Explicit ID names, remove {uuid} from URLs and add vms in URLs for VMs.

tests/api/test_project.py

@@ -80,7 +80,7 @@ def test_update_temporary_project(server):
 
 def test_commit_project(server, project):
     with asyncio_patch("gns3server.modules.project.Project.commit", return_value=True) as mock:
-        response = server.post("/projects/{project_id}/commit".format(project_id=project.uuid), example=True)
+        response = server.post("/projects/{project_id}/commit".format(project_id=project.id), example=True)
     assert response.status == 204
     assert mock.called
 
@@ -92,7 +92,7 @@ def test_commit_project_invalid_uuid(server):
 
 def test_delete_project(server, project):
     with asyncio_patch("gns3server.modules.project.Project.delete", return_value=True) as mock:
-        response = server.delete("/projects/{project_id}".format(project_id=project.uuid), example=True)
+        response = server.delete("/projects/{project_id}".format(project_id=project.id), example=True)
         assert response.status == 204
         assert mock.called
 
@@ -104,7 +104,7 @@ def test_delete_project_invalid_uuid(server):
 
 def test_close_project(server, project):
     with asyncio_patch("gns3server.modules.project.Project.close", return_value=True) as mock:
-        response = server.post("/projects/{project_id}/close".format(project_id=project.uuid), example=True)
+        response = server.post("/projects/{project_id}/close".format(project_id=project.id), example=True)
         assert response.status == 204
         assert mock.called
 

tests/api/test_virtualbox.py

@@ -22,10 +22,10 @@ from tests.utils import asyncio_patch
 @pytest.fixture(scope="module")
 def vm(server, project):
     with asyncio_patch("gns3server.modules.virtualbox.virtualbox_vm.VirtualBoxVM.create", return_value=True) as mock:
-        response = server.post("/virtualbox", {"name": "VMTEST",
-                                               "vmname": "VMTEST",
-                                               "linked_clone": False,
-                                               "project_id": project.uuid})
+        response = server.post("/virtualbox/vms", {"name": "VMTEST",
+                                                   "vmname": "VMTEST",
+                                                   "linked_clone": False,
+                                                   "project_id": project.id})
     assert mock.called
     assert response.status == 201
     return response.json
@@ -34,83 +34,83 @@ def vm(server, project):
 def test_vbox_create(server, project):
 
     with asyncio_patch("gns3server.modules.virtualbox.virtualbox_vm.VirtualBoxVM.create", return_value=True):
