Release v2.2.44

Allow disabling hardware virtualization check

.github/workflows/publish-api-documentation.yml

@@ -12,11 +12,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
         ref: "gh-pages"
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v3
       with:
         python-version: 3.7
     - name: Merge changes from 3.0 branch
@@ -24,13 +24,10 @@ jobs:
         git config user.name github-actions
         git config user.email github-actions@github.com
         git merge origin/3.0 -X theirs
-    - name: Install dependencies
+    - name: Install GNS3 server and dependencies
       run: |
         python -m pip install --upgrade pip
-        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-    - name: Install GNS3 server
-      run: |
-        python setup.py install
+        python -m pip install .
     - name: Generate the API documentation
       run: |
         cd scripts

.github/workflows/testing.yml

@@ -16,12 +16,12 @@ jobs:
     runs-on: ubuntu-20.04  # Downgrade Ubuntu to 20.04 to fix missing Python 3.6
     strategy:
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies

CHANGELOG

@@ -1,5 +1,53 @@
 # Change Log
 
+## 2.2.44 06/11/2023
+
+* Bundle web-ui v2.2.44
+* Non-blocking checksums computation when server starts. Fixes #2228
+* Fix timeout issue when creating Qemu disk image. Fixes https://github.com/GNS3/gns3-server/issues/2313
+* Support for web socket console over HTTPS
+* Add back script create_cert.sh
+* Allow disabling hardware virtualization check
+* Fix L2IOU "failed code signing checks" when IOU base file name is >= 63 characters
+* Change "ip cef" to "no ip cef" in IOU default configs. Fixes #2298
+* Add Qemu IGB network device
+* Add Python 3.12 support.
+* Fix issue with importlib.resources.files() and Python 3.9
+
+## 2.2.43 19/09/2023
+
+* Force English output for VBoxManage. Fixes #2266
+* Automatically add vboxnet and DHCP server if not present for VirtualBox GNS3 VM. Ref #2266
+* Fix issue with controller config saved before checking current version with previous one
+* Prevent X11 socket file to be modified by Docker container
+* Use the user data dir to store built-in appliances
+* Catch ConnectionResetError exception when client disconnects
+* Upgrade to PyQt 5.15.9 and pywin32
+
+## 2.2.42 09/08/2023
+
+* Bundle web-ui v2.2.42
+* Handle API version key in VirtualBox 7. Fixes #2266
+* Enable system certificate store for SSL connections
+* Use DEFAULT_BUFFER_SIZE for md5sum
+* Fix version check when installing appliances. Ref https://github.com/GNS3/gns3-gui/issues/3486
+* Allow connection to ws console over IPv6. Fixes https://github.com/GNS3/gns3-web-ui/issues/1400
+* Support for Python 3.12
+* Remove import urllib3 and let sentry_sdk import and patch it. Fixes https://github.com/GNS3/gns3-gui/issues/3498
+
+## 2.2.41 12/07/2023
+
+* Bundle web-ui v2.2.41
+* Catch urllib3 exceptions when sending crash report. Ref https://github.com/GNS3/gns3-gui/issues/3483
+* Only fetch Qemu version once when starting Qemu + only add speed/duplex for virtio-net-pci with Qemu version >= 2.12
+* Use recent OVMF firmware (stable-202305) and use flash drives to configure Qemu command line
+* Remove the useless executable permissions to the file gns3server/disks/empty8G.qcow2
+* Backport UEFI boot mode support for Qemu VMs
+
+## 2.2.40.1 10/06/2023
+
+* Re-bundle Web-Ui v2.2.40. Fixes #2239
+
 ## 2.2.40 06/06/2023
 
 * qemu : with network adapter_type equal to "virtio-net-pci", fix the speed to 10000 and duplex to full. 	The values are actually fake. 	(https://github.com/GNS3/gns3-gui/issues/3476)

README.md

@@ -69,7 +69,7 @@ GNS3 is perhaps packaged for your distribution:
 -   Alpine:
     <https://pkgs.alpinelinux.org/package/v3.10/community/x86_64/gns3-server>
 -   NixOS:
-    <https://search.nixos.org/packages?channel=21.11&from=0&size=50&sort=relevance&type=packages&query=gns3-server>
+    <https://search.nixos.org/packages?channel=unstable&from=0&size=50&sort=relevance&type=packages&query=gns3-server>
 
 Linux (Debian based)
 --------------------

appveyor.yml

@@ -5,7 +5,7 @@ image: Visual Studio 2022
 platform: x64
 
 environment:
-    PYTHON: "C:\\Python37-x64"
+    PYTHON: "C:\\Python38-x64"
     DISTUTILS_USE_SDK: "1"
     API_TOKEN:
         secure: VEKn4bYH3QO0ixtQW5ni4Enmn8cS1NlZV246ludBDgQ=

conf/gns3_server.conf

@@ -62,6 +62,9 @@ default_nat_interface = vmnet10
 ; Enable the built-in templates
 enable_builtin_templates = True
 
+; check if hardware virtualization is used by other emulators (KVM, VMware or VirtualBox)
+hardware_virtualization_check = True
+
 [VPCS]
 ; VPCS executable location, default: search in PATH
 ;vpcs_path = vpcs

gns3server/appliances/almalinux.gns3a

@@ -21,9 +21,26 @@
         "hda_disk_interface": "sata",
         "arch": "x86_64",
         "console_type": "telnet",
-        "kvm": "allow"
+        "kvm": "allow",
+        "options": "-cpu host -nographic"
     },
     "images": [
+        {
+            "filename": "AlmaLinux-9-GenericCloud-9.2-20230513.x86_64.qcow2",
+            "version": "9.2",
+            "md5sum": "c5bc76e8c95ac9f810a3482c80a54cc7",
+            "filesize": 563347456,
+            "download_url": "https://repo.almalinux.org/almalinux/9/cloud/x86_64/images/",
+            "direct_download_url": "https://repo.almalinux.org/almalinux/9/cloud/x86_64/images/AlmaLinux-9-GenericCloud-9.2-20230513.x86_64.qcow2"
+        },
+        {
+            "filename": "AlmaLinux-8-GenericCloud-8.8-20230524.x86_64.qcow2",
+            "version": "8.8",
+            "md5sum": "3958c5fc25770ef63cf97aa5d93f0a0b",
+            "filesize": 565444608,
+            "download_url": "https://repo.almalinux.org/almalinux/8/cloud/x86_64/images/",
+            "direct_download_url": "https://repo.almalinux.org/almalinux/8/cloud/x86_64/images/AlmaLinux-8-GenericCloud-8.8-20230524.x86_64.qcow2"
+        },
         {
             "filename": "AlmaLinux-8-GenericCloud-8.7-20221111.x86_64.qcow2",
             "version": "8.7",
@@ -42,6 +59,20 @@
         }
     ],
     "versions": [
+        {
+            "name": "9.2",
+            "images": {
+                "hda_disk_image": "AlmaLinux-9-GenericCloud-9.2-20230513.x86_64.qcow2",
+                "cdrom_image": "almalinux-cloud-init-data.iso"
+            }
+        },
+        {
+            "name": "8.8",
+            "images": {
+                "hda_disk_image": "AlmaLinux-8-GenericCloud-8.8-20230524.x86_64.qcow2",
+                "cdrom_image": "almalinux-cloud-init-data.iso"
+            }
+        },
         {
             "name": "8.7",
             "images": {

gns3server/appliances/alpine-linux-virt.gns3a

@@ -25,6 +25,14 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "alpine-virt-3.18.4.qcow2",
+            "version": "3.18.4",
+            "md5sum": "99d393c16c870e12c4215aadd82ca998",
+            "filesize": 51066880,
+            "download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/",
+            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/alpine-virt-3.18.4.qcow2/download"
+        },
         {
             "filename": "alpine-virt-3.16.img",
             "version": "3.16",
@@ -35,6 +43,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "3.18.4",
+            "images": {
+                "hda_disk_image": "alpine-virt-3.18.4.qcow2"
+            }
+        },
         {
             "name": "3.16",
             "images": {

gns3server/appliances/alpine-linux.gns3a

@@ -5,6 +5,7 @@
     "description": "Alpine Linux is a security-oriented, lightweight Linux distribution based on musl libc and busybox.",
     "vendor_name": "Alpine Linux Development Team",
     "vendor_url": "http://alpinelinux.org",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/Alpine Linux.png",
     "documentation_url": "http://wiki.alpinelinux.org",
     "product_name": "Alpine Linux",
     "registry_version": 4,

gns3server/appliances/bird2.gns3a

@@ -0,0 +1,43 @@
+{
+    "appliance_id": "8fecbf89-5cd1-4aea-b735-5f36cf0efbb7",
+    "name": "BIRD2",
+    "category": "router",
+    "description": "The BIRD project aims to develop a fully functional dynamic IP routing daemon primarily targeted on (but not limited to) Linux, FreeBSD and other UNIX-like systems and distributed under the GNU General Public License.",
+    "vendor_name": "CZ.NIC Labs",
+    "vendor_url": "https://bird.network.cz",
+    "documentation_url": "https://bird.network.cz/?get_doc&f=bird.html&v=20",
+    "product_name": "BIRD internet routing daemon",
+    "registry_version": 4,
+    "status": "stable",
+    "maintainer": "Bernhard Ehlers",
+    "maintainer_email": "dev-ehlers@mailbox.org",
+    "usage": "Username:\tgns3\nPassword:\tgns3\nTo become root, use \"sudo -s\".\n\nNetwork configuration:\nsudo nano /etc/network/interfaces\nsudo systemctl restart networking\n\nBIRD:\nRestart: sudo systemctl restart bird\nReconfigure: birdc configure",
+    "port_name_format": "eth{0}",
+    "qemu": {
+        "adapter_type": "virtio-net-pci",
+        "adapters": 4,
+        "ram": 512,
+        "hda_disk_interface": "scsi",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "kvm": "allow"
+    },
+    "images": [
+        {
+            "filename": "bird2-debian-2.0.12.qcow2",
+            "version": "2.0.12",
+            "md5sum": "435218a2e90cba921cc7fde1d64a9419",
+            "filesize": 287965184,
+            "download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/",
+            "direct_download_url": "https://downloads.sourceforge.net/project/gns-3/Qemu%20Appliances/bird2-debian-2.0.12.qcow2"
+        }
+    ],
+    "versions": [
+        {
+            "name": "2.0.12",
+            "images": {
+                "hda_disk_image": "bird2-debian-2.0.12.qcow2"
+            }
+        }
+    ]
+}

gns3server/appliances/centos-cloud.gns3a

@@ -12,7 +12,7 @@
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
-    "usage": "Username: centos\nPassword: centos",
+    "usage": "Username: centos or cloud-user\nPassword: centos",
     "port_name_format": "Ethernet{0}",
     "qemu": {
         "adapter_type": "virtio-net-pci",
@@ -23,9 +23,25 @@
         "console_type": "telnet",
         "boot_priority": "c",
         "kvm": "require",
-        "options": "-nographic"
+        "options": "-cpu host -nographic"
     },
     "images": [
+        {
+            "filename": "CentOS-Stream-GenericCloud-9-20230704.1.x86_64.qcow2",
+            "version": "Stream-9 (20230704.1)",
+            "md5sum": "e04511e019325a97837edd9eafe02b48",
+            "filesize": 1087868416,
+            "download_url": "https://cloud.centos.org/centos/9-stream/x86_64/images",
+            "direct_download_url": "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-20230704.1.x86_64.qcow2"
+        },
+        {
+            "filename": "CentOS-Stream-GenericCloud-8-20230710.0.x86_64.qcow2",
+            "version": "Stream-8 (20230710.0)",
+            "md5sum": "83e02ce98c29753c86fb7be7d802aa75",
+            "filesize": 1676164096,
+            "download_url": "https://cloud.centos.org/centos/8-stream/x86_64/images",
+            "direct_download_url": "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20230710.0.x86_64.qcow2"
+        },
         {
             "filename": "CentOS-8-GenericCloud-8.4.2105-20210603.0.x86_64.qcow2",
             "version": "8.4 (2105)",
@@ -60,6 +76,20 @@
         }
     ],
     "versions": [
+        {
+            "name": "Stream-9 (20230704.1)",
+            "images": {
+                "hda_disk_image": "CentOS-Stream-GenericCloud-9-20230704.1.x86_64.qcow2",
+                "cdrom_image": "centos-cloud-init-data.iso"
+            }
+        },
+        {
+            "name": "Stream-8 (20230710.0)",
+            "images": {
+                "hda_disk_image": "CentOS-Stream-GenericCloud-8-20230710.0.x86_64.qcow2",
+                "cdrom_image": "centos-cloud-init-data.iso"
+            }
+        },
         {
             "name": "8.4 (2105)",
             "images": {

gns3server/appliances/chromium.gns3a

@@ -5,6 +5,7 @@
     "description": "The chromium browser",
     "vendor_name": "Chromium",
     "vendor_url": "https://www.chromium.org/",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/Chromium.jpg",
     "product_name": "Chromium",
     "registry_version": 4,
     "status": "stable",

gns3server/appliances/cisco-c8000v.gns3a

@@ -24,10 +24,17 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "c8000v-universalk9_8G_serial.17.06.05.qcow2",
+            "version": "17.06.05 8G",
+            "md5sum": "aeb15ab8e1cbd0cd76f7260a81442f98",
+            "filesize": 1777795072,
+            "download_url": "https://software.cisco.com/download/home/286327102/type/282046477/release/Bengaluru-17.6.5"
+        },
         {
             "filename": "c8000v-universalk9_8G_serial.17.06.01a.qcow2",
             "version": "17.06.01a 8G",
-            "md5sum": "d8b8ae633d953ec1b6d8f18a09a4f4e7",
+            "md5sum": "e278fa644295c703976a86f7f1c1cd65",
             "filesize": 1595277312,
             "download_url": "https://software.cisco.com/download/home/286327102/type/282046477/release/Bengaluru-17.6.1a"
         },
@@ -47,6 +54,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "17.06.05 8G",
+            "images": {
+                "hda_disk_image": "c8000v-universalk9_8G_serial.17.06.05.qcow2"
+            }
+        },
         {
             "name": "17.06.01a 8G",
             "images": {

gns3server/appliances/cisco-nxosv9k.gns3a

@@ -188,12 +188,12 @@
             "download_url": "https://software.cisco.com/download/"
         },
         {
-            "filename": "OVMF-20160813.fd",
-            "version": "16.08.13",
-            "md5sum": "8ff0ef1ec56345db5b6bda1a8630e3c6",
-            "filesize": 2097152,
-            "download_url": "",
-            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/OVMF-20160813.fd.zip/download",
+            "filename": "OVMF-edk2-stable202305.fd",
+            "version": "stable202305",
+            "md5sum": "6c4cf1519fec4a4b95525d9ae562963a",
+            "filesize": 4194304,
+            "download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/",
+            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/OVMF-edk2-stable202305.fd.zip/download",
             "compression": "zip"
         }
     ],
@@ -201,161 +201,161 @@
         {
             "name": "9500v 10.1.1",
             "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                 "hda_disk_image": "nexus9500v64.10.1.1.qcow2"
             }
         },
         {
             "name": "9300v 10.1.1",
             "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                 "hda_disk_image": "nexus9300v.10.1.1.qcow2"
             }
         },
         {
             "name": "9500v 9.3.9",
             "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                 "hda_disk_image": "nexus9500v.9.3.9.qcow2"
             }
         },
         {
             "name": "9300v 9.3.9",
             "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                 "hda_disk_image": "nexus9300v.9.3.9.qcow2"
             }
         },
         {
             "name": "9300v 9.3.8",
             "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                 "hda_disk_image": "nexus9300v.9.3.8.qcow2"
             }
         },
         {
             "name": "9500v 9.3.7",
             "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                 "hda_disk_image": "nexus9500v.9.3.7.qcow2"
             }
         },
         {
             "name": "9500v 9.3.3",
             "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                 "hda_disk_image": "nexus9500v.9.3.3.qcow2"
             }
         },
         {
             "name": "9300v 9.3.3",
             "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                 "hda_disk_image": "nexus9300v.9.3.3.qcow2"
             }
         },
         {
             "name": "9.3.1",
             "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                 "hda_disk_image": "nxosv.9.3.1.qcow2"
             }
         },
         {
             "name": "9.2.3",
             "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                 "hda_disk_image": "nxosv-final.9.2.3.qcow2"
             }
         },
         {
             "name": "9.2.2",
             "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                 "hda_disk_image": "nxosv-final.9.2.2.qcow2"
             }
         },
         {
             "name": "9.2.1",
             "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                 "hda_disk_image": "nxosv-final.9.2.1.qcow2"
             }
         },
         {
             "name": "7.0.3.I7.9",
             "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                 "hda_disk_image": "nxosv-final.7.0.3.I7.9.qcow2"
             }
         },
         {
             "name": "7.0.3.I7.7",
             "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                 "hda_disk_image": "nxosv-final.7.0.3.I7.7.qcow2"
             }
         },
         {
             "name": "7.0.3.I7.6",
             "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                 "hda_disk_image": "nxosv-final.7.0.3.I7.6.qcow2"
             }
         },
         {
             "name": "7.0.3.I7.5",
             "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                 "hda_disk_image": "nxosv-final.7.0.3.I7.5.qcow2"
             }
         },
         {
             "name": "7.0.3.I7.4",
             "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                 "hda_disk_image": "nxosv-final.7.0.3.I7.4.qcow2"
             }
         },
         {
             "name": "7.0.3.I7.3",
             "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                 "hda_disk_image": "nxosv-final.7.0.3.I7.3.qcow2"
             }
         },
         {
             "name": "7.0.3.I7.2",
             "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                 "hda_disk_image": "nxosv-final.7.0.3.I7.2.qcow2"
             }
         },
         {
             "name": "7.0.3.I7.1",
             "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                 "hda_disk_image": "nxosv-final.7.0.3.I7.1.qcow2"
             }
         },
         {
             "name": "7.0.3.I6.1",
             "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                 "hda_disk_image": "nxosv-final.7.0.3.I6.1.qcow2"
             }
         },
         {
             "name": "7.0.3.I5.2",
             "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                 "hda_disk_image": "nxosv-final.7.0.3.I5.2.qcow2"
             }
         },
         {
             "name": "7.0.3.I5.1",
             "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                 "hda_disk_image": "nxosv-final.7.0.3.I5.1.qcow2"
             }
         }

gns3server/appliances/cloudrouter.gns3a

@@ -5,6 +5,7 @@
     "description": "The CloudRouter Project is a collaborative open source project focused on developing a powerful, easy to use router designed for the cloud.\nCompute resources are rapidly migrating from physical infrastructure to a combination of physical, virtual and cloud environments. A similar transition is emerging in the networking space, with network control logic shifting from proprietary hardware-based platforms to open source software-based platforms. CloudRouter is a software-based router distribution designed to run on physical, virtual and cloud environments, supporting software-defined networking infrastructure. It includes the features of traditional hardware routers, as well as support for emerging technologies such as containers and software-defined interconnection. CloudRouter aims to facilitate migration to the cloud without giving up control over network routing and governance.",
     "vendor_name": "CloudRouter Community",
     "vendor_url": "https://cloudrouter.org/",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/CloudRouter.png",
     "documentation_url": "https://cloudrouter.atlassian.net/wiki/display/CPD/CloudRouter+Project+Information",
     "product_name": "CloudRouter",
     "product_url": "https://cloudrouter.org/about/",

gns3server/appliances/coreos.gns3a

@@ -5,6 +5,7 @@
     "description": "CoreOS is designed for security, consistency, and reliability. Instead of installing packages via yum or apt, CoreOS uses Linux containers to manage your services at a higher level of abstraction. A single service's code and all dependencies are packaged within a container that can be run on one or many CoreOS machines.",
     "vendor_name": "CoreOS, Inc",
     "vendor_url": "https://coreos.com/",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/CoreOS.png",
     "documentation_url": "https://coreos.com/docs/",
     "product_name": "CoreOS",
     "registry_version": 4,

gns3server/appliances/cumulus-vx.gns3a

