Merge branch '2.1' into 2.2

# Conflicts:
#	gns3server/version.py
#	requirements.txt

tests/compute/dynamips/test_ethernet_switch.py

@@ -20,7 +20,7 @@ from gns3server.compute.dynamips.nodes.ethernet_switch import EthernetSwitchCons
 from gns3server.compute.nios.nio_udp import NIOUDP
 
 
-def test_arp_command(async_run):
+def test_mac_command(async_run):
     node = AsyncioMagicMock()
     node.name = "Test"
     node.nios = {}
@@ -30,7 +30,7 @@ def test_arp_command(async_run):
     node.nios[1].name = "Ethernet1"
     node._hypervisor.send = AsyncioMagicMock(return_value=["0050.7966.6801  1  Ethernet0", "0050.7966.6802  1  Ethernet1"])
     console = EthernetSwitchConsole(node)
-    assert async_run(console.arp()) == \
+    assert async_run(console.mac()) == \
         "Port       Mac                VLAN\n" \
         "Ethernet0  00:50:79:66:68:01  1\n" \
         "Ethernet1  00:50:79:66:68:02  1\n"

tests/compute/test_manager.py

@@ -229,7 +229,7 @@ def test_list_images(loop, qemu, tmpdir):
             f.write("1")
 
     with patch("gns3server.utils.images.default_images_directory", return_value=str(tmpdir)):
-        assert loop.run_until_complete(qemu.list_images()) == [
+        assert sorted(loop.run_until_complete(qemu.list_images()), key=lambda k: k['filename']) == [
             {"filename": "a.qcow2", "path": "a.qcow2", "md5sum": "c4ca4238a0b923820dcc509a6f75849b", "filesize": 1},
             {"filename": "b.qcow2", "path": "b.qcow2", "md5sum": "c4ca4238a0b923820dcc509a6f75849b", "filesize": 1}
         ]
@@ -249,7 +249,7 @@ def test_list_images_recursives(loop, qemu, tmpdir):
 
     with patch("gns3server.utils.images.default_images_directory", return_value=str(tmpdir)):
 
-        assert loop.run_until_complete(qemu.list_images()) == [
+        assert sorted(loop.run_until_complete(qemu.list_images()), key=lambda k: k['filename']) == [
             {"filename": "a.qcow2", "path": "a.qcow2", "md5sum": "c4ca4238a0b923820dcc509a6f75849b", "filesize": 1},
             {"filename": "b.qcow2", "path": "b.qcow2", "md5sum": "c4ca4238a0b923820dcc509a6f75849b", "filesize": 1},
             {"filename": "c.qcow2", "path": force_unix_path(os.path.sep.join(["c", "c.qcow2"])), "md5sum": "c4ca4238a0b923820dcc509a6f75849b", "filesize": 1}

tests/controller/test_controller.py

@@ -388,9 +388,10 @@ def test_start_vm(controller, async_run):
         "vmname": "GNS3 VM"
     }
     with asyncio_patch("gns3server.controller.gns3vm.vmware_gns3_vm.VMwareGNS3VM.start") as mock:
-        with asyncio_patch("gns3server.controller.compute.Compute.connect") as mock_connect:
-            async_run(controller.start())
-            assert mock.called
+        with asyncio_patch("gns3server.controller.gns3vm.GNS3VM._check_network") as mock_check_network:
+            with asyncio_patch("gns3server.controller.compute.Compute.connect") as mock_connect:
+                async_run(controller.start())
+                assert mock.called
     assert "local" in controller.computes
     assert "vm" in controller.computes
     assert len(controller.computes) == 2  # Local compute and vm are created

tests/controller/test_gns3vm.py

@@ -70,7 +70,8 @@ def test_update_settings(controller, async_run):
         "vmname": "GNS3 VM"
     }
     with asyncio_patch("gns3server.controller.gns3vm.vmware_gns3_vm.VMwareGNS3VM.start"):
-        async_run(vm.auto_start_vm())
+        with asyncio_patch("gns3server.controller.gns3vm.GNS3VM._check_network") as mock_check_network:
+            async_run(vm.auto_start_vm())
     assert "vm" in controller.computes
     async_run(vm.update_settings({"enable": False}))
     assert "vm" not in controller.computes
@@ -80,7 +81,9 @@ def test_auto_start(async_run, controller, dummy_gns3vm, dummy_engine):
     """
     When start the compute should be add to the controller
     """
-    async_run(dummy_gns3vm.auto_start_vm())
+
+    with asyncio_patch("gns3server.controller.gns3vm.GNS3VM._check_network") as mock_check_network:
+        async_run(dummy_gns3vm.auto_start_vm())
     assert dummy_engine.start.called
     assert controller.computes["vm"].name == "GNS3 VM (Test VM)"
     assert controller.computes["vm"].host == "vm.local"

tests/controller/test_node.py

@@ -195,7 +195,7 @@ def test_create(node, compute, project, async_run):
         "startup_script": "echo test",
         "name": "demo"
     }
-    compute.post.assert_called_with("/projects/{}/vpcs/nodes".format(node.project.id), data=data, timeout=120)
+    compute.post.assert_called_with("/projects/{}/vpcs/nodes".format(node.project.id), data=data, timeout=1200)
     assert node._console == 2048
     assert node._properties == {"startup_script": "echo test"}
 
@@ -244,7 +244,7 @@ def test_create_base_script(node, config, compute, tmpdir, async_run):
         "startup_script": "hostname test",
         "name": "demo"
     }
