Refactoring to use a common node class for all VMs and other (future) objects.

gns3server/compute/virtualbox/__init__.py

@@ -35,7 +35,7 @@ from .virtualbox_error import VirtualBoxError
 
 class VirtualBox(BaseManager):
 
-    _VM_CLASS = VirtualBoxVM
+    _NODE_CLASS = VirtualBoxVM
 
     def __init__(self):
 
@@ -160,7 +160,7 @@ class VirtualBox(BaseManager):
         Gets VirtualBox VM list.
         """
 
-        vms = []
+        vbox_vms = []
         result = yield from self.execute("list", ["vms"])
         for line in result:
             if len(line) == 0 or line[0] != '"' or line[-1:] != "}":
@@ -182,16 +182,16 @@ class VirtualBox(BaseManager):
                             break
                     except ValueError:
                         continue
-                vms.append({"vmname": vmname, "ram": ram})
-        return vms
+                vbox_vms.append({"vmname": vmname, "ram": ram})
+        return vbox_vms
 
     @staticmethod
     def get_legacy_vm_workdir(legacy_vm_id, name):
         """
-        Returns the name of the legacy working directory name for a VM.
+        Returns the name of the legacy working directory name for a node.
 
-        :param legacy_vm_id: legacy VM identifier (not used)
-        :param name: VM name
+        :param legacy_vm_id: legacy node identifier (not used)
+        :param name: node name
 
         :returns: working directory name
         """

gns3server/compute/virtualbox/virtualbox_error.py

@@ -19,9 +19,9 @@
 Custom exceptions for the VirtualBox module.
 """
 
-from ..vm_error import VMError
+from ..node_error import NodeError
 
 
-class VirtualBoxError(VMError):
+class VirtualBoxError(NodeError):
 
     pass

gns3server/compute/virtualbox/virtualbox_vm.py

@@ -35,7 +35,7 @@ from .virtualbox_error import VirtualBoxError
 from ..nios.nio_udp import NIOUDP
 from ..nios.nio_nat import NIONAT
 from ..adapters.ethernet_adapter import EthernetAdapter
-from ..base_vm import BaseVM
+from ..base_node import BaseNode
 
 if sys.platform.startswith('win'):
     import msvcrt
@@ -45,15 +45,15 @@ import logging
 log = logging.getLogger(__name__)
 
 
-class VirtualBoxVM(BaseVM):
+class VirtualBoxVM(BaseNode):
 
     """
     VirtualBox VM implementation.
     """
 
-    def __init__(self, name, vm_id, project, manager, vmname, linked_clone, console=None, adapters=0):
+    def __init__(self, name, node_id, project, manager, vmname, linked_clone, console=None, adapters=0):
 
-        super().__init__(name, vm_id, project, manager, console=console)
+        super().__init__(name, node_id, project, manager, console=console)
 
         self._maximum_adapters = 8
         self._linked_clone = linked_clone
@@ -75,7 +75,7 @@ class VirtualBoxVM(BaseVM):
     def __json__(self):
 
         json = {"name": self.name,
-                "vm_id": self.id,
+                "node_id": self.id,
                 "console": self.console,
                 "project_id": self.project.id,
                 "vmname": self.vmname,