diff --git a/gns3server/modules/qemu/qemu_vm.py b/gns3server/modules/qemu/qemu_vm.py index 72f0cc7b..8335cfe9 100644 --- a/gns3server/modules/qemu/qemu_vm.py +++ b/gns3server/modules/qemu/qemu_vm.py @@ -1233,90 +1233,37 @@ class QemuVM(BaseVM): options = [] qemu_img_path = self._get_qemu_img() - if self._hda_disk_image: - if not os.path.isfile(self._hda_disk_image) or not os.path.exists(self._hda_disk_image): - if os.path.islink(self._hda_disk_image): - raise QemuError("hda disk image '{}' linked to '{}' is not accessible".format(self._hda_disk_image, os.path.realpath(self._hda_disk_image))) + drives = ["a", "b", "c", "d"] + + for disk_index, drive in enumerate(drives): + disk_image = getattr(self, "_hd{}_disk_image".format(drive)) + interface = getattr(self, "hd{}_disk_interface".format(drive)) + + if not disk_image: + continue + + disk_name = "hd" + drive + + if not os.path.isfile(disk_image) or not os.path.exists(disk_image): + if os.path.islink(disk_image): + raise QemuError("{} disk image '{}' linked to '{}' is not accessible".format(disk_name, disk_image, os.path.realpath(disk_image))) else: - raise QemuError("hda disk image '{}' is not accessible".format(self._hda_disk_image)) + raise QemuError("{} disk image '{}' is not accessible".format(disk_name, disk_image)) if self._linked_clone: - hda_disk = os.path.join(self.working_dir, "hda_disk.qcow2") - if not os.path.exists(hda_disk): + disk = os.path.join(self.working_dir, "{}_disk.qcow2".format(disk_name)) + if not os.path.exists(disk): # create the disk try: process = yield from asyncio.create_subprocess_exec(qemu_img_path, "create", "-o", - "backing_file={}".format(self._hda_disk_image), - "-f", "qcow2", hda_disk) + "backing_file={}".format(disk_image), + "-f", "qcow2", disk) retcode = yield from process.wait() log.info("{} returned with {}".format(qemu_img_path, retcode)) except (OSError, subprocess.SubprocessError) as e: - raise QemuError("Could not create hda disk image {}".format(e)) + raise QemuError("Could not create {} disk image {}".format(disk_name, e)) else: - hda_disk = self._hda_disk_image - options.extend(["-drive", 'file={},if={},index=0,media=disk'.format(hda_disk, self.hda_disk_interface)]) - - if self._hdb_disk_image: - if not os.path.isfile(self._hdb_disk_image) or not os.path.exists(self._hdb_disk_image): - if os.path.islink(self._hdb_disk_image): - raise QemuError("hdb disk image '{}' linked to '{}' is not accessible".format(self._hdb_disk_image, os.path.realpath(self._hdb_disk_image))) - else: - raise QemuError("hdb disk image '{}' is not accessible".format(self._hdb_disk_image)) - if self._linked_clone: - hdb_disk = os.path.join(self.working_dir, "hdb_disk.qcow2") - if not os.path.exists(hdb_disk): - try: - process = yield from asyncio.create_subprocess_exec(qemu_img_path, "create", "-o", - "backing_file={}".format(self._hdb_disk_image), - "-f", "qcow2", hdb_disk) - retcode = yield from process.wait() - log.info("{} returned with {}".format(qemu_img_path, retcode)) - except (OSError, subprocess.SubprocessError) as e: - raise QemuError("Could not create hdb disk image {}".format(e)) - else: - hdb_disk = self._hdb_disk_image - options.extend(["-drive", 'file={},if={},index=1,media=disk'.format(hdb_disk, self.hdb_disk_interface)]) - - if self._hdc_disk_image: - if not os.path.isfile(self._hdc_disk_image) or not os.path.exists(self._hdc_disk_image): - if os.path.islink(self._hdc_disk_image): - raise QemuError("hdc disk image '{}' linked to '{}' is not accessible".format(self._hdc_disk_image, os.path.realpath(self._hdc_disk_image))) - else: - raise QemuError("hdc disk image '{}' is not accessible".format(self._hdc_disk_image)) - if self._linked_clone: - hdc_disk = os.path.join(self.working_dir, "hdc_disk.qcow2") - if not os.path.exists(hdc_disk): - try: - process = yield from asyncio.create_subprocess_exec(qemu_img_path, "create", "-o", - "backing_file={}".format(self._hdc_disk_image), - "-f", "qcow2", hdc_disk) - retcode = yield from process.wait() - log.info("{} returned with {}".format(qemu_img_path, retcode)) - except (OSError, subprocess.SubprocessError) as e: - raise QemuError("Could not create hdc disk image {}".format(e)) - else: - hdc_disk = self._hdc_disk_image - options.extend(["-drive", 'file={},if={},index=2,media=disk'.format(hdc_disk, self.hdc_disk_interface)]) - - if self._hdd_disk_image: - if not os.path.isfile(self._hdd_disk_image) or not os.path.exists(self._hdd_disk_image): - if os.path.islink(self._hdd_disk_image): - raise QemuError("hdd disk image '{}' linked to '{}' is not accessible".format(self._hdd_disk_image, os.path.realpath(self._hdd_disk_image))) - else: - raise QemuError("hdd disk image '{}' is not accessible".format(self._hdd_disk_image)) - if self._linked_clone: - hdd_disk = os.path.join(self.working_dir, "hdd_disk.qcow2") - if not os.path.exists(hdd_disk): - try: - process = yield from asyncio.create_subprocess_exec(qemu_img_path, "create", "-o", - "backing_file={}".format(self._hdd_disk_image), - "-f", "qcow2", hdd_disk) - retcode = yield from process.wait() - log.info("{} returned with {}".format(qemu_img_path, retcode)) - except (OSError, subprocess.SubprocessError) as e: - raise QemuError("Could not create hdd disk image {}".format(e)) - else: - hdd_disk = self._hdd_disk_image - options.extend(["-drive", 'file={},if={},index=3,media=disk'.format(hdd_disk, self.hdd_disk_interface)]) + disk = disk_image + options.extend(["-drive", 'file={},if={},index={},media=disk'.format(disk, interface, disk_index)]) return options diff --git a/tests/modules/qemu/test_qemu_vm.py b/tests/modules/qemu/test_qemu_vm.py index 209f270c..dd3ee342 100644 --- a/tests/modules/qemu/test_qemu_vm.py +++ b/tests/modules/qemu/test_qemu_vm.py @@ -321,11 +321,35 @@ def test_disk_options(vm, tmpdir, loop, fake_qemu_img_binary): open(vm._hda_disk_image, "w+").close() with asyncio_patch("asyncio.create_subprocess_exec", return_value=MagicMock()) as process: - loop.run_until_complete(asyncio.async(vm._disk_options())) + options = loop.run_until_complete(asyncio.async(vm._disk_options())) assert process.called args, kwargs = process.call_args assert args == (fake_qemu_img_binary, "create", "-o", "backing_file={}".format(vm._hda_disk_image), "-f", "qcow2", os.path.join(vm.working_dir, "hda_disk.qcow2")) + assert options == ['-drive', 'file=' + os.path.join(vm.working_dir, "hda_disk.qcow2") + ',if=ide,index=0,media=disk'] + + +def test_disk_options_multiple_disk(vm, tmpdir, loop, fake_qemu_img_binary): + + vm._hda_disk_image = str(tmpdir / "test0.qcow2") + vm._hdb_disk_image = str(tmpdir / "test1.qcow2") + vm._hdc_disk_image = str(tmpdir / "test2.qcow2") + vm._hdd_disk_image = str(tmpdir / "test3.qcow2") + open(vm._hda_disk_image, "w+").close() + open(vm._hdb_disk_image, "w+").close() + open(vm._hdc_disk_image, "w+").close() + open(vm._hdd_disk_image, "w+").close() + + with asyncio_patch("asyncio.create_subprocess_exec", return_value=MagicMock()) as process: + options = loop.run_until_complete(asyncio.async(vm._disk_options())) + + assert options == [ + '-drive', 'file=' + os.path.join(vm.working_dir, "hda_disk.qcow2") + ',if=ide,index=0,media=disk', + '-drive', 'file=' + os.path.join(vm.working_dir, "hdb_disk.qcow2") + ',if=ide,index=1,media=disk', + '-drive', 'file=' + os.path.join(vm.working_dir, "hdc_disk.qcow2") + ',if=ide,index=2,media=disk', + '-drive', 'file=' + os.path.join(vm.working_dir, "hdd_disk.qcow2") + ',if=ide,index=3,media=disk' + ] + @pytest.mark.skipif(sys.platform.startswith("win"), reason="Not supported on Windows") def test_set_process_priority(vm, loop, fake_qemu_img_binary):