1
0
Fork 0
mirror of https://github.com/ThomasGsp/HyperProxmox.git synced 2025-03-09 15:40:18 +00:00

Api change + delete useless code

This commit is contained in:
Tlams 2018-02-11 18:40:30 +00:00
parent 1ee636da81
commit 86b208f5e2

View file

@ -68,6 +68,9 @@ if __name__ == "__main__":
# URL MAPPING # URL MAPPING
urls = \ urls = \
( (
# FRESH DATA
# MAPPING INSTANCES # MAPPING INSTANCES
'/api/v1/instance', 'Instance', '/api/v1/instance', 'Instance',
'/api/v1/instance/new', 'Instance', '/api/v1/instance/new', 'Instance',
@ -88,22 +91,21 @@ if __name__ == "__main__":
'/api/v1/auth', 'Auth', '/api/v1/auth', 'Auth',
# MANAGEMENT # MANAGEMENT
'/api/v1/administration/cluster', 'Cluster', '/api/v1/administration/cluster/(?:[0-9a-zA-Z\_\-]+)', 'Cluster',
'/api/v1/administration/cluster/', 'Cluster',
'/api/v1/administration/cluster/new', 'Cluster', '/api/v1/administration/cluster/new', 'Cluster',
# CACHE DATA (MONGO) # CACHE DATA (MONGO)
# date/cluster/node/vmid # date/cluster/node/vmid
# Disks mapping # Disks mapping
'/api/v1/static/(disks)/([0-9]+)/([0-9a-zA-Z]+)/([0-9a-zA-Z]+)/([0-9]+)', 'QueryCache_Infra', '/api/v1/static/(disks)/([0-9]+)/([0-9a-zA-Z\_\-]+)/([0-9a-zA-Z\_\-]+)/([0-9]+)', 'QueryCache_Infra',
'/api/v1/static/(disks)/([0-9]+)/([0-9a-zA-Z]+)/([0-9a-zA-Z]+)/', 'QueryCache_Infra', '/api/v1/static/(disks)/([0-9]+)/([0-9a-zA-Z\_\-]+)/([0-9a-zA-Z\_\-]+)/', 'QueryCache_Infra',
'/api/v1/static/(disks)/([0-9]+)/([0-9a-zA-Z]+)/', 'QueryCache_Infra', '/api/v1/static/(disks)/([0-9]+)/([0-9a-zA-Z\_\-]+)/', 'QueryCache_Infra',
'/api/v1/static/(disks)/([0-9]+)/', 'QueryCache_Infra', '/api/v1/static/(disks)/([0-9]+)/', 'QueryCache_Infra',
# Storages mapping # Storages mapping
'/api/v1/static/(storages)/([0-9]+)/([0-9a-zA-Z]+)/([0-9a-zA-Z]+)/', 'QueryCache_Infra', '/api/v1/static/(storages)/([0-9]+)/([0-9a-zA-Z\_\-]+)/([0-9a-zA-Z\_\-]+)/', 'QueryCache_Infra',
'/api/v1/static/(storages)/([0-9]+)/([0-9a-zA-Z]+)/', 'QueryCache_Infra', '/api/v1/static/(storages)/([0-9]+)/([0-9a-zA-Z\_\-]+)/', 'QueryCache_Infra',
'/api/v1/static/(storages)/([0-9]+)/', 'QueryCache_Infra', '/api/v1/static/(storages)/([0-9]+)/', 'QueryCache_Infra',
# Instances mapping # Instances mapping
@ -142,17 +144,10 @@ if __name__ == "__main__":
""" Active logger""" """ Active logger"""
logger = Logger(generalconf) logger = Logger(generalconf)
""" First redis connection """
# Lredis = Redis_wrapper(generalconf["redis"]["ip"], generalconf["redis"]["port"])
# Lredis.connect()
""" Init Core thread """ """ Init Core thread """
# core = Core(generalconf, Lredis)
core = Core(generalconf) core = Core(generalconf)
""" Init API thread """ """ Init API thread """
# api_th = ThreadAPI(1, "ThreadAPI", urls, core, generalconf, Lredis)
api_th = ThreadAPI(1, "ThreadAPI", urls, core, generalconf) api_th = ThreadAPI(1, "ThreadAPI", urls, core, generalconf)
api_th.start() api_th.start()