From 7bf17392dd22ef242f1477104372f0cb5db78ca2 Mon Sep 17 00:00:00 2001 From: grossmj Date: Thu, 7 Nov 2024 14:37:26 +1000 Subject: [PATCH 1/2] Do not use "ide" if there is a disk image and no interface type has been explicitly configured. --- gns3server/compute/qemu/qemu_vm.py | 5 ----- tests/compute/qemu/test_qemu_vm.py | 13 ++++++++++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/gns3server/compute/qemu/qemu_vm.py b/gns3server/compute/qemu/qemu_vm.py index 99b2d711..f8932d2b 100644 --- a/gns3server/compute/qemu/qemu_vm.py +++ b/gns3server/compute/qemu/qemu_vm.py @@ -1915,11 +1915,6 @@ class QemuVM(BaseNode): continue interface = getattr(self, "hd{}_disk_interface".format(drive)) - # fail-safe: use "ide" if there is a disk image and no interface type has been explicitly configured - if interface == "none": - interface = "ide" - setattr(self, "hd{}_disk_interface".format(drive), interface) - disk_name = "hd" + drive if not os.path.isfile(disk_image) or not os.path.exists(disk_image): if os.path.islink(disk_image): diff --git a/tests/compute/qemu/test_qemu_vm.py b/tests/compute/qemu/test_qemu_vm.py index 59d00687..0e075e3f 100644 --- a/tests/compute/qemu/test_qemu_vm.py +++ b/tests/compute/qemu/test_qemu_vm.py @@ -353,16 +353,23 @@ async def test_set_platform(compute_project, manager): async def test_disk_options(vm, tmpdir, fake_qemu_img_binary): vm._hda_disk_image = str(tmpdir / "test.qcow2") + vm._hda_disk_interface = "ide" + vm._hdb_disk_image = str(tmpdir / "test2.qcow2") open(vm._hda_disk_image, "w+").close() + open(vm._hdb_disk_image, "w+").close() - with asyncio_patch("gns3server.compute.qemu.qemu_vm.QemuVM._find_disk_file_format", return_value="qcow2"): + with (asyncio_patch("gns3server.compute.qemu.qemu_vm.QemuVM._find_disk_file_format", return_value="qcow2")): with asyncio_patch("asyncio.create_subprocess_exec", return_value=MagicMock()) as process: options = await 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", "-f", "qcow2", os.path.join(vm.working_dir, "hda_disk.qcow2")) + assert args == (fake_qemu_img_binary, "create", "-o", "backing_file={}".format(vm._hda_disk_image), "-F", "qcow2", "-f", "qcow2", os.path.join(vm.working_dir, "hda_disk.qcow2")) or \ + args == (fake_qemu_img_binary, "create", "-o", "backing_file={}".format(vm._hdb_disk_image), "-F", "qcow2", "-f", "qcow2", os.path.join(vm.working_dir, "hdb_disk.qcow2")) - assert options == ['-drive', 'file=' + os.path.join(vm.working_dir, "hda_disk.qcow2") + ',if=ide,index=0,media=disk,id=drive0'] + assert options == [ + '-drive', 'file=' + os.path.join(vm.working_dir, "hda_disk.qcow2") + ',if=ide,index=0,media=disk,id=drive0', + '-drive', 'file=' + os.path.join(vm.working_dir, "hdb_disk.qcow2") + ',if=none,index=1,media=disk,id=drive1', + ] async def test_cdrom_option(vm, tmpdir, fake_qemu_img_binary): From 52a7696618ad0cff9eef07213e257b5f9fdcee8b Mon Sep 17 00:00:00 2001 From: grossmj Date: Thu, 7 Nov 2024 14:48:57 +1000 Subject: [PATCH 2/2] Fix tests --- tests/compute/qemu/test_qemu_vm.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/compute/qemu/test_qemu_vm.py b/tests/compute/qemu/test_qemu_vm.py index 0e075e3f..a194684c 100644 --- a/tests/compute/qemu/test_qemu_vm.py +++ b/tests/compute/qemu/test_qemu_vm.py @@ -447,9 +447,13 @@ async def test_tpm_option(vm, tmpdir, fake_qemu_img_binary): async def test_disk_options_multiple_disk(vm, tmpdir, fake_qemu_img_binary): vm._hda_disk_image = str(tmpdir / "test0.qcow2") + vm._hda_disk_interface = "ide" vm._hdb_disk_image = str(tmpdir / "test1.qcow2") + vm._hdb_disk_interface = "ide" vm._hdc_disk_image = str(tmpdir / "test2.qcow2") + vm._hdc_disk_interface = "ide" vm._hdd_disk_image = str(tmpdir / "test3.qcow2") + vm._hdd_disk_interface = "ide" open(vm._hda_disk_image, "w+").close() open(vm._hdb_disk_image, "w+").close() open(vm._hdc_disk_image, "w+").close()