Ethernet hub and Ethernet switch almost fully migrated to the new API.

gns3server/compute/builtin/builtin_node_factory.py

@@ -18,11 +18,13 @@
 
 from ..node_error import NodeError
 from .nodes.ethernet_hub import EthernetHub
+from .nodes.ethernet_switch import EthernetSwitch
 
 import logging
 log = logging.getLogger(__name__)
 
-BUILTIN_NODES = {'ethernet_hub': EthernetHub}
+BUILTIN_NODES = {'ethernet_hub': EthernetHub,
+                 'ethernet_switch': EthernetSwitch}
 
 
 class BuiltinNodeFactory:

gns3server/compute/builtin/nodes/ethernet_switch.py

@@ -0,0 +1,109 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2013 GNS3 Technologies Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""
+Hub object that uses the Bridge interface to create a hub with ports.
+"""
+
+import asyncio
+
+from ...node_error import NodeError
+from ...base_node import BaseNode
+
+import logging
+log = logging.getLogger(__name__)
+
+
+class EthernetSwitch(BaseNode):
+
+    """
+    Ethernet switch.
+
+    :param name: name for this switch
+    :param node_id: Node identifier
+    :param project: Project instance
+    :param manager: Parent VM Manager
+    """
+
+    def __init__(self, name, node_id, project, manager):
+
+        super().__init__(name, node_id, project, manager)
+
+    def __json__(self):
+
+        return {"name": self.name,
+                "node_id": self.id,
+                "project_id": self.project.id}
+
+    @asyncio.coroutine
+    def create(self):
+
+        super().create()
+        log.info('Ethernet switch "{name}" [{id}] has been created'.format(name=self._name, id=self._id))
+
+    @asyncio.coroutine
+    def delete(self):
+        """
+        Deletes this switch.
+        """
+
+        raise NotImplementedError()
+
+    @asyncio.coroutine
+    def add_nio(self, nio, port_number):
+        """
+        Adds a NIO as new port on this switch.
+
+        :param nio: NIO instance to add
+        :param port_number: port to allocate for the NIO
+        """
+
+        raise NotImplementedError()
+
+    @asyncio.coroutine
+    def remove_nio(self, port_number):
+        """
+        Removes the specified NIO as member of this switch.
+
+        :param port_number: allocated port number
+
+        :returns: the NIO that was bound to the allocated port
+        """
+
+        raise NotImplementedError()
+
+    @asyncio.coroutine
+    def start_capture(self, port_number, output_file, data_link_type="DLT_EN10MB"):
+        """
+        Starts a packet capture.
+
+        :param port_number: allocated port number
+        :param output_file: PCAP destination file for the capture
+        :param data_link_type: PCAP data link type (DLT_*), default is DLT_EN10MB
+        """
+
+        raise NotImplementedError()
+
+    @asyncio.coroutine
+    def stop_capture(self, port_number):
+        """
+        Stops a packet capture.
+
+        :param port_number: allocated port number
+        """
+
+        raise NotImplementedError()

gns3server/compute/dynamips/__init__.py

@@ -266,32 +266,33 @@ class Dynamips(BaseManager):
         return self._dynamips_path
 
     @asyncio.coroutine
-    def create_device(self, name, project_id, device_id, device_type, *args, **kwargs):
+    def create_device(self, name, project_id, node_id, device_type, *args, **kwargs):
         """
         Create a new Dynamips device.
 
         :param name: Device name
         :param project_id: Project identifier
+        :param node_id: Node identifier
         """
 
         project = ProjectManager.instance().get_project(project_id)
-        if device_id and isinstance(device_id, int):
+        if node_id and isinstance(node_id, int):
             with (yield from BaseManager._convert_lock):
-                device_id = yield from self.convert_old_project(project, device_id, name)
+                node_id = yield from self.convert_old_project(project, node_id, name)
 
-        if not device_id:
-            device_id = str(uuid4())
+        if not node_id:
+            node_id = str(uuid4())
 
-        device = self._DEVICE_CLASS(name, device_id, project, self, device_type, *args, **kwargs)
+        device = self._DEVICE_CLASS(name, node_id, project, self, device_type, *args, **kwargs)
         yield from device.create()
         self._devices[device.id] = device
         return device
 
-    def get_device(self, device_id, project_id=None):
+    def get_device(self, node_id, project_id=None):
         """
         Returns a device instance.
 
-        :param device_id: Device identifier
+        :param node_id: Node identifier
         :param project_id: Project identifier
 
         :returns: Device instance
@@ -302,14 +303,14 @@ class Dynamips(BaseManager):
             project = ProjectManager.instance().get_project(project_id)
 
         try:
-            UUID(device_id, version=4)
+            UUID(node_id, version=4)
         except ValueError:
-            raise aiohttp.web.HTTPBadRequest(text="Device ID} is not a valid UUID".format(device_id))
+            raise aiohttp.web.HTTPBadRequest(text="Node ID {} is not a valid UUID".format(node_id))
 
-        if device_id not in self._devices:
-            raise aiohttp.web.HTTPNotFound(text="Device ID {} doesn't exist".format(device_id))
+        if node_id not in self._devices:
+            raise aiohttp.web.HTTPNotFound(text="Node ID {} doesn't exist".format(node_id))
 
-        device = self._devices[device_id]
+        device = self._devices[node_id]
         if project_id:
             if device.project.id != project.id:
                 raise aiohttp.web.HTTPNotFound(text="Project ID {} doesn't belong to device {}".format(project_id, device.name))
@@ -317,16 +318,16 @@ class Dynamips(BaseManager):
         return device
 
     @asyncio.coroutine
-    def delete_device(self, device_id):
+    def delete_device(self, node_id):
         """
         Delete a device
 
-        :param device_id: Device identifier
+        :param node_id: Node identifier
 
         :returns: Device instance
         """
 
