Dissallow serial to ethernet connection

Fix #678

gns3server/controller/link.py

@@ -42,6 +42,7 @@ class Link:
         self._capture_file_name = None
         self._streaming_pcap = None
         self._created = False
+        self._link_type = "ethernet"
 
     @property
     def created(self):
@@ -56,11 +57,19 @@ class Link:
         Add a node to the link
         """
 
+        port = node.get_port(adapter_number, port_number)
+        self._link_type = port.link_type
+
         for other_node in self._nodes:
             if node.node_type in ["nat", "cloud"]:
                 if other_node["node"].node_type in ["nat", "cloud"]:
                     raise aiohttp.web.HTTPConflict(text="It's not allowed to connect a {} to a {}".format(other_node["node"].node_type, node.node_type))
 
+            # Check if user is not connecting serial => ethernet
+            other_port = other_node["node"].get_port(other_node["adapter_number"], other_node["port_number"])
+            if port.link_type != other_port.link_type:
+                raise aiohttp.web.HTTPConflict(text="It's not allowed to connect a {} to a {}".format(other_port.link_type, port.link_type))
+
         if label is None:
             label = {
                 "x": -10,
@@ -225,5 +234,6 @@ class Link:
             "project_id": self._project.id,
             "capturing": self._capturing,
             "capture_file_name": self._capture_file_name,
-            "capture_file_path": self.capture_file_path
+            "capture_file_path": self.capture_file_path,
+            "link_type": self._link_type
         }

gns3server/controller/node.py

@@ -70,6 +70,7 @@ class Node:
         self._x = 0
         self._y = 0
         self._z = 0
+        self._ports = None
         self._symbol = None
         if node_type == "iou":
             self._port_name_format = "Ethernet{segment0}/{port0}"
@@ -159,6 +160,12 @@ class Node:
         """
         return self._compute.host
 
+    @property
+    def ports(self):
+        if self._ports is None:
+            self._list_ports()
+        return self._ports
+
     @property
     def x(self):
         return self._x
@@ -303,6 +310,7 @@ class Node:
                 else:
                     setattr(self, prop, kwargs[prop])
 
+        self._list_ports()
         # We send notif only if object has changed
         if old_json != self.__json__():
             self.project.controller.notification.emit("node.updated", self.__json__())
@@ -333,6 +341,7 @@ class Node:
                 pass
             else:
                 self._properties[key] = value
+        self._list_ports()
 
     def _node_data(self, properties=None):
         """
@@ -457,26 +466,38 @@ class Node:
         """
         return (yield from self._compute.get("/projects/{}/{}/nodes/{}/idlepc_proposals".format(self._project.id, self._node_type, self._id), timeout=240)).json
 
+    def get_port(self, adapter_number, port_number):
+        """
+        Return the port for this adapter_number and port_number
+        or raise an HTTPNotFound
+        """
+        for port in self.ports:
+            if port.adapter_number == adapter_number and port.port_number == port_number:
+                return port
+        raise aiohttp.web.HTTPNotFound(text="Port {}/{} for {} not found".format(adapter_number, port_number, self.name))
+
     def _list_ports(self):
         """
         Generate the list of port display in the client
         if the compute has sent a list we return it (use by
         node where you can not personnalize the port naming).
         """
-        ports = []
+        self._ports = []
         # Some special cases
         if self._node_type == "atm_switch":
             for adapter_number in range(0, len(self.properties["mappings"])):
-                ports.append(PortFactory("ATM{}".format(adapter_number), adapter_number, adapter_number, 0, "atm"))
-            return ports
+                self._ports.append(PortFactory("ATM{}".format(adapter_number), adapter_number, adapter_number, 0, "atm"))
+            return
         elif self._node_type == "frame_relay_switch":
             for adapter_number in range(0, len(self.properties["mappings"])):
-                ports.append(PortFactory("FrameRelay{}".format(adapter_number), adapter_number, adapter_number, 0, "frame_relay"))
-            return ports
+                self._ports.append(PortFactory("FrameRelay{}".format(adapter_number), adapter_number, adapter_number, 0, "frame_relay"))
+            return
         elif self._node_type == "dynamips":
