Rename port_id to port_number for VPCS and adapter_id for VirtualBox to avoid confusion.

tests/api/test_virtualbox.py

@@ -94,7 +94,7 @@ def test_vbox_nio_create_udp(server, vm):
                                                                              "rhost": "127.0.0.1"},
                            example=True)
     assert response.status == 201
-    assert response.route == "/virtualbox/{uuid}/ports/{port_id:\d+}/nio"
+    assert response.route == "/virtualbox/{uuid}/ports/{adapter_id:\d+}/nio"
     assert response.json["type"] == "nio_udp"
 
 
@@ -105,7 +105,7 @@ def test_vbox_delete_nio(server, vm):
                                                                   "rhost": "127.0.0.1"})
     response = server.delete("/virtualbox/{}/ports/0/nio".format(vm["uuid"]), example=True)
     assert response.status == 204
-    assert response.route == "/virtualbox/{uuid}/ports/{port_id:\d+}/nio"
+    assert response.route == "/virtualbox/{uuid}/ports/{adapter_id:\d+}/nio"
 
 
 def test_vpcs_update(server, vm, free_console_port):

tests/api/test_vpcs.py

@@ -82,7 +82,7 @@ def test_vpcs_nio_create_udp(server, vm):
                                                                        "rhost": "127.0.0.1"},
                            example=True)
     assert response.status == 201
-    assert response.route == "/vpcs/{uuid}/ports/{port_id:\d+}/nio"
+    assert response.route == "/vpcs/{uuid}/ports/{port_number:\d+}/nio"
     assert response.json["type"] == "nio_udp"
 
 
@@ -91,7 +91,7 @@ def test_vpcs_nio_create_tap(server, vm):
         response = server.post("/vpcs/{}/ports/0/nio".format(vm["uuid"]), {"type": "nio_tap",
                                                                            "tap_device": "test"})
         assert response.status == 201
-        assert response.route == "/vpcs/{uuid}/ports/{port_id:\d+}/nio"
+        assert response.route == "/vpcs/{uuid}/ports/{port_number:\d+}/nio"
         assert response.json["type"] == "nio_tap"
 
 
@@ -102,7 +102,7 @@ def test_vpcs_delete_nio(server, vm):
                                                             "rhost": "127.0.0.1"})
     response = server.delete("/vpcs/{}/ports/0/nio".format(vm["uuid"]), example=True)
     assert response.status == 204
-    assert response.route == "/vpcs/{uuid}/ports/{port_id:\d+}/nio"
+    assert response.route == "/vpcs/{uuid}/ports/{port_number:\d+}/nio"
 
 
 def test_vpcs_start(server, vm):

tests/modules/virtualbox/test_virtualbox_vm.py

@@ -41,7 +41,6 @@ def test_vm(project, manager):
     assert vm.name == "test"
     assert vm.uuid == "00010203-0405-0607-0809-0a0b0c0d0e0f"
     assert vm.vmname == "test"
-    assert vm.linked_clone is False
 
 
 def test_vm_valid_virtualbox_api_version(loop, project, manager):