NgTech-LTD/gns3-server
2
0 Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-11-05 06:41:13 +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

tests/handlers/api/controller/test_appliance.py
+1 -1
View File
@@ -18,7 +18,7 @@
def test_appliances_list(http_controller, controller, async_run):
controller.load_appliances()
controller.appliance_manager.load_appliances()
response = http_controller.get("/appliances", example=True)
assert response.status == 200
assert len(response.json) > 0
tests/handlers/api/controller/test_template.py
+9 -9
View File
@@ -28,8 +28,8 @@ from gns3server.controller.template import Template
def test_template_list(http_controller, controller):
id = str(uuid.uuid4())
controller.load_templates()
controller._templates[id] = Template(id, {
controller.template_manager.load_templates()
controller.template_manager._templates[id] = Template(id, {
"template_type": "qemu",
"category": 0,
"name": "test",
@@ -59,7 +59,7 @@ def test_template_create_without_id(http_controller, controller):
assert response.status == 201
assert response.route == "/templates"
assert response.json["template_id"] is not None
assert len(controller.templates) == 1
assert len(controller.template_manager._templates) == 1
def test_template_create_with_id(http_controller, controller):
@@ -79,7 +79,7 @@ def test_template_create_with_id(http_controller, controller):
assert response.status == 201
assert response.route == "/templates"
assert response.json["template_id"] is not None
assert len(controller.templates) == 1
assert len(controller.template_manager._templates) == 1
def test_template_create_wrong_type(http_controller, controller):
@@ -97,7 +97,7 @@ def test_template_create_wrong_type(http_controller, controller):
response = http_controller.post("/templates", params)
assert response.status == 400
assert len(controller.templates) == 0
assert len(controller.template_manager._templates) == 0
def test_template_get(http_controller, controller):
@@ -169,14 +169,14 @@ def test_template_delete(http_controller, controller):
response = http_controller.get("/templates")
assert len(response.json) == 1
assert len(controller.templates) == 1
assert len(controller.template_manager._templates) == 1
response = http_controller.delete("/templates/{}".format(template_id), example=True)
assert response.status == 204
response = http_controller.get("/templates")
assert len(response.json) == 0
assert len(controller.templates) == 0
assert len(controller.template_manager._templates) == 0
def test_template_duplicate(http_controller, controller):
@@ -205,7 +205,7 @@ def test_template_duplicate(http_controller, controller):
response = http_controller.get("/templates")
assert len(response.json) == 2
assert len(controller.templates) == 2
assert len(controller.template_manager._templates) == 2
def test_c7200_dynamips_template_create(http_controller):
@@ -953,7 +953,7 @@ def project(http_controller, async_run):
def test_create_node_from_template(http_controller, controller, project, compute):
id = str(uuid.uuid4())
controller._templates = {id: Template(id, {
controller.template_manager._templates = {id: Template(id, {
"template_type": "qemu",
"category": 0,
"name": "test",