@@ -5,6 +5,7 @@
     "description": "Cumulus VX is a community-supported virtual appliance that enables cloud admins and network engineers to preview and test Cumulus Networks technology at zero cost. You can build sandbox environments to learn Open Networking concepts, prototype network operations and script & develop applications risk-free. With Cumulus VX, you can get started with Open Networking at your pace, on your time, and in your environment!",
     "vendor_name": "Cumulus Network",
     "vendor_url": "https://www.cumulusnetworks.com",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/Cumulus VX.jpg",
     "documentation_url": "http://docs.cumulusnetworks.com/",
     "product_name": "Cumulus VX",
     "product_url": "https://cumulusnetworks.com/cumulus-vx/",

gns3server/appliances/debian.gns3a

@@ -8,9 +8,9 @@
     "product_name": "Debian",
     "registry_version": 4,
     "status": "experimental",
-    "maintainer": "GNS3 Team",
-    "maintainer_email": "developers@gns3.net",
-    "usage": "Username:\tdebian\nPassword:\tdebian\nTo become root, use \"sudo -s\".\n\nNetwork configuration:\n- In \"/etc/network/interfaces\" comment out \"source-directory /run/network/interfaces.d\"\n- Remove \"/etc/network/interfaces.d/50-cloud-init\"\n- Create \"/etc/network/interfaces.d/10-ens4\", for example:\n\nauto ens4\n#iface ens4 inet dhcp\niface ens4 inet static\n    address 10.1.1.100/24\n    gateway 10.1.1.1\n    dns-nameservers 10.1.1.1\n",
+    "maintainer": "Bernhard Ehlers",
+    "maintainer_email": "dev-ehlers@mailbox.org",
+    "usage": "Username:\tdebian\nPassword:\tdebian\nTo become root, use \"sudo -s\".\n",
     "symbol": "linux_guest.svg",
     "port_name_format": "ens{port4}",
     "qemu": {
@@ -24,43 +24,33 @@
     },
     "images": [
         {
-            "filename": "debian-11-genericcloud-amd64-20221219-1234.qcow2",
-            "version": "11.6",
-            "md5sum": "bd6ddbccc89e40deb7716b812958238d",
-            "filesize": 258801664,
-            "download_url": "https://cloud.debian.org/images/cloud/bullseye/",
-            "direct_download_url": "https://cloud.debian.org/images/cloud/bullseye/20221219-1234/debian-11-genericcloud-amd64-20221219-1234.qcow2"
+            "filename": "debian-12.2.qcow2",
+            "version": "12.2",
+            "md5sum": "adf7716ec4a4e4e9e5ccfc7a1d7bd103",
+            "filesize": 286654464,
+            "download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/",
+            "direct_download_url": "https://downloads.sourceforge.net/project/gns-3/Qemu%20Appliances/debian-12.2.qcow2"
         },
         {
-            "filename": "debian-10-genericcloud-amd64-20220911-1135.qcow2",
-            "version": "10.13",
-            "md5sum": "9d4d1175bef974caba79dd6ca33d500c",
-            "filesize": 234749952,
-            "download_url": "https://cloud.debian.org/images/cloud/buster/",
-            "direct_download_url": "https://cloud.debian.org/images/cloud/buster/20220911-1135/debian-10-genericcloud-amd64-20220911-1135.qcow2"
-        },
-        {
-            "filename": "debian-cloud-init-data.iso",
-            "version": "1.0",
-            "md5sum": "43f6bf70c178a9d3c270b5c24971e578",
-            "filesize": 374784,
-            "download_url": "https://github.com/GNS3/gns3-registry/tree/master/cloud-init/Debian",
-            "direct_download_url": "https://github.com/GNS3/gns3-registry/raw/master/cloud-init/Debian/debian-cloud-init-data.iso"
+            "filename": "debian-11.8.qcow2",
+            "version": "11.8",
+            "md5sum": "95bf44716c7fa1a1da290fd3c98591f2",
+            "filesize": 264933376,
+            "download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/",
+            "direct_download_url": "https://downloads.sourceforge.net/project/gns-3/Qemu%20Appliances/debian-11.8.qcow2"
         }
     ],
     "versions": [
         {
-            "name": "11.6",
+            "name": "12.2",
             "images": {
-                "hda_disk_image": "debian-11-genericcloud-amd64-20221219-1234.qcow2",
-                "cdrom_image": "debian-cloud-init-data.iso"
+                "hda_disk_image": "debian-12.2.qcow2"
             }
         },
         {
-            "name": "10.13",
+            "name": "11.8",
             "images": {
-                "hda_disk_image": "debian-10-genericcloud-amd64-20220911-1135.qcow2",
-                "cdrom_image": "debian-cloud-init-data.iso"
+                "hda_disk_image": "debian-11.8.qcow2"
             }
         }
     ]

gns3server/appliances/empty-vm.gns3a

@@ -33,6 +33,22 @@
             "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/empty8G.qcow2/download"
         },
+        {
+            "filename": "empty10G.qcow2",
+            "version": "10G",
+            "md5sum": "1d4589798b8a63a6afa7150492ca3193",
+            "filesize": 196768,
+            "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/empty10G.qcow2/download"
+        },
+        {
+            "filename": "empty20G.qcow2",
+            "version": "20G",
+            "md5sum": "df9e4a1169c597117fd8999f0bc3de91",
+            "filesize": 196928,
+            "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/empty20G.qcow2/download"
+        },
         {
             "filename": "empty30G.qcow2",
             "version": "30G",
@@ -41,6 +57,22 @@
             "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/empty30G.qcow2/download"
         },
+        {
+            "filename": "empty40G.qcow2",
+            "version": "40G",
+            "md5sum": "4a9e538aa1946a27d91a8d53a8dbc546",
+            "filesize":  197248,
+            "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/empty50G.qcow2/download"
+        },
+        {
+            "filename": "empty50G.qcow2",
+            "version": "50G",
+            "md5sum": "9a17e67e685907fbc0c351689ab289b2",
+            "filesize":  197408,
+            "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/empty40G.qcow2/download"
+        },
         {
             "filename": "empty100G.qcow2",
             "version": "100G",
@@ -49,6 +81,14 @@
             "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": "empty150G.qcow2",
+            "version": "150G",
+            "md5sum": "7db590ad39f84fdfc91516d162af26f6",
+            "filesize": 199008,
+            "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/empty150G.qcow2/download"
+        },
         {
             "filename": "empty200G.qcow2",
             "version": "200G",
@@ -56,6 +96,30 @@
             "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"
+        },
+        {
+            "filename": "empty250G.qcow2",
+            "version": "250G",
+            "md5sum": "7d7272f02edd189aafd81f9c29a35255",
+            "filesize": 200608,
+            "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/empty250G.qcow2/download"
+        },
+        {
+            "filename": "empty500G.qcow2",
+            "version": "500G",
+            "md5sum": "658c825441b9b3080ba00f9eec002eaa",
+            "filesize": 204608,
+            "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/empty500G.qcow2/download"
+        },
+        {
+            "filename": "empty1T.qcow2",
+            "version": "1T",
+            "md5sum": "34997a22f618827aaa62bcfd5b8ce2bb",
+            "filesize": 212992,
+            "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/empty1T.qcow2/download"
         }
     ],
     "versions": [
@@ -65,23 +129,71 @@
                 "hda_disk_image": "empty8G.qcow2"
             }
         },
+        {
+            "name": "10G",
+            "images": {
+                "hda_disk_image": "empty10G.qcow2"
+            }
+        },
+        {
+            "name": "20G",
+            "images": {
+                "hda_disk_image": "empty20G.qcow2"
+            }
+        },
         {
             "name": "30G",
             "images": {
                 "hda_disk_image": "empty30G.qcow2"
             }
         },
+        {
+            "name": "40G",
+            "images": {
+                "hda_disk_image": "empty40G.qcow2"
+            }
+        },
+        {
+            "name": "50G",
+            "images": {
+                "hda_disk_image": "empty50G.qcow2"
+            }
+        },
         {
             "name": "100G",
             "images": {
                 "hda_disk_image": "empty100G.qcow2"
             }
         },
+        {
+            "name": "150G",
+            "images": {
+                "hda_disk_image": "empty150G.qcow2"
+            }
+        },
         {
             "name": "200G",
             "images": {
                 "hda_disk_image": "empty200G.qcow2"
             }
+        },
+        {
+            "name": "250G",
+            "images": {
+                "hda_disk_image": "empty250G.qcow2"
+            }
+        },
+        {
+            "name": "500G",
+            "images": {
+                "hda_disk_image": "empty500G.qcow2"
+            }
+        },
+        {
+            "name": "1T",
+            "images": {
+                "hda_disk_image": "empty1T.qcow2"
+            }
         }
     ]
 }

gns3server/appliances/endhost.gns3a

@@ -0,0 +1,17 @@
+{
+    "appliance_id": "f59a5cf6-baaa-45a6-9685-989a2c3f3f4a",
+    "name": "endhost",
+    "category": "guest",
+    "description": "General purpose alpine-based endhost",
+    "vendor_name": "endhost",
+    "vendor_url": "https://www.alpinelinux.org",
+    "product_name": "endhost",
+    "registry_version": 4,
+    "status": "experimental",
+    "maintainer": "GNS3 Team",
+    "maintainer_email": "developers@gns3.net",
+    "docker": {
+        "adapters": 1,
+        "image": "gns3/endhost:latest"
+    }
+}

gns3server/appliances/extreme-networks-voss.gns3a

@@ -5,6 +5,7 @@
     "description": "The VOSS VM is a software emulation of a VSP8K switch.",
     "vendor_name": "Extreme Networks",
     "vendor_url": "http://www.extremenetworks.com",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/VOSS VM.jpeg",
     "documentation_url": "http://www.extremenetworks.com/support/documentation",
     "product_name": "VOSS_VM",
     "registry_version": 4,
