From 33087a6c2197b9c8af59d8c43def0f5957b669cc Mon Sep 17 00:00:00 2001 From: grossmj Date: Thu, 4 Aug 2022 11:04:33 +0200 Subject: [PATCH] Do not use build-optimizer when bundling web-ui. Ref https://github.com/GNS3/gns3-web-ui/issues/1366 --- gns3server/appliances/cisco-asav.gns3a | 13 ++++++++++ gns3server/appliances/cumulus-vx.gns3a | 16 ++++++++++++- gns3server/appliances/empty-vm.gns3a | 20 +++++++++++++--- gns3server/appliances/raspian.gns3a | 30 +++++++++++++++++++++++- gns3server/appliances/ubuntu-cloud.gns3a | 14 +++++++++++ 5 files changed, 88 insertions(+), 5 deletions(-) diff --git a/gns3server/appliances/cisco-asav.gns3a b/gns3server/appliances/cisco-asav.gns3a index d74e0118..31b695d0 100644 --- a/gns3server/appliances/cisco-asav.gns3a +++ b/gns3server/appliances/cisco-asav.gns3a @@ -27,6 +27,13 @@ }, "images": [ { + "filename": "asav9-16-2.qcow2", + "version": "9.16.2 CML", + "md5sum": "1f8db97063a7f738fddc81ac880a906c", + "filesize": 262078976, + "download_url": "https://learningnetworkstore.cisco.com/cisco-modeling-labs-personal/cisco-modeling-labs-personal/CML-PERSONAL.html" + }, + { "filename": "asav9-16-2.qcow2", "version": "9.16.2", "md5sum": "c3aa2b73b029146ec345bf888dd54eab", @@ -112,6 +119,12 @@ } ], "versions": [ + { + "name": "9.16.2 CML", + "images": { + "hda_disk_image": "asav9-16-2.qcow2" + } + }, { "name": "9.16.2", "images": { diff --git a/gns3server/appliances/cumulus-vx.gns3a b/gns3server/appliances/cumulus-vx.gns3a index 03685393..c21971a4 100644 --- a/gns3server/appliances/cumulus-vx.gns3a +++ b/gns3server/appliances/cumulus-vx.gns3a @@ -12,7 +12,7 @@ "status": "stable", "maintainer": "GNS3 Team", "maintainer_email": "developers@gns3.net", - "usage": "Default username is cumulus and password is CumulusLinux! in version 4.1 and earlier, and cumulus in version 4.2 and later.", + "usage": "Default username/password is cumulus/CumulusLinux! in version 4.1 and earlier, and cumulus/cumulus in version 4.2 and later.", "first_port_name": "eth0", "port_name_format": "swp{port1}", "qemu": { @@ -25,6 +25,14 @@ "kvm": "require" }, "images": [ + { + "filename": "cumulus-linux-5.1.0-vx-amd64-qemu.qcow2", + "version": "5.1.0", + "md5sum": "b46a68bbb57e77fab5c2927367bead13", + "filesize": 4174446592, + "download_url": "https://www.nvidia.com/en-us/networking/ethernet-switching/cumulus-vx/download/", + "direct_download_url": "https://d2cd9e7ca6hntp.cloudfront.net/public/CumulusLinux-5.1.0/cumulus-linux-5.1.0-vx-amd64-qemu.qcow2" + }, { "filename": "cumulus-linux-4.3.0-vx-amd64-qemu.qcow2", "version": "4.3.0", @@ -231,6 +239,12 @@ } ], "versions": [ + { + "name": "5.1.0", + "images": { + "hda_disk_image": "cumulus-linux-5.1.0-vx-amd64-qemu.qcow2" + } + }, { "name": "4.3.0", "images": { diff --git a/gns3server/appliances/empty-vm.gns3a b/gns3server/appliances/empty-vm.gns3a index 83724603..8e2ac20f 100644 --- a/gns3server/appliances/empty-vm.gns3a +++ b/gns3server/appliances/empty-vm.gns3a @@ -2,7 +2,7 @@ "appliance_id": "1cfdf900-7c30-4cb7-8f03-3f61d2581633", "name": "Empty VM", "category": "guest", - "description": "An empty VM with empty hard disks 8G, 30G & 100G.", + "description": "A empty VM with empty hard disks 8G, 30G, 100G & 200G.", "vendor_name": "GNS3", "vendor_url": "https://gns3.com", "documentation_url": "", @@ -20,7 +20,7 @@ "ram": 1024, "arch": "x86_64", "console_type": "vnc", - "hda_disk_interface": "sata", + "hda_disk_interface": "sata", "boot_priority": "d", "kvm": "allow" }, @@ -48,6 +48,14 @@ "filesize": 198656, "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/", "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty100G.qcow2/download" + }, + { + "filename": "empty200G.qcow2", + "version": "200G", + "md5sum": "d1686d2f25695dee32eab9a6f4652c7c", + "filesize": 200192, + "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/", + "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty200G.qcow2/download" } ], "versions": [ @@ -63,11 +71,17 @@ "hda_disk_image": "empty30G.qcow2" } }, - { + { "name": "100G", "images": { "hda_disk_image": "empty100G.qcow2" } + }, + { + "name": "200G", + "images": { + "hda_disk_image": "empty200G.qcow2" + } } ] } diff --git a/gns3server/appliances/raspian.gns3a b/gns3server/appliances/raspian.gns3a index e3973693..0c4cafca 100644 --- a/gns3server/appliances/raspian.gns3a +++ b/gns3server/appliances/raspian.gns3a @@ -15,7 +15,7 @@ "usage": "Default password is raspberry", "symbol": "rpi.png", "qemu": { - "adapter_type": "virtio", + "adapter_type": "e1000", "adapters": 1, "ram": 1024, "hda_disk_interface": "sata", @@ -25,6 +25,20 @@ }, "images": [ { + "filename": "2022-07-01-raspios-bullseye-i386.iso", + "version": "2022-07-01", + "md5sum": "e57f42852306ac5ed0d9e97bdc3513cb", + "filesize": 3607101440, + "download_url": "https://www.raspberrypi.org/downloads/raspberry-pi-desktop/" + }, + { + "filename": "2021-01-11-raspios-buster-i386.iso", + "version": "2021-01-11", + "md5sum": "14c0b29c393adee45b90d265b3243564", + "filesize": 3091660800, + "download_url": "https://www.raspberrypi.org/downloads/raspberry-pi-desktop/" + }, + { "filename": "2020-02-12-rpd-x86-buster.iso", "version": "2020-02-12", "md5sum": "98f34fb53086752b4c9c452094f30740", @@ -41,6 +55,20 @@ ], "versions": [ { + "name": "2022-07-01", + "images": { + "hda_disk_image": "empty8G.qcow2", + "cdrom_image": "2022-07-01-raspios-bullseye-i386.iso" + } + }, + { + "name": "2021-01-11", + "images": { + "hda_disk_image": "empty8G.qcow2", + "cdrom_image": "2021-01-11-raspios-buster-i386.iso" + } + }, + { "name": "2020-02-12", "images": { "hda_disk_image": "empty8G.qcow2", diff --git a/gns3server/appliances/ubuntu-cloud.gns3a b/gns3server/appliances/ubuntu-cloud.gns3a index c31af598..d0ddd03e 100644 --- a/gns3server/appliances/ubuntu-cloud.gns3a +++ b/gns3server/appliances/ubuntu-cloud.gns3a @@ -26,6 +26,13 @@ "options": "-nographic" }, "images": [ + { + "filename": "ubuntu-22.04-server-cloudimg-amd64.img", + "version": "22.04 (LTS)", + "md5sum": "ac2351289daa173fa1ed6b2b81d81d7c", + "filesize": 624295936, + "download_url": "https://cloud-images.ubuntu.com/releases/jammy/release/ubuntu-22.04-server-cloudimg-amd64.img" + }, { "filename": "ubuntu-20.04-server-cloudimg-amd64.img", "version": "20.04 (LTS)", @@ -70,6 +77,13 @@ } ], "versions": [ + { + "name": "22.04 (LTS)", + "images": { + "hda_disk_image": "ubuntu-22.04-server-cloudimg-amd64.img", + "cdrom_image": "ubuntu-cloud-init-data.iso" + } + }, { "name": "20.04 (LTS)", "images": {