-        response = server.post("/virtualbox", {"name": "VM1",
-                                               "vmname": "VM1",
-                                               "linked_clone": False,
-                                               "project_id": project.uuid},
+        response = server.post("/virtualbox/vms", {"name": "VM1",
+                                                   "vmname": "VM1",
+                                                   "linked_clone": False,
+                                                   "project_id": project.id},
                                example=True)
         assert response.status == 201
         assert response.json["name"] == "VM1"
-        assert response.json["project_id"] == project.uuid
+        assert response.json["project_id"] == project.id
 
 
 def test_vbox_get(server, project, vm):
-    response = server.get("/virtualbox/{}".format(vm["uuid"]), example=True)
+    response = server.get("/virtualbox/vms/{}".format(vm["vm_id"]), example=True)
     assert response.status == 200
-    assert response.route == "/virtualbox/{uuid}"
+    assert response.route == "/virtualbox/vms/{vm_id}"
     assert response.json["name"] == "VMTEST"
-    assert response.json["project_id"] == project.uuid
+    assert response.json["project_id"] == project.id
 
 
 def test_vbox_start(server, vm):
     with asyncio_patch("gns3server.modules.virtualbox.virtualbox_vm.VirtualBoxVM.start", return_value=True) as mock:
-        response = server.post("/virtualbox/{}/start".format(vm["uuid"]))
+        response = server.post("/virtualbox/vms/{}/start".format(vm["vm_id"]))
         assert mock.called
         assert response.status == 204
 
 
 def test_vbox_stop(server, vm):
     with asyncio_patch("gns3server.modules.virtualbox.virtualbox_vm.VirtualBoxVM.stop", return_value=True) as mock:
-        response = server.post("/virtualbox/{}/stop".format(vm["uuid"]))
+        response = server.post("/virtualbox/vms/{}/stop".format(vm["vm_id"]))
         assert mock.called
         assert response.status == 204
 
 
 def test_vbox_suspend(server, vm):
     with asyncio_patch("gns3server.modules.virtualbox.virtualbox_vm.VirtualBoxVM.suspend", return_value=True) as mock:
-        response = server.post("/virtualbox/{}/suspend".format(vm["uuid"]))
+        response = server.post("/virtualbox/vms/{}/suspend".format(vm["vm_id"]))
         assert mock.called
         assert response.status == 204
 
 
 def test_vbox_resume(server, vm):
     with asyncio_patch("gns3server.modules.virtualbox.virtualbox_vm.VirtualBoxVM.resume", return_value=True) as mock:
-        response = server.post("/virtualbox/{}/resume".format(vm["uuid"]))
+        response = server.post("/virtualbox/vms/{}/resume".format(vm["vm_id"]))
         assert mock.called
         assert response.status == 204
 
 
 def test_vbox_reload(server, vm):
     with asyncio_patch("gns3server.modules.virtualbox.virtualbox_vm.VirtualBoxVM.reload", return_value=True) as mock:
-        response = server.post("/virtualbox/{}/reload".format(vm["uuid"]))
+        response = server.post("/virtualbox/vms/{}/reload".format(vm["vm_id"]))
         assert mock.called
         assert response.status == 204
 
 
 def test_vbox_nio_create_udp(server, vm):
-    response = server.post("/virtualbox/{}/adapters/0/nio".format(vm["uuid"]), {"type": "nio_udp",
-                                                                                "lport": 4242,
-                                                                                "rport": 4343,
-                                                                                "rhost": "127.0.0.1"},
+    response = server.post("/virtualbox/vms/{}/adapters/0/nio".format(vm["vm_id"]), {"type": "nio_udp",
+                                                                                     "lport": 4242,
+                                                                                     "rport": 4343,
+                                                                                     "rhost": "127.0.0.1"},
                            example=True)
     assert response.status == 201
-    assert response.route == "/virtualbox/{uuid}/adapters/{adapter_id:\d+}/nio"
+    assert response.route == "/virtualbox/vms/{vm_id}/adapters/{adapter_id:\d+}/nio"
     assert response.json["type"] == "nio_udp"
 
 
 def test_vbox_delete_nio(server, vm):
-    server.post("/virtualbox/{}/adapters/0/nio".format(vm["uuid"]), {"type": "nio_udp",
-                                                                     "lport": 4242,
-                                                                     "rport": 4343,
-                                                                     "rhost": "127.0.0.1"})
-    response = server.delete("/virtualbox/{}/adapters/0/nio".format(vm["uuid"]), example=True)
+    server.post("/virtualbox/vms/{}/adapters/0/nio".format(vm["vm_id"]), {"type": "nio_udp",
+                                                                          "lport": 4242,
+                                                                          "rport": 4343,
+                                                                          "rhost": "127.0.0.1"})
+    response = server.delete("/virtualbox/vms/{}/adapters/0/nio".format(vm["vm_id"]), example=True)
     assert response.status == 204
-    assert response.route == "/virtualbox/{uuid}/adapters/{adapter_id:\d+}/nio"
+    assert response.route == "/virtualbox/vms/{vm_id}/adapters/{adapter_id:\d+}/nio"
 
 
 def test_vpcs_update(server, vm, free_console_port):
-    response = server.put("/virtualbox/{}".format(vm["uuid"]), {"name": "test",
-                                                                "console": free_console_port})
+    response = server.put("/virtualbox/vms/{}".format(vm["vm_id"]), {"name": "test",
+                                                                     "console": free_console_port})
     assert response.status == 200
     assert response.json["name"] == "test"
     assert response.json["console"] == free_console_port

tests/api/test_vpcs.py

@@ -23,108 +23,108 @@ from unittest.mock import patch
 
 @pytest.fixture(scope="module")
 def vm(server, project):
-    response = server.post("/vpcs", {"name": "PC TEST 1", "project_id": project.uuid})
+    response = server.post("/vpcs/vms", {"name": "PC TEST 1", "project_id": project.id})
     assert response.status == 201
     return response.json
 
 
 def test_vpcs_create(server, project):
-    response = server.post("/vpcs", {"name": "PC TEST 1", "project_id": project.uuid}, example=True)
+    response = server.post("/vpcs/vms", {"name": "PC TEST 1", "project_id": project.id}, example=True)
     assert response.status == 201
-    assert response.route == "/vpcs"
+    assert response.route == "/vpcs/vms"
     assert response.json["name"] == "PC TEST 1"
-    assert response.json["project_id"] == project.uuid
+    assert response.json["project_id"] == project.id
     assert response.json["script_file"] is None
 
 
 def test_vpcs_get(server, project, vm):
-    response = server.get("/vpcs/{}".format(vm["uuid"]), example=True)
+    response = server.get("/vpcs/vms/{}".format(vm["vm_id"]), example=True)
     assert response.status == 200
-    assert response.route == "/vpcs/{uuid}"
+    assert response.route == "/vpcs/vms/{vm_id}"
     assert response.json["name"] == "PC TEST 1"
-    assert response.json["project_id"] == project.uuid
+    assert response.json["project_id"] == project.id
 
 
 def test_vpcs_create_startup_script(server, project):
-    response = server.post("/vpcs", {"name": "PC TEST 1", "project_id": project.uuid, "startup_script": "ip 192.168.1.2\necho TEST"})
+    response = server.post("/vpcs/vms", {"name": "PC TEST 1", "project_id": project.id, "startup_script": "ip 192.168.1.2\necho TEST"})
     assert response.status == 201
-    assert response.route == "/vpcs"
+    assert response.route == "/vpcs/vms"
     assert response.json["name"] == "PC TEST 1"
-    assert response.json["project_id"] == project.uuid
+    assert response.json["project_id"] == project.id
     assert response.json["startup_script"] == "ip 192.168.1.2\necho TEST"
 
 
 def test_vpcs_create_port(server, project, free_console_port):
-    response = server.post("/vpcs", {"name": "PC TEST 1", "project_id": project.uuid, "console": free_console_port})
+    response = server.post("/vpcs/vms", {"name": "PC TEST 1", "project_id": project.id, "console": free_console_port})
     assert response.status == 201
-    assert response.route == "/vpcs"
+    assert response.route == "/vpcs/vms"
     assert response.json["name"] == "PC TEST 1"
-    assert response.json["project_id"] == project.uuid
+    assert response.json["project_id"] == project.id
     assert response.json["console"] == free_console_port
 
 
 def test_vpcs_nio_create_udp(server, vm):
-    response = server.post("/vpcs/{}/ports/0/nio".format(vm["uuid"]), {"type": "nio_udp",
-                                                                       "lport": 4242,
-                                                                       "rport": 4343,
-                                                                       "rhost": "127.0.0.1"},
+    response = server.post("/vpcs/vms/{}/ports/0/nio".format(vm["vm_id"]), {"type": "nio_udp",
+                                                                            "lport": 4242,
+                                                                            "rport": 4343,
+                                                                            "rhost": "127.0.0.1"},
                            example=True)
     assert response.status == 201
-    assert response.route == "/vpcs/{uuid}/ports/{port_number:\d+}/nio"
+    assert response.route == "/vpcs/vms/{vm_id}/ports/{port_number:\d+}/nio"
     assert response.json["type"] == "nio_udp"
 
 
 def test_vpcs_nio_create_tap(server, vm):
     with patch("gns3server.modules.base_manager.BaseManager._has_privileged_access", return_value=True):
-        response = server.post("/vpcs/{}/ports/0/nio".format(vm["uuid"]), {"type": "nio_tap",
-                                                                           "tap_device": "test"})
+        response = server.post("/vpcs/vms/{}/ports/0/nio".format(vm["vm_id"]), {"type": "nio_tap",
+                                                                                "tap_device": "test"})
         assert response.status == 201
-        assert response.route == "/vpcs/{uuid}/ports/{port_number:\d+}/nio"
+        assert response.route == "/vpcs/vms/{vm_id}/ports/{port_number:\d+}/nio"
         assert response.json["type"] == "nio_tap"
 
 
 def test_vpcs_delete_nio(server, vm):
-    server.post("/vpcs/{}/ports/0/nio".format(vm["uuid"]), {"type": "nio_udp",
-                                                            "lport": 4242,
-                                                            "rport": 4343,
-                                                            "rhost": "127.0.0.1"})
-    response = server.delete("/vpcs/{}/ports/0/nio".format(vm["uuid"]), example=True)
+    server.post("/vpcs/vms/{}/ports/0/nio".format(vm["vm_id"]), {"type": "nio_udp",
+                                                                 "lport": 4242,
+                                                                 "rport": 4343,
+                                                                 "rhost": "127.0.0.1"})
+    response = server.delete("/vpcs/vms/{}/ports/0/nio".format(vm["vm_id"]), example=True)
     assert response.status == 204
-    assert response.route == "/vpcs/{uuid}/ports/{port_number:\d+}/nio"
+    assert response.route == "/vpcs/vms/{vm_id}/ports/{port_number:\d+}/nio"
 
 
 def test_vpcs_start(server, vm):
     with asyncio_patch("gns3server.modules.vpcs.vpcs_vm.VPCSVM.start", return_value=True) as mock:
-        response = server.post("/vpcs/{}/start".format(vm["uuid"]))
+        response = server.post("/vpcs/vms/{}/start".format(vm["vm_id"]))
         assert mock.called
         assert response.status == 204
 
 
 def test_vpcs_stop(server, vm):
     with asyncio_patch("gns3server.modules.vpcs.vpcs_vm.VPCSVM.stop", return_value=True) as mock:
-        response = server.post("/vpcs/{}/stop".format(vm["uuid"]))
+        response = server.post("/vpcs/vms/{}/stop".format(vm["vm_id"]))
         assert mock.called
         assert response.status == 204
 
 
 def test_vpcs_reload(server, vm):
     with asyncio_patch("gns3server.modules.vpcs.vpcs_vm.VPCSVM.reload", return_value=True) as mock:
-        response = server.post("/vpcs/{}/reload".format(vm["uuid"]))
+        response = server.post("/vpcs/vms/{}/reload".format(vm["vm_id"]))
         assert mock.called
         assert response.status == 204
 
 
 def test_vpcs_delete(server, vm):
     with asyncio_patch("gns3server.modules.vpcs.VPCS.delete_vm", return_value=True) as mock:
-        response = server.delete("/vpcs/{}".format(vm["uuid"]))
+        response = server.delete("/vpcs/vms/{}".format(vm["vm_id"]))
         assert mock.called
         assert response.status == 204
 
 
 def test_vpcs_update(server, vm, tmpdir, free_console_port):
-    response = server.put("/vpcs/{}".format(vm["uuid"]), {"name": "test",
-                                                          "console": free_console_port,
-                                                          "startup_script": "ip 192.168.1.1"})
+    response = server.put("/vpcs/vms/{}".format(vm["vm_id"]), {"name": "test",
+                                                               "console": free_console_port,
+                                                               "startup_script": "ip 192.168.1.1"})
     assert response.status == 200
     assert response.json["name"] == "test"
     assert response.json["console"] == free_console_port