@@ -27,6 +28,13 @@
         "options": "-nographic"
     },
     "images": [
+        {
+            "filename": "VOSSGNS3.8.10.1.0.qcow2",
+            "version": "v8.10.1.0",
+            "md5sum": "d8f09f5a9759882be84ad7e4be575ed3",
+            "filesize": 433258496,
+			"direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_VOSS/VOSSGNS3.8.10.1.0.qcow2"
+        },
         {
             "filename": "VOSSGNS3.8.8.0.0.qcow2",
             "version": "v8.8.0.0",
@@ -85,6 +93,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "v8.10.1.0",
+            "images":
+            {
+                "hda_disk_image": "VOSSGNS3.8.10.1.0.qcow2"
+            }
+        },
         {
             "name": "v8.8.0.0",
             "images": {

gns3server/appliances/fedora-cloud.gns3a

@@ -26,6 +26,30 @@
         "options": "-nographic"
     },
     "images": [
+        {
+            "filename": "Fedora-Cloud-Base-38-1.6.x86_64.qcow2",
+            "version": "38-1.6",
+            "md5sum": "53ddfe7b28666d5ddc55e93ff06abad2",
+            "filesize": 497287168,
+            "download_url": "https://download.fedoraproject.org/pub/fedora/linux/releases/38/Cloud/x86_64/images",
+            "direct_download_url": "https://download.fedoraproject.org/pub/fedora/linux/releases/38/Cloud/x86_64/images/Fedora-Cloud-Base-38-1.6.x86_64.qcow2"
+        },
+        {
+            "filename": "Fedora-Cloud-Base-37-1.7.x86_64.qcow2",
+            "version": "37-1.7",
+            "md5sum": "36f7b464b6ab46ad97c001b539495e90",
+            "filesize": 492830720,
+            "download_url": "https://download.fedoraproject.org/pub/fedora/linux/releases/37/Cloud/x86_64/images",
+            "direct_download_url": "https://download.fedoraproject.org/pub/fedora/linux/releases/37/Cloud/x86_64/images/Fedora-Cloud-Base-37-1.7.x86_64.qcow2"
+        },
+        {
+            "filename": "Fedora-Cloud-Base-36-1.5.x86_64.qcow2",
+            "version": "36-1.5",
+            "md5sum": "7f7cdad25b77f232078bf454c39529d3",
+            "filesize": 448266240,
+            "download_url": "https://download.fedoraproject.org/pub/fedora/linux/releases/36/Cloud/x86_64/images",
+            "direct_download_url": "https://download.fedoraproject.org/pub/fedora/linux/releases/36/Cloud/x86_64/images/Fedora-Cloud-Base-36-1.5.x86_64.qcow2"
+        },
         {
             "filename": "Fedora-Cloud-Base-35-1.2.x86_64.qcow2",
             "version": "35-1.2",
@@ -44,6 +68,27 @@
         }
     ],
     "versions": [
+        {
+            "name": "38-1.6",
+            "images": {
+                "hda_disk_image": "Fedora-Cloud-Base-38-1.6.x86_64.qcow2",
+                "cdrom_image": "fedora-cloud-init-data.iso"
+            }
+        },
+        {
+            "name": "37-1.7",
+            "images": {
+                "hda_disk_image": "Fedora-Cloud-Base-37-1.7.x86_64.qcow2",
+                "cdrom_image": "fedora-cloud-init-data.iso"
+            }
+        },
+        {
+            "name": "36-1.5",
+            "images": {
+                "hda_disk_image": "Fedora-Cloud-Base-36-1.5.x86_64.qcow2",
+                "cdrom_image": "fedora-cloud-init-data.iso"
+            }
+        },
         {
             "name": "35-1.2",
             "images": {

gns3server/appliances/firefox.gns3a

@@ -5,6 +5,7 @@
     "description": "A light Linux based on TinyCore Linux with Firefox preinstalled",
     "vendor_name": "Mozilla Foundation",
     "vendor_url": "http://www.mozilla.org",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/Firefox.png",
     "documentation_url": "https://support.mozilla.org",
     "product_name": "Firefox",
     "product_url": "https://www.mozilla.org/firefox",

gns3server/appliances/fortianalyzer.gns3a

@@ -5,20 +5,22 @@
     "description": "FortiAnalyzer Network Security Logging, Analysis, and Reporting Appliances securely aggregate log data from Fortinet Security Appliances. A comprehensive suite of easily customable reports allows you to quickly analyze and visualize network threats, inefficiencies and usage.",
     "vendor_name": "Fortinet",
     "vendor_url": "http://www.fortinet.com/",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/FortiAnalyzer.jpg",
     "documentation_url": "http://docs.fortinet.com/fortianalyzer/",
     "product_name": "FortiAnalyzer",
     "product_url": "https://www.fortinet.com/products-services/products/management-reporting/fortianalyzer.html",
     "registry_version": 4,
     "status": "stable",
-    "maintainer": "GNS3 Team",
-    "maintainer_email": "developers@gns3.net",
-    "usage": "Default username is admin, no password is set.\n\n- Versions 7.0 and higher require:\n--RAM: 8192 MB\n--CPU:4",
+    "maintainer": "Ean Towne",
+    "maintainer_email": "ean.fortinet@gmail.com",
+    "usage": "Default username is admin, no password is set.\n\n- Versions lower than 7.0.x can reduce CPU/RAM",
     "symbol": "fortinet.svg",
     "port_name_format": "Port{port1}",
     "qemu": {
         "adapter_type": "e1000",
         "adapters": 4,
-        "ram": 4096,
+        "ram": 16384,
+        "cpus": 4,
         "hda_disk_interface": "virtio",
         "hdb_disk_interface": "virtio",
         "arch": "x86_64",
@@ -27,6 +29,20 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "FAZ_VM64_KVM-v7.4.1-build2308-FORTINET.out.kvm.qcow2",
+            "version": "7.4.1",
+            "md5sum": "f30caac36854c2a0cc1e35c4ab5f310d",
+            "filesize": 435310592,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FAZ_VM64_KVM-v7.2.4-build1460-FORTINET.out.kvm.qcow2",
+            "version": "7.2.4",
+            "md5sum": "d53bd5c61cc3f5e387557dfcfe9bc530",
+            "filesize": 363327488,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FAZ_VM64_KVM-v7.2.2-build1334-FORTINET.out.kvm.qcow2",
             "version": "7.2.2",
@@ -41,6 +57,13 @@
             "filesize": 340631552,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
+        {
+            "filename": "FAZ_VM64_KVM-v7.0.9-build0489-FORTINET.out.kvm.qcow2",
+            "version": "7.0.9",
+            "md5sum": "3f69c9bc4fa7776476edf0ce9728ebd7",
+            "filesize": 347889664,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FAZ_VM64_KVM-v7.0.6-build0372-FORTINET.out.kvm.qcow2",
             "version": "7.0.6",
@@ -55,6 +78,13 @@
             "filesize": 334184448,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
+        {
+            "filename": "FAZ_VM64_KVM-v6.4.12-build2610-FORTINET.out.kvm.qcow2",
+            "version": "6.4.12",
+            "md5sum": "b9e164c2d4e778348a6a7107d375abf3",
+            "filesize": 300691456,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FAZ_VM64_KVM-v6-build2288-FORTINET.out.kvm.qcow2",
             "version": "6.4.5",
@@ -205,6 +235,20 @@
         }
     ],
     "versions": [
+        {
+            "name": "7.4.1",
+            "images": {
+                "hda_disk_image": "FAZ_VM64_KVM-v7.4.1-build2308-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "7.2.4",
+            "images": {
+                "hda_disk_image": "FAZ_VM64_KVM-v7.2.4-build1460-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "7.2.2",
             "images": {
@@ -219,6 +263,13 @@
                 "hdb_disk_image": "empty30G.qcow2"
             }
         },
+        {
+            "name": "7.0.9",
+            "images": {
+                "hda_disk_image": "FAZ_VM64_KVM-v7.0.9-build0489-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "7.0.6",
             "images": {
@@ -233,6 +284,13 @@
                 "hdb_disk_image": "empty30G.qcow2"
             }
         },
+        {
+            "name": "6.4.12",
+            "images": {
+                "hda_disk_image": "FAZ_VM64_KVM-v6.4.12-build2610-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "6.4.5",
             "images": {

gns3server/appliances/fortiauthenticator.gns3a

@@ -5,6 +5,7 @@
     "description": "FortiAuthenticator user identity management appliances strengthen enterprise security by simplifying and centralizing the management and storage of user identity information.",
     "vendor_name": "Fortinet",
     "vendor_url": "http://www.fortinet.com/",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/FortiAuthenticator.jpg",
     "documentation_url": "http://docs.fortinet.com/fortiauthenticator/admin-guides",
     "product_name": "FortiAuthenticator",
     "product_url": "https://www.fortinet.com/products/identity-access-management/fortiauthenticator.html",

gns3server/appliances/forticache.gns3a

@@ -5,6 +5,7 @@
     "description": "FortiCache VM high performance Web Caching virtual appliances address bandwidth saturation, high latency, and poor performance caused by caching popular internet content locally for carriers, service providers, enterprises and educational networks. FortiCache VM appliances reduce the cost and impact of cached content on the network, while increasing performance and end- user satisfaction by improving the speed of delivery of popular repeated content.",
     "vendor_name": "Fortinet",
     "vendor_url": "http://www.fortinet.com/",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/FortiCache.jpg",
     "documentation_url": "http://docs.fortinet.com/forticache/admin-guides",
     "product_name": "FortiCache",
     "product_url": "https://www.fortinet.com/products-services/products/wan-appliances/forticache.html",

gns3server/appliances/fortigate.gns3a

@@ -5,20 +5,21 @@
     "description": "FortiGate Virtual Appliance offers the same level of advanced threat prevention features like the physical appliances in private, hybrid and public cloud deployment.",
     "vendor_name": "Fortinet",
     "vendor_url": "http://www.fortinet.com/",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/FortiGate.jpg",
     "documentation_url": "http://docs.fortinet.com/p/inside-fortios",
     "product_name": "FortiGate",
     "product_url": "http://www.fortinet.com/products/fortigate/virtual-appliances.html",
     "registry_version": 4,
     "status": "stable",
-    "maintainer": "GNS3 Team",
-    "maintainer_email": "developers@gns3.net",
+    "maintainer": "Ean Towne",
+    "maintainer_email": "ean.fortinet@gmail.com",
     "usage": "Default username is admin, no password is set.\n\n- FortiGate version 7.0.0 and above require 2GB RAM.\n\n- FortiGate versions higher than 7.2.0 trial license is VERY restrictive, not recommended for use.",
     "symbol": "fortinet.svg",
     "port_name_format": "Port{port1}",
     "qemu": {
         "adapter_type": "e1000",
         "adapters": 10,
-        "ram": 1024,
+        "ram": 2048,
         "hda_disk_interface": "virtio",
         "hdb_disk_interface": "virtio",
         "arch": "x86_64",
@@ -27,6 +28,20 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "FGT_VM64_KVM-v7.4.1.F-build2463-FORTINET.out.kvm.qcow2",
+            "version": "7.4.1",
+            "md5sum": "362a2f3d4ca842aaabd87191d4446584",
+            "filesize": 116064256,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FGT_VM64_KVM-v7.2.6.F-build1575-FORTINET.out.kvm.qcow2",
+            "version": "7.2.6",
+            "md5sum": "b5ef3c844abb4947f98b88ae0048660b",
+            "filesize": 103022592,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FGT_VM64_KVM-v7.2.4.F-build1396-FORTINET.out.kvm.qcow2",
             "version": "7.2.4",
@@ -48,6 +63,20 @@
             "filesize": 86704128,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
+        {
+            "filename": "FGT_VM64_KVM-v7.0.13.M-build0566-FORTINET.out.kvm.qcow2",
+            "version": "7.0.13",
+            "md5sum": "47a4bab29407153a635c54b64d6a226e",
+            "filesize": 89325568,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FGT_VM64_KVM-v7.0.12.M-build0523-FORTINET.out.kvm.qcow2",
+            "version": "7.0.12",
+            "md5sum": "7cd2452dde489c80f48c40a7f8a48c8e",
+            "filesize": 88997888,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FGT_VM64_KVM-v7.0.10.M-build0450-FORTINET.out.kvm.qcow2",
             "version": "7.0.10",
@@ -62,6 +91,13 @@
             "filesize": 77135872,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
+        {
+            "filename": "FGT_VM64_KVM-v6.4.14.M-build2093-FORTINET.out.kvm.qcow2",
+            "version": "6.4.14",
+            "md5sum": "5758340f9d3e1a03139176ab46e63e8d",
+            "filesize": 81461248,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FGT_VM64_KVM-v6.4.12.M-build2060-FORTINET.out.kvm.qcow2",
             "version": "6.4.12",
@@ -303,6 +339,20 @@
         }
     ],
     "versions": [
+        {
+            "name": "7.4.1",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v7.4.1.F-build2463-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "7.2.6",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v7.2.6.F-build1575-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "7.2.4",
             "images": {
@@ -324,6 +374,20 @@
                 "hdb_disk_image": "empty30G.qcow2"
             }
         },
+        {
+            "name": "7.0.13",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v7.0.13.M-build0566-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "7.0.12",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v7.0.12.M-build0523-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "7.0.10",
             "images": {
@@ -338,6 +402,13 @@
                 "hdb_disk_image": "empty30G.qcow2"
             }
         },
+        {
+            "name": "6.4.14",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v6.4.14.M-build2093-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "6.4.12",
             "images": {

gns3server/appliances/fortimail.gns3a

@@ -5,6 +5,7 @@
     "description": "FortiMail is a complete Secure Email Gateway offering suitable for any size organization. It provides a single solution to protect against inbound attacks - including advanced malware -, as well as outbound threats and data loss with a wide range of top-rated security capabilities.",
     "vendor_name": "Fortinet",
     "vendor_url": "http://www.fortinet.com/",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/FortiMail.jpg",
     "documentation_url": "http://docs.fortinet.com/fortimail/admin-guides",
     "product_name": "FortiMail",
     "product_url": "http://www.fortinet.com/products/fortimail/index.html",

gns3server/appliances/fortimanager.gns3a

@@ -5,20 +5,22 @@
     "description": "FortiManager Security Management appliances allow you to centrally manage any number of Fortinet Network Security devices, from several to thousands, including FortiGate, FortiWiFi, and FortiCarrier.",
     "vendor_name": "Fortinet",
     "vendor_url": "http://www.fortinet.com/",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/FortiManager.jpg",
     "documentation_url": "http://docs.fortinet.com/p/inside-fortios",
     "product_name": "FortiManager",
     "product_url": "http://www.fortinet.com/products/fortimanager/virtual-security-management.html",
     "registry_version": 4,
     "status": "stable",
-    "maintainer": "GNS3 Team",
-    "maintainer_email": "developers@gns3.net",
-    "usage": "Default username is admin, no password is set.\n\n- Versions 7.0 and higher require:\n--RAM: 8192 MB\n--CPU:4",
+    "maintainer": "Ean Towne",
+    "maintainer_email": "ean.fortinet@gmail.com",
+    "usage": "Default username is admin, no password is set.\n\n- Versions lower than 7.0.x require less CPU/RAM",
     "symbol": "fortinet.svg",
     "port_name_format": "Port{port1}",
     "qemu": {
         "adapter_type": "virtio-net-pci",
         "adapters": 4,
-        "ram": 2048,
+        "ram": 8192,
+        "cpus": 4,
         "hda_disk_interface": "virtio",
         "hdb_disk_interface": "virtio",
         "arch": "x86_64",
@@ -27,6 +29,20 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "FMG_VM64_KVM-v7.4.1-build2308-FORTINET.out.kvm.qcow2",
+            "version": "7.4.1",
+            "md5sum": "e542cc8f2d8f46e9c32b783bf31bef39",
+            "filesize": 309387264,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FMG_VM64_KVM-v7.2.4-build1460-FORTINET.out.kvm.qcow2",
+            "version": "7.2.4",
+            "md5sum": "98fa9830d9ecb5911a703d03b80026b6",
+            "filesize": 261992448,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FMG_VM64_KVM-v7.2.2-build1334-FORTINET.out.kvm.qcow2",
             "version": "7.2.2",
@@ -41,6 +57,13 @@
             "filesize": 242814976,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
+        {
+            "filename": "FMG_VM64_KVM-v7.0.9-build0489-FORTINET.out.kvm.qcow2",
+            "version": "7.0.9",
+            "md5sum": "dbeb6a79b6e421000573dbbbdb50b8b5",
+            "filesize": 247955456,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FMG_VM64_KVM-v7.0.6-build0372-FORTINET.out.kvm.qcow2",
             "version": "7.0.6",
@@ -55,6 +78,13 @@
             "filesize": 237535232,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
+        {
+            "filename": "FMG_VM64_KVM-v6.4.12-build2610-FORTINET.out.kvm.qcow2",
+            "version": "6.4.12",
+            "md5sum": "36c0dc531d921e5f1e1e09b030f7c813",
+            "filesize": 219455488,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FMG_VM64_KVM-v6-build2288-FORTINET.out.kvm.qcow2",
             "version": "6.4.5",
@@ -205,6 +235,20 @@
         }
     ],
     "versions": [
+        {
+            "name": "7.4.1",
+            "images": {
+                "hda_disk_image": "FMG_VM64_KVM-v7.4.1-build2308-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "7.2.4",
+            "images": {
+                "hda_disk_image": "FMG_VM64_KVM-v7.2.4-build1460-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "7.2.2",
             "images": {
@@ -219,6 +263,13 @@
                 "hdb_disk_image": "empty30G.qcow2"
             }
         },
+        {
+            "name": "7.0.9",
+            "images": {
+                "hda_disk_image": "FMG_VM64_KVM-v7.0.9-build0489-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "7.0.6",
             "images": {
@@ -233,6 +284,13 @@
                 "hdb_disk_image": "empty30G.qcow2"
             }
         },
+        {
+            "name": "6.4.12",
+            "images": {
+                "hda_disk_image": "FMG_VM64_KVM-v6.4.12-build2610-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "6.4.5",
             "images": {

gns3server/appliances/fortisandbox.gns3a

@@ -5,6 +5,7 @@
     "description": "Today's threats are increasingly sophisticated and often bypass traditional malware security by masking their malicious activity. A sandbox augments your security architecture by validating threats in a separate, secure environment. FortiSandbox offers a powerful combination of advanced detection, automated mitigation, actionable insight, and flexible deployment to stop targeted attacks and subsequent data loss. It's also a key component of our Advanced Threat Protection solution.",
     "vendor_name": "Fortinet",
     "vendor_url": "http://www.fortinet.com/",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/FortiSandbox.jpg",
     "documentation_url": "http://docs.fortinet.com/fortisandbox/admin-guides",
     "product_name": "FortiSandbox",
     "product_url": "https://www.fortinet.com/products/sandbox/fortisandbox.html",

gns3server/appliances/fortisiem-super_worker.gns3a

@@ -5,6 +5,7 @@
     "description": "Breaches to network security continue to occur across all industry verticals, even to the most respected brands. The time it takes to discover, isolate, and remediate the incident continues to be measured in hundreds of days-having material impacts on security and compliance standards. It is no wonder that many organizations are struggling. As recent surveys have shown, enterprises have an average of 32 different vendors' devices in their network, with no automated ability to cross-correlate the data that each is collecting. It is also easy to see why organizations are strapped for the cyber security personnel they need to manage all the data in these complex environments.\n\nFrom its inception, FortiSIEM was built to reduce complexity in managing network and security operations. FortiSIEM provides organizations of all sizes with a comprehensive, holistic, and scalable solution for managing security, performance, and compliance from IoT to the cloud.",
     "vendor_name": "Fortinet",
     "vendor_url": "http://www.fortinet.com/",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/FortiSIEM.jpg",
     "documentation_url": "http://docs.fortinet.com/fortisiem/admin-guides",
     "product_name": "FortiSIEM",
     "product_url": "https://www.fortinet.com/products/siem/fortisiem.html",

gns3server/appliances/fortiweb.gns3a

@@ -5,6 +5,7 @@
     "description": "FortiWeb Web Application Firewalls provide specialized, layered web application threat protection for medium/large enterprises, application service providers, and SaaS providers.",
     "vendor_name": "Fortinet",
     "vendor_url": "http://www.fortinet.com/",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/FortiWeb.jpg",
     "documentation_url": "http://docs.fortinet.com/fortiweb",
     "product_name": "FortiWeb",
     "product_url": "http://www.fortinet.com/products/fortiweb/index.html",

gns3server/appliances/freebsd.gns3a

@@ -5,6 +5,7 @@
     "description": "FreeBSD is an advanced computer operating system used to power modern servers, desktops, and embedded platforms. A large community has continually developed it for more than thirty years. Its advanced networking, security, and storage features have made FreeBSD the platform of choice for many of the busiest web sites and most pervasive embedded networking and storage devices.",
     "vendor_name": "FreeBSD",
     "vendor_url": "http://www.freebsd.org",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/FreeBSD.jpg",
     "documentation_url": "https://www.freebsd.org/docs.html",
     "product_name": "FreeBSD",
     "registry_version": 4,

gns3server/appliances/haproxy.gns3a

@@ -0,0 +1,18 @@
+{
+    "appliance_id": "79df483d-8cc9-48de-85ea-e6cb45b93e2a",
+    "name": "haproxy",
+    "category": "guest",
+    "description": "haproxy alpine container",
+    "vendor_name": "haproxy",
+    "vendor_url": "https://www.haproxy.org",
+    "product_name": "haproxy",
+    "registry_version": 4,
+    "status": "experimental",
+    "maintainer": "GNS3 Team",
+    "maintainer_email": "developers@gns3.net",
+    "usage": "Modify /etc/haproxy/haproxy.cfg to suit your needs.",
+    "docker": {
+        "adapters": 1,
+        "image": "gns3/haproxy:latest"
+    }
+}

gns3server/appliances/hp-vsr1001.gns3a

@@ -5,6 +5,7 @@
     "description": "The HPE VSR1000 Virtual Services Router Series is a software application, running on a server, which provides functionality similar to that of a physical router: robust routing between networked devices using a number of popular routing protocols. It also delivers the critical network services associated with today's enterprise routers such as VPN gateway, firewall and other security and traffic management functions.\n\nThe virtual services router (VSR) application runs on a hypervqcor on the server, and supports VMware vSphere and Linux KVM hypervqcors. From one to eight virtual CPUs are supported, depending on license.\n\nBecause the VSR1000 Series application runs the same HPE Comware version 7 operating system as HPE switches and routers, it enables significant operational savings. And being virtual, additional agility and ease of deployment is realized, as resources on the VSR can be dynamically allocated and upgraded upon demand as performance requirements grow.\n\nA variety of deployment models are supported including enterprise branch CPE routing, and cloud offload for small to medium workloads.",
     "vendor_name": "HPE",
     "vendor_url": "http://www.hpe.com",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/HPE VSR1001.jpg",
     "documentation_url": "https://support.hpe.com/hpesc/public/home/documentHome?document_type=135&sp4ts.oid=5195141",
     "product_name": "VSR1001",
     "product_url": "https://www.hpe.com/us/en/product-catalog/networking/networking-routers/pip.hpe-flexnetwork-vsr1000-virtual-services-router-series.5443163.html",

gns3server/appliances/huawei-ce12800.gns3a

@@ -21,7 +21,7 @@
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "require",
-        "options": "-machine type=pc-1.0,accel=kvm -serial mon:stdio -nographic -nodefaults -rtc base=utc -cpu host"
+        "options": "-machine type=pc,accel=kvm -serial mon:stdio -nographic -nodefaults -rtc base=utc -cpu host"
     },
     "images": [
         {

gns3server/appliances/huawei-ne40e.gns3a

@@ -23,7 +23,7 @@
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "require",
-        "options": "-machine type=pc-1.0,accel=kvm -serial mon:stdio -nographic -nodefaults -rtc base=utc -cpu host"
+        "options": "-machine type=pc,accel=kvm -serial mon:stdio -nographic -nodefaults -rtc base=utc -cpu host"
     },
     "images": [
         {

gns3server/appliances/ipterm.gns3a

@@ -8,8 +8,8 @@
     "product_name": "ipterm",
     "registry_version": 4,
     "status": "stable",
-    "maintainer": "GNS3 Team",
-    "maintainer_email": "developers@gns3.net",
+    "maintainer": "Bernhard Ehlers",
+    "maintainer_email": "dev-ehlers@mailbox.org",
     "usage": "The /root directory is persistent.",
     "symbol": "linux_guest.svg",
     "docker": {

gns3server/appliances/kerio-connect.gns3a

@@ -5,6 +5,7 @@
     "description": "Kerio Connect makes email, calendars, contacts and task management easy and affordable. With Kerio Connect, you have immediate, secure access to your communications anytime, anywhere, on any device - without complexity or expensive overhead.",
     "vendor_name": "Kerio Technologies Inc.",
     "vendor_url": "http://www.kerio.com",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/Kerio Connect.jpg",
     "documentation_url": "http://kb.kerio.com/product/kerio-connect/",
     "product_name": "Kerio Connect",
     "product_url": "http://www.kerio.com/products/kerio-connect",

gns3server/appliances/kerio-control.gns3a

@@ -5,6 +5,7 @@
     "description": "Protect your network from viruses, malware and malicious activity with Kerio Control, the easy-to-administer yet powerful all-in-one security solution.\nKerio Control brings together next-generation firewall capabilities - including a network firewall and router, intrusion detection and prevention (IPS), gateway anti-virus, VPN, and web content and application filtering. These comprehensive capabilities and unmatched deployment flexibility make Kerio Control the ideal choice for small and mid-sized businesses.",
     "vendor_name": "Kerio Technologies Inc.",
     "vendor_url": "http://www.kerio.com",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/Kerio Control.jpg",
     "documentation_url": "http://kb.kerio.com/product/kerio-control/",
     "product_name": "Kerio Control",
     "product_url": "http://www.kerio.com/products/kerio-control",

gns3server/appliances/kerio-operator.gns3a

@@ -5,6 +5,7 @@
     "description": "Stay connected to your customers and colleagues without being chained to your desk.\nKerio Operator is a VoIP based phone system that provides powerful yet affordable enterprise-class voice and video communication capabilities for small and mid-sized businesses globally.",
     "vendor_name": "Kerio Technologies Inc.",
     "vendor_url": "http://www.kerio.com",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/Kerio Operator.jpg",
     "documentation_url": "http://kb.kerio.com/product/kerio-operator/",
     "product_name": "Kerio Operator",
     "product_url": "http://www.kerio.com/products/kerio-operator",

gns3server/appliances/mikrotik-chr.gns3a

@@ -27,6 +27,24 @@
         "options": "-nographic"
     },
     "images": [
+        {
+            "filename": "chr-7.11.2.img",
+            "version": "7.11.2",
+            "md5sum": "fbffd097d2c5df41fc3335c3977f782c",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.11.2/chr-7.11.2.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.10.1.img",
+            "version": "7.10.1",
+            "md5sum": "917729e79b9992562f4160d461b21cac",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.10.1/chr-7.10.1.img.zip",
+            "compression": "zip"
+        },
         {
             "filename": "chr-7.7.img",
             "version": "7.7",
@@ -63,6 +81,15 @@
             "direct_download_url": "https://download.mikrotik.com/routeros/7.1.5/chr-7.1.5.img.zip",
             "compression": "zip"
         },
+        {
+            "filename": "chr-6.49.10.img",
+            "version": "6.49.10",
+            "md5sum": "49ae1ecfe310aea1df37b824aa13cf84",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.49.10/chr-6.49.10.img.zip",
+            "compression": "zip"
+        },
         {
             "filename": "chr-6.49.6.img",
             "version": "6.49.6",
@@ -83,6 +110,18 @@
         }
     ],
     "versions": [
+        {
+            "name": "7.11.2",
+            "images": {
+                "hda_disk_image": "chr-7.11.2.img"
+            }
+        },
+        {
+            "name": "7.10.1",
+            "images": {
+                "hda_disk_image": "chr-7.10.1.img"
+            }
+        },
         {
             "name": "7.7",
             "images": {
@@ -107,6 +146,12 @@
                 "hda_disk_image": "chr-7.1.5.img"
             }
         },
+        {
+            "name": "6.49.10",
+            "images": {
+                "hda_disk_image": "chr-6.49.10.img"
+            }
+        },
         {
             "name": "6.49.6",
             "images": {

gns3server/appliances/ntopng.gns3a

@@ -5,6 +5,7 @@
     "description": "ntopng is the next generation version of the original ntop, a network traffic probe that shows the network usage, similar to what the popular top Unix command does. ntopng is based on libpcap and it has been written in a portable way in order to virtually run on every Unix platform, MacOSX and on Windows as well. ntopng users can use a a web browser to navigate through ntop (that acts as a web server) traffic information and get a dump of the network status. In the latter case, ntopng can be seen as a simple RMON-like agent with an embedded web interface.",
     "vendor_name": "ntop",
     "vendor_url": "https://www.ntop.org/",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/ntopng.jpg",
     "documentation_url": "https://www.ntop.org/guides/ntopng/",
     "product_name": "ntopng",
     "registry_version": 4,

gns3server/appliances/op5-monitor.gns3a

@@ -5,6 +5,7 @@
     "description": "Over 200,000 IT staff across medium to large enterprises worldwide are currently using OP5 Monitor as their preferred network monitoring software.\nOP5 Monitor allows you to take control of your IT, enabling your network to be more responsive, more reliable and even faster than ever before. With unparalleled scalability, OP5 Monitor grows as your company grows, so you'll understand why we say this is the last network monitor you'll ever need to purchase.",
     "vendor_name": "OP5",
     "vendor_url": "https://www.op5.com/",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/OP5 Monitor.jpg",
     "documentation_url": "https://kb.op5.com/display/MAN/Documentation+Home#sthash.pohb5bis.dpbs",
     "product_name": "OP5 Monitor",
     "product_url": "https://www.op5.com/op5-monitor/",

gns3server/appliances/open-media-vault.gns3a

@@ -26,6 +26,14 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "openmediavault_6.5.0-amd64.iso",
+            "version": "6.5.0",
+            "md5sum": "aa40e5ca50748b139cba2f4ac704a72d",
+            "filesize": 941621248,
+            "download_url": "https://www.openmediavault.org/download.html",
+            "direct_download_url": "https://sourceforge.net/projects/openmediavault/files/6.5.0/openmediavault_6.5.0-amd64.iso"
+        },
         {
             "filename": "openmediavault_6.0.24-amd64.iso",
             "version": "6.0.24",
@@ -60,6 +68,14 @@
         }
     ],
     "versions": [
+        {
+            "name": "6.5.0",
+            "images": {
+                "hda_disk_image": "empty30G.qcow2",
+                "hdb_disk_image": "empty30G.qcow2",
+                "cdrom_image": "openmediavault_6.5.0-amd64.iso"
+            }
+        },
         {
             "name": "6.0.24",
             "images": {

gns3server/appliances/opensuse.gns3a

@@ -5,6 +5,7 @@
     "description": "openSUSE is a free and Linux-based operating system for PC, Laptop or Server. The openSUSE project is a community program sponsored by Novell. It is a general purpose operating system built on top of the Linux kernel, developed by the community-supported openSUSE Project and sponsored by SUSE and a number of other companies.",
     "vendor_name": "SUSE LLC.",
     "vendor_url": "https://www.opensuse.org/",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/openSUSE.png",
     "documentation_url": "https://en.opensuse.org/Main_Page",
     "product_name": "openSUSE",
     "product_url": "https://www.opensuse.org/#Leap",

gns3server/appliances/openvswitch.gns3a

@@ -5,6 +5,7 @@
     "description": "Open vSwitch is a production quality, multilayer virtual switch licensed under the open source Apache 2.0 license.  It is designed to enable massive network automation through programmatic extension, while still supporting standard management interfaces and protocols (e.g. NetFlow, sFlow, IPFIX, RSPAN, CLI, LACP, 802.1ag).  In addition, it is designed to support distribution across multiple physical servers similar to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V.",
     "vendor_name": "Open vSwitch",
     "vendor_url": "http://openvswitch.org/",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/Open vSwitch.jpg",
     "documentation_url": "http://openvswitch.org/support/",
     "product_name": "Open vSwitch",
     "product_url": "http://openvswitch.org/",

gns3server/appliances/openwrt.gns3a

@@ -23,6 +23,15 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "openwrt-23.05.0-x86-64-generic-ext4-combined.img",
+            "version": "23.05.0",
+            "md5sum": "8d53c7aa2605a8848b0b2ca759fc924f",
+            "filesize": 126353408,
+            "download_url": "https://downloads.openwrt.org/releases/23.05.0/targets/x86/64/",
+            "direct_download_url": "https://downloads.openwrt.org/releases/23.05.0/targets/x86/64/openwrt-23.05.0-x86-64-generic-ext4-combined.img.gz",
+            "compression": "gzip"
+        },
         {
             "filename": "openwrt-22.03.0-x86-64-generic-ext4-combined.img",
             "version": "22.03.0",
@@ -170,7 +179,7 @@
         {
             "filename": "openwrt-18.06.5-x86-64-combined-ext4.img",
             "version": "18.06.5",
-            "md5sum": "6fce24c15f0bc75af16c133b839aea30",
+            "md5sum": "a0f72f4e75e15bef06396fa31eb1bc82",
             "filesize": 285736960,
             "download_url": "https://downloads.openwrt.org/releases/18.06.5/targets/x86/64/",
             "direct_download_url": "https://downloads.openwrt.org/releases/18.06.5/targets/x86/64/openwrt-18.06.5-x86-64-combined-ext4.img.gz",
@@ -179,7 +188,7 @@
         {
             "filename": "openwrt-18.06.2-x86-64-combined-ext4.img",
             "version": "18.06.2",
-            "md5sum": "d112cd432bf51e2ddadbf9513f272fd9",
+            "md5sum": "9996a3c070b3e2ea582d28293bd78055",
             "filesize": 285736960,
             "download_url": "https://downloads.openwrt.org/releases/18.06.2/targets/x86/64/",
             "direct_download_url": "https://downloads.openwrt.org/releases/18.06.2/targets/x86/64/openwrt-18.06.2-x86-64-combined-ext4.img.gz",
@@ -214,6 +223,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "23.05.0",
+            "images": {
+                "hda_disk_image": "openwrt-23.05.0-x86-64-generic-ext4-combined.img"
+            }
+        },
         {
             "name": "22.03.0",
             "images": {

gns3server/appliances/opnsense.gns3a

@@ -25,6 +25,13 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "OPNsense-23.1-OpenSSL-nano-amd64.img",
+            "version": "23.1",
+            "md5sum": "db7d3b9fd3b94894623368db1041ff11",
+            "filesize": 3221225472,
+            "download_url": "https://opnsense.c0urier.net/releases/23.1/"
+        },
         {
             "filename": "OPNsense-22.1.2-OpenSSL-nano-amd64.img",
             "version": "22.1.2",
@@ -55,6 +62,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "23.1",
+            "images": {
+                "hda_disk_image": "OPNsense-23.1-OpenSSL-nano-amd64.img"
+            }
+        },
         {
             "name": "22.1.2",
             "images": {

gns3server/appliances/oracle-linux-cloud.gns3a

@@ -26,6 +26,14 @@
         "options": "-cpu host -nographic"
     },
     "images": [
+        {
+            "filename": "OL9U2_x86_64-kvm-b197.qcow",
+            "version": "9.2",
+            "md5sum": "2ff3d0bc8a243ad89c96215f303f1c73",
+            "filesize": 560791552,
+            "download_url": "https://yum.oracle.com/oracle-linux-templates.html",
+            "direct_download_url": "https://yum.oracle.com/templates/OracleLinux/OL9/u2/x86_64/OL9U2_x86_64-kvm-b197.qcow"
+        },
         {
             "filename": "OL9U1_x86_64-kvm-b158.qcow",
             "version": "9.1",
@@ -34,6 +42,14 @@
             "download_url": "https://yum.oracle.com/oracle-linux-templates.html",
             "direct_download_url": "https://yum.oracle.com/templates/OracleLinux/OL9/u1/x86_64/OL9U1_x86_64-kvm-b158.qcow"
         },
+        {
+            "filename": "OL8U8_x86_64-kvm-b198.qcow",
+            "version": "8.8",
+            "md5sum": "717622f373d77349cc102a3a325efbd3",
+            "filesize": 934215680,
+            "download_url": "https://yum.oracle.com/oracle-linux-templates.html",
+            "direct_download_url": "https://yum.oracle.com/templates/OracleLinux/OL8/u8/x86_64/OL8U8_x86_64-kvm-b198.qcow"
+        },
         {
             "filename": "OL8U7_x86_64-kvm-b148.qcow",
             "version": "8.7",
@@ -42,6 +58,14 @@
             "download_url": "https://yum.oracle.com/oracle-linux-templates.html",
             "direct_download_url": "https://yum.oracle.com/templates/OracleLinux/OL8/u7/x86_64/OL8U7_x86_64-kvm-b148.qcow"
         },
+        {
+            "filename": "OL7U9_x86_64-kvm-b145.qcow",
+            "version": "7.9",
+            "md5sum": "e60d4145a69b34026db6121109ca9131",
+            "filesize": 725221376,
+            "download_url": "https://yum.oracle.com/oracle-linux-templates.html",
+            "direct_download_url": "https://yum.oracle.com/templates/OracleLinux/OL7/u9/x86_64/OL7U9_x86_64-kvm-b145.qcow"
+        },
         {
             "filename": "oracle-cloud-init-data.iso",
             "version": "1.1",
@@ -52,6 +76,13 @@
         }
     ],
     "versions": [
+{
+            "name": "9.2",
+            "images": {
+                "hda_disk_image": "OL9U2_x86_64-kvm-b197.qcow",
+                "cdrom_image": "oracle-cloud-init-data.iso"
+            }
+        },
         {
             "name": "9.1",
             "images": {
@@ -59,12 +90,26 @@
                 "cdrom_image": "oracle-cloud-init-data.iso"
             }
         },
+        {
+            "name": "8.8",
+            "images": {
+                "hda_disk_image": "OL8U8_x86_64-kvm-b198.qcow",
+                "cdrom_image": "oracle-cloud-init-data.iso"
+            }
+        },
         {
             "name": "8.7",
             "images": {
                 "hda_disk_image": "OL8U7_x86_64-kvm-b148.qcow",
                 "cdrom_image": "oracle-cloud-init-data.iso"
             }
+        },
+        {
+            "name": "7.9",
+            "images": {
+                "hda_disk_image": "OL7U9_x86_64-kvm-b145.qcow",
+                "cdrom_image": "oracle-cloud-init-data.iso"
+            }
         }
     ]
 }

gns3server/appliances/ostinato.gns3a

@@ -5,6 +5,7 @@
     "description": "Packet crafter and traffic generator for network engineers",
     "vendor_name": "Ostinato",
     "vendor_url": "https://ostinato.org/",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/Ostinato.png",
     "documentation_url": "https://ostinato.org/docs",
     "product_name": "Ostinato",
     "product_url": "https://ostinato.org/",

gns3server/appliances/packetfence-zen.gns3a

@@ -5,6 +5,7 @@
     "description": "PacketFence is a fully supported, trusted, Free and Open Source network access control (NAC) solution. Boasting an impressive feature set including a captive-portal for registration and remediation, centralized wired and wireless management, 802.1X support, layer-2 isolation of problematic devices, integration with the Snort IDS and the Nessus vulnerability scanner; PacketFence can be used to effectively secure networks - from small to very large heterogeneous networks.",
     "vendor_name": "Inverse inc.",
     "vendor_url": "https://packetfence.org/",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/PacketFence ZEN.jpg",
     "documentation_url": "https://packetfence.org/support/index.html#/documentation",
     "product_name": "PacketFence ZEN",
     "product_url": "https://packetfence.org/about.html",

gns3server/appliances/pfsense.gns3a

@@ -24,6 +24,13 @@
         "process_priority": "normal"
     },
     "images": [
+        {
+            "filename": "pfSense-CE-2.7.0-RELEASE-amd64.iso",
+            "version": "2.7.0",
+            "md5sum": "cb0b72ca864d06682265de5e5a72a1fb",
+            "filesize": 765218816,
+            "download_url": "https://www.pfsense.org/download/mirror.php?section=downloads"
+        },
         {
             "filename": "pfSense-CE-2.6.0-RELEASE-amd64.iso",
             "version": "2.6.0",
@@ -69,6 +76,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "2.7.0",
+            "images": {
+                "hda_disk_image": "empty100G.qcow2",
+                "cdrom_image": "pfSense-CE-2.7.0-RELEASE-amd64.iso"
+            }
+        },
         {
             "name": "2.6.0",
             "images": {

gns3server/appliances/rhel.gns3a

@@ -13,7 +13,7 @@
     "availability": "service-contract",
     "maintainer": "Neyder Achahuanco",
     "maintainer_email": "neyder@neyder.net",
-    "usage": "You should download Red Hat Enterprise Linux KVM Guest Image from https://access.redhat.com/downloads/content/479/ver=/rhel---8/8.5/x86_64/product-software attach/customize cloud-init.iso and start.\nusername: cloud-user\npassword: redhat",
+    "usage": "You should download Red Hat Enterprise Linux KVM Guest Image from https://access.redhat.com/downloads/content/479/ver=/rhel---9/9.2/x86_64/product-software attach/customize cloud-init.iso and start.\nusername: cloud-user\npassword: redhat",
     "qemu": {
         "adapter_type": "virtio-net-pci",
         "adapters": 1,
@@ -23,9 +23,51 @@
         "console_type": "telnet",
         "boot_priority": "c",
         "kvm": "require",
-        "options": "-nographic"
+        "options": "-cpu host -nographic"
     },
     "images": [
+        {
+            "filename": "rhel-9.2-x86_64-kvm.qcow2",
+            "version": "9.2",
+            "md5sum": "f33845298b387dbcfbf162c6b4e3f8c8",
+            "filesize": 819265536,
+            "download_url": "https://access.redhat.com/downloads/content/479/ver=/rhel---8/9.2/x86_64/product-software"
+        },
+        {
+            "filename": "rhel-baseos-9.1-x86_64-kvm.qcow2",
+            "version": "9.1",
+            "md5sum": "622de743da83bcec1ad2959ecaedb8f4",
+            "filesize": 753401856,
+            "download_url": "https://access.redhat.com/downloads/content/479/ver=/rhel---8/9.1/x86_64/product-software"
+        },
+        {
+            "filename": "rhel-baseos-9.0-x86_64-kvm.qcow2",
+            "version": "9.0",
+            "md5sum": "4a41497d354fe99a4abf55f1ed73edcb",
+            "filesize": 696582144,
+            "download_url": "https://access.redhat.com/downloads/content/479/ver=/rhel---8/9.0/x86_64/product-software"
+        },
+        {
+            "filename": "rhel-8.8-x86_64-kvm.qcow2",
+            "version": "8.8",
+            "md5sum": "bf22af816ba6abd846bbb0c9ecf7bce1",
+            "filesize": 926810112,
+            "download_url": "https://access.redhat.com/downloads/content/479/ver=/rhel---8/8.8/x86_64/product-software"
+        },
+        {
+            "filename": "rhel-8.7-x86_64-kvm.qcow2",
+            "version": "8.7",
+            "md5sum": "ab71a2c4cc276441bf999f531e064507",
+            "filesize": 858128384,
+            "download_url": "https://access.redhat.com/downloads/content/479/ver=/rhel---8/8.7/x86_64/product-software"
+        },
+        {
+            "filename": "rhel-8.6-x86_64-kvm.qcow2",
+            "version": "8.6",
+            "md5sum": "19501666f46df6b5472db1254e86a339",
+            "filesize": 832438272,
+            "download_url": "https://access.redhat.com/downloads/content/479/ver=/rhel---8/8.6/x86_64/product-software"
+        },
         {
             "filename": "rhel-8.5-x86_64-kvm.qcow2",
             "version": "8.5",
@@ -70,6 +112,48 @@
         }
     ],
     "versions": [
+        {
+            "name": "9.2",
+            "images": {
+                "hda_disk_image": "rhel-9.2-x86_64-kvm.qcow2",
+                "cdrom_image": "rhel-cloud-init.iso"
+            }
+        },
+        {
+            "name": "9.1",
+            "images": {
+                "hda_disk_image": "rhel-baseos-9.1-x86_64-kvm.qcow2",
+                "cdrom_image": "rhel-cloud-init.iso"
+            }
+        },
+        {
+            "name": "9.0",
+            "images": {
+                "hda_disk_image": "rhel-baseos-9.0-x86_64-kvm.qcow2",
+                "cdrom_image": "rhel-cloud-init.iso"
+            }
+        },
+        {
+            "name": "8.8",
+            "images": {
+                "hda_disk_image": "rhel-8.8-x86_64-kvm.qcow2",
+                "cdrom_image": "rhel-cloud-init.iso"
+            }
+        },
+        {
+            "name": "8.7",
+            "images": {
+                "hda_disk_image": "rhel-8.7-x86_64-kvm.qcow2",
+                "cdrom_image": "rhel-cloud-init.iso"
+            }
+        },
+        {
+            "name": "8.6",
+            "images": {
+                "hda_disk_image": "rhel-8.6-x86_64-kvm.qcow2",
+                "cdrom_image": "rhel-cloud-init.iso"
+            }
+        },
         {
             "name": "8.5",
             "images": {

gns3server/appliances/rockylinux.gns3a

@@ -27,12 +27,20 @@
     },
     "images": [
         {
-            "filename": "Rocky-8-GenericCloud-8.5-20211114.2.x86_64.qcow2",
-            "version": "8.5",
-            "md5sum": "44982ddace75a1dba17942401086d72c",
-            "filesize": 1502701568,
-            "download_url": "https://download.rockylinux.org/pub/rocky/8/images/",
-            "direct_download_url": "https://download.rockylinux.org/pub/rocky/8/images/Rocky-8-GenericCloud-8.5-20211114.2.x86_64.qcow2"
+            "filename": "Rocky-9-GenericCloud-Base-9.2-20230513.0.x86_64.qcow2",
+            "version": "9.2",
+            "md5sum": "2022bdb49a691119f1fd3cc76de0a846",
+            "filesize": 989265920,
+            "download_url": "https://download.rockylinux.org/pub/rocky/9/images/x86_64/",
+            "direct_download_url": "https://download.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud-Base-9.2-20230513.0.x86_64.qcow2"
+        },
+        {
+            "filename": "Rocky-8-GenericCloud-Base-8.8-20230518.0.x86_64.qcow2",
+            "version": "8.8",
+            "md5sum": "3ad7d355909cc37100c037562e4b3b6d",
+            "filesize": 1800536064,
+            "download_url": "https://download.rockylinux.org/pub/rocky/8/images/x86_64/",
+            "direct_download_url": "https://download.rockylinux.org/pub/rocky/8/images/x86_64/Rocky-8-GenericCloud-Base-8.8-20230518.0.x86_64.qcow2"
         },
         {
             "filename": "rocky-cloud-init-data.iso",
@@ -45,9 +53,16 @@
     ],
     "versions": [
         {
-            "name": "8.5",
+            "name": "9.2",
             "images": {
-                "hda_disk_image": "Rocky-8-GenericCloud-8.5-20211114.2.x86_64.qcow2",
+                "hda_disk_image": "Rocky-9-GenericCloud-Base-9.2-20230513.0.x86_64.qcow2",
+                "cdrom_image": "rocky-cloud-init-data.iso"
+            }
+        },
+        {
+            "name": "8.8",
+            "images": {
+                "hda_disk_image": "Rocky-8-GenericCloud-Base-8.8-20230518.0.x86_64.qcow2",
                 "cdrom_image": "rocky-cloud-init-data.iso"
             }
         }

gns3server/appliances/security-onion.gns3a

@@ -5,6 +5,7 @@
     "description": "Security Onion is a Linux distro for intrusion detection, network security monitoring, and log management. It's based on Ubuntu and contains Snort, Suricata, Bro, OSSEC, Sguil, Squert, ELSA, Xplico, NetworkMiner, and many other security tools. The easy-to-use Setup wizard allows you to build an army of distributed sensors for your enterprise in minutes!",
     "vendor_name": "Security Onion Solutions, LLC",
     "vendor_url": "https://securityonion.net/",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/Security Onion.png",
     "documentation_url": "https://github.com/Security-Onion-Solutions/security-onion/wiki",
     "product_name": "Security Onion",
     "product_url": "https://securityonion.net/",

gns3server/appliances/ubuntu-cloud.gns3a

@@ -5,6 +5,7 @@
     "description": "The term 'Ubuntu Cloud Guest' refers to the Official Ubuntu images that are available at http://cloud-images.ubuntu.com . These images are built by Canonical. They are then registered on EC2, and compressed tarfiles are made also available for download. For using those images on a public cloud such as Amazon EC2, you simply choose an image and launch it. To use those images on a private cloud, or to run the image on a local hypervisor (such as KVM) you would need to download those images and either publish them to your private cloud, or launch them directly on a hypervisor. The following sections explain in more details how to perform each of those actions",
     "vendor_name": "Canonical Inc.",
     "vendor_url": "https://www.ubuntu.com",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/Ubuntu Cloud Guest.png",
     "documentation_url": "https://help.ubuntu.com/community/UEC/Images",
     "product_name": "Ubuntu Cloud Guest",
     "product_url": "https://www.ubuntu.com/cloud",
@@ -26,9 +27,17 @@
         "options": "-nographic"
     },
     "images": [
+        {
+            "filename": "ubuntu-23.04-server-cloudimg-arm64.img",
+            "version": "Ubuntu 23.04 (Lunar Lobster)",
+            "md5sum": "35fa3b31b65717af6f0520a769aac8c0",
+            "filesize": 786432000,
+            "download_url": "https://cloud-images.ubuntu.com/releases/23.04/release/",
+            "direct_download_url": "https://cloud-images.ubuntu.com/releases/23.04/release/ubuntu-23.04-server-cloudimg-arm64.img"
+        },
         {
             "filename": "ubuntu-22.04-server-cloudimg-amd64.img",
-            "version": "22.04 (LTS)",
+            "version": "Ubuntu 22.04 LTS (Jammy Jellyfish)",
             "md5sum": "3ce0b84f9592482fb645e8253b979827",
             "filesize": 686096384,
             "download_url": "https://cloud-images.ubuntu.com/releases/jammy/release",
@@ -36,7 +45,7 @@
         },
         {
             "filename": "ubuntu-20.04-server-cloudimg-amd64.img",
-            "version": "20.04 (LTS)",
+            "version": "Ubuntu 20.04 LTS (Focal Fossa)",
             "md5sum": "044bc979b2238192ee3edb44e2bb6405",
             "filesize": 552337408,
             "download_url": "https://cloud-images.ubuntu.com/releases/focal/release-20210119.1/",
@@ -44,7 +53,7 @@
         },
         {
             "filename": "ubuntu-18.04-server-cloudimg-amd64.img",
-            "version": "18.04 (LTS)",
+            "version": "Ubuntu 18.04 LTS (Bionic Beaver)",
             "md5sum": "f4134e7fa16d7fa766c7467cbe25c949",
             "filesize": 336134144,
             "download_url": "https://cloud-images.ubuntu.com/releases/18.04/release-20180426.2/",
@@ -61,21 +70,28 @@
     ],
     "versions": [
         {
-            "name": "22.04 (LTS)",
+            "name": "Ubuntu 23.04 (Lunar Lobster)",
+            "images": {
+                "hda_disk_image": "ubuntu-23.04-server-cloudimg-arm64.img",
+                "cdrom_image": "ubuntu-cloud-init-data.iso"
+            }
+        },
+        {
+            "name": "Ubuntu 22.04 LTS (Jammy Jellyfish)",
             "images": {
                 "hda_disk_image": "ubuntu-22.04-server-cloudimg-amd64.img",
                 "cdrom_image": "ubuntu-cloud-init-data.iso"
             }
         },
         {
-            "name": "20.04 (LTS)",
+            "name": "Ubuntu 20.04 LTS (Focal Fossa)",
             "images": {
                 "hda_disk_image": "ubuntu-20.04-server-cloudimg-amd64.img",
                 "cdrom_image": "ubuntu-cloud-init-data.iso"
             }
         },
         {
-            "name": "18.04 (LTS)",
+            "name": "Ubuntu 18.04 LTS (Bionic Beaver)",
             "images": {
                 "hda_disk_image": "ubuntu-18.04-server-cloudimg-amd64.img",
                 "cdrom_image": "ubuntu-cloud-init-data.iso"

gns3server/appliances/ubuntu-docker.gns3a

@@ -5,6 +5,7 @@
     "description": "Ubuntu is a Debian-based Linux operating system, with Unity as its default desktop environment. It is based on free software and named after the Southern African philosophy of ubuntu (literally, \"human-ness\"), which often is translated as \"humanity towards others\" or \"the belief in a universal bond of sharing that connects all humanity\".",
     "vendor_name": "Canonical",
     "vendor_url": "http://www.ubuntu.com",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/Ubuntu Docker Guest.png",
     "product_name": "Ubuntu",
     "registry_version": 4,
     "status": "stable",

gns3server/appliances/ubuntu-gui.gns3a

@@ -5,6 +5,7 @@
     "description": "Ubuntu is a full-featured Linux operating system which is based on Debian distribution and freely available with both community and professional support, it comes with Unity as its default desktop environment. There are other flavors of Ubuntu available with other desktops as default like Ubuntu Gnome, Lubuntu, Xubuntu, and so on. A tightly-integrated selection of excellent applications is included, and an incredible variety of add-on software is just a few clicks away. A default installation of Ubuntu contains a wide range of software that includes LibreOffice, Firefox, Empathy, Transmission, etc.",
     "vendor_name": "Canonical Inc.",
     "vendor_url": "https://www.ubuntu.com",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/Ubuntu Desktop Guest.png",
     "documentation_url": "https://help.ubuntu.com",
     "product_name": "Ubuntu",
     "product_url": "https://www.ubuntu.com/desktop",

gns3server/appliances/untangle.gns3a

@@ -5,6 +5,7 @@
     "description": "Untangle's NG Firewall enables you to quickly and easily create the network policies that deliver the perfect balance between security and productivity. Untangle combines Unified Threat Management (UTM)-to address all of the key network threats-with policy management tools that enable you to define access and control by individuals, groups or company-wide. And with industry-leading reports, you'll have complete visibility into and control over everything that's happening on your network.",
     "vendor_name": "Untangle",
     "vendor_url": "https://www.untangle.com/",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/Untangle NG.jpg",
     "documentation_url": "http://wiki.untangle.com/index.php/Main_Page",
     "product_name": "Untangle NG",
     "product_url": "https://www.untangle.com/untangle-ng-firewall/",

gns3server/appliances/vyos.gns3a

@@ -60,7 +60,7 @@
             "md5sum": "3fece6363f9766f862e26d292d0ed5a3",
             "filesize": 430964736,
             "download_url": "https://support.vyos.io/en/downloads/files/vyos-1-2-9-s1-generic-iso-image",
-            "direct_download_url": "https://s3-us.vyos.io/1.2.9-S1/vyos-1.2.9-S1-amd64.iso"
+            "direct_download_url": "https://legacy-lts-images.vyos.io/1.2.9-S1/vyos-1.2.9-S1-amd64.iso"
         },
         {
             "filename": "vyos-1.2.9-S1-10G-qemu.qcow2",
@@ -68,7 +68,7 @@
             "md5sum": "0a70d78b80a3716d42487c02ef44f41f",
             "filesize": 426967040,
             "download_url": "https://support.vyos.io/en/downloads/files/vyos-1-2-9-s1-for-kvm",
-            "direct_download_url": "https://s3-us.vyos.io/1.2.9-S1/vyos-1.2.9-S1-10G-qemu.qcow2"
+            "direct_download_url": "https://legacy-lts-images.vyos.io/1.2.9-S1/vyos-1.2.9-S1-10G-qemu.qcow2"
         },
         {
             "filename": "vyos-1.2.9-amd64.iso",
@@ -76,7 +76,7 @@
             "md5sum": "586be23b6256173e174c82d8f1f699a1",
             "filesize": 430964736,
             "download_url": "https://support.vyos.io/en/downloads/files/vyos-1-2-9-generic-iso-image",
-            "direct_download_url": "https://s3-us.vyos.io/1.2.9/vyos-1.2.9-amd64.iso"
+            "direct_download_url": "https://legacy-lts-images.vyos.io/1.2.9/vyos-1.2.9-amd64.iso"
         },
         {
             "filename": "vyos-1.2.9-10G-qemu.qcow2",
@@ -84,7 +84,7 @@
             "md5sum": "76871c7b248c32f75177c419128257ac",
             "filesize": 427360256,
             "download_url": "https://support.vyos.io/en/downloads/files/vyos-1-2-9-10g-qemu-qcow2",
-            "direct_download_url": "https://s3-us.vyos.io/1.2.9/vyos-1.2.9-10G-qemu.qcow2"
+            "direct_download_url": "https://legacy-lts-images.vyos.io/1.2.9/vyos-1.2.9-10G-qemu.qcow2"
         },
         {
             "filename": "vyos-1.2.8-amd64.iso",
@@ -98,7 +98,7 @@
             "version": "1.1.8",
             "md5sum": "95a141d4b592b81c803cdf7e9b11d8ea",
             "filesize": 241172480,
-            "direct_download_url": "https://s3-us.vyos.io/vyos-1.1.8-amd64.iso"
+            "direct_download_url": "https://legacy-lts-images.vyos.io/vyos-1.1.8-amd64.iso"
         },
         {
             "filename": "empty8G.qcow2",

gns3server/appliances/webterm.gns3a

@@ -8,8 +8,8 @@
     "product_name": "webterm",
     "registry_version": 4,
     "status": "stable",
-    "maintainer": "GNS3 Team",
-    "maintainer_email": "developers@gns3.net",
+    "maintainer": "Bernhard Ehlers",
+    "maintainer_email": "dev-ehlers@mailbox.org",
     "usage": "The /root directory is persistent.",
     "symbol": "firefox.svg",
     "docker": {

gns3server/appliances/windows-11-dev-env.gns3a

@@ -29,6 +29,14 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "WinDev2308Eval-disk1.vmdk",
+            "version": "2308",
+            "md5sum": "6a9b4ed6d7481f7bbf8a054c797b1eee",
+            "filesize": 24945341952,
+            "download_url": "https://download.microsoft.com/download/7/1/3/7135f2ab-8528-49fc-9252-8d5d94c697ef/WinDev2308Eval.VMWare.zip",
+            "compression": "zip"
+        },
         {
             "filename": "WinDev2212Eval-disk1.vmdk",
             "version": "2212",
@@ -38,20 +46,27 @@
             "compression": "zip"
         },
         {
-            "filename": "OVMF-20160813.fd",
-            "version": "16.08.13",
-            "md5sum": "8ff0ef1ec56345db5b6bda1a8630e3c6",
-            "filesize": 2097152,
-            "download_url": "",
-            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/OVMF-20160813.fd.zip/download",
+            "filename": "OVMF-edk2-stable202305.fd",
+            "version": "stable202305",
+            "md5sum": "6c4cf1519fec4a4b95525d9ae562963a",
+            "filesize": 4194304,
+            "download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/",
+            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/OVMF-edk2-stable202305.fd.zip/download",
             "compression": "zip"
         }
     ],
     "versions": [
+        {
+            "name": "2308",
+            "images": {
+                "bios_image": "OVMF-edk2-stable202305.fd",
+                "hda_disk_image": "WinDev2308Eval-disk1.vmdk"
+            }
+        },
         {
             "name": "2212",
             "images": {
-                "bios_image": "OVMF-20160813.fd",
+                "bios_image": "OVMF-edk2-stable202305.fd",
                 "hda_disk_image": "WinDev2212Eval-disk1.vmdk"
             }
         }

gns3server/appliances/windows.gns3a

@@ -5,6 +5,7 @@
     "description": "Microsoft Windows, or simply Windows, is a metafamily of graphical operating systems developed, marketed, and sold by Microsoft. It consists of several families of operating systems, each of which cater to a certain sector of the computing industry with the OS typically associated with IBM PC compatible architecture.",
     "vendor_name": "Microsoft",
     "vendor_url": "http://www.microsoft.com/",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/Windows.jpg",
     "documentation_url": "https://technet.microsoft.com/en-us/library/cc498727.aspx",
     "product_name": "Windows",
     "product_url": "https://www.microsoft.com/en-us/windows",

gns3server/appliances/windows_server.gns3a

@@ -5,6 +5,7 @@
     "description": "Microsoft Windows, or simply Windows, is a metafamily of graphical operating systems developed, marketed, and sold by Microsoft. It consists of several families of operating systems, each of which cater to a certain sector of the computing industry with the OS typically associated with IBM PC compatible architecture.",
     "vendor_name": "Microsoft",
     "vendor_url": "http://www.microsoft.com/",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/Windows Server.jpg",
     "documentation_url": "https://technet.microsoft.com/en-us/library/cc498727.aspx",
     "product_name": "Windows Server",
     "product_url": "https://www.microsoft.com/en-us/windows",
@@ -27,6 +28,13 @@
         "options": "-usbdevice tablet"
     },
     "images": [
+        {
+            "filename": "SERVER_EVAL_x64FRE_en-us.iso",
+            "version": "2022",
+            "md5sum": "e7908933449613edc97e1b11180429d1",
+            "filesize": 5044094976,
+            "download_url": "https://www.microsoft.com/en-gb/evalcenter/evaluate-windows-server-2022"
+        },
         {
             "filename": "Win2k16_14393.0.161119-1705.RS1_REFRESH_SERVER_EVAL_X64FRE_EN-US.ISO",
             "version": "2016",
@@ -51,6 +59,13 @@
         }
     ],
     "versions": [
+         {
+            "name": "2022",
+            "images": {
+                "hda_disk_image": "empty100G.qcow2",
+                "cdrom_image": "SERVER_EVAL_x64FRE_en-us.iso"
+            }
+        },
         {
             "name": "2016",
             "images": {

gns3server/compute/docker/docker_vm.py

@@ -406,7 +406,7 @@ class DockerVM(BaseNode):
             await self._start_vnc()
             params["Env"].append("QT_GRAPHICSSYSTEM=native")  # To fix a Qt issue: https://github.com/GNS3/gns3-server/issues/556
             params["Env"].append("DISPLAY=:{}".format(self._display))
-            params["HostConfig"]["Binds"].append("/tmp/.X11-unix/:/tmp/.X11-unix/")
+            params["HostConfig"]["Binds"].append("/tmp/.X11-unix/X{0}:/tmp/.X11-unix/X{0}:ro".format(self._display))
 
         if self._extra_hosts:
             extra_hosts = self._format_extra_hosts(self._extra_hosts)

gns3server/compute/iou/iou_vm.py

@@ -539,7 +539,12 @@ class IOUVM(BaseNode):
             # create a symbolic link to the image to avoid IOU error "failed code signing checks"
             # on newer images, see https://github.com/GNS3/gns3-server/issues/1484
             try:
-                symlink = os.path.join(self.working_dir, os.path.basename(self.path))
+                iou_image_path = os.path.basename(self.path)
+                if len(iou_image_path) > 63:
+                    # IOU file basename length must be <= 63 chars
+                    iou_file_name, iou_file_ext = os.path.splitext(iou_image_path)
+                    iou_image_path = iou_file_name[:63 - len(iou_file_ext)] + iou_file_ext
+                symlink = os.path.join(self.working_dir, iou_image_path)
                 if os.path.islink(symlink):
                     os.unlink(symlink)
                 os.symlink(self.path, symlink)

gns3server/compute/project_manager.py

@@ -16,12 +16,14 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import aiohttp
-import asyncio
 import psutil
 import platform
+
 from .project import Project
+from ..config import Config
 from uuid import UUID
 
+
 import logging
 log = logging.getLogger(__name__)
 
@@ -128,10 +130,11 @@ class ProjectManager:
         :returns: boolean
         """
 
-        for project in self._projects.values():
-            for node in project.nodes:
-                if node == source_node:
-                    continue
-                if node.hw_virtualization and node.__class__.__name__ != source_node.__class__.__name__:
-                    return False
+        if Config.instance().get_section_config("Server").getboolean("hardware_virtualization_check", True):
+            for project in self._projects.values():
+                for node in project.nodes:
+                    if node == source_node:
+                        continue
+                    if node.hw_virtualization and node.__class__.__name__ != source_node.__class__.__name__:
+                        return False
         return True

gns3server/compute/qemu/__init__.py

@@ -26,6 +26,7 @@ import sys
 import re
 import subprocess
 
+from ...utils import shlex_quote
 from ...utils.asyncio import subprocess_check_output
 from ...utils.get_resource import get_resource
 from ..base_manager import BaseManager
@@ -337,6 +338,8 @@ class Qemu(BaseManager):
             command.append(path)
             command.append("{}M".format(img_size))
 
+            command_string = " ".join(shlex_quote(s) for s in command)
+            log.info("Creating disk image with {}".format(command_string))
             process = await asyncio.create_subprocess_exec(*command)
             await process.wait()
         except (OSError, subprocess.SubprocessError) as e:

gns3server/compute/qemu/qemu_vm.py

@@ -86,6 +86,7 @@ class QemuVM(BaseNode):
         self._local_udp_tunnels = {}
         self._guest_cid = None
         self._command_line_changed = False
+        self._qemu_version = None
 
         # QEMU VM settings
         if qemu_path:
@@ -122,6 +123,7 @@ class QemuVM(BaseNode):
         self._kernel_image = ""
         self._kernel_command_line = ""
         self._tpm = False
+        self._uefi = False
         self._legacy_networking = False
         self._replicate_network_connection_state = True
         self._create_config_disk = False
@@ -833,6 +835,30 @@ class QemuVM(BaseNode):
             log.info('QEMU VM "{name}" [{id}] has disabled the Trusted Platform Module (TPM)'.format(name=self._name, id=self._id))
         self._tpm = tpm
 
+    @property
+    def uefi(self):
+        """
+        Returns whether UEFI boot mode is activated for this QEMU VM.
+
+        :returns: boolean
+        """
+
+        return self._uefi
+
+    @uefi.setter
+    def uefi(self, uefi):
+        """
+        Sets whether UEFI boot mode is activated for this QEMU VM.
+
+        :param uefi: boolean
+        """
+
+        if uefi:
+            log.info(f'QEMU VM "{self._name}" [{self._id}] has enabled the UEFI boot mode')
+        else:
+            log.info(f'QEMU VM "{self._name}" [{self._id}] has disabled the UEFI boot mode')
+        self._uefi = uefi
+
     @property
     def options(self):
         """
@@ -1846,8 +1872,7 @@ class QemuVM(BaseNode):
             # special case, sata controller doesn't exist in Qemu
             options.extend(["-device", 'ahci,id=ahci{}'.format(disk_index)])
             options.extend(["-drive", 'file={},if=none,id=drive{},index={},media=disk{}'.format(disk, disk_index, disk_index, extra_drive_options)])
-            qemu_version = await self.manager.get_qemu_version(self.qemu_path)
-            if qemu_version and parse_version(qemu_version) >= parse_version("4.2.0"):
+            if self._qemu_version and parse_version(self._qemu_version) >= parse_version("4.2.0"):
                 # The ‘ide-drive’ device is deprecated since version 4.2.0
                 # https://qemu.readthedocs.io/en/latest/system/deprecated.html#ide-drive-since-4-2
                 options.extend(["-device", 'ide-hd,drive=drive{},bus=ahci{}.0,id=drive{}'.format(disk_index, disk_index, disk_index)])
@@ -1994,12 +2019,28 @@ class QemuVM(BaseNode):
 
         options = []
         if self._bios_image:
+            if self._uefi:
+                raise QemuError("Cannot use a bios image and the UEFI boot mode at the same time")
             if not os.path.isfile(self._bios_image) or not os.path.exists(self._bios_image):
                 if os.path.islink(self._bios_image):
                     raise QemuError("bios image '{}' linked to '{}' is not accessible".format(self._bios_image, os.path.realpath(self._bios_image)))
                 else:
                     raise QemuError("bios image '{}' is not accessible".format(self._bios_image))
             options.extend(["-bios", self._bios_image.replace(",", ",,")])
+        elif self._uefi:
+            # get the OVMF firmware from the images directory
+            ovmf_firmware_path = self.manager.get_abs_image_path("OVMF_CODE.fd")
+            log.info("Configuring UEFI boot mode using OVMF file: '{}'".format(ovmf_firmware_path))
+            options.extend(["-drive", "if=pflash,format=raw,readonly,file={}".format(ovmf_firmware_path)])
+
+            # the node should have its own copy of OVMF_VARS.fd (the UEFI variables store)
+            ovmf_vars_node_path = os.path.join(self.working_dir, "OVMF_VARS.fd")
+            if not os.path.exists(ovmf_vars_node_path):
+                try:
+                    shutil.copyfile(self.manager.get_abs_image_path("OVMF_VARS.fd"), ovmf_vars_node_path)
+                except OSError as e:
+                    raise QemuError("Cannot copy OVMF_VARS.fd file to the node working directory: {}".format(e))
+            options.extend(["-drive", "if=pflash,format=raw,file={}".format(ovmf_vars_node_path)])
         return options
 
     def _linux_boot_options(self):
@@ -2090,11 +2131,10 @@ class QemuVM(BaseNode):
 
         patched_qemu = False
         if self._legacy_networking:
-            qemu_version = await self.manager.get_qemu_version(self.qemu_path)
-            if qemu_version:
-                if parse_version(qemu_version) >= parse_version("2.9.0"):
+            if self._qemu_version:
+                if parse_version(self._qemu_version) >= parse_version("2.9.0"):
                     raise QemuError("Qemu version 2.9.0 and later doesn't support legacy networking mode")
-                if parse_version(qemu_version) < parse_version("1.1.0"):
+                if parse_version(self._qemu_version) < parse_version("1.1.0"):
                     # this is a patched Qemu if version is below 1.1.0
                     patched_qemu = True
 
@@ -2103,8 +2143,7 @@ class QemuVM(BaseNode):
         pci_bridges = math.floor(pci_devices / 32)
         pci_bridges_created = 0
         if pci_bridges >= 1:
-            qemu_version = await self.manager.get_qemu_version(self.qemu_path)
-            if qemu_version and parse_version(qemu_version) < parse_version("2.4.0"):
+            if self._qemu_version and parse_version(self._qemu_version) < parse_version("2.4.0"):
                 raise QemuError("Qemu version 2.4 or later is required to run this VM with a large number of network adapters")
 
         pci_device_id = 4 + pci_bridges  # Bridge consume PCI ports
@@ -2150,7 +2189,9 @@ class QemuVM(BaseNode):
             else:
                 # newer QEMU networking syntax
                 device_string = "{},mac={}".format(adapter_type, mac)
-                if adapter_type == "virtio-net-pci":
+                if adapter_type == "virtio-net-pci" and \
+                        self._qemu_version and parse_version(self._qemu_version) >= parse_version("2.12"):
+                    # speed and duplex support was added in Qemu 2.12
                     device_string = "{},speed=10000,duplex=full".format(device_string)
                 bridge_id = math.floor(pci_device_id / 32)
                 if bridge_id > 0:
@@ -2183,8 +2224,7 @@ class QemuVM(BaseNode):
 
         if any(opt in self._options for opt in ["-display", "-nographic", "-curses", "-sdl" "-spice", "-vnc"]):
             return []
-        version = await self.manager.get_qemu_version(self.qemu_path)
-        if version and parse_version(version) >= parse_version("3.0"):
+        if self._qemu_version and parse_version(self._qemu_version) >= parse_version("3.0"):
             return ["-display", "none"]
         else:
             return ["-nographic"]
@@ -2229,9 +2269,8 @@ class QemuVM(BaseNode):
             elif sys.platform.startswith("win"):
                 if require_hardware_accel:
                     # HAXM is only available starting with Qemu version 2.9.0
-                    version = await self.manager.get_qemu_version(self.qemu_path)
-                    if version and parse_version(version) < parse_version("2.9.0"):
-                        raise QemuError("HAXM acceleration can only be enable for Qemu version 2.9.0 and above (current version: {})".format(version))
+                    if self._qemu_version and parse_version(self._qemu_version) < parse_version("2.9.0"):
+                        raise QemuError("HAXM acceleration can only be enable for Qemu version 2.9.0 and above (current version: {})".format(self._qemu_version))
 
                     # check if HAXM is installed
                     version = self.manager.get_haxm_windows_version()
@@ -2331,6 +2370,7 @@ class QemuVM(BaseNode):
         (to be passed to subprocess.Popen())
         """
 
+        self._qemu_version = await self.manager.get_qemu_version(self.qemu_path)
         vm_name = self._name.replace(",", ",,")
         project_path = self.project.path.replace(",", ",,")
         additional_options = self._options.strip()
@@ -2348,10 +2388,9 @@ class QemuVM(BaseNode):
         if await self._run_with_hardware_acceleration(self.qemu_path, self._options):
             if sys.platform.startswith("linux"):
                 command.extend(["-enable-kvm"])
-                version = await self.manager.get_qemu_version(self.qemu_path)
                 # Issue on some combo Intel CPU + KVM + Qemu 2.4.0
                 # https://github.com/GNS3/gns3-server/issues/685
-                if version and parse_version(version) >= parse_version("2.4.0") and self.platform == "x86_64":
+                if self._qemu_version and parse_version(self._qemu_version) >= parse_version("2.4.0") and self.platform == "x86_64":
                     command.extend(["-machine", "smm=off"])
             elif sys.platform.startswith("win") or sys.platform.startswith("darwin"):
                 command.extend(["-enable-hax"])

gns3server/compute/virtualbox/__init__.py

@@ -109,9 +109,16 @@ class VirtualBox(BaseManager):
             command = [vboxmanage_path, "--nologo", subcommand]
             command.extend(args)
             command_string = " ".join(command)
+            env = os.environ.copy()
+            env["LANG"] = "en"  # force english output because we rely on it to parse the output
             log.info("Executing VBoxManage with command: {}".format(command_string))
             try:
-                process = await asyncio.create_subprocess_exec(*command, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE)
+                process = await asyncio.create_subprocess_exec(
+                    *command,
+                    stdout=asyncio.subprocess.PIPE,
+                    stderr=asyncio.subprocess.PIPE,
+                    env=env
+                )
             except (OSError, subprocess.SubprocessError) as e:
                 raise VirtualBoxError("Could not execute VBoxManage: {}".format(e))
 

gns3server/configs/iou_l2_base_startup-config.txt

@@ -13,7 +13,8 @@ logging console discriminator EXCESS
 !
 no ip icmp rate-limit unreachable
 !
-ip cef
+! due to some bugs with IOU, try to change the following line to 'ip cef' if your routing does not work
+no ip cef
 no ip domain-lookup
 !
 !

gns3server/configs/iou_l3_base_startup-config.txt

@@ -12,7 +12,8 @@ no ip icmp rate-limit unreachable
 !         
 !
 !
-ip cef
+! due to some bugs with IOU, try to change the following line to 'ip cef' if your routing does not work
+no ip cef
 no ip domain-lookup
 !
 !

gns3server/controller/__init__.py

@@ -191,29 +191,28 @@ class Controller:
         Save the controller configuration on disk
         """
 
-        if self._config_loaded is False:
-            return
+        controller_settings = dict()
+        if self._config_loaded:
+            controller_settings = {"computes": [],
+                                   "templates": [],
+                                   "gns3vm": self.gns3vm.__json__(),
+                                   "iou_license": self._iou_license_settings,
+                                   "appliances_etag": self._appliance_manager.appliances_etag,
+                                   "version": __version__}
 
-        controller_settings = {"computes": [],
-                               "templates": [],
-                               "gns3vm": self.gns3vm.__json__(),
-                               "iou_license": self._iou_license_settings,
-                               "appliances_etag": self._appliance_manager.appliances_etag,
-                               "version": __version__}
+            for template in self._template_manager.templates.values():
+                if not template.builtin:
+                    controller_settings["templates"].append(template.__json__())
 
-        for template in self._template_manager.templates.values():
-            if not template.builtin:
-                controller_settings["templates"].append(template.__json__())
-
-        for compute in self._computes.values():
-            if compute.id != "local" and compute.id != "vm":
-                controller_settings["computes"].append({"host": compute.host,
-                                                        "name": compute.name,
-                                                        "port": compute.port,
-                                                        "protocol": compute.protocol,
-                                                        "user": compute.user,
-                                                        "password": compute.password,
-                                                        "compute_id": compute.id})
+            for compute in self._computes.values():
+                if compute.id != "local" and compute.id != "vm":
+                    controller_settings["computes"].append({"host": compute.host,
+                                                            "name": compute.name,
+                                                            "port": compute.port,
+                                                            "protocol": compute.protocol,
+                                                            "user": compute.user,
+                                                            "password": compute.password,
+                                                            "compute_id": compute.id})
 
         try:
             os.makedirs(os.path.dirname(self._config_file), exist_ok=True)
@@ -229,8 +228,7 @@ class Controller:
 
         try:
             if not os.path.exists(self._config_file):
-                self._config_loaded = True
-                self.save()
+                self.save()  # this will create the config file
             with open(self._config_file) as f:
                 controller_settings = json.load(f)
         except (OSError, ValueError) as e:
@@ -251,7 +249,11 @@ class Controller:
             self._iou_license_settings = controller_settings["iou_license"]
 
         previous_version = controller_settings.get("version")
-        if not previous_version or parse_version(__version__) > parse_version(previous_version):
+        log.info("Comparing controller version {} with config version {}".format(__version__, previous_version))
+        if not previous_version or \
+                parse_version(__version__.split("+")[0]) > parse_version(previous_version.split("+")[0]):
+            self._appliance_manager.install_builtin_appliances()
+        elif not os.listdir(self._appliance_manager.builtin_appliances_path()):
             self._appliance_manager.install_builtin_appliances()
 
         self._appliance_manager.appliances_etag = controller_settings.get("appliances_etag")
@@ -293,7 +295,7 @@ class Controller:
                 if not os.path.exists(os.path.join(dst_path, filename)):
                     shutil.copy(os.path.join(resource_path, filename), os.path.join(dst_path, filename))
         else:
-            for entry in importlib_resources.files(f'gns3server.{resource_name}').iterdir():
+            for entry in importlib_resources.files('gns3server').joinpath(resource_name).iterdir():
                 full_path = os.path.join(dst_path, entry.name)
                 if entry.is_file() and not os.path.exists(full_path):
                     log.debug(f'Installing {resource_name} resource file "{entry.name}" to "{full_path}"')

gns3server/controller/appliance_manager.py

@@ -15,13 +15,14 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import sys
 import os
 import json
 import uuid
 import asyncio
 import aiohttp
 import shutil
+import platformdirs
+
 
 try:
     import importlib_resources
@@ -81,13 +82,13 @@ class ApplianceManager:
         os.makedirs(appliances_path, exist_ok=True)
         return appliances_path
 
-    def _builtin_appliances_path(self, delete_first=False):
+    def builtin_appliances_path(self, delete_first=False):
         """
         Get the built-in appliance storage directory
         """
 
-        config = Config.instance()
-        appliances_dir = os.path.join(config.config_dir, "appliances")
+        appname = vendor = "GNS3"
+        appliances_dir = os.path.join(platformdirs.user_data_dir(appname, vendor, roaming=True), "appliances")
         if delete_first:
             shutil.rmtree(appliances_dir, ignore_errors=True)
         os.makedirs(appliances_dir, exist_ok=True)
@@ -98,7 +99,7 @@ class ApplianceManager:
         At startup we copy the built-in appliances files.
         """
 
-        dst_path = self._builtin_appliances_path(delete_first=True)
+        dst_path = self.builtin_appliances_path(delete_first=True)
         log.info(f"Installing built-in appliances in '{dst_path}'")
         from . import Controller
         try:
@@ -112,7 +113,7 @@ class ApplianceManager:
         """
 
         self._appliances = {}
-        for directory, builtin in ((self._builtin_appliances_path(), True,), (self._custom_appliances_path(), False,)):
+        for directory, builtin in ((self.builtin_appliances_path(), True,), (self._custom_appliances_path(), False,)):
             if directory and os.path.isdir(directory):
                 for file in os.listdir(directory):
                     if not file.endswith('.gns3a') and not file.endswith('.gns3appliance'):
@@ -200,7 +201,10 @@ class ApplianceManager:
                 log.info("Checking if appliances are up-to-date (ETag {})".format(self._appliances_etag))
                 headers["If-None-Match"] = self._appliances_etag
             async with aiohttp.ClientSession() as session:
-                async with session.get('https://api.github.com/repos/GNS3/gns3-registry/contents/appliances', headers=headers) as response:
+                async with session.get(
+                        'https://api.github.com/repos/GNS3/gns3-registry/contents/appliances',
+                        headers=headers
+                ) as response:
                     if response.status == 304:
                         log.info("Appliances are already up-to-date (ETag {})".format(self._appliances_etag))
                         return
@@ -212,7 +216,7 @@ class ApplianceManager:
                         from . import Controller
                         Controller.instance().save()
                     json_data = await response.json()
-                appliances_dir = self._builtin_appliances_path()
+                appliances_dir = self.builtin_appliances_path()
                 downloaded_appliance_files = []
                 for appliance in json_data:
                     if appliance["type"] == "file":

gns3server/controller/gns3vm/virtualbox_gns3_vm.py

@@ -15,11 +15,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import re
 import sys
 import aiohttp
 import logging
 import asyncio
 import socket
+import ipaddress
 
 from .base_gns3_vm import BaseGNS3VM
 from .gns3_vm_error import GNS3VMError
@@ -89,16 +91,16 @@ class VirtualBoxGNS3VM(BaseGNS3VM):
         if not self._system_properties:
             await self._get_system_properties()
         if "API version" not in self._system_properties:
-            raise VirtualBoxError("Can't access to VirtualBox API version:\n{}".format(self._system_properties))
+            raise GNS3VMError("Can't access to VirtualBox API version:\n{}".format(self._system_properties))
         from cpuinfo import get_cpu_info
         cpu_info = await wait_run_in_executor(get_cpu_info)
         vendor_id = cpu_info.get('vendor_id_raw')
         if vendor_id == "GenuineIntel":
             if parse_version(self._system_properties["API version"]) < parse_version("6_1"):
-                raise VirtualBoxError("VirtualBox version 6.1 or above is required to run the GNS3 VM with nested virtualization enabled on Intel processors")
+                raise GNS3VMError("VirtualBox version 6.1 or above is required to run the GNS3 VM with nested virtualization enabled on Intel processors")
         elif vendor_id == "AuthenticAMD":
             if parse_version(self._system_properties["API version"]) < parse_version("6_0"):
-                raise VirtualBoxError("VirtualBox version 6.0 or above is required to run the GNS3 VM with nested virtualization enabled on AMD processors")
+                raise GNS3VMError("VirtualBox version 6.0 or above is required to run the GNS3 VM with nested virtualization enabled on AMD processors")
         else:
             log.warning("Could not determine CPU vendor: {}".format(vendor_id))
 
@@ -159,6 +161,44 @@ class VirtualBoxGNS3VM(BaseGNS3VM):
                     return True
         return False
 
+    async def _add_dhcp_server(self, vboxnet):
+        """
+        Add a DHCP server for vboxnet.
+
+        :param vboxnet: vboxnet name
+        """
+
+        hostonlyifs = await self._execute("list", ["hostonlyifs"])
+        pattern = r"IPAddress:\s+(\d+\.\d+\.\d+\.\d+)\nNetworkMask:\s+(\d+\.\d+\.\d+\.\d+)"
+        match = re.search(pattern, hostonlyifs)
+
+        if match:
+            ip_address = match.group(1)
+            netmask = match.group(2)
+        else:
+            raise GNS3VMError("Could not find IP address and netmask for vboxnet {}".format(vboxnet))
+
+        try:
+            interface = ipaddress.IPv4Interface(f"{ip_address}/{netmask}")
+            subnet = ipaddress.IPv4Network(str(interface.network))
+            dhcp_server_ip = str(interface.ip + 1)
+            netmask = str(subnet.netmask)
+            lower_ip = str(interface.ip + 2)
+            upper_ip = str(subnet.network_address + subnet.num_addresses - 2)
+        except ValueError:
+            raise GNS3VMError("Invalid IP address and netmask for vboxnet {}: {}/{}".format(vboxnet, ip_address, netmask))
+
+        dhcp_server_args = [
+            "add",
+            "--network=HostInterfaceNetworking-{}".format(vboxnet),
+            "--server-ip={}".format(dhcp_server_ip),
+            "--netmask={}".format(netmask),
+            "--lower-ip={}".format(lower_ip),
+            "--upper-ip={}".format(upper_ip),
+            "--enable"
+        ]
+        await self._execute("dhcpserver", dhcp_server_args)
+
     async def _check_vboxnet_exists(self, vboxnet, vboxnet_type):
         """
         Check if the vboxnet interface exists
@@ -261,12 +301,20 @@ class VirtualBoxGNS3VM(BaseGNS3VM):
                 await self.set_hostonly_network(interface_number, first_available_vboxnet)
                 vboxnet = first_available_vboxnet
             else:
-                raise GNS3VMError('VirtualBox host-only network "{}" does not exist, please make the sure the network adapter {} configuration is valid for "{}"'.format(vboxnet,
-                                                                                                                                                                         interface_number,
-                                                                                                                                                                         self._vmname))
+                try:
+                    await self._execute("hostonlyif", ["create"])
+                except GNS3VMError:
+                    raise GNS3VMError('VirtualBox host-only network "{}" does not exist and could not be automatically created, please make the sure the network adapter {} configuration is valid for "{}"'.format(
+                        vboxnet,
+                        interface_number,
+                        self._vmname
+                    ))
 
         if backend_type == "hostonlyadapter" and not (await self._check_dhcp_server(vboxnet)):
-            raise GNS3VMError('DHCP must be enabled on VirtualBox host-only network "{}"'.format(vboxnet))
+            try:
+                await self._add_dhcp_server(vboxnet)
+            except GNS3VMError as e:
+                raise GNS3VMError("Could not add DHCP server for vboxnet {}: {}, please configure manually".format(vboxnet, e))
 
         vm_state = await self._get_state()
         log.info('"{}" state is {}'.format(self._vmname, vm_state))
@@ -299,7 +347,7 @@ class VirtualBoxGNS3VM(BaseGNS3VM):
         except OSError as e:
             raise GNS3VMError("Error while getting random port: {}".format(e))
 
-        if (await self._check_vbox_port_forwarding()):
+        if await self._check_vbox_port_forwarding():
             # delete the GNS3VM NAT port forwarding rule if it exists
             log.info("Removing GNS3VM NAT port forwarding rule from interface {}".format(nat_interface_number))
             await self._execute("controlvm", [self._vmname, "natpf{}".format(nat_interface_number), "delete", "GNS3VM"])

gns3server/controller/node.py

@@ -485,7 +485,7 @@ class Node:
 
         # None properties are not be send. Because it can mean the emulator doesn't support it
         for key in list(data.keys()):
-            if data[key] is None or data[key] is {} or key in self.CONTROLLER_ONLY_PROPERTIES:
+            if data[key] is None or data[key] == {} or key in self.CONTROLLER_ONLY_PROPERTIES:
                 del data[key]
 
         return data

gns3server/crash_report.py

@@ -32,7 +32,6 @@ import distro
 
 from .version import __version__, __version_info__
 from .config import Config
-from .utils.get_resource import get_resource
 
 import logging
 log = logging.getLogger(__name__)
@@ -58,7 +57,7 @@ class CrashReport:
     Report crash to a third party service
     """
 
-    DSN = "https://b929a9b102684c4d809647f1e613853a@o19455.ingest.sentry.io/38482"
+    DSN = "https://dcbac52ef824b8386b67cc8f07c4de70@o19455.ingest.sentry.io/38482"
     _instance = None
 
     def __init__(self):
@@ -71,22 +70,16 @@ class CrashReport:
         sentry_uncaught.disabled = True
 
         if SENTRY_SDK_AVAILABLE:
-            cacert = None
-            if hasattr(sys, "frozen"):
-                cacert_resource = get_resource("cacert.pem")
-                if cacert_resource is not None and os.path.isfile(cacert_resource):
-                    cacert = cacert_resource
-                else:
-                    log.error("The SSL certificate bundle file '{}' could not be found".format(cacert_resource))
-
             # Don't send log records as events.
             sentry_logging = LoggingIntegration(level=logging.INFO, event_level=None)
-
-            sentry_sdk.init(dsn=CrashReport.DSN,
-                            release=__version__,
-                            ca_certs=cacert,
-                            default_integrations=False,
-                            integrations=[sentry_logging])
+            try:
+                sentry_sdk.init(dsn=CrashReport.DSN,
+                                release=__version__,
+                                default_integrations=False,
+                                integrations=[sentry_logging])
+            except Exception as e:
+                log.error("Crash report could not be sent: {}".format(e))
+                return
 
             tags = {
                 "os:name": platform.system(),

gns3server/handlers/api/controller/node_handler.py

@@ -17,6 +17,7 @@
 
 import aiohttp
 import asyncio
+import ipaddress
 
 from gns3server.web.route import Route
 from gns3server.controller import Controller
@@ -477,11 +478,27 @@ class NodeHandler:
         await ws.prepare(request)
         request.app['websockets'].add(ws)
 
-        ws_console_compute_url = "ws://{compute_host}:{compute_port}/v2/compute/projects/{project_id}/{node_type}/nodes/{node_id}/console/ws".format(compute_host=compute.host,
-                                                                                                                                                     compute_port=compute.port,
-                                                                                                                                                     project_id=project.id,
-                                                                                                                                                     node_type=node.node_type,
-                                                                                                                                                     node_id=node.id)
+        compute_host = compute.host
+        try:
+            # handle IPv6 address
+            ip = ipaddress.ip_address(compute_host)
+            if isinstance(ip, ipaddress.IPv6Address):
+                compute_host = '[' + compute_host + ']'
+        except ValueError:
+            pass
+
+        ws_protocol = "ws"
+        if request.scheme == "https":
+            ws_protocol = "wss"
+
+        ws_console_compute_url = "{protocol}://{compute_host}:{compute_port}/v2/compute/projects/{project_id}/{node_type}/nodes/{node_id}/console/ws".format(
+            protocol=ws_protocol,
+            compute_host=compute_host,
+            compute_port=compute.port,
+            project_id=project.id,
+            node_type=node.node_type,
+            node_id=node.id
+        )
 
         async def ws_forward(ws_client):
             async for msg in ws:
@@ -494,7 +511,7 @@ class NodeHandler:
 
         try:
             async with aiohttp.ClientSession(connector=aiohttp.TCPConnector(limit=None, force_close=True)) as session:
-                async with session.ws_connect(ws_console_compute_url) as ws_client:
+                async with session.ws_connect(ws_console_compute_url, ssl=False) as ws_client:
                     asyncio.ensure_future(ws_forward(ws_client))
                     async for msg in ws_client:
                         if msg.type == aiohttp.WSMsgType.TEXT:
@@ -505,6 +522,8 @@ class NodeHandler:
                             break
         except ConnectionResetError:
             log.info("Websocket console connection with compute disconnected")
+        except aiohttp.ClientError as e:
+            log.error("Websocket console connection with compute failed: {}".format(e))
         finally:
             if not ws.closed:
                 await ws.close()

gns3server/run.py

@@ -35,7 +35,6 @@ from gns3server.version import __version__
 from gns3server.config import Config
 from gns3server.crash_report import CrashReport
 
-
 import logging
 log = logging.getLogger(__name__)
 
@@ -243,6 +242,13 @@ def run():
     user_log.info("Running with Python {major}.{minor}.{micro} and has PID {pid}".format(major=sys.version_info[0], minor=sys.version_info[1],
                                                                                          micro=sys.version_info[2], pid=os.getpid()))
 
+    try:
+        import truststore
+        truststore.inject_into_ssl()
+        log.info("Using system certificate store for SSL connections")
+    except ImportError:
+        pass
+
     # check for the correct locale (UNIX/Linux only)
     locale_check()
 

gns3server/schemas/qemu.py

@@ -194,6 +194,10 @@ QEMU_CREATE_SCHEMA = {
             "description": "Enable the Trusted Platform Module (TPM) in Qemu",
             "type": ["boolean", "null"],
         },
+        "uefi": {
+            "description": "Enable the UEFI boot mode in Qemu",
+            "type": ["boolean", "null"],
+        },
         "create_config_disk": {
             "description": "Automatically create a config disk on HDD disk interface (secondary slave)",
             "type": ["boolean", "null"],
@@ -392,6 +396,10 @@ QEMU_UPDATE_SCHEMA = {
             "description": "Enable the Trusted Platform Module (TPM) in Qemu",
             "type": ["boolean", "null"],
         },
+        "uefi": {
+            "description": "Enable the UEFI boot mode in Qemu",
+            "type": ["boolean", "null"],
+        },
         "create_config_disk": {
             "description": "Automatically create a config disk on HDD disk interface (secondary slave)",
             "type": ["boolean", "null"],
@@ -603,6 +611,10 @@ QEMU_OBJECT_SCHEMA = {
             "description": "Enable the Trusted Platform Module (TPM) in Qemu",
             "type": "boolean",
         },
+        "uefi": {
+            "description": "Enable the UEFI boot mode in Qemu",
+            "type": "boolean",
+        },
         "create_config_disk": {
             "description": "Automatically create a config disk on HDD disk interface (secondary slave)",
             "type": ["boolean", "null"],
@@ -678,6 +690,7 @@ QEMU_OBJECT_SCHEMA = {
                  "legacy_networking",
                  "replicate_network_connection_state",
                  "tpm",
+                 "uefi",
                  "create_config_disk",
                  "on_close",
                  "cpu_throttling",

gns3server/schemas/qemu_template.py

@@ -65,8 +65,8 @@ QEMU_TEMPLATE_PROPERTIES = {
         "description": "QEMU adapter type",
         "type": "string",
         "enum": ["e1000", "e1000-82544gc", "e1000-82545em", "e1000e", "i82550", "i82551", "i82557a", "i82557b", "i82557c", "i82558a",
-                 "i82558b", "i82559a", "i82559b", "i82559c", "i82559er", "i82562", "i82801", "ne2k_pci", "pcnet", "rocker", "rtl8139",
-                 "virtio", "virtio-net-pci", "vmxnet3"],
+                 "i82558b", "i82559a", "i82559b", "i82559c", "i82559er", "i82562", "i82801", "igb", "ne2k_pci", "pcnet", "rocker",
+                 "rtl8139", "virtio", "virtio-net-pci", "vmxnet3"],
         "default": "e1000"
     },
     "mac_address": {
@@ -188,6 +188,11 @@ QEMU_TEMPLATE_PROPERTIES = {
         "type": "boolean",
         "default": False
     },
+    "uefi": {
+        "description": "Enable the UEFI boot mode in Qemu",
+        "type": "boolean",
+        "default": False
+    },
     "create_config_disk": {
         "description": "Automatically create a config disk on HDD disk interface (secondary slave)",
         "type": "boolean",

gns3server/static/web-ui/26.49028ab13de5de406c90.js

@@ -0,0 +1 @@
+"use strict";(self.webpackChunkgns3_web_ui=self.webpackChunkgns3_web_ui||[]).push([[26],{91026:function(W,g,a){a.r(g),a.d(g,{TopologySummaryComponent:function(){return U}});var t=a(38999),_=a(96852),h=a(14200),f=a(36889),v=a(3941),y=a(15132),p=a(40098),x=a(39095),c=a(88802),S=a(73044),d=a(59412),T=a(93386);function C(i,e){if(1&i){var o=t.EpF();t.TgZ(0,"div",2),t.NdJ("mousemove",function(r){return t.CHM(o),t.oxw().dragWidget(r)},!1,t.evT)("mouseup",function(){return t.CHM(o),t.oxw().toggleDragging(!1)},!1,t.evT),t.qZA()}}function b(i,e){1&i&&(t.O4$(),t.TgZ(0,"svg",28),t._UZ(1,"rect",29),t.qZA())}function E(i,e){1&i&&(t.O4$(),t.TgZ(0,"svg",28),t._UZ(1,"rect",30),t.qZA())}function Z(i,e){1&i&&(t.O4$(),t.TgZ(0,"svg",28),t._UZ(1,"rect",31),t.qZA())}function O(i,e){if(1&i&&(t.TgZ(0,"div"),t._uU(1),t.qZA()),2&i){var o=t.oxw().$implicit;t.xp6(1),t.lnq(" ",o.console_type,"://",o.console_host,":",o.console," ")}}function P(i,e){1&i&&(t.TgZ(0,"div"),t._uU(1," none "),t.qZA())}function M(i,e){if(1&i&&(t.TgZ(0,"div",25),t.TgZ(1,"div"),t.YNc(2,b,2,0,"svg",26),t.YNc(3,E,2,0,"svg",26),t.YNc(4,Z,2,0,"svg",26),t._uU(5),t.qZA(),t.YNc(6,O,2,3,"div",27),t.YNc(7,P,2,0,"div",27),t.qZA()),2&i){var o=e.$implicit;t.xp6(2),t.Q6J("ngIf","started"===o.status),t.xp6(1),t.Q6J("ngIf","suspended"===o.status),t.xp6(1),t.Q6J("ngIf","stopped"===o.status),t.xp6(1),t.hij(" ",o.name," "),t.xp6(1),t.Q6J("ngIf",null!=o.console&&null!=o.console&&"none"!=o.console_type),t.xp6(1),t.Q6J("ngIf",null==o.console||"none"===o.console_type)}}function w(i,e){1&i&&(t.O4$(),t.TgZ(0,"svg",28),t._UZ(1,"rect",29),t.qZA())}function A(i,e){1&i&&(t.O4$(),t.TgZ(0,"svg",28),t._UZ(1,"rect",31),t.qZA())}function F(i,e){if(1&i&&(t.TgZ(0,"div",25),t.TgZ(1,"div"),t.YNc(2,w,2,0,"svg",26),t.YNc(3,A,2,0,"svg",26),t._uU(4),t.qZA(),t.TgZ(5,"div"),t._uU(6),t.qZA(),t.TgZ(7,"div"),t._uU(8),t.qZA(),t.qZA()),2&i){var o=e.$implicit,s=t.oxw(2);t.xp6(2),t.Q6J("ngIf",o.connected),t.xp6(1),t.Q6J("ngIf",!o.connected),t.xp6(1),t.hij(" ",o.name," "),t.xp6(2),t.hij(" ",o.host," "),t.xp6(2),t.hij(" ",s.server.location," ")}}var I=function(i){return{lightTheme:i}},D=function(){return{right:!0,left:!0,bottom:!0,top:!0}};function N(i,e){if(1&i){var o=t.EpF();t.TgZ(0,"div",3),t.NdJ("mousedown",function(){return t.CHM(o),t.oxw().toggleDragging(!0)})("resizeStart",function(){return t.CHM(o),t.oxw().toggleDragging(!1)})("resizeEnd",function(n){return t.CHM(o),t.oxw().onResizeEnd(n)}),t.TgZ(1,"div",4),t.TgZ(2,"mat-tab-group"),t.TgZ(3,"mat-tab",5),t.NdJ("click",function(){return t.CHM(o),t.oxw().toggleTopologyVisibility(!0)}),t.TgZ(4,"div",6),t.TgZ(5,"div",7),t.TgZ(6,"mat-select",8),t.TgZ(7,"mat-optgroup",9),t.TgZ(8,"mat-option",10),t.NdJ("onSelectionChange",function(){return t.CHM(o),t.oxw().applyStatusFilter("started")}),t._uU(9,"started"),t.qZA(),t.TgZ(10,"mat-option",11),t.NdJ("onSelectionChange",function(){return t.CHM(o),t.oxw().applyStatusFilter("suspended")}),t._uU(11,"suspended"),t.qZA(),t.TgZ(12,"mat-option",12),t.NdJ("onSelectionChange",function(){return t.CHM(o),t.oxw().applyStatusFilter("stopped")}),t._uU(13,"stopped"),t.qZA(),t.qZA(),t.TgZ(14,"mat-optgroup",13),t.TgZ(15,"mat-option",14),t.NdJ("onSelectionChange",function(){return t.CHM(o),t.oxw().applyCaptureFilter("capture")}),t._uU(16,"active capture(s)"),t.qZA(),t.TgZ(17,"mat-option",15),t.NdJ("onSelectionChange",function(){return t.CHM(o),t.oxw().applyCaptureFilter("packet")}),t._uU(18,"active packet captures"),t.qZA(),t.qZA(),t.qZA(),t.qZA(),t.TgZ(19,"div",16),t.TgZ(20,"mat-select",17),t.NdJ("selectionChange",function(){return t.CHM(o),t.oxw().setSortingOrder()})("valueChange",function(n){return t.CHM(o),t.oxw().sortingOrder=n}),t.TgZ(21,"mat-option",18),t._uU(22,"sort by name ascending"),t.qZA(),t.TgZ(23,"mat-option",19),t._uU(24,"sort by name descending"),t.qZA(),t.qZA(),t.qZA(),t._UZ(25,"mat-divider",20),t.TgZ(26,"div",21),t.YNc(27,M,8,6,"div",22),t.qZA(),t.qZA(),t.qZA(),t.TgZ(28,"mat-tab",23),t.NdJ("click",function(){return t.CHM(o),t.oxw().toggleTopologyVisibility(!1)}),t.TgZ(29,"div",6),t.TgZ(30,"div",24),t.YNc(31,F,9,5,"div",22),t.qZA(),t.qZA(),t.qZA(),t.qZA(),t.qZA(),t.qZA()}if(2&i){var s=t.oxw();t.Q6J("ngStyle",s.style)("ngClass",t.VKq(9,I,s.isLightThemeEnabled))("validateResize",s.validate)("resizeEdges",t.DdM(11,D))("enableGhostResize",!0),t.xp6(20),t.Q6J("value",s.sortingOrder),t.xp6(6),t.Q6J("ngStyle",s.styleInside),t.xp6(1),t.Q6J("ngForOf",s.filteredNodes),t.xp6(4),t.Q6J("ngForOf",s.computes)}}var U=function(){function i(e,o,s,r,n){this.nodesDataSource=e,this.projectService=o,this.computeService=s,this.linksDataSource=r,this.themeService=n,this.closeTopologySummary=new t.vpe,this.style={},this.styleInside={height:"280px"},this.subscriptions=[],this.nodes=[],this.filteredNodes=[],this.sortingOrder="asc",this.startedStatusFilterEnabled=!1,this.suspendedStatusFilterEnabled=!1,this.stoppedStatusFilterEnabled=!1,this.captureFilterEnabled=!1,this.packetFilterEnabled=!1,this.computes=[],this.isTopologyVisible=!0,this.isDraggLine truncated

gns3server/static/web-ui/index.html

@@ -46,6 +46,6 @@
 
       gtag('config', 'G-5D6FZL9923');
     </script>
-  <script src="runtime.baa1121a4737aeb68bb7.js" defer></script><script src="polyfills-es5.865074f5cd9a121111a2.js" nomodule defer></script><script src="polyfills.2f91a039d848e57ff02e.js" defer></script><script src="main.8448c96e4facbe79a613.js" defer></script>
+  <script src="runtime.baa1121a4737aeb68bb7.js" defer></script><script src="polyfills-es5.865074f5cd9a121111a2.js" nomodule defer></script><script src="polyfills.2f91a039d848e57ff02e.js" defer></script><script src="main.383fdade2fd9dbccffbc.js" defer></script>
 
 </body></html>

gns3server/static/web-ui/main.383fdade2fd9dbccffbc.js

@@ -0,0 +1 @@
+(self.webpackChunkgns3_web_ui=self.webpackChunkgns3_web_ui||[]).push([[179],{98255:function(ue){function q(f){return Promise.resolve().then(function(){var U=new Error("Cannot find module '"+f+"'");throw U.code="MODULE_NOT_FOUND",U})}q.keys=function(){return[]},q.resolve=q,q.id=98255,ue.exports=q},82908:function(ue){ue.exports=function(f,U){(null==U||U>f.length)&&(U=f.length);for(var B=0,V=new Array(U);B<U;B++)V[B]=f[B];return V},ue.exports.default=ue.exports,ue.exports.__esModule=!0},36457:function(ue){ue.exports=function(f){if(Array.isArray(f))return f},ue.exports.default=ue.exports,ue.exports.__esModule=!0},35036:function(ue){ue.exports=function(f,U){var B=null==f?null:"undefined"!=typeof Symbol&&f[Symbol.iterator]||f["@@iterator"];if(null!=B){var R,b,V=[],Z=!0,T=!1;try{for(B=B.call(f);!(Z=(R=B.next()).done)&&(V.push(R.value),!U||V.length!==U);Z=!0);}catch(v){T=!0,b=v}finally{try{!Z&&null!=B.return&&B.return()}finally{if(T)throw b}}return V}},ue.exports.default=ue.exports,ue.exports.__esModule=!0},13969:function(ue){ue.exports=function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")},ue.exports.default=ue.exports,ue.exports.__esModule=!0},6326:function(ue,q,f){var U=f(36457),B=f(35036),V=f(54850),Z=f(13969);ue.exports=function(R,b){return U(R)||B(R,b)||V(R,b)||Z()},ue.exports.default=ue.exports,ue.exports.__esModule=!0},54850:function(ue,q,f){var U=f(82908);ue.exports=function(V,Z){if(V){if("string"==typeof V)return U(V,Z);var T=Object.prototype.toString.call(V).slice(8,-1);if("Object"===T&&V.constructor&&(T=V.constructor.name),"Map"===T||"Set"===T)return Array.from(V);if("Arguments"===T||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(T))return U(V,Z)}},ue.exports.default=ue.exports,ue.exports.__esModule=!0},26552:function(ue,q,f){ue.exports=f(55590)},61855:function(ue,q,f){"use strict";f.d(q,{ZT:function(){return B},mG:function(){return v},Jh:function(){return I},ev:function(){return N}});var U=function($,ae){return(U=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(se,ce){se.__proto__=ce}||function(se,ce){for(var le in ce)Object.prototype.hasOwnProperty.call(ce,le)&&(se[le]=ce[le])})($,ae)};function B($,ae){if("function"!=typeof ae&&null!==ae)throw new TypeError("Class extends value "+String(ae)+" is not a constructor or null");function se(){this.constructor=$}U($,ae),$.prototype=null===ae?Object.create(ae):(se.prototype=ae.prototype,new se)}function v($,ae,se,ce){return new(se||(se=Promise))(function(oe,Ae){function be(_t){try{qe(ce.next(_t))}catch(yt){Ae(yt)}}function it(_t){try{qe(ce.throw(_t))}catch(yt){Ae(yt)}}function qe(_t){_t.done?oe(_t.value):function(oe){return oe instanceof se?oe:new se(function(Ae){Ae(oe)})}(_t.value).then(be,it)}qe((ce=ce.apply($,ae||[])).next())})}function I($,ae){var ce,le,oe,Ae,se={label:0,sent:function(){if(1&oe[0])throw oe[1];return oe[1]},trys:[],ops:[]};return Ae={next:be(0),throw:be(1),return:be(2)},"function"==typeof Symbol&&(Ae[Symbol.iterator]=function(){return this}),Ae;function be(qe){return function(_t){return function(qe){if(ce)throw new TypeError("Generator is already executing.");for(;se;)try{if(ce=1,le&&(oe=2&qe[0]?le.return:qe[0]?le.throw||((oe=le.return)&&oe.call(le),0):le.next)&&!(oe=oe.call(le,qe[1])).done)return oe;switch(le=0,oe&&(qe=[2&qe[0],oe.value]),qe[0]){case 0:case 1:oe=qe;break;case 4:return se.label++,{value:qe[1],done:!1};case 5:se.label++,le=qe[1],qe=[0];continue;case 7:qe=se.ops.pop(),se.trys.pop();continue;default:if(!(oe=(oe=se.trys).length>0&&oe[oe.length-1])&&(6===qe[0]||2===qe[0])){se=0;continue}if(3===qe[0]&&(!oe||qe[1]>oe[0]&&qe[1]<oe[3])){se.label=qe[1];break}if(6===qe[0]&&se.label<oe[1]){se.label=oe[1],oe=qe;break}if(oe&&se.label<oe[2]){se.label=oe[2],se.ops.push(qe);break}oe[2]&&se.ops.pop(),se.trys.pop();continue}qe=ae.call($,se)}catch(_t){qe=[6,_t],le=0}finally{ce=oe=0}if(5&qe[0])throw qe[1];return{value:qe[0]?qe[1]:void 0,done:!0}}([qe,_t])}}}function N($,ae,se){if(se||2===arguments.length)for(var oe,ce=0,le=ae.length;ce<le;ce++)(oe||!(ce in ae))&&(oe||(oe=Array.prototype.slice.call(ae,0,ce)),oe[ce]=ae[ce]);return $.concat(oe||Array.prototype.slice.call(ae))}},739:function(ue,q,f){"use strict";f.d(q,{l3:function(){return T},_j:function(){return V},LC:function(){return Z},ZN:function(){return O},jt:function(){return b},pV:function(){return E},F4:function(){return M},IO:function(){return A},vP:function(){return I},SB:function(){return k},oB:function(){return D},eR:function(){return _},X$:function(){return R},ZE:function(){return F},k1:function(){return z}});var U=f(14105),B=f(18967),V=function K(){(0,B.Z)(this,K)},Z=function K(){(0,B.Z)(this,K)},T="*";function R(K,j){return{type:7,name:K,definitions:j,options:{}}}function b(K){var j=arguments.length>1&&void 0!==arguments[1]?arguments[1]:null;return{type:4,styles:j,timings:K}}function I(K){var j=arguments.length>1&&void 0!==arguments[1]?arguments[1]Line truncated

gns3server/static/web-ui/runtime.baa1121a4737aeb68bb7.js

@@ -0,0 +1 @@
+!function(){"use strict";var e,v={},g={};function n(e){var a=g[e];if(void 0!==a)return a.exports;var t=g[e]={id:e,loaded:!1,exports:{}};return v[e](t,t.exports,n),t.loaded=!0,t.exports}n.m=v,e=[],n.O=function(a,t,u,o){if(!t){var r=1/0;for(i=0;i<e.length;i++){t=e[i][0],u=e[i][1],o=e[i][2];for(var l=!0,f=0;f<t.length;f++)(!1&o||r>=o)&&Object.keys(n.O).every(function(b){return n.O[b](t[f])})?t.splice(f--,1):(l=!1,o<r&&(r=o));if(l){e.splice(i--,1);var s=u();void 0!==s&&(a=s)}}return a}o=o||0;for(var i=e.length;i>0&&e[i-1][2]>o;i--)e[i]=e[i-1];e[i]=[t,u,o]},n.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(a,{a:a}),a},n.d=function(e,a){for(var t in a)n.o(a,t)&&!n.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:a[t]})},n.f={},n.e=function(e){return Promise.all(Object.keys(n.f).reduce(function(a,t){return n.f[t](e,a),a},[]))},n.u=function(e){return e+".49028ab13de5de406c90.js"},n.miniCssF=function(e){return"styles.f8555f2eecf8cf87f666.css"},n.hmd=function(e){return(e=Object.create(e)).children||(e.children=[]),Object.defineProperty(e,"exports",{enumerable:!0,set:function(){throw new Error("ES Modules may not assign module.exports or exports.*, Use ESM export syntax, instead: "+e.id)}}),e},n.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},function(){var e={},a="gns3-web-ui:";n.l=function(t,u,o,i){if(e[t])e[t].push(u);else{var r,l;if(void 0!==o)for(var f=document.getElementsByTagName("script"),s=0;s<f.length;s++){var c=f[s];if(c.getAttribute("src")==t||c.getAttribute("data-webpack")==a+o){r=c;break}}r||(l=!0,(r=document.createElement("script")).charset="utf-8",r.timeout=120,n.nc&&r.setAttribute("nonce",n.nc),r.setAttribute("data-webpack",a+o),r.src=n.tu(t)),e[t]=[u];var d=function(h,b){r.onerror=r.onload=null,clearTimeout(p);var _=e[t];if(delete e[t],r.parentNode&&r.parentNode.removeChild(r),_&&_.forEach(function(m){return m(b)}),h)return h(b)},p=setTimeout(d.bind(null,void 0,{type:"timeout",target:r}),12e4);r.onerror=d.bind(null,r.onerror),r.onload=d.bind(null,r.onload),l&&document.head.appendChild(r)}}}(),n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},function(){var e;n.tu=function(a){return void 0===e&&(e={createScriptURL:function(t){return t}},"undefined"!=typeof trustedTypes&&trustedTypes.createPolicy&&(e=trustedTypes.createPolicy("angular#bundler",e))),e.createScriptURL(a)}}(),n.p="",function(){var e={666:0};n.f.j=function(u,o){var i=n.o(e,u)?e[u]:void 0;if(0!==i)if(i)o.push(i[2]);else if(666!=u){var r=new Promise(function(c,d){i=e[u]=[c,d]});o.push(i[2]=r);var l=n.p+n.u(u),f=new Error;n.l(l,function(c){if(n.o(e,u)&&(0!==(i=e[u])&&(e[u]=void 0),i)){var d=c&&("load"===c.type?"missing":c.type),p=c&&c.target&&c.target.src;f.message="Loading chunk "+u+" failed.\n("+d+": "+p+")",f.name="ChunkLoadError",f.type=d,f.request=p,i[1](f)}},"chunk-"+u,u)}else e[u]=0},n.O.j=function(u){return 0===e[u]};var a=function(u,o){var f,s,i=o[0],r=o[1],l=o[2],c=0;for(f in r)n.o(r,f)&&(n.m[f]=r[f]);if(l)var d=l(n);for(u&&u(o);c<i.length;c++)n.o(e,s=i[c])&&e[s]&&e[s][0](),e[i[c]]=0;return n.O(d)},t=self.webpackChunkgns3_web_ui=self.webpackChunkgns3_web_ui||[];t.forEach(a.bind(null,0)),t.push=a.bind(null,t.push.bind(t))}()}();

gns3server/utils/images.py

@@ -20,7 +20,7 @@ import hashlib
 
 from ..config import Config
 from . import force_unix_path
-
+from io import DEFAULT_BUFFER_SIZE
 
 import logging
 log = logging.getLogger(__name__)
@@ -167,12 +167,13 @@ def md5sum(path, stopped_event=None):
 
     try:
         m = hashlib.md5()
+        log.debug("Calculating MD5 sum of `{}`".format(path))
         with open(path, 'rb') as f:
             while True:
                 if stopped_event is not None and stopped_event.is_set():
                     log.error("MD5 sum calculation of `{}` has stopped due to cancellation".format(path))
                     return
-                buf = f.read(128)
+                buf = f.read(DEFAULT_BUFFER_SIZE)
                 if not buf:
                     break
                 m.update(buf)

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.40"
-__version_info__ = (2, 2, 40, 0)
+__version__ = "2.2.44"
+__version_info__ = (2, 2, 44, 0)
 
 if "dev" in __version__:
     try:

gns3server/web/route.py

@@ -232,8 +232,7 @@ class Route(object):
                     response.set_status(408)
                     response.json({"message": "Request canceled", "status": 408})
                     raise  # must raise to let aiohttp know the connection has been closed
-                except aiohttp.ClientError:
-                    log.warning("Client error")
+                except (ConnectionResetError, aiohttp.ClientError):
                     response = Response(request=request, route=route)
                     response.set_status(408)
                     response.json({"message": "Client error", "status": 408})

gns3server/web/web_server.py

@@ -29,6 +29,7 @@ import functools
 import time
 import atexit
 import weakref
+import concurrent.futures
 
 # Import encoding now, to avoid implicit import later.
 # Implicit import within threads may cause LookupError when standard library is in a ZIP
@@ -38,7 +39,7 @@ from .route import Route
 from ..config import Config
 from ..compute import MODULES
 from ..compute.port_manager import PortManager
-from ..compute.qemu import Qemu
+from ..utils.images import list_images
 from ..controller import Controller
 
 # do not delete this import
@@ -87,6 +88,8 @@ class WebServer:
         except (RuntimeError, OSError, asyncio.CancelledError) as e:
             log.critical("Could not start the server: {}".format(e))
             return False
+        except KeyboardInterrupt:
+            return False
         return True
 
     async def reload_server(self):
@@ -230,16 +233,27 @@ class WebServer:
 
         atexit.register(close_asyncio_loop)
 
+    async def _compute_image_checksums(self):
+        """
+        Compute image checksums.
+        """
+
+        loop = asyncio.get_event_loop()
+        with concurrent.futures.ProcessPoolExecutor(max_workers=1) as pool:
+            log.info("Computing image checksums...")
+            await loop.run_in_executor(pool, list_images, "qemu")
+            log.info("Finished computing image checksums")
+
     async def _on_startup(self, *args):
         """
         Called when the HTTP server start
         """
 
         await Controller.instance().start()
-        # Because with a large image collection
-        # without md5sum already computed we start the
-        # computing with server start
-        asyncio.ensure_future(Qemu.instance().list_images())
+
+        # Start computing checksums now because it can take a long time
+        # for a large image collection
+        await self._compute_image_checksums()
 
     def run(self):
         """
@@ -330,6 +344,8 @@ class WebServer:
 
         try:
             self._loop.run_forever()
+        except ConnectionResetError:
+            log.warning("Connection reset by peer")
         except TypeError as e:
             # This is to ignore an asyncio.windows_events exception
             # on Windows when the process gets the SIGBREAK signal

requirements.txt

@@ -1,16 +1,19 @@
-jsonschema>=4.17.3,<4.18; python_version >= '3.7'
+jsonschema>=4.17.3,<4.18; python_version >= '3.7' # v4.17.3 is the last version to support Python 3.7
 jsonschema==3.2.0; python_version < '3.7'  # v3.2.0 is the last version to support Python 3.6
-aiohttp>=3.8.4,<3.9
+aiohttp>=3.8.5,<3.9; python_version < '3.12'
+aiohttp==3.9.0b0; python_version == '3.12'
 aiohttp-cors>=0.7.0,<0.8
-aiofiles>=22.1.0,<22.2; python_version >= '3.7'
+aiofiles>=23.2.1,<23.3; python_version >= '3.7'
 aiofiles==0.8.0; python_version < '3.7'  # v0.8.0 is the last version to support Python 3.6
 Jinja2>=3.1.2,<3.2; python_version >= '3.7'
 Jinja2==3.0.3; python_version < '3.7'  # v3.0.3 is the last version to support Python 3.6
-sentry-sdk==1.17.0,<1.18
-psutil==5.9.4
+sentry-sdk==1.34.0,<1.35
+psutil==5.9.6
 async-timeout>=4.0.2,<4.1
 distro>=1.8.0
 py-cpuinfo>=9.0.0,<10.0
-importlib-resources>=1.3; python_version <= '3.9'
+platformdirs>=2.4.0
+importlib-resources>=1.3; python_version < '3.9'
+truststore>=0.8.0; python_version >= '3.10'
 setuptools>=60.8.1; python_version >= '3.7'
 setuptools==59.6.0; python_version < '3.7'  # v59.6.0 is the last version to support Python 3.6

scripts/create_cert.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2020 GNS3 Technologies Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Bash shell script for generating self-signed certs.
+# The certificate is automatically put in your GNS3 config
+
+DST_DIR="$HOME/.config/GNS3/ssl"
+OLD_DIR=`pwd`
+
+fail_if_error() {
+  [ $1 != 0 ] && {
+    unset PASSPHRASE
+    cd $OLD_DIR
+    exit 10
+  }
+}
+
+
+mkdir -p $DST_DIR
+fail_if_error $?
+cd $DST_DIR
+
+SUBJ="/C=US/ST=Texas/O=GNS3SELF/localityName=Austin/commonName=localhost/organizationalUnitName=GNS3Server/emailAddress=gns3cert@gns3.com"
+
+openssl req -nodes -new -x509 -keyout server.key -out server.cert -subj "$SUBJ"

scripts/update-bundled-web-ui.sh

@@ -72,7 +72,7 @@ if [ "$CUSTOM_REPO" = false ] ; then
     else
       cd "$REPO_DIR"
 
-      git checkout master
+      git checkout 2.2
       git fetch --tags
       git pull
 
@@ -96,3 +96,8 @@ yarn ng build --source-map=false --configuration=production --base-href /static/
 cp -R $REPO_DIR/dist/* "$GNS3SERVER_DIR/gns3server/static/web-ui/"
 
 cd "$GNS3SERVER_DIR"
+git add gns3server/static/web-ui/*
+if [[ -n "$TAG" ]]
+then
+  git commit -m "Bundle web-ui ${TAG}"
+fi

setup.py

@@ -109,6 +109,7 @@ setup(
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "Programming Language :: Python :: Implementation :: CPython",
     ],
 )

tests/compute/docker/test_docker_vm.py

@@ -182,7 +182,7 @@ async def test_create_vnc(compute_project, manager):
                         "Binds": [
                             "{}:/gns3:ro".format(get_resource("compute/docker/resources")),
                             "{}:/gns3volumes/etc/network".format(os.path.join(vm.working_dir, "etc", "network")),
-                            '/tmp/.X11-unix/:/tmp/.X11-unix/'
+                            "/tmp/.X11-unix/X{0}:/tmp/.X11-unix/X{0}:ro".format(vm._display)
                         ],
                         "Privileged": True
                     },

tests/compute/qemu/test_qemu_vm.py

@@ -78,6 +78,7 @@ async def vm(compute_project, manager, fake_qemu_binary, fake_qemu_img_binary):
     vm._start_ubridge = AsyncioMagicMock()
     vm._ubridge_hypervisor = MagicMock()
     vm._ubridge_hypervisor.is_running.return_value = True
+    vm.manager.get_qemu_version = AsyncioMagicMock(return_value="6.2.0")
     vm.manager.config.set("Qemu", "enable_hardware_acceleration", False)
     return vm
 
@@ -141,7 +142,6 @@ async def test_is_running(vm, running_subprocess_mock):
 
 async def test_start(vm, running_subprocess_mock):
 
-    vm.manager.get_qemu_version = AsyncioMagicMock(return_value="3.1.0")
     with asyncio_patch("gns3server.compute.qemu.QemuVM.start_wrap_console"):
         with asyncio_patch("asyncio.create_subprocess_exec", return_value=running_subprocess_mock) as mock:
             await vm.start()
@@ -156,7 +156,6 @@ async def test_stop(vm, running_subprocess_mock):
     future = asyncio.Future()
     future.set_result(True)
     process.wait.return_value = future
-    vm.manager.get_qemu_version = AsyncioMagicMock(return_value="3.1.0")
 
     with asyncio_patch("gns3server.compute.qemu.QemuVM.start_wrap_console"):
         with asyncio_patch("asyncio.create_subprocess_exec", return_value=process):
@@ -209,18 +208,18 @@ async def test_termination_callback_error(vm, tmpdir):
 
 async def test_reload(vm):
 
-    with asyncio_patch("gns3server.compute.qemu.QemuVM._control_vm") as mock:
+    with asyncio_patch("gns3server.compute.qemu.QemuVM._control_vm") as m:
         await vm.reload()
-        assert mock.called_with("system_reset")
+        m.assert_called_with("system_reset")
 
 
-async def test_suspend(vm):
+async def test_suspend(vm, running_subprocess_mock):
 
-    control_vm_result = MagicMock()
-    control_vm_result.match.group.decode.return_value = "running"
-    with asyncio_patch("gns3server.compute.qemu.QemuVM._control_vm", return_value=control_vm_result) as mock:
-        await vm.suspend()
-        assert mock.called_with("system_reset")
+    vm._process = running_subprocess_mock
+    with asyncio_patch("gns3server.compute.qemu.QemuVM._get_vm_status", return_value="running"):
+        with asyncio_patch("gns3server.compute.qemu.QemuVM._control_vm") as m:
+            await vm.suspend()
+            m.assert_called_with("stop")
 
 
 async def test_add_nio_binding_udp(vm):
@@ -241,7 +240,6 @@ async def test_port_remove_nio_binding(vm):
 
 async def test_close(vm, port_manager):
 
-    vm.manager.get_qemu_version = AsyncioMagicMock(return_value="3.1.0")
     with asyncio_patch("gns3server.compute.qemu.QemuVM.start_wrap_console"):
         with asyncio_patch("asyncio.create_subprocess_exec", return_value=MagicMock()):
             await vm.start()
@@ -369,7 +367,6 @@ async def test_disk_options(vm, tmpdir, fake_qemu_img_binary):
 
 async def test_cdrom_option(vm, tmpdir, fake_qemu_img_binary):
 
-    vm.manager.get_qemu_version = AsyncioMagicMock(return_value="3.1.0")
     vm._cdrom_image = str(tmpdir / "test.iso")
     open(vm._cdrom_image, "w+").close()
 
@@ -380,13 +377,38 @@ async def test_cdrom_option(vm, tmpdir, fake_qemu_img_binary):
 
 async def test_bios_option(vm, tmpdir, fake_qemu_img_binary):
 
-    vm.manager.get_qemu_version = AsyncioMagicMock(return_value="3.1.0")
     vm._bios_image = str(tmpdir / "test.img")
     open(vm._bios_image, "w+").close()
     options = await vm._build_command()
     assert ' '.join(['-bios', str(tmpdir / "test.img")]) in ' '.join(options)
 
 
+@pytest.mark.skipif(sys.platform.startswith("win"), reason="Test not working on Windows")
+async def test_uefi_boot_mode_option(vm, tmpdir, images_dir, fake_qemu_img_binary):
+
+    vm._uefi = True
+
+    # create fake OVMF files
+    ovmf_code_path = os.path.join(images_dir, "OVMF_CODE.fd")
+    with open(ovmf_code_path, "w+") as f:
+        f.write('1')
+    ovmf_vars_path = os.path.join(images_dir, "OVMF_VARS.fd")
+    with open(ovmf_vars_path, "w+") as f:
+        f.write('1')
+
+    options = await vm._build_command()
+    assert ' '.join(["-drive", "if=pflash,format=raw,readonly,file={}".format(ovmf_code_path)]) in ' '.join(options)
+    assert ' '.join(["-drive", "if=pflash,format=raw,file={}".format(os.path.join(vm.working_dir, "OVMF_VARS.fd"))]) in ' '.join(options)
+
+
+async def test_uefi_with_bios_image_already_configured(vm, tmpdir, fake_qemu_img_binary):
+
+    vm._bios_image = str(tmpdir / "test.img")
+    vm._uefi = True
+    with pytest.raises(QemuError):
+        await vm._build_command()
+
+
 async def test_vnc_option(vm, fake_qemu_img_binary):
 
     vm._console_type = 'vnc'
@@ -406,7 +428,6 @@ async def test_spice_option(vm, fake_qemu_img_binary):
 
 async def test_tpm_option(vm, tmpdir, fake_qemu_img_binary):
 
-    vm.manager.get_qemu_version = AsyncioMagicMock(return_value="3.1.0")
     vm._tpm = True
     tpm_sock = os.path.join(vm.temporary_directory, "swtpm.sock")
     with patch("os.path.exists", return_value=True) as os_path:
@@ -469,14 +490,15 @@ def test_json(vm, compute_project):
     assert json["project_id"] == compute_project.id
 
 
-async def test_control_vm(vm):
+async def test_control_vm(vm, running_subprocess_mock):
 
-    vm._process = MagicMock()
+    vm._process = running_subprocess_mock
+    vm._monitor = 4242
     reader = MagicMock()
     writer = MagicMock()
     with asyncio_patch("asyncio.open_connection", return_value=(reader, writer)):
         res = await vm._control_vm("test")
-        assert writer.write.called_with("test")
+        writer.write.assert_called_with(b"test\n")
     assert res is None
 
 
@@ -493,14 +515,13 @@ async def test_control_vm_expect_text(vm, running_subprocess_mock):
 
         vm._monitor = 4242
         res = await vm._control_vm("test", [b"epic"])
-        assert writer.write.called_with("test")
+        writer.write.assert_called_with(b"test\n")
 
     assert res == "epic product"
 
 
 async def test_build_command(vm, fake_qemu_binary):
 
-    vm.manager.get_qemu_version = AsyncioMagicMock(return_value="3.1.0")
     os.environ["DISPLAY"] = "0:0"
     with asyncio_patch("asyncio.create_subprocess_exec", return_value=MagicMock()):
         cmd = await vm._build_command()
@@ -535,7 +556,6 @@ async def test_build_command_manual_uuid(vm):
     If user has set a uuid we keep it
     """
 
-    vm.manager.get_qemu_version = AsyncioMagicMock(return_value="3.1.0")
     vm.options = "-uuid e1c307a4-896f-11e6-81a5-3c07547807cc"
     os.environ["DISPLAY"] = "0:0"
     with asyncio_patch("asyncio.create_subprocess_exec", return_value=MagicMock()):
@@ -670,7 +690,6 @@ async def test_build_command_two_adapters_mac_address(vm):
     Should support multiple base vmac address
     """
 
-    vm.manager.get_qemu_version = AsyncioMagicMock(return_value="2.5.0")
     vm.adapters = 2
     vm.mac_address = "00:00:ab:0e:0f:09"
     mac_0 = vm._mac_address
@@ -695,12 +714,9 @@ async def test_build_command_two_adapters_mac_address(vm):
 async def test_build_command_large_number_of_adapters(vm):
     """
     When we have more than 28 interface we need to add a pci bridge for
-    additional interfaces
+    additional interfaces (supported only with Qemu 2.4 and later)
     """
 
-    # It's supported only with Qemu 2.4 and later
-    vm.manager.get_qemu_version = AsyncioMagicMock(return_value="2.4.0")
-
     vm.adapters = 100
     vm.mac_address = "00:00:ab:0e:0f:09"
     mac_0 = vm._mac_address
@@ -742,7 +758,6 @@ async def test_build_command_with_virtio_net_pci_adapter(vm):
     Test virtio-net-pci adapter which has parameters speed=1000 & duplex=full hard-coded
     """
 
-    vm.manager.get_qemu_version = AsyncioMagicMock(return_value="2.4.0")
     vm.adapters = 1
     vm.mac_address = "00:00:ab:0e:0f:09"
     vm._adapter_type = "virtio-net-pci"

tests/handlers/api/compute/test_qemu.py

@@ -255,7 +255,7 @@ async def test_qemu_list_binaries(compute_api, vm):
 
     with asyncio_patch("gns3server.compute.qemu.Qemu.binary_list", return_value=ret) as mock:
         response = await compute_api.get("/qemu/binaries".format(project_id=vm["project_id"]))
-        assert mock.called_with(None)
+        mock.assert_called_with(None)
         assert response.status == 200
         assert response.json == ret
 
@@ -271,7 +271,7 @@ async def test_qemu_list_binaries_filter(compute_api, vm):
     with asyncio_patch("gns3server.compute.qemu.Qemu.binary_list", return_value=ret) as mock:
         response = await compute_api.get("/qemu/binaries".format(project_id=vm["project_id"]), body={"archs": ["i386"]})
         assert response.status == 200
-        assert mock.called_with(["i386"])
+        mock.assert_called_with(["i386"])
         assert response.json == ret