From fb06eb3c0cdc23184b34eaded0cec9af91e6b3cb Mon Sep 17 00:00:00 2001 From: grossmj Date: Thu, 31 Oct 2024 13:07:09 +1000 Subject: [PATCH 1/7] Remove old debug message --- gns3server/compute/docker/docker_vm.py | 1 - 1 file changed, 1 deletion(-) diff --git a/gns3server/compute/docker/docker_vm.py b/gns3server/compute/docker/docker_vm.py index 2f42d257..334af520 100644 --- a/gns3server/compute/docker/docker_vm.py +++ b/gns3server/compute/docker/docker_vm.py @@ -451,7 +451,6 @@ class DockerVM(BaseNode): if extra_hosts: params["Env"].append("GNS3_EXTRA_HOSTS={}".format(extra_hosts)) - print(params) result = await self.manager.query("POST", "containers/create", data=params) self._cid = result['Id'] log.info("Docker container '{name}' [{id}] created".format(name=self._name, id=self._id)) From 7bf17392dd22ef242f1477104372f0cb5db78ca2 Mon Sep 17 00:00:00 2001 From: grossmj Date: Thu, 7 Nov 2024 14:37:26 +1000 Subject: [PATCH 2/7] 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 3/7] 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() From f3749e83ec54323873029ec9ad468f9fae19bb84 Mon Sep 17 00:00:00 2001 From: grossmj Date: Thu, 7 Nov 2024 14:52:59 +1000 Subject: [PATCH 4/7] Catch error when cannot resize Docker container TTY. --- gns3server/compute/base_node.py | 10 ++++------ gns3server/compute/docker/docker_vm.py | 5 ++++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/gns3server/compute/base_node.py b/gns3server/compute/base_node.py index 13da0a8c..c95138e4 100644 --- a/gns3server/compute/base_node.py +++ b/gns3server/compute/base_node.py @@ -406,13 +406,11 @@ class BaseNode: Stops the telnet proxy. """ - if self._wrapper_telnet_server: + if self._wrap_console_writer: self._wrap_console_writer.close() - if sys.version_info >= (3, 7, 0): - try: - await self._wrap_console_writer.wait_closed() - except ConnectionResetError: - pass + await self._wrap_console_writer.wait_closed() + self._wrap_console_writer = None + if self._wrapper_telnet_server: self._wrapper_telnet_server.close() await self._wrapper_telnet_server.wait_closed() self._wrapper_telnet_server = None diff --git a/gns3server/compute/docker/docker_vm.py b/gns3server/compute/docker/docker_vm.py index 334af520..24a70e94 100644 --- a/gns3server/compute/docker/docker_vm.py +++ b/gns3server/compute/docker/docker_vm.py @@ -710,7 +710,10 @@ class DockerVM(BaseNode): """ # resize the container TTY. - await self._manager.query("POST", "containers/{}/resize?h={}&w={}".format(self._cid, rows, columns)) + try: + await self._manager.query("POST", "containers/{}/resize?h={}&w={}".format(self._cid, rows, columns)) + except DockerError as e: + log.warning(f"Could not resize the container TTY: {e}") async def _start_console(self): """ From 05773ce1899f61d9709e195a50a026881fe2d223 Mon Sep 17 00:00:00 2001 From: grossmj Date: Thu, 7 Nov 2024 15:06:06 +1000 Subject: [PATCH 5/7] Sync appliances --- gns3server/appliances/nixos.gns3a | 52 +++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 gns3server/appliances/nixos.gns3a diff --git a/gns3server/appliances/nixos.gns3a b/gns3server/appliances/nixos.gns3a new file mode 100644 index 00000000..32d3b609 --- /dev/null +++ b/gns3server/appliances/nixos.gns3a @@ -0,0 +1,52 @@ +{ + "appliance_id": "00714342-14b2-4281-aa20-9043ca8dc26e", + "name": "NixOS", + "category": "guest", + "description": "NixOS QEMU Appliance for images created with nixos-generator. Automatically sets hostname based on vmname.", + "vendor_name": "NixOS", + "vendor_url": "https://nixos.org/", + "vendor_logo_url": "https://avatars.githubusercontent.com/u/487568", + "documentation_url": "https://github.com/ob7/gns3-nixos-appliance", + "product_name": "NixOS", + "product_url": "https://github.com/NixOS/nixpkgs", + "registry_version": 4, + "status": "experimental", + "availability": "free", + "maintainer": "ob7dev", + "maintainer_email": "dev@ob7.us", + "usage": "For custom NixOS images, create qcow2 VM with: nixos-generate -f qcow -c ./server.nix Import it into GNS3 as image. VM name is passed into QEMU guest with Advanced Options field entry: -fw_cfg name=opt/vm_hostname,string=%vm-name%", + "symbol": ":/symbols/affinity/circle/gray/template.svg", + "first_port_name": "eth0", + "port_name_format": "eth{0}", + "qemu": { + "adapter_type": "e1000", + "adapters": 4, + "ram": 256, + "cpus": 1, + "hda_disk_interface": "ide", + "arch": "x86_64", + "console_type": "telnet", + "kvm": "allow", + "options": "-fw_cfg name=opt/vm_hostname,string=%vm-name%", + "on_close": "power_off" + }, + "images": [ + { + "filename": "nixos-24-11.qcow2", + "version": "24.11", + "md5sum": "2459f05136836dd430402d75cba0f205", + "download_url": "https://github.com/nix-community/nixos-generators", + "filesize": 1749483520, + "download_url": "https://f.ob7.us/gns3/", + "direct_download_url": "http://ob7.us/nixos-24-11.qcow2" + } + ], + "versions": [ + { + "name": "24.11", + "images": { + "hda_disk_image": "nixos-24-11.qcow2" + } + } + ] +} From 754680d8e911d234b0f9a187f1963c3fef4b8a40 Mon Sep 17 00:00:00 2001 From: grossmj Date: Thu, 7 Nov 2024 15:08:27 +1000 Subject: [PATCH 6/7] Release v2.2.51 --- CHANGELOG | 10 ++++++++++ gns3server/crash_report.py | 2 +- gns3server/version.py | 4 ++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index c0623d74..a5a834f7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,15 @@ # Change Log +## 2.2.51 07/11/2024 + +* Catch error when cannot resize Docker container TTY. +* Do not use "ide" if there is a disk image and no interface type has been explicitly configured. +* Use @locking when sending uBridge commands. Ref https://github.com/GNS3/gns3-gui/issues/3651 +* Fix run Docker containers with user namespaces enabled. Fixes #2414 +* Python 3.13 support +* Upgrade dependencies +* Fix errors in init.sh. Fixes #2431 + ## 2.2.50 21/10/2024 * Bundle web-ui v2.2.50 diff --git a/gns3server/crash_report.py b/gns3server/crash_report.py index d0bf23dd..6ad998a5 100644 --- a/gns3server/crash_report.py +++ b/gns3server/crash_report.py @@ -57,7 +57,7 @@ class CrashReport: Report crash to a third party service """ - DSN = "https://decb06a5d7bda07bef342a41c5c9d6e1@o19455.ingest.us.sentry.io/38482" + DSN = "https://088679fcf3aa35f775356982a80fe37c@o19455.ingest.us.sentry.io/38482" _instance = None def __init__(self): diff --git a/gns3server/version.py b/gns3server/version.py index fc2f34ba..533a4376 100644 --- a/gns3server/version.py +++ b/gns3server/version.py @@ -23,8 +23,8 @@ # or negative for a release candidate or beta (after the base version # number has been incremented) -__version__ = "2.2.51.dev1" -__version_info__ = (2, 2, 51, 99) +__version__ = "2.2.51" +__version_info__ = (2, 2, 51, 0) if "dev" in __version__: try: From a5f0dba5cf5be22b90ccca708449cc1fcaa5570a Mon Sep 17 00:00:00 2001 From: grossmj Date: Thu, 7 Nov 2024 23:13:31 +1000 Subject: [PATCH 7/7] Development on 2.2.52.dev1 --- gns3server/version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gns3server/version.py b/gns3server/version.py index 533a4376..663120ad 100644 --- a/gns3server/version.py +++ b/gns3server/version.py @@ -23,8 +23,8 @@ # or negative for a release candidate or beta (after the base version # number has been incremented) -__version__ = "2.2.51" -__version_info__ = (2, 2, 51, 0) +__version__ = "2.2.52.dev1" +__version_info__ = (2, 2, 52, 99) if "dev" in __version__: try: