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

gns3server/modules/adapters/adapter.py

@@ -29,8 +29,8 @@ class Adapter(object):
         self._interfaces = interfaces
 
         self._ports = {}
-        for port_id in range(0, interfaces):
-            self._ports[port_id] = None
+        for port_number in range(0, interfaces):
+            self._ports[port_number] = None
 
     def removable(self):
         """
@@ -42,7 +42,7 @@ class Adapter(object):
 
         return True
 
-    def port_exists(self, port_id):
+    def port_exists(self, port_number):
         """
         Checks if a port exists on this adapter.
 
@@ -50,39 +50,39 @@ class Adapter(object):
         False otherwise.
         """
 
-        if port_id in self._ports:
+        if port_number in self._ports:
             return True
         return False
 
-    def add_nio(self, port_id, nio):
+    def add_nio(self, port_number, nio):
         """
         Adds a NIO to a port on this adapter.
 
-        :param port_id: port ID (integer)
+        :param port_number: port number (integer)
         :param nio: NIO instance
         """
 
-        self._ports[port_id] = nio
+        self._ports[port_number] = nio
 
-    def remove_nio(self, port_id):
+    def remove_nio(self, port_number):
         """
         Removes a NIO from a port on this adapter.
 
-        :param port_id: port ID (integer)
+        :param port_number: port number (integer)
         """
 
-        self._ports[port_id] = None
+        self._ports[port_number] = None
 
-    def get_nio(self, port_id):
+    def get_nio(self, port_number):
         """
         Returns the NIO assigned to a port.
 
-        :params port_id: port ID (integer)
+        :params port_number: port number (integer)
 
         :returns: NIO instance
         """
 
-        return self._ports[port_id]
+        return self._ports[port_number]
 
     @property
     def ports(self):

gns3server/modules/virtualbox/virtualbox_vm.py

@@ -152,7 +152,8 @@ class VirtualBoxVM(BaseVM):
             else:
                 yield from self._create_linked_clone()
 
-        yield from self.set_adapters(self._adapters)
+        if self._adapters:
+            yield from self.set_adapters(self._adapters)
 
     @asyncio.coroutine
     def start(self):

gns3server/modules/vpcs/vpcs_vm.py

@@ -317,47 +317,47 @@ class VPCSVM(BaseVM):
             return True
         return False
 
-    def port_add_nio_binding(self, port_id, nio):
+    def port_add_nio_binding(self, port_number, nio):
         """
         Adds a port NIO binding.
 
-        :param port_id: port ID
+        :param port_number: port number
         :param nio: NIO instance to add to the slot/port
         """
 
-        if not self._ethernet_adapter.port_exists(port_id):
-            raise VPCSError("Port {port_id} doesn't exist in adapter {adapter}".format(adapter=self._ethernet_adapter,
-                                                                                       port_id=port_id))
+        if not self._ethernet_adapter.port_exists(port_number):
+            raise VPCSError("Port {port_number} doesn't exist in adapter {adapter}".format(adapter=self._ethernet_adapter,
+                                                                                           port_number=port_number))
 
-        self._ethernet_adapter.add_nio(port_id, nio)
-        log.info("VPCS {name} {uuid}]: {nio} added to port {port_id}".format(name=self._name,
-                                                                             uuid=self.uuid,
-                                                                             nio=nio,
-                                                                             port_id=port_id))
+        self._ethernet_adapter.add_nio(port_number, nio)
+        log.info("VPCS {name} {uuid}]: {nio} added to port {port_number}".format(name=self._name,
+                                                                                 uuid=self.uuid,
+                                                                                 nio=nio,
+                                                                                 port_number=port_number))
         return nio
 
-    def port_remove_nio_binding(self, port_id):
+    def port_remove_nio_binding(self, port_number):
         """
         Removes a port NIO binding.
 
-        :param port_id: port ID
+        :param port_number: port number
 
         :returns: NIO instance
         """
 
-        if not self._ethernet_adapter.port_exists(port_id):
-            raise VPCSError("Port {port_id} doesn't exist in adapter {adapter}".format(adapter=self._ethernet_adapter,
-                                                                                       port_id=port_id))
+        if not self._ethernet_adapter.port_exists(port_number):
+            raise VPCSError("Port {port_number} doesn't exist in adapter {adapter}".format(adapter=self._ethernet_adapter,
+                                                                                           port_number=port_number))
 
-        nio = self._ethernet_adapter.get_nio(port_id)
+        nio = self._ethernet_adapter.get_nio(port_number)
         if str(nio) == "NIO UDP":
             self.manager.port_manager.release_udp_port(nio.lport)
-        self._ethernet_adapter.remove_nio(port_id)
+        self._ethernet_adapter.remove_nio(port_number)
 
-        log.info("VPCS {name} [{uuid}]: {nio} removed from port {port_id}".format(name=self._name,
-                                                                                  uuid=self.uuid,
-                                                                                  nio=nio,
-                                                                                  port_id=port_id))
+        log.info("VPCS {name} [{uuid}]: {nio} removed from port {port_number}".format(name=self._name,
+                                                                                      uuid=self.uuid,
+                                                                                      nio=nio,
+                                                                                      port_number=port_number))
         return nio
 
     def _build_command(self):