Release v2.1.19

Sync appliances.
Remove yarl from requirements.txt since it is installed by aiohttp.
2026-11-13 18:35:15 +02:00 · 2019-05-28 15:23:35 +07:00 · 2019-05-28 10:37:43 +07:00 · 2019-05-27 18:10:46 +07:00 · 2019-05-27 17:57:37 +07:00 · 2019-05-27 17:38:16 +07:00
177 changed files with 4681 additions and 1060 deletions
@@ -30,3 +30,4 @@ env:
    - PYTHON_VERSION=3.4
    - PYTHON_VERSION=3.5
    - PYTHON_VERSION=3.6
+    - PYTHON_VERSION=3.7
@@ -1,5 +1,96 @@
 # Change Log

+## 2.1.19 28/05/2019
+
+* Sync appliances.
+* Remove yarl from requirements.txt since it is installed by aiohttp.
+* Drop typing dependency.
+
+## 2.1.18 22/05/2019
+
+* Revert "Force aiohttp version to 2.3.10 and aiohttp-cors version to 0.5.3" Ref https://github.com/GNS3/gns3-server/issues/1583 Ref https://github.com/GNS3/gns3-server/issues/1592
+* Fix invalid reStructuredText for long description in setup.py
+
+## 2.1.17 17/05/2019
+
+* Force aiohttp version to 2.3.10 and aiohttp-cors version to 0.5.3 This is to fix build issue for Ubuntu 19.04 package on Launchpad. Ref #1583 https://github.com/GNS3/gns3-gui/issues/2774
+
+## 2.1.16 15/04/2019
+
+* Fix broken embedded console for Ethernet switch. Fixes #1574
+* Remove old unused argument option. Fixes #1569
+
+## 2.1.15 21/03/2019
+
+* Fix IOU symlink issue on remote servers.
+* Fix vcpus configuration for GNS3 VM on VMware. Ref #2738.
+
+## 2.1.14 27/02/2019
+
+* Fix issue when setting cpuid.corespersocket for the GNS3 VM. Fixes https://github.com/GNS3/gns3-gui/issues/2723
+* Bump ACPI Shutdown Timeout to 120 seconds. Ref #1536
+
+## 2.1.13 26/02/2019
+
+* Force jsonschema dependency to 2.6.0
+* Less aggressive connections to uBridge. Ref #1289
+* Fix topology images (Pictures) disappearing from projects. Fixes #1514.
+* Reset MAC addresses when duplicating a project. Fixes #1522
+* Fix API call to create a node from an appliance doesn't return the new node data. Fixes #1527
+* Detect invalid environment variable and send a warning when creating a Docker node. Ref #2683
+* Do not export/import symlinks for projects. Fixes #2699
+* Fix symlink not being created for duplicated IOU devices. Fixes https://github.com/GNS3/gns3-gui/issues/2699
+* Configure coresPerSocket value in VMX file for the GNS3 VM. Fixes https://github.com/GNS3/gns3-gui/issues/2688
+* Count logical CPUs to detect if the number of vCPUs is too high when configuring the GNS3 VM. Fixes #2688.
+* Add explicit error when trying to pull a Docker image from Docker Hub without Internet access. Fixes #1506.
+* Fixes double display output in GRUB in QEMU v3.1. Fixes #1516.
+
+## 2.1.12 23/01/2019
+
+* Tune how to get the size of SVG images. Ref https://github.com/GNS3/gns3-gui/issues/2674.
+* Automatically create a symbolic link to the IOU image in the IOU working directory. Fixes #1484
+* Fix link pause/filters only work for the first interface of Docker containers. Fixes #1482
+* Telnet console resize support for Docker VM.
+* Fix _fix_permissions() garbles permissions in Docker VM. Ref #1428
+* Fix "None is not of type 'integer'" when opening project containing a Qemu VM. Fixes #2610.
+* Only require Xtigervnc or Xvfb+x11vnc for Docker with vnc console. Ref #1438
+* Support tigervnc in Docker VM. Ref #1438
+* Update minimum VIX version requirements for VMware. Ref #1415.
+
+## 2.1.11 28/09/2018
+
+* Catch some exceptions.
+
+## 2.1.10 15/09/2018
+
+* Include locale information and GNS3 VM version in crash reports.
+* Fix small errors like unhandled exceptions etc.
+* Import encodings.idna to avoid LookupError when standard library is in a zip file.
+* Catch exceptions in various locations to fix small issues reported by Sentry.
+* Check if serial pipe can be opened for VMware and VirtualBox VMs.
+* Improve the invalid port format detection. Fixes https://github.com/GNS3/gns3-gui/issues/2580
+* Update aiohttp verion requirement in order to support Python 3.7. Fixes https://github.com/GNS3/gns3-gui/issues/2566
+* Update setup.py and fix minor issues.
+* Catch asyncio.CancelledError when shutting down the server.
+* Report GNS3 VM errors to the GUI server summary. Ref #1359.
+* Replace vboxnet0 (if it does not exist) by the first available vboxnet interface on Windows. Fixes https://github.com/GNS3/gns3-vm/issues/102
+* Check if the VirtualBox host-only network exists when starting a GNS3 VM running on VirtualBox. Ref https://github.com/GNS3/gns3-vm/issues/102
+* Change file timestamps if necessary because ZIP does not support timestamps before 1980. Fixes #1360.
+* Add missing coroutine decorator Ref https://github.com/GNS3/gns3-gui/issues/2566
+* Refactor asyncio locking system for Python 3.7 support. Ref https://github.com/GNS3/gns3-gui/issues/2566 Ref https://github.com/GNS3/gns3-gui/issues/2568
+* Use asyncio.ensure_future() instead of asyncio.async() with conservative approach to support Python < 3.4.4. Fixes https://github.com/GNS3/gns3-gui/issues/2566
+* Forbid controller and compute servers to be different versions. Report last compute server error to clients and display in the server summary.
+* Fix exception with short names for Dynamips interfaces. Fixes #1386.
+* Add missing Qemu boot priority values. Fixes https://github.com/GNS3/gns3-server/issues/1385
+
+## 2.1.9 13/08/2018
+
+* Fix some more problems with interface short names. Fixes https://github.com/GNS3/gns3-gui/issues/2562
+* Fix incorrect short port names in topology summary. Fixes https://github.com/GNS3/gns3-gui/issues/2562
+* Set lower process priority when computing idle-pc value on Windows. Ref #2522.
+* Catch exception: ZIP does not support timestamps before 1980. Ref #1360.
+* Sync appliances
+
 ## 2.1.8 14/06/2018

 * 'caplog.text()' syntax is deprecated, use 'caplog.text' property instead.
@@ -647,7 +738,7 @@
 * Fix naming of IOU serial interfaces
 * Improve timeout management
 * When exporting debug information export GNS3 VM vmx content
-* /debug for exporting debug informations
+* /debug for exporting debug information
 * Raise error if using a non linked clone VM twice
 * Fix a possible deadlock at exit
 * Fix import of some old dynamips topologies
@@ -23,7 +23,7 @@ master is the next stable release, you can test it in your day to day activities
 Bug fixes or small improvements pull requests go here.

 2.x (2.1 for example)
-********
+*********************
 Next major release

 *Never* use this branch for production. Pull requests for major new features go here.
@@ -100,7 +100,7 @@ All the init script require the creation of a GNS3 user. You can change it to an
    sudo adduser gns3

 upstart
-~~~~~~~
+-------

 For ubuntu < 15.04

@@ -113,7 +113,8 @@ You need to copy init/gns3.conf.upstart to /etc/init/gns3.conf


 systemd
-~~~~~~~~
+-------
+
 You need to copy init/gns3.service.systemd to /lib/systemd/system/gns3.service

 .. code:: bash
@@ -219,5 +220,5 @@ If you want test coverage:

 Security issues
 ----------------
-Please contact us using contact informations available here:
+Please contact us using contact form available here:
 http://docs.gns3.com/1ON9JBXSeR7Nt2-Qum2o3ZX0GU86BZwlmNSUgvmqNWGY/index.html
@@ -5,7 +5,7 @@

 GET /v2/compute/debug
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Return debug informations about the compute
+Return debug information about the compute

 Response status codes
 **********************
