Release v2.2.40.1

Release v2.2.40

.github/workflows/add-new-issues-to-project.yml

@@ -0,0 +1,16 @@
+name: Add new issues to GNS3 project
+
+on:
+  issues:
+    types:
+      - opened
+
+jobs:
+  add-to-project:
+    name: Add issue to project
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/add-to-project@v0.4.0
+        with:
+          project-url: https://github.com/orgs/GNS3/projects/3
+          github-token: ${{ secrets.ADD_NEW_ISSUES_TO_PROJECT }}

CHANGELOG

@@ -1,5 +1,37 @@
 # Change Log
 
+## 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)
+* Parse name for request to node creation from template
+* Remove Xvfb + x11vnc support
+* Require a Host-Only Network to start the VirtualBox GNS3 VM on macOS with VirtualBox 7
+* Properly catch aiohttp client exception. Ref #2228
+* Catch ConnectionResetError when waiting for the wrap console
+* Fix open IPv6 address for HTTP consoles on controller. Fixes https://github.com/GNS3/gns3-gui/issues/3448
+* Use proc.communicate() when checking for subprocess output As recommended in https://docs.python.org/3/library/asyncio-subprocess.html#asyncio.subprocess.Process.stderr
+
+## 2.2.39 08/05/2023
+
+* Install web-ui v2.2.39
+* Add generic function to install resource files
+* Install empty Qemu disks on first start
+* Check for colon in project name. Fixes #2203
+* Upgrade distro and aiohttp dependencies
+
+## 2.2.38 28/02/2023
+
+* Bundle web-ui v2.2.38
+* Fix c7200_i0_log.txt is created in the current directory. Fixes #2191
+* Check swtpm version and start swtpm before qemu
+* Fix broken websocket console with Python 3.11
+* Fix "cannot reopen console". Ref #2182
+* Fix Qemu binary not set when adding appliance from template
+
 ## 2.2.37 25/01/2023
 
 * Fix link communication issues on Windows with uBridge

gns3server/appliances/almalinux.gns3a

@@ -37,7 +37,8 @@
             "version": "1.0",
             "md5sum": "72fb52af76e9561d125dd99224e2c1d1",
             "filesize": 374784,
