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

Revert move "/version" endpoint to "/server/version".

Browse Source 
Move "/server/shutdown" endpoint to "/shutdown".
This commit is contained in:
grossmj committed 2016-06-01 18:21:07 -06:00
1 parent cd07a99118
commit f47eb326c7
7 files changed
+15 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/compute/qemu/test_qemu_vm.py
+1 -1
View File
@@ -200,7 +200,7 @@ def test_add_nio_binding_udp(vm, loop):
@pytest.mark.skipif(sys.platform.startswith("win"), reason="Not supported on Windows")
def test_add_nio_binding_ethernet(vm, loop, ethernet_device):
with patch("gns3server.compute.base_manager.BaseManager.has_privileged_access", return_value=True):
nio = Qemu.instance().create_nio(vm.qemu_path, {"type": "nio_generic_ethernet", "ethernet_device": ethernet_device})
nio = Qemu.instance().create_nio(vm.qemu_path, {"type": "nio_ethernet", "ethernet_device": ethernet_device})
loop.run_until_complete(asyncio.async(vm.adapter_add_nio_binding(0, nio)))
assert nio.ethernet_device == ethernet_device
tests/handlers/api/compute/test_iou.py
+4 -4
View File
@@ -220,24 +220,24 @@ def test_iou_nio_create_udp(http_compute, vm):
def test_iou_nio_create_ethernet(http_compute, vm, ethernet_device):
response = http_compute.post("/projects/{project_id}/iou/nodes/{node_id}/adapters/1/ports/0/nio".format(project_id=vm["project_id"], node_id=vm["node_id"]), {"type": "nio_generic_ethernet",
response = http_compute.post("/projects/{project_id}/iou/nodes/{node_id}/adapters/1/ports/0/nio".format(project_id=vm["project_id"], node_id=vm["node_id"]), {"type": "nio_ethernet",
"ethernet_device": ethernet_device,
},
example=True)
assert response.status == 201
assert response.route == "/projects/{project_id}/iou/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio"
assert response.json["type"] == "nio_generic_ethernet"
assert response.json["type"] == "nio_ethernet"
assert response.json["ethernet_device"] == ethernet_device
def test_iou_nio_create_ethernet_different_port(http_compute, vm, ethernet_device):
response = http_compute.post("/projects/{project_id}/iou/nodes/{node_id}/adapters/0/ports/3/nio".format(project_id=vm["project_id"], node_id=vm["node_id"]), {"type": "nio_generic_ethernet",
response = http_compute.post("/projects/{project_id}/iou/nodes/{node_id}/adapters/0/ports/3/nio".format(project_id=vm["project_id"], node_id=vm["node_id"]), {"type": "nio_ethernet",
"ethernet_device": ethernet_device,
},
example=False)
assert response.status == 201
assert response.route == "/projects/{project_id}/iou/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/nio"
assert response.json["type"] == "nio_generic_ethernet"
assert response.json["type"] == "nio_ethernet"
assert response.json["ethernet_device"] == ethernet_device
tests/handlers/api/compute/test_qemu.py
+1 -1
View File
@@ -183,7 +183,7 @@ def test_qemu_nio_create_udp(http_compute, vm):
def test_qemu_nio_create_ethernet(http_compute, vm):
http_compute.put("/projects/{project_id}/qemu/nodes/{node_id}".format(project_id=vm["project_id"], node_id=vm["node_id"]), {"adapters": 2})
response = http_compute.post("/projects/{project_id}/qemu/nodes/{node_id}/adapters/1/ports/0/nio".format(project_id=vm["project_id"], node_id=vm["node_id"]), {"type": "nio_generic_ethernet",
response = http_compute.post("/projects/{project_id}/qemu/nodes/{node_id}/adapters/1/ports/0/nio".format(project_id=vm["project_id"], node_id=vm["node_id"]), {"type": "nio_ethernet",
"ethernet_device": "eth0",
},
example=True)
tests/handlers/api/controller/test_server.py
+3 -3
View File
@@ -36,17 +36,17 @@ def test_shutdown_local(http_controller, web_server, config):
web_server.shutdown_server.return_value = hello()
config.set("Server", "local", True)
response = http_controller.post('/server/shutdown', example=True)
response = http_controller.post('/shutdown', example=True)
assert response.status == 201
assert web_server.shutdown_server.called
def test_shutdown_non_local(http_controller, web_server, config):
"""
Dissalow shutdown of a non local GNS3 server
Disallow shutdown of a non local GNS3 server
"""
WebServer._instance = MagicMock()
config.set("Server", "local", False)
response = http_controller.post('/server/shutdown')
response = http_controller.post('/shutdown')
assert response.status == 403
assert not web_server.shutdown_server.called