@@ -0,0 +1,19 @@
+{
+    "name": "AAA",
+    "category": "guest",
+    "description": "This appliance provides RADIUS and TACACS+ services with preconfigured users and groups.",
+    "vendor_name": "Ubuntu",
+    "vendor_url": "https://www.ubuntu.com/",
+    "product_name": "AAA",
+    "registry_version": 3,
+    "status": "stable",
+    "maintainer": "Andras Dosztal",
+    "maintainer_email": "developers@gns3.net",
+    "symbol": "linux_guest.svg",
+    "usage": "RADIUS users:\n- alice\n- bob\n\nTACACS+ users:\n- gns3 (role: admin)\n- readonly\n\nAll users, as well as the RADIUS/TACACS+ clients have the password 'gns3' set.",
+    "docker": {
+        "adapters": 1,
+        "image": "adosztal/aaa:latest",
+        "console_type": "telnet"
+    }
+}
@@ -0,0 +1,19 @@
+{
+    "name": "cEOS",
+    "category": "multilayer_switch",
+    "description": "Arista cEOS\u2122 introduces the containerized packaging of EOS software and its agents for deployment in cloud infrastructure with the same proven EOS software image that runs on all Arista products. These flexible deployment options empower cloud network operators that are customizing their operating environments to provide a uniform workflow for development, testing and deployment of differentiated services.",
+    "vendor_name": "Arista",
+    "vendor_url": "http://www.arista.com/",
+    "product_name": "cEOS",
+    "registry_version": 3,
+    "status": "experimental",
+    "maintainer": "GNS3 Team",
+    "maintainer_email": "developers@gns3.net",
+    "usage": "Download:\nCreate a (free) Arista account and login.\nThen navigate to Support / Software Download and download the cEOS-lab image.\n\nInstallation:\nCopy the image to your GNS3VM (or other Linux) server, then run the following commands:\n\ncEOS-4.21.0F and newer, replace <version> by the cEOS version:\ndocker import cEOS-lab.tar.xz ceosimage:<version>\necho \"rm /etc/systemd/system/getty.target.wants/getty@tty1.service\" | \\\ndocker run --name=ceos-container -e CEOS=1 -e container=docker -e EOS_PLATFORM=ceoslab -e SKIP_ZEROTOUCH_BARRIER_IN_SYSDBINIT=1 -e ETBA=1 -e INTFTYPE=eth -i ceosimage:<version> sh\ndocker commit --change='CMD [\"/sbin/init\"]' --change='VOLUME /mnt/flash' ceos-container ceosimage:GNS3\ndocker rm ceos-container\n\ncEOS-4.20.5F:\ndocker import cEOS-lab.tar.xz ceosimage:4.20.5F\necho \"rm /etc/systemd/system/getty.target.wants/getty@tty1.service\" | \\\ndocker run --name=ceos-container -e CEOS=1 -e container=docker -e EOS_PLATFORM=ceossim -e SKIP_ZEROTOUCH_BARRIER_IN_SYSDBINIT=1 -e ETBA=1 -e INTFTYPE=eth -i ceosimage:4.20.5F sh\ndocker commit --change='CMD [\"/sbin/init\"]' --change='VOLUME /mnt/flash' ceos-container ceosimage:GNS3\ndocker rm ceos-container\n\nUsage:\nStart an auxiliary console on the cEOS and issue the \"Cli\" command.\nOnly cEOS-4.20.5F: Login on the console with username \"admin\".",
+    "symbol": ":/symbols/multilayer_switch.svg",
+    "docker": {
+        "adapters": 8,
+        "image": "ceosimage:GNS3",
+        "console_type": "telnet"
+    }
+}
@@ -24,6 +24,20 @@
        "kvm": "require"
    },
    "images": [
+        {
+            "filename": "vEOS-lab-4.21.1.1F.vmdk",
+            "version": "4.21.1.1F",
+            "md5sum": "02bfb7e53781fd44ff02357f201586d9",
+            "filesize": 358809600,
+            "download_url": "https://www.arista.com/en/support/software-download"
+        },
+        {
+            "filename": "vEOS-lab-4.20.10M-combined.vmdk",
+            "version": "4.20.10M-combined",
+            "md5sum": "d1f2d650f93dbf24e04fdd2c9d62bd62",
+            "filesize": 334626816,
+            "download_url": "https://www.arista.com/en/support/software-download"
+        },
        {
            "filename": "vEOS-lab-4.20.1F.vmdk",
            "version": "4.20.1F",
@@ -31,6 +45,34 @@
            "filesize": 662044672,
            "download_url": "https://www.arista.com/en/support/software-download"
        },
+        {
+            "filename": "vEOS-lab-4.19.10M-combined.vmdk",
+            "version": "4.19.10M-combined",
+            "md5sum": "103daa45c33be4584cbe6adc60de46a3",
+            "filesize": 324141056,
+            "download_url": "https://www.arista.com/en/support/software-download"
+        },
+        {
+            "filename": "vEOS-lab-4.19.10M.vmdk",
+            "version": "4.19.10M",
+            "md5sum": "665ed14389411ae5f16ba0a2ff84240a",
+            "filesize": 637337600,
+            "download_url": "https://www.arista.com/en/support/software-download"
+        },
+        {
+            "filename": "vEOS-lab-4.18.10M-combined.vmdk",
+            "version": "4.18.10M-combined",
+            "md5sum": "e33e0ef5b8cecc84c5bb57569b36b9c6",
+            "filesize": 317652992,
+            "download_url": "https://www.arista.com/en/support/software-download"
+        },
+        {
+            "filename": "vEOS-lab-4.18.10M.vmdk",
+            "version": "4.18.10M",
+            "md5sum": "1d87e9ace37fe3706dbf3e49c8d4d231",
+            "filesize": 624427008,
+            "download_url": "https://www.arista.com/en/support/software-download"
+        },
        {
            "filename": "vEOS-lab-4.18.5M.vmdk",
            "version": "4.18.5M",
@@ -45,6 +87,13 @@
            "filesize": 620625920,
            "download_url": "https://www.arista.com/en/support/software-download"
        },
+        {
+            "filename": "vEOS-lab-4.17.8M.vmdk",
+            "version": "4.17.8M",
+            "md5sum": "afc79a06f930ea2cc0ae3e03cbfd3f23",
+            "filesize": 608829440,
+            "download_url": "https://www.arista.com/en/support/software-download"
+        },
        {
            "filename": "vEOS-lab-4.17.2F.vmdk",
            "version": "4.17.2F",
@@ -52,6 +101,13 @@
            "filesize": 609615872,
            "download_url": "https://www.arista.com/en/support/software-download"
        },
+        {
+            "filename": "vEOS-lab-4.16.13M.vmdk",
+            "version": "4.16.13M",
+            "md5sum": "4d0facf90140fc3aab031f0f8f88a32f",
+            "filesize": 521404416,
+            "download_url": "https://www.arista.com/en/support/software-download"
+        },
        {
            "filename": "vEOS-lab-4.16.6M.vmdk",
            "version": "4.16.6M",
@@ -59,6 +115,13 @@
            "filesize": 519962624,
            "download_url": "https://www.arista.com/en/support/software-download"
        },
+        {
+            "filename": "vEOS-lab-4.15.10M.vmdk",
+            "version": "4.15.10M",
+            "md5sum": "98e08281a9c48ddf6f3c5d62a124a20f",
+            "filesize": 517079040,
+            "download_url": "https://www.arista.com/en/support/software-download"
+        },
        {
            "filename": "vEOS-lab-4.15.5M.vmdk",
            "version": "4.15.5M",
@@ -96,6 +159,19 @@
        }
    ],
    "versions": [
+        {
+            "name": "4.21.1F",
+            "images": {
+                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
+                "hdb_disk_image": "vEOS-lab-4.21.1.1F.vmdk"
+            }
+        },
+        {
+            "name": "4.20.10M-combined",
+            "images": {
+                "hda_disk_image": "vEOS-lab-4.20.10M-combined.vmdk"
+            }
+        },
        {
            "name": "4.20.1F",
            "images": {
@@ -103,6 +179,32 @@
                "hdb_disk_image": "vEOS-lab-4.20.1F.vmdk"
            }
        },
+        {
+            "name": "4.19.10M-combined",
+            "images": {
+                "hda_disk_image": "vEOS-lab-4.19.10M-combined.vmdk"
+            }
+        },
+        {
+            "name": "4.19.10M",
+            "images": {
+                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
+                "hdb_disk_image": "vEOS-lab-4.19.10M.vmdk"
+            }
+        },
+        {
+            "name": "4.18.10M-combined",
+            "images": {
+                "hda_disk_image": "vEOS-lab-4.18.10M-combined.vmdk"
+            }
+        },
+        {
+            "name": "4.18.10M",
+            "images": {
+                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
+                "hdb_disk_image": "vEOS-lab-4.18.10M.vmdk"
+            }
+        },
        {
            "name": "4.18.5M",
            "images": {
@@ -117,6 +219,13 @@
                "hdb_disk_image": "vEOS-lab-4.18.1F.vmdk"
            }
        },
+        {
+            "name": "4.17.8M",
+            "images": {
+                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
+                "hdb_disk_image": "vEOS-lab-4.17.8M.vmdk"
+            }
+        },
        {
            "name": "4.17.2F",
            "images": {
@@ -124,6 +233,13 @@
                "hdb_disk_image": "vEOS-lab-4.17.2F.vmdk"
            }
        },
+        {
+            "name": "4.16.13M",
+            "images": {
+                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
+                "hdb_disk_image": "vEOS-lab-4.16.13M.vmdk"
+            }
+        },
        {
            "name": "4.16.6M",
            "images": {
@@ -131,6 +247,13 @@
                "hdb_disk_image": "vEOS-lab-4.16.6M.vmdk"
            }
        },
+        {
+            "name": "4.15.10M",
+            "images": {
+                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
+                "hdb_disk_image": "vEOS-lab-4.15.10M.vmdk"
+            }
+        },
        {
            "name": "4.15.5M",
            "images": {
@@ -0,0 +1,53 @@
+{
+    "name": "ArubaOS-CX Simulation Software",
+    "category": "multilayer_switch",
+    "status": "stable",
+    "product_name": "ArubaOS-CX Simulation Software",
+    "description": "The ArubaOS-CX Simulation Software OVA 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 and BGP. 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. This software can be easily implemented in the GNS3 simulation software to enable drag and drop network design for building complex simulated topologies.",
+    "maintainer_email": "alloytm@gmail.com",
+    "vendor_url": "arubanetworks.com",
+    "vendor_name": "HPE Aruba",
+    "availability": "service-contract",
+    "maintainer": "Tak Mem Loy",
+    "registry_version": 4,
+    "usage": "Default username admin with blank password.",
+    "symbol": ":/symbols/route_switch_processor.svg",
+    "first_port_name": "mgmt",
+    "port_name_format": "1/1/{0}",
+
+    "qemu": {
+        "arch": "x86_64",
+        "ram": 4096,
+        "adapters": 8,
+        "hdb_disk_interface": "ide",
+        "hdc_disk_interface": "ide",
+        "hda_disk_interface": "ide",
+        "cpus": 2,
+        "kvm": "require",
+        "adapter_type": "virtio-net-pci",
+        "console_type": "vnc",
+        "options": "-nographic",
+        "process_priority": "normal"
+    },   
+
+    "images": [
+        {
+            "filename": "arubaoscx-disk-image-genericx86-p4-20180712161119.vmdk",
+            "version": "10.01.0001",
+            "md5sum": "9146ae0ac650d8206c9600e03753f022",
+            "filesize": 287734784,
+            "download_url": "http://support.arubanetworks.com/"
+        }
+
+    ],
+
+    "versions": [
+        {
+            "name": "10.01.0001",
+            "images": {
+                "hda_disk_image": "arubaoscx-disk-image-genericx86-p4-20180712161119.vmdk"
+            }
+        }
+    ]    
+    
+}
@@ -0,0 +1,56 @@
+{
+    "versions": [
+        {
+            "name": "8.2.1.1",
+            "images": {
+                "hda_disk_image": "ArubaOS_VMC_8.2.1.1_65265-disk1.qcow2",
+                "hdb_disk_image": "ArubaOS_VMC_8.2.1.1_65265-disk2.qcow2"
+            }
+        }
+    ],
+    "status": "stable",
+    "name": "Aruba VMC",
+    "product_name": "Aruba VMC",
+    "maintainer_email": "gary.ossewaarde@gmail.com",
+    "vendor_url": "arubanetworks.com",
+    "vendor_name": "HPE Aruba",
+    "images": [
+        {
+            "filename": "ArubaOS_VMC_8.2.1.1_65265-disk1.qcow2",
+            "version": "8.2.1.1",
+            "md5sum": "f3bc233f0714e4b1cc127e337d077574",
+            "filesize": 197066752,
+            "download_url": "http://support.arubanetworks.com/"
+        },
+        {
+            "filename": "ArubaOS_VMC_8.2.1.1_65265-disk2.qcow2",
+            "version": "8.2.1.1",
+            "md5sum": "18ede2afc7595fdac4508a8a3972e302",
+            "filesize": 19202048,
+            "download_url": "http://support.arubanetworks.com/"
+        }
+
+    ],
+    "port_name_format": "GE0/0/{0}",
+    "qemu": {
+        "arch": "x86_64",
+        "ram": 6144,
+        "adapters": 4,
+        "hdb_disk_interface": "ide",
+        "hdc_disk_interface": "ide",
+        "hda_disk_interface": "ide",
+        "cpus": 3,
+        "kvm": "require",
+        "kernel_command_line": "-smp cores=3,threads=1,sockets=1 -cpu host -nographic",
+        "adapter_type": "e1000",
+        "console_type": "vnc",
+        "options": "-smp cores=3,threads=1,sockets=1 -cpu host -nographic",
+        "process_priority": "normal"
+    },
+    "availability": "service-contract",
+    "category": "guest",
+    "maintainer": "Gary Ossewaarde",
+    "description": "Aruba Virtual Mobility Controller",
+    "first_port_name": "mgmt",
+    "registry_version": 4
+}
@@ -1,11 +1,11 @@
 {
-    "name": "AsteriskNOW",
+    "name": "AsteriskNOW / FreePBX",
    "category": "guest",
    "description": "AsteriskNOW makes it easy to create custom telephony solutions by automatically installing the 'plumbing'. It's a complete Linux distribution with Asterisk, the DAHDI driver framework, and, the FreePBX administrative GUI. Much of the complexity of Asterisk and Linux is handled by the installer, the yum package management utility and the administrative GUI. With AsteriskNOW, application developers and integrators can concentrate on building solutions, not maintaining the plumbing.",
    "vendor_name": "Digium",
    "vendor_url": "http://www.asterisk.org/",
    "documentation_url": "https://wiki.asterisk.org/wiki/display/AST/Installing+AsteriskNOW",
-    "product_name": "AsteriskNOW",
+    "product_name": "AsteriskNOW / FreePBX",
    "product_url": "http://www.asterisk.org/downloads/asterisknow",
    "registry_version": 3,
    "status": "stable",
@@ -24,6 +24,22 @@
        "kvm": "allow"
    },
    "images": [
+        {
+            "filename": "SNG7-FPBX-64bit-1904-2.iso",
+            "version": "14-1904",
+            "md5sum": "f37c316bc0ff208682769b6f2d468e93",
+            "filesize": 2015363072,
+            "download_url": "https://www.freepbx.org/downloads/",
+            "direct_download_url": "https://downloads.freepbxdistro.org/ISO/SNG7-FPBX-64bit-1904-2.iso"
+        },
+        {
+            "filename": "SNG7-FPBX-64bit-1805-2.iso",
+            "version": "14-1805",
+            "md5sum": "64f0c38c17ce680f7106f94183bc5745",
+            "filesize": 1755316224,
+            "download_url": "https://www.freepbx.org/downloads/",
+            "direct_download_url": "https://downloads.freepbxdistro.org/ISO/SNG7-FPBX-64bit-1805-2.iso"
+        },
        {
            "filename": "AsteriskNow-1013-current-64.iso",
            "version": "10.13",
@@ -58,6 +74,20 @@
        }
    ],
    "versions": [
+        {
+            "name": "14-1904",
+            "images": {
+                "hda_disk_image": "empty30G.qcow2",
+                "cdrom_image": "SNG7-FPBX-64bit-1904-2.iso"
+            }
+        },
+        {
+            "name": "14-1805",
+            "images": {
+                "hda_disk_image": "empty30G.qcow2",
+                "cdrom_image": "SNG7-FPBX-64bit-1805-2.iso"
+            }
+        },
        {
            "name": "10.13",
            "images": {
@@ -19,6 +19,33 @@
        "kvm": "allow"
    },
    "images": [
+        {
+            "filename": "BSDRP-1.92-full-amd64-serial.img",
+            "version": "1.92",
+            "md5sum": "b02f2502188915490bb9756ffca36910",
+            "filesize": 1000000000,
+            "download_url": "https://bsdrp.net/downloads",
+            "direct_download_url": "https://sourceforge.net/projects/bsdrp/files/BSD_Router_Project/1.92/amd64/BSDRP-1.92-full-amd64-serial.img.xz/download",
+            "compression": "xz"
+        },
+        {
+            "filename": "BSDRP-1.91-full-amd64-serial.img",
+            "version": "1.91",
+            "md5sum": "cea67b29ce94e66b617e7dc90956af45",
+            "filesize": 1000000000,
+            "download_url": "https://bsdrp.net/downloads",
+            "direct_download_url": "https://sourceforge.net/projects/bsdrp/files/BSD_Router_Project/1.91/amd64/BSDRP-1.91-full-amd64-serial.img.xz/download",
+            "compression": "xz"
+        },
+        {
+            "filename": "BSDRP-1.90-full-amd64-serial.img",
+            "version": "1.90",
+            "md5sum": "78b7182bed93888d17d18a67d5fec3a7",
+            "filesize": 1000000000,
+            "download_url": "https://bsdrp.net/downloads",
+            "direct_download_url": "https://sourceforge.net/projects/bsdrp/files/BSD_Router_Project/1.90/amd64/BSDRP-1.90-full-amd64-serial.img.xz/download",
+            "compression": "xz"
+        },
        {
            "filename": "BSDRP-1.80-full-amd64-serial.img",
            "version": "1.80",
@@ -39,6 +66,24 @@
        }
    ],
    "versions": [
+        {
+            "name": "1.92",
+            "images": {
+                "hda_disk_image": "BSDRP-1.92-full-amd64-serial.img"
+            }
+        },
+        {
+            "name": "1.91",
+            "images": {
+                "hda_disk_image": "BSDRP-1.91-full-amd64-serial.img"
+            }
+        },
+        {
+            "name": "1.90",
+            "images": {
+                "hda_disk_image": "BSDRP-1.90-full-amd64-serial.img"
+            }
+        },
        {
            "name": "1.80",
            "images": {
@@ -0,0 +1,52 @@
+{
+    "name": "CentOS Cloud Guest",
+    "category": "guest",
+    "description": "CentOS official image for self-hosted cloud",
+    "vendor_name": "The CentOS Project",
+    "vendor_url": "https://www.centos.org/",
+    "documentation_url": "https://wiki.centos.org/Documentation",
+    "product_name": "Centos Cloud",
+    "product_url": "https://wiki.centos.org/Cloud",
+    "registry_version": 3,
+    "status": "stable",
+    "maintainer": "GNS3 Team",
+    "maintainer_email": "developers@gns3.net",
+    "usage": "Username: centos\nPassword: centos",
+    "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": "-nographic"
+    },
+    "images": [
+        {
+            "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-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"
+        }
+    ],
+    "versions": [
+        {
+            "name": "7 (1809)",
+            "images": {
+                "hda_disk_image": "CentOS-7-x86_64-GenericCloud-1809.qcow2",
+                "cdrom_image": "centos-cloud-init-data.iso"
+            }
+        }
+    ]
+}
@@ -27,6 +27,22 @@
    },
    "images": [

+        {
+            "filename": "CentOS 7-18.10 (64bit).vmdk",
+            "version": "7-1810",
+            "md5sum": "7307e143c11910f3c782b1e013e6f14f",
+            "filesize": 4886233088,
+            "download_url": "http://www.osboxes.org/centos/"
+        },
+
+        {
+            "filename": "CentOS 7-1804 (64bit).vmdk",
+            "version": "7-1804",
+            "md5sum": "eae8dc48bb390c0c2d9a9a0432ced9bc",
+            "filesize": 4701356032,
+            "download_url": "http://www.osboxes.org/centos/"
+        },
+
        {
            "filename": "CentOS 7-1611 (64bit).vmdk",
            "version": "7-1611",
@@ -36,6 +52,20 @@
        }
    ],
    "versions": [
+        {
+            "name": "7-1810",
+            "images": {
+                "hda_disk_image": "CentOS 7-18.10 (64bit).vmdk"
+            }
+        },
+
+        {
+            "name": "7-1804",
+            "images": {
+                "hda_disk_image": "CentOS 7-1804 (64bit).vmdk"
+            }
+        },
+
        {
            "name": "7-1611",
            "images": {
@@ -11,7 +11,6 @@
    "maintainer": "GNS3 Team",
    "maintainer_email": "developers@gns3.net",
    "dynamips": {
-        "chassis": "",
        "platform": "c3745",
        "ram": 256,
        "nvram": 256,
@@ -25,6 +25,20 @@
        "kvm": "require"
    },
    "images": [
+        {
+            "filename": "asav992.qcow2",
+            "version": "9.9.2",
+            "md5sum": "0cba453dbf70313d8d63a00700618f52",
+            "filesize": 204865536,
+            "download_url": "https://software.cisco.com/download/home/286119613/type/280775065/release/9.9.2"
+        },
+        {
+            "filename": "asav983.qcow2",
+            "version": "9.8.3",
+            "md5sum": "f9cf40b2d555a1bea6d36bc83f06ea33",
+            "filesize": 199491584,
+            "download_url": "https://software.cisco.com/download/home/286119613/type/280775065/release/9.8.3"
+        },
        {
            "filename": "asav981-5.qcow2",
            "version": "9.8.1-5",
@@ -97,6 +111,18 @@
        }
    ],
    "versions": [
+        {
+            "name": "9.9.2",
+            "images": {
+                "hda_disk_image": "asav992.qcow2"
+            }
+        },
+        {
+            "name": "9.8.3",
+            "images": {
+                "hda_disk_image": "asav983.qcow2"
+            }
+        },
        {
            "name": "9.8.1-5",
            "images": {
@@ -14,7 +14,7 @@
    "usage": "There is no default password and enable password. A default configuration is present.",
    "port_name_format": "Gi{port1}",
    "qemu": {
-        "adapter_type": "virtio-net-pci",
+        "adapter_type": "vmxnet3",
        "adapters": 4,
        "ram": 3072,
        "arch": "x86_64",
@@ -22,6 +22,27 @@
        "kvm": "require"
    },
    "images": [
+        {
+            "filename": "csr1000v-universalk9.16.10.01b-serial.qcow2",
+            "version": "16.10.1b",
+            "md5sum": "0d3d647f83631c7955ad7899e6cce293",
+            "filesize": 950468608,
+            "download_url": "https://software.cisco.com/download/home/284364978/type/282046477/release/Gibraltar-16.10.1b"
+        },
+        {
+            "filename": "csr1000v-universalk9.16.09.01-serial.qcow2",
+            "version": "16.9.1",
+            "md5sum": "d7e1c83b6f513beb4200c7691d119086",
+            "filesize": 917897216,
+            "download_url": "https://software.cisco.com/download/home/284364978/type/282046477/release/Fuji-16.9.1"
+        },
+        {
+            "filename": "csr1000v-universalk9.16.08.01a-serial.qcow2",
+            "version": "16.8.1a",
+            "md5sum": "91e2572f20c77606d710223511cd279a",
+            "filesize": 890044416,
+            "download_url": "https://software.cisco.com/download/home/284364978/type/282046477"
+        },
        {
            "filename": "csr1000v-universalk9.16.07.01-serial.qcow2",
            "version": "16.7.1",
@@ -94,6 +115,24 @@
        }
    ],
    "versions": [
+        {
+            "name": "16.10.1b",
+            "images": {
+                "hda_disk_image": "csr1000v-universalk9.16.10.01b-serial.qcow2"
+            }
+        },
+        {
+            "name": "16.9.1",
+            "images": {
+                "hda_disk_image": "csr1000v-universalk9.16.09.01-serial.qcow2"
+            }
+        },
+        {
+            "name": "16.8.1a",
+            "images": {
+                "hda_disk_image": "csr1000v-universalk9.16.08.01a-serial.qcow2"
+            }
+        },
        {
            "name": "16.7.1",
            "images": {
@@ -25,12 +25,19 @@
        "options": "-smp 2"
    },
    "images": [
+        {
+            "filename": "dcnm-va.11.1.1.iso",
+            "version": "11.1.1",
+            "md5sum": "43af970d046d1430d3ec7950dbe4a20a",
+            "filesize": 4432132096,
+            "download_url": "https://software.cisco.com/download/home/281722751/type/282088134/release/11.1%25281%2529"
+        },
        {
            "filename": "dcnm-va.10.1.1.iso",
            "version": "10.1.1",
            "md5sum": "4eca14506decaf166251c64e67adb110",
            "filesize": 2927532032,
-            "download_url": "https://software.cisco.com/download/release.html?mdfid=281722751&softwareid=282088134&release=10.1(1)&relind=AVAILABLE&rellifecycle=&reltype=latest"
+            "download_url": "https://software.cisco.com/download/home/281722751/type/282088134/release/10.1%25281%2529"
        },
        {
            "filename": "empty100G.qcow2",
@@ -42,6 +49,13 @@
        }
    ],
    "versions": [
+        {
+            "name": "11.1.1",
+            "images": {
+                "hda_disk_image": "empty100G.qcow2",
+                "cdrom_image": "dcnm-va.11.1.1.iso"
+            }
+        },
        {
            "name": "10.1.1",
            "images": {
@@ -0,0 +1,70 @@
+{
+    "name": "Cisco Flow Collector for NetFlow",
+    "category": "firewall",
+    "description": "Cisco Stealthwatch is the most comprehensive visibility and network traffic security analytics solution that uses enterprise telemetry from the existing network infrastructure. It provides advanced threat detection, accelerated threat response, and simplified network segmentation using multilayer machine learning and entity modeling. With advanced behavioral analytics, you’ll always know who is on your network and what they are doing.\n\nAt the heart of the Stealthwatch System is the highly scalable Stealthwatch Flow Collector. The Flow Collector is available as either a physical or a virtual appliance. The Flow Collector VE performs the same functions as its physical counterpart, but in a virtual environment. The Stealthwatch Flow Collector for NetFlow gathers NetFlow, cFlow, J-Flow, Packeteer 2, NetStream, and IPFIX data. To achieve full network visibility with a traditional probe-based approach, you would need to install a probe for each router or switch on your network. This results in many costly hardware installations. Conversely, Stealthwatch’s flow-based approach provides you with full network visibility at a fraction of the cost. Each Flow Collector can process data for as many as 1,000,000 hosts from up to 2,000 flow exporters, depending on the Flow Collector model and license restrictions. ",
+    "vendor_name": "Cisco",
+    "vendor_url": "http://www.cisco.com/",
+    "documentation_url": "https://www.cisco.com/c/en/us/support/security/stealthwatch/tsd-products-support-series-home.html",
+    "product_name": "Flow Collector for NetFlow",
+    "product_url": "https://www.cisco.com/c/en/us/products/security/stealthwatch/index.html",
+    "registry_version": 4,
+    "status": "experimental",
+    "maintainer": "GNS3 Team",
+    "maintainer_email": "developers@gns3.net",
+    "usage": "Starting Flow Collector for NetFlow will start an installation of FCNF onto a blank 200GB Drive.\nDefault console username/password: sysadmin/lan1cope.\nDefault web username/password: admin/lan411cope.",
+    "symbol": ":/symbols/asa.svg",
+    "first_port_name": "eth0",
+	"port_name_format": "eth{port1}",
+    "qemu": {
+        "cpus": 2,
+        "adapter_type": "e1000",
+        "adapters": 1,
+        "ram": 8192,
+        "hda_disk_interface": "scsi",
+        "arch": "x86_64",
+        "console_type": "vnc",
+        "boot_priority": "cd",
+        "kvm": "require",
+        "options": ""
+    },
+    "images": [
+        {
+            "filename": "FlowCollector-NetFlow-6.10.4-2018.11.14.1757-0.iso",
+            "version": "6.10.4-2018.11.14.1757-0",
+            "md5sum": "accd9fb9dd2d312805883749899a2fc0",
+            "filesize": 2479288320,
+            "download_url": "https://stealthwatch.flexnetoperations.com/control/lncp/product?child_plneID=786407"
+        },
+        {
+            "filename": "FlowCollector-NetFlow-6.10.2-2018.03.19.2230-0.iso",
+            "version": "6.10.2-2018.03.19.2230-0",
+            "md5sum": "e2ac83fa617ed9e073e845cedae76873",
+            "filesize": 2430076928,
+            "download_url": "https://software.cisco.com/download/home/286307342/type/286307754/release/6.10.2"
+        },
+        {
+            "filename": "empty200G.qcow2",
+            "version": "1.0",
+            "md5sum": "d1686d2f25695dee32eab9a6f4652c7c",
+            "filesize": 200192,
+            "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
+            "direct_download_url": "http://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty200G.qcow2/download"
+        }
+    ],
+    "versions": [
+        {
+            "name": "6.10.4-2018.11.14.1757-0",
+            "images": {
+                "hda_disk_image": "empty200G.qcow2",
+                "cdrom_image": "FlowCollector-NetFlow-6.10.4-2018.11.14.1757-0.iso"
+            }
+        },
+        {
+            "name": "6.10.2-2018.03.19.2230-0",
+            "images": {
+                "hda_disk_image": "empty200G.qcow2",
+                "cdrom_image": "FlowCollector-NetFlow-6.10.2-2018.03.19.2230-0.iso"
+            }
+        }
+    ]
+}
@@ -0,0 +1,56 @@
+{
+    "name": "Cisco Flow Sensor",
+    "category": "firewall",
+    "description": "Cisco Stealthwatch is the most comprehensive visibility and network traffic security analytics solution that uses enterprise telemetry from the existing network infrastructure. It provides advanced threat detection, accelerated threat response, and simplified network segmentation using multilayer machine learning and entity modeling. With advanced behavioral analytics, you’ll always know who is on your network and what they are doing.\n\nUsing the same technology as the Stealthwatch Flow Sensor appliance, the Flow Sensor VE is a virtual appliance that provides visibility into virtual environments, generating flow data for areas that are not flow-enabled. ",
+    "vendor_name": "Cisco",
+    "vendor_url": "http://www.cisco.com/",
+    "documentation_url": "https://www.cisco.com/c/en/us/support/security/stealthwatch/tsd-products-support-series-home.html",
+    "product_name": "Flow Sensor VE",
+    "product_url": "https://www.cisco.com/c/en/us/products/security/stealthwatch/index.html",
+    "registry_version": 4,
+    "status": "experimental",
+    "maintainer": "GNS3 Team",
+    "maintainer_email": "developers@gns3.net",
+    "usage": "Starting Flow Sensor will start an installation of FSVE onto a blank 100GB Drive.\nDefault console username/password: sysadmin/lan1cope.\nDefault web username/password: admin/lan411cope.",
+    "symbol": ":/symbols/asa.svg",
+    "first_port_name": "eth0",
+	"port_name_format": "eth{port1}",
+    "qemu": {
+        "cpus": 1,
+        "adapter_type": "e1000",
+        "adapters": 2,
+        "ram": 8192,
+        "hda_disk_interface": "scsi",
+        "arch": "x86_64",
+        "console_type": "vnc",
+        "boot_priority": "cd",
+        "kvm": "require",
+        "options": ""
+    },
+    "images": [
+        {
+            "filename": "FlowSensor-AE-6.10.2-2018.03.19.2224-0.iso",
+            "version": "6.10.2-2018.03.19.2224-0",
+            "md5sum": "ef8712e655fcbc92dc1a1551ee2e4a80",
+            "filesize": 1287245824,
+            "download_url": "https://software.cisco.com/download/home/286307342/type/286307754/release/6.10.2"
+        },
+        {
+            "filename": "empty100G.qcow2",
+            "version": "1.0",
+            "md5sum": "1e6409a4523ada212dea2ebc50e50a65",
+            "filesize": 198656,
+            "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
+            "direct_download_url": "http://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty100G.qcow2/download"
+        }
+    ],
+    "versions": [
+        {
+            "name": "6.10.2-2018.03.19.2224-0",
+            "images": {
+                "hda_disk_image": "empty100G.qcow2",
+                "cdrom_image": "FlowSensor-AE-6.10.2-2018.03.19.2224-0.iso"
+            }
+        }
+    ]
+}
@@ -11,19 +11,46 @@
    "status": "experimental",
    "maintainer": "GNS3 Team",
    "maintainer_email": "developers@gns3.net",
-    "usage": "Default username/password: admin/admin, cisco/cisco and lab/lab. There is no default configuration present.",
+    "usage": "Default username/password: admin/admin, cisco/cisco and lab/lab. There is no default configuration present. Interfaces may take several minutes to be usable after appliance boot.\n\nThe interfaces are mapped the following way:\n- NIC0: unused\n- NIC1: unused\n- NIC2: Gi0/0/0/0\n- NIC3: Gi0/0/0/1\n- NICn: Gi0/0/0/(n-2)",
    "first_port_name": "MgmtEth0/0/CPU0/0",
-    "port_name_format": "GigabitEthernet0/0/0/{0}",
+    "port_name_format": "NIC{0}",
    "qemu": {
-        "adapter_type": "e1000",
-        "adapters": 4,
+        "adapter_type": "virtio-net-pci",
+        "adapters": 7,
        "ram": 16384,
-        "arch": "i386",
+        "arch": "x86_64",
        "console_type": "telnet",
        "kvm": "require",
-        "options": "-smp 4"
+        "options": "-smp 4 -cpu host"
    },
    "images": [
+        {
+            "filename": "xrv9k-fullk9-x-6.5.2.qcow2",
+            "version": "6.5.2",
+            "md5sum": "506d9e23dda7365c99dd82b613859697",
+            "filesize": 1205010432,
+            "download_url": "https://software.cisco.com/download/home/286288939/type/280805694/release/6.5.1"
+        },
+        {
+            "filename": "xrv9k-fullk9-x-6.5.1.qcow2",
+            "version": "6.5.1",
+            "md5sum": "730868e7cd46de9aa2e950899c7f9498",
+            "filesize": 1208811520,
+            "download_url": "https://software.cisco.com/download/home/286288939/type/280805694/release/6.5.1"
+        },
+        {
+            "filename": "xrv9k-fullk9-x-6.4.2.qcow2",
+            "version": "6.4.2",
+            "md5sum": "6958763192c7bb59a1b8049d377de1b4",
+            "filesize": 1311703040,
+            "download_url": "https://software.cisco.com/download/home/286288939/type/280805694/release/6.4.2"
+        },
+        {   "filename": "xrv9k-fullk9-x-6.4.1.qcow2",
+            "version": "6.4.1",
+            "md5sum": "9c56b684e307706005a503e289cb9317",
+            "filesize": 1304887296,
+            "download_url": "https://software.cisco.com/download/home/286288939/type/280805694/release/6.4.1"
+        },
        {
            "filename": "xrv9k-fullk9-x-6.2.25.qcow2",
            "version": "6.2.25",
@@ -47,6 +74,30 @@
        }
    ],
    "versions": [
+        {
+            "name": "6.5.2",
+            "images": {
+                "hda_disk_image": "xrv9k-fullk9-x-6.5.2.qcow2"
+            }
+        },
+        {
+            "name": "6.5.1",
+            "images": {
+                "hda_disk_image": "xrv9k-fullk9-x-6.5.1.qcow2"
+            }
+        },
+        {
+            "name": "6.4.2",
+            "images": {
+                "hda_disk_image": "xrv9k-fullk9-x-6.4.2.qcow2"
+            }
+        },
+        {
+            "name": "6.4.1",
+            "images": {
+                "hda_disk_image": "xrv9k-fullk9-x-6.4.1.qcow2"
+            }
+        },
        {
            "name": "6.2.25",
            "images": {
@@ -23,29 +23,36 @@
        "console_type": "vnc",
        "boot_priority": "cd",
        "kvm": "require",
-        "options": "-smp 2"
+        "options": "-smp 2 -smbios type=1,product=KVM"
    },
    "images": [
+        {
+            "filename": "ise-2.2.0.470.SPA.x86_64.iso",
+            "version": "2.2.0.470",
+            "md5sum": "7fe5e730d0a51ef66e69d1463717ff3f",
+            "filesize": 8044992512,
+            "download_url": "https://software.cisco.com/download/home/283801620/type/283802505/release/2.2.0"
+        },
        {
            "filename": "ise-2.1.0.474.SPA.x86_64.iso",
            "version": "2.1.0.474",
            "md5sum": "8dc844696790f2f5f37054899fab3e2a",
            "filesize": 6161475584,
-            "download_url": "https://software.cisco.com/download/release.html?mdfid=283801620&flowid=&softwareid=283802505&release=2.1.0&relind=AVAILABLE&rellifecycle=&reltype=latest"
+            "download_url": "https://software.cisco.com/download/home/283801620/type/283802505/release/2.1.0"
        },
        {
            "filename": "ise-2.0.1.130.SPA.x86_64.iso",
            "version": "2.0.1.130",
            "md5sum": "25ac842fdbb61f6e75f2f8b26beea28e",
            "filesize": 5129990144,
-            "download_url": "https://software.cisco.com/download/release.html?mdfid=283801620&flowid=&softwareid=283802505&release=2.1.0&relind=AVAILABLE&rellifecycle=&reltype=latest"
+            "download_url": "https://software.cisco.com/download/home/283801620/type/283802505/release/2.0.1"
        },
        {
            "filename": "ise-2.0.0.306.SPA.x86_64.iso",
            "version": "2.0.0.306",
            "md5sum": "b7a454ee235db29b5c208b19bfd1fbd1",
            "filesize": 5088827392,
-            "download_url": "https://software.cisco.com/download/release.html?mdfid=283801620&flowid=&softwareid=283802505&release=2.0.0&relind=AVAILABLE&rellifecycle=&reltype=latest"
+            "download_url": "https://software.cisco.com/download/home/283801620/type/283802505/release/2.0"
        },
        {
            "filename": "empty200G.qcow2",
@@ -57,6 +64,13 @@
        }
    ],
    "versions": [
+        {
+            "name": "2.2.0.470",
+            "images": {
+                "hda_disk_image": "empty200G.qcow2",
+                "cdrom_image": "ise-2.2.0.470.SPA.x86_64.iso"
+            }
+        },
        {
            "name": "2.1.0.474",
            "images": {
@@ -78,6 +92,5 @@
                "cdrom_image": "ise-2.0.0.306.SPA.x86_64.iso"
            }
        }
-      
    ]
 }
@@ -25,6 +25,48 @@
        "kvm": "require"
    },
    "images": [
+        {
+            "filename": "nxosv-final.9.2.3.qcow2",
+            "version": "9.2.3",
+            "md5sum": "74bd9a5b4970e868685f753e48979194",
+            "filesize": 1357643776,
+            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/9.2%25283%2529"
+        },
+        {
+            "filename": "nxosv-final.9.2.2.qcow2",
+            "version": "9.2.2",
+            "md5sum": "2119702c488552fc4d1b4210a04d4f64",
+            "filesize": 1344077824,
+            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/9.2%25281%2529"
+        },
+        {
+            "filename": "nxosv-final.9.2.1.qcow2",
+            "version": "9.2.1",
+            "md5sum": "1d7fa4654602d7ffbf62544edfe71986",
+            "filesize": 1330315264,
+            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/9.2%25281%2529"
+        },
+        {
+            "filename": "nxosv-final.7.0.3.I7.6.qcow2",
+            "version": "7.0.3.I7.6",
+            "md5sum": "a122ee954b4c11761abd99291b70544e",
+            "filesize": 1031995392,
+            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/7.0%25283%2529I7%25286%2529"
+        },
+        {
+            "filename": "nxosv-final.7.0.3.I7.5.qcow2",
+            "version": "7.0.3.I7.5",
+            "md5sum": "68a4008e189c8a35ccb8ee58db9608bb",
+            "filesize": 1027670016,
+            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/7.0%25283%2529I7%25285%2529"
+        },
+        {
+            "filename": "nxosv-final.7.0.3.I7.4.qcow2",
+            "version": "7.0.3.I7.4",
+            "md5sum": "1e980c95ca47045ae45ded6e07fabfb8",
+            "filesize": 985792512,
+            "download_url": "https://software.cisco.com/download/"
+        },
        {
            "filename": "nxosv-final.7.0.3.I7.3.qcow2",
            "version": "7.0.3.I7.3",
@@ -78,6 +120,48 @@
        }
    ],
    "versions": [
+        {
+            "name": "9.2.3",
+            "images": {
+                "bios_image": "OVMF-20160813.fd",
+                "hda_disk_image": "nxosv-final.9.2.3.qcow2"
+            }
+        },
+        {
+            "name": "9.2.2",
+            "images": {
+                "bios_image": "OVMF-20160813.fd",
+                "hda_disk_image": "nxosv-final.9.2.2.qcow2"
+            }
+        },
+        {
+            "name": "9.2.1",
+            "images": {
+                "bios_image": "OVMF-20160813.fd",
+                "hda_disk_image": "nxosv-final.9.2.1.qcow2"
+            }
+        },
+        {
+            "name": "7.0.3.I7.6",
+            "images": {
+                "bios_image": "OVMF-20160813.fd",
+                "hda_disk_image": "nxosv-final.7.0.3.I7.6.qcow2"
+            }
+        },
+        {
+            "name": "7.0.3.I7.5",
+            "images": {
+                "bios_image": "OVMF-20160813.fd",
+                "hda_disk_image": "nxosv-final.7.0.3.I7.5.qcow2"
+            }
+        },
+        {
+            "name": "7.0.3.I7.4",
+            "images": {
+                "bios_image": "OVMF-20160813.fd",
+                "hda_disk_image": "nxosv-final.7.0.3.I7.4.qcow2"
+            }
+        },
        {
            "name": "7.0.3.I7.3",
            "images": {
@@ -0,0 +1,70 @@
+{
+    "name": "Cisco Stealthwatch Management Console",
+    "category": "firewall",
+    "description": "Cisco Stealthwatch is the most comprehensive visibility and network traffic security analytics solution that uses enterprise telemetry from the existing network infrastructure. It provides advanced threat detection, accelerated threat response, and simplified network segmentation using multilayer machine learning and entity modeling. With advanced behavioral analytics, you’ll always know who is on your network and what they are doing.\n\nAs the control center for the Stealthwatch System, the SMC manages, coordinates, configures, and organizes all of the different components of the system. The SMC client software allows you to access the SMC’s user-friendly graphical user interface from any local computer with access to a Web browser. Through the client interface, you can easily access real-time security and network information about critical segments throughout your enterprise. ",
+    "vendor_name": "Cisco",
+    "vendor_url": "http://www.cisco.com/",
+    "documentation_url": "https://www.cisco.com/c/en/us/support/security/stealthwatch/tsd-products-support-series-home.html",
+    "product_name": "Stealthwatch Management Console",
+    "product_url": "https://www.cisco.com/c/en/us/products/security/stealthwatch/index.html",
+    "registry_version": 4,
+    "status": "experimental",
+    "maintainer": "GNS3 Team",
+    "maintainer_email": "developers@gns3.net",
+    "usage": "Starting Stealthwatch Management Console will start an installation of SMC onto a blank 200GB Drive.\nDefault console username/password: sysadmin/lan1cope.\nDefault web username/password: admin/lan411cope.",
+    "symbol": "cisco-fmcv.svg",
+    "first_port_name": "eth0",
+	"port_name_format": "eth{port1}",
+    "qemu": {
+        "cpus": 3,
+        "adapter_type": "e1000",
+        "adapters": 1,
+        "ram": 8192,
+        "hda_disk_interface": "scsi",
+        "arch": "x86_64",
+        "console_type": "vnc",
+        "boot_priority": "cd",
+        "kvm": "require",
+        "options": ""
+    },
+    "images": [
+        {
+            "filename": "SMC-6.10.4-2018.11.14.1757-0.iso",
+            "version": "6.10.4-2018.11.14.1757-0",
+            "md5sum": "1de82eddf5303012aa8701144a7d4c7b",
+            "filesize": 2518747136,
+            "download_url": "https://stealthwatch.flexnetoperations.com/control/lncp/product?child_plneID=786407"
+        },
+        {
+            "filename": "SMC-6.10.2-2018.03.19.2228-0.iso",
+            "version": "6.10.2-2018.03.19.2228-0",
+            "md5sum": "e4e31ea6eb5c17c12769724f0c70b452",
+            "filesize": 2311847936,
+            "download_url": "https://software.cisco.com/download/home/286307342/type/286307754/release/6.10.2"
+        },
+        {
+            "filename": "empty200G.qcow2",
+            "version": "1.0",
+            "md5sum": "d1686d2f25695dee32eab9a6f4652c7c",
+            "filesize": 200192,
+            "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
+            "direct_download_url": "http://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty200G.qcow2/download"
+        }
+    ],
+    "versions": [
+        {
+            "name": "6.10.4-2018.11.14.1757-0",
+            "images": {
+                "hda_disk_image": "empty200G.qcow2",
+                "cdrom_image": "SMC-6.10.4-2018.11.14.1757-0.iso"
+            }
+        },
+        {
+            "name": "6.10.2-2018.03.19.2228-0",
+            "images": {
+                "hda_disk_image": "empty200G.qcow2",
+                "cdrom_image": "SMC-6.10.2-2018.03.19.2228-0.iso"
+            }
+        }
+    ]
+}
@@ -22,6 +22,13 @@
        "kvm": "require"
    },
    "images": [
+        {
+            "filename": "ClearOS-7.5-DVD-x86_64.iso",
+            "version": "7.5",
+            "md5sum": "1e23c5f73a6c996420d8e0e70b000bf9",
+            "filesize": 1146093568,
+            "download_url": "https://www.clearos.com/clearfoundation/software/clearos-downloads"
+        },
        {
            "filename": "ClearOS-7.4-DVD-x86_64.iso",
            "version": "7.4",
@@ -53,6 +60,13 @@
        }
    ],
    "versions": [
+        {
+            "name": "7.5",
+            "images": {
+                "hda_disk_image": "empty30G.qcow2",
+                "cdrom_image": "ClearOS-7.5-DVD-x86_64.iso"
+            }
+        },
        {
            "name": "7.4",
            "images": {
@@ -21,6 +21,51 @@
        "kvm": "allow"
    },
    "images": [
+        {
+            "filename": "coreos_production_qemu_image.img",
+            "version": "2079.4.0",
+            "md5sum": "d5e28d68bcadf252ff9c909a159b9504",
+            "filesize": 970129408,
+            "download_url": "http://stable.release.core-os.net/amd64-usr/2079.4.0/",
+            "direct_download_url": "http://stable.release.core-os.net/amd64-usr/2079.4.0/coreos_production_qemu_image.img.bz2",
+            "compression": "bzip2"
+        },
+        {
+            "filename": "coreos_production_qemu_image.2023.5.0.img",
+            "version": "2023.5.0",
+            "md5sum": "f8b12e524aa81220222d06473b3f36dc",
+            "filesize": 587661312,
+            "download_url": "http://stable.release.core-os.net/amd64-usr/2023.5.0/",
+            "direct_download_url": "http://stable.release.core-os.net/amd64-usr/2023.5.0/coreos_production_qemu_image.img.bz2",
+            "compression": "bzip2"
+        },
+        {
+            "filename": "coreos_production_qemu_image.1911.5.0.img",
+            "version": "1911.5.0",
+            "md5sum": "3b5b33697cfc545d8eb9fb461c612e76",
+            "filesize": 940507136,
+            "download_url": "http://stable.release.core-os.net/amd64-usr/1911.5.0/",
+            "direct_download_url": "http://stable.release.core-os.net/amd64-usr/1911.5.0/coreos_production_qemu_image.img.bz2",
+            "compression": "bzip2"
+        },
+        {
+            "filename": "coreos_production_qemu_image.1855.5.0.img",
+            "version": "1855.5.0",
+            "md5sum": "6b5b06bc47446277c5c536c09b5a7988",
+            "filesize": 924319744,
+            "download_url": "http://stable.release.core-os.net/amd64-usr/1855.5.0/",
+            "direct_download_url": "http://stable.release.core-os.net/amd64-usr/1855.5.0/coreos_production_qemu_image.img.bz2",
+            "compression": "bzip2"
+        },
+        {
+            "filename": "coreos_production_qemu_image.1688.5.3.img",
+            "version": "1688.5.3",
+            "md5sum": "f1015a9573fb6e378d2a5e86b4243acd",
+            "filesize": 867368960,
+            "download_url": "http://stable.release.core-os.net/amd64-usr/1688.5.3/",
+            "direct_download_url": "http://stable.release.core-os.net/amd64-usr/1688.5.3/coreos_production_qemu_image.img.bz2",
+            "compression": "bzip2"
+        },
        {
            "filename": "coreos_production_qemu_image.1632.2.1.img",
            "version": "1632.2.1",
@@ -158,10 +203,40 @@
        }
    ],
    "versions": [
+        {
+            "name": "2079.4.0",
+            "images": {
+                "hda_disk_image": "coreos_production_qemu_image.img"
+            }
+        },
+        {
+            "name": "2023.5.0",
+            "images": {
+                "hda_disk_image": "coreos_production_qemu_image.2023.5.0.img"
+            }
+        },
+        {
+            "name": "1911.5.0",
+            "images": {
+                "hda_disk_image": "coreos_production_qemu_image.1911.5.0.img"
+            }
+        },
+        {
+            "name": "1855.5.0",
+            "images": {
+                "hda_disk_image": "coreos_production_qemu_image.1855.5.0.img"
+            }
+        },
+        {
+            "name": "1688.5.3",
+            "images": {
+                "hda_disk_image": "coreos_production_qemu_image.1688.5.3.img"
+            }
+        },
        {
            "name": "1632.2.1",
            "images": {
-                "hda_disk_image": "coreos_production_qemu_image.1576.4.0.img"
+                "hda_disk_image": "coreos_production_qemu_image.1632.2.1.img"
            }
        },
        {
@@ -23,13 +23,77 @@
        "kvm": "require"
    },
    "images": [
+        {
+            "filename": "cumulus-linux-3.7.6-vx-amd64-qemu.qcow2",
+            "version": "3.7.6",
+            "md5sum": "34de965074332cbc40d51832da7d6a5d",
+            "filesize": 540278784,
+            "download_url": "https://cumulusnetworks.com/cumulus-vx/download/",
+            "direct_download_url": "http://cumulusfiles.s3.amazonaws.com/CumulusLinux-3.7.6/cumulus-linux-3.7.6-vx-amd64-qemu.qcow2"
+        },
+        {
+            "filename": "cumulus-linux-3.7.3-vx-amd64-qemu.qcow2",
+            "version": "3.7.3",
+            "md5sum": "e6f438cd44ede841ff290c85dedd127e",
+            "filesize": 1514340352,
+            "download_url": "https://cumulusnetworks.com/cumulus-vx/download/",
+            "direct_download_url": "http://cumulusfiles.s3.amazonaws.com/CumulusLinux-3.7.3/cumulus-linux-3.7.3-vx-amd64-qemu.qcow2"
+        },
+        {
+            "filename": "cumulus-linux-3.7.2-vx-amd64-qemu.qcow2",
+            "version": "3.7.2",
+            "md5sum": "2fcd785da0452e403c44ba5f3ac4e870",
+            "filesize": 1574502400,
+            "download_url": "https://cumulusnetworks.com/cumulus-vx/download/",
+            "direct_download_url": "http://cumulusfiles.s3.amazonaws.com/CumulusLinux-3.7.2/cumulus-linux-3.7.2-vx-amd64-qemu.qcow2"
+        },
+        {
+            "filename": "cumulus-linux-3.7.1-vx-amd64-qemu.qcow2",
+            "version": "3.7.1",
+            "md5sum": "201055c57e4a20bb5772289ea6216631",
+            "filesize": 1640300544,
+            "download_url": "https://cumulusnetworks.com/cumulus-vx/download/",
+            "direct_download_url": "http://cumulusfiles.s3.amazonaws.com/CumulusLinux-3.7.1/cumulus-linux-3.7.1-vx-amd64-qemu.qcow2"
+        },
+        {
+            "filename": "cumulus-linux-3.6.2-vx-amd64.qcow2",
+            "version": "3.6.2",
+            "md5sum": "fda2cfc556de7b12daf45369bd60d33b",
+            "filesize": 1157169152,
+            "download_url": "https://cumulusnetworks.com/cumulus-vx/download/",
+            "direct_download_url": "https://s3.amazonaws.com/cumulusfiles/CumulusLinux-3.6.2/cumulus-linux-3.6.2-vx-amd64.qcow2"
+        },
+        {
+            "filename": "cumulus-linux-3.6.1-vx-amd64.qcow2",
+            "version": "3.6.1",
+            "md5sum": "b2145a689ceea668d003a0d2f2faa045",
+            "filesize": 1068761088,
+            "download_url": "https://cumulusnetworks.com/cumulus-vx/download/",
+            "direct_download_url": "https://s3.amazonaws.com/cumulusfiles/CumulusLinux-3.6.1/cumulus-linux-3.6.1-vx-amd64.qcow2"
+        },
+        {
+            "filename": "cumulus-linux-3.6.0-vx-amd64.qcow2",
+            "version": "3.6.0",
+            "md5sum": "b5356b6c922f5620d7e6971d44e9be4d",
+            "filesize": 1105199104,
+            "download_url": "https://cumulusnetworks.com/cumulus-vx/download/",
+            "direct_download_url": "http://cumulusfiles.s3.amazonaws.com/cumulus-linux-3.6.0-vx-amd64.qcow2"
+        },
+        {
+            "filename": "cumulus-linux-3.5.3-vx-amd64.qcow2",
+            "version": "3.5.3",
+            "md5sum": "4ecbd7341b214fa3c3b27ab11d1df2fb",
+            "filesize": 1084358656,
+            "download_url": "https://cumulusnetworks.com/cumulus-vx/download/",
+            "direct_download_url": "http://cumulusfiles.s3.amazonaws.com/cumulus-linux-3.5.3-vx-amd64.qcow2"
+        },
        {
            "filename": "cumulus-linux-3.5.2-vx-amd64.qcow2",
            "version": "3.5.2",
            "md5sum": "87d1d8b297e5ebd77924669dfb7e4c9f",
            "filesize": 996605952,
            "download_url": "https://cumulusnetworks.com/cumulus-vx/download/",
-            "direct_download_url": "http://cumulusfiles.s3.amazonaws.com/cumulus-linux-3.5.0-vx-amd64.qcow2"
+            "direct_download_url": "http://cumulusfiles.s3.amazonaws.com/cumulus-linux-3.5.3-vx-amd64.qcow2"
        },
        {
            "filename": "cumulus-linux-3.5.0-vx-amd64.qcow2",
@@ -141,6 +205,54 @@
        }
    ],
    "versions": [
+        {
+            "name": "3.7.6",
+            "images": {
+                "hda_disk_image": "cumulus-linux-3.7.6-vx-amd64-qemu.qcow2"
+            }
+        }, 
+        {
+            "name": "3.7.3",
+            "images": {
+                "hda_disk_image": "cumulus-linux-3.7.3-vx-amd64-qemu.qcow2"
+            }
+        },    
+        {
+            "name": "3.7.2",
+            "images": {
+                "hda_disk_image": "cumulus-linux-3.7.2-vx-amd64-qemu.qcow2"
+            }
+        },    
+        {
+            "name": "3.7.1",
+            "images": {
+                "hda_disk_image": "cumulus-linux-3.7.1-vx-amd64-qemu.qcow2"
+            }
+        },    
+        {
+            "name": "3.6.2",
+            "images": {
+                "hda_disk_image": "cumulus-linux-3.6.2-vx-amd64.qcow2"
+            }
+        },    
+        {
+            "name": "3.6.1",
+            "images": {
+                "hda_disk_image": "cumulus-linux-3.6.1-vx-amd64.qcow2"
+            }
+        },    
+        {
+            "name": "3.6.0",
+            "images": {
+                "hda_disk_image": "cumulus-linux-3.6.0-vx-amd64.qcow2"
+            }
+        },
+        {
+            "name": "3.5.3",
+            "images": {
+                "hda_disk_image": "cumulus-linux-3.5.3-vx-amd64.qcow2"
+            }
+        },
        {
            "name": "3.5.2",
            "images": {
@@ -1,16 +1,16 @@
 {
-    "name": "Dell FTOS",
+    "name": "Dell OS9",
    "category": "router",
-    "description": "Dell Networking OS10 combines the best of Linux, open computing and networking to advance open networking disaggregation. Dell Networking OS10 is a transformational software platform that provides networking hardware abstraction through a common set of APIs. Enable consistency across compute and network resources for your system operators (SysOps) groups that require server-like manageability. Easily leverage your existing network configuration. Dell Networking OS10 incorporates traditional networking integration. Enhance the integration and control you allow your development and operations (DevOps) teams, down to identifying an object as an individual, manageable entity within the platform.",
+    "description": "Dell Networking OS9 (formerly FTOS).\nOS9 powers the Dell Networking product portfolio and has been hardened in some of the largest and most demanding environments in the world to meet stringent reliability, scalability and serviceability requirements. \n\nDownload and uncompress zip files from the Dell support site - corresponding to the FTOS/OS9 image name. Please 'Select FTOS for S-Series OS-EMULATOR'. Import the resulting ISO image.",
    "vendor_name": "Dell Inc.",
    "vendor_url": "http://www.dell.com/",
-    "product_name": "Dell FTOS",
+    "product_name": "Dell OS9",
    "product_url": "http://www.dell.com/us/business/p/open-platform-software/pd",
    "registry_version": 3,
    "status": "experimental",
    "maintainer": "GNS3 Team",
    "maintainer_email": "developers@gns3.net",
-    "usage": "Abort the BCM process and format the flash after first boot by entering these commands:\nen\nformat flash:\n\nSometimes the flash device is not available after boot.",
+    "usage": "Make sure the Boot priority of the configuration template is HDD or CD.\n\nAbort the BCM process and format the flash after first boot by entering these commands:\nen\nformat flash:\n\nSometimes the flash device is not available after boot.",
    "first_port_name": "Management0/0",
    "port_name_format": "fortyGigE0/{0}",
    "qemu": {
@@ -29,7 +29,7 @@
            "version": "9.8.0",
            "md5sum": "b9b50eda0a73407dc381792ff7975e24",
            "filesize": 108115968,
-            "download_url": "https://www.force10networks.com/csportal20/Software/Downloads.aspx",
+            "download_url": "https://www.force10networks.com/CSPortal20/Software/SSeriesDownloads.aspx",
            "compression": "zip"
        },
        {
@@ -0,0 +1,19 @@
+{
+    "name": "DNS",
+    "category": "guest",
+    "description": "This appliance provides DNS using dnsmasq with the local domain set to \"lab\".",
+    "vendor_name": "Ubuntu",
+    "vendor_url": "https://www.ubuntu.com/",
+    "product_name": "DNS",
+    "registry_version": 3,
+    "status": "stable",
+    "maintainer": "Andras Dosztal",
+    "maintainer_email": "developers@gns3.net",
+    "symbol": "linux_guest.svg",
+    "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",
+    "docker": {
+        "adapters": 1,
+        "image": "adosztal/dns:latest",
+        "console_type": "telnet"
+    }
+}
@@ -1,159 +1,139 @@
 {
-    "name": "EXOS",
+    "name": "EXOS VM",
    "category": "multilayer_switch",
-    "description": "ExtremeXOS was designed from the ground up to meet the needs of large cloud and private data centers, service providers, intelligent, converged enterprise edge networks, and everything in between. It provides the high performance and rich features required by these diverse environments.",
+    "description": "The ExtremeXOS VM is created and maintained by Extreme Networks for users to emulate a network using EXOS switches.",
    "vendor_name": "Extreme Networks",
-    "vendor_url": "http://www.extremenetworks.com/",
-    "documentation_url": "http://www.extremenetworks.com/support/documentation",
-    "product_name": "EXOS",
-    "product_url": "http://www.extremenetworks.com/product/extremexos-network-operating-system",
+    "vendor_url": "https://www.extremenetworks.com",
+    "documentation_url": "https://www.extremenetworks.com/support/documentation",
+    "product_name": "EXOS VM",
    "registry_version": 3,
    "status": "stable",
-    "maintainer": "GNS3 Team",
-    "maintainer_email": "developers@gns3.net",
-    "usage": "You can change the console to telnet after install. Default user: admin (no password set)",
-    "first_port_name": "Management",
+    "maintainer": "Extreme Networks",
+    "maintainer_email": "GitHubscripting@extremenetworks.com",
+    "usage": "Boot up and login is admin with no password.",
+    "symbol": "ethernet_switch.svg",
+    "first_port_name": "Mgmt",
    "port_name_format": "Port{port1}",
    "qemu": {
-        "adapter_type": "e1000",
+        "adapter_type": "rtl8139",
        "adapters": 13,
-        "ram": 256,
+        "ram": 512,
        "hda_disk_interface": "ide",
        "arch": "x86_64",
        "console_type": "telnet",
-        "boot_priority": "cd",
-        "kvm": "require",
-        "options": "-smp 2 -cpu core2duo"
+        "boot_priority": "dc",
+        "kvm": "allow",
+        "options": "-cpu core2duo"
    },
+    
    "images": [
+
+		{
+            "filename": "EXOS-VM_v30.1.1.4.qcow2",
+            "version": "30.1.1.4",
+            "md5sum": "92d3f9b13d750f7bfa804823fa545772",
+            "filesize": 383385600,
+            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v30.1.1.4.qcow2"
+        },
+		{
+            "filename": "EXOS-VM_v22.6.1.4.qcow2",
+            "version": "22.6.1.4",
+            "md5sum": "82b31b11b26143a82c8259a4825696fc",
+            "filesize": 180355072,
+            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v22.6.1.4.qcow2"
+        },
+		{
+            "filename": "EXOS-VM_v22.5.1.7.qcow2",
+            "version": "22.5.1.7",
+            "md5sum": "d2e8ae6783b6ed777ad5cd8cafd83c86",
+            "filesize": 180289536,
+            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v22.5.1.7.qcow2"
+        },
        {
-            "filename": "exosvm-22.4.1.4.iso",
+            "filename": "EXOS-VM_v22.4.1.4-disk1.qcow2",
            "version": "22.4.1.4",
-            "md5sum": "2134a511084519a5f8ad00a6f7cd71a9",
-            "filesize": 49993728,
-            "download_url": "https://github.com/extremenetworks/Virtual_EXOS",
-            "direct_download_url": "https://github.com/extremenetworks/Virtual_EXOS/raw/master/vm-22.4.1.4.iso"
+            "md5sum": "5f1ee41912d74d423ce8ae57ea413602",
+            "filesize": 229638144,
+            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v22.4.1.4-disk1.qcow2"
        },
        {
-            "filename": "exosvm-22.2.1.5.iso",
+            "filename": "EXOS-VM_v22.3.1.4patch1-4-disk1.qcow2",
+            "version": "22.3.1.4",
+            "md5sum": "a4585b6e987ff730f5c044af339fe090",
+            "filesize": 218431488,
+            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v22.3.1.4patch1-4-disk1.qcow2"
+        },
+		{
+            "filename": "EXOS-VM_v22.2.1.5-disk1.qcow2",
            "version": "22.2.1.5",
-            "md5sum": "bf51fd5b3c5e9dab10a616055265bcf2",
-            "filesize": 44578816,
-            "download_url": "https://github.com/extremenetworks/Virtual_EXOS",
-            "direct_download_url": "https://github.com/extremenetworks/Virtual_EXOS/raw/master/vm-22.2.1.5.iso"
+            "md5sum": "e3cfe92077addda6ad34185288c90acf",
+            "filesize": 179568640,
+            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v22.2.1.5-disk1.qcow2"
        },
        {
-            "filename": "exosvm-22.1.1.5.iso",
+            "filename": "EXOS-VM_v22.1.1.5-disk1.qcow2",
            "version": "22.1.1.5",
-            "md5sum": "df3897ca2d7c7053582587ed120114fa",
-            "filesize": 44220416,
-            "download_url": "https://github.com/extremenetworks/Virtual_EXOS",
-            "direct_download_url": "https://github.com/extremenetworks/Virtual_EXOS/raw/master/vm-22.1.1.5.iso"
+            "md5sum": "77683060e75d81b776761f6829b15e9b",
+            "filesize": 179437568,
+            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v22.1.1.5-disk1.qcow2"
        },
-        {
-            "filename": "exosvm-21.1.2.14.iso",
-            "version": "21.1.2.14",
-            "md5sum": "de0752d56e41d92027ce1fccd604b14b",
-            "filesize": 41101312,
-            "download_url": "https://github.com/extremenetworks/Virtual_EXOS",
-            "direct_download_url": "https://github.com/extremenetworks/Virtual_EXOS/blob/master/vm-21.1.2.14.iso?raw=true"
-        },
-        {
-            "filename": "exosvm-21.1.1.4.iso",
+		{
+            "filename": "EXOS-VM_v21.1.1.4-disk1.qcow2",
            "version": "21.1.1.4",
-            "md5sum": "4d5db0e01a39b08775ed6a3e2c8bf663",
-            "filesize": 41046016,
-            "download_url": "https://github.com/extremenetworks/Virtual_EXOS",
-            "direct_download_url": "https://github.com/extremenetworks/Virtual_EXOS/blob/master/vm-21.1.1.4.iso?raw=true"
-        },
-        {
-            "filename": "exospc-16.2.1.6.iso",
-            "version": "16.2.1.6",
-            "md5sum": "b4be339afb02c03dcb4349630c1adb4f",
-            "filesize": 36306944,
-            "download_url": "https://github.com/extremenetworks/Virtual_EXOS",
-            "direct_download_url": "https://github.com/extremenetworks/Virtual_EXOS/blob/master/exospc-16.2.1.6.iso?raw=true"
-        },
-        {
-            "filename": "exospc-16.1.3.6.iso",
-            "version": "16.1.3.6",
-            "md5sum": "4c17b2bf2a4909527f6c866a68ba406e",
-            "filesize": 35758080,
-            "download_url": "https://github.com/extremenetworks/Virtual_EXOS",
-            "direct_download_url": "https://github.com/extremenetworks/Virtual_EXOS/blob/master/exospc-16.1.3.6.iso?raw=true"
-        },
-        {
-            "filename": "exospc-16.1.2.14.iso",
-            "version": "16.1.2.14",
-            "md5sum": "140cdc11f426156ffcbde150b2f46768",
-            "filesize": 35743744,
-            "download_url": "https://github.com/extremenetworks/Virtual_EXOS",
-            "direct_download_url": "https://github.com/extremenetworks/Virtual_EXOS/blob/master/exospc-16.1.2.14.iso?raw=true"
-        },
-        {
-            "filename": "empty8G.qcow2",
-            "version": "1.0",
-            "md5sum": "f1d2c25b6990f99bd05b433ab603bdb4",
-            "filesize": 197120,
-            "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
-            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty8G.qcow2/download"
+            "md5sum": "654606809b6fd3bca400377483eb4a79",
+            "filesize": 117560832,
+            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v21.1.1.4-disk1.qcow2"
        }
+
    ],
+    
    "versions": [
+        {
+            "name": "30.1.1.4",
+            "images": {
+                "hda_disk_image": "EXOS-VM_v30.1.1.4.qcow2"
+            }
+        },
+		{
+            "name": "22.6.1.4",
+            "images": {
+                "hda_disk_image": "EXOS-VM_v22.6.1.4.qcow2"
+            }
+        },
+		{
+            "name": "22.5.1.7",
+            "images": {
+                "hda_disk_image": "EXOS-VM_v22.5.1.7.qcow2"
+            }
+        },
        {
            "name": "22.4.1.4",
            "images": {
-                "hda_disk_image": "empty8G.qcow2",
-                "cdrom_image": "exosvm-22.4.1.4.iso"
+                "hda_disk_image": "EXOS-VM_v22.4.1.4-disk1.qcow2"
+            }
+        },
+        {
+            "name": "22.3.1.4",
+            "images": {
+                "hda_disk_image": "EXOS-VM_v22.3.1.4patch1-4-disk1.qcow2"
            }
        },
        {
            "name": "22.2.1.5",
            "images": {
-                "hda_disk_image": "empty8G.qcow2",
-                "cdrom_image": "exosvm-22.2.1.5.iso"
+                "hda_disk_image": "EXOS-VM_v22.2.1.5-disk1.qcow2"
            }
        },
        {
            "name": "22.1.1.5",
            "images": {
-                "hda_disk_image": "empty8G.qcow2",
-                "cdrom_image": "exosvm-22.1.1.5.iso"
-            }
-        },
-        {
-            "name": "21.1.2.14",
-            "images": {
-                "hda_disk_image": "empty8G.qcow2",
-                "cdrom_image": "exosvm-21.1.2.14.iso"
+                "hda_disk_image": "EXOS-VM_v22.1.1.5-disk1.qcow2"
            }
        },
        {
            "name": "21.1.1.4",
            "images": {
-                "hda_disk_image": "empty8G.qcow2",
-                "cdrom_image": "exosvm-21.1.1.4.iso"
-            }
-        },
-        {
-            "name": "16.2.1.6",
-            "images": {
-                "hda_disk_image": "empty8G.qcow2",
-                "cdrom_image": "exospc-16.2.1.6.iso"
-            }
-        },
-        {
-            "name": "16.1.3.6",
-            "images": {
-                "hda_disk_image": "empty8G.qcow2",
-                "cdrom_image": "exospc-16.1.3.6.iso"
-            }
-        },
-        {
-            "name": "16.1.2.14",
-            "images": {
-                "hda_disk_image": "empty8G.qcow2",
-                "cdrom_image": "exospc-16.1.2.14.iso"
+                "hda_disk_image": "EXOS-VM_v21.1.1.4-disk1.qcow2"
            }
        }
    ]
@@ -0,0 +1,64 @@
+{
+    "name": "VOSS VM",
+    "category": "multilayer_switch",
+    "description": "The VOSS VM is a software emulation of a VSP8K switch.",
+    "vendor_name": "Extreme Networks",
+    "vendor_url": "http://www.extremenetworks.com",
+    "documentation_url": "http://www.extremenetworks.com/support/documentation",
+    "product_name": "VOSS_VM",
+    "registry_version": 3,
+    "status": "experimental",
+    "maintainer": "Extreme Networks",
+    "maintainer_email": "voss@extremenetworks.com",
+    "usage": "Boot up and login is rwa/rwa",
+    "symbol": ":/symbols/multilayer_switch.svg",
+    "first_port_name": "Mgmt",
+    "port_name_format": "1/{port1}",
+    "qemu":
+    {
+        "adapter_type": "e1000",
+        "adapters": 9,
+        "ram": 1024,
+        "hda_disk_interface": "ide",
+        "arch": "i386",
+        "console_type": "telnet",
+        "kvm": "allow",
+        "options": "-nographic"
+    },
+
+    "images":
+    [
+        {
+            "filename": "VOSSGNS3.7.1.0.0.qcow2",
+            "version": "voss_7.1.0.0",
+            "md5sum": "7bb2974efe1a1ab857debd9fa894dbe7",
+            "filesize": 193724416,
+            "direct_download_url": "https://stackingtool.extremenetworks.com/github/VOSSGNS3.7.1.0.0.qcow2"
+        },
+		{
+            "filename": "VOSSGNS3.7.0.0.0.img",
+            "version": "voss_7.0.0.0",
+            "md5sum": "65fe97461156aa88c836a90be1287649",
+            "filesize": 419430400,
+            "direct_download_url": "https://stackingtool.extremenetworks.com/github/VOSSGNS3.7.0.0.0.img"
+    	}
+    ],
+
+    "versions":
+    [
+        {
+            "name": "7.1.0.0",
+            "images":
+            {
+                "hda_disk_image": "VOSSGNS3.7.1.0.0.qcow2"
+            }
+        },
+		{
+            "name": "7.0.0.0",
+            "images": {
+                "hda_disk_image": "VOSSGNS3.7.0.0.0.img"
+        	}
+        }
+    ]
+
+}
@@ -27,6 +27,20 @@
        "options": "-smp 2 -cpu host"
    },
    "images": [
+        {
+            "filename": "BIGIP-14.0.0.3-0.0.4.qcow2",
+            "version": "14.0.0 HF3",
+            "md5sum": "dc80a7e436ff93e2f4092eece18d369b",
+            "filesize": 4550164480,
+            "download_url": "https://downloads.f5.com/esd/serveDownload.jsp?path=/big-ip/big-ip_v14.x/14.0.0/english/14.0.0.3_virtual-edition/&sw=BIG-IP&pro=big-ip_v14.x&ver=14.0.0&container=14.0.0.3_Virtual-Edition&file=BIGIP-14.0.0.3-0.0.4.ALL.qcow2.zip"
+        },
+        {
+            "filename": "BIGIP-13.1.0.5-0.0.5.qcow2",
+            "version": "13.1.0 HF5",
+            "md5sum": "567b70fe36af0f5364883e97e2c08807",
+            "filesize": 4402446336,
+            "download_url": "https://downloads.f5.com/esd/serveDownload.jsp?path=/big-ip/big-ip_v13.x/13.1.0/english/13.1.0.5_virtual-edition/&sw=BIG-IP&pro=big-ip_v13.x&ver=13.1.0&container=13.1.0.5_Virtual-Edition&file=BIGIP-13.1.0.5-0.0.5.ALL.qcow2.zip"
+        },
        {
            "filename": "BIGIP-13.1.0.2.0.0.6.qcow2",
            "version": "13.1.0 HF2",
@@ -55,6 +69,13 @@
            "filesize": 3833135104,
            "download_url": "https://downloads.f5.com/esd/serveDownload.jsp?path=/big-ip/big-ip_v13.x/13.0.0/english/virtual-edition/&sw=BIG-IP&pro=big-ip_v13.x&ver=13.0.0&container=Virtual-Edition&file=BIGIP-13.0.0.0.0.1645.ALL.qcow2.zip"
        },
+        {
+            "filename": "BIGIP-12.1.3.4-0.0.2.qcow2",
+            "version": "12.1.3 HF4",
+            "md5sum": "b2ec82816480c18af1d45ee833744ee8",
+            "filesize": 3383164928,
+            "download_url": "https://downloads.f5.com/esd/serveDownload.jsp?path=/big-ip/big-ip_v12.x/12.1.3/english/12.1.3.4_virtual-edition/&sw=BIG-IP&pro=big-ip_v12.x&ver=12.1.3&container=12.1.3.4_Virtual-Edition&file=BIGIP-12.1.3.4-0.0.2.ALL.qcow2.zip"
+        },
        {
            "filename": "BIGIP-12.1.2.1.0.271.LTM.qcow2",
            "version": "12.1.2 HF1",
@@ -121,6 +142,20 @@
        }
    ],
    "versions": [
+        {
+            "name": "14.0.0 HF3",
+            "images": {
+                "hda_disk_image": "BIGIP-14.0.0.3-0.0.4.qcow2",
+                "hdb_disk_image": "empty100G.qcow2"
+            }
+        },
+        {
+            "name": "13.1.0 HF5",
+            "images": {
+                "hda_disk_image": "BIGIP-13.1.0.5-0.0.5.qcow2",
+                "hdb_disk_image": "empty100G.qcow2"
+            }
+        },
        {
            "name": "13.1.0 HF2",
            "images": {
@@ -149,6 +184,13 @@
                "hdb_disk_image": "empty100G.qcow2"
            }
        },
+        {
+            "name": "12.1.3 HF4",
+            "images": {
+                "hda_disk_image": "BIGIP-12.1.3.4-0.0.2.qcow2",
+                "hdb_disk_image": "empty100G.qcow2"
+            }
+        },
        {
            "name": "12.1.2 HF1",
            "images": {
@@ -29,6 +29,20 @@
        "options": "-smp 2 -cpu host"
    },
    "images": [
+        {
+            "filename": "BIG-IQ-6.0.1.1.0.0.9.qcow2",
+            "version": "6.0.1.1",
+            "md5sum": "3ae32308fe39d5db555f7f1cdcc734dd",
+            "filesize": 3895787520,
+            "download_url": "https://downloads.f5.com/esd/serveDownload.jsp?path=/big-iq/big-iq_cm/6.0.1/english/v6.0.1.1/&sw=BIG-IQ&pro=big-iq_CM&ver=6.0.1&container=v6.0.1.1&file=BIG-IQ-6.0.1.1.0.0.9.qcow2.zip"
+        },
+        {
+            "filename": "BIG-IQ-5.4.0.2.24.7467.qcow2",
+            "version": "5.4.0.2",
+            "md5sum": "e3e6389438ba1e1676f507658f767e95",
+            "filesize": 3480748032,
+            "download_url": "https://downloads.f5.com/esd/serveDownload.jsp?path=/big-iq/big-iq_cm/5.4.0/english/virtual-edition_base-plus-hf2/&sw=BIG-IQ&pro=big-iq_CM&ver=5.4.0&container=Virtual-Edition_Base-Plus-HF2&file=BIG-IQ-5.4.0.2.24.7467.qcow2.zip"
+        },
        {
            "filename": "BIG-IQ-5.4.0.0.0.7437.qcow2",
            "version": "5.4.0",
@@ -81,6 +95,20 @@
        }
    ],
    "versions": [
+        {
+            "name": "6.0.1.1",
+            "images": {
+                "hda_disk_image": "BIG-IQ-6.0.1.1.0.0.9.qcow2",
+                "hdb_disk_image": "empty100G.qcow2"
+            }
+        },
+        {
+            "name": "5.4.0.2",
+            "images": {
+                "hda_disk_image": "BIG-IQ-5.4.0.2.24.7467.qcow2",
+                "hdb_disk_image": "empty100G.qcow2"
+            }
+        },
        {
            "name": "5.4.0",
            "images": {
@@ -0,0 +1,53 @@
+{
+    "name": "FortiADC Manager",
+    "category": "guest",
+    "description": "FortiADC Manager allows you to use a web- based user interface to configure remote FortiADC devices. It allows you to simplify and speed up the FortiADC deployment and update process by maintaining configuration templates and policy packages that you can modify and apply as needed.",
+    "vendor_name": "Fortinet",
+    "vendor_url": "http://www.fortinet.com/",
+    "documentation_url": "https://docs.fortinet.com/fortiadc-manager/",
+    "product_name": "FortiADC Manager",
+    "product_url": "https://www.fortinet.com/products/application-delivery-controller/fortiadc.html",
+    "registry_version": 3,
+    "status": "stable",
+    "maintainer": "GNS3 Team",
+    "maintainer_email": "developers@gns3.net",
+    "usage": "Default username is admin, no password is set.",
+    "port_name_format": "Port{port1}",
+    "symbol": "fortinet.svg",
+    "qemu": {
+        "adapter_type": "virtio-net-pci",
+        "adapters": 10,
+        "ram": 2048,
+        "hda_disk_interface": "virtio",
+        "hdb_disk_interface": "virtio",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "boot_priority": "c",
+        "kvm": "allow"
+    },
+    "images": [
+        {
+            "filename": "FADCManager-KVM-V500-build0020-FORTINET.out.kvm-boot.qcow2",
+            "version": "5.2.0",
+            "md5sum": "a79d04040848b704ce4efe925518fd3f",
+            "filesize": 70057984,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FADCManager-KVM-v500-data.qcow2",
+            "version": "5.x",
+            "md5sum": "b7500835594e62d8acb1c6ec43d597c1",
+            "filesize": 30998528,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        }
+    ],
+    "versions": [
+        {
+            "name": "5.2.0",
+            "images": {
+                "hda_disk_image": "FADCManager-KVM-V500-build0020-FORTINET.out.kvm-boot.qcow2",
+                "hdb_disk_image": "FADCManager-KVM-v500-data.qcow2"
+            }
+        }
+    ]
+}
@@ -28,12 +28,54 @@
    },
    "images": [
        {
-            "filename": "FAD_KVM-v400-FORTINET.out.kvm-data.qcow2",
-            "version": "4.x.x",
+            "filename": "FAD_KVM-FORTINET.out.kvm-data.qcow2",
+            "version": "ALL",
            "md5sum": "b7500835594e62d8acb1c6ec43d597c1",
            "filesize": 30998528,
            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
        },
+        {
+            "filename": "FAD_KVM-V500-build0442-FORTINET.out.kvm-boot.qcow2",
+            "version": "5.2.2",
+            "md5sum": "7d959ed264b064716e8f1378fceed48f",
+            "filesize": 104857600,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FAD_KVM-V500-build0423-FORTINET.out.kvm-boot.qcow2",
+            "version": "5.2.0",
+            "md5sum": "993bcd0e8e5496fdacb78dffb3c9a9b3",
+            "filesize": 104333312,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FAD_KVM-V500-build0239-FORTINET.out.kvm-boot.qcow2",
+            "version": "5.1.1",
+            "md5sum": "f94323bc6415dd1477f2352bd3323d14",
+            "filesize": 75235328,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FAD_KVM-V500-build0056-FORTINET.out.kvm-boot.qcow2",
+            "version": "5.0.1",
+            "md5sum": "8b3b789fb540b2c30066f66bcbe7f307",
+            "filesize": 75038720,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FAD_KVM-V500-build0045-FORTINET.out.kvm-boot.qcow2",
+            "version": "5.0.0",
+            "md5sum": "d7381b3fb7a4534370ce8983e441d888",
+            "filesize": 74383360,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FAD_KVM-V400-build0999-FORTINET.out.kvm-boot.qcow2",
+            "version": "4.8.5",
+            "md5sum": "d7825b8d0962800c37ffa814a6b2ad45",
+            "filesize": 73334784,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
        {
            "filename": "FAD_KVM-V400-build0989-FORTINET.out.kvm-boot.qcow2",
            "version": "4.8.4",
@@ -155,123 +197,165 @@
        }
    ],
    "versions": [
+        {
+            "name": "5.2.2",
+            "images": {
+                "hda_disk_image": "FAD_KVM-V500-build0442-FORTINET.out.kvm-boot.qcow2",
+                "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
+            }
+        },
+        {
+            "name": "5.2.0",
+            "images": {
+                "hda_disk_image": "FAD_KVM-V500-build0423-FORTINET.out.kvm-boot.qcow2",
+                "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
+            }
+        },
+        {
+            "name": "5.1.1",
+            "images": {
+                "hda_disk_image": "FAD_KVM-V500-build0239-FORTINET.out.kvm-boot.qcow2",
+                "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
+            }
+        },
+        {
+            "name": "5.0.1",
+            "images": {
+                "hda_disk_image": "FAD_KVM-V400-build0989-FORTINET.out.kvm-boot.qcow2",
+                "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
+            }
+        },
+        {
+            "name": "5.0.0",
+            "images": {
+                "hda_disk_image": "FAD_KVM-V400-build0989-FORTINET.out.kvm-boot.qcow2",
+                "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
+            }
+        },
+        {
+            "name": "4.8.5",
+            "images": {
+                "hda_disk_image": "FAD_KVM-V400-build0999-FORTINET.out.kvm-boot.qcow2",
+                "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
+            }
+        },
        {
            "name": "4.8.4",
            "images": {
                "hda_disk_image": "FAD_KVM-V400-build0989-FORTINET.out.kvm-boot.qcow2",
-                "hdb_disk_image": "FAD_KVM-v400-FORTINET.out.kvm-data.qcow2"
+                "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
            }
        },
        {
            "name": "4.8.3",
            "images": {
                "hda_disk_image": "FAD_KVM-V400-build0983-FORTINET.out.kvm-boot.qcow2",
-                "hdb_disk_image": "FAD_KVM-v400-FORTINET.out.kvm-data.qcow2"
+                "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
            }
        },
        {
            "name": "4.8.2",
            "images": {
                "hda_disk_image": "FAD_KVM-V400-build0977-FORTINET.out.kvm-boot.qcow2",
-                "hdb_disk_image": "FAD_KVM-v400-FORTINET.out.kvm-data.qcow2"
+                "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
            }
        },
        {
            "name": "4.8.1",
            "images": {
                "hda_disk_image": "FAD_KVM-V400-build0970-FORTINET.out.kvm-boot.qcow2",
-                "hdb_disk_image": "FAD_KVM-v400-FORTINET.out.kvm-data.qcow2"
+                "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
            }
        },
        {
            "name": "4.8.0",
            "images": {
                "hda_disk_image": "FAD_KVM-V400-build0937-FORTINET.out.kvm-boot.qcow2",
-                "hdb_disk_image": "FAD_KVM-v400-FORTINET.out.kvm-data.qcow2"
+                "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
            }
        },
        {
            "name": "4.7.4",
            "images": {
                "hda_disk_image": "FAD_KVM-V400-build0858-FORTINET.out.kvm-boot.qcow2",
-                "hdb_disk_image": "FAD_KVM-v400-FORTINET.out.kvm-data.qcow2"
+                "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
            }
        },
        {
            "name": "4.7.3",
            "images": {
                "hda_disk_image": "FAD_KVM-V400-build0849-FORTINET.out.kvm-boot.qcow2",
-                "hdb_disk_image": "FAD_KVM-v400-FORTINET.out.kvm-data.qcow2"
+                "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
            }
        },
        {
            "name": "4.7.2",
            "images": {
                "hda_disk_image": "FAD_KVM-V400-build0844-FORTINET.out.kvm-boot.qcow2",
-                "hdb_disk_image": "FAD_KVM-v400-FORTINET.out.kvm-data.qcow2"
+                "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
            }
        },
        {
            "name": "4.7.1",
            "images": {
                "hda_disk_image": "FAD_KVM-V400-build0832-FORTINET.out.kvm-boot.qcow2",
-                "hdb_disk_image": "FAD_KVM-v400-FORTINET.out.kvm-data.qcow2"
+                "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
            }
        },
        {
            "name": "4.7.0",
            "images": {
                "hda_disk_image": "FAD_KVM-V400-build0828-FORTINET.out.kvm-boot.qcow2",
-                "hdb_disk_image": "FAD_KVM-v400-FORTINET.out.kvm-data.qcow2"
+                "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
            }
        },
        {
            "name": "4.6.2",
            "images": {
                "hda_disk_image": "FAD_KVM-V400-build0679-FORTINET.out.kvm-boot.qcow2",
-                "hdb_disk_image": "FAD_KVM-v400-FORTINET.out.kvm-data.qcow2"
+                "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
            }
        },
        {
            "name": "4.6.1",
            "images": {
                "hda_disk_image": "FAD_KVM-V400-build0677-FORTINET.out.kvm-boot.qcow2",
-                "hdb_disk_image": "FAD_KVM-v400-FORTINET.out.kvm-data.qcow2"
+                "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
            }
        },
        {
            "name": "4.6.0",
            "images": {
                "hda_disk_image": "FAD_KVM-V400-build0660-FORTINET.out.kvm-boot.qcow2",
-                "hdb_disk_image": "FAD_KVM-v400-FORTINET.out.kvm-data.qcow2"
+                "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
            }
        },
        {
            "name": "4.5.3",
            "images": {
                "hda_disk_image": "FAD_KVM-V400-build0605-FORTINET.out.kvm-boot.qcow2",
-                "hdb_disk_image": "FAD_KVM-v400-FORTINET.out.kvm-data.qcow2"
+                "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
            }
        },
        {
            "name": "4.5.2",
            "images": {
                "hda_disk_image": "FAD_KVM-v400-build0597-FORTINET.out.kvm-boot.qcow2",
-                "hdb_disk_image": "FAD_KVM-v400-FORTINET.out.kvm-data.qcow2"
+                "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
            }
        },
        {
            "name": "4.5.1",
            "images": {
                "hda_disk_image": "FAD_KVM-v400-build0581-FORTINET.out.kvm-boot.qcow2",
-                "hdb_disk_image": "FAD_KVM-v400-FORTINET.out.kvm-data.qcow2"
+                "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
            }
        },
        {
            "name": "4.5.0",
            "images": {
                "hda_disk_image": "FAD_KVM-v400-build0560-FORTINET.out.kvm-boot.qcow2",
-                "hdb_disk_image": "FAD_KVM-v400-FORTINET.out.kvm-data.qcow2"
+                "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
            }
        }
    ]
@@ -26,6 +26,48 @@
        "kvm": "allow"
    },
    "images": [
+        {
+            "filename": "FAZ_VM64_KVM-v6-build1050-FORTINET.out.kvm.qcow2",
+            "version": "6.2.0",
+            "md5sum": "dc123116e4c816d8b4dee244bd671844",
+            "filesize": 140177408,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FAZ_VM64_KVM-v6-build0255-FORTINET.out.kvm.qcow2",
+            "version": "6.0.3",
+            "md5sum": "14c98b20ed1d0729e2d04aad49ff1be5",
+            "filesize": 114589696,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FAZ_VM64_KVM-v6-build0205-FORTINET.out.kvm.qcow2",
+            "version": "6.0.2",
+            "md5sum": "1c9c6a99244aaf8b215c52194e1f82ed",
+            "filesize": 115777536,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FAZ_VM64_KVM-v6-build0092-FORTINET.out.kvm.qcow2",
+            "version": "6.0.0",
+            "md5sum": "e870087db55a095c75ddcafe73e1ea27",
+            "filesize": 117940224,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FAZ_VM64_KVM-v5-build1782-FORTINET.out.kvm.qcow2",
+            "version": "5.6.7",
+            "md5sum": "f67c115cc51e911802e9cbcb5cb0c8c2",
+            "filesize": 110862336,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FAZ_VM64_KVM-v5-build1631-FORTINET.out.kvm.qcow2",
+            "version": "5.6.2",
+            "md5sum": "c7f1cf26051b50b86e7e59b99e36756f",
+            "filesize": 105816064,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
        {
            "filename": "FAZ_VM64_KVM-v5-build1619-FORTINET.out.kvm.qcow2",
            "version": "5.6.1",
@@ -113,6 +155,48 @@
        }
    ],
    "versions": [
+        {
+            "name": "6.2.0",
+            "images": {
+                "hda_disk_image": "FAZ_VM64_KVM-v6-build1050-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "6.0.3",
+            "images": {
+                "hda_disk_image": "FAZ_VM64_KVM-v6-build0255-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "6.0.2",
+            "images": {
+                "hda_disk_image": "FAZ_VM64_KVM-v6-build0205-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "6.0.0",
+            "images": {
+                "hda_disk_image": "FAZ_VM64_KVM-v6-build0092-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "5.6.7",
+            "images": {
+                "hda_disk_image": "FAZ_VM64_KVM-v5-build1782-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "5.6.2",
+            "images": {
+                "hda_disk_image": "FAZ_VM64_KVM-v5-build1631-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
        {
            "name": "5.6.1",
            "images": {
@@ -26,6 +26,41 @@
        "kvm": "allow"
    },
    "images": [
+        {
+            "filename": "FAC_VM_KVM-v6-build0010-FORTINET.out.kvm.qcow2",
+            "version": "6.0.0",
+            "md5sum": "6699c0b24e54dc6a5215ba3945abb364",
+            "filesize": 74317824,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FAC_VM_KVM-v5-build0366-FORTINET.out.kvm.qcow2",
+            "version": "5.5.0",
+            "md5sum": "c6ae060f8840b467efac6701a7e8e6af",
+            "filesize": 72982528,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FAC_VM_KVM-v5-build0297-FORTINET.out.kvm.qcow2",
+            "version": "5.4.1",
+            "md5sum": "e63bcaae040f903f9de315f582702619",
+            "filesize": 72617984,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FAC_VM_KVM-v5-build0163-FORTINET.out.kvm.qcow2",
+            "version": "5.2.2",
+            "md5sum": "e746b3c6c29b0356ec6b90ed14d4b098",
+            "filesize": 71565312,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FAC_VM_KVM-v500-build0161-FORTINET.out.kvm.qcow2",
+            "version": "5.2.1",
+            "md5sum": "c46ad2de4a20296ebd35b3fcc2d81a1d",
+            "filesize": 72536064,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
        {
            "filename": "FAC_VM_KVM-v5-build0155-FORTINET.out.kvm.qcow2",
            "version": "5.2.0",
@@ -62,47 +97,82 @@
            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
        },
        {
-            "filename": "FAC_VM_KVM-v500-DATADRIVE.qcow2",
-            "version": "5.x.x",
+            "filename": "FAC_VM_KVM-ALL-DATADRIVE.qcow2",
+            "version": "All",
            "md5sum": "09bad6cfe6301930adbc829eb8a67149",
            "filesize": 258048,
            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
        }
    ],
    "versions": [
+        {
+            "name": "6.0.0",
+            "images": {
+                "hda_disk_image": "FAC_VM_KVM-v6-build0010-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "FAC_VM_KVM-ALL-DATADRIVE.qcow2"
+            }
+        },
+        {
+            "name": "5.5.0",
+            "images": {
+                "hda_disk_image": "FAC_VM_KVM-v5-build0366-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "FAC_VM_KVM-ALL-DATADRIVE.qcow2"
+            }
+        },
+        {
+            "name": "5.4.1",
+            "images": {
+                "hda_disk_image": "FAC_VM_KVM-v5-build0297-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "FAC_VM_KVM-ALL-DATADRIVE.qcow2"
+            }
+        },
+        {
+            "name": "5.2.2",
+            "images": {
+                "hda_disk_image": "FAC_VM_KVM-v5-build0163-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "FAC_VM_KVM-ALL-DATADRIVE.qcow2"
+            }
+        },
+        {
+            "name": "5.2.1",
+            "images": {
+                "hda_disk_image": "FAC_VM_KVM-v500-build0161-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "FAC_VM_KVM-ALL-DATADRIVE.qcow2"
+            }
+        },
        {
            "name": "5.2.0",
            "images": {
                "hda_disk_image": "FAC_VM_KVM-v5-build0155-FORTINET.out.kvm.qcow2",
-                "hdb_disk_image": "FAC_VM_KVM-v500-DATADRIVE.qcow2"
+                "hdb_disk_image": "FAC_VM_KVM-ALL-DATADRIVE.qcow2"
            }
        },
        {
            "name": "5.1.2",
            "images": {
                "hda_disk_image": "FAC_VM_KVM-v500-build0091-FORTINET.out.kvm.qcow2",
-                "hdb_disk_image": "FAC_VM_KVM-v500-DATADRIVE.qcow2"
+                "hdb_disk_image": "FAC_VM_KVM-ALL-DATADRIVE.qcow2"
            }
        },
        {
            "name": "5.1.1",
            "images": {
                "hda_disk_image": "FAC_VM_KVM-v500-build0086-FORTINET.out.kvm.qcow2",
-                "hdb_disk_image": "FAC_VM_KVM-v500-DATADRIVE.qcow2"
+                "hdb_disk_image": "FAC_VM_KVM-ALL-DATADRIVE.qcow2"
            }
        },
        {
            "name": "5.1.0",
            "images": {
                "hda_disk_image": "FAC_VM_KVM-v500-build0083-FORTINET.out.kvm.qcow2",
-                "hdb_disk_image": "FAC_VM_KVM-v500-DATADRIVE.qcow2"
+                "hdb_disk_image": "FAC_VM_KVM-ALL-DATADRIVE.qcow2"
            }
        },
        {
            "name": "5.0.0",
            "images": {
                "hda_disk_image": "FAC_VM_KVM-v500-build0012-FORTINET.out.kvm.qcow2",
-                "hdb_disk_image": "FAC_VM_KVM-v500-DATADRIVE.qcow2"
+                "hdb_disk_image": "FAC_VM_KVM-ALL-DATADRIVE.qcow2"
            }
        }
    ]
@@ -26,6 +26,27 @@
        "kvm": "require"
    },
    "images": [
+        {
+            "filename": "FCHKVM-v400-build0230-FORTINET.out.kvm.qcow2",
+            "version": "4.2.9",
+            "md5sum": "a3583f162004da2f1e0b751e7b23504a",
+            "filesize": 27672576,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FCHKVM-v400-build0226-FORTINET.out.kvm.qcow2",
+            "version": "4.2.8",
+            "md5sum": "17efdc8f037c8ec1d1fc67ae262f619e",
+            "filesize": 27676672,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FCHKVM-v400-build0222-FORTINET.out.kvm.qcow2",
+            "version": "4.2.7",
+            "md5sum": "d77790e414f4e2b31c756906a720e681",
+            "filesize": 27631616,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
        {
            "filename": "FCHKVM-v400-build0216-FORTINET.out.kvm.qcow2",
            "version": "4.2.6",
@@ -99,6 +120,27 @@
        }
    ],
    "versions": [
+        {
+            "name": "4.2.9",
+            "images": {
+                "hda_disk_image": "FCHKVM-v400-build0230-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty100G.qcow2"
+            }
+        },
+        {
+            "name": "4.2.8",
+            "images": {
+                "hda_disk_image": "FCHKVM-v400-build0226-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty100G.qcow2"
+            }
+        },
+        {
+            "name": "4.2.7",
+            "images": {
+                "hda_disk_image": "FCHKVM-v400-build0222-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty100G.qcow2"
+            }
+        },
        {
            "name": "4.2.6",
            "images": {
@@ -26,6 +26,41 @@
        "kvm": "allow"
    },
    "images": [
+        {
+            "filename": "FGT_VM64_KVM-v6-build0866-FORTINET.out.kvm.qcow2",
+            "version": "6.2.0",
+            "md5sum": "588df9ba0db485976f6681810001ae73",
+            "filesize": 57868288,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FGT_VM64_KVM-v6-build0200-FORTINET.out.kvm.qcow2",
+            "version": "6.0.3",
+            "md5sum": "be6f74ea13da09cf0b68e87234e2d8d5",
+            "filesize": 51552256,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FGT_VM64_KVM-v6-build0076-FORTINET.out.kvm.qcow2",
+            "version": "6.0.0",
+            "md5sum": "161728b413e097954bd640ade89dfeb1",
+            "filesize": 46104576,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FGT_VM64_KVM-v5-build1653-FORTINET.out.kvm.qcow2",
+            "version": "5.6.7",
+            "md5sum": "202e1ed7582b02493be63f14cc48c2cb",
+            "filesize": 43180032,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FGT_VM64_KVM-v5-build1575-FORTINET.out.kvm.qcow2",
+            "version": "5.6.4",
+            "md5sum": "c312ea8ec1afffb73858fb1b15c095ef",
+            "filesize": 41594880,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
        {
            "filename": "FGT_VM64_KVM-v5-build1547-FORTINET.out.kvm.qcow2",
            "version": "5.6.3",
@@ -54,6 +89,13 @@
            "filesize": 38760448,
            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
        },
+        {
+            "filename": "FGT_VM64_KVM-v5-build1220-FORTINET.out.kvm.qcow2",
+            "version": "5.4.10",
+            "md5sum": "7444d6c85ef6b937a98163482caa5a90",
+            "filesize": 39043072,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
        {
            "filename": "FGT_VM64_KVM-v5-build1183-FORTINET.out.kvm.qcow2",
            "version": "5.4.8",
@@ -183,6 +225,41 @@
        }
    ],
    "versions": [
+        {
+            "name": "6.2.0",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v6-build0866-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "6.0.3",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v6-build0200-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "6.0.0",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v6-build0076-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "5.6.7",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v5-build1653-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "5.6.4",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v5-build1575-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
        {
            "name": "5.6.3",
            "images": {
@@ -211,6 +288,13 @@
                "hdb_disk_image": "empty30G.qcow2"
            }
        },
+        {
+            "name": "5.4.10",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v5-build1220-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
        {
            "name": "5.4.8",
            "images": {
@@ -26,6 +26,34 @@
        "kvm": "allow"
    },
    "images": [
+        {
+            "filename": "FML_VMKV-64-v60-build0143-FORTINET.out.kvm.qcow2",
+            "version": "6.0.4",
+            "md5sum": "e6401ecfe9b145256cccb29757bbddfe",
+            "filesize": 98959360,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FML_VMKV-64-v60-build0126-FORTINET.out.kvm.qcow2",
+            "version": "6.0.3",
+            "md5sum": "b062636f029ff0f3d4b74451cc70b755",
+            "filesize": 96731136,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FML_VMKV-64-v54-build0719-FORTINET.out.kvm.qcow2",
+            "version": "5.4.5",
+            "md5sum": "e2f202efd28039a6f1f4ebb7ee69e214",
+            "filesize": 97255424,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FML_VMKV-64-v54-build0714-FORTINET.out.kvm.qcow2",
+            "version": "5.4.4",
+            "md5sum": "6a3155d9cee6af3ecb016e59c0a0765f",
+            "filesize": 93519872,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
        {
            "filename": "FML_VMKV-64-v54-build0712-FORTINET.out.kvm.qcow2",
            "version": "5.4.3",
@@ -54,6 +82,13 @@
            "filesize": 101253120,
            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
        },
+        {
+            "filename": "FML_VMKV-64-v53-build0653-FORTINET.out.kvm.qcow2",
+            "version": "5.3.12",
+            "md5sum": "aed4dcb17de047860736d8742362a754",
+            "filesize": 89980928,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
        {
            "filename": "FML_VMKV-64-v53-build0648-FORTINET.out.kvm.qcow2",
            "version": "5.3.11",
@@ -134,6 +169,34 @@
        }
    ],
    "versions": [
+        {
+            "name": "6.0.4",
+            "images": {
+                "hda_disk_image": "FML_VMKV-64-v60-build0143-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "6.0.3",
+            "images": {
+                "hda_disk_image": "FML_VMKV-64-v60-build0126-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "5.4.5",
+            "images": {
+                "hda_disk_image": "FML_VMKV-64-v54-build0719-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "5.4.4",
+            "images": {
+                "hda_disk_image": "FML_VMKV-64-v54-build0714-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
        {
            "name": "5.4.3",
            "images": {
@@ -162,6 +225,13 @@
                "hdb_disk_image": "empty30G.qcow2"
            }
        },
+        {
+            "name": "5.3.12",
+            "images": {
+                "hda_disk_image": "FML_VMKV-64-v53-build0653-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
        {
            "name": "5.3.11",
            "images": {
@@ -26,6 +26,41 @@
        "kvm": "allow"
    },
    "images": [
+        {
+            "filename": "FMG_VM64_KVM-v6-build1050-FORTINET.out.kvm.qcow2",
+            "version": "6.2.0",
+            "md5sum": "c19d2527f91ad1bbafbde5bf08487867",
+            "filesize": 126894080,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FMG_VM64_KVM-v6-build0255-FORTINET.out.kvm.qcow2",
+            "version": "6.0.3",
+            "md5sum": "5f34d52d9289b0be2a4c04943446ea39",
+            "filesize": 115703808,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FMG_VM64_KVM-v6-build0205-FORTINET.out.kvm.qcow2",
+            "version": "6.0.2",
+            "md5sum": "8f748649c537d9b5466b24c5b4e62017",
+            "filesize": 116981760,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FMG_VM64_KVM-v6-build0092-FORTINET.out.kvm.qcow2",
+            "version": "6.0.0",
+            "md5sum": "73bfe1bc70124521a524d857646b9c2e",
+            "filesize": 119066624,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FMG_VM64_KVM-v5-build1631-FORTINET.out.kvm.qcow2",
+            "version": "5.6.2",
+            "md5sum": "c81cc247e8eb03249b475fe0e847653e",
+            "filesize": 106946560,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
        {
            "filename": "FMG_VM64_KVM-v5-build1619-FORTINET.out.kvm.qcow2",
            "version": "5.6.1",
@@ -113,6 +148,34 @@
        }
    ],
    "versions": [
+        {
+            "name": "6.2.0",
+            "images": {
+                "hda_disk_image": "FMG_VM64_KVM-v6-build1050-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "6.0.2",
+            "images": {
+                "hda_disk_image": "FMG_VM64_KVM-v6-build0205-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "6.0.0",
+            "images": {
+                "hda_disk_image": "FMG_VM64_KVM-v6-build0092-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "5.6.2",
+            "images": {
+                "hda_disk_image": "FMG_VM64_KVM-v5-build1631-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
        {
            "name": "5.6.1",
            "images": {
@@ -0,0 +1,68 @@
+{
+    "name": "FortiProxy",
+    "category": "firewall",
+    "description": "FortiProxy is a secure web proxy that protects employees against internet-borne attacks by incorporating multiple detection techniques such as web filtering, DNS filtering, data loss prevention, antivirus, intrusion prevention and advanced threat protection. It helps enterprises enforce internet compliance using granular application control.",
+    "vendor_name": "Fortinet",
+    "vendor_url": "http://www.fortinet.com/",
+    "documentation_url": "https://docs.fortinet.com/fortiproxy/",
+    "product_name": "FortiProxy",
+    "product_url": "https://www.fortinet.com/content/dam/fortinet/assets/data-sheets/FortiProxy.pdf",
+    "registry_version": 3,
+    "status": "stable",
+    "maintainer": "GNS3 Team",
+    "maintainer_email": "developers@gns3.net",
+    "usage": "The system reboots twice during the initial setup; this is normal.\nDefault username is admin, no password is set.",
+    "port_name_format": "Port{port1}",
+    "symbol": "fortinet.svg",
+    "qemu": {
+        "adapter_type": "virtio-net-pci",
+        "adapters": 10,
+        "ram": 2048,
+        "hda_disk_interface": "virtio",
+        "hdb_disk_interface": "virtio",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "boot_priority": "c",
+        "kvm": "allow"
+    },
+    "images": [
+        {
+            "filename": "FPX_KVM-v100-build0162-FORTINET.out.kvm.qcow2",
+            "version": "1.1.2",
+            "md5sum": "00db4c04fcc4ac0d7c389a86c71d20a5",
+            "filesize": 44601344,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FPX_KVM-v100-build0147-FORTINET.out.kvm.qcow2",
+            "version": "1.1.0",
+            "md5sum": "d7c60693bfa58246e5063304cd450c89",
+            "filesize": 42668032,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "empty30G.qcow2",
+            "version": "1.0",
+            "md5sum": "3411a599e822f2ac6be560a26405821a",
+            "filesize": 197120,
+            "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
+            "direct_download_url": "http://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
+        }
+    ],
+    "versions": [
+        {
+            "name": "1.1.2",
+            "images": {
+                "hda_disk_image": "FPX_KVM-v100-build0162-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "1.1.0",
+            "images": {
+                "hda_disk_image": "FPX_KVM-v100-build0147-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        }
+    ]
+}
@@ -0,0 +1,68 @@
+{
+    "name": "FortiRecorder",
+    "category": "guest",
+    "description": "Surveillance systems can be complicated, expensive, and unreliable. But FortiCamera and FortiRecorder simplify IP video surveillance and there are no license fees. With FortiCams, you can see everything: doors, POS terminals, public areas--whatever you need to keep an eye on. FortiRecorder captures the images for easy monitoring, storage, and retrieval. Just plug in your cameras, connect the FortiRecorder, open a web browser or client application, and you're ready to go. It's easy to navigate and configure with event timelines and profile-driven configuration.",
+    "vendor_name": "Fortinet",
+    "vendor_url": "http://www.fortinet.com/",
+    "documentation_url": "https://docs.fortinet.com/fortirecorder/",
+    "product_name": "FortiRecorder",
+    "product_url": "https://www.fortinet.com/products/network-based-video-security/forticam-fortirecorder.html",
+    "registry_version": 3,
+    "status": "stable",
+    "maintainer": "GNS3 Team",
+    "maintainer_email": "developers@gns3.net",
+    "usage": "Use HTTPS when connecting to the WebUI.\nDefault username is admin, no password is set.",
+    "port_name_format": "Port{port1}",
+    "symbol": "fortinet.svg",
+    "qemu": {
+        "adapter_type": "virtio-net-pci",
+        "adapters": 10,
+        "ram": 2048,
+        "hda_disk_interface": "virtio",
+        "hdb_disk_interface": "virtio",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "boot_priority": "c",
+        "kvm": "allow"
+    },
+    "images": [
+        {
+            "filename": "FRC_VMKV-64-v27-build0700-FORTINET.out.kvm.qcow2",
+            "version": "2.7.1",
+            "md5sum": "3736c66af7d958fc672fe29439b405b8",
+            "filesize": 79429632,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FRC_VMKV-64-v26-build0607-FORTINET.out.kvm.qcow2",
+            "version": "2.6.3",
+            "md5sum": "ffa5d42119de576631673516f60e028b",
+            "filesize": 63569920,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "empty30G.qcow2",
+            "version": "1.0",
+            "md5sum": "3411a599e822f2ac6be560a26405821a",
+            "filesize": 197120,
+            "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
+            "direct_download_url": "http://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
+        }
+    ],
+    "versions": [
+        {
+            "name": "2.7.1",
+            "images": {
+                "hda_disk_image": "FRC_VMKV-64-v27-build0700-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "2.6.3",
+            "images": {
+                "hda_disk_image": "FRC_VMKV-64-v26-build0607-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        }
+    ]
+}
@@ -27,6 +27,34 @@
        "options": "-smp 2"
    },
    "images": [
+        {
+            "filename": "FSA_KVM-v300-build0060-FORTINET.out.kvm.qcow2",
+            "version": "3.0.4",
+            "md5sum": "7e744c4d62430917aea4533672710b5a",
+            "filesize": 157221376,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FSA_KVM-v300-build0049-FORTINET.out.kvm.qcow2",
+            "version": "3.0.3",
+            "md5sum": "3ef1f05124d13e23332b8b90f8f71c2c",
+            "filesize": 156828160,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FSA_KVM-v300-build0029-FORTINET.out.kvm.qcow2",
+            "version": "3.0.1",
+            "md5sum": "a2f6c5297a722c5dba40327734a6e0ac",
+            "filesize": 153158144,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FSA_KVM-v200-build0340-FORTINET.out.kvm.qcow2",
+            "version": "2.5.2",
+            "md5sum": "527f3225bd3fbd4ba23779cc1987d2ed",
+            "filesize": 117834240,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
        {
            "filename": "FSA_KVM-v200-build0329-FORTINET.out.kvm.qcow2",
            "version": "2.5.1",
@@ -70,54 +98,82 @@
            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
        },
        {
-            "filename": "FSA_v200-datadrive.qcow2",
-            "version": "2.x",
+            "filename": "FSA-datadrive.qcow2",
+            "version": "All",
            "md5sum": "f2dc0a8fc7591699c364aff400369157",
            "filesize": 200192,
            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
        }
    ],
    "versions": [
+        {
+            "name": "3.0.4",
+            "images": {
+                "hda_disk_image": "FSA_KVM-v300-build0060-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "FSA-datadrive.qcow2"
+            }
+        },
+        {
+            "name": "3.0.3",
+            "images": {
+                "hda_disk_image": "FSA_KVM-v300-build0049-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "FSA-datadrive.qcow2"
+            }
+        },
+        {
+            "name": "3.0.1",
+            "images": {
+                "hda_disk_image": "FSA_KVM-v300-build0029-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "FSA-datadrive.qcow2"
+            }
+        },
+        {
+            "name": "2.5.2",
+            "images": {
+                "hda_disk_image": "FSA_KVM-v200-build0340-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "FSA-datadrive.qcow2"
+            }
+        },
        {
            "name": "2.5.1",
            "images": {
                "hda_disk_image": "FSA_KVM-v200-build0329-FORTINET.out.kvm.qcow2",
-                "hdb_disk_image": "FSA_v200-datadrive.qcow2"
+                "hdb_disk_image": "FSA-datadrive.qcow2"
            }
        },
        {
            "name": "2.4.1",
            "images": {
                "hda_disk_image": "FSA_KVM-v200-build0261-FORTINET.out.kvm.qcow2",
-                "hdb_disk_image": "FSA_v200-datadrive.qcow2"
+                "hdb_disk_image": "FSA-datadrive.qcow2"
            }
        },
        {
            "name": "2.4.0",
            "images": {
                "hda_disk_image": "FSA_KVM-v200-build0252-FORTINET.out.kvm.qcow2",
-                "hdb_disk_image": "FSA_v200-datadrive.qcow2"
+                "hdb_disk_image": "FSA-datadrive.qcow2"
            }
        },
        {
            "name": "2.3.3",
            "images": {
                "hda_disk_image": "FSA_KVM-v200-build0205-FORTINET.out.kvm.qcow2",
-                "hdb_disk_image": "FSA_v200-datadrive.qcow2"
+                "hdb_disk_image": "FSA-datadrive.qcow2"
            }
        },
        {
            "name": "2.3.2",
            "images": {
                "hda_disk_image": "FSA_KVM-v200-build0195-FORTINET.out.kvm.qcow2",
-                "hdb_disk_image": "FSA_v200-datadrive.qcow2"
+                "hdb_disk_image": "FSA-datadrive.qcow2"
            }
        },
        {
            "name": "2.3.0",
            "images": {
                "hda_disk_image": "FSA_VM-v200-build0183-FORTINET.out.kvm.qcow2",
-                "hdb_disk_image": "FSA_v200-datadrive.qcow2"
+                "hdb_disk_image": "FSA-datadrive.qcow2"
            }
        }
    ]
@@ -11,7 +11,7 @@
    "status": "stable",
    "maintainer": "GNS3 Team",
    "maintainer_email": "developers@gns3.net",
-    "usage": "This is the Super/Worker component. Default credentials:\n- admin / admin*1\n - root / ProspectHills\n\nIf you get a 503 error on the WebUI, run /opt/phoenix/deployment/jumpbox/phinitsuper as root.",
+    "usage": "This is the Super/Worker component. Default credentials:\n- admin / admin*1\n - root / ProspectHills\n\nIf you get a 503 error on the WebUI, run /opt/phoenix/deployment/jumpbox/phinitsuper as root.\n\nMake sure that Super, Worker(s), Collector(s) and Report Server can connect to FortiSIEM hosted CentOS repo on https port 443 under the URLs below. Otherwise, some packages may not install and 5.0.0 binaries will not run.\n- https://os-pkgs-cdn.fortisiem.fortinet.com/centos6/\n- https://os-pkgs.fortisiem.fortinet.com/centos6/",
    "port_name_format": "Port{port1}",
    "symbol": "fortinet.svg",
    "qemu": {
@@ -28,6 +28,69 @@
        "options": "-smp 4"
    },
    "images": [
+        {
+            "filename": "FortiSIEM-VA-5.2.1.1553-OS.qcow2",
+            "version": "5.2.1",
+            "md5sum": "9dc3f4a9614b65c83d3e9733248cbcea",
+            "filesize": 3902208000,
+            "download_url": "https://images-cdn.fortisiem.fortinet.com/VirtualAppliances/release510.html"
+        },
+        {
+            "filename": "FortiSIEM-VA-5.2.1.1553-CMDB.qcow2",
+            "version": "5.2.1",
+            "md5sum": "ea3f69191eb803cdf021227ec666bf7b",
+            "filesize": 46858240,
+            "download_url": "https://images-cdn.fortisiem.fortinet.com/VirtualAppliances/release510.html"
+        },
+        {
+            "filename": "FortiSIEM-VA-5.2.1.1553-SVN.qcow2",
+            "version": "5.2.1",
+            "md5sum": "eff32e40baf6ede7bc57ad8d241812ad",
+            "filesize": 46858240,
+            "download_url": "https://images-cdn.fortisiem.fortinet.com/VirtualAppliances/release510.html"
+        },
+        {
+            "filename": "FortiSIEM-VA-5.1.0.1336.qcow2",
+            "version": "5.1.0",
+            "md5sum": "753685ee68287c7a56f9da53566ac522",
+            "filesize": 10376904704,
+            "download_url": "https://images-cdn.fortisiem.fortinet.com/VirtualAppliances/release510.html"
+        },
+        {
+            "filename": "FortiSIEM-VA-5.1.0.1336-1.qcow2",
+            "version": "5.1.0",
+            "md5sum": "6ffb7e16d89a6731fc077982cb012ee2",
+            "filesize": 46858240,
+            "download_url": "https://images-cdn.fortisiem.fortinet.com/VirtualAppliances/release510.html"
+        },
+        {
+            "filename": "FortiSIEM-VA-5.1.0.1336-2.qcow2",
+            "version": "5.1.0",
+            "md5sum": "8185e537ce222c2e8407e9bf08e604bb",
+            "filesize": 46858240,
+            "download_url": "https://images-cdn.fortisiem.fortinet.com/VirtualAppliances/release510.html"
+        },
+        {
+            "filename": "FortiSIEM-VA-5.0.0.1201.qcow2",
+            "version": "5.0.0",
+            "md5sum": "1f2f0b1d84e89495fc5b5ca722cb5710",
+            "filesize": 10029432832,
+            "download_url": "https://images-cdn.fortisiem.fortinet.com/VirtualAppliances/release500.html"
+        },
+        {
+            "filename": "FortiSIEM-VA-5.0.0.1201-1.qcow2",
+            "version": "5.0.0",
+            "md5sum": "88e96259f44a82b7c545b82925880513",
+            "filesize": 46858240,
+            "download_url": "https://images-cdn.fortisiem.fortinet.com/VirtualAppliances/release500.html"
+        },
+        {
+            "filename": "FortiSIEM-VA-5.0.0.1201-2.qcow2",
+            "version": "5.0.0",
+            "md5sum": "58d61498e1adc1df062fc12113d42d86",
+            "filesize": 46858240,
+            "download_url": "https://images-cdn.fortisiem.fortinet.com/VirtualAppliances/release500.html"
+        },
        {
            "filename": "FortiSIEM-VA-KVM-4.10.0.1102.qcow2",
            "version": "4.10.0",
@@ -72,6 +135,30 @@
        }
    ],
    "versions": [
+        {
+            "name": "5.2.1",
+            "images": {
+                "hda_disk_image": "FortiSIEM-VA-5.2.1.1553-OS.qcow2",
+                "hdb_disk_image": "FortiSIEM-VA-5.2.1.1553-CMDB.qcow2",
+                "hdc_disk_image": "FortiSIEM-VA-5.2.1.1553-SVN.qcow2"
+            }
+        },
+        {
+            "name": "5.1.0",
+            "images": {
+                "hda_disk_image": "FortiSIEM-VA-5.1.0.1336.qcow2",
+                "hdb_disk_image": "FortiSIEM-VA-5.1.0.1336-1.qcow2",
+                "hdc_disk_image": "FortiSIEM-VA-5.1.0.1336-2.qcow2"
+            }
+        },
+        {
+            "name": "5.0.0",
+            "images": {
+                "hda_disk_image": "FortiSIEM-VA-5.0.0.1201.qcow2",
+                "hdb_disk_image": "FortiSIEM-VA-5.0.0.1201-1.qcow2",
+                "hdc_disk_image": "FortiSIEM-VA-5.0.0.1201-2.qcow2"
+            }
+        },
        {
            "name": "4.10.0",
            "images": {
@@ -26,6 +26,48 @@
        "kvm": "allow"
    },
    "images": [
+        {
+            "filename": "FWB_KVM-v600-build0383-FORTINET.out.kvm.qcow2",
+            "version": "6.1.0",
+            "md5sum": "d2dbbde9f03eb716a54119cc3e6055c4",
+            "filesize": 190120448,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FWB_KVM-v600-build0056-FORTINET.out.kvm.qcow2",
+            "version": "6.0.2",
+            "md5sum": "cc7800bc6c2dd60c583d2d4ef1965e01",
+            "filesize": 156959232,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FWB_KVM-v600-build0036-FORTINET.out.kvm.qcow2",
+            "version": "6.0.1",
+            "md5sum": "220170383b66a6f8091729d67a8fef3e",
+            "filesize": 138412544,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FWB_KVM-v500-build1618-FORTINET.out.kvm.qcow2",
+            "version": "5.9.1",
+            "md5sum": "12bafff7bbfbf9a49554c6378f0e1a46",
+            "filesize": 132579840,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FWB_KVM-v500-build1609-FORTINET.out.kvm.qcow2",
+            "version": "5.9.0",
+            "md5sum": "a957ae3d60eabc685fcda015c31a5d01",
+            "filesize": 140837376,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FWB_KVM-v500-build1413-FORTINET.out.kvm.qcow2",
+            "version": "5.8.6",
+            "md5sum": "910fefe796daa5c963b0bde121996306",
+            "filesize": 105775616,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
        {
            "filename": "FWB_KVM-v500-build0739-FORTINET.out.kvm-log.qcow2",
            "version": "5.5.4",
@@ -60,9 +102,60 @@
            "md5sum": "0a613191948d3618ae16cd9f11988448",
            "filesize": 87162880,
            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "empty30G.qcow2",
+            "version": "1.0",
+            "md5sum": "3411a599e822f2ac6be560a26405821a",
+            "filesize": 197120,
+            "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
+            "direct_download_url": "http://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
        }
+
    ],
    "versions": [
+        {
+            "name": "6.1.0",
+            "images": {
+                "hda_disk_image": "FWB_KVM-v600-build0383-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "6.0.2",
+            "images": {
+                "hda_disk_image": "FWB_KVM-v600-build0056-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "6.0.1",
+            "images": {
+                "hda_disk_image": "FWB_KVM-v600-build0036-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "5.9.1",
+            "images": {
+                "hda_disk_image": "FWB_KVM-v500-build1618-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "5.9.0",
+            "images": {
+                "hda_disk_image": "FWB_KVM-v500-build1609-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "5.8.6",
+            "images": {
+                "hda_disk_image": "FWB_KVM-v500-build1413-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
        {
            "name": "5.5.4",
            "images": {
@@ -22,6 +22,24 @@
        "kvm": "require"
    },
    "images": [
+        {
+            "filename": "FreeBSD-12.0-RELEASE-amd64.qcow2",
+            "version": "12.0",
+            "md5sum": "4d2126ba79dad224628be6f25a908bd8",
+            "filesize": 2644836352,
+            "download_url": "https://www.freebsd.org/where.html",
+            "direct_download_url": "https://download.freebsd.org/ftp/releases/VM-IMAGES/12.0-RELEASE/amd64/Latest/FreeBSD-12.0-RELEASE-amd64.qcow2.xz",
+            "compression": "xz"
+        },
+        {
+            "filename": "FreeBSD-11.2-RELEASE-amd64.qcow2",
+            "version": "11.2",
+            "md5sum": "44d37e65be4bb4054f067911c84d074a",
+            "filesize": 1630076928,
+            "download_url": "https://www.freebsd.org/where.html",
+            "direct_download_url": "https://download.freebsd.org/ftp/releases/VM-IMAGES/11.2-RELEASE/amd64/Latest/FreeBSD-11.2-RELEASE-amd64.qcow2.xz",
+            "compression": "xz"
+        },
        {
            "filename": "FreeBSD-11.1-RELEASE-amd64.qcow2",
            "version": "11.1",
@@ -60,6 +78,18 @@
        }
    ],
    "versions": [
+        {
+            "name": "12.0",
+            "images": {
+                "hda_disk_image": "FreeBSD-12.0-RELEASE-amd64.qcow2"
+            }
+        },
+        {
+            "name": "11.2",
+            "images": {
+                "hda_disk_image": "FreeBSD-11.2-RELEASE-amd64.qcow2"
+            }
+        },
        {
            "name": "11.1",
            "images": {
@@ -24,6 +24,38 @@
        "kvm": "require"
    },
    "images": [
+        {
+            "filename": "FreeNAS-11.2-U3.iso",
+            "version": "11.2 U3",
+            "md5sum": "59ee32e2598a792eec0355b40a511251",
+            "filesize": 600387584,
+            "download_url": "http://www.freenas.org/download/",
+            "direct_download_url": "https://download.freenas.org/11.2/STABLE/U3/x64/FreeNAS-11.2-U3.iso"
+        },
+        {
+            "filename": "FreeNAS-11.2-RELEASE.iso",
+            "version": "11.2",
+            "md5sum": "bf4a9ebb19313c3d45f84c1550477727",
+            "filesize": 603410432,
+            "download_url": "http://www.freenas.org/download/",
+            "direct_download_url": "https://download.freenas.org/11.2/STABLE/RELEASE/x64/FreeNAS-11.2-RELEASE.iso"
+        },
+        {
+            "filename": "FreeNAS-11.1-U6.iso",
+            "version": "11.1 U6",
+            "md5sum": "633d6444cad903c707983b54e04fc053",
+            "filesize": 636065792,
+            "download_url": "http://www.freenas.org/download/",
+            "direct_download_url": "https://download.freenas.org/11/11.1-U6/x64/FreeNAS-11.1-U6.iso"
+        },
+        {
+            "filename": "FreeNAS-11.1-U4.iso",
+            "version": "11.1 U4",
+            "md5sum": "d75623e5671dbc82f32f4b4f8d46092f",
+            "filesize": 633833472,
+            "download_url": "http://www.freenas.org/download/",
+            "direct_download_url": "https://download.freenas.org/11/11.1-U4/x64/FreeNAS-11.1-U4.iso"
+        },
        {
            "filename": "FreeNAS-11.1-U1.iso",
            "version": "11.1 U1",
@@ -66,6 +98,38 @@
        }
    ],
    "versions": [
+        {
+            "name": "11.2 U3",
+            "images": {
+                "hda_disk_image": "empty30G.qcow2",
+                "hdb_disk_image": "empty30G.qcow2",
+                "cdrom_image": "FreeNAS-11.2-U3.iso"
+            }
+        },
+        {
+            "name": "11.2",
+            "images": {
+                "hda_disk_image": "empty30G.qcow2",
+                "hdb_disk_image": "empty30G.qcow2",
+                "cdrom_image": "FreeNAS-11.2-RELEASE.iso"
+            }
+        },
+        {
+            "name": "11.1 U6",
+            "images": {
+                "hda_disk_image": "empty30G.qcow2",
+                "hdb_disk_image": "empty30G.qcow2",
+                "cdrom_image": "FreeNAS-11.1-U6.iso"
+            }
+        },
+        {
+            "name": "11.1 U4",
+            "images": {
+                "hda_disk_image": "empty30G.qcow2",
+                "hdb_disk_image": "empty30G.qcow2",
+                "cdrom_image": "FreeNAS-11.1-U4.iso"
+            }
+        },
        {
            "name": "11.1 U1",
            "images": {
@@ -0,0 +1,72 @@
+{
+    "name": "FRR",
+    "category": "router",
+    "description": "FRRouting (FRR) is an IP routing protocol suite for Linux and Unix platforms which includes protocol daemons for BGP, IS-IS, LDP, OSPF, PIM, and RIP.\n\nFRR’s seamless integration with the native Linux/Unix IP networking stacks makes it applicable to a wide variety of use cases including connecting hosts/VMs/containers to the network, advertising network services, LAN switching and routing, Internet access routers, and Internet peering.\n\nThis is an unofficial VM or FRR.",
+    "vendor_name": "FRRouting Project",
+    "vendor_url": "https://frrouting.org",
+    "product_name": "FRR",
+    "registry_version": 3,
+    "status": "stable",
+    "maintainer": "Andras Dosztal",
+    "maintainer_email": "developers@gns3.net",
+    "usage": "Credentials: frr / frr\nIf you exit from the router CLI, you can get back by typing 'vtysh' to the console.",
+    "port_name_format": "ens{port3}",
+    "qemu": {
+        "adapter_type": "virtio-net-pci",
+        "adapters": 8,
+        "ram": 512,
+        "hda_disk_interface": "virtio",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "kvm": "require"
+    },
+    "images": [
+        {
+            "filename": "frr7.0-vm0.3.qcow2",
+            "version": "FRR7.0 - VM0.3",
+            "md5sum": "5fa8ce0ee74215f4c4a8c61778ee0b10",
+            "filesize": 2044657664,
+            "download_url": "https://sourceforge.net/projects/frr/files/",
+            "direct_download_url": "https://sourceforge.net/projects/frr/files/FRR7.0-VM0.3.qcow2.bz2/download",
+            "compression": "bzip2"
+        },
+        {
+            "filename": "frr6.0-vm0.2.qcow2",
+            "version": "FRR6.0 - VM0.2",
+            "md5sum": "bf5aebd98352716bfabb119abb2ba19a",
+            "filesize": 1762066432,
+            "download_url": "https://sourceforge.net/projects/frr/files/",
+            "direct_download_url": "https://sourceforge.net/projects/frr/files/frr6.0-vm0.2.qcow2.bz2/download",
+            "compression": "bzip2"
+        },
+        {
+            "filename": "frr4.0-vm0.1.qcow2",
+            "version": "FRR4.0 - VM0.1",
+            "md5sum": "e1dc58cbb2b71c58051538c07d412493",
+            "filesize": 1670643712,
+            "download_url": "https://sourceforge.net/projects/frr/files/",
+            "direct_download_url": "https://sourceforge.net/projects/frr/files/frr4.0-vm0.1.qcow2.bz2/download",
+            "compression": "bzip2"
+        }
+    ],
+    "versions": [
+        {
+            "name": "FRR7.0 - VM0.3",
+            "images": {
+                "hda_disk_image": "frr7.0-vm0.3.qcow2"
+            }
+        },
+        {
+            "name": "FRR6.0 - VM0.2",
+            "images": {
+                "hda_disk_image": "frr6.0-vm0.2.qcow2"
+            }
+        },
+        {
+            "name": "FRR4.0 - VM0.1",
+            "images": {
+                "hda_disk_image": "frr4.0-vm0.1.qcow2"
+            }
+        }
+    ]
+}
@@ -1,10 +1,10 @@
 {
    "name": "HPE VSR1001",
    "category": "router",
-    "description": "The HP VSR1000 Virtual Services Router Series is a software application, running on a server, which provides functionality similar to that of a physical router: robust routing between networked devices using a number of popular routing protocols. It also delivers the critical network services associated with today's enterprise routers such as VPN gateway, firewall and other security and traffic management functions.\n\nThe virtual services router (VSR) application runs on a hypervqcor on the server, and supports VMware vSphere and Linux KVM hypervqcors. From one to eight virtual CPUs are supported, depending on license.\n\nBecause the VSR1000 Series application runs the same HP Comware version 7 operating system as HP switches and routers, it enables significant operational savings. And being virtual, additional agility and ease of deployment is realized, as resources on the VSR can be dynamically allocated and upgraded upon demand as performance requirements grow.\n\nA variety of deployment models are supported including enterprise branch CPE routing, and cloud offload for small to medium workloads.",
+    "description": "The HPE VSR1000 Virtual Services Router Series is a software application, running on a server, which provides functionality similar to that of a physical router: robust routing between networked devices using a number of popular routing protocols. It also delivers the critical network services associated with today's enterprise routers such as VPN gateway, firewall and other security and traffic management functions.\n\nThe virtual services router (VSR) application runs on a hypervqcor on the server, and supports VMware vSphere and Linux KVM hypervqcors. From one to eight virtual CPUs are supported, depending on license.\n\nBecause the VSR1000 Series application runs the same HPE Comware version 7 operating system as HPE switches and routers, it enables significant operational savings. And being virtual, additional agility and ease of deployment is realized, as resources on the VSR can be dynamically allocated and upgraded upon demand as performance requirements grow.\n\nA variety of deployment models are supported including enterprise branch CPE routing, and cloud offload for small to medium workloads.",
    "vendor_name": "HPE",
    "vendor_url": "http://www.hpe.com",
-    "documentation_url": "http://h20195.www2.hpe.com/v2/default.aspx?cc=us&lc=en&oid=5443878",
+    "documentation_url": "https://support.hpe.com/hpesc/public/home/documentHome?document_type=135&sp4ts.oid=5195141",
    "product_name": "VSR1001",
    "product_url": "https://www.hpe.com/us/en/product-catalog/networking/networking-routers/pip.hpe-flexnetwork-vsr1000-virtual-services-router-series.5443163.html",
    "registry_version": 3,
@@ -20,67 +20,81 @@
        "arch": "x86_64",
        "console_type": "vnc",
        "boot_priority": "c",
-        "kvm": "require"
+        "kvm": "require",
+        "options": "-machine type=pc-1.0"
    },
    "images": [
+        {
+            "filename": "VSR1000_HPE-CMW710-E0519L03-X64.qco",
+            "version": "7.10.E0519L03",
+            "md5sum": "83e23d27e7c3ef7ce813e6aad31d74f7",
+            "filesize": 202047488,
+            "download_url": "https://h10145.www1.hpe.com/Downloads/DownloadSoftware.aspx?SoftwareReleaseUId=23726&ProductNumber=JG811AAE&lang=en&cc=us&prodSeriesId=5443163&SaidNumber="
+        },
        {
            "filename": "VSR1000_HPE-CMW710-R0327L01-X64.qco",
            "version": "7.10.R0327L01",
            "md5sum": "907de5140a4a029afe1c517cfc27ecde",
            "filesize": 138739712,
-            "download_url": "https://h10145.www1.hp.com/Downloads/DownloadSoftware.aspx?SoftwareReleaseUId=22702&ProductNumber=JG811AAE&lang=en&cc=us&prodSeriesId=5443163&SaidNumber="
+            "download_url": "https://h10145.www1.hpe.com/Downloads/DownloadSoftware.aspx?SoftwareReleaseUId=22702&ProductNumber=JG811AAE&lang=en&cc=us&prodSeriesId=5443163&SaidNumber="
        },
        {
            "filename": "VSR1000_HPE-CMW710-R0326-X64.qco",
            "version": "7.10.R0326",
            "md5sum": "4153d638bfa72ca72a957ea8682ad0e2",
            "filesize": 138412032,
-            "download_url": "https://h10145.www1.hp.com/Downloads/SoftwareReleases.aspx?ProductNumber=JG811AAE&lang=en&cc=us&prodSeriesId=5443163&SoftwareReleaseUId=11832&SerialNumber=&PurchaseDate="
+            "download_url": "https://h10145.www1.hpe.com/Downloads/DownloadSoftware.aspx?SoftwareReleaseUId=21985&ProductNumber=JG811AAE&lang=en&cc=us&prodSeriesId=5443163&SaidNumber="
        },
        {
            "filename": "VSR1000_HPE-CMW710-E0325-X64.qco",
            "version": "7.10.E0325",
            "md5sum": "a6731f3af86bee9b209a8b342be6bf75",
            "filesize": 111738880,
-            "download_url": "https://h10145.www1.hp.com/Downloads/SoftwareReleases.aspx?ProductNumber=JG811AAE&lang=en&cc=us&prodSeriesId=5443163&SoftwareReleaseUId=11832&SerialNumber=&PurchaseDate="
+            "download_url": "https://h10145.www1.hpe.com/Downloads/DownloadSoftware.aspx?SoftwareReleaseUId=20278&ProductNumber=JG811AAE&lang=en&cc=us&prodSeriesId=5443163&SaidNumber="
        },
        {
            "filename": "VSR1000_HPE-CMW710-E0518-X64.qco",
            "version": "7.10.E0518",
            "md5sum": "4991436442ae706df8041c69778a48df",
            "filesize": 201588736,
-            "download_url": "https://h10145.www1.hp.com/Downloads/SoftwareReleases.aspx?ProductNumber=JG811AAE&lang=en&cc=us&prodSeriesId=5443163&SoftwareReleaseUId=11832&SerialNumber=&PurchaseDate="
+            "download_url": "https://h10145.www1.hpe.com/Downloads/DownloadSoftware.aspx?SoftwareReleaseUId=21929&ProductNumber=JG811AAE&lang=en&cc=us&prodSeriesId=5443163&SaidNumber="
        },
        {
            "filename": "VSR1000_HPE-CMW710-E0324-X64.qco",
            "version": "7.10.E0324",
            "md5sum": "7a0ff32281284c042591c6181426effd",
            "filesize": 111411200,
-            "download_url": "https://h10145.www1.hp.com/Downloads/SoftwareReleases.aspx?ProductNumber=JG811AAE&lang=en&cc=us&prodSeriesId=5443163&SoftwareReleaseUId=11832&SerialNumber=&PurchaseDate="
+            "download_url": "https://h10145.www1.hpe.com/Downloads/DownloadSoftware.aspx?SoftwareReleaseUId=18977&ProductNumber=JG811AAE&lang=en&cc=us&prodSeriesId=5443163&SaidNumber="
        },
        {
            "filename": "VSR1000_HPE-CMW710-E0322P01-X64.qco",
            "version": "7.10.E0322P01",
            "md5sum": "0aa2dbe5910fa64eb8c623e083b21a5e",
            "filesize": 110428160,
-            "download_url": "https://h10145.www1.hp.com/Downloads/SoftwareReleases.aspx?ProductNumber=JG811AAE&lang=en&cc=us&prodSeriesId=5443163&SoftwareReleaseUId=11832&SerialNumber=&PurchaseDate="
+            "download_url": "https://h10145.www1.hpe.com/Downloads/DownloadSoftware.aspx?SoftwareReleaseUId=18976&ProductNumber=JG811AAE&lang=en&cc=us&prodSeriesId=5443163&SaidNumber="
        },
        {
            "filename": "VSR1000_HPE-CMW710-E0322-X64.qco",
            "version": "7.10.E0322",
            "md5sum": "05e0dab6b7aa489f627448b4d79b1f50",
            "filesize": 113770496,
-            "download_url": "https://h10145.www1.hp.com/Downloads/SoftwareReleases.aspx?ProductNumber=JG811AAE&lang=en&cc=us&prodSeriesId=5443163&SoftwareReleaseUId=11832&SerialNumber=&PurchaseDate="
+            "download_url": "https://h10145.www1.hpe.com/Downloads/DownloadSoftware.aspx?SoftwareReleaseUId=18975&ProductNumber=JG811AAE&lang=en&cc=us&prodSeriesId=5443163&SaidNumber="
        },
        {
            "filename": "VSR1000_HPE-CMW710-E0321P01-X64.qco",
            "version": "7.10.E0321P01",
            "md5sum": "26d4375fafeedc81f298f29f593de252",
            "filesize": 113639424,
-            "download_url": "https://h10145.www1.hp.com/Downloads/SoftwareReleases.aspx?ProductNumber=JG811AAE&lang=en&cc=us&prodSeriesId=5443163&SoftwareReleaseUId=11832&SerialNumber=&PurchaseDate="
+            "download_url": "https://h10145.www1.hpe.com/Downloads/DownloadSoftware.aspx?SoftwareReleaseUId=16838&ProductNumber=JG811AAE&lang=en&cc=us&prodSeriesId=5443163&SaidNumber="
        }
    ],
    "versions": [
+        {
+            "name": "7.10.E0519L03",
+            "images": {
+                "hda_disk_image": "VSR1000_HPE-CMW710-E0519L03-X64.qco"
+            }
+        },
        {
            "name": "7.10.R0327L01",
            "images": {
@@ -24,6 +24,42 @@
        "kvm": "allow"
    },
    "images": [
+        {
+            "filename": "ipfire-2.21.2gb-ext4.x86_64-full-core129.img",
+            "version": "2.21.129",
+            "md5sum": "84801c588174763c585967a2851a7769",
+            "filesize": 1541160960,
+            "download_url": "http://www.ipfire.org/download",
+            "direct_download_url": "https://downloads.ipfire.org/releases/ipfire-2.x/2.21-core129/ipfire-2.21.2gb-ext4.x86_64-full-core129.img.xz",
+            "compression": "xz"
+        },
+        {
+            "filename": "ipfire-2.21.2gb-ext4.x86_64-full-core124.img",
+            "version": "2.21.124",
+            "md5sum": "970a5cafaa0cb4cfbf42772f41d24932",
+            "filesize": 1541160960,
+            "download_url": "http://www.ipfire.org/download",
+            "direct_download_url": "https://downloads.ipfire.org/releases/ipfire-2.x/2.21-core124/ipfire-2.21.2gb-ext4.x86_64-full-core124.img.xz",
+            "compression": "xz"
+        },
+        {
+            "filename": "ipfire-2.19.1gb-ext4-scon.x86_64-full-core119.img",
+            "version": "2.19.119",
+            "md5sum": "b57be976ff54569b71eae4ee66634b0d",
+            "filesize": 1063256064,
+            "download_url": "http://www.ipfire.org/download",
+            "direct_download_url": "https://downloads.ipfire.org/releases/ipfire-2.x/2.19-core119/ipfire-2.19.1gb-ext4-scon.x86_64-full-core119.img.gz",
+            "compression": "gzip"
+        },
+        {
+            "filename": "ipfire-2.19.1gb-ext4-scon.x86_64-full-core118.img",
+            "version": "2.19.118",
+            "md5sum": "4dbeb474848d87c16c20ff4e31feb204",
+            "filesize": 1063256064,
+            "download_url": "http://www.ipfire.org/download",
+            "direct_download_url": "https://downloads.ipfire.org/releases/ipfire-2.x/2.19-core118/ipfire-2.19.1gb-ext4-scon.x86_64-full-core118.img.gz",
+            "compression": "gzip"
+        },
        {
            "filename": "ipfire-2.19.1gb-ext4-scon.x86_64-full-core117.img",
            "version": "2.19.117",
@@ -62,6 +98,30 @@
        }
    ],
    "versions": [
+        {
+            "name": "2.21.129",
+            "images": {
+                "hda_disk_image": "ipfire-2.21.2gb-ext4.x86_64-full-core129.img"
+            }
+        },
+        {
+            "name": "2.21.124",
+            "images": {
+                "hda_disk_image": "ipfire-2.21.2gb-ext4.x86_64-full-core124.img"
+            }
+        },
+        {
+            "name": "2.19.119",
+            "images": {
+                "hda_disk_image": "ipfire-2.19.1gb-ext4-scon.x86_64-full-core119.img"
+            }
+        },
+        {
+            "name": "2.19.118",
+            "images": {
+                "hda_disk_image": "ipfire-2.19.1gb-ext4-scon.x86_64-full-core118.img"
+            }
+        },
        {
            "name": "2.19.117",
            "images": {
@@ -18,13 +18,49 @@
    "qemu": {
        "adapter_type": "e1000",
        "adapters": 2,
-        "ram": 2048,
+        "ram": 1024,
        "arch": "x86_64",
        "console_type": "telnet",
        "kvm": "require",
        "options": "-nographic -enable-kvm"
    },
    "images": [
+        {
+            "filename": "junos-vmx-x86-64-17.4R1.16.qcow2",
+            "version": "17.4R1.16-KVM",
+            "md5sum": "85239193e852d643dfd9d5c257240bdf",
+            "filesize": 1325400064
+        },
+        {
+            "filename": "vmxhdd-17.4R1.16.img",
+            "version": "17.4R1.16-KVM",
+            "md5sum": "69e9821ebc59367527336d8bcecd171c",
+            "filesize": 108986368
+        },
+        {
+            "filename": "metadata-usb-re-17.4R1.16.img",
+            "version": "17.4R1.16-KVM",
+            "md5sum": "a5b125822b798c7167c35966ea00229a",
+            "filesize": 16777216
+        },
+        {
+            "filename": "junos-vmx-x86-64-17.3R2.10.qcow2",
+            "version": "17.3R2.10-KVM",
+            "md5sum": "11984eb87b471e8cc2677212c4277959",
+            "filesize": 1298137088
+        },
+        {
+            "filename": "vmxhdd-17.3R2.10.img",
+            "version": "17.3R2.10-KVM",
+            "md5sum": "9d843e5493d5e86d37853a72885d84c8",
+            "filesize": 108986368
+        },
+        {
+            "filename": "metadata-usb-re-17.3R2.10.img",
+            "version": "17.3R2.10-KVM",
+            "md5sum": "564ca5b7c03ed39680d2d42464d9489b",
+            "filesize": 16777216
+        },
        {
            "filename": "vcp_17.1R1.8-disk1.vmdk",
            "version": "17.1R1.8-ESXi",
@@ -261,9 +297,43 @@
            "md5sum": "af48f7e03f94ffcfeecd15a59a4f1567",
            "filesize": 16777216,
            "download_url": "http://www.juniper.net/us/en/products-services/routing/mx-series/vmx/"
+        },
+        {
+            "filename": "junos-vmx-x86-64-15.1F6.9.qcow2",
+            "version": "15.1F6.9-KVM",
+            "md5sum": "595f532b95d6d98590d0375a3d6d14b6",
+            "filesize": 994181120
+        },
+        {
+            "filename": "vmxhdd-15.1F6.9.img",
+            "version": "15.1F6.9-KVM",
+            "md5sum": "bae35d0bb72946d1e91ff9c5e7ddbf86",
+            "filesize": 108986368
+        },
+        {
+            "filename": "metadata-usb-re-15.1F6.9.img",
+            "version": "15.1F6.9-KVM",
+            "md5sum": "15238c3dbc987d1a641c919efe2731c5",
+            "filesize": 16777216
        }
    ],
    "versions": [
+        {
+            "name": "17.4R1.16-KVM",
+            "images": {
+                "hda_disk_image": "junos-vmx-x86-64-17.4R1.16.qcow2",
+                "hdb_disk_image": "vmxhdd-17.4R1.16.img",
+                "hdc_disk_image": "metadata-usb-re-17.4R1.16.img"
+            }
+        },
+        {
+            "name": "17.3R2.10-KVM",
+            "images": {
+                "hda_disk_image": "junos-vmx-x86-64-17.3R2.10.qcow2",
+                "hdb_disk_image": "vmxhdd-17.3R2.10.img",
+                "hdc_disk_image": "metadata-usb-re-17.3R2.10.img"
+            }
+        },
        {
            "name": "17.1R1.8-ESXi",
            "images": {
@@ -367,6 +437,14 @@
                "hdb_disk_image": "vmxhdd-15.1.img",
                "hdc_disk_image": "metadata-usb-15.1.img"
            }
-         }
+        },
+        {
+            "name": "15.1F6.9",
+            "images": {
+                "hda_disk_image": "junos-vmx-x86-64-15.1F6.9.qcow2",
+                "hdb_disk_image": "vmxhdd-15.1F6.9.img",
+                "hdc_disk_image": "metadata-usb-re-15.1F6.9.img"
+            }
+        }
    ]
 }
@@ -25,13 +25,27 @@
        "options": "-nographic -enable-kvm -smp cpus=3"
    },
    "images": [
+        {
+            "filename": "vFPC-20171213.img",
+            "version": "17.4R1.16-KVM",
+            "md5sum": "848a6256da7296e8fede368a258c68e4",
+            "filesize": 2313158656,
+            "download_url": "http://www.juniper.net/us/en/products-services/routing/mx-series/vmx/"
+        },
+        {
+            "filename": "vFPC-20180126.img",
+            "version": "17.3R2.10-KVM",
+            "md5sum": "02d6b719053485c52a511fe6f5a598e3",
+            "filesize": 2313158656,
+            "download_url": "http://www.juniper.net/us/en/products-services/routing/mx-series/vmx/"
+        },
        {
            "filename": "vfpc_17.1R1.8-disk1.vmdk",
            "version": "17.1R1.8-ESXi",
            "md5sum": "169dd487b8547d58b12b2918a5667360",
            "filesize": 102820352,
            "download_url": "http://www.juniper.net/us/en/products-services/routing/mx-series/vmx/"
-        }, 
+        },
        {
            "filename": "vFPC-20170216.img",
            "version": "17.1R1.8-KVM",
@@ -108,17 +122,36 @@
            "md5sum": "5ccf252002184a21413cad23fd239c3f",
            "filesize": 2313158656,
            "download_url": "http://www.juniper.net/us/en/products-services/routing/mx-series/vmx/"
-        }, 
+        },
+        {
+            "filename": "vFPC-15.1F6.9.img",
+            "version": "15.1F6.9-KVM",
+            "md5sum": "7328501fdfa9b160955bc136664f1e86",
+            "filesize": 2313158656,
+            "download_url": "http://www.juniper.net/us/en/products-services/routing/mx-series/vmx/"
+        },
        {
            "filename": "vFPC-20151203.img",
            "version": "15.1F4.15",
            "md5sum": "b3faa91b4d20836a9a6dd6bad2629dd1",
            "filesize": 2313158656,
            "download_url": "http://www.juniper.net/us/en/products-services/routing/mx-series/vmx/"
-        } 
+        }
    ],

    "versions": [
+        {
+            "name": "17.4R1.16-KVM",
+            "images": {
+                "hda_disk_image": "vFPC-20171213.img"
+            }
+        },
+        {
+            "name": "17.3R2.10-KVM",
+            "images": {
+                "hda_disk_image": "vFPC-20180126.img"
+            }
+        },
        {
            "name": "17.1R1.8-ESXi",
            "images": {
@@ -191,12 +224,18 @@
                "hda_disk_image": "vFPC-20160617.img"
            }
        },
+        {
+            "name": "15.1F6.9-KVM",
+            "images": {
+                "hda_disk_image": "vFPC-15.1F6.9.img"
+            }
+        },
        {
            "name": "15.1F4.15",
            "images": {
                "hda_disk_image": "vFPC-20151203.img"
            }
        }
-       
+
    ]
 }
@@ -24,6 +24,13 @@
        "options": "-nographic"
    },
    "images": [
+        {
+            "filename": "cosim_20180212.qcow2",
+            "version": "17.4R1",
+            "md5sum": "0372e9c1b7df3608099186ab8cbbf2ad",
+            "filesize": 1911291904,
+            "download_url": "https://www.juniper.net/us/en/dm/free-vqfx-trial/"
+        },
        {
            "filename": "vqfx10k-pfe-20160609-2.vmdk",
            "version": "15.1X53-D60",
@@ -33,6 +40,12 @@
        }
    ],
    "versions": [
+        {
+            "name": "17.4R1",
+            "images": {
+                "hda_disk_image": "cosim_20180212.qcow2"
+            }
+        },
        {
            "name": "15.1X53-D60",
            "images": {
@@ -24,6 +24,13 @@
        "options": "-nographic -smp 2"
    },
    "images": [
+        {
+           "filename": "jinstall-vqfx-10-f-17.4R1.16.img",
+           "version": "17.4R1",
+           "md5sum": "dd83313b0f5beaf68488ed3d5e1e5240",
+           "filesize": 553910272,
+           "download_url": "https://www.juniper.net/us/en/dm/free-vqfx-trial/"
+        },
        {
           "filename": "vqfx10k-re-15.1X53-D60.vmdk",
           "version": "15.1X53-D60",
@@ -33,6 +40,12 @@
        }
    ],
    "versions": [
+        {
+            "name": "17.4R1",
+            "images": {
+                "hda_disk_image": "jinstall-vqfx-10-f-17.4R1.16.img"
+            }
+        },
        {
            "name": "15.1X53-D60",
            "images": {
@@ -24,6 +24,13 @@
        "options": "-smp 2"
    },
    "images": [
+        {
+            "filename": "junos-media-vsrx-vmdisk-18.1R1.9.qcow2",
+            "version": "18.1R1",
+            "md5sum": "4e9393142afc675d5d3d03c5071e70ce",
+            "filesize": 4418961408,
+            "download_url": "https://www.juniper.net/us/en/dm/free-vsrx-trial/"
+        },
        {
            "filename": "media-vsrx-vmdisk-17.4R1.16.qcow2",
            "version": "17.4R1",
@@ -31,6 +38,13 @@
            "filesize": 3965386752,
            "download_url": "https://www.juniper.net/us/en/dm/free-vsrx-trial/"
        },
+        {
+            "filename": "media-vsrx-vmdisk-17.3R2.10.qcow2",
+            "version": "17.3R2",
+            "md5sum": "8f2adfb0515913e0c7db32628a5deb3e",
+            "filesize": 3784572928,
+            "download_url": "https://www.juniper.net/us/en/dm/free-vsrx-trial/"
+        },
        {
            "filename": "media-vsrx-vmdisk-17.3R1.10.qcow2",
            "version": "17.3R1",
@@ -38,6 +52,13 @@
            "filesize": 3782541312,
            "download_url": "https://www.juniper.net/us/en/dm/free-vsrx-trial/"
        },
+        {
+            "filename": "media-vsrx-vmdisk-15.1X49-D130.6.qcow2",
+            "version": "15.1X49-D130",
+            "md5sum": "8ad03f4067b3fe5d2ed378733a5e8541",
+            "filesize": 3300917248,
+            "download_url": "https://www.juniper.net/us/en/dm/free-vsrx-trial/"
+        },
        {
            "filename": "media-vsrx-vmdisk-15.1X49-D120.3.qcow2",
            "version": "15.1X49-D120",
@@ -124,18 +145,36 @@
        }
    ],
    "versions": [
+        {
+            "name": "18.1R1",
+            "images": {
+                "hda_disk_image": "junos-media-vsrx-vmdisk-18.1R1.9.qcow2"
+            }
+        },
        {
            "name": "17.4R1",
            "images": {
                "hda_disk_image": "media-vsrx-vmdisk-17.4R1.16.qcow2"
            }
        },
+        {
+            "name": "17.3R2",
+            "images": {
+                "hda_disk_image": "media-vsrx-vmdisk-17.3R2.10.qcow2"
+            }
+        },
        {
            "name": "17.3R1",
            "images": {
                "hda_disk_image": "media-vsrx-vmdisk-17.3R1.10.qcow2"
            }
        },
+        {
+            "name": "15.1X49-D130",
+            "images": {
+                "hda_disk_image": "media-vsrx-vmdisk-15.1X49-D130.6.qcow2"
+            }
+        },
        {
            "name": "15.1X49-D120",
            "images": {
@@ -20,6 +20,38 @@
        "kvm": "require"
    },
    "images": [
+        {
+            "filename": "kali-linux-2019.1a-amd64.iso",
+            "version": "2019.1a",
+            "md5sum": "58c6111ed0be1919ea87267e7e65ab0f",
+            "filesize": 3483873280,
+            "download_url": "https://www.kali.org/downloads/",
+            "direct_download_url": "http://cdimage.kali.org/kali-2019.1a/kali-linux-2019.1a-amd64.iso"
+        },
+        {
+            "filename": "kali-linux-2018.4-amd64.iso",
+            "version": "2018.4",
+            "md5sum": "1b2d598bb8d2003e6207c119c0ba42fe",
+            "filesize": 3139436544,
+            "download_url": "https://www.kali.org/downloads/",
+            "direct_download_url": "http://cdimage.kali.org/kali-2018.4/kali-linux-2018.4-amd64.iso"
+        },
+        {
+            "filename": "kali-linux-2018.3a-amd64.iso",
+            "version": "2018.3a",
+            "md5sum": "2da675d016bd690c05e180e33aa98b94",
+            "filesize": 3192651776,
+            "download_url": "https://www.kali.org/downloads/",
+            "direct_download_url": "http://cdimage.kali.org/kali-2018.3a/kali-linux-2018.3a-amd64.iso"
+        },
+        {
+            "filename": "kali-linux-2018.1-amd64.iso",
+            "version": "2018.1",
+            "md5sum": "a3feb90df5b71b3c7f4a02bdddf221d7",
+            "filesize": 3028500480,
+            "download_url": "https://www.kali.org/downloads/",
+            "direct_download_url": "http://cdimage.kali.org/kali-2018.1/kali-linux-2018.1-amd64.iso"
+        },
        {
            "filename": "kali-linux-2017.3-amd64.iso",
            "version": "2017.3",
@@ -70,6 +102,30 @@
        }
    ],
    "versions": [
+        {
+            "name": "2019.1a",
+            "images": {
+                "cdrom_image": "kali-linux-2019.1a-amd64.iso"
+            }
+        },
+        {
+            "name": "2018.4",
+            "images": {
+                "cdrom_image": "kali-linux-2018.4-amd64.iso"
+            }
+        },
+        {
+            "name": "2018.3a",
+            "images": {
+                "cdrom_image": "kali-linux-2018.3a-amd64.iso"
+            }
+        },
+        {
+            "name": "2018.1",
+            "images": {
+                "cdrom_image": "kali-linux-2018.1-amd64.iso"
+            }
+        },
        {
            "name": "2017.3",
            "images": {
@@ -26,6 +26,13 @@
        "options": "-smp 2"
    },
    "images": [
+        {
+            "filename": "LoadMaster-VLM-7.2.44.0.16685.RELEASE-Linux-KVM-XEN-FREE.disk",
+            "version": "7.2.44.0",
+            "md5sum": "90d2f84fcabe0ba530c84cf12fab87f1",
+            "filesize": 17179869185,
+            "download_url": "http://freeloadbalancer.com/download/"
+        },
        {
            "filename": "LoadMaster-VLM-7.2.40.0.15707.RELEASE-Linux-KVM-XEN-FREE.disk",
            "version": "7.2.40.0",
@@ -63,6 +70,12 @@
        }
    ],
    "versions": [
+        {
+            "name": "7.2.44.0",
+            "images": {
+                "hda_disk_image": "LoadMaster-VLM-7.2.44.0.16685.RELEASE-Linux-KVM-XEN-FREE.disk"
+            }
+        },
        {
            "name": "7.2.40.0",
            "images": {
@@ -24,6 +24,22 @@
        "kvm": "require"
    },
    "images": [
+        {
+            "filename": "kerio-connect-appliance-9.2.7-4225-p3-vmware-amd64-disk1.vmdk",
+            "version": "9.2.7p3",
+            "md5sum": "12950c8244300f1d86c85c109f0b3413",
+            "filesize": 914165248,
+            "download_url": "http://www.kerio.com/support/kerio-connect",
+            "direct_download_url": "http://cdn.kerio.com/dwn/connect/connect-9.2.7-4225/kerio-connect-appliance-9.2.7-4225-p3-vmware-amd64-disk1.vmdk"
+        },
+        {
+            "filename": "kerio-connect-appliance-9.2.6-3851-p1-vmware-amd64-disk1.vmdk",
+            "version": "9.2.6p1",
+            "md5sum": "c6ed064114c6fd70608b7951b707528c",
+            "filesize": 625852004,
+            "download_url": "http://www.kerio.com/support/kerio-connect",
+            "direct_download_url": "http://cdn.kerio.com/dwn/connect/connect-9.2.6-3851/kerio-connect-appliance-9.2.6-3851-p1-vmware-amd64-disk1.vmdk"
+        },
        {
            "filename": "kerio-connect-appliance-9.2.5-3336-p3-vmware-amd64-disk1.vmdk",
            "version": "9.2.5p3",
@@ -68,7 +84,19 @@
    ],
    "versions": [
        {
-            "name": "9.2.5",
+            "name": "9.2.7p3",
+            "images": {
+                "hda_disk_image": "kerio-connect-appliance-9.2.7-4225-p3-vmware-amd64-disk1.vmdk"
+            }
+        },
+        {
+            "name": "9.2.6p1",
+            "images": {
+                "hda_disk_image": "kerio-connect-appliance-9.2.6-3851-p1-vmware-amd64-disk1.vmdk"
+            }
+        },
+        {
+            "name": "9.2.5p3",
            "images": {
                "hda_disk_image": "kerio-connect-appliance-9.2.5-3336-p3-vmware-amd64-disk1.vmdk"
            }
@@ -23,6 +23,30 @@
        "kvm": "require"
    },
    "images": [
+        {
+            "filename": "kerio-control-appliance-9.3.0-3273-vmware-disk1.vmdk",
+            "version": "9.3.0",
+            "md5sum": "6e6faf64b4ffce8b5639cdfce11ba31e",
+            "filesize": 192825856,
+            "download_url": "http://www.kerio.com/support/kerio-control",
+            "direct_download_url": "http://cdn.kerio.com/dwn/control/control-9.3.0-3273/kerio-control-appliance-9.3.0-3273-vmware-disk1.vmdk"
+        },
+        {
+            "filename": "kerio-control-appliance-9.2.7-2921-vmware-disk1.vmdk",
+            "version": "9.2.7",
+            "md5sum": "d286a240be53f8dd9da5f80deb9086b0",
+            "filesize": 191135232,
+            "download_url": "http://www.kerio.com/support/kerio-control",
+            "direct_download_url": "http://cdn.kerio.com/dwn/control/control-9.2.7-2921/kerio-control-appliance-9.2.7-2921-vmware-disk1.vmdk"
+        },
+        {
+            "filename": "kerio-control-appliance-9.2.5-2641-p5-vmware-disk1.vmdk",
+            "version": "9.2.5p5",
+            "md5sum": "fbb2824eb91ca2502c952c2e9c4e635d",
+            "filesize": 190706688,
+            "download_url": "http://www.kerio.com/support/kerio-control",
+            "direct_download_url": "http://cdn.kerio.com/dwn/control/control-9.2.5-2641/kerio-control-appliance-9.2.5-2641-p5-vmware-disk1.vmdk"
+        },
        {
            "filename": "kerio-control-appliance-9.2.4-2223-vmware-disk1.vmdk",
            "version": "9.2.4",
@@ -63,6 +87,24 @@
            "direct_download_url": "http://cdn.kerio.com/dwn/control/control-9.1.4-1535/kerio-control-appliance-9.1.4-1535-vmware.vmdk"        }
    ],
    "versions": [
+        {
+            "name": "9.3.0",
+            "images": {
+                "hda_disk_image": "kerio-control-appliance-9.3.0-3273-vmware-disk1.vmdk"
+            }
+        },
+        {
+            "name": "9.2.7",
+            "images": {
+                "hda_disk_image": "kerio-control-appliance-9.2.7-2921-vmware-disk1.vmdk"
+            }
+        },
+        {
+            "name": "9.2.5p5",
+            "images": {
+                "hda_disk_image": "kerio-control-appliance-9.2.5-2641-p5-vmware-disk1.vmdk"
+            }
+        },
        {
            "name": "9.2.4",
            "images": {
@@ -24,6 +24,22 @@
        "kvm": "require"
    },
    "images": [
+        {
+            "filename": "kerio-operator-appliance-2.6.4-9320-vmware-disk1.vmdk",
+            "version": "2.6.4",
+            "md5sum": "3823565dbc96069dc556158ebbbfb977",
+            "filesize": 307840512,
+            "download_url": "http://www.kerio.com/support/kerio-operator",
+            "direct_download_url": "http://cdn.kerio.com/dwn/operator/operator-2.6.4-9320/kerio-operator-appliance-2.6.4-9320-vmware-disk1.vmdk"
+        },
+        {
+            "filename": "kerio-operator-appliance-2.6.2-9085-vmware-disk1.vmdk",
+            "version": "2.6.2",
+            "md5sum": "abdfa7697e568b5d9a6396e11292e52a",
+            "filesize": 306665472,
+            "download_url": "http://www.kerio.com/support/kerio-operator",
+            "direct_download_url": "http://cdn.kerio.com/dwn/operator/operator-2.6.2-9085/kerio-operator-appliance-2.6.2-9085-vmware-disk1.vmdk"
+        },
        {
            "filename": "kerio-operator-appliance-2.6.0-8413-vmware-disk1.vmdk",
            "version": "2.6.0",
@@ -66,6 +82,18 @@
        }
    ],
    "versions": [
+        {
+            "name": "2.6.4",
+            "images": {
+                "hda_disk_image": "kerio-operator-appliance-2.6.4-9320-vmware-disk1.vmdk"
+            }
+        },
+        {
+            "name": "2.6.2",
+            "images": {
+                "hda_disk_image": "kerio-operator-appliance-2.6.2-9085-vmware-disk1.vmdk"
+            }
+        },
        {
            "name": "2.6.0",
            "images": {
@@ -1,97 +0,0 @@
-{
-    "name": "LEDE",
-    "category": "router",
-    "description": "LEDE is a highly extensible GNU/Linux distribution for embedded devices (typically wireless routers). Unlike many other distributions for these routers, OpenWrt is built from the ground up to be a full-featured, easily modifiable operating system for your router. In practice, this means that you can have all the features you need with none of the bloat, powered by a Linux kernel that's more recent than most other distributions.",
-    "vendor_name": "LEDE Project",
-    "vendor_url": "https://lede-project.org/",
-    "documentation_url": "http://wiki.openwrt.org/doc/",
-    "product_name": "LEDE",
-    "product_url": "https://lede-project.org/",
-    "registry_version": 3,
-    "status": "stable",
-    "maintainer": "GNS3 Team",
-    "maintainer_email": "developers@gns3.net",
-    "usage": "Ethernet0 is the LAN link, Ethernet1 the WAN link.",
-    "qemu": {
-        "adapter_type": "virtio-net-pci",
-        "adapters": 2,
-        "ram": 64,
-        "arch": "i386",
-        "console_type": "telnet",
-        "kvm": "allow"
-    },
-    "images": [
-        {
-            "filename": "lede-17.01.4-x86-generic-combined-squashfs.img",
-            "version": "17.01.4",
-            "md5sum": "ae5d8d3fcab109565fe337d28e51c4b4",
-            "filesize": 19779546,
-            "download_url": "https://downloads.lede-project.org/releases/17.01.4/targets/x86/generic/",
-            "direct_download_url": "https://downloads.lede-project.org/releases/17.01.4/targets/x86/generic/lede-17.01.4-x86-generic-combined-squashfs.img"
-        },
-        {
-            "filename": "lede-17.01.3-x86-generic-combined-squashfs.img",
-            "version": "17.01.3",
-            "md5sum": "d315fc638160a9aec0966d58828bfccf",
-            "filesize": 19775618,
-            "download_url": "https://downloads.lede-project.org/releases/17.01.3/targets/x86/generic/",
-            "direct_download_url": "https://downloads.lede-project.org/releases/17.01.3/targets/x86/generic/lede-17.01.3-x86-generic-combined-squashfs.img"
-        },
-        {
-            "filename": "lede-17.01.2-x86-generic-combined-squashfs.img",
-            "version": "17.01.2",
-            "md5sum": "a466e493ef12935dad5e0c622b1a7859",
-            "filesize": 19774794,
-            "download_url": "https://downloads.lede-project.org/releases/17.01.2/targets/x86/generic/",
-            "direct_download_url": "https://downloads.lede-project.org/releases/17.01.2/targets/x86/generic/lede-17.01.2-x86-generic-combined-squashfs.img"
-        },
-        {
-            "filename": "lede-17.01.1-x86-generic-combined-squashfs.img",
-            "version": "17.01.1",
-            "md5sum": "b050e734c605a34a429389c752ae7c30",
-            "filesize": 19771166,
-            "download_url": "https://downloads.lede-project.org/releases/17.01.1/targets/x86/generic/",
-            "direct_download_url": "https://downloads.lede-project.org/releases/17.01.1/targets/x86/generic/lede-17.01.1-x86-generic-combined-squashfs.img"
-        },
-        {
-            "filename": "lede-17.01.0-r3205-59508e3-x86-generic-combined-squashfs.img",
-            "version": "17.01.0",
-            "md5sum": "3c5e068d50a377d4e26b548ab1ca7b1e",
-            "filesize": 19755118,
-            "download_url": "https://downloads.lede-project.org/releases/17.01.0/targets/x86/generic/",
-            "direct_download_url": "https://downloads.lede-project.org/releases/17.01.0/targets/x86/generic/lede-17.01.0-r3205-59508e3-x86-generic-combined-squashfs.img"
-        }
-    ],
-    "versions": [
-        {
-            "name": "lede 17.01.4",
-            "images": {
-                "hda_disk_image": "lede-17.01.4-x86-generic-combined-squashfs.img"
-            }
-        },
-        {
-            "name": "lede 17.01.3",
-            "images": {
-                "hda_disk_image": "lede-17.01.3-x86-generic-combined-squashfs.img"
-            }
-        },
-        {
-            "name": "lede 17.01.2",
-            "images": {
-                "hda_disk_image": "lede-17.01.2-x86-generic-combined-squashfs.img"
-            }
-        },
-        {
-            "name": "lede 17.01.1",
-            "images": {
-                "hda_disk_image": "lede-17.01.1-x86-generic-combined-squashfs.img"
-            }
-        },
-        {
-            "name": "lede 17.01.0",
-            "images": {
-                "hda_disk_image": "lede-17.01.0-r3205-59508e3-x86-generic-combined-squashfs.img"
-            }
-        }
-    ]
-}
@@ -26,6 +26,33 @@
        "options": "-nographic"
    },
    "images": [
+        {
+           "filename": "chr-6.44.2.img",
+           "version": "6.44.2",
+           "md5sum": "f1ddaa47829e12c1f9f023d8c06b88cc",
+           "filesize": 67108864,
+           "download_url": "http://www.mikrotik.com/download",
+           "direct_download_url": "https://download.mikrotik.com/routeros/6.44.2/chr-6.44.2.img.zip",
+           "compression": "zip"
+        },
+        {
+           "filename": "chr-6.43.8.img",
+           "version": "6.43.8",
+           "md5sum": "9437133fc7e77779dc3ff62b98f30dc2",
+           "filesize": 134217728,
+           "download_url": "http://www.mikrotik.com/download",
+           "direct_download_url": "https://download2.mikrotik.com/routeros/6.43.8/chr-6.43.8.img.zip",
+           "compression": "zip"
+        },
+        {
+           "filename": "chr-6.42.9.img",
+           "version": "6.42.9",
+           "md5sum": "1f856978cfc3ceb4b5e18e4e079f2e32",
+           "filesize": 134217728,
+           "download_url": "http://www.mikrotik.com/download",
+           "direct_download_url": "https://download2.mikrotik.com/routeros/6.42.9/chr-6.42.9.img.zip",
+           "compression": "zip"
+        },
        {
            "filename": "chr-6.42.img",
            "version": "6.42",
@@ -262,6 +289,24 @@
        }
    ],
    "versions": [
+        {
+            "name": "6.44.2",
+            "images": {
+                "hda_disk_image": "chr-6.44.2.img"
+            }
+        },
+        {
+            "name": "6.43.8",
+            "images": {
+                "hda_disk_image": "chr-6.43.8.img"
+            }
+        },
+        {
+            "name": "6.42.9",
+            "images": {
+                "hda_disk_image": "chr-6.42.9.img"
+            }
+        },
        {
            "name": "6.41.4",
            "images": {
@@ -0,0 +1,46 @@
+{
+    "category": "guest",
+    "status": "stable",
+    "maintainer": "GNS3 Team",
+    "maintainer_email": "developers@gns3.net",
+    "description": "Mininet creates a realistic virtual network, running real kernel, switch and application code, on a single machine (VM, cloud or native), in seconds, with a single command.",
+    "product_name": "Mininet",
+    "registry_version": 4,
+    "product_url": "http://mininet.org/",
+    "documentation_url": "http://mininet.org/walkthrough/",
+    "first_port_name": "eth0",
+    "usage": "Username: mininet\nPassword: mininet",
+    "port_name_format": "eth{0}",
+    "vendor_name": "Mininet Team",
+    "qemu": {
+        "adapters": 1,
+        "adapter_type": "virtio-net-pci",
+        "arch": "x86_64",
+        "ram": 2048,
+        "console_type": "vnc",
+        "hda_disk_interface": "virtio",
+        "kvm": "allow"
+    },
+    "availability": "free",
+    "vendor_url": "http://mininet.org/",
+    "name": "Mininet",
+    "images": [
+        {
+            "filename": "mininet-vm-x86_64.vmdk",
+            "version": "2.2.2",
+            "md5sum": "a683441642300bdaf37b8e614de85342",
+            "filesize": 2047868928,
+            "download_url": "https://github.com/mininet/mininet/releases/",
+            "direct_download_url": "https://github.com/mininet/mininet/releases/download/2.2.2/mininet-2.2.2-170321-ubuntu-14.04.4-server-amd64.zip",
+            "compression": "zip"
+        }
+    ],
+    "versions": [
+        {
+            "images": {
+                "hda_disk_image": "mininet-vm-x86_64.vmdk"
+            },
+            "name": "2.2.2"
+        }
+    ]
+}
@@ -0,0 +1,19 @@
+{
+    "name": "Toolbox",
+    "category": "guest",
+    "description": "This appliance contains server side software for secondary management of network devices:\n- www (nginx) \n- ftp (vsftpd)\n- tftp (tftpd)\n- syslog (rsyslog)\n- dhcp (isc-dhcpd)\n- snmp server (snmpd + snmptrapd)",
+    "vendor_name": "Ubuntu",
+    "vendor_url": "https://www.ubuntu.com/",
+    "product_name": "Networkers' toolbox",
+    "registry_version": 3,
+    "status": "stable",
+    "maintainer": "Andras Dosztal",
+    "maintainer_email": "developers@gns3.net",
+    "symbol": "linux_guest.svg",
+    "usage": "Root password: gns3",
+    "docker": {
+        "adapters": 1,
+        "image": "adosztal/net_toolbox:latest",
+        "console_type": "telnet"
+    }
+}
@@ -12,7 +12,7 @@
    "symbol": "linux_guest.svg",
    "docker": {
        "adapters": 1,
-        "image": "gns3/network_automation:latest",
+        "image": "adosztal/network_automation:latest",
        "console_type": "telnet"
    }
 }
@@ -25,6 +25,13 @@
        "kvm": "require"
    },
    "images": [
+        {
+            "filename": "op5-Monitor-Virtual-Appliance-7.4.10.x86_64-disk1.vmdk",
+            "version": "7.4.10",
+            "md5sum": "48ec6d7ee3809d9ed705a089c679e076",
+            "filesize": 1111941120,
+            "download_url": "https://www.op5.com/download/"
+        },
        {
            "filename": "op5-Monitor-Virtual-Appliance-7.3.15.x86_64.vmdk",
            "version": "7.3.15",
@@ -34,6 +41,12 @@
        }
    ],
    "versions": [
+        {
+            "name": "7.4.10",
+            "images": {
+                "hda_disk_image": "op5-Monitor-Virtual-Appliance-7.4.10.x86_64-disk1.vmdk"
+            }
+        },
        {
            "name": "7.3.15",
            "images": {
@@ -11,31 +11,76 @@
    "status": "stable",
    "maintainer": "GNS3 Team",
    "maintainer_email": "developers@gns3.net",
-    "usage": "Ethernet0 is the LAN link, Ethernet1 the WAN link.",
+    "usage": "Ethernet0 is the LAN link, Ethernet1 the WAN link, Ethernet2 and Ethernet3 are optional links.",
    "qemu": {
        "adapter_type": "virtio-net-pci",
-        "adapters": 2,
-        "ram": 64,
-        "arch": "i386",
+        "adapters": 4,
+        "ram": 128,
+        "arch": "x86_64",
        "console_type": "telnet",
        "kvm": "allow"
    },
    "images": [
        {
-            "filename": "openwrt-15.05.1-x86-kvm_guest-combined-ext4.img",
+            "filename": "openwrt-18.06.2-x86-64-combined-ext4.img",
+            "version": "18.06.2",
+            "md5sum": "d112cd432bf51e2ddadbf9513f272fd9",
+            "filesize": 285736960,
+            "download_url": "https://downloads.openwrt.org/releases/18.06.2/targets/x86/64/",
+            "direct_download_url": "https://downloads.openwrt.org/releases/18.06.2/targets/x86/64/openwrt-18.06.2-x86-64-combined-ext4.img.gz",
+            "compression": "gzip"
+        }, 
+        {
+            "filename": "openwrt-18.06.1-x86-64-combined-ext4.img",
+            "version": "18.06.1",
+            "md5sum": "3e2da47c5c2496b6df364a60ded8f40a",
+            "filesize": 285736960,
+            "download_url": "https://downloads.openwrt.org/releases/18.06.1/targets/x86/64/",
+            "direct_download_url": "https://downloads.openwrt.org/releases/18.06.1/targets/x86/64/openwrt-18.06.1-x86-64-combined-ext4.img.gz",
+            "compression": "gzip"
+        },
+        {
+            "filename": "lede-17.01.6-x86-64-combined-ext4.img",
+            "version": "17.01.6",
+            "md5sum": "015c0d5038ddd469fbdabce7eb5265dc",
+            "filesize": 285736960,
+            "download_url": "https://downloads.openwrt.org/releases/17.01.6/targets/x86/64/",
+            "direct_download_url": "https://downloads.openwrt.org/releases/17.01.6/targets/x86/64/lede-17.01.6-x86-64-combined-ext4.img.gz",
+            "compression": "gzip"
+        },
+        {
+            "filename": "openwrt-15.05.1-x86-64-combined-ext4.img",
            "version": "15.05.1",
-            "md5sum": "d02f5224b7fbe929efa4d3f10f4dc996",
+            "md5sum": "307d8cdb11faeb1b5e27fe55078bd152",
            "filesize": 55050240,
-            "download_url": "http://downloads.openwrt.org/chaos_calmer/15.05.1/x86/kvm_guest/",
-            "direct_download_url": "https://downloads.openwrt.org/chaos_calmer/15.05.1/x86/kvm_guest/openwrt-15.05.1-x86-kvm_guest-combined-ext4.img.gz",
+            "download_url": "http://archive.openwrt.org/chaos_calmer/15.05.1/x86/64/",
+            "direct_download_url": "http://archive.openwrt.org/chaos_calmer/15.05.1/x86/64/openwrt-15.05.1-x86-64-combined-ext4.img.gz",
            "compression": "gzip"
        }
    ],
    "versions": [
        {
-            "name": "Chaos Calmer 15.05.1",
+            "name": "openwrt 18.06.2",
            "images": {
-                "hda_disk_image": "openwrt-15.05.1-x86-kvm_guest-combined-ext4.img"
+                "hda_disk_image": "openwrt-18.06.2-x86-64-combined-ext4.img"
+            }
+        },
+        { 
+            "name": "openwrt 18.06.1",
+            "images": {
+                "hda_disk_image": "openwrt-18.06.1-x86-64-combined-ext4.img"
+            }
+        },
+        {
+            "name": "openwrt/lede 17.01.6",
+            "images": {
+                "hda_disk_image": "lede-17.01.6-x86-64-combined-ext4.img"
+            }
+        },
+        {
+            "name": "openwrt 15.05.1",
+            "images": {
+                "hda_disk_image": "openwrt-15.05.1-x86-64-combined-ext4.img"
            }
        }
    ]
@@ -25,18 +25,31 @@
    },
    "images": [
        {
-            "filename": "OPNsense-17.7-OpenSSL-nano-amd64.img",
-            "version": "17.7",
-            "md5sum": "14cde5c7a15b2298a242238ad3c3b65a",
-            "filesize": 3221233664,
-            "download_url": "https://opnsense.org/download/"
+            "filename": "OPNsense-18.1.6-OpenSSL-nano-amd64.img",
+            "version": "18.1.6",
+            "md5sum": "042f328380ad0c8008759c43435e8843",
+            "filesize": 272003136,
+            "download_url": "https://opnsense.c0urier.net/releases/18.1/"
+        },
+        {
+            "filename": "OPNsense-17.7.5-OpenSSL-nano-amd64.img",
+            "version": "17.7.5",
+            "md5sum": "6ec5b7f99cc727f904bbf2aaadcab0b8",
+            "filesize": 237038601,
+            "download_url": "https://opnsense.c0urier.net/releases/17.7/"
        }
    ],
    "versions": [
        {
-            "name": "17.7",
+            "name": "18.1.6",
            "images": {
-                "hda_disk_image": "OPNsense-17.7-OpenSSL-nano-amd64.img"
+                "hda_disk_image": "OPNsense-18.1.6-OpenSSL-nano-amd64.img"
+            }
+        },
+        {
+            "name": "17.7.5",
+            "images": {
+                "hda_disk_image": "OPNsense-17.7.5-OpenSSL-nano-amd64.img"
            }
        }
    ]
@@ -22,6 +22,24 @@
        "kvm": "require"
    },
    "images": [
+        {
+            "filename": "PacketFenceZEN_USB-8.3.0.img",
+            "version": "8.3.0",
+            "md5sum": "b9de52dc2513220ad42d350486da4884",
+            "filesize": 3221225472,
+            "download_url": "https://packetfence.org/download.html#/zen",
+            "direct_download_url": "https://sourceforge.net/projects/packetfence/files/PacketFence%20ZEN/8.3.0/PacketFenceZEN_USB-8.3.0.tar.bz2/download",
+            "compression": "bzip2"
+        },
+        {
+            "filename": "PacketFenceZEN_USB-8.1.0.img",
+            "version": "8.1.0",
+            "md5sum": "f326f0e70b35d598c8b84ee3fc9c611f",
+            "filesize": 3221225472,
+            "download_url": "https://packetfence.org/download.html#/zen",
+            "direct_download_url": "https://sourceforge.net/projects/packetfence/files/PacketFence%20ZEN/8.1.0/PacketFenceZEN_USB-8.1.0.tar.bz2/download",
+            "compression": "bzip2"
+        },
        {
            "filename": "PacketFenceZEN_USB-7.4.0.img",
            "version": "7.4.0",
@@ -105,6 +123,18 @@
        }
    ],
    "versions": [
+        {
+            "name": "8.3.0",
+            "images": {
+                "hda_disk_image": "PacketFenceZEN_USB-8.3.0.img"
+            }
+        },
+        {
+            "name": "8.1.0",
+            "images": {
+                "hda_disk_image": "PacketFenceZEN_USB-8.1.0.img"
+            }
+        },
        {
            "name": "7.4.0",
            "images": {
@@ -1,123 +1,123 @@
-{
-    "name": "PA-VM",
-    "category": "firewall",
-    "description": "The VM-Series combines next-generation firewall security and advanced threat prevention to protect your virtualized environments from advanced cyberthreats. The VM-Series natively analyzes all traffic in a single pass to determine the application identity, the content within, and the user identity.",
-    "vendor_name": "Palo Alto Networks",
-    "vendor_url": "http://www.paloaltonetworks.com/",
-    "documentation_url": "https://www.paloaltonetworks.com/documentation/80/virtualization/virtualization",
-    "product_name": "PAN VM-Series Firewall",
-    "product_url": "https://www.paloaltonetworks.com/products/secure-the-network/virtualized-next-generation-firewall/vm-series",
-    "registry_version": 3,
-    "status": "experimental",
-    "maintainer": "Community",
-    "maintainer_email": "",
-    "usage": "Default Username: admin\r\nDefault Password: admin\r\nPAN-VM goes through several iterations of host prompts during boot. This is normal and expected.\r\nLogin is available when prompt is PA-VM login:\r\n\r\nGetting Started:\r\nTo configure a static IP address at the console enter the following commands:\r\n\r\nconfigure\r\nset deviceconfig system ip-address <Static IP> netmask <Netmask> default-gateway <Gateway IP> type static\r\nset deviceconfig system dns-setting servers primary <DNS Server IP> secondary <DNS Server IP>\r\ncommit\r\n",
-    "symbol": "pan-vm-fw.svg",
-    "first_port_name": "management",
-    "port_name_format": "ethernet1/{port1}",
-    "qemu": {
-        "adapter_type": "virtio-net-pci",
-        "adapters": 25,
-        "ram": 4096,
-        "arch": "x86_64",
-        "console_type": "telnet",
-        "hda_disk_interface": "virtio",
-        "kvm": "require",
-        "options": "-smp 2"
-    },
-    "images": [
-       {
-            "filename": "PA-VM-ESX-8.1.0-disk1.vmdk",
-            "version": "8.1.0",
-            "md5sum": "49af8e8225c2e90414bde0be15eaf421",
-            "filesize": 2281454080,
-            "download_url": "https://support.paloaltonetworks.com/Updates/SoftwareUpdates/"
-       },
-       {
-            "filename": "PA-VM-KVM-8.1.0.qcow2",
-            "version": "8.1.0",
-            "md5sum": "459558515b965b2e43fde2842abbae66",
-            "filesize": 2260467712,
-            "download_url": "https://support.paloaltonetworks.com/Updates/SoftwareUpdates/"
-        },
-       {
-            "filename": "PA-VM-ESX-8.0.0-disk1.vmdk",
-            "version": "8.0.0",
-            "md5sum": "a505fb1dbcc855ecf98630fd5d329f9a",
-            "filesize": 2002713088,
-            "download_url": "https://support.paloaltonetworks.com/Updates/SoftwareUpdates/"
-        },
-       {
-            "filename": "PA-VM-KVM-8.0.0.qcow2",
-            "version": "8.0.0",
-            "md5sum": "b6a1ddc8552aff87f05f9c0d4cb54dc3",
-            "filesize": 1987444736,
-            "download_url": "https://support.paloaltonetworks.com/Updates/SoftwareUpdates/"
-        },
-       {
-            "filename": "PA-VM-ESX-7.1.0-disk1.vmdk",
-            "version": "7.1.0 (ESX)",
-            "md5sum": "e044dc649b7146ee4f619edb0e5f6675",
-            "filesize": 1871149056,
-            "download_url": "https://support.paloaltonetworks.com/Updates/SoftwareUpdates/"
-        },
-       {
-            "filename": "PA-VM-KVM-7.1.0.qcow2",
-            "version": "7.1.0",
-            "md5sum": "da300253709740068927408239c2e321",
-            "filesize": 1858797568,
-            "download_url": "https://support.paloaltonetworks.com/Updates/SoftwareUpdates/"
-        },
-       {
-            "filename": "PA-VM-ESX-6.1.0-disk1.vmdk",
-            "version": "6.1.0 (ESX)",
-            "md5sum": "64b1e81cd54008318235832ea6d71424",
-            "filesize": 2959736832,
-            "download_url": "https://support.paloaltonetworks.com/Updates/SoftwareUpdates/"
-       }
-    ],
-    "versions": [
-         {
-            "name": "8.1.0 (ESX)",
-            "images": {
-                "hda_disk_image": "PA-VM-ESX-8.1.0-disk1.vmdk"
-            }
-        },
-         {
-            "name": "8.1.0",
-            "images": {
-                "hda_disk_image": "PA-VM-KVM-8.1.0.qcow2"
-            }
-        },
-         {
-            "name": "8.0.0 (ESX)",
-            "images": {
-                "hda_disk_image": "PA-VM-ESX-8.0.0-disk1.vmdk2"
-            }
-        },
-         {
-            "name": "8.0.0",
-            "images": {
-                "hda_disk_image": "PA-VM-KVM-8.0.0.qcow2"
-            }
-        },
-         {
-            "name": "7.1.0 (ESX)",
-            "images": {
-                "hda_disk_image": "PA-VM-ESX-7.1.0-disk1.vmdk"
-            }
-        },
-         {
-            "name": "7.1.0",
-            "images": {
-                "hda_disk_image": "PA-VM-KVM-7.1.0.qcow2"
-            }
-         },
-         {
-            "name": "6.1.0 (ESX)",
-            "images": {
-                "hda_disk_image": "PA-VM-ESX-6.1.0-disk1.vmdk"
-            }
-         }
-    ]
-}
+{
+    "name": "PA-VM",
+    "category": "firewall",
+    "description": "The VM-Series combines next-generation firewall security and advanced threat prevention to protect your virtualized environments from advanced cyberthreats. The VM-Series natively analyzes all traffic in a single pass to determine the application identity, the content within, and the user identity.",
+    "vendor_name": "Palo Alto Networks",
+    "vendor_url": "http://www.paloaltonetworks.com/",
+    "documentation_url": "https://www.paloaltonetworks.com/documentation/80/virtualization/virtualization",
+    "product_name": "PAN VM-Series Firewall",
+    "product_url": "https://www.paloaltonetworks.com/products/secure-the-network/virtualized-next-generation-firewall/vm-series",
+    "registry_version": 3,
+    "status": "experimental",
+    "maintainer": "Community",
+    "maintainer_email": "",
+    "usage": "Default Username: admin\r\nDefault Password: admin\r\nPAN-VM goes through several iterations of host prompts during boot. This is normal and expected.\r\nLogin is available when prompt is PA-VM login:\r\n\r\nGetting Started:\r\nTo configure a static IP address at the console enter the following commands:\r\n\r\nconfigure\r\nset deviceconfig system ip-address <Static IP> netmask <Netmask> default-gateway <Gateway IP> type static\r\nset deviceconfig system dns-setting servers primary <DNS Server IP> secondary <DNS Server IP>\r\ncommit\r\n",
+    "symbol": "pan-vm-fw.svg",
+    "first_port_name": "management",
+    "port_name_format": "ethernet1/{port1}",
+    "qemu": {
+        "adapter_type": "virtio-net-pci",
+        "adapters": 25,
+        "ram": 4096,
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "hda_disk_interface": "virtio",
+        "kvm": "require",
+        "options": "-smp 2"
+    },
+    "images": [
+       {
+            "filename": "PA-VM-ESX-8.1.0-disk1.vmdk",
+            "version": "8.1.0",
+            "md5sum": "49af8e8225c2e90414bde0be15eaf421",
+            "filesize": 2281454080,
+            "download_url": "https://support.paloaltonetworks.com/Updates/SoftwareUpdates/"
+       },
+       {
+            "filename": "PA-VM-KVM-8.1.0.qcow2",
+            "version": "8.1.0",
+            "md5sum": "459558515b965b2e43fde2842abbae66",
+            "filesize": 2260467712,
+            "download_url": "https://support.paloaltonetworks.com/Updates/SoftwareUpdates/"
+        },
+       {
+            "filename": "PA-VM-ESX-8.0.0-disk1.vmdk",
+            "version": "8.0.0",
+            "md5sum": "a505fb1dbcc855ecf98630fd5d329f9a",
+            "filesize": 2002713088,
+            "download_url": "https://support.paloaltonetworks.com/Updates/SoftwareUpdates/"
+        },
+       {
+            "filename": "PA-VM-KVM-8.0.0.qcow2",
+            "version": "8.0.0",
+            "md5sum": "b6a1ddc8552aff87f05f9c0d4cb54dc3",
+            "filesize": 1987444736,
+            "download_url": "https://support.paloaltonetworks.com/Updates/SoftwareUpdates/"
+        },
+       {
+            "filename": "PA-VM-ESX-7.1.0-disk1.vmdk",
+            "version": "7.1.0 (ESX)",
+            "md5sum": "e044dc649b7146ee4f619edb0e5f6675",
+            "filesize": 1871149056,
+            "download_url": "https://support.paloaltonetworks.com/Updates/SoftwareUpdates/"
+        },
+       {
+            "filename": "PA-VM-KVM-7.1.0.qcow2",
+            "version": "7.1.0",
+            "md5sum": "da300253709740068927408239c2e321",
+            "filesize": 1858797568,
+            "download_url": "https://support.paloaltonetworks.com/Updates/SoftwareUpdates/"
+        },
+       {
+            "filename": "PA-VM-ESX-6.1.0-disk1.vmdk",
+            "version": "6.1.0 (ESX)",
+            "md5sum": "64b1e81cd54008318235832ea6d71424",
+            "filesize": 2959736832,
+            "download_url": "https://support.paloaltonetworks.com/Updates/SoftwareUpdates/"
+       }
+    ],
+    "versions": [
+         {
+            "name": "8.1.0 (ESX)",
+            "images": {
+                "hda_disk_image": "PA-VM-ESX-8.1.0-disk1.vmdk"
+            }
+        },
+         {
+            "name": "8.1.0",
+            "images": {
+                "hda_disk_image": "PA-VM-KVM-8.1.0.qcow2"
+            }
+        },
+         {
+            "name": "8.0.0 (ESX)",
+            "images": {
+                "hda_disk_image": "PA-VM-ESX-8.0.0-disk1.vmdk"
+            }
+        },
+         {
+            "name": "8.0.0",
+            "images": {
+                "hda_disk_image": "PA-VM-KVM-8.0.0.qcow2"
+            }
+        },
+         {
+            "name": "7.1.0 (ESX)",
+            "images": {
+                "hda_disk_image": "PA-VM-ESX-7.1.0-disk1.vmdk"
+            }
+        },
+         {
+            "name": "7.1.0",
+            "images": {
+                "hda_disk_image": "PA-VM-KVM-7.1.0.qcow2"
+            }
+         },
+         {
+            "name": "6.1.0 (ESX)",
+            "images": {
+                "hda_disk_image": "PA-VM-ESX-6.1.0-disk1.vmdk"
+            }
+         }
+    ]
+}
@@ -0,0 +1,53 @@
+{
+    "name": "ParrotOS",
+    "category": "guest",
+    "description": " Parrot is a GNU/Linux distribution based on Debian Testing and designed with Security, Development and Privacy in mind.  It includes a full portable laboratory for security and digital forensics experts, but it also includes all you need to develop your own software or protect your privacy while surfing the net.",
+    "vendor_name": "Parrot Project",
+    "vendor_url": "https://parrotsec.org/",
+    "documentation_url": "https://docs.parrotsec.org/doku.php",
+    "product_name": "ParrotOS",
+    "product_url": "https://parrotsec.org/",
+    "registry_version": 3,
+    "status": "stable",
+    "maintainer": "Brent Stewart",
+    "maintainer_email": "brent@stewart.tc",
+    "usage": "Passwords are set during installation.",
+    "symbol": "parrotlogo.png",
+    "qemu": {
+        "adapter_type": "e1000",
+        "adapters": 1,
+        "ram": 2048,
+        "arch": "x86_64",
+        "console_type": "vnc",
+        "kvm": "require"
+    },
+    "images": [
+        {
+            "filename": "Parrot-security-3.11_amd64.iso",
+            "version": "Security Build 3.11",
+            "md5sum": "71c94474fb474f682da0844d95f0040b",
+            "filesize": 3788668928,
+            "download_url": "https://www.parrotsec.org/download.fx",
+            "direct_download_url": "https://www.parrotsec.org/download-full.fx"
+        },
+        {
+            "filename": "empty30G.qcow2",
+            "version": "1.0",
+            "md5sum": "3411a599e822f2ac6be560a26405821a",
+            "filesize": 197120,
+            "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%30disk/",
+            "direct_download_url": "http://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
+        }
+    
+    ],
+    "versions": [
+        {
+            "name": "Security Build 3.11",
+            "images": {
+                "hda_disk_image": "empty30G.qcow2",
+                "cdrom_image": "Parrot-security-3.11_amd64.iso"
+            }
+        }
+        
+]
+}
@@ -2,117 +2,50 @@
    "name": "pfSense",
    "category": "firewall",
    "description": "The pfSense project is a free network firewall distribution, based on the FreeBSD operating system with a custom kernel and including third party free software packages for additional functionality. pfSense software, with the help of the package system, is able to provide the same functionality or more of common commercial firewalls, without any of the artificial limitations. It has successfully replaced every big name commercial firewall you can imagine in numerous installations around the world, including Check Point, Cisco PIX, Cisco ASA, Juniper, Sonicwall, Netgear, Watchguard, Astaro, and more.",
-    "vendor_name": "Electric Sheep Fencing LLC",
+    "vendor_name": "Rubicon Communications, LLC (Netgate)",
    "vendor_url": "https://www.pfsense.org",
    "documentation_url": "https://doc.pfsense.org/index.php/Main_Page",
    "product_name": "pfSense",
    "registry_version": 3,
    "status": "stable",
-    "maintainer": "GNS3 Team",
-    "maintainer_email": "developers@gns3.net",
+    "maintainer": "Jose Phillips",
+    "maintainer_email": "jose@latinol.com",
+    "usage": "Credentials: admin / pfsense\nTo install pfSense use all the defaults settings.\n\nNote:The default LAN port is em1.",
    "port_name_format": "em{0}",
    "qemu": {
        "adapter_type": "e1000",
        "adapters": 6,
        "ram": 2048,
        "arch": "x86_64",
-        "console_type": "telnet",
-        "boot_priority": "dc",
+        "console_type": "vnc",
+        "hda_disk_interface": "virtio",
        "kvm": "allow",
        "process_priority": "normal"
    },
    "images": [
        {
-            "filename": "pfSense-CE-2.3.5-RELEASE-2g-amd64-nanobsd.img",
-            "version": "2.3.5",
-            "md5sum": "b6cb76adba3e1113892f84ea01894228",
-            "filesize": 1989969408,
+            "filename": "pfSense-CE-2.4.4-RELEASE-amd64.iso",
+            "version": "2.4.4",
+            "md5sum": "71386433238f96fc167d14cec9c708c6",
+            "filesize": 685557760,
            "download_url": "https://www.pfsense.org/download/mirror.php?section=downloads"
        },
        {
-            "filename": "pfSense-CE-2.3.4-RELEASE-2g-amd64-nanobsd.img",
-            "version": "2.3.4",
-            "md5sum": "0c9871b54f932be2d550908f7c23b302",
-            "filesize": 1989969408,
-            "download_url": "https://www.pfsense.org/download/mirror.php?section=downloads"
-        },
-        {
-            "filename": "pfSense-CE-2.3.3-RELEASE-2g-amd64-nanobsd.img",
-            "version": "2.3.3",
-            "md5sum": "200f073c4f0a4ba6690920079f23d5dd",
-            "filesize": 1989969408,
-            "download_url": "https://www.pfsense.org/download/mirror.php?section=downloads"
-        },
-        {
-            "filename": "pfSense-CE-2.3.2-RELEASE-2g-amd64-nanobsd.img",
-            "version": "2.3.2",
-            "md5sum": "c91f2c8e287f4930695e65a6793cb8fe",
-            "filesize": 1989969408,
-            "download_url": "https://www.pfsense.org/download/mirror.php?section=downloads"
-        },
-        {
-            "filename": "pfSense-CE-2.3.1-RELEASE-2g-amd64-nanobsd.img",
-            "version": "2.3.1",
-            "md5sum": "719149eed51e03872a8cfd235d958d2e",
-            "filesize": 1989969408,
-            "download_url": "https://www.pfsense.org/download/mirror.php?section=downloads"
-        },
-        {
-            "filename": "pfSense-CE-2.3-RELEASE-2g-amd64-nanobsd.img",
-            "version": "2.3",
-            "md5sum": "8ab5047bd4c5bbabf71055fb75177d85",
-            "filesize": 1989969408,
-            "download_url": "https://www.pfsense.org/download/mirror.php?section=downloads"
-        },
-        {
-            "filename": "pfSense-2.2.6-RELEASE-1g-amd64-nanobsd.img",
-            "version": "2.2.6",
-            "md5sum": "7bbe39c4ec698685c9f9b615926820a9",
-            "filesize": 997097472,
-            "download_url": "https://www.pfsense.org/download/mirror.php?section=downloads"
+            "filename": "empty100G.qcow2",
+            "version": "1.0",
+            "md5sum": "1e6409a4523ada212dea2ebc50e50a65",
+            "filesize": 197120,
+            "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
+            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty100G.qcow2/download"
        }
+
    ],
    "versions": [
        {
-            "name": "2.3.5",
+            "name": "2.4.4",
            "images": {
-                "hda_disk_image": "pfSense-CE-2.3.5-RELEASE-2g-amd64-nanobsd.img"
-            }
-        },
-        {
-            "name": "2.3.4",
-            "images": {
-                "hda_disk_image": "pfSense-CE-2.3.4-RELEASE-2g-amd64-nanobsd.img"
-            }
-        },
-        {
-            "name": "2.3.3",
-            "images": {
-                "hda_disk_image": "pfSense-CE-2.3.3-RELEASE-2g-amd64-nanobsd.img"
-            }
-        },
-        {
-            "name": "2.3.2",
-            "images": {
-                "hda_disk_image": "pfSense-CE-2.3.2-RELEASE-2g-amd64-nanobsd.img"
-            }
-        },
-        {
-            "name": "2.3.1",
-            "images": {
-                "hda_disk_image": "pfSense-CE-2.3.1-RELEASE-2g-amd64-nanobsd.img"
-            }
-        },
-        {
-            "name": "2.3",
-            "images": {
-                "hda_disk_image": "pfSense-CE-2.3-RELEASE-2g-amd64-nanobsd.img"
-            }
-        },
-        {
-            "name": "2.2.6",
-            "images": {
-                "hda_disk_image": "pfSense-2.2.6-RELEASE-1g-amd64-nanobsd.img"
+                "hda_disk_image": "empty100G.qcow2",
+                "cdrom_image": "pfSense-CE-2.4.4-RELEASE-amd64.iso"
            }
        }
    ]
@@ -24,6 +24,14 @@
        "kvm": "require"
    },
    "images": [
+        {
+            "filename": "proxmox-mailgateway_5.1-1.iso",
+            "version": "5.1-1",
+            "md5sum": "e629d5ff3213ff3ffbe5a8ab8ef87489",
+            "filesize": 724660224,
+            "download_url": "http://www.proxmox.com/en/downloads",
+            "direct_download_url": "https://www.proxmox.com/en/downloads?task=callelement&format=raw&item_id=415&element=f85c494b-2b32-4109-b8c1-083cca2b7db6&method=download&args[0]=7348486df9daacc8bd891a1d7ef1e5cb"
+        },
        {
            "filename": "proxmox-mailgateway_4.1-5.iso",
            "version": "4.1-5",
@@ -42,6 +50,13 @@
        }
    ],
    "versions": [
+        {
+            "name": "5.1-1",
+            "images": {
+                "hda_disk_image": "empty30G.qcow2",
+                "cdrom_image": "proxmox-mailgateway_5.1-1.iso"
+            }
+        },
        {
            "name": "4.1-5",
            "images": {
@@ -11,6 +11,6 @@
    "maintainer_email": "developers@gns3.net",
    "docker": {
        "adapters": 1,
-        "image": "gns3/python-go-perl-php:latest"
+        "image": "adosztal/python-go-perl-php:latest"
    }
 }
@@ -22,12 +22,20 @@
        "kvm": "allow"
    },
    "images": [
+        {
+            "filename": "securityonion-16.04.5.3.iso",
+            "version": "16.04.5.3",
+            "md5sum": "886b369548c9c3841bc820cc3ab02bd9",
+            "filesize": 1895825408,
+            "download_url": "https://github.com/Security-Onion-Solutions/security-onion/releases/",
+            "direct_download_url": "https://github.com/Security-Onion-Solutions/security-onion/releases/download/v16.04.5.3_20181010/securityonion-16.04.5.3.iso"
+        },
        {
            "filename": "securityonion-14.04.5.4.iso",
            "version": "14.04.5.4",
            "md5sum": "9c7cab756b675beb10de4274a3ad3bc6",
            "filesize": 1874853888,
-            "download_url": "https://github.com/Security-Onion-Solutions/security-onion/releases/download/v14.04.5.4_20171031/securityonion-14.04.5.4.iso",
+            "download_url": "https://github.com/Security-Onion-Solutions/security-onion/releases/",
            "direct_download_url": "https://github.com/Security-Onion-Solutions/security-onion/releases/download/v14.04.5.4_20171031/securityonion-14.04.5.4.iso"
        },
        {
@@ -35,7 +43,7 @@
            "version": "14.04.5.3",
            "md5sum": "fb80ccb2d3c0f3f511823fa5858f87d1",
            "filesize": 1889533952,
-            "download_url": "https://github.com/Security-Onion-Solutions/security-onion/releases/download/v14.04.5.4_20171031/securityonion-14.04.5.3.iso",
+            "download_url": "https://github.com/Security-Onion-Solutions/security-onion/releases/",
            "direct_download_url": "https://github.com/Security-Onion-Solutions/security-onion/releases/download/v14.04.5.4_20171031/securityonion-14.04.5.3.iso"
        },
        {
@@ -49,6 +57,13 @@
    
    ],
    "versions": [
+        {
+            "name": "16.04.5.3",
+            "images": {
+                "hda_disk_image": "empty30G.qcow2",
+                "cdrom_image": "securityonion-16.04.5.3.iso"
+            }
+        },
        {
            "name": "14.04.5.4",
            "images": {
@@ -24,6 +24,13 @@
        "kvm": "require"
    },
    "images": [
+        {
+            "filename": "VI-SIVOS_03.01.2.KVM-009-PRIMARY.qcow2",
+            "version": "3.1.2",
+            "md5sum": "62551f70f71e08283d3a23929321eba9",
+            "filesize": 644218880,
+            "download_url": "https://secure2.sophos.com/en-us/products/next-gen-firewall/free-trial.aspx"
+        },
        {
            "filename": "VI-SIVOS_02.00.0_MR-2.KVM-776-PRIMARY.qcow2",
            "version": "2.0.0 MR2",
@@ -32,7 +39,7 @@
            "download_url": "https://secure2.sophos.com/en-us/products/next-gen-firewall/free-trial.aspx"
        },
        {
-            "filename": "VI-SIVOS_02.00.0_MR-2.KVM-776-AUXILARY.qcow2",
+            "filename": "VI-SIVOS-AUXILARY.qcow2",
            "version": "2.0.0 MR2",
            "md5sum": "a52d8cedb1ccd4b5b9f2723dfb41588b",
            "filesize": 204800,
@@ -40,11 +47,18 @@
        }
    ],
    "versions": [
+        {
+            "name": "3.1.2",
+            "images": {
+                "hda_disk_image": "VI-SIVOS_03.01.2.KVM-009-PRIMARY.qcow2",
+                "hdb_disk_image": "VI-SIVOS-AUXILARY.qcow2"
+            }
+        },
        {
            "name": "2.0.0 MR2",
            "images": {
                "hda_disk_image": "VI-SIVOS_02.00.0_MR-2.KVM-776-PRIMARY.qcow2",
-                "hdb_disk_image": "VI-SIVOS_02.00.0_MR-2.KVM-776-AUXILARY.qcow2"
+                "hdb_disk_image": "VI-SIVOS-AUXILARY.qcow2"
            }
        }
    ]
@@ -24,6 +24,13 @@
        "kvm": "allow"
    },
    "images": [
+        {
+            "filename": "asg-9.510-5.1.iso",
+            "version": "9.510-5.1",
+            "md5sum": "ae21f96686f238c25941fd3240c7da5b",
+            "filesize": 871266304,
+            "download_url": "https://www.sophos.com/en-us/support/utm-downloads.aspx"
+        },
        {
            "filename": "asg-9.506-2.1.iso",
            "version": "9.506-2.1",
@@ -139,6 +146,13 @@
        }
    ],
    "versions": [
+        {
+            "name": "9.510-5.1",
+            "images": {
+                "hda_disk_image": "empty30G.qcow2",
+                "cdrom_image": "asg-9.510-5.1.iso"
+            }
+        },
        {
            "name": "9.506-2.1",
            "images": {
@@ -23,6 +23,20 @@
        "kvm": "require"
    },
    "images": [
+        {
+            "filename": "VI-17.1.3_MR-3.KVM-250-PRIMARY.qcow2",
+            "version": "17.1.3 MR3",
+            "md5sum": "f11c4f63656bcdacbd27c44c52416941",
+            "filesize": 298844160,
+            "download_url": "https://secure2.sophos.com/en-us/products/next-gen-firewall/free-trial.aspx"
+        },
+        {
+            "filename": "VI-17.1.3_MR-3.KVM-250-AUXILARY.qcow2",
+            "version": "17.1.3 MR3",
+            "md5sum": "fbea59f7aa81f305bea78c86f82dc3a6",
+            "filesize": 59441152,
+            "download_url": "https://secure2.sophos.com/en-us/products/next-gen-firewall/free-trial.aspx"
+        },
        {
            "filename": "VI-SFOS_17.0.2_MR-2.KVM-116-PRIMARY.qcow2",
            "version": "17.0.2 MR2",
@@ -32,7 +46,7 @@
        },
        {
            "filename": "VI-SFOS_17.0.2_MR-2.KVM-116-AUXILARY.qcow2",
-            "version": "16.05.1 MR1",
+            "version": "17.0.2 MR2",
            "md5sum": "c3ef795423dbfc01771348b0daa75125",
            "filesize": 59441152,
            "download_url": "https://secure2.sophos.com/en-us/products/next-gen-firewall/free-trial.aspx"
@@ -46,7 +60,7 @@
        },
        {
            "filename": "VI-SFOS_16.05.4_MR-4.KVM-215-AUXILARY.qcow2",
-            "version": "16.05.1 MR1",
+            "version": "16.05.4 MR4",
            "md5sum": "cafac2d997a3ead087d5823b86ce6cb4",
            "filesize": 59441152,
            "download_url": "https://secure2.sophos.com/en-us/products/next-gen-firewall/free-trial.aspx"
@@ -109,6 +123,13 @@
        }
    ],
    "versions": [
+        {
+            "name": "17.1.3 MR3",
+            "images": {
+                "hda_disk_image": "VI-17.1.3_MR-3.KVM-250-PRIMARY.qcow2",
+                "hdb_disk_image": "VI-17.1.3_MR-3.KVM-250-AUXILARY.qcow2"
+            }
+        },
        {
            "name": "17.0.2 MR2",
            "images": {
@@ -0,0 +1,43 @@
+{
+    "name": "TacacsGUI",
+    "category": "guest",
+    "description": "TacacsGUI Free Access Control Server for Your Network Devices. GUI for powerful daemon. The project of Alexey Mochalin, based on tacacs daemon by Marc Huber",
+    "vendor_name": "TacacsGUI",
+    "vendor_url": "https://tacacsgui.com/",
+    "documentation_url": "https://tacacsgui.com/documentation/",
+    "product_name": "TacacsGUI",
+    "product_url": "https://drive.google.com/open?id=1U8tbj14NqEyCmarayhZm54qTyjgsJm4B",
+    "registry_version": 3,
+    "status": "stable",
+    "maintainer": "GNS3 Team",
+    "maintainer_email": "developers@gns3.net",
+    "usage": "Credentials: SSH ---> username: root ---> password: 1234 MySQL DB: ---> username: root --> password: tacacs Web interface: ---> username: tacgui ---> password: abc123",
+    "port_name_format": "Port{port1}",
+    "qemu": {
+        "adapter_type": "e1000",
+        "adapters": 1,
+        "ram": 1024,
+        "hda_disk_interface": "ide",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "boot_priority": "c",
+        "kvm": "allow"
+    },
+    "images": [
+        {
+            "filename": "tac_plus.qcow2",
+            "version": "201710201114",
+            "md5sum": "6b5e66590051124dae586b8640b2eb11",
+            "filesize": 160301056,
+            "download_url": "https://drive.google.com/open?id=1U8tbj14NqEyCmarayhZm54qTyjgsJm4B"
+        }
+    ],
+    "versions": [
+        {
+            "name": "201710201114",
+            "images": {
+                "hda_disk_image": "tac_plus.qcow2"
+            }
+        }
+    ]
+}
@@ -13,7 +13,7 @@
    "usage": "For security reasons there are no default passwords. All passwords are set at system initialization time.",
    "docker": {
        "adapters": 1,
-        "image": "turnkeylinux/wordpress-14.2:latest",
+        "image": "turnkeylinux/wordpress:latest",
        "console_type": "telnet"
    }
 }
@@ -25,6 +25,13 @@
        "options": "-nographic"
    },
    "images": [
+        {
+            "filename": "ubuntu-18.04-server-cloudimg-amd64.img",
+            "version": "18.04",
+            "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",
@@ -55,6 +62,13 @@
        }
    ],
    "versions": [
+        {
+            "name": "18.04 (LTS)",
+            "images": {
+                "hda_disk_image": "ubuntu-18.04-server-cloudimg-amd64.img",
+                "cdrom_image": "ubuntu-cloud-init-data.iso"
+            }
+        },
        {
            "name": "17.10",
            "images": {
@@ -24,6 +24,27 @@
        "kvm": "allow"
    },
    "images": [
+        {
+            "filename": "untangle_1410_x64.iso",
+            "version": "14.1.0",
+            "md5sum": "49bb09e4796f225f482ca1d9c93de66b",
+            "filesize": 682622976,
+            "download_url": "https://www.untangle.com/get-untangle/"
+        },
+        {
+            "filename": "untangle_1401_x64.iso",
+            "version": "14.0.1",
+            "md5sum": "d9c01afd8bf4b5dfdc40c22aa3b2fd98",
+            "filesize": 680525824,
+            "download_url": "https://www.untangle.com/get-untangle/"
+        },
+        {
+            "filename": "untangle_1321_x64.iso",
+            "version": "13.2.1",
+            "md5sum": "4ce49535372f85565922c7e90bc11ba3",
+            "filesize": 627048448,
+            "download_url": "https://www.untangle.com/get-untangle/"
+        },
        {
            "filename": "untangle_1320_x64.iso",
            "version": "13.2.0",
@@ -97,6 +118,27 @@
        }
    ],
    "versions": [
+        {
+            "name": "14.1.0",
+            "images": {
+                "hda_disk_image": "empty30G.qcow2",
+                "cdrom_image": "untangle_1410_x64.iso"
+            }
+        },
+        {
+            "name": "14.0.1",
+            "images": {
+                "hda_disk_image": "empty30G.qcow2",
+                "cdrom_image": "untangle_1401_x64.iso"
+            }
+        },
+        {
+            "name": "13.2.1",
+            "images": {
+                "hda_disk_image": "empty30G.qcow2",
+                "cdrom_image": "untangle_1321_x64.iso"
+            }
+        },
        {
            "name": "13.2.0",
            "images": {
@@ -0,0 +1,46 @@
+{
+    "name": "VPP",
+    "category": "router",
+    "description": "Vector Packet Processing (VPP) platform",
+    "vendor_name": "FD.IO VPP router",
+    "vendor_url": "https://fd.io/",
+    "documentation_url": "https://fd.io/resources/",
+    "product_name": "VPP",
+    "registry_version": 4,
+    "status": "experimental",
+    "availability": "free",
+    "maintainer": "Virginijus Magelinskas",
+    "maintainer_email": "virginijus.m@gmail.com",
+    "usage": "Login: root , pass: vpp. This appliance requires >2 vCPUs and 4GB of RAM to run",
+    "port_name_format": "eth{0}",
+    "qemu": {
+        "adapter_type": "virtio-net-pci",
+        "adapters": 5,
+        "ram": 4096,
+        "hda_disk_interface": "ide",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "boot_priority": "c",
+        "kvm": "require",
+        "options": "-nographic -cpu host -smp 2"
+    },
+    "images": [
+        {
+            "filename": "vpp_public-18.10-07.qcow2",
+            "version": "0.7",
+            "md5sum": "3e962985e5bbda0de4dc7893e60f6366",
+            "filesize": 2065825792,
+            "direct_download_url": "https://sigaba.net/vpp/vpp_public-18.10-07.qcow2"
+        }
+    ],
+    "versions": [
+
+        {
+            "name": "18.10-07",
+            "images": {
+                "hda_disk_image": "vpp_public-18.10-07.qcow2"
+            }
+        }
+    ]
+}
+
@@ -27,10 +27,10 @@
    },
    "images": [
        {
-            "filename": "MSEdge-Win10-VMWare-disk1.vmdk",
+            "filename": "MSEdge-Win10-VMware-disk1.vmdk",
            "version": "10 w/ Edge",
-            "md5sum": "fef74c69e1949480d4e2095324a169af",
-            "filesize": 5636608512,
+            "md5sum": "670f3c2b03a5629dc85d0d1c261e5929",
+            "filesize": 7293386240,
            "download_url": "https://developer.microsoft.com/en-us/microsoft-edge/tools/vms/"
        },
        {
@@ -80,7 +80,7 @@
        {
            "name": "10 w/ Edge",
            "images": {
-                "hda_disk_image": "MSEdge-Win10-VMWare-disk1.vmdk"
+                "hda_disk_image": "MSEdge-Win10-VMware-disk1.vmdk"
            }
        },
        {
@@ -24,6 +24,22 @@
        "kvm": "require"
    },
    "images": [
+        {
+            "filename": "zentyal-6.0-development-amd64.iso",
+            "version": "6.0",
+            "md5sum": "e1765d2c4d86debc9d9cbab2b7a8adbd",
+            "filesize": 895483904,
+            "download_url": "http://download.zentyal.com/",
+            "direct_download_url": "http://download.zentyal.com/zentyal-6.0-development-amd64.iso"
+        },
+        {
+            "filename": "zentyal-5.1-development-amd64.iso",
+            "version": "5.1",
+            "md5sum": "dac5623b92c1b361d7805ab8c95c0d99",
+            "filesize": 947912704,
+            "download_url": "http://download.zentyal.com/",
+            "direct_download_url": "http://download.zentyal.com/zentyal-5.1-development-amd64.iso"
+        },
        {
            "filename": "zentyal-5.0.1-development-amd64.iso",
            "version": "5.0.1",
@@ -74,6 +90,20 @@
        }
    ],
    "versions": [
+        {
+            "name": "6.0",
+            "images": {
+                "hda_disk_image": "empty100G.qcow2",
+                "cdrom_image": "zentyal-6.0-development-amd64.iso"
+            }
+        },
+        {
+            "name": "5.1",
+            "images": {
+                "hda_disk_image": "empty100G.qcow2",
+                "cdrom_image": "zentyal-5.1-development-amd64.iso"
+            }
+        },
        {
            "name": "5.0.1",
            "images": {
@@ -30,6 +30,7 @@ log = logging.getLogger(__name__)

 from uuid import UUID, uuid4
 from gns3server.utils.interfaces import is_interface_up
+from gns3server.utils.asyncio import asyncio_ensure_future
 from ..config import Config
 from ..utils.asyncio import wait_run_in_executor
 from ..utils import force_unix_path
@@ -127,7 +128,7 @@ class BaseManager:

        tasks = []
        for node_id in self._nodes.keys():
-            tasks.append(asyncio.async(self.close_node(node_id)))
+            tasks.append(asyncio_ensure_future(self.close_node(node_id)))

        if tasks:
            done, _ = yield from asyncio.wait(tasks)
@@ -275,7 +276,7 @@ class BaseManager:
        destination_dir = destination_node.working_dir
        try:
            shutil.rmtree(destination_dir)
-            shutil.copytree(source_node.working_dir, destination_dir)
+            shutil.copytree(source_node.working_dir, destination_dir, symlinks=True, ignore_dangling_symlinks=True)
        except OSError as e:
            raise aiohttp.web.HTTPConflict(text="Can't duplicate node data: {}".format(e))

@@ -29,7 +29,7 @@ import re

 from gns3server.utils.interfaces import interfaces
 from ..compute.port_manager import PortManager
-from ..utils.asyncio import wait_run_in_executor, locked_coroutine
+from ..utils.asyncio import wait_run_in_executor, locking
 from ..utils.asyncio.telnet_server import AsyncioTelnetServer
 from ..ubridge.hypervisor import Hypervisor
 from ..ubridge.ubridge_error import UbridgeError
@@ -516,7 +516,8 @@ class BaseNode:
        except UbridgeError as e:
            raise UbridgeError("Error while sending command '{}': {}: {}".format(command, e, self._ubridge_hypervisor.read_stdout()))

-    @locked_coroutine
+    @locking
+    @asyncio.coroutine
    def _start_ubridge(self):
        """
        Starts uBridge (handles connections to and from this node).
@@ -163,7 +163,7 @@ class Cloud(BaseNode):

        try:
            output = yield from gns3server.utils.asyncio.subprocess_check_output("networksetup", "-listallhardwareports")
-        except (FileNotFoundError, subprocess.SubprocessError) as e:
+        except (OSError, subprocess.SubprocessError) as e:
            log.warn("Could not execute networksetup: {}".format(e))
            return False

@@ -25,7 +25,7 @@ import asyncio
 import logging
 import aiohttp
 from gns3server.utils import parse_version
-from gns3server.utils.asyncio import locked_coroutine
+from gns3server.utils.asyncio import locking
 from gns3server.compute.base_manager import BaseManager
 from gns3server.compute.docker.docker_vm import DockerVM
 from gns3server.compute.docker.docker_error import DockerError, DockerHttp304Error, DockerHttp404Error
@@ -182,7 +182,8 @@ class Docker(BaseManager):
                                                         autoping=True)
        return connection

-    @locked_coroutine
+    @locking
+    @asyncio.coroutine
    def pull_image(self, image, progress_callback=None):
        """
        Pull image from docker repository
@@ -199,7 +200,10 @@ class Docker(BaseManager):

        if progress_callback:
            progress_callback("Pulling '{}' from docker hub".format(image))
-        response = yield from self.http_query("POST", "images/create", params={"fromImage": image}, timeout=None)
+        try:
+            response = yield from self.http_query("POST", "images/create", params={"fromImage": image}, timeout=None)
+        except DockerError as e:
+            raise DockerError("Could not pull the '{}' image from Docker Hub, please check your Internet connection (original error: {})".format(image, e))
        # The pull api will stream status via an HTTP JSON stream
        content = ""
        while True:
@@ -24,11 +24,14 @@ import shutil
 import psutil
 import shlex
 import aiohttp
+import subprocess
 import os

 from gns3server.utils.asyncio.telnet_server import AsyncioTelnetServer
 from gns3server.utils.asyncio.raw_command_server import AsyncioRawCommandServer
 from gns3server.utils.asyncio import wait_for_file_creation
+from gns3server.utils.asyncio import asyncio_ensure_future
+from gns3server.utils.asyncio import monitor_process
 from gns3server.utils.get_resource import get_resource

 from gns3server.ubridge.ubridge_error import UbridgeError, UbridgeNamespaceError
@@ -80,12 +83,14 @@ class DockerVM(BaseNode):
        self._ethernet_adapters = []
        self._temporary_directory = None
        self._telnet_servers = []
-        self._x11vnc_process = None
+        self._vnc_process = None
+        self._xvfb_process = None
        self._console_resolution = console_resolution
        self._console_http_path = console_http_path
        self._console_http_port = console_http_port
        self._console_websocket = None
        self._extra_hosts = extra_hosts
+        self._permissions_fixed = False

        self._volumes = []
        # Keep a list of created bridge
@@ -226,11 +231,13 @@ class DockerVM(BaseNode):
        binds = ["{}:/gns3:ro".format(ressources)]

        # We mount our own etc/network
-        network_config = self._create_network_config()
+        try:
+            network_config = self._create_network_config()
+        except OSError as e:
+            raise DockerError("Could not create network config in the container: {}".format(e))
        binds.append("{}:/gns3volumes/etc/network:rw".format(network_config))

        self._volumes = ["/etc/network"]
-
        volumes = image_infos.get("Config", {}).get("Volumes")
        if volumes is None:
            return binds
@@ -283,11 +290,12 @@ class DockerVM(BaseNode):
        try:
            image_infos = yield from self._get_image_information()
        except DockerHttp404Error:
-            log.info("Image %s is missing pulling it from docker hub", self._image)
+            log.info("Image '{}' is missing, pulling it from Docker hub...".format(self._image))
            yield from self.pull_image(self._image)
            image_infos = yield from self._get_image_information()
-            if image_infos is None:
-                raise DockerError("Can't get image informations, please try again.")
+
+        if image_infos is None:
+            raise DockerError("Cannot get information for image '{}', please try again.".format(self._image))

        params = {
            "Hostname": self._name,
@@ -311,7 +319,10 @@ class DockerVM(BaseNode):
        if params["Entrypoint"] is None:
            params["Entrypoint"] = []
        if self._start_command:
-            params["Cmd"] = shlex.split(self._start_command)
+            try:
+                params["Cmd"] = shlex.split(self._start_command)
+            except ValueError as e:
+                raise DockerError("Invalid start command '{}': {}".format(self._start_command, e))
        if len(params["Cmd"]) == 0:
            params["Cmd"] = image_infos.get("Config", {"Cmd": []})["Cmd"]
            if params["Cmd"] is None:
@@ -336,6 +347,9 @@ class DockerVM(BaseNode):
        if self._environment:
            for e in self._environment.strip().split("\n"):
                e = e.strip()
+                if e.split("=")[0] == "":
+                    self.project.emit("log.warning", {"message": "{} has invalid environment variable: {}".format(self.name, e)})
+                    continue
                if not e.startswith("GNS3_"):
                    formatted = self._format_env(variables, e)
                    params["Env"].append(formatted)
@@ -353,8 +367,7 @@ class DockerVM(BaseNode):

        result = yield from self.manager.query("POST", "containers/create", data=params)
        self._cid = result['Id']
-        log.info("Docker container '{name}' [{id}] created".format(
-            name=self._name, id=self._id))
+        log.info("Docker container '{name}' [{id}] created".format(name=self._name, id=self._id))
        return True

    def _format_env(self, variables, env):
@@ -432,12 +445,14 @@ class DockerVM(BaseNode):

            if self.console_type == "telnet":
                yield from self._start_console()
+
            elif self.console_type == "http" or self.console_type == "https":
                yield from self._start_http()

            if self.allocate_aux:
                yield from self._start_aux()

+        self._permissions_fixed = False
        self.status = "started"
        log.info("Docker container '{name}' [{image}] started listen for {console_type} on {console}".format(name=self._name,
                                                                                                             image=self._image,
@@ -447,22 +462,24 @@ class DockerVM(BaseNode):
    @asyncio.coroutine
    def _start_aux(self):
        """
-        Start an auxilary console
+        Start an auxiliary console
        """

        # We can not use the API because docker doesn't expose a websocket api for exec
        # https://github.com/GNS3/gns3-gui/issues/1039
-        process = yield from asyncio.subprocess.create_subprocess_exec(
-            "docker", "exec", "-i", self._cid, "/gns3/bin/busybox", "script", "-qfc", "while true; do TERM=vt100 /gns3/bin/busybox sh; done", "/dev/null",
-            stdout=asyncio.subprocess.PIPE,
-            stderr=asyncio.subprocess.STDOUT,
-            stdin=asyncio.subprocess.PIPE)
+        try:
+            process = yield from asyncio.subprocess.create_subprocess_exec("docker", "exec", "-i", self._cid, "/gns3/bin/busybox", "script", "-qfc", "while true; do TERM=vt100 /gns3/bin/busybox sh; done", "/dev/null",
+                                                                           stdout=asyncio.subprocess.PIPE,
+                                                                           stderr=asyncio.subprocess.STDOUT,
+                                                                           stdin=asyncio.subprocess.PIPE)
+        except OSError as e:
+            raise DockerError("Could not start auxiliary console process: {}".format(e))
        server = AsyncioTelnetServer(reader=process.stdout, writer=process.stdin, binary=True, echo=True)
        try:
            self._telnet_servers.append((yield from asyncio.start_server(server.run, self._manager.port_manager.console_host, self.aux)))
        except OSError as e:
            raise DockerError("Could not start Telnet server on socket {}:{}: {}".format(self._manager.port_manager.console_host, self.aux, e))
-        log.debug("Docker container '%s' started listen for auxilary telnet on %d", self.name, self.aux)
+        log.debug("Docker container '%s' started listen for auxiliary telnet on %d", self.name, self.aux)

    @asyncio.coroutine
    def _fix_permissions(self):
@@ -472,6 +489,7 @@ class DockerVM(BaseNode):
        """

        state = yield from self._get_container_state()
+        log.info("Docker container '{name}' fix ownership, state = {state}".format(name=self._name, state=state))
        if state == "stopped" or state == "exited":
            # We need to restart it to fix permissions
            yield from self.manager.query("POST", "containers/{}/start".format(self._cid))
@@ -479,22 +497,27 @@ class DockerVM(BaseNode):
        for volume in self._volumes:
            log.debug("Docker container '{name}' [{image}] fix ownership on {path}".format(
                name=self._name, image=self._image, path=volume))
-            process = yield from asyncio.subprocess.create_subprocess_exec(
-                "docker",
-                "exec",
-                self._cid,
-                "/gns3/bin/busybox",
-                "sh",
-                "-c",
-                "("
-                "/gns3/bin/busybox find \"{path}\" -depth -print0"
-                " | /gns3/bin/busybox xargs -0 /gns3/bin/busybox stat -c '%a:%u:%g:%n' > \"{path}/.gns3_perms\""
-                ")"
-                " && /gns3/bin/busybox chmod -R u+rX \"{path}\""
-                " && /gns3/bin/busybox chown {uid}:{gid} -R \"{path}\""
-                .format(uid=os.getuid(), gid=os.getgid(), path=volume),
-            )
+
+            try:
+                process = yield from asyncio.subprocess.create_subprocess_exec(
+                    "docker",
+                    "exec",
+                    self._cid,
+                    "/gns3/bin/busybox",
+                    "sh",
+                    "-c",
+                    "("
+                    "/gns3/bin/busybox find \"{path}\" -depth -print0"
+                    " | /gns3/bin/busybox xargs -0 /gns3/bin/busybox stat -c '%a:%u:%g:%n' > \"{path}/.gns3_perms\""
+                    ")"
+                    " && /gns3/bin/busybox chmod -R u+rX \"{path}\""
+                    " && /gns3/bin/busybox chown {uid}:{gid} -R \"{path}\""
+                    .format(uid=os.getuid(), gid=os.getgid(), path=volume),
+                )
+            except OSError as e:
+                raise DockerError("Could not fix permissions for {}: {}".format(volume, e))
            yield from process.wait()
+            self._permissions_fixed = True

    @asyncio.coroutine
    def _start_vnc(self):
@@ -503,14 +526,54 @@ class DockerVM(BaseNode):
        """

        self._display = self._get_free_display_port()
-        if shutil.which("Xvfb") is None or shutil.which("x11vnc") is None:
-            raise DockerError("Please install Xvfb and x11vnc before using the VNC support")
-        self._xvfb_process = yield from asyncio.create_subprocess_exec("Xvfb", "-nolisten", "tcp", ":{}".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
-        self._x11vnc_process = yield from asyncio.create_subprocess_exec("x11vnc", "-forever", "-nopw", "-shared", "-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)
+        if not (shutil.which("Xtigervnc") or shutil.which("Xvfb") and shutil.which("x11vnc")):
+            raise DockerError("Please install tigervnc-standalone-server (recommended) or Xvfb + x11vnc before using VNC support")
+
+        if shutil.which("Xtigervnc"):
+            with open(os.path.join(self.working_dir, "vnc.log"), "w") as fd:
+                self._vnc_process = yield from asyncio.create_subprocess_exec("Xtigervnc",
+                                                                              "-geometry", self._console_resolution,
+                                                                              "-depth", "16",
+                                                                              "-interface", self._manager.port_manager.console_host,
+                                                                              "-rfbport", str(self.console),
+                                                                              "-AlwaysShared",
+                                                                              "-SecurityTypes", "None",
+                                                                              ":{}".format(self._display),
+                                                                              stdout=fd, stderr=subprocess.STDOUT)
+        else:
+            self._xvfb_process = yield from asyncio.create_subprocess_exec("Xvfb",
+                                                                           "-nolisten",
+                                                                           "tcp", ":{}".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 = yield from asyncio.create_subprocess_exec("x11vnc",
+                                                                              "-forever",
+                                                                              "-nopw",
+                                                                              "-shared",
+                                                                              "-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)

        x11_socket = os.path.join("/tmp/.X11-unix/", "X{}".format(self._display))
        yield from wait_for_file_creation(x11_socket)
+        #monitor_process(self._vnc_process, self._vnc_callback)
+
+    def _vnc_callback(self, returncode):
+        """
+        Called when the process has stopped.
+
+        :param returncode: Process returncode
+        """
+
+        if returncode != 0:
+            self.project.emit("log.error", {"message": "The vnc process has stopped, return code: {}.".format(returncode)})

    @asyncio.coroutine
    def _start_http(self):
@@ -533,6 +596,19 @@ class DockerVM(BaseNode):
        ])
        self._telnet_servers.append((yield from asyncio.start_server(server.run, self._manager.port_manager.console_host, self.console)))

+    @asyncio.coroutine
+    def _window_size_changed_callback(self, columns, rows):
+        """
+        Called when the console window size has been changed.
+        (when naws is enabled in the Telnet server)
+
+        :param columns: number of columns
+        :param rows: number of rows
+        """
+
+        # resize the container TTY.
+        yield from self._manager.query("POST", "containers/{}/resize?h={}&w={}".format(self._cid, rows, columns))
+
    @asyncio.coroutine
    def _start_console(self):
        """
@@ -555,8 +631,7 @@ class DockerVM(BaseNode):

        output_stream = asyncio.StreamReader()
        input_stream = InputStream()
-
-        telnet = AsyncioTelnetServer(reader=output_stream, writer=input_stream, echo=True)
+        telnet = AsyncioTelnetServer(reader=output_stream, writer=input_stream, echo=True, naws=True, window_size_changed_callback=self._window_size_changed_callback)
        try:
            self._telnet_servers.append((yield from asyncio.start_server(telnet.run, self._manager.port_manager.console_host, self.console)))
        except OSError as e:
@@ -566,8 +641,7 @@ class DockerVM(BaseNode):
        input_stream.ws = self._console_websocket

        output_stream.feed_data(self.name.encode() + b" console is now available... Press RETURN to get started.\r\n")
-
-        asyncio.async(self._read_console_output(self._console_websocket, output_stream))
+        asyncio_ensure_future(self._read_console_output(self._console_websocket, output_stream))

    @asyncio.coroutine
    def _read_console_output(self, ws, out):
@@ -641,14 +715,15 @@ class DockerVM(BaseNode):
            if state == "paused":
                yield from self.unpause()

-            yield from self._fix_permissions()
+            if not self._permissions_fixed:
+                yield from self._fix_permissions()
+
            state = yield from self._get_container_state()
            if state != "stopped" or state != "exited":
                # t=5 number of seconds to wait before killing the container
                try:
                    yield from self.manager.query("POST", "containers/{}/stop".format(self._cid), params={"t": 5})
-                    log.info("Docker container '{name}' [{image}] stopped".format(
-                        name=self._name, image=self._image))
+                    log.info("Docker container '{name}' [{image}] stopped".format(name=self._name, image=self._image))
                except DockerHttp304Error:
                    # Container is already stopped
                    pass
@@ -688,12 +763,13 @@ class DockerVM(BaseNode):
            if state == "paused" or state == "running":
                yield from self.stop()
            if self.console_type == "vnc":
-                if self._x11vnc_process:
+                if self._vnc_process:
                    try:
-                        self._x11vnc_process.terminate()
-                        yield from self._x11vnc_process.wait()
+                        self._vnc_process.terminate()
+                        yield from self._vnc_process.wait()
                    except ProcessLookupError:
                        pass
+                if self._xvfb_process:
                    try:
                        self._xvfb_process.terminate()
                        yield from self._xvfb_process.wait()
@@ -36,6 +36,7 @@ log = logging.getLogger(__name__)
 from gns3server.utils.interfaces import interfaces, is_interface_up
 from gns3server.utils.asyncio import wait_run_in_executor
 from gns3server.utils import parse_version
+from gns3server.utils.asyncio import asyncio_ensure_future
 from uuid import uuid4
 from ..base_manager import BaseManager
 from ..port_manager import PortManager
@@ -172,7 +173,7 @@ class Dynamips(BaseManager):

        tasks = []
        for device in self._devices.values():
-            tasks.append(asyncio.async(device.hypervisor.stop()))
+            tasks.append(asyncio_ensure_future(device.hypervisor.stop()))

        if tasks:
            done, _ = yield from asyncio.wait(tasks)
@@ -196,7 +197,7 @@ class Dynamips(BaseManager):
        tasks = []
        for device in self._devices.values():
            if device.project.id == project.id:
-                tasks.append(asyncio.async(device.delete()))
+                tasks.append(asyncio_ensure_future(device.delete()))

        if tasks:
            done, _ = yield from asyncio.wait(tasks)
@@ -561,6 +562,7 @@ class Dynamips(BaseManager):

        yield from vm.set_idlepc("0x0")
        was_auto_started = False
+        old_priority = None
        try:
            status = yield from vm.get_status()
            if status != "running":
@@ -572,6 +574,8 @@ class Dynamips(BaseManager):
            if not idlepcs:
                raise DynamipsError("No Idle-PC values found")

+            if sys.platform.startswith("win"):
+                old_priority = vm.set_process_priority_windows(vm.hypervisor.process.pid)
            for idlepc in idlepcs:
                match = re.search(r"^0x[0-9a-f]{8}$", idlepc.split()[0])
                if not match:
@@ -600,6 +604,8 @@ class Dynamips(BaseManager):
        except DynamipsError:
            raise
        finally:
+            if old_priority is not None:
+                vm.set_process_priority_windows(vm.hypervisor.process.pid, old_priority)
            if was_auto_started:
                yield from vm.stop()
        return validated_idlepc
@@ -87,6 +87,7 @@ class EthernetSwitch(Device):
        self._mappings = {}
        self._telnet_console = None
        self._telnet_shell = None
+        self._telnet_server = None
        self._console = self._manager.port_manager.get_free_tcp_port(self._project)
        if ports is None:
            # create 8 ports by default
@@ -217,8 +218,9 @@ class EthernetSwitch(Device):
        Deletes this Ethernet switch.
        """
        yield from self._telnet.close()
-        self._telnet_server.close()
-        
+        if self._telnet_server:
+            self._telnet_server.close()
+
        for nio in self._nios.values():
            if nio:
                yield from nio.close()
@@ -40,7 +40,7 @@ from ..nios.nio_udp import NIOUDP


 from gns3server.utils.file_watcher import FileWatcher
-from gns3server.utils.asyncio import wait_run_in_executor, monitor_process
+from gns3server.utils.asyncio import wait_run_in_executor, monitor_process, asyncio_ensure_future
 from gns3server.utils.images import md5sum


@@ -196,7 +196,7 @@ class Router(BaseNode):
        """
        Called when the NVRAM file has changed
        """
-        asyncio.async(self.save_configs())
+        asyncio_ensure_future(self.save_configs())

    @property
    def dynamips_id(self):
@@ -683,6 +683,29 @@ class Router(BaseNode):
        log.info('Router "{name}" [{id}]: idle-PC set to {idlepc}'.format(name=self._name, id=self._id, idlepc=idlepc))
        self._idlepc = idlepc

+    def set_process_priority_windows(self, pid, priority=None):
+        """
+        Sets process priority on Windows
+
+        :param pid: process PID
+        """
+
+        import win32api
+        import win32process
+        import win32con
+        import pywintypes
+
+        old_priority = None
+        try:
+            handle = win32api.OpenProcess(win32con.PROCESS_ALL_ACCESS, True, pid)
+            old_priority = win32process.GetPriorityClass(handle)
+            if priority is None:
+                priority = win32process.BELOW_NORMAL_PRIORITY_CLASS
+            win32process.SetPriorityClass(handle, priority)
+        except pywintypes.error as e:
+            log.error("Cannot set priority for Dynamips process (PID={}) ".format(pid, e.strerror))
+        return old_priority
+
    @asyncio.coroutine
    def get_idle_pc_prop(self):
        """
@@ -701,8 +724,13 @@ class Router(BaseNode):
            yield from asyncio.sleep(20)  # leave time to the router to boot

        log.info('Router "{name}" [{id}] has started calculating Idle-PC values'.format(name=self._name, id=self._id))
+        old_priority = None
+        if sys.platform.startswith("win"):
+            old_priority = self.set_process_priority_windows(self._hypervisor.process.pid)
        begin = time.time()
        idlepcs = yield from self._hypervisor.send('vm get_idle_pc_prop "{}" 0'.format(self._name))
+        if old_priority is not None:
+            self.set_process_priority_windows(self._hypervisor.process.pid, old_priority)
        log.info('Router "{name}" [{id}] has finished calculating Idle-PC values after {time:.4f} seconds'.format(name=self._name,
                                                                                                                  id=self._id,
                                                                                                                  time=time.time() - begin))
@@ -43,7 +43,7 @@ from .utils.iou_export import nvram_export
 from gns3server.ubridge.ubridge_error import UbridgeError
 from gns3server.utils.file_watcher import FileWatcher
 from gns3server.utils.asyncio.telnet_server import AsyncioTelnetServer
-from gns3server.utils.asyncio import locked_coroutine
+from gns3server.utils.asyncio import locking
 import gns3server.utils.asyncio
 import gns3server.utils.images

@@ -368,7 +368,7 @@ class IOUVM(BaseNode):

        try:
            output = yield from gns3server.utils.asyncio.subprocess_check_output("ldd", self._path)
-        except (FileNotFoundError, subprocess.SubprocessError) as e:
+        except (OSError, subprocess.SubprocessError) as e:
            log.warn("Could not determine the shared library dependencies for {}: {}".format(self._path, e))
            return

@@ -421,7 +421,7 @@ class IOUVM(BaseNode):
                hostid = (yield from gns3server.utils.asyncio.subprocess_check_output("hostid")).strip()
            except FileNotFoundError as e:
                raise IOUError("Could not find hostid: {}".format(e))
-            except subprocess.SubprocessError as e:
+            except (OSError, subprocess.SubprocessError) as e:
                raise IOUError("Could not execute hostid: {}".format(e))

            try:
@@ -517,6 +517,17 @@ class IOUVM(BaseNode):

            if "IOURC" not in os.environ:
                env["IOURC"] = iourc_path
+
+            # create a symbolic link to the image to avoid IOU error "failed code signing checks"
+            # on newer images, see https://github.com/GNS3/gns3-server/issues/1484
+            try:
+                symlink = os.path.join(self.working_dir, os.path.basename(self.path))
+                if os.path.islink(symlink):
+                    os.unlink(symlink)
+                os.symlink(self.path, symlink)
+            except OSError as e:
+                raise IOUError("Could not create symbolic link: {}".format(e))
+
            command = yield from self._build_command()
            try:
                log.info("Starting IOU: {}".format(command))
@@ -550,7 +561,8 @@ class IOUVM(BaseNode):
            # configure networking support
            yield from self._networking()

-    @locked_coroutine
+    @locking
+    @asyncio.coroutine
    def _networking(self):
        """
        Configures the IOL bridge in uBridge.
@@ -650,6 +662,13 @@ class IOUVM(BaseNode):
                            pass
            self._iou_process = None

+        try:
+            symlink = os.path.join(self.working_dir, os.path.basename(self.path))
+            if os.path.islink(symlink):
+                os.unlink(symlink)
+        except OSError as e:
+            log.warning("Could not delete symbolic link: {}".format(e))
+
        self._started = False
        self.save_configs()

@@ -23,7 +23,7 @@ import logging
 log = logging.getLogger(__name__)


-# This ports are disallowed by Chrome and Firefox to avoid issues, we skip them as well
+# These ports are disallowed by Chrome and Firefox to avoid issues, we skip them as well
 BANNED_PORTS = set((1, 7, 9, 11, 13, 15, 17, 19, 20, 21, 22, 23, 25, 37, 42, 43, 53, 77, 79, 87, 95, 101, 102, 103,
                    104, 109, 110, 111, 113, 115, 117, 119, 123, 135, 139, 143, 179, 389, 465, 512, 513, 514, 515, 526,
                    530, 531, 532, 540, 556, 563, 587, 601, 636, 993, 995, 2049, 3659, 4045, 6000, 6665, 6666, 6667,
@@ -29,7 +29,7 @@ from uuid import UUID, uuid4
 from .port_manager import PortManager
 from .notification_manager import NotificationManager
 from ..config import Config
-from ..utils.asyncio import wait_run_in_executor
+from ..utils.asyncio import wait_run_in_executor, asyncio_ensure_future
 from ..utils.path import check_path_allowed, get_default_project_directory

 import logging
@@ -346,7 +346,7 @@ class Project:

        tasks = []
        for node in self._nodes:
-            tasks.append(asyncio.async(node.manager.close_node(node.id)))
+            tasks.append(asyncio_ensure_future(node.manager.close_node(node.id)))

        if tasks:
            done, _ = yield from asyncio.wait(tasks)
@@ -415,7 +415,7 @@ class Project:
        """

        files = []
-        for dirpath, dirnames, filenames in os.walk(self.path):
+        for dirpath, dirnames, filenames in os.walk(self.path, followlinks=False):
            for filename in filenames:
                if not filename.endswith(".ghost"):
                    path = os.path.relpath(dirpath, self.path)
@@ -186,14 +186,14 @@ class Qemu(BaseManager):
            return ""
        else:
            try:
-                output = yield from subprocess_check_output(qemu_path, "-version")
+                output = yield from subprocess_check_output(qemu_path, "-version", "-nographic")
                match = re.search("version\s+([0-9a-z\-\.]+)", output)
                if match:
                    version = match.group(1)
                    return version
                else:
                    raise QemuError("Could not determine the Qemu version for {}".format(qemu_path))
-            except subprocess.SubprocessError as e:
+            except (OSError, subprocess.SubprocessError) as e:
                raise QemuError("Error while looking for the Qemu version: {}".format(e))

    @staticmethod
@@ -213,7 +213,7 @@ class Qemu(BaseManager):
                return version
            else:
                raise QemuError("Could not determine the Qemu-img version for {}".format(qemu_img_path))
-        except subprocess.SubprocessError as e:
+        except (OSError, subprocess.SubprocessError) as e:
            raise QemuError("Error while looking for the Qemu-img version: {}".format(e))

    @staticmethod
@@ -974,7 +974,7 @@ class QemuVM(BaseNode):
                try:
                    if self.acpi_shutdown:
                        yield from self._control_vm("system_powerdown")
-                        yield from gns3server.utils.asyncio.wait_for_process_termination(self._process, timeout=30)
+                        yield from gns3server.utils.asyncio.wait_for_process_termination(self._process, timeout=120)
                    else:
                        self._process.terminate()
                        yield from gns3server.utils.asyncio.wait_for_process_termination(self._process, timeout=3)
@@ -1028,7 +1028,7 @@ class QemuVM(BaseNode):
                            if expect in line:
                                result = line.decode("utf-8").strip()
                                break
-                except EOFError as e:
+                except (ConnectionError, EOFError) as e:
                    log.warn("Could not read from QEMU monitor: {}".format(e))
            writer.close()
        return result
@@ -1601,18 +1601,19 @@ class QemuVM(BaseNode):

        return network_options

-    def _graphic(self):
+    @asyncio.coroutine
+    def _disable_graphics(self):
        """
-        Adds the correct graphic options depending of the OS
+        Disable graphics depending of the QEMU version
        """

-        if sys.platform.startswith("win"):
+        if any(opt in self._options for opt in ["-display", "-nographic", "-curses", "-sdl" "-spice", "-vnc"]):
            return []
-        if len(os.environ.get("DISPLAY", "")) > 0:
-            return []
-        if "-nographic" not in self._options:
+        version = yield from self.manager.get_qemu_version(self.qemu_path)
+        if version and parse_version(version) >= parse_version("3.0"):
+            return ["-display", "none"]
+        else:
            return ["-nographic"]
-        return []

    def _run_with_kvm(self, qemu_path, options):
        """
@@ -1678,7 +1679,8 @@ class QemuVM(BaseNode):
            raise QemuError("Console type {} is unknown".format(self._console_type))
        command.extend(self._monitor_options())
        command.extend((yield from self._network_options()))
-        command.extend(self._graphic())
+        if self._console_type == "telnet":
+            command.extend((yield from self._disable_graphics()))
        if additional_options:
            try:
                command.extend(shlex.split(additional_options))
@@ -33,7 +33,7 @@ import xml.etree.ElementTree as ET
 from gns3server.utils import parse_version
 from gns3server.utils.asyncio.telnet_server import AsyncioTelnetServer
 from gns3server.utils.asyncio.serial import asyncio_open_serial
-from gns3server.utils.asyncio import locked_coroutine
+from gns3server.utils.asyncio import locking
 from gns3server.compute.virtualbox.virtualbox_error import VirtualBoxError
 from gns3server.compute.nios.nio_udp import NIOUDP
 from gns3server.compute.adapters.ethernet_adapter import EthernetAdapter
@@ -217,6 +217,8 @@ class VirtualBoxVM(BaseNode):
            except ET.ParseError:
                raise VirtualBoxError("Cannot modify VirtualBox linked nodes file. "
                                      "File {} is corrupted.".format(self._linked_vbox_file()))
+            except OSError as e:
+                raise VirtualBoxError("Cannot modify VirtualBox linked nodes file '{}': {}".format(self._linked_vbox_file(), e))

            machine = tree.getroot().find("{http://www.virtualbox.org/}Machine")
            if machine is not None and machine.get("uuid") != "{" + self.id + "}":
@@ -245,6 +247,7 @@ class VirtualBoxVM(BaseNode):
            return True
        return False

+    @locking
    @asyncio.coroutine
    def start(self):
        """
@@ -296,7 +299,8 @@ class VirtualBoxVM(BaseNode):
        if (yield from self.check_hw_virtualization()):
            self._hw_virtualization = True

-    @locked_coroutine
+    @locking
+    @asyncio.coroutine
    def stop(self):
        """
        Stops this VirtualBox VM.
@@ -937,7 +941,12 @@ class VirtualBoxVM(BaseNode):
        """
        Starts remote console support for this VM.
        """
-        self._remote_pipe = yield from asyncio_open_serial(self._get_pipe_name())
+
+        pipe_name = self._get_pipe_name()
+        try:
+            self._remote_pipe = yield from asyncio_open_serial(pipe_name)
+        except OSError as e:
+            raise VirtualBoxError("Could not open serial pipe '{}': {}".format(pipe_name, e))
        server = AsyncioTelnetServer(reader=self._remote_pipe,
                                     writer=self._remote_pipe,
                                     binary=True,
@@ -32,6 +32,7 @@ import shlex
 from collections import OrderedDict
 from gns3server.utils.interfaces import interfaces
 from gns3server.utils.asyncio import subprocess_check_output
+from gns3server.utils.asyncio import asyncio_ensure_future
 from gns3server.utils import parse_version

 log = logging.getLogger(__name__)
@@ -148,6 +149,7 @@ class VMware(BaseManager):
        VIX 1.13 was the release for Player 6.
        VIX 1.14 was the release for Player 7.
        VIX 1.15 was the release for Workstation Player 12.
+        VIX 1.17 was the release for Workstation Player 14.

        :param player_version: VMware Player major version.
        """
@@ -161,6 +163,8 @@ class VMware(BaseManager):
            yield from self.check_vmrun_version(minimum_required_version="1.14.0")
        elif player_version >= 12:
            yield from self.check_vmrun_version(minimum_required_version="1.15.0")
+        elif player_version >= 14:
+            yield from self.check_vmrun_version(minimum_required_version="1.17.0")
        self._host_type = "player"

    @asyncio.coroutine
@@ -171,6 +175,7 @@ class VMware(BaseManager):
        VIX 1.13 was the release for Workstation 10.
        VIX 1.14 was the release for Workstation 11.
        VIX 1.15 was the release for Workstation Pro 12.
+        VIX 1.17 was the release for Workstation Pro 14.

        :param ws_version: VMware Workstation major version.
        """
@@ -184,6 +189,8 @@ class VMware(BaseManager):
            yield from self.check_vmrun_version(minimum_required_version="1.14.0")
        elif ws_version >= 12:
            yield from self.check_vmrun_version(minimum_required_version="1.15.0")
+        elif ws_version >= 14:
+            yield from self.check_vmrun_version(minimum_required_version="1.17.0")
        self._host_type = "ws"

    @asyncio.coroutine
@@ -738,4 +745,4 @@ if __name__ == '__main__':
    loop = asyncio.get_event_loop()
    vmware = VMware.instance()
    print("=> Check version")
-    loop.run_until_complete(asyncio.async(vmware.check_vmware_version()))
+    loop.run_until_complete(asyncio_ensure_future(vmware.check_vmware_version()))
Author	SHA1	Message	Date
grossmj	6fb613dcff	Release v2.1.19	2019-05-28 15:23:35 +07:00
grossmj	4f803ff162	Sync appliances.	2019-05-28 10:37:43 +07:00
grossmj	87d85c1947	Remove yarl from requirements.txt since it is installed by aiohttp.	2019-05-27 18:10:46 +07:00
grossmj	54c4bd31d4	Remove setup require since we do not use environment makers yet.	2019-05-27 17:57:37 +07:00
grossmj	907807dc53	Drop typing dependency.	2019-05-27 17:38:16 +07:00
grossmj	457ae4783f	Development on 2.1.19dev1	2019-05-23 14:37:37 +07:00
grossmj	878987a26e	Release v2.1.18	2019-05-22 16:13:28 +07:00
grossmj	c357d52ba4	Revert "Force aiohttp version to 2.3.10 and aiohttp-cors version to 0.5.3" Ref https://github.com/GNS3/gns3-server/issues/1583 Ref https://github.com/GNS3/gns3-server/issues/1592 This reverts commit `351ed64de9`.	2019-05-20 17:23:26 +07:00
grossmj	773bad811a	Fix invalid reStructuredText for long description in setup.py	2019-05-17 16:14:19 +07:00
grossmj	6b54cc27da	Release v2.1.17	2019-05-17 15:10:28 +07:00
grossmj	351ed64de9	Force aiohttp version to 2.3.10 and aiohttp-cors version to 0.5.3 This is to fix build issue for Ubuntu 19.04 package on Launchpad. Ref #1583 https://github.com/GNS3/gns3-gui/issues/2774	2019-05-17 09:56:16 +07:00
grossmj	f41158173b	Development on 2.1.17dev1	2019-04-15 12:41:40 +07:00
grossmj	cb5dc36987	Release v2.1.16	2019-04-15 12:00:18 +07:00
grossmj	cc1980ac1c	Fix broken embedded console for Ethernet switch. Fixes #1574	2019-04-11 17:57:47 +07:00
grossmj	8cd66cfc02	Remove old unused argument option. Fixes #1569	2019-04-09 19:26:07 +07:00
grossmj	645031ee15	Development on 2.1.16dev1	2019-03-21 13:56:11 +08:00
grossmj	c70b344133	Release v2.1.15	2019-03-21 11:41:44 +08:00
grossmj	e291ec1eb9	Fix IOU symlink issue on remote servers.	2019-03-18 18:11:16 +07:00
grossmj	8e8985c69f	Fix vcpus configuration for GNS3 VM on VMware. Ref #2738 .	2019-03-18 17:53:14 +07:00
grossmj	4eca82174d	Development on 2.1.15dev1	2019-02-27 15:59:16 +07:00
grossmj	32f5dbb645	Release v2.1.14	2019-02-27 14:58:52 +07:00
grossmj	7aae682f0a	Fix issue when setting cpuid.corespersocket for the GNS3 VM. Fixes https://github.com/GNS3/gns3-gui/issues/2723	2019-02-27 14:47:45 +07:00
grossmj	879e32eb9a	Bump ACPI Shutdown Timeout to 120 seconds. Ref #1536	2019-02-26 23:19:33 +07:00
grossmj	01481cde1f	Development on 2.1.14dev1	2019-02-26 18:10:23 +07:00
grossmj	b5deb9d177	Release v2.1.13	2019-02-26 16:46:02 +07:00
Jeremy Grossmann	e1aa13fa73	Force jsonschema dependency to 2.6.0 This is to fix this issue when starting the (frozen) application on Windows: ``` File "C:\Python36-x64\lib\site-packages\jsonschema\validators.py", line 505, in <module> File "C:\Python36-x64\lib\site-packages\jsonschema\_utils.py", line 57, in load_schema File "C:\Python36-x64\lib\pkgutil.py", line 634, in get_data OSError: [Errno 34] Result too large: 'jsonschema\\schemas\\draft6.json' ```	2019-02-26 15:28:11 +07:00
grossmj	62c51edbae	Less aggressive connections to uBridge. Ref #1289	2019-02-22 16:05:31 +07:00
grossmj	a13d063aa1	Fix topology images (Pictures) disappearing from projects. Fixes #1514 .	2019-02-21 23:58:54 +07:00
grossmj	1ef1872f8e	Reset MAC addresses when duplicating a project. Fixes #1522	2019-02-20 16:38:43 +07:00
grossmj	657698a961	Fix create a node from an appliance test.	2019-02-20 11:21:29 +07:00
grossmj	081ba31b50	Fix API call to create a node from an appliance doesn't return the new node data. Fixes #1527	2019-02-20 10:47:33 +07:00
grossmj	aea4ae808f	Detect invalid environment variable and send a warning when creating a Docker node. Ref #2683	2019-02-19 17:34:10 +07:00
grossmj	ae3515434c	Do not export/import symlinks for projects. Fixes #2699	2019-02-19 12:43:44 +07:00
grossmj	589c9754e8	Fix symlink not being created for duplicated IOU devices. Fixes https://github.com/GNS3/gns3-gui/issues/2699	2019-02-19 00:09:59 +08:00
grossmj	4ecd3b2015	Configure coresPerSocket value in VMX file for the GNS3 VM. Fixes https://github.com/GNS3/gns3-gui/issues/2688	2019-02-17 23:16:48 +08:00
grossmj	84ee3263ba	Count logical CPUs to detect if the number of vCPUs is too high when configuring the GNS3 VM. Fixes #2688 .	2019-02-17 23:07:33 +08:00
grossmj	174624121d	Fix Qemu VM tests. Ref #1516	2019-02-17 19:53:46 +08:00
grossmj	d9a9abf845	Add explicit error when trying to pull a Docker image from Docker Hub without Internet access. Fixes #1506 .	2019-02-17 19:21:21 +08:00
grossmj	0b07299472	Fixes double display output in GRUB in QEMU v3.1. Fixes #1516 .	2019-02-17 19:03:36 +08:00
grossmj	7fb192699b	Development on 2.1.13dev1	2019-01-23 15:42:10 +08:00
grossmj	bccdfc97d1	Release 2.1.12	2019-01-23 15:40:38 +08:00
Jeremy Grossmann	792c4310eb	Merge pull request #1502 from GNS3/svg-symbols-fixes Tune how to get the size of SVG images.	2019-01-22 00:41:26 +07:00
grossmj	3e21f96bf9	Fix indentation issue. Ref https://github.com/GNS3/gns3-gui/issues/2674 (cherry picked from commit `c14d79a3d5`)	2019-01-21 23:51:46 +07:00
grossmj	5f932fee9f	Tune how to get the size of SVG images. Ref https://github.com/GNS3/gns3-gui/issues/2674 . * Default for missing height/width is "100%" as defined in the SVG specification * Better error message, if viewBox attribute is missing * Removal of "%" in percent more fault tolerant by using rstrip("%") (cherry picked from commit `e3757a8955`)	2019-01-21 23:49:43 +07:00
grossmj	ef38ccfefa	Automatically create a symbolic link to the IOU image in the IOU working directory. Fixes #1484	2018-12-17 22:42:18 -06:00
grossmj	670b6d689a	Merge remote-tracking branch 'origin/2.1' into 2.1	2018-12-14 19:53:51 -06:00
grossmj	fc75a6b8d3	Fix link pause/filters only work for the first interface of Docker containers. Fixes #1482	2018-12-14 19:53:43 -06:00
Jeremy Grossmann	647ac87c89	Merge pull request #1476 from ddragic/x11vnc Docker: fix x11vnc not starting	2018-11-29 07:03:58 +07:00
Dušan Dragić	817a053dfc	docker_vm: fix x11vnc not starting	2018-11-29 00:37:20 +01:00
Jeremy Grossmann	df4e4bec24	Merge pull request #1472 from GNS3/docker-console-resize Telnet console resize support for Docker VM. Fixes #1471	2018-11-27 15:17:34 +07:00
grossmj	60ac6d2dfe	Telnet console resize support for Docker VM.	2018-11-27 15:06:56 +07:00
grossmj	c0a0a13bdd	Avoid _fix_permissions() to be called twice when stopping Docker VM. Ref #1428	2018-11-26 15:53:24 +07:00
grossmj	a3044ede77	Fix _fix_permissions() garbles permissions in Docker VM. Ref #1428	2018-11-25 17:11:42 +07:00
grossmj	df3baffd9b	Fix "None is not of type 'integer'" when opening project containing a Qemu VM. Fixes #2610 .	2018-11-24 19:56:29 +07:00
grossmj	e7b8309a80	Fix Docker VNC tests. Ref #1438	2018-11-11 23:25:23 +08:00
grossmj	029344da14	Only require Xtigervnc or Xvfb+x11vnc for Docker with vnc console. Ref #1438	2018-11-11 22:33:58 +08:00
grossmj	d0bab9947e	Support tigervnc in Docker VM. Ref #1438	2018-11-11 21:07:33 +08:00
grossmj	e4a6db8ebc	Fix some typos.	2018-10-04 15:22:42 +02:00
grossmj	181a31be32	Update minimum VIX version requirements for VMware. Ref #1415 .	2018-10-02 11:22:32 +02:00
grossmj	8d368cd0f6	Development on 2.1.12dev1	2018-09-28 20:50:03 +02:00
grossmj	41d4ecc4b7	Release v2.1.11	2018-09-28 20:47:44 +02:00
grossmj	4d95e0b51f	Catch some exceptions.	2018-09-28 15:04:38 +02:00
grossmj	4efdefaf5a	Development on 2.1.11dev1	2018-09-15 11:23:18 +02:00
grossmj	b6b345508b	Release v2.1.10	2018-09-15 11:19:55 +02:00
grossmj	5d2e539193	Update appliances.	2018-09-14 22:18:13 +02:00
grossmj	eb0e26b55f	Include locale information and GNS3 VM version in crash reports.	2018-09-12 15:38:20 +02:00
grossmj	17d657c919	Fix small errors like unhandled exceptions etc.	2018-09-11 15:06:01 +02:00
grossmj	0aa9ab53d1	Import encodings.idna to avoid LookupError when standard library is in a zip file.	2018-09-07 09:34:17 +02:00
grossmj	4021a13651	Catch exceptions in various locations to fix small issues reported by Sentry.	2018-09-06 09:49:12 +02:00
grossmj	341e2e2e3a	Check if serial pipe can be opened for VMware and VirtualBox VMs.	2018-09-06 07:02:32 +02:00
grossmj	f8ecd61a98	Notify users if xvfb process or x11vnc process have crashed. Ref #1401 .	2018-09-05 15:16:07 +08:00
grossmj	c620d0be84	Improve the invalid port format detection. Fixes https://github.com/GNS3/gns3-gui/issues/2580	2018-09-05 13:35:42 +08:00
grossmj	abfbadecd6	Update aiohttp verion requirement in order to support Python 3.7. Fixes https://github.com/GNS3/gns3-gui/issues/2566	2018-09-02 20:41:45 +07:00
grossmj	4a6202fa84	Update setup.py and fix minor issues.	2018-09-02 15:32:33 +07:00
grossmj	f89d645b56	Update appliances.	2018-08-31 19:33:03 +07:00
grossmj	b7dd8b5176	Catch asyncio.CancelledError when shutting down the server.	2018-08-28 17:10:24 +07:00
grossmj	00cf66fb0f	Report GNS3 VM errors to the GUI server summary. Ref #1359 .	2018-08-28 15:42:06 +07:00
grossmj	8d4e73d23c	Replace vboxnet0 (if it does not exist) by the first available vboxnet interface on Windows. Fixes https://github.com/GNS3/gns3-vm/issues/102	2018-08-26 03:28:38 -07:00
grossmj	4e712280b3	Merge remote-tracking branch 'origin/2.1' into 2.1	2018-08-26 02:44:01 -07:00
grossmj	4d57a3befa	Check if the VirtualBox host-only network exists when starting a GNS3 VM running on VirtualBox. Ref https://github.com/GNS3/gns3-vm/issues/102	2018-08-26 02:43:40 -07:00
grossmj	38b72079b2	Change file timestamps if necessary because ZIP does not support timestamps before 1980. Fixes #1360 .	2018-08-25 18:10:40 +07:00
grossmj	814526ba26	Add missing coroutine decorator Ref https://github.com/GNS3/gns3-gui/issues/2566	2018-08-25 16:00:40 +07:00
grossmj	f5dc635baa	Fix test to support Python 3.7 Ref https://github.com/GNS3/gns3-gui/issues/2566	2018-08-25 15:50:08 +07:00
grossmj	902de3dd47	Refactor asyncio locking system for Python 3.7 support. Ref https://github.com/GNS3/gns3-gui/issues/2566 Ref https://github.com/GNS3/gns3-gui/issues/2568	2018-08-25 14:10:47 +07:00
grossmj	ad9b6f42bf	Test with Python 3.7 on Travis.	2018-08-24 18:59:10 +07:00
grossmj	3560cda06c	Use asyncio.ensure_future() instead of asyncio.async() with conservative approach to support Python < 3.4.4. Fixes https://github.com/GNS3/gns3-gui/issues/2566	2018-08-24 18:57:18 +07:00
grossmj	a3d1e865a8	Replace asyncio.async() by asyncio.ensure_future() in tests. Ref #2566 .	2018-08-24 18:52:15 +07:00
grossmj	089d25c79d	Forbid controller and compute servers to be different versions. Report last compute server error to clients and display in the server summary.	2018-08-22 16:54:43 +07:00
grossmj	59ce105a50	Fix exception with short names for Dynamips interfaces. Fixes #1386 .	2018-08-21 19:46:14 +07:00
grossmj	aeb33024ca	Add missing Qemu boot priority values. Fixes https://github.com/GNS3/gns3-server/issues/1385	2018-08-21 17:49:58 +07:00
ziajka	c593785c6d	Development on 2.1.10dev1	2018-08-13 13:50:43 +02:00
ziajka	689a82a180	Release v2.1.9	2018-08-13 13:13:46 +02:00
grossmj	23e83b730b	Fix some more problems with interface short names. Fixes https://github.com/GNS3/gns3-gui/issues/2562	2018-08-13 15:45:24 +07:00
grossmj	e5d38811ca	Fix incorrect short port names in topology summary. Fixes https://github.com/GNS3/gns3-gui/issues/2562	2018-08-13 15:10:21 +07:00
grossmj	12e71a2917	Set lower process priority when computing idle-pc value on Windows. Ref #2522 .	2018-08-07 19:31:33 +07:00
grossmj	17e51fdac6	Merge remote-tracking branch 'origin/2.1' into 2.1	2018-07-26 13:35:57 -05:00
grossmj	d0ed6931d8	Catch exception: ZIP does not support timestamps before 1980. Ref #1360 .	2018-07-26 13:34:23 -05:00
ziajka	c274be1135	Sync appliances	2018-07-13 12:42:43 +02:00