Merge branch '2.0' into 2.1

tests/compute/docker/test_docker_vm.py

@@ -879,7 +879,7 @@ def test_start_aux(vm, loop):
 
     with asyncio_patch("asyncio.subprocess.create_subprocess_exec", return_value=MagicMock()) as mock_exec:
         loop.run_until_complete(asyncio.async(vm._start_aux()))
-    mock_exec.assert_called_with('docker', 'exec', '-i', 'e90e34656842', '/gns3/bin/busybox', 'script', '-qfc', 'while true; do /gns3/bin/busybox sh; done', '/dev/null', stderr=asyncio.subprocess.STDOUT, stdin=asyncio.subprocess.PIPE, stdout=asyncio.subprocess.PIPE)
+    mock_exec.assert_called_with('docker', 'exec', '-i', 'e90e34656842', '/gns3/bin/busybox', 'script', '-qfc', 'while true; do TERM=vt100 /gns3/bin/busybox sh; done', '/dev/null', stderr=asyncio.subprocess.STDOUT, stdin=asyncio.subprocess.PIPE, stdout=asyncio.subprocess.PIPE)
 
 
 def test_create_network_interfaces(vm):

tests/controller/test_compute.py

@@ -360,8 +360,10 @@ def test_images(compute, async_run, images_dir):
         images = async_run(compute.images("qemu"))
         mock.assert_called_with("GET", "https://example.com:84/v2/compute/qemu/images", auth=None, data=None, headers={'content-type': 'application/json'}, chunked=False, timeout=None)
 
-    assert images == [{"filename": "linux.qcow2", "path": "linux.qcow2", "md5sum": "d41d8cd98f00b204e9800998ecf8427e", "filesize": 0},
-                      {"filename": "asa.qcow2", "path": "asa.qcow2", "md5sum": "d41d8cd98f00b204e9800998ecf8427e", "filesize": 0}]
+    assert images == [
+        {"filename": "asa.qcow2", "path": "asa.qcow2", "md5sum": "d41d8cd98f00b204e9800998ecf8427e", "filesize": 0},
+        {"filename": "linux.qcow2", "path": "linux.qcow2", "md5sum": "d41d8cd98f00b204e9800998ecf8427e", "filesize": 0}
+    ]
 
 
 def test_list_files(project, async_run, compute):

tests/controller/test_import_project.py

@@ -252,6 +252,50 @@ def test_import_iou_linux_with_vm(linux_platform, async_run, tmpdir, controller)
         assert topo["topology"]["nodes"][0]["compute_id"] == "vm"
 
 
+def test_import_nat_non_linux(windows_platform, async_run, tmpdir, controller):
+    """
+    On non linux host NAT should be moved to the GNS3 VM
+    """
+    project_id = str(uuid.uuid4())
+    controller._computes["vm"] = AsyncioMagicMock()
+
+    topology = {
+        "project_id": str(uuid.uuid4()),
+        "name": "test",
+        "type": "topology",
+        "topology": {
+            "nodes": [
+                {
+                    "compute_id": "local",
+                    "node_id": "0fd3dd4d-dc93-4a04-a9b9-7396a9e22e8b",
+                    "node_type": "nat",
+                    "name": "test",
+                    "properties": {}
+                }
+            ],
+            "links": [],
+            "computes": [],
+            "drawings": []
+        },
+        "revision": 5,
+        "version": "2.0.0"
+    }
+
+    with open(str(tmpdir / "project.gns3"), 'w+') as f:
+        json.dump(topology, f)
+
+    zip_path = str(tmpdir / "project.zip")
+    with zipfile.ZipFile(zip_path, 'w') as myzip:
+        myzip.write(str(tmpdir / "project.gns3"), "project.gns3")
+
+    with open(zip_path, "rb") as f:
+        project = async_run(import_project(controller, project_id, f))
+
+    with open(os.path.join(project.path, "test.gns3")) as f:
+        topo = json.load(f)
+        assert topo["topology"]["nodes"][0]["compute_id"] == "vm"
+
+
 def test_import_iou_non_linux(windows_platform, async_run, tmpdir, controller):
     """
     On non linux host IOU should be moved to the GNS3 VM

tests/controller/test_node_port_name.py

@@ -548,8 +548,8 @@ def test_list_ports_dynamips(project, compute):
             "link_type": "ethernet"
         },
         {
-            "name": "Serial0/16",
-            "short_name": "s0/16",
+            "name": "Serial0/0",
+            "short_name": "s0/0",
             "data_link_types": {
                 "Cisco HDLC": "DLT_C_HDLC",
                 "Cisco PPP": "DLT_PPP_SERIAL",
@@ -559,8 +559,8 @@ def test_list_ports_dynamips(project, compute):
             "link_type": "serial"
         },
         {
-            "name": "Serial0/17",
-            "short_name": "s0/17",
+            "name": "Serial0/1",
+            "short_name": "s0/1",
             "data_link_types": {
                 "Cisco HDLC": "DLT_C_HDLC",
                 "Cisco PPP": "DLT_PPP_SERIAL",
@@ -570,24 +570,24 @@ def test_list_ports_dynamips(project, compute):
             "link_type": "serial"
         },
         {
-            "name": "Serial0/18",
-            "short_name": "s0/18",
+            "name": "Serial0/2",
+            "short_name": "s0/2",
             "data_link_types": {
                 "Cisco HDLC": "DLT_C_HDLC",
                 "Cisco PPP": "DLT_PPP_SERIAL",
                 "Frame Relay": "DLT_FRELAY"},
-            "port_number": 18,
+            "port_number": 32,
             "adapter_number": 0,
             "link_type": "serial"
         },
         {
-            "name": "Serial0/19",
-            "short_name": "s0/19",
+            "name": "Serial0/3",
+            "short_name": "s0/3",
             "data_link_types": {
                 "Cisco HDLC": "DLT_C_HDLC",
                 "Cisco PPP": "DLT_PPP_SERIAL",
                 "Frame Relay": "DLT_FRELAY"},
-            "port_number": 19,
+            "port_number": 33,
             "adapter_number": 0,
             "link_type": "serial"
         }