Dissallow serial to ethernet connection

Fix #678

tests/controller/test_link.py

@@ -24,6 +24,8 @@ from unittest.mock import MagicMock
 
 from gns3server.controller.link import Link
 from gns3server.controller.node import Node
+from gns3server.controller.ports.ethernet_port import EthernetPort
+from gns3server.controller.ports.serial_port import SerialPort
 from gns3server.controller.compute import Compute
 from gns3server.controller.project import Project
 
@@ -43,7 +45,9 @@ def compute():
 @pytest.fixture
 def link(async_run, project, compute):
     node1 = Node(project, compute, "node1", node_type="qemu")
+    node1._ports = [EthernetPort("E0", 0, 0, 4)]
     node2 = Node(project, compute, "node2", node_type="qemu")
+    node2._ports = [EthernetPort("E0", 0, 1, 3)]
 
     link = Link(project)
     link.create = AsyncioMagicMock()
@@ -60,6 +64,7 @@ def test_eq(project, link, controller):
 
 def test_add_node(async_run, project, compute):
     node1 = Node(project, compute, "node1", node_type="qemu")
+    node1._ports = [EthernetPort("E0", 0, 0, 4)]
 
     link = Link(project)
     link.create = AsyncioMagicMock()
@@ -87,6 +92,7 @@ def test_add_node(async_run, project, compute):
 
     # We call link.created only when both side are created
     node2 = Node(project, compute, "node2", node_type="qemu")
+    node2._ports = [EthernetPort("E0", 0, 0, 4)]
     async_run(link.add_node(node2, 0, 4))
 
     assert link.create.called
@@ -95,7 +101,9 @@ def test_add_node(async_run, project, compute):
 
 def test_add_node_cloud(async_run, project, compute):
     node1 = Node(project, compute, "node1", node_type="qemu")
+    node1._ports = [EthernetPort("E0", 0, 0, 4)]
     node2 = Node(project, compute, "node2", node_type="cloud")
+    node2._ports = [EthernetPort("E0", 0, 0, 4)]
 
     link = Link(project)
     link.create = AsyncioMagicMock()
