NgTech-LTD/gns3-server
2
0 Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-11-05 23:01:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move appliance and template management code in their own classes.

Browse Source
This commit is contained in:
grossmj committed 2019-01-14 16:09:06 +07:00
1 parent 5a3929f01a
commit 8360ae98b1
10 files changed
+340 -224
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gns3server/handlers/api/controller/appliance_handler.py
+3 -3
View File
@@ -37,6 +37,6 @@ class ApplianceHandler:
controller = Controller.instance()
if request.query.get("update", "no") == "yes":
await controller.download_appliances()
controller.load_appliances()
response.json([c for c in controller.appliances.values()])
await controller.appliance_manager.download_appliances()
controller.appliance_manager.load_appliances()
response.json([c for c in controller.appliance_manager.appliances.values()])
gns3server/handlers/api/controller/template_handler.py
+6 -6
View File
@@ -50,7 +50,7 @@ class TemplateHandler:
def create(request, response):
controller = Controller.instance()
template = controller.add_template(request.json)
template = controller.template_manager.add_template(request.json)
response.set_status(201)
response.json(template)
@@ -67,7 +67,7 @@ class TemplateHandler:
request_etag = request.headers.get("If-None-Match", "")
controller = Controller.instance()
template = controller.get_template(request.match_info["template_id"])
template = controller.template_manager.get_template(request.match_info["template_id"])
data = json.dumps(template.__json__())
template_etag = '"' + hashlib.md5(data.encode()).hexdigest() + '"'
if template_etag == request_etag:
@@ -90,7 +90,7 @@ class TemplateHandler:
def update(request, response):
controller = Controller.instance()
template = controller.get_template(request.match_info["template_id"])
template = controller.template_manager.get_template(request.match_info["template_id"])
# Ignore these because we only use them when creating a template
request.json.pop("template_id", None)
request.json.pop("template_type", None)
@@ -114,7 +114,7 @@ class TemplateHandler:
def delete(request, response):
controller = Controller.instance()
controller.delete_template(request.match_info["template_id"])
controller.template_manager.delete_template(request.match_info["template_id"])
response.set_status(204)
@Route.get(
@@ -126,7 +126,7 @@ class TemplateHandler:
def list(request, response):
controller = Controller.instance()
response.json([c for c in controller.templates.values()])
response.json([c for c in controller.template_manager.templates.values()])
@Route.post(
r"/templates/{template_id}/duplicate",
@@ -143,7 +143,7 @@ class TemplateHandler:
async def duplicate(request, response):
controller = Controller.instance()
template = controller.duplicate_template(request.match_info["template_id"])
template = controller.template_manager.duplicate_template(request.match_info["template_id"])
response.set_status(201)
response.json(template)