-    compute.post.assert_called_with("/projects/{}/vpcs/nodes".format(node.project.id), data=data, timeout=120)
+    compute.post.assert_called_with("/projects/{}/vpcs/nodes".format(node.project.id), data=data, timeout=1200)
 
 
 def test_symbol(node, symbols_dir):
@@ -445,7 +445,7 @@ def test_create_without_console(node, compute, project, async_run):
         "startup_script": "echo test",
         "name": "demo"
     }
-    compute.post.assert_called_with("/projects/{}/vpcs/nodes".format(node.project.id), data=data, timeout=120)
+    compute.post.assert_called_with("/projects/{}/vpcs/nodes".format(node.project.id), data=data, timeout=1200)
     assert node._console == 2048
     assert node._properties == {"test_value": "success", "startup_script": "echo test"}
 

tests/controller/test_project.py

@@ -153,7 +153,7 @@ def test_add_node_local(async_run, controller):
                                  data={'node_id': node.id,
                                        'startup_script': 'test.cfg',
                                        'name': 'test'},
-                                 timeout=120)
+                                 timeout=1200)
     assert compute in project._project_created_on_compute
     controller.notification.emit.assert_any_call("node.created", node.__json__())
 
@@ -181,7 +181,7 @@ def test_add_node_non_local(async_run, controller):
                                  data={'node_id': node.id,
                                        'startup_script': 'test.cfg',
                                        'name': 'test'},
-                                 timeout=120)
+                                 timeout=1200)
     assert compute in project._project_created_on_compute
     controller.notification.emit.assert_any_call("node.created", node.__json__())
 
@@ -222,7 +222,7 @@ def test_add_node_from_appliance(async_run, controller):
                                        'name': 'Test-1',
                                        'a': 1,
                                        },
-                                 timeout=120)
+                                 timeout=1200)
     assert compute in project._project_created_on_compute
     controller.notification.emit.assert_any_call("node.created", node.__json__())
 
@@ -233,7 +233,7 @@ def test_add_node_from_appliance(async_run, controller):
                                        'name': 'Test-2',
                                        'a': 1
                                        },
-                                 timeout=120)
+                                 timeout=1200)
 
 
 def test_delete_node(async_run, controller):

tests/handlers/api/controller/test_drawing.py

@@ -50,6 +50,19 @@ def test_create_drawing(http_controller, tmpdir, project, async_run):
     assert response.json["drawing_id"] is not None
 
 
+def test_get_drawing(http_controller, tmpdir, project, async_run):
+
+    response = http_controller.post("/projects/{}/drawings".format(project.id), {
+        "svg": '<svg height="210" width="500"><line x1="0" y1="0" x2="200" y2="200" style="stroke:rgb(255,0,0);stroke-width:2" /></svg>',
+        "x": 10,
+        "y": 20,
+        "z": 0
+    },)
+    response = http_controller.get("/projects/{}/drawings/{}".format(project.id, response.json["drawing_id"]), example=True)
+    assert response.status == 200
+    assert response.json["x"] == 10
+
+
 def test_update_drawing(http_controller, tmpdir, project, async_run):
 
     response = http_controller.post("/projects/{}/drawings".format(project.id), {

tests/handlers/api/controller/test_link.py

@@ -128,6 +128,43 @@ def test_create_link_failure(http_controller, tmpdir, project, compute, async_ru
     assert len(project.links) == 0
 
 
+def test_get_link(http_controller, tmpdir, project, compute, async_run):
+    response = MagicMock()
+    response.json = {"console": 2048}
+    compute.post = AsyncioMagicMock(return_value=response)
+
+    node1 = async_run(project.add_node(compute, "node1", None, node_type="qemu"))
+    node1._ports = [EthernetPort("E0", 0, 0, 3)]
+    node2 = async_run(project.add_node(compute, "node2", None, node_type="qemu"))
+    node2._ports = [EthernetPort("E0", 0, 2, 4)]
+
+    with asyncio_patch("gns3server.controller.udp_link.UDPLink.create"):
+        response = http_controller.post("/projects/{}/links".format(project.id), {
+            "nodes": [
+                {
+                    "node_id": node1.id,
+                    "adapter_number": 0,
+                    "port_number": 3,
+                    "label": {
+                        "text": "Text",
+                        "x": 42,
+                        "y": 0
+                    }
+                },
+                {
+                    "node_id": node2.id,
+                    "adapter_number": 2,
+                    "port_number": 4
+                }
+            ]
+        })
+    link_id = response.json["link_id"]
+    assert response.json["nodes"][0]["label"]["x"] == 42
+    response = http_controller.get("/projects/{}/links/{}".format(project.id, link_id), example=True)
+    assert response.status == 200
+    assert response.json["nodes"][0]["label"]["x"] == 42
+
+
 def test_update_link_suspend(http_controller, tmpdir, project, compute, async_run):
     response = MagicMock()
     response.json = {"console": 2048}
@@ -242,7 +279,7 @@ def test_update_link(http_controller, tmpdir, project, compute, async_run):
             }
         ],
         "filters": filters
-    })
+    }, example=True)
     assert response.status == 201
     assert response.json["nodes"][0]["label"]["x"] == 64
     assert list(project.links.values())[0].filters == filters

tests/handlers/api/controller/test_version.py

@@ -45,7 +45,8 @@ def test_version_invalid_input(http_controller):
     query = {'version': "0.4.2"}
     response = http_controller.post('/version', query)
     assert response.status == 409
-    assert response.json == {'message': 'Client version 0.4.2 differs with server version {}'.format(__version__),
+
+    assert response.json == {'message': 'Client version 0.4.2 is not the same as server version {}'.format(__version__),
                              'status': 409}