-            "download_url": "https://github.com/GNS3/gns3-registry/raw/master/cloud-init/AlmaLinux/almalinux-cloud-init-data.iso"
+            "download_url": "https://github.com/GNS3/gns3-registry/tree/master/cloud-init/AlmaLinux",
+            "direct_download_url": "https://github.com/GNS3/gns3-registry/raw/master/cloud-init/AlmaLinux/almalinux-cloud-init-data.iso"
         }
     ],
     "versions": [

gns3server/appliances/aruba-arubaoscx.gns3a

@@ -2,10 +2,12 @@
     "appliance_id": "8f074218-9d61-4e99-ab89-35ca19ad44ee",
     "name": "ArubaOS-CX Simulation Software",
     "category": "multilayer_switch",
-    "description": "The ArubaOS-CX Simulation Software is a virtual platform to enable simulation of the ArubaOS-CX Network Operating System. Simulated networks can be created using many of the protocols in the ArubaOS-CX Operating system like OSPF, BGP (inc. EVPN). Key features like the Aruba Network Analytics Engine and the REST API can be simulated, providing a lightweight development platform to building the modern network.",
+    "description": "The Aruba AOS-CX Switch Simulator is a virtual platform to enable simulation of the Aruba AOS-CX Network Operating System. Simulated networks can be created using many of the protocols in the ArubaOS-CX Operating system like OSPF, BGP (inc. EVPN). Key features like the Aruba Network Analytics Engine and the REST API can be simulated, providing a lightweight development platform to building the modern network.",
     "vendor_name": "HPE Aruba",
     "vendor_url": "https://www.arubanetworks.com",
-    "product_name": "ArubaOS-CX Simulation Software",
+    "documentation_url": "https://asp.arubanetworks.com/downloads;search=Aruba%20AOS%20CX%20Switch%20Simulator;products=Aruba%20Switches",
+    "product_name": "Aruba AOS-CX Switch Simulator",
+    "product_url": "https://www.arubanetworks.com/products/switches/",
     "registry_version": 4,
     "status": "stable",
     "availability": "service-contract",
@@ -30,6 +32,20 @@
         "process_priority": "normal"
     },
     "images": [
+        {
+            "filename": "arubaoscx-disk-image-genericx86-p4-20230531220439.vmdk",
+            "version": "10.12.0006",
+            "md5sum": "c4f80fecd02ef93b431b75dd610e0063",
+            "filesize": 384638464,
+            "download_url": "https://asp.arubanetworks.com/"
+        },
+        {
+            "filename": "arubaoscx-disk-image-genericx86-p4-20221130174651.vmdk",
+            "version": "10.11.0001",
+            "md5sum": "ed5434173c898f47f19bfda51000611a",
+            "filesize": 364597760,
+            "download_url": "https://asp.arubanetworks.com/"
+        },
         {
             "filename": "arubaoscx-disk-image-genericx86-p4-20220815162137.vmdk",
             "version": "10.10.1000",
@@ -102,6 +118,18 @@
         }
     ],
     "versions": [
+        {
+            "name": "10.12.0006",
+            "images": {
+                "hda_disk_image": "arubaoscx-disk-image-genericx86-p4-20230531220439.vmdk"
+            }
+        },
+        {
+            "name": "10.11.0001",
+            "images": {
+                "hda_disk_image": "arubaoscx-disk-image-genericx86-p4-20221130174651.vmdk"
+            }
+        },
         {
             "name": "10.10.1000",
             "images": {

gns3server/appliances/centos-cloud.gns3a

@@ -26,33 +26,37 @@
         "options": "-nographic"
     },
     "images": [
+        {
+            "filename": "CentOS-8-GenericCloud-8.4.2105-20210603.0.x86_64.qcow2",
+            "version": "8.4 (2105)",
+            "md5sum": "032eed270415526546eac07628905a62",
+            "filesize": 1309652992,
+            "download_url": "https://cloud.centos.org/centos/8/x86_64/images",
+            "direct_download_url": "https://cloud.centos.org/centos/8/x86_64/images/CentOS-8-GenericCloud-8.4.2105-20210603.0.x86_64.qcow2"
+        },
         {
             "filename": "CentOS-7-x86_64-GenericCloud-2111.qcow2",
             "version": "7 (2111)",
             "md5sum": "730b8662695831670721c8245be61dac",
             "filesize": 897384448,
-            "download_url": "https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-2111.qcow2"
+            "download_url": "https://cloud.centos.org/centos/7/images",
+            "direct_download_url": "https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-2111.qcow2"
         },
         {
             "filename": "CentOS-7-x86_64-GenericCloud-1809.qcow2",
             "version": "7 (1809)",
             "md5sum": "da79108d1324b27bd1759362b82fbe40",
             "filesize": 914948096,
-            "download_url": "https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1809.qcow2"
-        },
-        {
-            "filename": "CentOS-8-GenericCloud-8.4.2105-20210603.0.x86_64.qcow2",
-            "version": "8.4 (2105)",
-            "md5sum": "032eed270415526546eac07628905a62",
-            "filesize": 1309652992,
-            "download_url": "https://cloud.centos.org/centos/8/x86_64/images/CentOS-8-GenericCloud-8.4.2105-20210603.0.x86_64.qcow2"
+            "download_url": "https://cloud.centos.org/centos/7/images",
+            "direct_download_url": "https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1809.qcow2"
         },
         {
             "filename": "centos-cloud-init-data.iso",
-            "version": "1.0",
-            "md5sum": "15ca60c12db6d13b8eeae1a19613fd6e",
-            "filesize": 378880,
-            "download_url": "https://github.com/asenci/gns3-centos-cloud-init-data/raw/master/centos-cloud-init-data.iso"
+            "version": "1.1",
+            "md5sum": "59ea8223fd659d8bce9081ff175912e9",
+            "filesize": 374784,
+            "download_url": "https://github.com/GNS3/gns3-registry/tree/master/cloud-init/centos-cloud",
+            "direct_download_url": "https://github.com/GNS3/gns3-registry/raw/master/cloud-init/centos-cloud/centos-cloud-init-data.iso"
         }
     ],
     "versions": [

gns3server/appliances/cisco-7200.gns3a

@@ -21,6 +21,18 @@
         "npe": "npe-400"
     },
     "images": [
+        {
+            "filename": "c7200-adventerprisek9-mz.153-3.XB12.image",
+            "version": "153-3.XB12",
+            "md5sum": "3d234a3793331c972776354531f87221",
+            "filesize": 131471340
+        },
+        {
+            "filename": "c7200-advipservicesk9-mz.152-4.S5.image",
+            "version": "152-4.S5",
+            "md5sum": "cbbbea66a253f1dac0fcf81274dc778d",
+            "filesize": 87756936
+        },
         {
             "filename": "c7200-adventerprisek9-mz.124-24.T5.image",
             "version": "124-24.T5",
@@ -29,6 +41,20 @@
         }
     ],
     "versions": [
+        {
+            "name": "153-3.XB12",
+            "idlepc": "0x60630d08",
+            "images": {
+                "image": "c7200-adventerprisek9-mz.153-3.XB12.image"
+            }
+        },
+        {
+            "name": "152-4.S5",
+            "idlepc": "0x62cc930c",
+            "images": {
+                "image": "c7200-advipservicesk9-mz.152-4.S5.image"
+            }
+        },
         {
             "name": "124-24.T5",
             "idlepc": "0x606df838",

gns3server/appliances/cisco-cat9k.gns3a

@@ -0,0 +1,45 @@
+{
+    "appliance_id": "57a85f0e-b8ae-4820-bd2b-816b2cceb842",
+    "name": "Cisco CAT IOS-XE 9000v",
+    "category": "multilayer_switch",
+    "description": "Cisco IOS-XE 9000v. This appliance requires 16GB of memory to run! Recommend 2 or more vCPUs for faster boot performance",
+    "vendor_name": "Cisco",
+    "vendor_url": "http://www.cisco.com/",
+    "documentation_url": "https://developer.cisco.com/docs/modeling-labs/2-5/#!cml-release-notes",
+    "product_name": "Cisco CAT IOS-XE 9000v",
+    "product_url": "http://virl.cisco.com/",
+    "registry_version": 4,
+    "status": "experimental",
+    "maintainer": "GNS3 Team",
+    "maintainer_email": "developers@gns3.net",
+    "usage": "There is no default configuration present. Virtual Switch and Interfaces may take several minutes to be usable after appliance boot.",
+    "first_port_name": "GigabitEthernet0/0",
+    "port_name_format": "GigabitEthernet1/0/{port1}",
+    "qemu": {
+        "adapter_type": "virtio-net-pci",
+        "adapters": 9,
+        "ram": 16384,
+	"cpus": 2,
+        "hda_disk_interface": "virtio",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "kvm": "require"
+		},
+    "images": [
+        {
+            "filename": "cat9kv-prd-17.10.01prd7.qcow2",
+            "version": "17.10(1)",
+            "md5sum": "ffdbace33d31deae33e2a920a96b79ef",
+            "filesize": 2155806720,
+            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
+        }
+    ],
+    "versions": [
+        {
+            "name": "17.10(1)",
+            "images": {
+                "hda_disk_image": "cat9kv-prd-17.10.01prd7.qcow2"
+            }
+        }
+    ]
+}

gns3server/appliances/cisco-iosv.gns3a

@@ -32,6 +32,13 @@
             "download_url": "https://sourceforge.net/projects/gns-3/files",
             "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/IOSv_startup_config.img/download"
         },
+        {
+            "filename": "vios-adventerprisek9-m.spa.159-3.m6.qcow2",
+            "version": "15.9(3)M6",
+            "md5sum": "49a6977977263b2774bebc56e4e678ff",
+            "filesize": 57309696,
+            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
+        },
         {
             "filename": "vios-adventerprisek9-m.spa.159-3.m4.qcow2",
             "version": "15.9(3)M4",
@@ -90,6 +97,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "15.9(3)M6",
+            "images": {
+                "hda_disk_image": "vios-adventerprisek9-m.spa.159-3.m6.qcow2",
+                "hdb_disk_image": "IOSv_startup_config.img"
+            }
+        },
         {
             "name": "15.9(3)M4",
             "images": {

gns3server/appliances/cisco-nxosv9k.gns3a

@@ -33,6 +33,27 @@
             "filesize": 1592000512,
             "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/10.1(1)"
         },
+        {
+            "filename": "nexus9300v.10.1.1.qcow2",
+            "version": "9300v 10.1.1",
+            "md5sum": "4051bdb96aff6e54b72b7e3b06c9d6eb",
+            "filesize": 1990983680,
+            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/10.1(1)"
+        },
+        {
+            "filename": "nexus9500v.9.3.9.qcow2",
+            "version": "9500v 9.3.9",
+            "md5sum": "30c25039927f89aebe73ea20d15abd6d",
+            "filesize": 1980760064,
+            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/9.3(9)"
+        },
+        {
+            "filename": "nexus9300v.9.3.9.qcow2",
+            "version": "9300v 9.3.9",
+            "md5sum": "e807005cb7d2d2957b4af0e59f368b36",
+            "filesize": 1980563456,
+            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/9.3(9)"
+        },
         {
             "filename": "nexus9300v.9.3.8.qcow2",
             "version": "9300v 9.3.8",
@@ -184,6 +205,27 @@
                 "hda_disk_image": "nexus9500v64.10.1.1.qcow2"
             }
         },
+        {
+            "name": "9300v 10.1.1",
+            "images": {
+                "bios_image": "OVMF-20160813.fd",
+                "hda_disk_image": "nexus9300v.10.1.1.qcow2"
+            }
+        },
+        {
+            "name": "9500v 9.3.9",
+            "images": {
+                "bios_image": "OVMF-20160813.fd",
+                "hda_disk_image": "nexus9500v.9.3.9.qcow2"
+            }
+        },
+        {
+            "name": "9300v 9.3.9",
+            "images": {
+                "bios_image": "OVMF-20160813.fd",
+                "hda_disk_image": "nexus9300v.9.3.9.qcow2"
+            }
+        },
         {
             "name": "9300v 9.3.8",
             "images": {

gns3server/appliances/cumulus-vx.gns3a

@@ -18,13 +18,21 @@
     "qemu": {
         "adapter_type": "virtio-net-pci",
         "adapters": 7,
-        "ram": 768,
-        "hda_disk_interface": "ide",
+        "ram": 1024,
+        "hda_disk_interface": "virtio",
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "cumulus-linux-5.4.0-vx-amd64-qemu.qcow2",
+            "version": "5.4.0",
+            "md5sum": "b36d781a168e381e0db5b1d85a2f970d",
+            "filesize": 6254493696,
+            "download_url": "https://www.nvidia.com/en-us/networking/ethernet-switching/cumulus-vx/download/",
+            "direct_download_url": "https://d2cd9e7ca6hntp.cloudfront.net/public/CumulusLinux-5.4.0/cumulus-linux-5.4.0-vx-amd64-qemu.qcow2"
+        },
         {
             "filename": "cumulus-linux-5.3.1-vx-amd64-qemu.qcow2",
             "version": "5.3.1",
@@ -247,6 +255,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "5.4.0",
+            "images": {
+                "hda_disk_image": "cumulus-linux-5.4.0-vx-amd64-qemu.qcow2"
+            }
+        },
         {
             "name": "5.3.1",
             "images": {

gns3server/appliances/debian.gns3a

@@ -44,7 +44,8 @@
             "version": "1.0",
             "md5sum": "43f6bf70c178a9d3c270b5c24971e578",
             "filesize": 374784,
-            "download_url": "https://github.com/GNS3/gns3-registry/raw/master/cloud-init/Debian/debian-cloud-init-data.iso"
+            "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"
         }
     ],
     "versions": [

gns3server/appliances/dns.gns3a

@@ -10,7 +10,7 @@
     "status": "stable",
     "maintainer": "Andras Dosztal",
     "maintainer_email": "developers@gns3.net",
-    "usage": "You can add records by adding entries to the /etc/hosts file in the following format:\n%IP_ADDRESS% %HOSTNAME%.lab %HOSTNAME%\n\nExample:\n192.168.123.10 router1.lab router1\n\nIf you require DNS requests to be serviced from a different subnet than the one that the DNS server resides on then do the following:\n\n1. Edit (nano or vim) /ect/init.d/dnsmasq\n2. Find the line DNSMASQ_OPTS=\"$DNSMASQ_OPTS --local-service\"\n3. Remove the --local-service or comment that line out and add DNSMASQ_OPTS=\"\"\n4. Restart dnsmasq - service dnsmaq restart",
+    "usage": "You can add records by adding entries to the /etc/hosts file in the following format:\n%IP_ADDRESS% %HOSTNAME%.lab %HOSTNAME%\n\nExample:\n192.168.123.10 router1.lab router1\n\nIf you require DNS requests to be serviced from a different subnet than the one that the DNS server resides on then do the following:\n\n1. Edit (nano or vim) /ect/init.d/dnsmasq\n2. Find the line DNSMASQ_OPTS=\"$DNSMASQ_OPTS --local-service\"\n3. Remove the --local-service or comment that line out and add DNSMASQ_OPTS=\"\"\n4. Restart dnsmasq using the following command: service dnsmasq restart \n\n There is an error in this Docker container, edit /etc/dnsmasq.conf, add: interface=eth0",
     "symbol": "linux_guest.svg",
     "docker": {
         "adapters": 1,

gns3server/appliances/fedora-cloud.gns3a

@@ -31,14 +31,16 @@
             "version": "35-1.2",
             "md5sum": "cfa9cdcfb946e5f4cf9dd4d7906008d0",
             "filesize": 376897536,
-            "download_url": "https://download.fedoraproject.org/pub/fedora/linux/releases/35/Cloud/x86_64/images/Fedora-Cloud-Base-35-1.2.x86_64.qcow2"
+            "download_url": "https://download.fedoraproject.org/pub/fedora/linux/releases/35/Cloud/x86_64/images",
+            "direct_download_url": "https://download.fedoraproject.org/pub/fedora/linux/releases/35/Cloud/x86_64/images/Fedora-Cloud-Base-35-1.2.x86_64.qcow2"
         },
         {
             "filename": "fedora-cloud-init-data.iso",
             "version": "1.0",
             "md5sum": "3d0d6391d3f5ece1180c70b9667c4dca",
             "filesize": 374784,
-            "download_url": "https://github.com/GNS3/gns3-registry/raw/master/cloud-init/fedora-cloud/fedora-cloud-init-data.iso"
+            "download_url": "https://github.com/GNS3/gns3-registry/tree/master/cloud-init/fedora-cloud",
+            "direct_download_url": "https://github.com/GNS3/gns3-registry/raw/master/cloud-init/fedora-cloud/fedora-cloud-init-data.iso"
         }
     ],
     "versions": [

gns3server/appliances/fortiadc.gns3a

@@ -34,6 +34,20 @@
             "filesize": 30998528,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
+        {
+            "filename": "FAD_KVM-V7.2.0-build0210-FORTINET.out.kvm-boot.qcow2",
+            "version": "7.2.0",
+            "md5sum": "e01f14443b0434adc803c482bb92e3a2",
+            "filesize": 145817600,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FAD_KVM-V7.1.1-build0117-FORTINET.out.kvm-boot.qcow2",
+            "version": "7.1.1",
+            "md5sum": "3ab1a886e4961ded804588de6f3b2e27",
+            "filesize": 134807552,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FAD_KVM-v700-build0111-FORTINET.out.kvm-boot.qcow2",
             "version": "7.1.0",
@@ -41,6 +55,13 @@
             "filesize": 134676480,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
+        {
+            "filename": "FAD_KVM-V7.0.5-build0053-FORTINET.out.kvm-boot.qcow2",
+            "version": "7.0.5",
+            "md5sum": "3285114b8f317a367b7bcf79631a42f9",
+            "filesize": 127860736,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FAD_KVM-v700-build0048-FORTINET.out.kvm-boot.qcow2",
             "version": "7.0.4",
@@ -225,6 +246,20 @@
         }
     ],
     "versions": [
+        {
+            "name": "7.2.0",
+            "images": {
+                "hda_disk_image": "FAD_KVM-V7.2.0-build0210-FORTINET.out.kvm-boot.qcow2",
+                "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
+            }
+        },
+        {
+            "name": "7.1.1",
+            "images": {
+                "hda_disk_image": "FAD_KVM-V7.1.1-build0117-FORTINET.out.kvm-boot.qcow2",
+                "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
+            }
+        },
         {
             "name": "7.1.0",
             "images": {
@@ -232,6 +267,13 @@
                 "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
             }
         },
+        {
+            "name": "7.0.5",
+            "images": {
+                "hda_disk_image": "FAD_KVM-V7.0.5-build0053-FORTINET.out.kvm-boot.qcow2",
+                "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
+            }
+        },
         {
             "name": "7.0.4",
             "images": {

gns3server/appliances/fortianalyzer.gns3a

@@ -12,7 +12,7 @@
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
-    "usage": "Default username is admin, no password is set.",
+    "usage": "Default username is admin, no password is set.\n\n- Versions 7.0 and higher require:\n--RAM: 8192 MB\n--CPU:4",
     "symbol": "fortinet.svg",
     "port_name_format": "Port{port1}",
     "qemu": {
@@ -27,6 +27,13 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "FAZ_VM64_KVM-v7.2.2-build1334-FORTINET.out.kvm.qcow2",
+            "version": "7.2.2",
+            "md5sum": "fe445cc79eed00b3abcdba9c36e7445d",
+            "filesize": 345501696,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FAZ_VM64_KVM-v7.2.1-build1215-FORTINET.out.kvm.qcow2",
             "version": "7.2.1",
@@ -34,6 +41,13 @@
             "filesize": 340631552,
             "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",
+            "md5sum": "2e382abcf661c41c1a69178e9cdc5a3f",
+            "filesize": 335556608,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FAZ_VM64_KVM-v7.0.5-build0365-FORTINET.out.kvm.qcow2",
             "version": "7.0.5",
@@ -191,6 +205,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "7.2.2",
+            "images": {
+                "hda_disk_image": "FAZ_VM64_KVM-v7.2.2-build1334-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "7.2.1",
             "images": {
@@ -198,6 +219,13 @@
                 "hdb_disk_image": "empty30G.qcow2"
             }
         },
+        {
+            "name": "7.0.6",
+            "images": {
+                "hda_disk_image": "FAZ_VM64_KVM-v7.0.6-build0372-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "7.0.5",
             "images": {

gns3server/appliances/fortigate.gns3a

@@ -12,7 +12,7 @@
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
-    "usage": "Default username is admin, no password is set.",
+    "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": {
@@ -27,6 +27,13 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "FGT_VM64_KVM-v7.2.4.F-build1396-FORTINET.out.kvm.qcow2",
+            "version": "7.2.4",
+            "md5sum": "e3bd5958ff3d4f9363152c340e9b9578",
+            "filesize": 95158272,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FGT_VM64_KVM-v7.2.3.F-build1262-FORTINET.out.kvm.qcow2",
             "version": "7.2.3",
@@ -41,6 +48,13 @@
             "filesize": 86704128,
             "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",
+            "md5sum": "c7eb9fad8484405aa5bd8a4dd9e67722",
+            "filesize": 77135872,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FGT_VM64_KVM-v7.0.9.M-build0444-FORTINET.out.kvm.qcow2",
             "version": "7.0.9",
@@ -48,6 +62,13 @@
             "filesize": 77135872,
             "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",
+            "md5sum": "df2569f9fa3e40b65fa0db741cf6e01e",
+            "filesize": 69861376,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FGT_VM64_KVM-v6.M-build2030-FORTINET.out.kvm.qcow2",
             "version": "6.4.11",
@@ -282,6 +303,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "7.2.4",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v7.2.4.F-build1396-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "7.2.3",
             "images": {
@@ -296,6 +324,13 @@
                 "hdb_disk_image": "empty30G.qcow2"
             }
         },
+        {
+            "name": "7.0.10",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v7.0.10.M-build0450-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "7.0.9",
             "images": {
@@ -303,6 +338,13 @@
                 "hdb_disk_image": "empty30G.qcow2"
             }
         },
+        {
+            "name": "6.4.12",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v6.4.12.M-build2060-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "6.4.11",
             "images": {

gns3server/appliances/fortimail.gns3a

@@ -27,6 +27,13 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "FML_VMKV-64-v722.M-build0380-FORTINET.out.kvm.qcow2",
+            "version": "7.2.2",
+            "md5sum": "ec7c32c90f4cfba32a744ea74adc596b",
+            "filesize": 124387328,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FML_VMKV-64-v721.M-build0364-FORTINET.out.kvm.qcow2",
             "version": "7.2.1",
@@ -34,6 +41,20 @@
             "filesize": 123535360,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         },
+        {
+            "filename": "FML_VMKV-64-v705-build0208-FORTINET.out.kvm.qcow2",
+            "version": "7.0.5",
+            "md5sum": "62e561465ff8134efdea6f66ba9ccf20",
+            "filesize": 118226944,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FML_VMKV-64-v647-build0467-FORTINET.out.kvm.qcow2",
+            "version": "6.4.7",
+            "md5sum": "11fab90b39d88446a711bbd01802aca1",
+            "filesize": 112066560,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FML_VMKV-64-v60-build0257-FORTINET.out.kvm.qcow2",
             "version": "6.2.1",
@@ -191,6 +212,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "7.2.2",
+            "images": {
+                "hda_disk_image": "FML_VMKV-64-v722.M-build0380-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "7.2.1",
             "images": {
@@ -198,6 +226,20 @@
                 "hdb_disk_image": "empty30G.qcow2"
             }
         },
+        {
+            "name": "7.0.5",
+            "images": {
+                "hda_disk_image": "FML_VMKV-64-v705-build0208-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "6.4.7",
+            "images": {
+                "hda_disk_image": "FML_VMKV-64-v647-build0467-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "6.2.1",
             "images": {

gns3server/appliances/fortimanager.gns3a

@@ -12,7 +12,7 @@
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
-    "usage": "Default username is admin, no password is set.",
+    "usage": "Default username is admin, no password is set.\n\n- Versions 7.0 and higher require:\n--RAM: 8192 MB\n--CPU:4",
     "symbol": "fortinet.svg",
     "port_name_format": "Port{port1}",
     "qemu": {
@@ -27,6 +27,13 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "FMG_VM64_KVM-v7.2.2-build1334-FORTINET.out.kvm.qcow2",
+            "version": "7.2.2",
+            "md5sum": "2ff1298257321cd485d2cad91d6ce510",
+            "filesize": 246083584,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FMG_VM64_KVM-v7.2.1-build1215-FORTINET.out.kvm.qcow2",
             "version": "7.2.1",
@@ -34,6 +41,13 @@
             "filesize": 242814976,
             "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",
+            "md5sum": "dfa4df9e976ed87e73cb9601a8a70323",
+            "filesize": 239190016,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FMG_VM64_KVM-v7.0.5-build0365-FORTINET.out.kvm.qcow2",
             "version": "7.0.5",
@@ -191,6 +205,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "7.2.2",
+            "images": {
+                "hda_disk_image": "FMG_VM64_KVM-v7.2.2-build1334-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "7.2.1",
             "images": {
@@ -198,6 +219,13 @@
                 "hdb_disk_image": "empty30G.qcow2"
             }
         },
+        {
+            "name": "7.0.6",
+            "images": {
+                "hda_disk_image": "FMG_VM64_KVM-v7.0.6-build0372-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "7.0.5",
             "images": {

gns3server/appliances/fortiweb.gns3a

@@ -27,6 +27,27 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "FWB_KVM-v7.2.1-build0330-FORTINET.out.kvm.boot.qcow2",
+            "version": "7.2.1",
+            "md5sum": "5806524ca31401c313e0e86e992b6659",
+            "filesize": 260506112,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FWB_KVM-v7.0.6-build0140-FORTINET.out.kvm.boot.qcow2",
+            "version": "7.0.6",
+            "md5sum": "1327019e891678a0f2fb9602086d998d",
+            "filesize": 258408960,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FWB_KVM-v700-build0129-FORTINET.out.kvm.qcow2",
+            "version": "7.0.5",
+            "md5sum": "dc14114c68cf42df322e5b89bffd9bf7",
+            "filesize": 258146816,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FWB_KVM-v700-build0097-FORTINET.out.kvm.qcow2",
             "version": "7.0.1",
@@ -128,6 +149,27 @@
         }
     ],
     "versions": [
+        {
+            "name": "7.2.1",
+            "images": {
+                "hda_disk_image": "FWB_KVM-v7.2.1-build0330-FORTINET.out.kvm.boot.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "7.0.6",
+            "images": {
+                "hda_disk_image": "FWB_KVM-v7.0.6-build0140-FORTINET.out.kvm.boot.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "7.0.5",
+            "images": {
+                "hda_disk_image": "FWB_KVM-v700-build0129-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "7.0.1",
             "images": {

gns3server/appliances/internet.gns3a

@@ -1,44 +0,0 @@
-{
-    "appliance_id": "f8302832-ad07-47e2-a750-004f700bd47c",
-    "name": "Internet",
-    "category": "router",
-    "description": "This appliance simulate a domestic modem. It provide an IP via DHCP and will nat all connection to the internet without the need of using a cloud interface in your topologies. IP will be in the subnet 172.16.0.0/16. Multiple internet will have different IP range from 172.16.1.0/24 to 172.16.253.0/24 .\n\nWARNING USE IT ONLY WITH THE GNS3 VM.",
-    "vendor_name": "GNS3",
-    "vendor_url": "http://www.gns3.com",
-    "documentation_url": "http://www.gns3.com",
-    "product_name": "Internet",
-    "registry_version": 4,
-    "status": "stable",
-    "maintainer": "GNS3 Team",
-    "maintainer_email": "developers@gns3.net",
-    "usage": "Just connect stuff to the appliance. Everything is automated.",
-    "symbol": ":/symbols/cloud.svg",
-    "qemu": {
-        "adapter_type": "e1000",
-        "adapters": 1,
-        "ram": 64,
-        "hda_disk_interface": "ide",
-        "arch": "i386",
-        "console_type": "telnet",
-        "kvm": "allow",
-        "options": "-device e1000,netdev=internet0 -netdev vde,sock=/var/run/vde2/qemu0.ctl,id=internet0"
-    },
-    "images": [
-        {
-            "filename": "core-linux-6.4-internet-0.1.img",
-            "version": "0.1",
-            "md5sum": "8ebc5a6ec53a1c05b7aa101b5ceefe31",
-            "filesize": 16711680,
-            "download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/",
-            "direct_download_url": "http://downloads.sourceforge.net/project/gns-3/Qemu%20Appliances/core-linux-6.4-internet-0.1.img"
-        }
-    ],
-    "versions": [
-        {
-            "name": "0.1",
-            "images": {
-                "hda_disk_image": "core-linux-6.4-internet-0.1.img"
-            }
-        }
-    ]
-}

gns3server/appliances/juniper-vsrx.gns3a

@@ -26,6 +26,13 @@
         "options": "-smp 2"
     },
     "images": [
+        {
+            "filename": "junos-vsrx3-x86-64-21.2R3-S4.8.qcow2",
+            "version": "21.2R3-S4",
+            "md5sum": "18fdcbfe0acbc935b4f677b4be7e228d",
+            "filesize": 762773504,
+            "download_url": "https://www.juniper.net/us/en/dm/free-vsrx-trial/"
+        },
         {
             "filename": "junos-media-vsrx-x86-64-vmdisk-20.4R1.12.qcow2",
             "version": "20.4R1",
@@ -182,6 +189,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "21.2R3-S4",
+            "images": {
+                "hda_disk_image": "junos-vsrx3-x86-64-21.2R3-S4.8.qcow2"
+            }
+        },
         {
             "name": "20.4R1",
             "images": {

gns3server/appliances/mikrotik-ccr1036-8g-2s+.gns3a

@@ -0,0 +1,165 @@
+{
+    "appliance_id": "cec3cf6f-36c1-4a15-9fe0-4e88b5f3bffa",
+    "name": "MikroTik CCR1036-8G-2S+",
+    "category": "router",
+    "description": "This is a variation of Cloud Hosted Router (CHR) which is meant to mimic the basic hardware configuration of the CCR1036-8G-2S+ model.",
+    "vendor_name": "MikroTik",
+    "vendor_url": "http://mikrotik.com/",
+    "documentation_url": "http://wiki.mikrotik.com/wiki/Manual:CHR",
+    "product_name": "MikroTik CCR1036-8G-2S+",
+    "product_url": "http://www.mikrotik.com/download",
+    "registry_version": 6,
+    "status": "stable",
+    "maintainer": "Azorian Solutions",
+    "maintainer_email": "help@azorian.solutions",
+    "usage": "If you'd like a different sized main disk, resize the image before booting the VM for the first time.\n\nOn first boot, RouterOS is actually being installed, formatting the whole main virtual disk, before finally rebooting. That whole process may take a minute or so.\n\nThe console will become available after the installation is complete. Most Telnet/SSH clients (certainly SuperPutty) will keep retrying to connect, thus letting you know when installation is done.\n\nFrom that point on, everything about RouterOS is also true about Cloud Hosted Router, including the default credentials: Username \"admin\" and an empty password.\n\nThe primary differences between RouterOS and CHR are in support for virtual devices (this appliance comes with them being selected), and in the different license model, for which you can read more about at http://wiki.mikrotik.com/wiki/Manual:CHR.",
+    "symbol": ":/symbols/classic/router.svg",
+    "port_name_format": "ether{port1}",
+    "qemu": {
+        "adapter_type": "virtio-net-pci",
+        "adapters": 10,
+        "ram": 8192,
+        "cpus": 36,
+        "hda_disk_interface": "virtio",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "boot_priority": "c",
+        "kvm": "allow",
+        "options": "-nographic",
+        "on_close": "shutdown_signal",
+        "custom_adapters": [
+            {
+                "adapter_number": 8,
+                "port_name": "sfp-sfpplus1"
+            },
+            {
+                "adapter_number": 9,
+                "port_name": "sfp-sfpplus2"
+            }
+        ]
+    },
+    "images": [
+        {
+            "filename": "chr-7.8.img",
+            "version": "7.8",
+            "md5sum": "08fc9baf18d920bc65c974cafa3719be",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.8/chr-7.8.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.7.img",
+            "version": "7.7",
+            "md5sum": "efc4fdeb1cc06dc240a14f1215fd59b3",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.7/chr-7.7.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.6.img",
+            "version": "7.6",
+            "md5sum": "864482f9efaea9d40910c050318f65b9",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.6/chr-7.6.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.3.1.img",
+            "version": "7.3.1",
+            "md5sum": "99f8ea75f8b745a8bf5ca3cc1bd325e3",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.3.1/chr-7.3.1.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.1.5.img",
+            "version": "7.1.5",
+            "md5sum": "9c0be05f891df2b1400bdae5e719898e",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.1.5/chr-7.1.5.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-6.49.7.img",
+            "version": "6.49.7",
+            "md5sum": "0686d07f69d15d41467ada4a58a92cd2",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.49.7/chr-6.49.7.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-6.49.6.img",
+            "version": "6.49.6",
+            "md5sum": "ae27d38acc9c4dcd875e0f97bcae8d97",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.49.6/chr-6.49.6.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-6.48.6.img",
+            "version": "6.48.6",
+            "md5sum": "875574a561570227ff8f395aabe478c6",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.48.6/chr-6.48.6.img.zip",
+            "compression": "zip"
+        }
+    ],
+    "versions": [
+        {
+            "name": "7.8",
+            "images": {
+                "hda_disk_image": "chr-7.8.img"
+            }
+        },
+        {
+            "name": "7.7",
+            "images": {
+                "hda_disk_image": "chr-7.7.img"
+            }
+        },
+        {
+            "name": "7.6",
+            "images": {
+                "hda_disk_image": "chr-7.6.img"
+            }
+        },
+        {
+            "name": "7.3.1",
+            "images": {
+                "hda_disk_image": "chr-7.3.1.img"
+            }
+        },
+        {
+            "name": "7.1.5",
+            "images": {
+                "hda_disk_image": "chr-7.1.5.img"
+            }
+        },
+        {
+            "name": "6.49.7",
+            "images": {
+                "hda_disk_image": "chr-6.49.7.img"
+            }
+        },
+        {
+            "name": "6.49.6",
+            "images": {
+                "hda_disk_image": "chr-6.49.6.img"
+            }
+        },
+        {
+            "name": "6.48.6",
+            "images": {
+                "hda_disk_image": "chr-6.48.6.img"
+            }
+        }
+    ]
+}

gns3server/appliances/mikrotik-ccr1072-1g-8s+.gns3a

@@ -0,0 +1,161 @@
+{
+    "appliance_id": "b7023032-61e9-4ca6-a36d-f917cfc498b4",
+    "name": "MikroTik CCR1072-1G-8S+",
+    "category": "router",
+    "description": "This is a variation of Cloud Hosted Router (CHR) which is meant to mimic the basic hardware configuration of the CCR1072-1G-8S+ model.",
+    "vendor_name": "MikroTik",
+    "vendor_url": "http://mikrotik.com/",
+    "documentation_url": "http://wiki.mikrotik.com/wiki/Manual:CHR",
+    "product_name": "MikroTik CCR1072-1G-8S+",
+    "product_url": "http://www.mikrotik.com/download",
+    "registry_version": 6,
+    "status": "stable",
+    "maintainer": "Azorian Solutions",
+    "maintainer_email": "help@azorian.solutions",
+    "usage": "If you'd like a different sized main disk, resize the image before booting the VM for the first time.\n\nOn first boot, RouterOS is actually being installed, formatting the whole main virtual disk, before finally rebooting. That whole process may take a minute or so.\n\nThe console will become available after the installation is complete. Most Telnet/SSH clients (certainly SuperPutty) will keep retrying to connect, thus letting you know when installation is done.\n\nFrom that point on, everything about RouterOS is also true about Cloud Hosted Router, including the default credentials: Username \"admin\" and an empty password.\n\nThe primary differences between RouterOS and CHR are in support for virtual devices (this appliance comes with them being selected), and in the different license model, for which you can read more about at http://wiki.mikrotik.com/wiki/Manual:CHR.",
+    "symbol": ":/symbols/classic/router.svg",
+    "port_name_format": "sfp-sfpplus{port1}",
+    "qemu": {
+        "adapter_type": "virtio-net-pci",
+        "adapters": 9,
+        "ram": 16384,
+        "cpus": 72,
+        "hda_disk_interface": "virtio",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "boot_priority": "c",
+        "kvm": "allow",
+        "options": "-nographic",
+        "on_close": "shutdown_signal",
+        "custom_adapters": [
+            {
+                "adapter_number": 8,
+                "port_name": "ether1"
+            }
+        ]
+    },
+    "images": [
+        {
+            "filename": "chr-7.8.img",
+            "version": "7.8",
+            "md5sum": "08fc9baf18d920bc65c974cafa3719be",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.8/chr-7.8.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.7.img",
+            "version": "7.7",
+            "md5sum": "efc4fdeb1cc06dc240a14f1215fd59b3",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.7/chr-7.7.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.6.img",
+            "version": "7.6",
+            "md5sum": "864482f9efaea9d40910c050318f65b9",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.6/chr-7.6.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.3.1.img",
+            "version": "7.3.1",
+            "md5sum": "99f8ea75f8b745a8bf5ca3cc1bd325e3",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.3.1/chr-7.3.1.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.1.5.img",
+            "version": "7.1.5",
+            "md5sum": "9c0be05f891df2b1400bdae5e719898e",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.1.5/chr-7.1.5.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-6.49.7.img",
+            "version": "6.49.7",
+            "md5sum": "0686d07f69d15d41467ada4a58a92cd2",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.49.7/chr-6.49.7.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-6.49.6.img",
+            "version": "6.49.6",
+            "md5sum": "ae27d38acc9c4dcd875e0f97bcae8d97",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.49.6/chr-6.49.6.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-6.48.6.img",
+            "version": "6.48.6",
+            "md5sum": "875574a561570227ff8f395aabe478c6",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.48.6/chr-6.48.6.img.zip",
+            "compression": "zip"
+        }
+    ],
+    "versions": [
+        {
+            "name": "7.8",
+            "images": {
+                "hda_disk_image": "chr-7.8.img"
+            }
+        },
+        {
+            "name": "7.7",
+            "images": {
+                "hda_disk_image": "chr-7.7.img"
+            }
+        },
+        {
+            "name": "7.6",
+            "images": {
+                "hda_disk_image": "chr-7.6.img"
+            }
+        },
+        {
+            "name": "7.3.1",
+            "images": {
+                "hda_disk_image": "chr-7.3.1.img"
+            }
+        },
+        {
+            "name": "7.1.5",
+            "images": {
+                "hda_disk_image": "chr-7.1.5.img"
+            }
+        },
+        {
+            "name": "6.49.7",
+            "images": {
+                "hda_disk_image": "chr-6.49.7.img"
+            }
+        },
+        {
+            "name": "6.49.6",
+            "images": {
+                "hda_disk_image": "chr-6.49.6.img"
+            }
+        },
+        {
+            "name": "6.48.6",
+            "images": {
+                "hda_disk_image": "chr-6.48.6.img"
+            }
+        }
+    ]
+}

gns3server/appliances/mikrotik-crs328-24p-4s+.gns3a

@@ -0,0 +1,173 @@
+{
+    "appliance_id": "5b583e53-197c-4ec1-a153-df9405320eec",
+    "name": "MikroTik CRS328-24P-4S+",
+    "category": "multilayer_switch",
+    "description": "This is a variation of Cloud Hosted Router (CHR) which is meant to mimic the basic hardware configuration of the CRS328-24P-4S+ model.",
+    "vendor_name": "MikroTik",
+    "vendor_url": "http://mikrotik.com/",
+    "documentation_url": "http://wiki.mikrotik.com/wiki/Manual:CHR",
+    "product_name": "MikroTik CRS328-24P-4S+",
+    "product_url": "http://www.mikrotik.com/download",
+    "registry_version": 6,
+    "status": "stable",
+    "maintainer": "Azorian Solutions",
+    "maintainer_email": "help@azorian.solutions",
+    "usage": "If you'd like a different sized main disk, resize the image before booting the VM for the first time.\n\nOn first boot, RouterOS is actually being installed, formatting the whole main virtual disk, before finally rebooting. That whole process may take a minute or so.\n\nThe console will become available after the installation is complete. Most Telnet/SSH clients (certainly SuperPutty) will keep retrying to connect, thus letting you know when installation is done.\n\nFrom that point on, everything about RouterOS is also true about Cloud Hosted Router, including the default credentials: Username \"admin\" and an empty password.\n\nThe primary differences between RouterOS and CHR are in support for virtual devices (this appliance comes with them being selected), and in the different license model, for which you can read more about at http://wiki.mikrotik.com/wiki/Manual:CHR.",
+    "symbol": ":/symbols/classic/multilayer_switch.svg",
+    "port_name_format": "ether{port1}",
+    "qemu": {
+        "adapter_type": "virtio-net-pci",
+        "adapters": 28,
+        "ram": 512,
+        "cpus": 1,
+        "hda_disk_interface": "virtio",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "boot_priority": "c",
+        "kvm": "allow",
+        "options": "-nographic",
+        "on_close": "shutdown_signal",
+        "custom_adapters": [
+            {
+                "adapter_number": 24,
+                "port_name": "sfp-sfpplus1"
+            },
+            {
+                "adapter_number": 25,
+                "port_name": "sfp-sfpplus2"
+            },
+            {
+                "adapter_number": 26,
+                "port_name": "sfp-sfpplus3"
+            },
+            {
+                "adapter_number": 27,
+                "port_name": "sfp-sfpplus4"
+            }
+        ]
+    },
+    "images": [
+        {
+            "filename": "chr-7.8.img",
+            "version": "7.8",
+            "md5sum": "08fc9baf18d920bc65c974cafa3719be",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.8/chr-7.8.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.7.img",
+            "version": "7.7",
+            "md5sum": "efc4fdeb1cc06dc240a14f1215fd59b3",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.7/chr-7.7.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.6.img",
+            "version": "7.6",
+            "md5sum": "864482f9efaea9d40910c050318f65b9",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.6/chr-7.6.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.3.1.img",
+            "version": "7.3.1",
+            "md5sum": "99f8ea75f8b745a8bf5ca3cc1bd325e3",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.3.1/chr-7.3.1.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.1.5.img",
+            "version": "7.1.5",
+            "md5sum": "9c0be05f891df2b1400bdae5e719898e",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.1.5/chr-7.1.5.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-6.49.7.img",
+            "version": "6.49.7",
+            "md5sum": "0686d07f69d15d41467ada4a58a92cd2",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.49.7/chr-6.49.7.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-6.49.6.img",
+            "version": "6.49.6",
+            "md5sum": "ae27d38acc9c4dcd875e0f97bcae8d97",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.49.6/chr-6.49.6.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-6.48.6.img",
+            "version": "6.48.6",
+            "md5sum": "875574a561570227ff8f395aabe478c6",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.48.6/chr-6.48.6.img.zip",
+            "compression": "zip"
+        }
+    ],
+    "versions": [
+        {
+            "name": "7.8",
+            "images": {
+                "hda_disk_image": "chr-7.8.img"
+            }
+        },
+        {
+            "name": "7.7",
+            "images": {
+                "hda_disk_image": "chr-7.7.img"
+            }
+        },
+        {
+            "name": "7.6",
+            "images": {
+                "hda_disk_image": "chr-7.6.img"
+            }
+        },
+        {
+            "name": "7.3.1",
+            "images": {
+                "hda_disk_image": "chr-7.3.1.img"
+            }
+        },
+        {
+            "name": "7.1.5",
+            "images": {
+                "hda_disk_image": "chr-7.1.5.img"
+            }
+        },
+        {
+            "name": "6.49.7",
+            "images": {
+                "hda_disk_image": "chr-6.49.7.img"
+            }
+        },
+        {
+            "name": "6.49.6",
+            "images": {
+                "hda_disk_image": "chr-6.49.6.img"
+            }
+        },
+        {
+            "name": "6.48.6",
+            "images": {
+                "hda_disk_image": "chr-6.48.6.img"
+            }
+        }
+    ]
+}

gns3server/appliances/mikrotik-crs328-4c-20s-4s+.gns3a

@@ -0,0 +1,189 @@
+{
+    "appliance_id": "8d94af97-7e2f-4d8f-8ad7-49f48107c8ce",
+    "name": "MikroTik CRS328-4C-20S-4S+",
+    "category": "multilayer_switch",
+    "description": "This is a variation of Cloud Hosted Router (CHR) which is meant to mimic the basic hardware configuration of the CRS328-4C-20S-4S+ model.",
+    "vendor_name": "MikroTik",
+    "vendor_url": "http://mikrotik.com/",
+    "documentation_url": "http://wiki.mikrotik.com/wiki/Manual:CHR",
+    "product_name": "MikroTik CRS328-4C-20S-4S+",
+    "product_url": "http://www.mikrotik.com/download",
+    "registry_version": 6,
+    "status": "stable",
+    "maintainer": "Azorian Solutions",
+    "maintainer_email": "help@azorian.solutions",
+    "usage": "If you'd like a different sized main disk, resize the image before booting the VM for the first time.\n\nOn first boot, RouterOS is actually being installed, formatting the whole main virtual disk, before finally rebooting. That whole process may take a minute or so.\n\nThe console will become available after the installation is complete. Most Telnet/SSH clients (certainly SuperPutty) will keep retrying to connect, thus letting you know when installation is done.\n\nFrom that point on, everything about RouterOS is also true about Cloud Hosted Router, including the default credentials: Username \"admin\" and an empty password.\n\nThe primary differences between RouterOS and CHR are in support for virtual devices (this appliance comes with them being selected), and in the different license model, for which you can read more about at http://wiki.mikrotik.com/wiki/Manual:CHR.",
+    "symbol": ":/symbols/classic/multilayer_switch.svg",
+    "port_name_format": "sfp{port1}",
+    "qemu": {
+        "adapter_type": "virtio-net-pci",
+        "adapters": 28,
+        "ram": 512,
+        "cpus": 1,
+        "hda_disk_interface": "virtio",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "boot_priority": "c",
+        "kvm": "allow",
+        "options": "-nographic",
+        "on_close": "shutdown_signal",
+        "custom_adapters": [
+            {
+                "adapter_number": 20,
+                "port_name": "combo1"
+            },
+            {
+                "adapter_number": 21,
+                "port_name": "combo2"
+            },
+            {
+                "adapter_number": 22,
+                "port_name": "combo3"
+            },
+            {
+                "adapter_number": 23,
+                "port_name": "combo4"
+            },
+            {
+                "adapter_number": 24,
+                "port_name": "sfp-sfpplus1"
+            },
+            {
+                "adapter_number": 25,
+                "port_name": "sfp-sfpplus2"
+            },
+            {
+                "adapter_number": 26,
+                "port_name": "sfp-sfpplus3"
+            },
+            {
+                "adapter_number": 27,
+                "port_name": "sfp-sfpplus4"
+            }
+        ]
+    },
+    "images": [
+        {
+            "filename": "chr-7.8.img",
+            "version": "7.8",
+            "md5sum": "08fc9baf18d920bc65c974cafa3719be",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.8/chr-7.8.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.7.img",
+            "version": "7.7",
+            "md5sum": "efc4fdeb1cc06dc240a14f1215fd59b3",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.7/chr-7.7.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.6.img",
+            "version": "7.6",
+            "md5sum": "864482f9efaea9d40910c050318f65b9",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.6/chr-7.6.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.3.1.img",
+            "version": "7.3.1",
+            "md5sum": "99f8ea75f8b745a8bf5ca3cc1bd325e3",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.3.1/chr-7.3.1.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.1.5.img",
+            "version": "7.1.5",
+            "md5sum": "9c0be05f891df2b1400bdae5e719898e",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.1.5/chr-7.1.5.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-6.49.7.img",
+            "version": "6.49.7",
+            "md5sum": "0686d07f69d15d41467ada4a58a92cd2",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.49.7/chr-6.49.7.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-6.49.6.img",
+            "version": "6.49.6",
+            "md5sum": "ae27d38acc9c4dcd875e0f97bcae8d97",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.49.6/chr-6.49.6.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-6.48.6.img",
+            "version": "6.48.6",
+            "md5sum": "875574a561570227ff8f395aabe478c6",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.48.6/chr-6.48.6.img.zip",
+            "compression": "zip"
+        }
+    ],
+    "versions": [
+        {
+            "name": "7.8",
+            "images": {
+                "hda_disk_image": "chr-7.8.img"
+            }
+        },
+        {
+            "name": "7.7",
+            "images": {
+                "hda_disk_image": "chr-7.7.img"
+            }
+        },
+        {
+            "name": "7.6",
+            "images": {
+                "hda_disk_image": "chr-7.6.img"
+            }
+        },
+        {
+            "name": "7.3.1",
+            "images": {
+                "hda_disk_image": "chr-7.3.1.img"
+            }
+        },
+        {
+            "name": "7.1.5",
+            "images": {
+                "hda_disk_image": "chr-7.1.5.img"
+            }
+        },
+        {
+            "name": "6.49.7",
+            "images": {
+                "hda_disk_image": "chr-6.49.7.img"
+            }
+        },
+        {
+            "name": "6.49.6",
+            "images": {
+                "hda_disk_image": "chr-6.49.6.img"
+            }
+        },
+        {
+            "name": "6.48.6",
+            "images": {
+                "hda_disk_image": "chr-6.48.6.img"
+            }
+        }
+    ]
+}

gns3server/appliances/mikrotik-rb1100ahx4-dude-edition.gns3a

@@ -0,0 +1,155 @@
+{
+    "appliance_id": "d88d159f-ac6e-41ba-83a4-88e91548131e",
+    "name": "MikroTik RB1100AHx4 Dude Edition",
+    "category": "router",
+    "description": "This is a variation of Cloud Hosted Router (CHR) which is meant to mimic the basic hardware configuration of the RB1100AHx4 Dude Edition model.",
+    "vendor_name": "MikroTik",
+    "vendor_url": "http://mikrotik.com/",
+    "documentation_url": "http://wiki.mikrotik.com/wiki/Manual:CHR",
+    "product_name": "MikroTik RouterBOARD 1100AHx4 Dude Edition",
+    "product_url": "http://www.mikrotik.com/download",
+    "registry_version": 5,
+    "status": "stable",
+    "maintainer": "Azorian Solutions",
+    "maintainer_email": "help@azorian.solutions",
+    "usage": "If you'd like a different sized main disk, resize the image before booting the VM for the first time.\n\nOn first boot, RouterOS is actually being installed, formatting the whole main virtual disk, before finally rebooting. That whole process may take a minute or so.\n\nThe console will become available after the installation is complete. Most Telnet/SSH clients (certainly SuperPutty) will keep retrying to connect, thus letting you know when installation is done.\n\nFrom that point on, everything about RouterOS is also true about Cloud Hosted Router, including the default credentials: Username \"admin\" and an empty password.\n\nThe primary differences between RouterOS and CHR are in support for virtual devices (this appliance comes with them being selected), and in the different license model, for which you can read more about at http://wiki.mikrotik.com/wiki/Manual:CHR.",
+    "symbol": ":/symbols/classic/router.svg",
+    "port_name_format": "ether{port1}",
+    "qemu": {
+        "adapter_type": "virtio-net-pci",
+        "adapters": 13,
+        "ram": 1024,
+        "cpus": 4,
+        "hda_disk_interface": "virtio",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "boot_priority": "c",
+        "kvm": "allow",
+        "options": "-nographic",
+        "on_close": "shutdown_signal"
+    },
+    "images": [
+        {
+            "filename": "chr-7.8.img",
+            "version": "7.8",
+            "md5sum": "08fc9baf18d920bc65c974cafa3719be",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.8/chr-7.8.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.7.img",
+            "version": "7.7",
+            "md5sum": "efc4fdeb1cc06dc240a14f1215fd59b3",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.7/chr-7.7.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.6.img",
+            "version": "7.6",
+            "md5sum": "864482f9efaea9d40910c050318f65b9",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.6/chr-7.6.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.3.1.img",
+            "version": "7.3.1",
+            "md5sum": "99f8ea75f8b745a8bf5ca3cc1bd325e3",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.3.1/chr-7.3.1.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.1.5.img",
+            "version": "7.1.5",
+            "md5sum": "9c0be05f891df2b1400bdae5e719898e",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.1.5/chr-7.1.5.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-6.49.7.img",
+            "version": "6.49.7",
+            "md5sum": "0686d07f69d15d41467ada4a58a92cd2",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.49.7/chr-6.49.7.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-6.49.6.img",
+            "version": "6.49.6",
+            "md5sum": "ae27d38acc9c4dcd875e0f97bcae8d97",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.49.6/chr-6.49.6.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-6.48.6.img",
+            "version": "6.48.6",
+            "md5sum": "875574a561570227ff8f395aabe478c6",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.48.6/chr-6.48.6.img.zip",
+            "compression": "zip"
+        }
+    ],
+    "versions": [
+        {
+            "name": "7.8",
+            "images": {
+                "hda_disk_image": "chr-7.8.img"
+            }
+        },
+        {
+            "name": "7.7",
+            "images": {
+                "hda_disk_image": "chr-7.7.img"
+            }
+        },
+        {
+            "name": "7.6",
+            "images": {
+                "hda_disk_image": "chr-7.6.img"
+            }
+        },
+        {
+            "name": "7.3.1",
+            "images": {
+                "hda_disk_image": "chr-7.3.1.img"
+            }
+        },
+        {
+            "name": "7.1.5",
+            "images": {
+                "hda_disk_image": "chr-7.1.5.img"
+            }
+        },
+        {
+            "name": "6.49.7",
+            "images": {
+                "hda_disk_image": "chr-6.49.7.img"
+            }
+        },
+        {
+            "name": "6.49.6",
+            "images": {
+                "hda_disk_image": "chr-6.49.6.img"
+            }
+        },
+        {
+            "name": "6.48.6",
+            "images": {
+                "hda_disk_image": "chr-6.48.6.img"
+            }
+        }
+    ]
+}

gns3server/appliances/mikrotik-rb2011uias.gns3a

@@ -0,0 +1,161 @@
+{
+    "appliance_id": "475336ed-cd52-4ed8-9ef1-db9a81e2e0ce",
+    "name": "MikroTik RB2011UiAS",
+    "category": "router",
+    "description": "This is a variation of Cloud Hosted Router (CHR) which is meant to mimic the basic hardware configuration of the RB2011UiAS model.",
+    "vendor_name": "MikroTik",
+    "vendor_url": "http://mikrotik.com/",
+    "documentation_url": "http://wiki.mikrotik.com/wiki/Manual:CHR",
+    "product_name": "MikroTik RouterBOARD 2011UiAS",
+    "product_url": "http://www.mikrotik.com/download",
+    "registry_version": 6,
+    "status": "stable",
+    "maintainer": "Azorian Solutions",
+    "maintainer_email": "help@azorian.solutions",
+    "usage": "If you'd like a different sized main disk, resize the image before booting the VM for the first time.\n\nOn first boot, RouterOS is actually being installed, formatting the whole main virtual disk, before finally rebooting. That whole process may take a minute or so.\n\nThe console will become available after the installation is complete. Most Telnet/SSH clients (certainly SuperPutty) will keep retrying to connect, thus letting you know when installation is done.\n\nFrom that point on, everything about RouterOS is also true about Cloud Hosted Router, including the default credentials: Username \"admin\" and an empty password.\n\nThe primary differences between RouterOS and CHR are in support for virtual devices (this appliance comes with them being selected), and in the different license model, for which you can read more about at http://wiki.mikrotik.com/wiki/Manual:CHR.",
+    "symbol": ":/symbols/classic/router.svg",
+    "port_name_format": "ether{port1}",
+    "qemu": {
+        "adapter_type": "virtio-net-pci",
+        "adapters": 11,
+        "ram": 128,
+        "cpus": 1,
+        "hda_disk_interface": "virtio",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "boot_priority": "c",
+        "kvm": "allow",
+        "options": "-nographic",
+        "on_close": "shutdown_signal",
+        "custom_adapters": [
+            {
+                "adapter_number": 10,
+                "port_name": "sfp1"
+            }
+        ]
+    },
+    "images": [
+        {
+            "filename": "chr-7.8.img",
+            "version": "7.8",
+            "md5sum": "08fc9baf18d920bc65c974cafa3719be",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.8/chr-7.8.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.7.img",
+            "version": "7.7",
+            "md5sum": "efc4fdeb1cc06dc240a14f1215fd59b3",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.7/chr-7.7.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.6.img",
+            "version": "7.6",
+            "md5sum": "864482f9efaea9d40910c050318f65b9",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.6/chr-7.6.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.3.1.img",
+            "version": "7.3.1",
+            "md5sum": "99f8ea75f8b745a8bf5ca3cc1bd325e3",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.3.1/chr-7.3.1.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.1.5.img",
+            "version": "7.1.5",
+            "md5sum": "9c0be05f891df2b1400bdae5e719898e",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.1.5/chr-7.1.5.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-6.49.7.img",
+            "version": "6.49.7",
+            "md5sum": "0686d07f69d15d41467ada4a58a92cd2",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.49.7/chr-6.49.7.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-6.49.6.img",
+            "version": "6.49.6",
+            "md5sum": "ae27d38acc9c4dcd875e0f97bcae8d97",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.49.6/chr-6.49.6.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-6.48.6.img",
+            "version": "6.48.6",
+            "md5sum": "875574a561570227ff8f395aabe478c6",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.48.6/chr-6.48.6.img.zip",
+            "compression": "zip"
+        }
+    ],
+    "versions": [
+        {
+            "name": "7.8",
+            "images": {
+                "hda_disk_image": "chr-7.8.img"
+            }
+        },
+        {
+            "name": "7.7",
+            "images": {
+                "hda_disk_image": "chr-7.7.img"
+            }
+        },
+        {
+            "name": "7.6",
+            "images": {
+                "hda_disk_image": "chr-7.6.img"
+            }
+        },
+        {
+            "name": "7.3.1",
+            "images": {
+                "hda_disk_image": "chr-7.3.1.img"
+            }
+        },
+        {
+            "name": "7.1.5",
+            "images": {
+                "hda_disk_image": "chr-7.1.5.img"
+            }
+        },
+        {
+            "name": "6.49.7",
+            "images": {
+                "hda_disk_image": "chr-6.49.7.img"
+            }
+        },
+        {
+            "name": "6.49.6",
+            "images": {
+                "hda_disk_image": "chr-6.49.6.img"
+            }
+        },
+        {
+            "name": "6.48.6",
+            "images": {
+                "hda_disk_image": "chr-6.48.6.img"
+            }
+        }
+    ]
+}

gns3server/appliances/mikrotik-rb3011uias.gns3a

@@ -0,0 +1,161 @@
+{
+    "appliance_id": "363f3e40-569b-445a-83fc-0e25bfc9c3ff",
+    "name": "MikroTik RB3011UiAS",
+    "category": "router",
+    "description": "This is a variation of Cloud Hosted Router (CHR) which is meant to mimic the basic hardware configuration of the RB3011UiAS model.",
+    "vendor_name": "MikroTik",
+    "vendor_url": "http://mikrotik.com/",
+    "documentation_url": "http://wiki.mikrotik.com/wiki/Manual:CHR",
+    "product_name": "MikroTik RouterBOARD 3011UiAS",
+    "product_url": "http://www.mikrotik.com/download",
+    "registry_version": 6,
+    "status": "stable",
+    "maintainer": "Azorian Solutions",
+    "maintainer_email": "help@azorian.solutions",
+    "usage": "If you'd like a different sized main disk, resize the image before booting the VM for the first time.\n\nOn first boot, RouterOS is actually being installed, formatting the whole main virtual disk, before finally rebooting. That whole process may take a minute or so.\n\nThe console will become available after the installation is complete. Most Telnet/SSH clients (certainly SuperPutty) will keep retrying to connect, thus letting you know when installation is done.\n\nFrom that point on, everything about RouterOS is also true about Cloud Hosted Router, including the default credentials: Username \"admin\" and an empty password.\n\nThe primary differences between RouterOS and CHR are in support for virtual devices (this appliance comes with them being selected), and in the different license model, for which you can read more about at http://wiki.mikrotik.com/wiki/Manual:CHR.",
+    "symbol": ":/symbols/classic/router.svg",
+    "port_name_format": "ether{port1}",
+    "qemu": {
+        "adapter_type": "virtio-net-pci",
+        "adapters": 11,
+        "ram": 1024,
+        "cpus": 2,
+        "hda_disk_interface": "virtio",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "boot_priority": "c",
+        "kvm": "allow",
+        "options": "-nographic",
+        "on_close": "shutdown_signal",
+        "custom_adapters": [
+            {
+                "adapter_number": 10,
+                "port_name": "sfp1"
+            }
+        ]
+    },
+    "images": [
+        {
+            "filename": "chr-7.8.img",
+            "version": "7.8",
+            "md5sum": "08fc9baf18d920bc65c974cafa3719be",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.8/chr-7.8.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.7.img",
+            "version": "7.7",
+            "md5sum": "efc4fdeb1cc06dc240a14f1215fd59b3",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.7/chr-7.7.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.6.img",
+            "version": "7.6",
+            "md5sum": "864482f9efaea9d40910c050318f65b9",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.6/chr-7.6.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.3.1.img",
+            "version": "7.3.1",
+            "md5sum": "99f8ea75f8b745a8bf5ca3cc1bd325e3",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.3.1/chr-7.3.1.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.1.5.img",
+            "version": "7.1.5",
+            "md5sum": "9c0be05f891df2b1400bdae5e719898e",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.1.5/chr-7.1.5.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-6.49.7.img",
+            "version": "6.49.7",
+            "md5sum": "0686d07f69d15d41467ada4a58a92cd2",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.49.7/chr-6.49.7.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-6.49.6.img",
+            "version": "6.49.6",
+            "md5sum": "ae27d38acc9c4dcd875e0f97bcae8d97",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.49.6/chr-6.49.6.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-6.48.6.img",
+            "version": "6.48.6",
+            "md5sum": "875574a561570227ff8f395aabe478c6",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.48.6/chr-6.48.6.img.zip",
+            "compression": "zip"
+        }
+    ],
+    "versions": [
+        {
+            "name": "7.8",
+            "images": {
+                "hda_disk_image": "chr-7.8.img"
+            }
+        },
+        {
+            "name": "7.7",
+            "images": {
+                "hda_disk_image": "chr-7.7.img"
+            }
+        },
+        {
+            "name": "7.6",
+            "images": {
+                "hda_disk_image": "chr-7.6.img"
+            }
+        },
+        {
+            "name": "7.3.1",
+            "images": {
+                "hda_disk_image": "chr-7.3.1.img"
+            }
+        },
+        {
+            "name": "7.1.5",
+            "images": {
+                "hda_disk_image": "chr-7.1.5.img"
+            }
+        },
+        {
+            "name": "6.49.7",
+            "images": {
+                "hda_disk_image": "chr-6.49.7.img"
+            }
+        },
+        {
+            "name": "6.49.6",
+            "images": {
+                "hda_disk_image": "chr-6.49.6.img"
+            }
+        },
+        {
+            "name": "6.48.6",
+            "images": {
+                "hda_disk_image": "chr-6.48.6.img"
+            }
+        }
+    ]
+}

gns3server/appliances/mikrotik-rb4011igs+.gns3a

@@ -0,0 +1,161 @@
+{
+    "appliance_id": "014c6b0b-0558-4120-a7f1-d20d4d92b073",
+    "name": "MikroTik RB4011iGS+",
+    "category": "router",
+    "description": "This is a variation of Cloud Hosted Router (CHR) which is meant to mimic the basic hardware configuration of the RB4011iGS+ model.",
+    "vendor_name": "MikroTik",
+    "vendor_url": "http://mikrotik.com/",
+    "documentation_url": "http://wiki.mikrotik.com/wiki/Manual:CHR",
+    "product_name": "MikroTik RouterBOARD 4011iGS+",
+    "product_url": "http://www.mikrotik.com/download",
+    "registry_version": 6,
+    "status": "stable",
+    "maintainer": "Azorian Solutions",
+    "maintainer_email": "help@azorian.solutions",
+    "usage": "If you'd like a different sized main disk, resize the image before booting the VM for the first time.\n\nOn first boot, RouterOS is actually being installed, formatting the whole main virtual disk, before finally rebooting. That whole process may take a minute or so.\n\nThe console will become available after the installation is complete. Most Telnet/SSH clients (certainly SuperPutty) will keep retrying to connect, thus letting you know when installation is done.\n\nFrom that point on, everything about RouterOS is also true about Cloud Hosted Router, including the default credentials: Username \"admin\" and an empty password.\n\nThe primary differences between RouterOS and CHR are in support for virtual devices (this appliance comes with them being selected), and in the different license model, for which you can read more about at http://wiki.mikrotik.com/wiki/Manual:CHR.",
+    "symbol": ":/symbols/classic/router.svg",
+    "port_name_format": "ether{port1}",
+    "qemu": {
+        "adapter_type": "virtio-net-pci",
+        "adapters": 9,
+        "ram": 1024,
+        "cpus": 4,
+        "hda_disk_interface": "virtio",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "boot_priority": "c",
+        "kvm": "allow",
+        "options": "-nographic",
+        "on_close": "shutdown_signal",
+        "custom_adapters": [
+            {
+                "adapter_number": 8,
+                "port_name": "sfp-sfpplus1"
+            }
+        ]
+    },
+    "images": [
+        {
+            "filename": "chr-7.8.img",
+            "version": "7.8",
+            "md5sum": "08fc9baf18d920bc65c974cafa3719be",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.8/chr-7.8.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.7.img",
+            "version": "7.7",
+            "md5sum": "efc4fdeb1cc06dc240a14f1215fd59b3",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.7/chr-7.7.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.6.img",
+            "version": "7.6",
+            "md5sum": "864482f9efaea9d40910c050318f65b9",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.6/chr-7.6.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.3.1.img",
+            "version": "7.3.1",
+            "md5sum": "99f8ea75f8b745a8bf5ca3cc1bd325e3",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.3.1/chr-7.3.1.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.1.5.img",
+            "version": "7.1.5",
+            "md5sum": "9c0be05f891df2b1400bdae5e719898e",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.1.5/chr-7.1.5.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-6.49.7.img",
+            "version": "6.49.7",
+            "md5sum": "0686d07f69d15d41467ada4a58a92cd2",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.49.7/chr-6.49.7.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-6.49.6.img",
+            "version": "6.49.6",
+            "md5sum": "ae27d38acc9c4dcd875e0f97bcae8d97",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.49.6/chr-6.49.6.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-6.48.6.img",
+            "version": "6.48.6",
+            "md5sum": "875574a561570227ff8f395aabe478c6",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.48.6/chr-6.48.6.img.zip",
+            "compression": "zip"
+        }
+    ],
+    "versions": [
+        {
+            "name": "7.8",
+            "images": {
+                "hda_disk_image": "chr-7.8.img"
+            }
+        },
+        {
+            "name": "7.7",
+            "images": {
+                "hda_disk_image": "chr-7.7.img"
+            }
+        },
+        {
+            "name": "7.6",
+            "images": {
+                "hda_disk_image": "chr-7.6.img"
+            }
+        },
+        {
+            "name": "7.3.1",
+            "images": {
+                "hda_disk_image": "chr-7.3.1.img"
+            }
+        },
+        {
+            "name": "7.1.5",
+            "images": {
+                "hda_disk_image": "chr-7.1.5.img"
+            }
+        },
+        {
+            "name": "6.49.7",
+            "images": {
+                "hda_disk_image": "chr-6.49.7.img"
+            }
+        },
+        {
+            "name": "6.49.6",
+            "images": {
+                "hda_disk_image": "chr-6.49.6.img"
+            }
+        },
+        {
+            "name": "6.48.6",
+            "images": {
+                "hda_disk_image": "chr-6.48.6.img"
+            }
+        }
+    ]
+}

gns3server/appliances/mikrotik-rb450g.gns3a

@@ -0,0 +1,155 @@
+{
+    "appliance_id": "e2d71a59-6b15-495d-9dd5-67f56072ee32",
+    "name": "MikroTik RB450G",
+    "category": "router",
+    "description": "This is a variation of Cloud Hosted Router (CHR) which is meant to mimic the basic hardware configuration of the RB450G model.",
+    "vendor_name": "MikroTik",
+    "vendor_url": "http://mikrotik.com/",
+    "documentation_url": "http://wiki.mikrotik.com/wiki/Manual:CHR",
+    "product_name": "MikroTik RouterBOARD 450G",
+    "product_url": "http://www.mikrotik.com/download",
+    "registry_version": 5,
+    "status": "stable",
+    "maintainer": "Azorian Solutions",
+    "maintainer_email": "help@azorian.solutions",
+    "usage": "If you'd like a different sized main disk, resize the image before booting the VM for the first time.\n\nOn first boot, RouterOS is actually being installed, formatting the whole main virtual disk, before finally rebooting. That whole process may take a minute or so.\n\nThe console will become available after the installation is complete. Most Telnet/SSH clients (certainly SuperPutty) will keep retrying to connect, thus letting you know when installation is done.\n\nFrom that point on, everything about RouterOS is also true about Cloud Hosted Router, including the default credentials: Username \"admin\" and an empty password.\n\nThe primary differences between RouterOS and CHR are in support for virtual devices (this appliance comes with them being selected), and in the different license model, for which you can read more about at http://wiki.mikrotik.com/wiki/Manual:CHR.",
+    "symbol": ":/symbols/classic/router.svg",
+    "port_name_format": "ether{port1}",
+    "qemu": {
+        "adapter_type": "virtio-net-pci",
+        "adapters": 5,
+        "ram": 256,
+        "cpus": 1,
+        "hda_disk_interface": "virtio",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "boot_priority": "c",
+        "kvm": "allow",
+        "options": "-nographic",
+        "on_close": "shutdown_signal"
+    },
+    "images": [
+        {
+            "filename": "chr-7.8.img",
+            "version": "7.8",
+            "md5sum": "08fc9baf18d920bc65c974cafa3719be",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.8/chr-7.8.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.7.img",
+            "version": "7.7",
+            "md5sum": "efc4fdeb1cc06dc240a14f1215fd59b3",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.7/chr-7.7.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.6.img",
+            "version": "7.6",
+            "md5sum": "864482f9efaea9d40910c050318f65b9",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.6/chr-7.6.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.3.1.img",
+            "version": "7.3.1",
+            "md5sum": "99f8ea75f8b745a8bf5ca3cc1bd325e3",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.3.1/chr-7.3.1.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.1.5.img",
+            "version": "7.1.5",
+            "md5sum": "9c0be05f891df2b1400bdae5e719898e",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.1.5/chr-7.1.5.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-6.49.7.img",
+            "version": "6.49.7",
+            "md5sum": "0686d07f69d15d41467ada4a58a92cd2",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.49.7/chr-6.49.7.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-6.49.6.img",
+            "version": "6.49.6",
+            "md5sum": "ae27d38acc9c4dcd875e0f97bcae8d97",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.49.6/chr-6.49.6.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-6.48.6.img",
+            "version": "6.48.6",
+            "md5sum": "875574a561570227ff8f395aabe478c6",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.48.6/chr-6.48.6.img.zip",
+            "compression": "zip"
+        }
+    ],
+    "versions": [
+        {
+            "name": "7.8",
+            "images": {
+                "hda_disk_image": "chr-7.8.img"
+            }
+        },
+        {
+            "name": "7.7",
+            "images": {
+                "hda_disk_image": "chr-7.7.img"
+            }
+        },
+        {
+            "name": "7.6",
+            "images": {
+                "hda_disk_image": "chr-7.6.img"
+            }
+        },
+        {
+            "name": "7.3.1",
+            "images": {
+                "hda_disk_image": "chr-7.3.1.img"
+            }
+        },
+        {
+            "name": "7.1.5",
+            "images": {
+                "hda_disk_image": "chr-7.1.5.img"
+            }
+        },
+        {
+            "name": "6.49.7",
+            "images": {
+                "hda_disk_image": "chr-6.49.7.img"
+            }
+        },
+        {
+            "name": "6.49.6",
+            "images": {
+                "hda_disk_image": "chr-6.49.6.img"
+            }
+        },
+        {
+            "name": "6.48.6",
+            "images": {
+                "hda_disk_image": "chr-6.48.6.img"
+            }
+        }
+    ]
+}

gns3server/appliances/mikrotik-rb450gx4.gns3a

@@ -0,0 +1,155 @@
+{
+    "appliance_id": "aa26d321-415c-46ee-b3e9-3bc04dd96423",
+    "name": "MikroTik RB450Gx4",
+    "category": "router",
+    "description": "This is a variation of Cloud Hosted Router (CHR) which is meant to mimic the basic hardware configuration of the RB450Gx4 model.",
+    "vendor_name": "MikroTik",
+    "vendor_url": "http://mikrotik.com/",
+    "documentation_url": "http://wiki.mikrotik.com/wiki/Manual:CHR",
+    "product_name": "MikroTik RouterBOARD 450Gx4",
+    "product_url": "http://www.mikrotik.com/download",
+    "registry_version": 5,
+    "status": "stable",
+    "maintainer": "Azorian Solutions",
+    "maintainer_email": "help@azorian.solutions",
+    "usage": "If you'd like a different sized main disk, resize the image before booting the VM for the first time.\n\nOn first boot, RouterOS is actually being installed, formatting the whole main virtual disk, before finally rebooting. That whole process may take a minute or so.\n\nThe console will become available after the installation is complete. Most Telnet/SSH clients (certainly SuperPutty) will keep retrying to connect, thus letting you know when installation is done.\n\nFrom that point on, everything about RouterOS is also true about Cloud Hosted Router, including the default credentials: Username \"admin\" and an empty password.\n\nThe primary differences between RouterOS and CHR are in support for virtual devices (this appliance comes with them being selected), and in the different license model, for which you can read more about at http://wiki.mikrotik.com/wiki/Manual:CHR.",
+    "symbol": ":/symbols/classic/router.svg",
+    "port_name_format": "ether{port1}",
+    "qemu": {
+        "adapter_type": "virtio-net-pci",
+        "adapters": 5,
+        "ram": 1024,
+        "cpus": 4,
+        "hda_disk_interface": "virtio",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "boot_priority": "c",
+        "kvm": "allow",
+        "options": "-nographic",
+        "on_close": "shutdown_signal"
+    },
+    "images": [
+        {
+            "filename": "chr-7.8.img",
+            "version": "7.8",
+            "md5sum": "08fc9baf18d920bc65c974cafa3719be",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.8/chr-7.8.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.7.img",
+            "version": "7.7",
+            "md5sum": "efc4fdeb1cc06dc240a14f1215fd59b3",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.7/chr-7.7.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.6.img",
+            "version": "7.6",
+            "md5sum": "864482f9efaea9d40910c050318f65b9",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.6/chr-7.6.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.3.1.img",
+            "version": "7.3.1",
+            "md5sum": "99f8ea75f8b745a8bf5ca3cc1bd325e3",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.3.1/chr-7.3.1.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-7.1.5.img",
+            "version": "7.1.5",
+            "md5sum": "9c0be05f891df2b1400bdae5e719898e",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.1.5/chr-7.1.5.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-6.49.7.img",
+            "version": "6.49.7",
+            "md5sum": "0686d07f69d15d41467ada4a58a92cd2",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.49.7/chr-6.49.7.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-6.49.6.img",
+            "version": "6.49.6",
+            "md5sum": "ae27d38acc9c4dcd875e0f97bcae8d97",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.49.6/chr-6.49.6.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-6.48.6.img",
+            "version": "6.48.6",
+            "md5sum": "875574a561570227ff8f395aabe478c6",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.48.6/chr-6.48.6.img.zip",
+            "compression": "zip"
+        }
+    ],
+    "versions": [
+        {
+            "name": "7.8",
+            "images": {
+                "hda_disk_image": "chr-7.8.img"
+            }
+        },
+        {
+            "name": "7.7",
+            "images": {
+                "hda_disk_image": "chr-7.7.img"
+            }
+        },
+        {
+            "name": "7.6",
+            "images": {
+                "hda_disk_image": "chr-7.6.img"
+            }
+        },
+        {
+            "name": "7.3.1",
+            "images": {
+                "hda_disk_image": "chr-7.3.1.img"
+            }
+        },
+        {
+            "name": "7.1.5",
+            "images": {
+                "hda_disk_image": "chr-7.1.5.img"
+            }
+        },
+        {
+            "name": "6.49.7",
+            "images": {
+                "hda_disk_image": "chr-6.49.7.img"
+            }
+        },
+        {
+            "name": "6.49.6",
+            "images": {
+                "hda_disk_image": "chr-6.49.6.img"
+            }
+        },
+        {
+            "name": "6.48.6",
+            "images": {
+                "hda_disk_image": "chr-6.48.6.img"
+            }
+        }
+    ]
+}

gns3server/appliances/mikrotik-winbox.gns3a

@@ -0,0 +1,19 @@
+{
+    "appliance_id": "b770027f-1822-4ab6-b2f9-73336ca0983d",
+    "name": "Mikrotik WinBox",
+    "category": "guest",
+    "description": "Mikrotik's WinBox router management software for GNS3",
+    "vendor_name": "Mikrotik",
+    "vendor_url": "https://mikrotik.com",
+    "product_name": "Mikrotik WinBox",
+    "registry_version": 4,
+    "status": "stable",
+    "availability": "free",
+    "maintainer": "Alexander Horner",
+    "maintainer_email": "contact@alexhorner.cc",
+    "docker": {
+        "adapters": 1,
+        "image": "gns3/mikrotik-winbox",
+        "console_type": "vnc"
+    }
+}

gns3server/appliances/ntopng.gns3a

@@ -14,7 +14,7 @@
     "usage": "In the web interface login as admin/admin\n\nPersistent configuration:\n- Add \"/var/lib/redis\" as an additional persistent directory.\n- Use \"redis-cli save\" in an auxiliary console to save the configuration.",
     "docker": {
         "adapters": 1,
-        "image": "ntop/ntopng:latest",
+        "image": "ntop/ntopng:stable",
         "start_command": "--dns-mode 2 --interface eth0",
         "console_type": "http",
         "console_http_port": 3000,

gns3server/appliances/open-media-vault.gns3a

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

gns3server/appliances/oracle-linux-cloud.gns3a

@@ -0,0 +1,70 @@
+{
+    "appliance_id": "88e67f45-e0de-4e5e-9f36-2dc83e4a6c60",
+    "name": "Oracle Linux Cloud Guest",
+    "category": "guest",
+    "description": "A highly performant and secure operating environment, Oracle Linux delivers virtualization, management, automation, and cloud native computing tools, along with the operating system, in a single, easy-to-manage support offering. Oracle Linux provides a 100% application binary compatible alternative to Red Hat Enterprise Linux and CentOS Linux and is supported across both hybrid and multicloud environments.",
+    "vendor_name": "Oracle Corporation",
+    "vendor_url": "https://www.oracle.com",
+    "documentation_url": "https://docs.oracle.com/en-us/iaas/images/",
+    "product_name": "Oracle Linux Cloud Guest",
+    "product_url": "https://www.oracle.com/au/linux/",
+    "registry_version": 4,
+    "status": "stable",
+    "maintainer": "GNS3 Team",
+    "maintainer_email": "developers@gns3.net",
+    "usage": "Username: oracle\nPassword: oracle",
+    "port_name_format": "Ethernet{0}",
+    "qemu": {
+        "adapter_type": "virtio-net-pci",
+        "adapters": 1,
+        "ram": 1024,
+        "hda_disk_interface": "virtio",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "boot_priority": "c",
+        "kvm": "require",
+        "options": "-cpu host -nographic"
+    },
+    "images": [
+        {
+            "filename": "OL9U1_x86_64-kvm-b158.qcow",
+            "version": "9.1",
+            "md5sum": "9f32851b96fc38191892197fa11f7435",
+            "filesize": 539033600,
+            "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": "OL8U7_x86_64-kvm-b148.qcow",
+            "version": "8.7",
+            "md5sum": "962cdde7e810888b9914e937222f687f",
+            "filesize": 913965056,
+            "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": "oracle-cloud-init-data.iso",
+            "version": "1.1",
+            "md5sum": "cb51bc42ae9dfb7345bfa7362a313baf",
+            "filesize": 374784,
+            "download_url": "https://github.com/GNS3/gns3-registry/tree/master/cloud-init/oracle-cloud",
+            "direct_download_url": "https://github.com/GNS3/gns3-registry/raw/master/cloud-init/oracle-cloud/oracle-cloud-init-data.iso"
+        }
+    ],
+    "versions": [
+        {
+            "name": "9.1",
+            "images": {
+                "hda_disk_image": "OL9U1_x86_64-kvm-b158.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"
+            }
+        }
+    ]
+}

gns3server/appliances/ostinato.gns3a

@@ -29,6 +29,13 @@
         "options": "-vga std -usbdevice tablet"
     },
     "images": [
+        {
+            "filename": "ostinatostd-1.2.0-1.qcow2",
+            "version": "1.2.0",
+            "md5sum": "682680fe75f88975992c0a1a5c973149",
+            "filesize": 173801472,
+            "download_url": "https://ostinato.org/pricing/gns3"
+        },
         {
             "filename": "ostinatostd-1.1-1.qcow2",
             "version": "1.1",
@@ -38,6 +45,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "1.2.0",
+            "images": {
+                "hda_disk_image": "ostinatostd-1.2.0-1.qcow2"
+            }
+        },
         {
             "name": "1.1",
             "images": {

gns3server/appliances/pan-vm-fw.gns3a

@@ -27,6 +27,13 @@
         "options": "-smp 2"
     },
     "images": [
+		{
+            "filename": "PA-VM-KVM-10.1.0.qcow2",
+            "version": "10.1.0",
+            "md5sum": "8266fd412a22694749f2cd4afcd5fa33",
+            "filesize": 3597467648,
+            "download_url": "https://support.paloaltonetworks.com/Updates/SoftwareUpdates/"
+        },
         {
             "filename": "PA-VM-KVM-10.0.0.qcow2",
             "version": "10.0.0",
@@ -120,6 +127,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "10.1.0",
+            "images": {
+                "hda_disk_image": "PA-VM-KVM-10.1.0.qcow2"
+            }
+        },
         {
             "name": "10.0.0",
             "images": {

gns3server/appliances/rockylinux.gns3a

@@ -23,7 +23,7 @@
         "console_type": "telnet",
         "boot_priority": "c",
         "kvm": "require",
-        "options": "-nographic"
+        "options": "-nographic -cpu host"
     },
     "images": [
         {
@@ -39,7 +39,8 @@
             "version": "1.0",
             "md5sum": "33ffda3a81436e305f37fb913edd6d43",
             "filesize": 374784,
-            "download_url": "https://github.com/GNS3/gns3-registry/raw/master/cloud-init/rocky-cloud/rocky-cloud-init-data.iso"
+            "download_url": "https://github.com/GNS3/gns3-registry/tree/master/cloud-init/rocky-cloud",
+            "direct_download_url": "https://github.com/GNS3/gns3-registry/raw/master/cloud-init/rocky-cloud/rocky-cloud-init-data.iso"
         }
     ],
     "versions": [

gns3server/appliances/tinycore-linux.gns3a

@@ -17,7 +17,7 @@
     "qemu": {
         "adapter_type": "e1000",
         "adapters": 1,
-        "ram": 96,
+        "ram": 128,
         "hda_disk_interface": "virtio",
         "arch": "i386",
         "console_type": "vnc",
@@ -28,7 +28,7 @@
         {
             "filename": "linux-tinycore-11.1.qcow2",
             "version": "11.1",
-            "md5sum": "993d1ce9b86cb131c90e8263891d51b8",
+            "md5sum": "00a65300a1dcc956e4e677c638bf4445",
             "filesize": 33816576,
             "download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/",
             "direct_download_url": "http://downloads.sourceforge.net/project/gns-3/Qemu%20Appliances/linux-tinycore-11.1.qcow2"

gns3server/appliances/ubuntu-cloud.gns3a

@@ -29,51 +29,34 @@
         {
             "filename": "ubuntu-22.04-server-cloudimg-amd64.img",
             "version": "22.04 (LTS)",
-            "md5sum": "ac2351289daa173fa1ed6b2b81d81d7c",
-            "filesize": 624295936,
-            "download_url": "https://cloud-images.ubuntu.com/releases/jammy/release/ubuntu-22.04-server-cloudimg-amd64.img"
+            "md5sum": "3ce0b84f9592482fb645e8253b979827",
+            "filesize": 686096384,
+            "download_url": "https://cloud-images.ubuntu.com/releases/jammy/release",
+            "direct_download_url": "https://cloud-images.ubuntu.com/releases/jammy/release/ubuntu-22.04-server-cloudimg-amd64.img"
         },
         {
             "filename": "ubuntu-20.04-server-cloudimg-amd64.img",
             "version": "20.04 (LTS)",
             "md5sum": "044bc979b2238192ee3edb44e2bb6405",
             "filesize": 552337408,
-            "download_url": "https://cloud-images.ubuntu.com/releases/focal/release-20210119.1/ubuntu-20.04-server-cloudimg-amd64.img"
+            "download_url": "https://cloud-images.ubuntu.com/releases/focal/release-20210119.1/",
+            "direct_download_url": "https://cloud-images.ubuntu.com/releases/focal/release-20210119.1/ubuntu-20.04-server-cloudimg-amd64.img"
         },
         {
             "filename": "ubuntu-18.04-server-cloudimg-amd64.img",
             "version": "18.04 (LTS)",
             "md5sum": "f4134e7fa16d7fa766c7467cbe25c949",
             "filesize": 336134144,
-            "download_url": "https://cloud-images.ubuntu.com/releases/18.04/release-20180426.2/ubuntu-18.04-server-cloudimg-amd64.img"
-        },
-        {
-            "filename": "ubuntu-17.10-server-cloudimg-amd64.img",
-            "version": "17.10",
-            "md5sum": "331b44f2b05858c251b3ea92c8b65152",
-            "filesize": 320405504,
-            "download_url": "https://cloud-images.ubuntu.com/releases/17.10/release-20180404/ubuntu-17.10-server-cloudimg-amd64.img"
-        },
-        {
-            "filename": "ubuntu-16.04-server-cloudimg-amd64-disk1.img",
-            "version": "16.04 (LTS)",
-            "md5sum": "22c124ba65ea096cdef8b0a197dd613a",
-            "filesize": 290193408,
-            "download_url": "https://cloud-images.ubuntu.com/releases/16.04/release-20180405/ubuntu-16.04-server-cloudimg-amd64-disk1.img"
-        },
-        {
-            "filename": "ubuntu-14.04-server-cloudimg-amd64-disk1.img",
-            "version": "14.04 (LTS)",
-            "md5sum": "d11b89321d41d0eeddcacf73bf0d2262",
-            "filesize": 262668800,
-            "download_url": "https://cloud-images.ubuntu.com/releases/14.04/release-20180404/ubuntu-14.04-server-cloudimg-amd64-disk1.img"
+            "download_url": "https://cloud-images.ubuntu.com/releases/18.04/release-20180426.2/",
+            "direct_download_url": "https://cloud-images.ubuntu.com/releases/18.04/release-20180426.2/ubuntu-18.04-server-cloudimg-amd64.img"
         },
         {
             "filename": "ubuntu-cloud-init-data.iso",
-            "version": "1.0",
-            "md5sum": "328469100156ae8dbf262daa319c27ff",
-            "filesize": 131072,
-            "download_url": "https://github.com/asenci/gns3-ubuntu-cloud-init-data/raw/master/ubuntu-cloud-init-data.iso"
+            "version": "1.1",
+            "md5sum": "9a90ee8f88736204c756015b3cd86500",
+            "filesize": 374784,
+            "download_url": "https://github.com/GNS3/gns3-registry/tree/master/cloud-init/ubuntu-cloud",
+            "direct_download_url": "https://github.com/GNS3/gns3-registry/raw/master/cloud-init/ubuntu-cloud/ubuntu-cloud-init-data.iso"
         }
     ],
     "versions": [
@@ -97,27 +80,6 @@
                 "hda_disk_image": "ubuntu-18.04-server-cloudimg-amd64.img",
                 "cdrom_image": "ubuntu-cloud-init-data.iso"
             }
-        },
-        {
-            "name": "17.10",
-            "images": {
-                "hda_disk_image": "ubuntu-17.10-server-cloudimg-amd64.img",
-                "cdrom_image": "ubuntu-cloud-init-data.iso"
-            }
-        },
-        {
-            "name": "16.04 (LTS)",
-            "images": {
-                "hda_disk_image": "ubuntu-16.04-server-cloudimg-amd64-disk1.img",
-                "cdrom_image": "ubuntu-cloud-init-data.iso"
-            }
-        },
-        {
-            "name": "14.04 (LTS)",
-            "images": {
-                "hda_disk_image": "ubuntu-14.04-server-cloudimg-amd64-disk1.img",
-                "cdrom_image": "ubuntu-cloud-init-data.iso"
-            }
         }
     ]
 }

gns3server/appliances/ubuntu-server.gns3a

@@ -1,45 +0,0 @@
-{
-    "appliance_id": "d2a23e69-9e92-4c3f-83c8-8caa1aa58ece",
-    "name": "Ubuntu Server",
-    "category": "guest",
-    "description": "This is a custom Ubuntu server which comes with Canonical security updates, Xorg and Telnetd",
-    "vendor_name": "Canonical Inc.",
-    "vendor_url": "https://www.ubuntu.com",
-    "documentation_url": "https://help.ubuntu.com",
-    "product_name": "Ubuntu",
-    "product_url": "https://ubuntu.com/server",
-    "registry_version": 4,
-    "status": "stable",
-    "maintainer": "Mohamad Siblini",
-    "maintainer_email": "info@ictkin.com",
-    "usage": "Username: gns3\nPassword: gns3 | MD5: 435f15a54f7f673e302ad26f05226e0e",
-    "port_name_format": "ens{0}",
-    "qemu": {
-        "adapter_type": "virtio-net-pci",
-        "adapters": 1,
-        "ram": 2048,
-        "hda_disk_interface": "virtio",
-        "arch": "x86_64",
-        "console_type": "vnc",
-        "boot_priority": "c",
-        "kvm": "require",
-        "options": "-vga virtio"
-    },
-    "images": [
-        {
-            "filename": "Ubuntu Server 18.04.3 LTS (64bit).vmdk",
-            "version": "18.04.3 LTS Server",
-            "md5sum": "435f15a54f7f673e302ad26f05226e0e",
-            "filesize": 2707814912,
-            "download_url": "https://www.ictkin.com/gns3-appliance/"
-        }
-    ],
-    "versions": [
-        {
-            "name": "18.04.3 LTS Server",
-            "images": {
-                "hda_disk_image": "Ubuntu Server 18.04.3 LTS (64bit).vmdk"
-            }
-        }
-    ]
-}

gns3server/appliances/vyos.gns3a

@@ -12,7 +12,7 @@
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
-    "usage": "Default username/password is vyos/vyos.\n\nAt first boot the router will start from the cdrom. Login and then type \"install image\" and follow the instructions.",
+    "usage": "Default username/password is vyos/vyos.\n\nThe -KVM versions are ready to use, no installation is required.\nThe other images will start the router from the CDROM on initial boot. Login and then type \"install image\" and follow the instructions.",
     "symbol": "vyos.svg",
     "port_name_format": "eth{0}",
     "qemu": {
@@ -54,12 +54,37 @@
             "filesize": 338690048,
             "download_url": "https://support.vyos.io/en/downloads/files/vyos-1-3-0-generic-iso-image"
         },
+        {
+            "filename": "vyos-1.2.9-S1-amd64.iso",
+            "version": "1.2.9-S1",
+            "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"
+        },
+        {
+            "filename": "vyos-1.2.9-S1-10G-qemu.qcow2",
+            "version": "1.2.9-S1-KVM",
+            "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"
+        },
         {
             "filename": "vyos-1.2.9-amd64.iso",
             "version": "1.2.9",
             "md5sum": "586be23b6256173e174c82d8f1f699a1",
             "filesize": 430964736,
-            "download_url": "https://support.vyos.io/en/downloads/files/vyos-1-2-9-generic-iso-image"
+            "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"
+        },
+        {
+            "filename": "vyos-1.2.9-10G-qemu.qcow2",
+            "version": "1.2.9-KVM",
+            "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"
         },
         {
             "filename": "vyos-1.2.8-amd64.iso",
@@ -68,20 +93,12 @@
             "filesize": 429916160,
             "download_url": "https://support.vyos.io/en/downloads/files/vyos-1-2-8-generic-iso-image"
         },
-        {
-            "filename": "vyos-1.2.7-amd64.iso",
-            "version": "1.2.7",
-            "md5sum": "1a06255edfac63fa3ea89353317130bf",
-            "filesize": 428867584,
-            "download_url": "https://support.vyos.io/en/downloads/files/vyos-1-2-7-generic-iso-image"
-        },
         {
             "filename": "vyos-1.1.8-amd64.iso",
             "version": "1.1.8",
             "md5sum": "95a141d4b592b81c803cdf7e9b11d8ea",
             "filesize": 241172480,
-            "download_url": "https://support.vyos.io/en/downloads/files/vyos-1-1-8-iso",
-            "direct_download_url": "https://s3.amazonaws.com/s3-us.vyos.io/vyos-1.1.8-amd64.iso"
+            "direct_download_url": "https://s3-us.vyos.io/vyos-1.1.8-amd64.iso"
         },
         {
             "filename": "empty8G.qcow2",
@@ -121,6 +138,19 @@
                 "cdrom_image": "vyos-1.3.0-amd64.iso"
             }
         },
+        {
+            "name": "1.2.9-S1",
+            "images": {
+                "hda_disk_image": "empty8G.qcow2",
+                "cdrom_image": "vyos-1.2.9-S1-amd64.iso"
+            }
+        },
+        {
+            "name": "1.2.9-S1-KVM",
+            "images": {
+                "hda_disk_image": "vyos-1.2.9-S1-10G-qemu.qcow2"
+            }
+        },
         {
             "name": "1.2.9",
             "images": {
@@ -128,6 +158,12 @@
                 "cdrom_image": "vyos-1.2.9-amd64.iso"
             }
         },
+        {
+            "name": "1.2.9-KVM",
+            "images": {
+                "hda_disk_image": "vyos-1.2.9-10G-qemu.qcow2"
+            }
+        },
         {
             "name": "1.2.8",
             "images": {
@@ -135,13 +171,6 @@
                 "cdrom_image": "vyos-1.2.8-amd64.iso"
             }
         },
-        {
-            "name": "1.2.7",
-            "images": {
-                "hda_disk_image": "empty8G.qcow2",
-                "cdrom_image": "vyos-1.2.7-amd64.iso"
-            }
-        },
         {
             "name": "1.1.8",
             "images": {

gns3server/compute/base_node.py

@@ -409,7 +409,10 @@ class BaseNode:
         if self._wrapper_telnet_server:
             self._wrap_console_writer.close()
             if sys.version_info >= (3, 7, 0):
-                await self._wrap_console_writer.wait_closed()
+                try:
+                    await self._wrap_console_writer.wait_closed()
+                except ConnectionResetError:
+                    pass
             self._wrapper_telnet_server.close()
             await self._wrapper_telnet_server.wait_closed()
             self._wrapper_telnet_server = None
@@ -469,7 +472,18 @@ class BaseNode:
 
         try:
             # keep forwarding websocket data in both direction
-            await asyncio.wait([ws_forward(telnet_writer), telnet_forward(telnet_reader)], return_when=asyncio.FIRST_COMPLETED)
+            if sys.version_info >= (3, 11, 0):
+                # Starting with Python 3.11, passing coroutine objects to wait() directly is forbidden.
+                aws = [asyncio.create_task(ws_forward(telnet_writer)), asyncio.create_task(telnet_forward(telnet_reader))]
+            else:
+                aws = [ws_forward(telnet_writer), telnet_forward(telnet_reader)]
+
+            done, pending = await asyncio.wait(aws, return_when=asyncio.FIRST_COMPLETED)
+            for task in done:
+                if task.exception():
+                    log.warning(f"Exception while forwarding WebSocket data to Telnet server {task.exception()}")
+            for task in pending:
+                task.cancel()
         finally:
             log.info("Client has disconnected from console WebSocket")
             if not ws.closed:

gns3server/compute/docker/__init__.py

@@ -150,9 +150,9 @@ class Docker(BaseManager):
                                                    data=data,
                                                    headers={"content-type": "application/json", },
                                                    timeout=timeout)
-        except (aiohttp.ClientResponseError, aiohttp.ClientOSError) as e:
+        except aiohttp.ClientError as e:
             raise DockerError("Docker has returned an error: {}".format(str(e)))
-        except (asyncio.TimeoutError):
+        except asyncio.TimeoutError:
             raise DockerError("Docker timeout " + method + " " + path)
         if response.status >= 300:
             body = await response.read()

gns3server/compute/docker/docker_vm.py

@@ -85,7 +85,6 @@ class DockerVM(BaseNode):
         self._ethernet_adapters = []
         self._temporary_directory = None
         self._telnet_servers = []
-        self._xvfb_process = None
         self._vnc_process = None
         self._vncconfig_process = None
         self._console_resolution = console_resolution
@@ -323,6 +322,9 @@ class DockerVM(BaseNode):
         Creates the Docker container.
         """
 
+        if ":" in os.path.splitdrive(self.working_dir)[1]:
+            raise DockerError("Cannot create a Docker container with a project directory containing a colon character (':')")
+
         try:
             image_infos = await self._get_image_information()
         except DockerHttp404Error:
@@ -582,8 +584,8 @@ class DockerVM(BaseNode):
         self._display = self._get_free_display_port()
         tigervnc_path = shutil.which("Xtigervnc") or shutil.which("Xvnc")
 
-        if not (tigervnc_path or shutil.which("Xvfb") and shutil.which("x11vnc")):
-            raise DockerError("Please install TigerVNC (recommended) or Xvfb + x11vnc before using VNC support")
+        if not tigervnc_path:
+            raise DockerError("Please install TigerVNC server before using VNC support")
 
         if tigervnc_path:
             with open(os.path.join(self.working_dir, "vnc.log"), "w") as fd:
@@ -597,29 +599,6 @@ class DockerVM(BaseNode):
                                                                          "-SecurityTypes", "None",
                                                                          ":{}".format(self._display),
                                                                          stdout=fd, stderr=subprocess.STDOUT)
-        else:
-            if restart is False:
-                self._xvfb_process = await asyncio.create_subprocess_exec("Xvfb",
-                                                                          "-nolisten", "tcp",
-                                                                          "-extension", "MIT-SHM",
-                                                                          ":{}".format(self._display),
-                                                                          "-screen", "0",
-                                                                          self._console_resolution + "x16")
-
-            # We pass a port for TCPV6 due to a crash in X11VNC if not here: https://github.com/GNS3/gns3-server/issues/569
-            with open(os.path.join(self.working_dir, "vnc.log"), "w") as fd:
-                self._vnc_process = await asyncio.create_subprocess_exec("x11vnc",
-                                                                         "-forever",
-                                                                         "-nopw",
-                                                                         "-shared",
-                                                                         "-noshm",
-                                                                         "-geometry", self._console_resolution,
-                                                                         "-display", "WAIT:{}".format(self._display),
-                                                                         "-rfbport", str(self.console),
-                                                                         "-rfbportv6", str(self.console),
-                                                                         "-noncache",
-                                                                         "-listen", self._manager.port_manager.console_host,
-                                                                         stdout=fd, stderr=subprocess.STDOUT)
 
     async def _start_vnc(self):
         """
@@ -628,8 +607,8 @@ class DockerVM(BaseNode):
 
         self._display = self._get_free_display_port()
         tigervnc_path = shutil.which("Xtigervnc") or shutil.which("Xvnc")
-        if not (tigervnc_path or shutil.which("Xvfb") and shutil.which("x11vnc")):
-            raise DockerError("Please install TigerVNC server (recommended) or Xvfb + x11vnc before using VNC support")
+        if not tigervnc_path:
+            raise DockerError("Please install TigerVNC server before using VNC support")
         await self._start_vnc_process()
         x11_socket = os.path.join("/tmp/.X11-unix/", "X{}".format(self._display))
         try:
@@ -872,12 +851,6 @@ class DockerVM(BaseNode):
                         await self._vnc_process.wait()
                     except ProcessLookupError:
                         pass
-                if self._xvfb_process:
-                    try:
-                        self._xvfb_process.terminate()
-                        await self._xvfb_process.wait()
-                    except ProcessLookupError:
-                        pass
 
                 if self._display:
                     display = "/tmp/.X11-unix/X{}".format(self._display)

gns3server/compute/dynamips/__init__.py

@@ -273,7 +273,7 @@ class Dynamips(BaseManager):
         """
 
         try:
-            output = await subprocess_check_output(dynamips_path)
+            output = await subprocess_check_output(dynamips_path, "-P", "none")
             match = re.search(r"Cisco Router Simulation Platform \(version\s+([\d.]+)", output)
             if match:
                 version = match.group(1)

gns3server/compute/qemu/__init__.py

@@ -223,7 +223,7 @@ class Qemu(BaseManager):
                     version = match.group(1)
                     return version
                 else:
-                    raise QemuError("Could not determine the Qemu version for {}".format(qemu_path))
+                    raise QemuError("Could not determine the Qemu version for '{}'".format(qemu_path))
             except (OSError, subprocess.SubprocessError) as e:
                 raise QemuError("Error while looking for the Qemu version: {}".format(e))
 
@@ -242,10 +242,29 @@ class Qemu(BaseManager):
                 version = match.group(1)
                 return version
             else:
-                raise QemuError("Could not determine the Qemu-img version for {}".format(qemu_img_path))
+                raise QemuError("Could not determine the Qemu-img version for '{}'".format(qemu_img_path))
         except (OSError, subprocess.SubprocessError) as e:
             raise QemuError("Error while looking for the Qemu-img version: {}".format(e))
 
+    @staticmethod
+    async def get_swtpm_version(swtpm_path):
+        """
+        Gets the swtpm version.
+
+        :param swtpm_path: path to swtpm executable.
+        """
+
+        try:
+            output = await subprocess_check_output(swtpm_path, "--version")
+            match = re.search(r"version\s+([\d.]+)", output)
+            if match:
+                version = match.group(1)
+                return version
+            else:
+                raise QemuError("Could not determine the swtpm version for '{}'".format(swtpm_path))
+        except (OSError, subprocess.SubprocessError) as e:
+            raise QemuError("Error while looking for the swtpm version: {}".format(e))
+
     @staticmethod
     def get_haxm_windows_version():
         """

gns3server/compute/qemu/qemu_vm.py

@@ -216,7 +216,7 @@ class QemuVM(BaseNode):
             if qemu_bin == "qemu":
                 self._platform = "i386"
             else:
-                self._platform = re.sub(r'^qemu-system-(.*)$', r'\1', qemu_bin, re.IGNORECASE)
+                self._platform = re.sub(r'^qemu-system-(\w+).*$', r'\1', qemu_bin, re.IGNORECASE)
         if self._platform.split(".")[0] not in QEMU_PLATFORMS:
             raise QemuError("Platform {} is unknown".format(self._platform))
         log.info('QEMU VM "{name}" [{id}] has set the QEMU path to {qemu_path}'.format(name=self._name,
@@ -1079,6 +1079,10 @@ class QemuVM(BaseNode):
             # check if there is enough RAM to run
             self.check_available_ram(self.ram)
 
+            # start swtpm (TPM emulator) first if TPM is enabled
+            if self._tpm:
+                await self._start_swtpm()
+
             command = await self._build_command()
             command_string = " ".join(shlex_quote(s) for s in command)
             try:
@@ -1104,8 +1108,6 @@ class QemuVM(BaseNode):
             await self._set_process_priority()
             if self._cpu_throttling:
                 self._set_cpu_throttling()
-            if self._tpm:
-                self._start_swtpm()
             if "-enable-kvm" in command_string or "-enable-hax" in command_string:
                 self._hw_virtualization = True
 
@@ -2019,10 +2021,9 @@ class QemuVM(BaseNode):
             options.extend(["-kernel", self._kernel_image.replace(",", ",,")])
         if self._kernel_command_line:
             options.extend(["-append", self._kernel_command_line])
-
         return options
 
-    def _start_swtpm(self):
+    async def _start_swtpm(self):
         """
         Start swtpm (TPM emulator)
         """
@@ -2035,6 +2036,10 @@ class QemuVM(BaseNode):
         swtpm = shutil.which("swtpm")
         if not swtpm:
             raise QemuError("Could not find swtpm (TPM emulator)")
+        swtpm_version = await self.manager.get_swtpm_version(swtpm)
+        if swtpm_version and parse_version(swtpm_version) < parse_version("0.8.0"):
+            # swtpm >= version 0.8.0 is required
+            raise QemuError("swtpm version 0.8.0 or above must be installed (detected version is {})".format(swtpm_version))
         try:
             command = [
                 swtpm,
@@ -2066,6 +2071,8 @@ class QemuVM(BaseNode):
         """
 
         tpm_sock = os.path.join(self.temporary_directory, "swtpm.sock")
+        if not os.path.exists(tpm_sock):
+            raise QemuError("swtpm socket file '{}' does not exist".format(tpm_sock))
         options = [
             "-chardev",
             "socket,id=chrtpm,path={}".format(tpm_sock),
@@ -2143,6 +2150,8 @@ class QemuVM(BaseNode):
             else:
                 # newer QEMU networking syntax
                 device_string = "{},mac={}".format(adapter_type, mac)
+                if adapter_type == "virtio-net-pci":
+                    device_string = "{},speed=10000,duplex=full".format(device_string)
                 bridge_id = math.floor(pci_device_id / 32)
                 if bridge_id > 0:
                     if pci_bridges_created < bridge_id:

gns3server/controller/__init__.py

@@ -30,6 +30,7 @@ except ImportError:
 
 from ..config import Config
 from ..utils import parse_version
+from ..utils.images import default_images_directory
 
 from .project import Project
 from .template import Template
@@ -72,6 +73,7 @@ class Controller:
 
         log.info("Controller is starting")
         self._install_base_configs()
+        self._install_builtin_disks()
         server_config = Config.instance().get_section_config("Server")
         Config.instance().listen_for_config_changes(self._update_config)
         host = server_config.get("host", "localhost")
@@ -279,29 +281,50 @@ class Controller:
         except OSError as e:
             log.error(str(e))
 
+    @staticmethod
+    def install_resource_files(dst_path, resource_name):
+        """
+        Install files from resources to user's file system
+        """
+
+        if hasattr(sys, "frozen") and sys.platform.startswith("win"):
+            resource_path = os.path.normpath(os.path.join(os.path.dirname(sys.executable), resource_name))
+            for filename in os.listdir(resource_path):
+                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():
+                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}"')
+                    shutil.copy(str(entry), os.path.join(dst_path, entry.name))
+
     def _install_base_configs(self):
         """
-        At startup we copy base file to the user location to allow
+        At startup we copy base configs to the user location to allow
         them to customize it
         """
 
         dst_path = self.configs_path()
         log.info(f"Installing base configs in '{dst_path}'")
         try:
-            if hasattr(sys, "frozen") and sys.platform.startswith("win"):
-                resource_path = os.path.normpath(os.path.join(os.path.dirname(sys.executable), "configs"))
-                for filename in os.listdir(resource_path):
-                    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('gns3server.configs').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 base config file {entry.name} to {full_path}")
-                        shutil.copy(str(entry), os.path.join(dst_path, entry.name))
+            Controller.install_resource_files(dst_path, "configs")
         except OSError as e:
             log.error(f"Could not install base config files to {dst_path}: {e}")
 
+    def _install_builtin_disks(self):
+        """
+        At startup we copy built-in Qemu disks to the user location to allow
+        them to use with appliances
+        """
+
+        dst_path = self.disks_path()
+        log.info(f"Installing built-in disks in '{dst_path}'")
+        try:
+            Controller.install_resource_files(dst_path, "disks")
+        except OSError as e:
+            log.error(f"Could not install disk files to {dst_path}: {e}")
+
     def images_path(self):
         """
         Get the image storage directory
@@ -322,6 +345,15 @@ class Controller:
         os.makedirs(configs_path, exist_ok=True)
         return configs_path
 
+    def disks_path(self, emulator_type="qemu"):
+        """
+        Get the disks storage directory
+        """
+
+        disks_path = default_images_directory(emulator_type)
+        os.makedirs(disks_path, exist_ok=True)
+        return disks_path
+
     async def add_compute(self, compute_id=None, name=None, force=False, connect=True, **kwargs):
         """
         Add a server to the dictionary of computes controlled by this controller

gns3server/controller/appliance_manager.py

@@ -100,17 +100,9 @@ class ApplianceManager:
 
         dst_path = self._builtin_appliances_path(delete_first=True)
         log.info(f"Installing built-in appliances in '{dst_path}'")
+        from . import Controller
         try:
-            if hasattr(sys, "frozen") and sys.platform.startswith("win"):
-                resource_path = os.path.normpath(os.path.join(os.path.dirname(sys.executable), "appliances"))
-                for filename in os.listdir(resource_path):
-                    shutil.copy(os.path.join(resource_path, filename), os.path.join(dst_path, filename))
-            else:
-                for entry in importlib_resources.files('gns3server.appliances').iterdir():
-                    full_path = os.path.join(dst_path, entry.name)
-                    if entry.is_file():
-                        log.debug(f"Installing built-in appliance file {entry.name} to {full_path}")
-                        shutil.copy(str(entry), os.path.join(dst_path, entry.name))
+            Controller.instance().install_resource_files(dst_path, "appliances")
         except OSError as e:
             log.error(f"Could not install built-in appliance files to {dst_path}: {e}")
 

gns3server/controller/compute.py

@@ -450,7 +450,7 @@ class Compute:
                         elif response.type == aiohttp.WSMsgType.CLOSED:
                             pass
                         break
-        except aiohttp.client_exceptions.ClientResponseError as e:
+        except aiohttp.ClientError as e:
             log.error("Client response error received on compute '{}' WebSocket '{}': {}".format(self._id, ws_url,e))
         finally:
             self._connected = False

gns3server/controller/gns3vm/virtualbox_gns3_vm.py

@@ -122,9 +122,9 @@ class VirtualBoxGNS3VM(BaseGNS3VM):
                         continue
         return interface
 
-    async def _look_for_vboxnet(self, interface_number):
+    async def _look_for_vboxnet(self, backend_type, interface_number):
         """
-        Look for the VirtualBox network name associated with a host only interface.
+        Look for the VirtualBox network name associated with an interface.
 
         :returns: None or vboxnet name
         """
@@ -133,7 +133,7 @@ class VirtualBoxGNS3VM(BaseGNS3VM):
         for info in result.splitlines():
             if '=' in info:
                 name, value = info.split('=', 1)
-                if name == "hostonlyadapter{}".format(interface_number):
+                if name == "{}{}".format(backend_type, interface_number):
                     return value.strip('"')
         return None
 
@@ -159,7 +159,7 @@ class VirtualBoxGNS3VM(BaseGNS3VM):
                     return True
         return False
 
-    async def _check_vboxnet_exists(self, vboxnet):
+    async def _check_vboxnet_exists(self, vboxnet, vboxnet_type):
         """
         Check if the vboxnet interface exists
 
@@ -167,7 +167,7 @@ class VirtualBoxGNS3VM(BaseGNS3VM):
         :returns: boolean
         """
 
-        properties = await self._execute("list", ["hostonlyifs"])
+        properties = await self._execute("list", ["{}".format(vboxnet_type)])
         for prop in properties.splitlines():
             try:
                 name, value = prop.split(':', 1)
@@ -230,29 +230,42 @@ class VirtualBoxGNS3VM(BaseGNS3VM):
         if nat_interface_number < 0:
             raise GNS3VMError('VM "{}" must have a NAT interface configured in order to start'.format(self.vmname))
 
-        hostonly_interface_number = await self._look_for_interface("hostonly")
-        if hostonly_interface_number < 0:
-            raise GNS3VMError('VM "{}" must have a host-only interface configured in order to start'.format(self.vmname))
+        if sys.platform.startswith("darwin") and parse_version(self._system_properties["API version"]) >= parse_version("7_0"):
+            # VirtualBox 7.0+ on macOS requires a host-only network interface
+            backend_type = "hostonly-network"
+            backend_description = "host-only network"
+            vboxnet_type = "hostonlynets"
+            interface_number = await self._look_for_interface("hostonlynetwork")
+            if interface_number < 0:
+                raise GNS3VMError('VM "{}" must have a network adapter attached to a host-only network in order to start'.format(self.vmname))
+        else:
+            backend_type = "hostonlyadapter"
+            backend_description = "host-only adapter"
+            vboxnet_type = "hostonlyifs"
+            interface_number = await self._look_for_interface("hostonly")
 
-        vboxnet = await self._look_for_vboxnet(hostonly_interface_number)
+        if interface_number < 0:
+            raise GNS3VMError('VM "{}" must have a network adapter attached to a {} in order to start'.format(self.vmname, backend_description))
+
+        vboxnet = await self._look_for_vboxnet(backend_type, interface_number)
         if vboxnet is None:
-            raise GNS3VMError('A VirtualBox host-only network could not be found on network adapter {} for "{}"'.format(hostonly_interface_number, self._vmname))
+            raise GNS3VMError('A VirtualBox host-only network could not be found on network adapter {} for "{}"'.format(interface_number, self._vmname))
 
-        if not (await self._check_vboxnet_exists(vboxnet)):
+        if not (await self._check_vboxnet_exists(vboxnet, vboxnet_type)):
             if sys.platform.startswith("win") and vboxnet == "vboxnet0":
                 # The GNS3 VM is configured with vboxnet0 by default which is not available
                 # on Windows. Try to patch this with the first available vboxnet we find.
                 first_available_vboxnet = await self._find_first_available_vboxnet()
                 if first_available_vboxnet is None:
-                    raise GNS3VMError('Please add a VirtualBox host-only network with DHCP enabled and attached it to network adapter {} for "{}"'.format(hostonly_interface_number, self._vmname))
-                await self.set_hostonly_network(hostonly_interface_number, first_available_vboxnet)
+                    raise GNS3VMError('Please add a VirtualBox host-only network with DHCP enabled and attached it to network adapter {} for "{}"'.format(interface_number, self._vmname))
+                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,
-                                                                                                                                                                         hostonly_interface_number,
+                                                                                                                                                                         interface_number,
                                                                                                                                                                          self._vmname))
 
-        if not (await self._check_dhcp_server(vboxnet)):
+        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))
 
         vm_state = await self._get_state()
@@ -296,7 +309,7 @@ class VirtualBoxGNS3VM(BaseGNS3VM):
         await self._execute("controlvm", [self._vmname, "natpf{}".format(nat_interface_number),
                                                "GNS3VM,tcp,{},{},,{}".format(ip_address, api_port, self.port)])
 
-        self.ip_address = await self._get_ip(hostonly_interface_number, api_port)
+        self.ip_address = await self._get_ip(interface_number, api_port)
         log.info("GNS3 VM has been started with IP {}".format(self.ip_address))
         self.running = True
 

gns3server/controller/node.py

@@ -15,6 +15,7 @@
 # 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 ipaddress
 import aiohttp
 import asyncio
 import html
@@ -716,6 +717,17 @@ class Node:
                 "first_port_name": self._first_port_name,
                 "custom_adapters": self._custom_adapters
             }
+
+        # add brackets around console host for http/https console type
+        console_host = str(self._compute.console_host)
+        if self._console_type == "http" or self._console_type == "https":
+            try:
+                ip = ipaddress.ip_address(console_host)
+                if isinstance(ip, ipaddress.IPv6Address):
+                        console_host = '[' + console_host + ']'
+            except ValueError:
+                pass
+
         return {
             "compute_id": str(self._compute.id),
             "project_id": self._project.id,
@@ -725,7 +737,7 @@ class Node:
             "node_directory": self._node_directory,
             "name": self._name,
             "console": self._console,
-            "console_host": str(self._compute.console_host),
+            "console_host": console_host,
             "console_type": self._console_type,
             "console_auto_start": self._console_auto_start,
             "command_line": self._command_line,

gns3server/controller/project.py

@@ -798,7 +798,7 @@ class Project:
             try:
                 await compute.post("/projects/{}/close".format(self._id), dont_connect=True)
             # We don't care if a compute is down at this step
-            except (ComputeError, aiohttp.web.HTTPError, aiohttp.ClientResponseError, TimeoutError):
+            except (ComputeError, aiohttp.web.HTTPError, aiohttp.ClientError, TimeoutError):
                 pass
         self._clean_pictures()
         self._status = "closed"

gns3server/crash_report.py

@@ -58,7 +58,7 @@ class CrashReport:
     Report crash to a third party service
     """
 
-    DSN = "https://5eb3c88b4e4949d985a6c4c71157b9c3@o19455.ingest.sentry.io/38482"
+    DSN = "https://7c34b76e7d244ce88fba19f40d283e09@o19455.ingest.sentry.io/38482"
     _instance = None
 
     def __init__(self):

gns3server/handlers/api/controller/node_handler.py

@@ -29,6 +29,9 @@ from gns3server.schemas.node import (
     NODE_DUPLICATE_SCHEMA
 )
 
+import logging
+log = logging.getLogger(__name__)
+
 
 class NodeHandler:
     """
@@ -500,6 +503,8 @@ class NodeHandler:
                             await ws.send_bytes(msg.data)
                         elif msg.type == aiohttp.WSMsgType.ERROR:
                             break
+        except ConnectionResetError:
+            log.info("Websocket console connection with compute disconnected")
         finally:
             if not ws.closed:
                 await ws.close()

gns3server/handlers/api/controller/template_handler.py

@@ -169,6 +169,7 @@ class TemplateHandler:
         node = await project.add_node_from_template(request.match_info["template_id"],
                                                     x=request.json["x"],
                                                     y=request.json["y"],
+                                                    name=request.json.get("name"),
                                                     compute_id=request.json.get("compute_id"))
         response.set_status(201)
         response.json(node)

gns3server/schemas/qemu_template.py

@@ -35,7 +35,7 @@ QEMU_TEMPLATE_PROPERTIES = {
     "platform": {
         "description": "Platform to emulate",
         "enum": QEMU_PLATFORMS,
-        "default": "i386"
+        "default": ""
     },
     "linked_clone": {
         "description": "Whether the VM is a linked clone or not",

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/26.52bf50eec59e1bcb0895.js

@@ -1 +0,0 @@
-"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.isDragginLine truncated

gns3server/static/web-ui/index.html

@@ -46,6 +46,6 @@
 
       gtag('config', 'G-5D6FZL9923');
     </script>
-  <script src="runtime.91a209cf21f6fb848205.js" defer></script><script src="polyfills-es5.865074f5cd9a121111a2.js" nomodule defer></script><script src="polyfills.2f91a039d848e57ff02e.js" defer></script><script src="main.b8506a62709d0cc9f214.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.8448c96e4facbe79a613.js" defer></script>
 
 </body></html>

gns3server/static/web-ui/main.8448c96e4facbe79a613.js

@@ -1 +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
+(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.91a209cf21f6fb848205.js

@@ -1 +0,0 @@
-!function(){"use strict";var e,v={},g={};function n(e){var u=g[e];if(void 0!==u)return u.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(u,t,a,o){if(!t){var r=1/0;for(i=0;i<e.length;i++){t=e[i][0],a=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=a();void 0!==s&&(u=s)}}return u}o=o||0;for(var i=e.length;i>0&&e[i-1][2]>o;i--)e[i]=e[i-1];e[i]=[t,a,o]},n.n=function(e){var u=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(u,{a:u}),u},n.d=function(e,u){for(var t in u)n.o(u,t)&&!n.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:u[t]})},n.f={},n.e=function(e){return Promise.all(Object.keys(n.f).reduce(function(u,t){return n.f[t](e,u),u},[]))},n.u=function(e){return e+".52bf50eec59e1bcb0895.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,u){return Object.prototype.hasOwnProperty.call(e,u)},function(){var e={},u="gns3-web-ui:";n.l=function(t,a,o,i){if(e[t])e[t].push(a);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")==u+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",u+o),r.src=n.tu(t)),e[t]=[a];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(u){return void 0===e&&(e={createScriptURL:function(t){return t}},"undefined"!=typeof trustedTypes&&trustedTypes.createPolicy&&(e=trustedTypes.createPolicy("angular#bundler",e))),e.createScriptURL(u)}}(),n.p="",function(){var e={666:0};n.f.j=function(a,o){var i=n.o(e,a)?e[a]:void 0;if(0!==i)if(i)o.push(i[2]);else if(666!=a){var r=new Promise(function(c,d){i=e[a]=[c,d]});o.push(i[2]=r);var l=n.p+n.u(a),f=new Error;n.l(l,function(c){if(n.o(e,a)&&(0!==(i=e[a])&&(e[a]=void 0),i)){var d=c&&("load"===c.type?"missing":c.type),p=c&&c.target&&c.target.src;f.message="Loading chunk "+a+" failed.\n("+d+": "+p+")",f.name="ChunkLoadError",f.type=d,f.request=p,i[1](f)}},"chunk-"+a,a)}else e[a]=0},n.O.j=function(a){return 0===e[a]};var u=function(a,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(a&&a(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(u.bind(null,0)),t.push=u.bind(null,t.push.bind(t))}()}();

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/asyncio/__init__.py

@@ -71,10 +71,10 @@ async def subprocess_check_output(*args, cwd=None, env=None, stderr=False):
 
     if stderr:
         proc = await asyncio.create_subprocess_exec(*args, stderr=asyncio.subprocess.PIPE, cwd=cwd, env=env)
-        output = await proc.stderr.read()
+        _, output = await proc.communicate()
     else:
         proc = await asyncio.create_subprocess_exec(*args, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.DEVNULL, cwd=cwd, env=env)
-        output = await proc.stdout.read()
+        output, _ = await proc.communicate()
     if output is None:
         return ""
     # If we received garbage we ignore invalid characters

gns3server/utils/asyncio/telnet_server.py

@@ -203,8 +203,7 @@ class AsyncioTelnetServer:
         except ConnectionError:
             async with self._lock:
                 network_writer.close()
-                if sys.version_info >= (3, 7, 0):
-                    await network_writer.wait_closed()
+                # await network_writer.wait_closed()  # this doesn't work in Python 3.6
                 if self._reader_process == network_reader:
                     self._reader_process = None
                     # Cancel current read from this reader
@@ -220,8 +219,7 @@ class AsyncioTelnetServer:
                 writer.write_eof()
                 await writer.drain()
                 writer.close()
-                if sys.version_info >= (3, 7, 0):
-                    await writer.wait_closed()
+                # await writer.wait_closed()  # this doesn't work in Python 3.6
             except (AttributeError, ConnectionError):
                 continue
 

gns3server/utils/images.py

@@ -26,11 +26,11 @@ import logging
 log = logging.getLogger(__name__)
 
 
-def list_images(type):
+def list_images(emulator_type):
     """
-    Scan directories for available image for a type
+    Scan directories for available image for a given emulator type
 
-    :param type: emulator type (dynamips, qemu, iou)
+    :param emulator_type: emulator type (dynamips, qemu, iou)
     """
     files = set()
     images = []
@@ -38,10 +38,10 @@ def list_images(type):
     server_config = Config.instance().get_section_config("Server")
     general_images_directory = os.path.expanduser(server_config.get("images_path", "~/GNS3/images"))
 
-    # Subfolder of the general_images_directory specific to this VM type
-    default_directory = default_images_directory(type)
+    # Subfolder of the general_images_directory specific to this emulator type
+    default_directory = default_images_directory(emulator_type)
 
-    for directory in images_directories(type):
+    for directory in images_directories(emulator_type):
 
         # We limit recursion to path outside the default images directory
         # the reason is in the default directory manage file organization and
@@ -57,9 +57,9 @@ def list_images(type):
                 if filename not in files:
                     if filename.endswith(".md5sum") or filename.startswith("."):
                         continue
-                    elif ((filename.endswith(".image") or filename.endswith(".bin")) and type == "dynamips") \
-                            or ((filename.endswith(".bin") or filename.startswith("i86bi")) and type == "iou") \
-                            or (not filename.endswith(".bin") and not filename.endswith(".image") and type == "qemu"):
+                    elif ((filename.endswith(".image") or filename.endswith(".bin")) and emulator_type == "dynamips") \
+                            or ((filename.endswith(".bin") or filename.startswith("i86bi")) and emulator_type == "iou") \
+                            or (not filename.endswith(".bin") and not filename.endswith(".image") and emulator_type == "qemu"):
                         files.add(filename)
 
                         # It the image is located in the standard directory the path is relative
@@ -69,7 +69,7 @@ def list_images(type):
                             path = os.path.relpath(os.path.join(root, filename), default_directory)
 
                         try:
-                            if type in ["dynamips", "iou"]:
+                            if emulator_type in ["dynamips", "iou"]:
                                 with open(os.path.join(root, filename), "rb") as f:
                                     # read the first 7 bytes of the file.
                                     elf_header_start = f.read(7)
@@ -102,34 +102,34 @@ def _os_walk(directory, recurse=True, **kwargs):
         yield directory, [], files
 
 
-def default_images_directory(type):
+def default_images_directory(emulator_type):
     """
     :returns: Return the default directory for a node type
     """
     server_config = Config.instance().get_section_config("Server")
     img_dir = os.path.expanduser(server_config.get("images_path", "~/GNS3/images"))
-    if type == "qemu":
+    if emulator_type == "qemu":
         return os.path.join(img_dir, "QEMU")
-    elif type == "iou":
+    elif emulator_type == "iou":
         return os.path.join(img_dir, "IOU")
-    elif type == "dynamips":
+    elif emulator_type == "dynamips":
         return os.path.join(img_dir, "IOS")
     else:
-        raise NotImplementedError("%s node type is not supported", type)
+        raise NotImplementedError("%s node type is not supported", emulator_type)
 
 
-def images_directories(type):
+def images_directories(emulator_type):
     """
     Return all directories where we will look for images
     by priority
 
-    :param type: Type of emulator
+    :param emulator_type: Type of emulator
     """
     server_config = Config.instance().get_section_config("Server")
 
     paths = []
     img_dir = os.path.expanduser(server_config.get("images_path", "~/GNS3/images"))
-    type_img_directory = default_images_directory(type)
+    type_img_directory = default_images_directory(emulator_type)
     try:
         os.makedirs(type_img_directory, exist_ok=True)
         paths.append(type_img_directory)

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

requirements.txt

@@ -1,15 +1,15 @@
 jsonschema>=4.17.3,<4.18; python_version >= '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.3,<3.9
+aiohttp>=3.8.4,<3.9
 aiohttp-cors>=0.7.0,<0.8
 aiofiles>=22.1.0,<22.2; 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.12.1,<1.13
+sentry-sdk==1.17.0,<1.18
 psutil==5.9.4
 async-timeout>=4.0.2,<4.1
-distro>=1.7.0
+distro>=1.8.0
 py-cpuinfo>=9.0.0,<10.0
 importlib-resources>=1.3; python_version <= '3.9'
 setuptools>=60.8.1; python_version >= '3.7'

scripts/remote-install.sh

@@ -26,6 +26,7 @@ function help {
   echo "--with-openvpn: Install OpenVPN" >&2
   echo "--with-iou: Install IOU" >&2
   echo "--with-i386-repository: Add the i386 repositories required by IOU if they are not already available on the system. Warning: this will replace your source.list in order to use the official Ubuntu mirror" >&2
+  echo "--with-welcome: Install GNS3-VM welcome.py script" >&2
   echo "--without-kvm: Disable KVM, required if system do not support it (limitation in some hypervisors and cloud providers). Warning: only disable KVM if strictly necessary as this will degrade performance" >&2
   echo "--unstable: Use the GNS3 unstable repository"
   echo "--help: This help" >&2
@@ -48,8 +49,9 @@ USE_IOU=0
 I386_REPO=0
 DISABLE_KVM=0
 UNSTABLE=0
+WELCOME_SETUP=0
 
-TEMP=`getopt -o h --long with-openvpn,with-iou,with-i386-repository,without-kvm,unstable,help -n 'gns3-remote-install.sh' -- "$@"`
+TEMP=`getopt -o h --long with-openvpn,with-iou,with-i386-repository,with-welcome,without-kvm,unstable,help -n 'gns3-remote-install.sh' -- "$@"`
 if [ $? != 0 ]
 then
   help
@@ -72,6 +74,10 @@ while true ; do
           I386_REPO=1
           shift
           ;;
+        --with-welcome)
+          WELCOME_SETUP=1
+          shift
+          ;;
         --without-kvm)
           DISABLE_KVM=1
           shift
@@ -159,7 +165,7 @@ apt-get install -y gns3-server
 log "Create user GNS3 with /opt/gns3 as home directory"
 if [ ! -d "/opt/gns3/" ]
 then
-  useradd -d /opt/gns3/ -m gns3
+  useradd -m -d /opt/gns3/ gns3
 fi
 
 
@@ -296,6 +302,37 @@ fi
 
 log "GNS3 installed with success"
 
+if [ $WELCOME_SETUP == 1 ]
+then
+NEEDRESTART_MODE=a apt-get install -y net-tools
+NEEDRESTART_MODE=a apt-get install -y python3-pip
+NEEDRESTART_MODE=a apt-get install -y dialog
+pip install --no-input --upgrade pip
+pip install --no-input pythondialog
+
+#Pull down welcome script from repo
+curl https://raw.githubusercontent.com/GNS3/gns3-server/master/scripts/welcome.py > /usr/local/bin/welcome.py
+
+chmod 755 /usr/local/bin/welcome.py
+chown gns3:gns3 /usr/local/bin/welcome.py
+
+mkdir /etc/systemd/system/getty@tty1.service.d
+cat <<EOFI > /etc/systemd/system/getty@tty1.service.d/override.conf
+[Service]
+ExecStart=
+ExecStart=-/sbin/agetty -a gns3 --noclear %I \$TERM
+EOFI
+
+chmod 755 /etc/systemd/system/getty@tty1.service.d/override.conf
+chown root:root /etc/systemd/system/getty@tty1.service.d/override.conf
+
+echo "python3 /usr/local/bin/welcome.py" >> /opt/gns3/.bashrc
+echo "gns3:gns3" | chpasswd
+usermod --shell /bin/bash gns3
+usermod -aG sudo gns3
+
+fi
+
 if [ $USE_VPN == 1 ]
 then
 log "Setup VPN"
@@ -417,3 +454,12 @@ service gns3 start
 log "Download http://$MY_IP_ADDR:8003/$UUID/$HOSTNAME.ovpn to setup your OpenVPN client after rebooting the server"
 
 fi
+
+if [ $WELCOME_SETUP == 1 ]
+then
+NEEDRESTART_MODE=a apt-get update
+NEEDRESTART_MODE=a apt-get upgrade
+python3 -c 'import sys; sys.path.append("/usr/local/bin/"); import welcome; ws = welcome.Welcome_dialog(); ws.repair_remote_install()'
+cd /opt/gns3
+su gns3
+fi

scripts/welcome.py

@@ -0,0 +1,479 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2015 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/>.
+
+import locale
+import re
+import os
+import sys
+import time
+import subprocess
+import configparser
+from json import loads as convert
+import urllib.request
+from dialog import Dialog, PythonDialogBug
+
+
+class Welcome_dialog:
+    def __init__(self):
+        try:
+            locale.setlocale(locale.LC_ALL, '')
+        except locale.Error:
+            # Not supported via SSH
+            pass
+        self.display = Dialog(dialog="dialog", autowidgetsize=True)
+        if self.gns3_version() is None:
+            self.display.set_background_title("GNS3")
+        else:
+            self.display.set_background_title("GNS3 {}".format(self.gns3_version()))
+
+    def get_ip(self):
+        """
+        Return the active IP
+        """
+        #request 'ip addr' data in JSON format from shell
+        ip_addr_response = subprocess.run(['ip', '--json', 'addr'],capture_output=True)
+        
+        #process response, decode and use json.loads to convert the string to a dict
+        ip_addr_data = convert(ip_addr_response.stdout.decode("utf-8"))
+        
+        #search ip_addr_data for the first ip adress that is not under a virtual bridge or loopback interface
+        for i in ip_addr_data:
+            if ('virbr' in i['ifname']) or ('lo' in i['ifname']):
+                continue
+            try:
+                if 'UP' in i['flags']:
+                    ip_addr = i['addr_info'][0]['local']
+                    break
+            except:
+                continue
+            ip_addr = None
+            
+        return ip_addr
+
+    def repair_remote_install(self):
+        """
+        This method is only called by remote-install.sh during setup to ensure it is setting the same IP as shown by Dialog
+        """        
+        ip_addr = self.get_ip()
+        subprocess.run(["sed", "-i", f"s/host = 0.0.0.0/host = {ip_addr}/", "/etc/gns3/gns3_server.conf"],capture_output=False)
+        subprocess.run(["service", "gns3", "stop"],capture_output=False)
+        subprocess.run(["service", "gns3", "start"],capture_output=False)
+
+
+    def get_config(self):
+        """
+        Read the config
+        """
+        config = configparser.RawConfigParser()
+        path = os.path.expanduser("~/.config/GNS3/gns3_server.conf")
+        config.read([path], encoding="utf-8")
+        return config
+
+
+    def write_config(self, config):
+        """
+        Write the config file
+        """
+
+        with open(os.path.expanduser("~/.config/GNS3/gns3_server.conf"), 'w') as f:
+            config.write(f)
+
+
+    def gns3_major_version(self):
+        """
+        Returns the GNS3 major server version
+        """
+
+        version = self.gns3_version()
+        if version:
+            match = re.search(r"\d+.\d+", version)
+            return match.group(0)
+        return ""
+
+
+    def gns3_version(self):
+        """
+        Return the GNS3 server version
+        """
+        try:
+            return subprocess.check_output(["gns3server", "--version"]).strip().decode()
+        except (subprocess.CalledProcessError, FileNotFoundError):
+            return None
+
+
+    def gns3vm_version(self):
+        """
+        Return the GNS3 VM version
+        """
+        try:
+            with open('/home/gns3/.config/GNS3/gns3vm_version') as f:
+                return f.read().strip()
+        except FileNotFoundError:
+            return "Remote Install"
+
+
+    def mode(self):
+        if self.display.yesno("This feature is for testers only. You may break your GNS3 installation. Are you REALLY sure you want to continue?", yes_label="Exit (Safe option)", no_label="Continue") == self.display.OK:
+            return
+        code, tag = self.display.menu("Select the GNS3 version",
+                        choices=[("2.1", "Stable release for this GNS3 VM (RECOMMENDED)"),
+                                    ("2.1dev", "Development version for stable release"),
+                                    ("2.2", "Latest stable release")])
+        self.display.clear()
+        if code == Dialog.OK:
+            os.makedirs(os.path.expanduser("~/.config/GNS3"), exist_ok=True)
+            with open(os.path.expanduser("~/.config/GNS3/gns3_release"), "w+") as f:
+                f.write(tag)
+
+            self.update(force=True)
+
+
+    def get_release(self):
+        try:
+            with open(os.path.expanduser("~/.config/GNS3/gns3_release")) as f:
+                content = f.read()
+
+                # Support old VM versions
+                if content == "stable":
+                    content = "1.5"
+                elif content == "testing":
+                    content = "1.5"
+                elif content == "unstable":
+                    content = "1.5dev"
+
+                return content
+        except OSError:
+            return "1.5"
+
+
+    def update(self, force=False):
+        if not force:
+            if self.display.yesno("PLEASE SNAPSHOT THE VM BEFORE RUNNING THE UPGRADE IN CASE OF FAILURE. The server will reboot at the end of the upgrade process. Continue?") != self.display.OK:
+                return
+        release = self.get_release()
+        if release == "2.2":
+            if self.display.yesno("It is recommended to run GNS3 version 2.2 with lastest GNS3 VM based on Ubuntu 18.04 LTS, please download this VM from our website or continue at your own risk!") != self.display.OK:
+                return
+        if release.endswith("dev"):
+            ret = os.system("curl -Lk https://raw.githubusercontent.com/GNS3/gns3-vm/unstable/scripts/update_{}.sh > /tmp/update.sh && bash -x /tmp/update.sh".format(release))
+        else:
+            ret = os.system("curl -Lk https://raw.githubusercontent.com/GNS3/gns3-vm/master/scripts/update_{}.sh > /tmp/update.sh && bash -x /tmp/update.sh".format(release))
+        if ret != 0:
+            print("ERROR DURING UPGRADE PROCESS PLEASE TAKE A SCREENSHOT IF YOU NEED SUPPORT")
+            time.sleep(15)
+
+
+    def migrate(self):
+        """
+        Migrate GNS3 VM data.
+        """
+
+        code, option = self.display.menu("Select an option",
+                            choices=[("Setup", "Configure this VM to send data to another GNS3 VM"),
+                                    ("Send", "Send images and projects to another GNS3 VM")])
+        self.display.clear()
+        if code == Dialog.OK:
+            (answer, destination) = self.display.inputbox("What is IP address or hostname of the other GNS3 VM?", init="172.16.1.128")
+            if answer != self.display.OK:
+                return
+            if destination == self.get_ip():
+                self.display.msgbox("The destination cannot be the same as this VM IP address ({})".format(destination))
+                return
+            if option == "Send":
+                # first make sure they are no files belonging to root
+                os.system("sudo chown -R gns3:gns3 /opt/gns3")
+                # then rsync the data
+                command = r"rsync -az --progress -e 'ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /home/gns3/.ssh/gns3-vm-key' /opt/gns3 gns3@{}:/opt".format(destination)
+                ret = os.system('bash -c "{}"'.format(command))
+                time.sleep(10)
+                if ret != 0:
+                    self.display.msgbox("Could not send data to the other GNS3 VM located at {}".format(destination))
+                else:
+                    self.display.msgbox("Images and projects have been successfully sent to the other GNS3 VM located at {}".format(destination))
+            elif option == "Setup":
+                script = """
+    if [ ! -f ~/.ssh/gns3-vm-key ]
+    then
+        ssh-keygen -f ~/.ssh/gns3-vm-key -N '' -C gns3@{}
+    fi
+    ssh-copy-id -i ~/.ssh/gns3-vm-key gns3@{}
+    """.format(self.get_ip(), destination)
+                ret = os.system('bash -c "{}"'.format(script))
+                time.sleep(10)
+                if ret != 0:
+                    self.display.msgbox("Error while setting up the migrate feature")
+                else:
+                    self.display.msgbox("Configuration successful, you can now send data to the GNS3 VM located at {} without password".format(destination))
+
+
+    def shrink_disk(self):
+
+        ret = os.system("lspci | grep -i vmware")
+        if ret != 0:
+            self.display.msgbox("Shrinking the disk is only supported when running inside VMware")
+            return
+
+        if self.display.yesno("Would you like to shrink the VM disk? The VM will reboot at the end of the process. Continue?") != self.display.OK:
+            return
+
+        os.system("sudo service gns3 stop")
+        os.system("sudo service docker stop")
+        os.system("sudo vmware-toolbox-cmd disk shrink /opt")
+        os.system("sudo vmware-toolbox-cmd disk shrink /")
+
+        self.display.msgbox("The GNS3 VM will reboot")
+        os.execvp("sudo", ['/usr/bin/sudo', "reboot"])
+
+    def vm_information(self):
+        """
+        Show IP, SSH settings....
+        """
+
+        content = "Welcome to GNS3 appliance\n\n"
+
+        version = self.gns3_version()
+        if version is None:
+            content += "GNS3 is not installed please install it with sudo pip3 install gns3-server. Or download a preinstalled VM.\n\n"
+        else:
+            content = "GNS3 version: {gns3_version}\nVM version: {gns3vm_version}\nKVM support available: {kvm}\n\n".format(
+                gns3vm_version=self.gns3vm_version(),
+                gns3_version=version,
+                kvm=self.kvm_support())
+
+        ip = self.get_ip()
+
+        if ip:
+            content += f"""
+IP:     {ip}
+Web UI: http://{ip}:3080
+
+To log in using SSH:
+ssh gns3@{ip}
+Password: gns3
+
+Images and projects are located in /opt/gns3
+""".strip()
+
+        else:
+            content += "eth0 is not configured. Please manually configure it via the Networking menu."
+
+        content += "\n\nRelease channel: " + self.get_release()
+
+        try:
+            self.display.msgbox(content)
+        # If it's an scp command or any bugs
+        except:
+            os.execvp("bash", ['/bin/bash'])
+
+
+    def check_internet_connectivity(self):
+        self.display.pause("Please wait...\n\n")
+        try:
+            response = urllib.request.urlopen('http://pypi.python.org/', timeout=5)
+        except urllib.request.URLError as err:
+            self.display.infobox("Can't connect to Internet (pypi.python.org): {}".format(str(err)))
+            time.sleep(15)
+            return
+        self.display.infobox("Connection to Internet: OK")
+        time.sleep(2)
+
+
+    def keyboard_configuration():
+        """
+        Allow user to change the keyboard layout
+        """
+        os.system("/usr/bin/sudo dpkg-reconfigure keyboard-configuration")
+
+
+    def set_security(self):
+        config = self.get_config()
+        if self.display.yesno("Enable server authentication?") == self.display.OK:
+            if not config.has_section("Server"):
+                config.add_section("Server")
+            config.set("Server", "auth", True)
+            (answer, text) = self.display.inputbox("Login?")
+            if answer != self.display.OK:
+                return
+            config.set("Server", "user", text)
+            (answer, text) = self.display.passwordbox("Password?")
+            if answer != self.display.OK:
+                return
+            config.set("Server", "password", text)
+        else:
+            config.set("Server", "auth", False)
+
+        self.write_config(config)
+
+
+    def log(self):
+        os.system("/usr/bin/sudo chmod 755 /var/log/upstart/gns3.log")
+        with open("/var/log/upstart/gns3.log") as f:
+            try:
+                while True:
+                    line = f.readline()
+                    sys.stdout.write(line)
+            except (KeyboardInterrupt, MemoryError):
+                return
+
+
+    def edit_config(self):
+        """
+        Edit GNS3 configuration file
+        """
+
+        major_version = self.gns3_major_version()
+        if major_version == "2.2":
+            os.system("nano ~/.config/GNS3/{}/gns3_server.conf".format(major_version))
+        else:
+            os.system("nano ~/.config/GNS3/gns3_server.conf")
+
+
+    def edit_network(self):
+        """
+        Edit network configuration file
+        """
+        if self.display.yesno("The server will reboot at the end of the process. Continue?") != self.display.OK:
+            return
+        os.system("sudo nano /etc/network/interfaces")
+        os.execvp("sudo", ['/usr/bin/sudo', "reboot"])
+
+
+    def edit_proxy(self):
+        """
+        Configure proxy settings
+        """
+        res, http_proxy = self.display.inputbox(text="HTTP proxy string, for example http://<user>:<password>@<proxy>:<port>. Leave empty for no proxy.")
+        if res != self.display.OK:
+            return
+        res, https_proxy = self.display.inputbox(text="HTTPS proxy string, for example http://<user>:<password>@<proxy>:<port>. Leave empty for no proxy.")
+        if res != self.display.OK:
+            return
+
+        with open('/tmp/00proxy', 'w+') as f:
+            f.write('Acquire::http::Proxy "' + http_proxy + '";')
+        os.system("sudo mv /tmp/00proxy /etc/apt/apt.conf.d/00proxy")
+        os.system("sudo chown root /etc/apt/apt.conf.d/00proxy")
+        os.system("sudo chmod 744 /etc/apt/apt.conf.d/00proxy")
+
+        with open('/tmp/proxy.sh', 'w+') as f:
+            f.write('export http_proxy="' + http_proxy + '"\n')
+            f.write('export https_proxy="' + https_proxy + '"\n')
+            f.write('export HTTP_PROXY="' + http_proxy + '"\n')
+            f.write('export HTTPS_PROXY="' + https_proxy + '"\n')
+        os.system("sudo mv /tmp/proxy.sh /etc/profile.d/proxy.sh")
+        os.system("sudo chown root /etc/profile.d/proxy.sh")
+        os.system("sudo chmod 744 /etc/profile.d/proxy.sh")
+        os.system("sudo cp /etc/profile.d/proxy.sh /etc/default/docker")
+
+        self.display.msgbox("The GNS3 VM will reboot")
+        os.execvp("sudo", ['/usr/bin/sudo', "reboot"])
+
+
+    def kvm_support(self):
+        """
+        Returns true if KVM is available
+        """
+        return subprocess.call("kvm-ok") == 0
+
+
+    def kvm_control(self):
+        """
+        Check if KVM is correctly configured
+        """
+
+        kvm_ok = self.kvm_support()
+        config = self.get_config()
+        try:
+            if config.getboolean("Qemu", "enable_kvm") is True:
+                if kvm_ok is False:
+                    if self.display.yesno("KVM is not available!\n\nQemu VM will crash!!\n\nThe reason could be unsupported hardware or another virtualization solution is already running.\n\nDisable KVM and get lower performances?") == self.display.OK:
+                        config.set("Qemu", "enable_kvm", False)
+                        self.write_config(config)
+                        os.execvp("sudo", ['/usr/bin/sudo', "reboot"])
+            else:
+                if kvm_ok is True:
+                    if self.display.yesno("KVM is available on your computer.\n\nEnable KVM and get better performances?") == self.display.OK:
+                        config.set("Qemu", "enable_kvm", True)
+                        self.write_config(config)
+                        os.execvp("sudo", ['/usr/bin/sudo', "reboot"])
+        except configparser.NoSectionError:
+            return
+
+
+    def display_loop(self):
+        try:
+            while True:
+                code, tag = self.display.menu("GNS3 {}".format(self.gns3_version()),
+                                choices=[("Information", "Display VM information"),
+                                    ("Upgrade", "Upgrade GNS3"),
+                                    ("Migrate", "Migrate data to another GNS3 VM"),
+                                    ("Shell", "Open a console"),
+                                    ("Security", "Configure authentication"),
+                                    ("Keyboard", "Change keyboard layout"),
+                                    ("Configure", "Edit server configuration (advanced users ONLY)"),
+                                    ("Proxy", "Configure proxy settings"),
+                                    ("Networking", "Configure networking settings"),
+                                    ("Log", "Show server log"),
+                                    ("Test", "Check internet connection"),
+                                    ("Shrink", "Shrink the VM disk"),
+                                    ("Version", "Select the GNS3 version"),
+                                    ("Restore", "Restore the VM (if you have trouble for upgrade)"),
+                                    ("Reboot", "Reboot the VM"),
+                                    ("Shutdown", "Shutdown the VM")])
+                self.display.clear()
+                if code == Dialog.OK:
+                    if tag == "Shell":
+                        os.execvp("bash", ['/bin/bash'])
+                    elif tag == "Version":
+                        self.mode()
+                    elif tag == "Restore":
+                        os.execvp("sudo", ['/usr/bin/sudo', "/usr/local/bin/gns3restore"])
+                    elif tag == "Reboot":
+                        os.execvp("sudo", ['/usr/bin/sudo', "reboot"])
+                    elif tag == "Shutdown":
+                        os.execvp("sudo", ['/usr/bin/sudo', "poweroff"])
+                    elif tag == "Upgrade":
+                        self.update()
+                    elif tag == "Information":
+                        self.vm_information()
+                    elif tag == "Log":
+                        self.log()
+                    elif tag == "Migrate":
+                        self.migrate()
+                    elif tag == "Configure":
+                        self.edit_config()
+                    elif tag == "Networking":
+                        self.edit_network()
+                    elif tag == "Security":
+                        self.set_security()
+                    elif tag == "Keyboard":
+                        self.keyboard_configuration()
+                    elif tag == "Test":
+                        self.check_internet_connectivity()
+                    elif tag == "Proxy":
+                        self.edit_proxy()
+                    elif tag == "Shrink":
+                        self.shrink_disk()
+        except KeyboardInterrupt:
+            sys.exit(0)
+
+if __name__ == "__main__":
+    ws = Welcome_dialog()
+    ws.vm_information()
+    ws.kvm_control()
+    ws.display_loop()

setup.py

@@ -76,6 +76,7 @@ setup(
     cmdclass={"test": PyTest},
     description="GNS3 server",
     long_description=open("README.md", "r").read(),
+    long_description_content_type="text/markdown",
     install_requires=dependencies,
     entry_points={
         "console_scripts": [

tests/compute/docker/test_docker_vm.py

@@ -222,6 +222,21 @@ async def test_create_with_extra_hosts(compute_project, manager):
         assert vm._extra_hosts == extra_hosts
 
 
+async def test_create_with_colon_in_project_name(compute_project, manager):
+
+    response = {
+        "Id": "e90e34656806",
+        "Warnings": []
+    }
+
+    with asyncio_patch("gns3server.compute.docker.Docker.list_images", return_value=[{"image": "ubuntu"}]):
+        with asyncio_patch("gns3server.compute.docker.Docker.query", return_value=response):
+            with patch("gns3server.compute.project.Project.node_working_directory", return_value="/tmp/test_:_/"):
+                vm = DockerVM("test", str(uuid.uuid4()), compute_project, manager, "ubuntu")
+                with pytest.raises(DockerError):
+                    await vm.create()
+
+
 async def test_create_with_extra_hosts_wrong_format(compute_project, manager):
     extra_hosts = "test"
 
@@ -1100,8 +1115,7 @@ async def test_close(vm, port_manager):
 async def test_close_vnc(vm):
 
     vm._console_type = "vnc"
-    vm._x11vnc_process = MagicMock()
-    vm._xvfb_process = MagicMock()
+    vm._vnc_process = MagicMock()
 
     with asyncio_patch("gns3server.compute.docker.DockerVM._get_container_state", return_value="stopped"):
         with asyncio_patch("gns3server.compute.docker.Docker.query") as mock_query:
@@ -1109,7 +1123,7 @@ async def test_close_vnc(vm):
         mock_query.assert_called_with("DELETE", "containers/e90e34656842", params={"force": 1, "v": 1})
 
     assert vm._closed is True
-    assert vm._xvfb_process.terminate.called
+    assert vm._vnc_process.terminate.called
 
 
 async def test_get_namespace(vm):

tests/compute/iou/test_iou_vm.py

@@ -102,6 +102,7 @@ async def test_start(vm):
 
     with asyncio_patch("asyncio.create_subprocess_exec", return_value=mock_process) as mock_exec:
         mock_process.returncode = None
+        mock_process.communicate = AsyncioMagicMock(return_value=(None, None))
         await vm.start()
         assert vm.is_running()
         assert vm.command_line == ' '.join(mock_exec.call_args[0])
@@ -130,6 +131,7 @@ async def test_start_with_iourc(vm, tmpdir):
     with patch("gns3server.config.Config.get_section_config", return_value={"iourc_path": fake_file}):
         with asyncio_patch("asyncio.create_subprocess_exec", return_value=mock_process) as exec_mock:
             mock_process.returncode = None
+            mock_process.communicate = AsyncioMagicMock(return_value=(None, None))
             await vm.start()
             assert vm.is_running()
             arsgs, kwargs = exec_mock.call_args
@@ -165,11 +167,12 @@ async def test_stop(vm):
     future = asyncio.Future()
     future.set_result(True)
     process.wait.return_value = future
+    process.returncode = None
+    process.communicate = AsyncioMagicMock(return_value=(None, None))
 
     with asyncio_patch("asyncio.create_subprocess_exec", return_value=process):
         with asyncio_patch("gns3server.utils.asyncio.wait_for_process_termination"):
             await vm.start()
-            process.returncode = None
             assert vm.is_running()
             await vm.stop()
             assert vm.is_running() is False
@@ -190,6 +193,7 @@ async def test_reload(vm, fake_iou_bin):
     future.set_result(True)
     process.wait.return_value = future
     process.returncode = None
+    process.communicate = AsyncioMagicMock(return_value=(None, None))
 
     with asyncio_patch("asyncio.create_subprocess_exec", return_value=process):
         with asyncio_patch("gns3server.utils.asyncio.wait_for_process_termination"):
@@ -202,10 +206,13 @@ async def test_reload(vm, fake_iou_bin):
 
 async def test_close(vm, port_manager):
 
+    process = MagicMock()
+    process.returncode = None
+    process.communicate = AsyncioMagicMock(return_value=(None, None))
     vm._start_ubridge = AsyncioMagicMock(return_value=True)
     vm._ubridge_send = AsyncioMagicMock()
     with asyncio_patch("gns3server.compute.iou.iou_vm.IOUVM._check_requirements", return_value=True):
-        with asyncio_patch("asyncio.create_subprocess_exec", return_value=MagicMock()):
+        with asyncio_patch("asyncio.create_subprocess_exec", return_value=process):
             await vm.start()
             port = vm.console
             await vm.close()

tests/compute/qemu/test_qemu_vm.py

@@ -409,7 +409,8 @@ 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")
-    options = await vm._build_command()
+    with patch("os.path.exists", return_value=True) as os_path:
+        options = await vm._build_command()
     assert '-chardev socket,id=chrtpm,path={}'.format(tpm_sock) in ' '.join(options)
     assert '-tpmdev emulator,id=tpm0,chardev=chrtpm' in ' '.join(options)
     assert '-device tpm-tis,tpmdev=tpm0' in ' '.join(options)
@@ -736,6 +737,20 @@ async def test_build_command_large_number_of_adapters(vm):
         await vm._build_command()
 
 
+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"
+    with asyncio_patch("asyncio.create_subprocess_exec", return_value=MagicMock()):
+        cmd = await vm._build_command()
+    assert "virtio-net-pci,mac=00:00:ab:0e:0f:09,speed=10000,duplex=full,netdev=gns3-0" in cmd
+
+
 @pytest.mark.skipif(sys.platform.startswith("win"), reason="Not supported on Windows")
 async def test_build_command_with_invalid_options(vm):
 

tests/controller/test_controller.py

@@ -395,6 +395,31 @@ async def test_install_base_configs(controller, config, tmpdir):
         assert f.read() == 'test'
 
 
+@pytest.mark.parametrize(
+    "builtin_disk",
+    [
+        "empty8G.qcow2",
+        "empty10G.qcow2",
+        "empty20G.qcow2",
+        "empty30G.qcow2",
+        "empty40G.qcow2",
+        "empty50G.qcow2",
+        "empty100G.qcow2",
+        "empty150G.qcow2",
+        "empty200G.qcow2",
+        "empty250G.qcow2",
+        "empty500G.qcow2",
+        "empty1T.qcow2"
+    ]
+)
+async def test_install_builtin_disks(controller, config, tmpdir, builtin_disk):
+
+    config.set_section_config("Server", {"images_path": str(tmpdir)})
+    controller._install_builtin_disks()
+    # we only install Qemu empty disks at this time
+    assert os.path.exists(str(tmpdir / "QEMU" / builtin_disk))
+
+
 def test_appliances(controller, tmpdir):
 
     my_appliance = {

tests/handlers/api/controller/test_template.py

@@ -952,6 +952,6 @@ async def test_create_node_from_template(controller_api, controller, project):
             "x": 42,
             "y": 12
         })
-    mock.assert_called_with(id, x=42, y=12, compute_id=None)
+    mock.assert_called_with(id, x=42, y=12, name=None, compute_id=None)
     assert response.route == "/projects/{project_id}/templates/{template_id}"
     assert response.status == 201