-            return DynamipsPortFactory(self.properties)
+            self._ports = DynamipsPortFactory(self.properties)
+            return
         else:
-            return StandardPortFactory(self.properties, self._port_by_adapter, self._first_port_name, self._port_name_format, self._port_segment_size)
+            self._ports = StandardPortFactory(self.properties, self._port_by_adapter, self._first_port_name, self._port_name_format, self._port_segment_size)
+            return
 
     def __repr__(self):
         return "<gns3server.controller.Node {} {}>".format(self._node_type, self._name)
@@ -533,5 +554,5 @@ class Node:
             "port_name_format": self._port_name_format,
             "port_segment_size": self._port_segment_size,
             "first_port_name": self._first_port_name,
-            "ports": [port.__json__() for port in self._list_ports()]
+            "ports": [port.__json__() for port in self.ports]
         }

gns3server/controller/ports/atm_port.py

@@ -19,43 +19,31 @@
 ATM port for ATM link end points.
 """
 
-from .port import Port
+from .serial_port import SerialPort
 
 
-class ATMPort(Port):
+class ATMPort(SerialPort):
 
     @staticmethod
-    def longNameType():
+    def long_name_type():
         """
         Returns the long name type for this port.
 
         :returns: string
         """
-
         return "ATM"
 
-    @staticmethod
-    def shortNameType():
+    @property
+    def short_name_type(self):
         """
         Returns the short name type for this port.
 
         :returns: string
         """
-
         return "a"
 
-    @staticmethod
-    def linkType():
-        """
-        Returns the link type to be used to connect this port.
-
-        :returns: string
-        """
-
-        return "Serial"
-
-    @staticmethod
-    def dataLinkTypes():
+    @property
+    def data_link_types(self):
         """
         Returns the supported PCAP DLTs.
 

gns3server/controller/ports/ethernet_port.py

@@ -30,7 +30,7 @@ class EthernetPort(Port):
     """
 
     @staticmethod
-    def longNameType():
+    def long_name_type():
         """
         Returns the long name type for this port.
 
@@ -39,8 +39,8 @@ class EthernetPort(Port):
 
         return "Ethernet"
 
-    @staticmethod
-    def shortNameType():
+    @property
+    def short_name_type(self):
         """
         Returns the short name type for this port.
 

gns3server/controller/ports/fastethernet_port.py

@@ -25,7 +25,7 @@ from .port import Port
 class FastEthernetPort(Port):
 
     @staticmethod
-    def longNameType():
+    def long_name_type():
         """
         Returns the long name type for this port.
 
@@ -34,8 +34,8 @@ class FastEthernetPort(Port):
 
         return "FastEthernet"
 
-    @staticmethod
-    def shortNameType():
+    @property
+    def short_name_type(self):
         """
         Returns the short name type for this port.
 

gns3server/controller/ports/frame_relay_port.py

@@ -25,7 +25,7 @@ from .serial_port import SerialPort
 class FrameRelayPort(SerialPort):
 
     @staticmethod
-    def longNameType():
+    def long_name_type():
         """
         Returns the long name type for this port.
 
@@ -34,8 +34,8 @@ class FrameRelayPort(SerialPort):
 
         return "FrameRelay"
 
-    @staticmethod
-    def dataLinkTypes():
+    @property
+    def data_link_types(self):
         """
         Returns the supported PCAP DLTs.
 

gns3server/controller/ports/gigabitethernet_port.py

@@ -25,7 +25,7 @@ from .port import Port
 class GigabitEthernetPort(Port):
 
     @staticmethod
-    def longNameType():
+    def long_name_type():
         """
         Returns the long name type for this port.
 
@@ -34,8 +34,8 @@ class GigabitEthernetPort(Port):
 
         return "GigabitEthernet"
 
-    @staticmethod
-    def shortNameType():
+    @property
+    def short_name_type(self):
         """
         Returns the short name type for this port.
 

gns3server/controller/ports/port.py

@@ -27,8 +27,16 @@ class Port:
         self._port_number = port_number
         self._name = name
 
-    @staticmethod
-    def dataLinkTypes():
+    @property
+    def adapter_number(self):
+        return self._adapter_number
+
+    @property
+    def port_number(self):
+        return self._port_number
+
+    @property
+    def data_link_types(self):
         """
         Returns the supported PCAP DLTs.
 
