Merge branch 'master' into 1.5

tests/conftest.py

@@ -147,7 +147,9 @@ def run_around_tests(monkeypatch, port_manager):
     port_manager._instance = port_manager
     config = Config.instance()
     config.clear()
-    config.set("Server", "project_directory", tmppath)
+    os.makedirs(os.path.join(tmppath, 'projects'))
+    config.set("Server", "project_directory", os.path.join(tmppath, 'projects'))
+    config.set("Server", "images_path", os.path.join(tmppath, 'images'))
     config.set("Server", "auth", False)
 
     # Prevent executions of the VM if we forgot to mock something
@@ -158,7 +160,7 @@ def run_around_tests(monkeypatch, port_manager):
     # Force turn off KVM because it's not available on CI
     config.set("Qemu", "enable_kvm", False)
 
-    monkeypatch.setattr("gns3server.modules.project.Project._get_default_project_directory", lambda *args: tmppath)
+    monkeypatch.setattr("gns3server.modules.project.Project._get_default_project_directory", lambda *args: os.path.join(tmppath, 'projects'))
 
     # Force sys.platform to the original value. Because it seem not be restore correctly at each tests
     sys.platform = sys.original_platform

tests/handlers/api/test_project.py

@@ -207,9 +207,9 @@ def test_notification(server, project, loop):
     @asyncio.coroutine
     def go(future):
         response = yield from aiohttp.request("GET", server.get_url("/projects/{project_id}/notifications".format(project_id=project.id), 1))
-        response.body = yield from response.content.read(19)
+        response.body = yield from response.content.read(200)
         project.emit("vm.created", {"a": "b"})
-        response.body += yield from response.content.read(47)
+        response.body += yield from response.content.read(50)
         response.close()
         future.set_result(response)
 
@@ -217,7 +217,9 @@ def test_notification(server, project, loop):
     asyncio.async(go(future))
     response = loop.run_until_complete(future)
     assert response.status == 200
-    assert response.body == b'{"action": "ping"}\n{"action": "vm.created", "event": {"a": "b"}}\n'
+    assert b'"action": "ping"' in response.body
+    assert b'"cpu_usage_percent"' in response.body
+    assert b'{"action": "vm.created", "event": {"a": "b"}}\n' in response.body
 
 
 def test_notification_invalid_id(server):

tests/handlers/api/test_qemu.py

@@ -23,7 +23,6 @@ from tests.utils import asyncio_patch
 from unittest.mock import patch
 from gns3server.config import Config
 
-
 @pytest.fixture
 def fake_qemu_bin():
 
@@ -40,7 +39,10 @@ def fake_qemu_bin():
 @pytest.fixture
 def fake_qemu_vm(tmpdir):
 