@@ -110,7 +118,9 @@ def test_add_node_cloud_to_cloud(async_run, project, compute):
     Cloud to cloud connection is not allowed
     """
     node1 = Node(project, compute, "node1", node_type="cloud")
+    node1._ports = [EthernetPort("E0", 0, 0, 4)]
     node2 = Node(project, compute, "node2", node_type="cloud")
+    node2._ports = [EthernetPort("E0", 0, 0, 4)]
 
     link = Link(project)
     link.create = AsyncioMagicMock()
@@ -121,9 +131,29 @@ def test_add_node_cloud_to_cloud(async_run, project, compute):
         async_run(link.add_node(node2, 0, 4))
 
 
-def test_json(async_run, project, compute):
+def test_add_node_serial_to_ethernet(async_run, project, compute):
+    """
+    Serial to ethernet connection is not allowed
+    """
     node1 = Node(project, compute, "node1", node_type="qemu")
+    node1._ports = [EthernetPort("E0", 0, 0, 4)]
     node2 = Node(project, compute, "node2", node_type="qemu")
+    node2._ports = [SerialPort("E0", 0, 0, 4)]
+
+    link = Link(project)
+    link.create = AsyncioMagicMock()
+    link._project.controller.notification.emit = MagicMock()
+
+    async_run(link.add_node(node1, 0, 4))
+    with pytest.raises(aiohttp.web.HTTPConflict):
+        async_run(link.add_node(node2, 0, 4))
+
+
+def test_json(async_run, project, compute, link):
+    node1 = Node(project, compute, "node1", node_type="qemu")
+    node1._ports = [EthernetPort("E0", 0, 0, 4)]
+    node2 = Node(project, compute, "node2", node_type="qemu")
+    node2._ports = [EthernetPort("E0", 0, 1, 3)]
 
     link = Link(project)
     link.create = AsyncioMagicMock()
@@ -158,6 +188,7 @@ def test_json(async_run, project, compute):
                 }
             }
         ],
+        "link_type": "ethernet",
         "capturing": False,
         "capture_file_name": None,
         "capture_file_path": None
@@ -193,6 +224,19 @@ def test_json(async_run, project, compute):
     }
 
 
+def test_json_serial_link(async_run, project, compute, link):
+    node1 = Node(project, compute, "node1", node_type="qemu")
+    node1._ports = [SerialPort("S0", 0, 0, 4)]
+    node2 = Node(project, compute, "node2", node_type="qemu")
+    node2._ports = [SerialPort("S0", 0, 1, 3)]
+
+    link = Link(project)
+    link.create = AsyncioMagicMock()
+    async_run(link.add_node(node1, 0, 4))
+    async_run(link.add_node(node2, 1, 3))
+    assert link.__json__()["link_type"] == "serial"
+
+
 def test_start_streaming_pcap(link, async_run, tmpdir, project):
     @asyncio.coroutine
     def fake_reader():
@@ -212,7 +256,9 @@ def test_start_streaming_pcap(link, async_run, tmpdir, project):
 
 def test_default_capture_file_name(project, compute, async_run):
     node1 = Node(project, compute, "Hello@", node_type="qemu")
+    node1._ports = [EthernetPort("E0", 0, 0, 4)]
     node2 = Node(project, compute, "w0.rld", node_type="qemu")
+    node2._ports = [EthernetPort("E0", 0, 1, 3)]
 
     link = Link(project)
     link.create = AsyncioMagicMock()

tests/controller/test_node.py

@@ -15,6 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import aiohttp
 import pytest
 import uuid
 import asyncio
@@ -420,3 +421,15 @@ def test_update_label(node):
     node.label = {"text": "Wrong", "x": 12}
     assert node.label["text"] == "Test"
     assert node.label["x"] == 12
+
+
+def test_get_port(node):
+    node.properties["adapters"] = 2
+    node._list_ports()
+    port = node.get_port(0, 0)
+    assert port.adapter_number == 0
+    assert port.port_number == 0
+    port = node.get_port(1, 0)
+    assert port.adapter_number == 1
+    with pytest.raises(aiohttp.web.HTTPNotFound):
+        port = node.get_port(42, 0)

tests/controller/test_node_port_name.py

@@ -68,20 +68,25 @@ def test_list_ports_port_name_format(node):
     """
     node._first_port_name = None
     node._port_name_format = "eth{}"
+    node._list_ports()
     assert node.__json__()["ports"][0]["name"] == "eth0"
     node._port_name_format = "eth{port0}"
+    node._list_ports()
     assert node.__json__()["ports"][0]["name"] == "eth0"
     node._port_name_format = "eth{port1}"
+    node._list_ports()
     assert node.__json__()["ports"][0]["name"] == "eth1"
 
     node._first_port_name = ""
     node._port_segment_size = 2
     node._port_name_format = "eth{segment0}/{port0}"
     node.properties["adapters"] = 8
+    node._list_ports()
     assert node.__json__()["ports"][6]["name"] == "eth3/0"
     assert node.__json__()["ports"][7]["name"] == "eth3/1"
 
     node._first_port_name = "mgnt0"
+    node._list_ports()
     assert node.__json__()["ports"][0]["name"] == "mgnt0"
     assert node.__json__()["ports"][1]["name"] == "eth0/0"
 

tests/controller/test_project.py

@@ -28,6 +28,7 @@ from unittest.mock import patch
 from uuid import uuid4
 
 from gns3server.controller.project import Project
+from gns3server.controller.ports.ethernet_port import EthernetPort
 from gns3server.config import Config
 
 
@@ -250,7 +251,9 @@ def test_addLink(async_run, project, controller):
     compute.post = AsyncioMagicMock(return_value=response)
 
     vm1 = async_run(project.add_node(compute, "test1", None, node_type="vpcs", properties={"startup_config": "test.cfg"}))
+    vm1._ports = [EthernetPort("E0", 0, 3, 1)]
     vm2 = async_run(project.add_node(compute, "test2", None, node_type="vpcs", properties={"startup_config": "test.cfg"}))
+    vm2._ports = [EthernetPort("E0", 0, 4, 2)]
     controller._notification = MagicMock()
     link = async_run(project.add_link())
     async_run(link.add_node(vm1, 3, 1))

tests/controller/test_udp_link.py

@@ -23,6 +23,7 @@ from tests.utils import asyncio_patch, AsyncioMagicMock
 
 from gns3server.controller.project import Project
 from gns3server.controller.udp_link import UDPLink
+from gns3server.controller.ports.ethernet_port import EthernetPort
 from gns3server.controller.node import Node
 
 
@@ -36,7 +37,9 @@ def test_create(async_run, project):
     compute2 = MagicMock()
 
     node1 = Node(project, compute1, "node1", node_type="vpcs")
+    node1._ports = [EthernetPort("E0", 0, 0, 4)]
     node2 = Node(project, compute2, "node2", node_type="vpcs")
+    node2._ports = [EthernetPort("E0", 0, 3, 1)]
 
     @asyncio.coroutine
     def subnet_callback(compute2):
@@ -95,7 +98,9 @@ def test_delete(async_run, project):
     compute2 = MagicMock()
 
     node1 = Node(project, compute1, "node1", node_type="vpcs")
+    node1._ports = [EthernetPort("E0", 0, 0, 4)]
     node2 = Node(project, compute2, "node2", node_type="vpcs")
+    node2._ports = [EthernetPort("E0", 0, 3, 1)]
 
     link = UDPLink(project)
     link.create = AsyncioMagicMock()
@@ -117,7 +122,9 @@ def test_choose_capture_side(async_run, project):
     compute2.id = "local"
 
     node_vpcs = Node(project, compute1, "node1", node_type="vpcs")
+    node_vpcs._ports = [EthernetPort("E0", 0, 0, 4)]
     node_iou = Node(project, compute2, "node2", node_type="iou")
+    node_iou._ports = [EthernetPort("E0", 0, 3, 1)]
 
     link = UDPLink(project)
     link.create = AsyncioMagicMock()
@@ -127,7 +134,9 @@ def test_choose_capture_side(async_run, project):
     assert link._choose_capture_side()["node"] == node_iou
 
     node_vpcs = Node(project, compute1, "node3", node_type="vpcs")
+    node_vpcs._ports = [EthernetPort("E0", 0, 0, 4)]
     node_vpcs2 = Node(project, compute1, "node4", node_type="vpcs")
+    node_vpcs2._ports = [EthernetPort("E0", 0, 3, 1)]
 
     link = UDPLink(project)
     link.create = AsyncioMagicMock()
@@ -136,7 +145,9 @@ def test_choose_capture_side(async_run, project):
 
     # Capture should run on the local node
     node_iou = Node(project, compute1, "node5", node_type="iou")
+    node_iou._ports = [EthernetPort("E0", 0, 0, 4)]
     node_iou2 = Node(project, compute2, "node6", node_type="iou")
+    node_iou2._ports = [EthernetPort("E0", 0, 3, 1)]
 
     link = UDPLink(project)
     link.create = AsyncioMagicMock()
@@ -150,7 +161,9 @@ def test_capture(async_run, project):
     compute1 = MagicMock()
 
     node_vpcs = Node(project, compute1, "V1", node_type="vpcs")
+    node_vpcs._ports = [EthernetPort("E0", 0, 0, 4)]
     node_iou = Node(project, compute1, "I1", node_type="iou")
+    node_iou._ports = [EthernetPort("E0", 0, 3, 1)]
 
     link = UDPLink(project)
     link.create = AsyncioMagicMock()