@@ -36,16 +44,16 @@ class Port:
         """
         return {"Ethernet": "DLT_EN10MB"}
 
-    @staticmethod
-    def linkType():
-        return "Ethernet"
+    @property
+    def link_type(self):
+        return "ethernet"
 
     def __json__(self):
         return {
             "name": self._name,
-            "short_name": self.shortNameType() + "{}/{}".format(self._interface_number, self._port_number),
-            "data_link_types": self.dataLinkTypes(),
+            "short_name": self.short_name_type + "{}/{}".format(self._interface_number, self._port_number),
+            "data_link_types": self.data_link_types,
             "port_number": self._port_number,
             "adapter_number": self._adapter_number,
-            "link_type": self.linkType().lower()
+            "link_type": self.link_type
         }

gns3server/controller/ports/port_factory.py

@@ -183,7 +183,7 @@ class DynamipsPortFactory:
                     interface_numbers.setdefault(port_class, 0)
                     interface_number = interface_numbers[port_class]
                     for port_number in range(0, cls.ADAPTER_MATRIX[properties[name]]["nb_ports"]):
-                        name = "{}{}/{}".format(port_class.longNameType(), interface_number, port_number)
+                        name = "{}{}/{}".format(port_class.long_name_type(), interface_number, port_number)
                         ports.append(port_class(name, interface_number, adapter_number, port_number))
                     interface_numbers[port_class] += 1
                 adapter_number += 1
@@ -191,7 +191,7 @@ class DynamipsPortFactory:
                 port_class = cls.WIC_MATRIX[properties[name]]["port"]
                 if port_class:
                     for port_number in range(0, cls.WIC_MATRIX[properties[name]]["nb_ports"]):
-                        name = "{}{}/{}".format(port_class.longNameType(), 0, wic_port_number)
+                        name = "{}{}/{}".format(port_class.long_name_type(), 0, wic_port_number)
                         ports.append(port_class(name, 0, 0, wic_port_number))
                         wic_port_number += 1
         return ports

gns3server/controller/ports/pos_port.py

@@ -19,43 +19,31 @@
 POS port for Packet over SONET link end points.
 """
 
-from .port import Port
+from .serial_port import SerialPort
 
 
-class POSPort(Port):
+class POSPort(SerialPort):
 
     @staticmethod
-    def longNameType():
+    def long_name_type():
         """
         Returns the long name type for this port.
 
         :returns: string
         """
-
         return "POS"
 
-    @staticmethod
-    def shortNameType():
+    @property
+    def short_name_type(self):
         """
         Returns the short name type for this port.
 
         :returns: string
         """
-
         return "p"
 
-    @staticmethod
-    def linkType():
-        """
-        Returns the link type to be used to connect this port.
-
-        :returns: string
-        """
-
-        return "Serial"
-
-    @staticmethod
-    def dataLinkTypes():
+    @property
+    def data_link_types(self):
         """
         Returns the supported PCAP DLTs.
 

gns3server/controller/ports/serial_port.py

@@ -25,7 +25,7 @@ from .port import Port
 class SerialPort(Port):
 
     @staticmethod
-    def longNameType():
+    def long_name_type():
         """
         Returns the long name type for this port.
 
@@ -34,8 +34,8 @@ class SerialPort(Port):
 
         return "Serial"
 
-    @staticmethod
-    def shortNameType():
+    @property
+    def short_name_type(self):
         """
         Returns the short name type for this port.
 
@@ -44,18 +44,18 @@ class SerialPort(Port):
 
         return "s"
 
-    @staticmethod
-    def linkType():
+    @property
+    def link_type(self):
         """
         Returns the link type to be used to connect this port.
 
         :returns: string
         """
 
-        return "Serial"
+        return "serial"
 
-    @staticmethod
-    def dataLinkTypes():
+    @property
+    def data_link_types(self):
         """
         Returns the supported PCAP DLTs.