-    bin_path = os.path.join(str(tmpdir / "linux.img"))
+    img_dir = Config.instance().get_section_config("Server").get("images_path")
+    img_dir = os.path.join(img_dir, "QEMU")
+    os.makedirs(img_dir)
+    bin_path = os.path.join(img_dir, "linux载.img")
     with open(bin_path, "w+") as f:
         f.write("1")
     os.chmod(bin_path, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
@@ -86,15 +88,17 @@ def test_qemu_create_platform(server, project, base_params, fake_qemu_bin):
 def test_qemu_create_with_params(server, project, base_params, fake_qemu_vm):
     params = base_params
     params["ram"] = 1024
-    params["hda_disk_image"] = "linux.img"
+    params["hda_disk_image"] = "linux载.img"
 
     response = server.post("/projects/{project_id}/qemu/vms".format(project_id=project.id), params, example=True)
+
     assert response.status == 201
     assert response.route == "/projects/{project_id}/qemu/vms"
     assert response.json["name"] == "PC TEST 1"
     assert response.json["project_id"] == project.id
     assert response.json["ram"] == 1024
-    assert response.json["hda_disk_image"] == "linux.img"
+    assert response.json["hda_disk_image"] == "linux载.img"
+    assert response.json["hda_disk_image_md5sum"] == "c4ca4238a0b923820dcc509a6f75849b"
 
 
 def test_qemu_get(server, project, vm):
@@ -220,10 +224,9 @@ def test_qemu_list_binaries_filter(server, vm):
 
 def test_vms(server, tmpdir, fake_qemu_vm):
 
-    with patch("gns3server.modules.Qemu.get_images_directory", return_value=str(tmpdir), example=True):
-        response = server.get("/qemu/vms")
+    response = server.get("/qemu/vms")
     assert response.status == 200
-    assert response.json == [{"filename": "linux.img", "path": "linux.img"}]
+    assert response.json == [{"filename": "linux载.img", "path": "linux载.img"}]
 
 
 def test_upload_vm(server, tmpdir):

tests/modules/qemu/test_qemu_manager.py

@@ -177,19 +177,15 @@ def test_create_image_exist(loop, tmpdir, fake_qemu_img_binary):
                 assert not process.called
 
 
-def test_get_kvm_archs_no_kvm(loop):
-    with asyncio_patch("asyncio.create_subprocess_exec", side_effect=FileNotFoundError('kvm-ok')):
-        archs = loop.run_until_complete(asyncio.async(Qemu.get_kvm_archs()))
-        assert archs == []
-
-
 def test_get_kvm_archs_kvm_ok(loop):
 
-    process = MagicMock()
-    with asyncio_patch("asyncio.create_subprocess_exec", return_value=process):
-        process.returncode = 0
+    with patch("os.path.exists", return_value=True):
         archs = loop.run_until_complete(asyncio.async(Qemu.get_kvm_archs()))
         if platform.machine() == 'x86_64':
             assert archs == ['x86_64', 'i386']
         else:
             assert archs == platform.machine()
+
+    with patch("os.path.exists", return_value=False):
+        archs = loop.run_until_complete(asyncio.async(Qemu.get_kvm_archs()))
+        assert archs == []

tests/modules/qemu/test_qemu_vm.py

@@ -85,6 +85,22 @@ def test_vm(project, manager, fake_qemu_binary):
     assert vm.id == "00010203-0405-0607-0809-0a0b0c0d0e0f"
 
 
+def test_vm_invalid_qemu_with_platform(project, manager, fake_qemu_binary):
+
+    vm = QemuVM("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", project, manager, qemu_path="/usr/fake/bin/qemu-system-64", platform="x86_64")
+
+    assert vm.qemu_path == fake_qemu_binary
+    assert vm.platform == "x86_64"
+
+
+def test_vm_invalid_qemu_without_platform(project, manager, fake_qemu_binary):
+
+    vm = QemuVM("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", project, manager, qemu_path="/usr/fake/bin/qemu-system-x86_64")
+
+    assert vm.qemu_path == fake_qemu_binary
+    assert vm.platform == "x86_64"
+
+
 def test_is_running(vm, running_subprocess_mock):
 
     vm._process = None
@@ -459,6 +475,30 @@ def test_hdd_disk_image(vm, tmpdir):
     assert vm.hdd_disk_image == force_unix_path(str(tmpdir / "QEMU" / "test"))
 
 
+def test_initrd(vm, tmpdir):
+
+    vm.manager.config.set("Server", "images_path", str(tmpdir))
+
+    with patch("gns3server.modules.project.Project.emit") as mock:
+        vm.initrd = str(tmpdir / "test")
+        assert vm.initrd == force_unix_path(str(tmpdir / "test"))
+        vm.initrd = "test"
+        assert vm.initrd == force_unix_path(str(tmpdir / "QEMU" / "test"))
+        assert not mock.called
+
+
+def test_initrd_asa(vm, tmpdir):
+
+    vm.manager.config.set("Server", "images_path", str(tmpdir))
+
+    with patch("gns3server.modules.project.Project.emit") as mock:
+        vm.initrd = str(tmpdir / "asa842-initrd.gz")
+        assert vm.initrd == force_unix_path(str(tmpdir / "asa842-initrd.gz"))
+        vm.initrd = "asa842-initrd.gz"
+        assert vm.initrd == force_unix_path(str(tmpdir / "QEMU" / "asa842-initrd.gz"))
+        assert mock.called
+
+
 def test_options(linux_platform, vm):
     vm.kvm = False
     vm.options = "-usb"

tests/utils/test_images.py

@@ -21,13 +21,13 @@ from gns3server.utils.images import md5sum, remove_checksum
 
 
 def test_md5sum(tmpdir):
-    fake_img = str(tmpdir / 'hello')
+    fake_img = str(tmpdir / 'hello载')
 
     with open(fake_img, 'w+') as f:
         f.write('hello')
 
     assert md5sum(fake_img) == '5d41402abc4b2a76b9719d911017c592'
-    with open(str(tmpdir / 'hello.md5sum')) as f:
+    with open(str(tmpdir / 'hello载.md5sum')) as f:
         assert f.read() == '5d41402abc4b2a76b9719d911017c592'