-        device = self.get_device(device_id)
+        device = self.get_device(node_id)
         yield from device.delete()
         del self._devices[device.id]
         return device

gns3server/compute/dynamips/nodes/device.py

@@ -28,10 +28,10 @@ class Device:
     :param hypervisor: Dynamips hypervisor instance
     """
 
-    def __init__(self, name, device_id, project, manager, hypervisor=None):
+    def __init__(self, name, node_id, project, manager, hypervisor=None):
 
         self._name = name
-        self._id = device_id
+        self._id = node_id
         self._project = project
         self._manager = manager
         self._hypervisor = hypervisor
@@ -96,6 +96,12 @@ class Device:
 
         return self._manager
 
+    def updated(self):
+        """
+        Send a updated event
+        """
+        self.project.emit("node.updated", self)
+
     def create(self):
         """
         Creates the device.

gns3server/compute/dynamips/nodes/ethernet_hub.py

@@ -35,22 +35,53 @@ class EthernetHub(Bridge):
     Dynamips Ethernet hub (based on Bridge)
 
     :param name: name for this hub
-    :param device_id: Device instance identifier
+    :param node_id: Node instance identifier
     :param project: Project instance
     :param manager: Parent VM Manager
+    :param ports: initial hub ports
     :param hypervisor: Dynamips hypervisor instance
     """
 
-    def __init__(self, name, device_id, project, manager, hypervisor=None):
+    def __init__(self, name, node_id, project, manager, ports=None, hypervisor=None):
 
-        super().__init__(name, device_id, project, manager, hypervisor)
+        super().__init__(name, node_id, project, manager, hypervisor)
         self._mappings = {}
+        if ports is None:
+            # create 8 ports by default
+            self._ports = []
+            for port_number in range(1, 9):
+                self._ports.append({"port_number": port_number,
+                                    "name": "Ethernet{}".format(port_number)})
+        else:
+            self._ports = ports
 
     def __json__(self):
 
         return {"name": self.name,
                 "node_id": self.id,
-                "project_id": self.project.id}
+                "project_id": self.project.id,
+                "ports": self._ports,
+                "status": "started"}
+
+    @property
+    def ports(self):
+        """
+        Ports on this hub
+
+        :returns: ports info
+        """
+
+        return self._ports
+
+    @ports.setter
+    def ports(self, ports):
+        """
+        Set the ports on this hub
+
+        :param ports: ports info
+        """
+
+        self._ports = ports
 
     @asyncio.coroutine
     def create(self):
@@ -95,6 +126,9 @@ class EthernetHub(Bridge):
         :param port_number: port to allocate for the NIO
         """
 
+        if port_number not in [port["port_number"] for port in self._ports]:
+            raise DynamipsError("Port {} doesn't exist".format(port_number))
+
         if port_number in self._mappings:
             raise DynamipsError("Port {} isn't free".format(port_number))
 

gns3server/compute/dynamips/nodes/ethernet_switch.py

@@ -37,34 +37,67 @@ class EthernetSwitch(Device):
     Dynamips Ethernet switch.
 
     :param name: name for this switch
-    :param device_id: Device instance identifier
+    :param node_id: Node instance identifier
     :param project: Project instance
     :param manager: Parent VM Manager
+    :param ports: initial switch ports
     :param hypervisor: Dynamips hypervisor instance
     """
 
-    def __init__(self, name, device_id, project, manager, hypervisor=None):
+    def __init__(self, name, node_id, project, manager, ports=None, hypervisor=None):
 
-        super().__init__(name, device_id, project, manager, hypervisor)
+        super().__init__(name, node_id, project, manager, hypervisor)
         self._nios = {}
         self._mappings = {}
+        if ports is None:
+            # create 8 ports by default
+            self._ports = []
+            for port_number in range(1, 9):
+                self._ports.append({"port_number": port_number,
+                                    "name": "Ethernet{}".format(port_number),
+                                    "type": "access",
+                                    "vlan": 1})
+        else:
+            self._ports = ports
 
     def __json__(self):
 
         ethernet_switch_info = {"name": self.name,
-                                "device_id": self.id,
-                                "project_id": self.project.id}
+                                "node_id": self.id,
+                                "project_id": self.project.id,
+                                "ports": self._ports,
+                                "status": "started"}
 
-        ports = []
-        for port_number, settings in self._mappings.items():
-            ports.append({"port": port_number,
-                          "type": settings[0],
-                          "vlan": settings[1],
-                          "ethertype": settings[2] if len(settings) > 2 else ""})
-
-        ethernet_switch_info["ports"] = ports
+        # ports = []
+        # for port_number, settings in self._mappings.items():
+        #     ports.append({"port": port_number,
+        #                   "type": settings[0],
+        #                   "vlan": settings[1],
+        #                   "ethertype": settings[2] if len(settings) > 2 else ""})
+        #
+        # ethernet_switch_info["ports"] = ports
         return ethernet_switch_info
 
+    @property
+    def ports(self):
+        """
+        Ports on this switch
+
+        :returns: ports info
+        """
+
+        return self._ports
+
+    @ports.setter
+    def ports(self, ports):
+        """
+        Set the ports on this switch
+
+        :param ports: ports info
+        """
+
+        self._ports = ports
+
     @asyncio.coroutine
     def create(self):
 
@@ -149,6 +182,10 @@ class EthernetSwitch(Device):
                                                                                           nio=nio,
                                                                                           port=port_number))
         self._nios[port_number] = nio
+        for port_settings in self._ports:
+            if port_settings["port_number"] == port_number:
+                yield from self.set_port_settings(port_number, port_settings)
+                break
 
     @asyncio.coroutine
     def remove_nio(self, port_number):