Release v2.2.26

https://github.com/actions/setup-python/issues/249#issuecomment-934299359

.github/workflows/publish_api_documentation.yml

@@ -0,0 +1,43 @@
+name: publish-api-documentation
+
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - v3.*
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+        ref: "gh-pages"
+    - uses: actions/setup-python@v2
+      with:
+        python-version: 3.6
+    - name: Merge changes from 3.0 branch
+      run: |
+        git config user.name github-actions
+        git config user.email github-actions@github.com
+        git merge origin/3.0 -X theirs
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+    - name: Install GNS3 server
+      run: |
+        python setup.py install
+    - name: Generate the API documentation
+      run: |
+        cd scripts
+        python3 publish_api_documentation.py
+    - name: Publish the API documentation
+      run: |
+        git add docs
+        git status
+        git commit -m "Publish API documentation"
+        git push

.github/workflows/testing.yml

@@ -0,0 +1,35 @@
+name: testing
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        if [ -f dev-requirements.txt ]; then pip install -r dev-requirements.txt; fi
+    - name: Lint with flake8
+      run: |
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - name: Test with pytest
+      run: |
+        pytest -vv

.pyup.yml

@@ -1,2 +0,0 @@
-branch:
-    2.2

.travis.yml

@@ -1,32 +0,0 @@
-sudo: required
-
-services:
-  - docker
-
-install:
-  - sed -e 's/${PYTHON_VERSION}/'${PYTHON_VERSION}/g DockerfileTests.tpl  > /tmp/DockerfileTests
-  - docker-compose build
-
-script:
-  - docker-compose run tests
-
-before_deploy:
-- sudo pip install twine
-- sudo pip install urllib3[secure]
-
-deploy:
-  provider: pypi
-  edge:
-    branch: v1.8.45
-  user: noplay
-  password:
-    secure: Fa66zp8ML4oSGwzkUMZi07MIYfO3tbS5gHFUaLN2mk2MBknhCjDYexmFJqT//sC/+xqv6sSJE6rz1EPoy/THbxj8R96ZgIyiUZIbDCbzgdy92d7J/eusrDoNdpApBLke8NqQqtFETb3addMZZNofQ3IDANFD2m2jY+KECU8z8NI=
-  on:
-    tags: true
-    repo: GNS3/gns3-server
-
-env:
-  matrix:
-    - PYTHON_VERSION=3.6
-    - PYTHON_VERSION=3.7
-    - PYTHON_VERSION=3.8

.whitesource

@@ -0,0 +1,13 @@
+{
+  "scanSettings": {
+    "configMode": "AUTO",
+    "configExternalURL": "",
+    "projectToken" : ""
+  },
+  "checkRunSettings": {
+    "vulnerableCheckRunConclusionLevel": "failure"
+  },
+  "issueSettings": {
+    "minSeverityLevel": "LOW"
+  }
+}

CHANGELOG

@@ -1,5 +1,163 @@
 # Change Log
 
+## 2.2.26 08/10/2021
+
+* Release web UI 2.2.26
+* Sort symbols by theme. Fixes https://github.com/GNS3/gns3-gui/issues/3230
+* Fix memory percentage left warning. Fixes #1966
+* Update affinity symbols. Fixes https://github.com/GNS3/gns3-gui/issues/3232
+
+## 2.2.25 14/09/2021
+
+* Release web UI 2.2.25
+* Fix issue preventing to use custom nested symbols. Fixes #1969
+* Updated affinity symbols
+* Fix qemu-img rebase code to support Qemu 6.1. Ref https://github.com/GNS3/gns3-server/pull/1962
+* Reinstate qemu-img rebase
+* Return disk usage for partition that contains the default project directory. Fixes #1947
+* Explicitly require setuptools, utils/get_resource.py imports pkg_resources
+
+## 2.2.24 25/08/2021
+
+* Release web UI 2.2.24
+* Fix issue when searching for image with relative path. Fixes #1925
+* Fix wrong error when NAT interface is not allowed. Fixes #1943
+* Fix incorrect Qemu binary selected when importing template. Fixes https://github.com/GNS3/gns3-gui/issues/3216
+* Fix error when updating a link style. Fixes https://github.com/GNS3/gns3-gui/issues/2461
+* Some fixes for early support for Python3.10 The loop parameter has been removed from most of asyncio‘s high-level API following deprecation in Python 3.8.
+* Early support for Python3.10 Fixes #1940
+* Bump pywin32 from 300 to 301
+
+## 2.2.23 05/08/2021
+
+* Release web UI 2.2.23
+* Fix hostname inconsistencies during script execution
+* Add option `--without-kvm`
+* Add a `reload` server endpoint. Fixes #1926
+* Handle -no-kvm param deprecated in Qemu >= v5.2
+* Fix binary websocket access to the console
+* Change how to generate random MAC addresses
+* setup.py: prevent installing tests directory
+* Support cloning of encrypted qcow2 base image files
+* Fix VMware VM support on Linux and Windows. Fixes #1919
+
+## 2.2.22 10/06/2021
+
+* Fix VMware support on macOS BigSur
+* Link style support. Fixes https://github.com/GNS3/gns3-gui/issues/2461
+* Release web UI version 2.2.22
+* Preserve auto_start/auto_open/auto_close when restoring snapshot
+* Fix uBridge errors for cloud nodes not visible in logs. Fixes #1895
+* Prevent directory traversal. Fixes #1894
+
+## 2.2.21 10/05/2021
+
+* Release Web-Ui v2.2.21
+* Improvements for get symbol dimensions endpoint. Ref #1885
+
+## 2.2.20 09/04/2021
+
+* Release Web UI version 2.2.20
+* Fix packet capture with HTTPS remote server. Fixes #1882
+* Sync appliance files and remove old ones after sync with online repo. Fixes #1876
+* Upgrade dependencies
+* Fix export for missing files
+* Fix issue when trying to export temporary Dynamips files.
+
+## 2.2.19 05/03/2021
+
+* Launch projects marked for auto open after SIGHUP is received
+* Release Web UI 2.2.19
+* Fix console type error when creating Ethernet switch node. Fixes #1873
+* Upgrade Jinja to version 2.11.3. Fixes #1865
+
+## 2.2.18 16/02/2021
+
+* SIGHUP: remove projects with an empty project directory.
+* Release Web UI 2.2.18
+* Catch OSError exception in psutil. Fixes https://github.com/GNS3/gns3-gui/issues/3127
+* Expose 'auto_open' and 'auto_start' properties in API when creating project. Fixes https://github.com/GNS3/gns3-gui/issues/3119
+* Add mtools package information. Ref https://github.com/GNS3/gns3-gui/issues/3076
+* Fix warning: 'ide-drive' is deprecated when using recent version of Qemu. Fixes https://github.com/GNS3/gns3-gui/issues/3101
+* Fix bug when starting of vpcs stopped with "quit". Fixes https://github.com/GNS3/gns3-gui/issues/3110
+* Fix WinError 0 handling
+* Stop uBridge if VPCS node has been terminated. Ref https://github.com/GNS3/gns3-gui/issues/3110
+* Allow cloned QEMU disk images to be resized before the node starts, by cloning the disk image in response to a resize request instead of waiting until the node starts.
+* Fix(readme): update python version from 3.5.3 to 3.6
+* Use HDD disk image as startup QEMU config disk
+* Create config disk property false by default for Qemu templates
+* Set default disk interface type to "none".
+* Add explicit option to automatically create or not the config disk. Off by default.
+* QEMU config disk support
+
+
+## 2.2.17 04/12/2020
+
+* Close and remove projects deleted from disks after SIGHUP signal is received.
+* Release Web Ui 2.2.17
+* New config file options to configure the VNC console port range.
+* Use asyncio.all_tasks instead of deprecated method for Python 3.9 compatibility.
+
+## 2.2.16 05/11/2020
+
+* Option to allocate or not the vCPUs and RAM settings for the GNS3 VM. Fixes https://github.com/GNS3/gns3-gui/issues/3069
+* Release Web UI version 2.2.16
+* Fix wrong defaults for images_path, configs_path, appliances_path. Fixes #1829
+* Use EnvironmentFile for Systemd service. Ref https://github.com/GNS3/gns3-gui/issues/3048
+* Fix SSL support for controller and local compute. Fixes #1826
+* Prevent WIC to be added/removed while Dynamips router is running. Fixes https://github.com/GNS3/gns3-gui/issues/3082
+* Fix bug with application id allocation for IOU nodes. Fixes #3079
+* Allow commas in image paths and VM name for Qemu VMs. Fixes https://github.com/GNS3/gns3-gui/issues/3065
+
+## 2.2.15 07/10/2020
+
+* Fix symbol retrieval issue. Ref #1824
+* Fixes update() missing 2 required positional arguments: 'name' and 'value'. Fixes #1821 #1825
+* Fix Hyper-V based GNS3 VM WMI issue. Fixes #1822
+* Release Web-Ui version 2020.4.0-beta.1
+
+## 2.2.14 14/09/2020
+
+* Release Web-Ui version 2020.3.0-beta.4
+* Add '-smp sockets=1' by default for Qemu VMs. Ref https://github.com/GNS3/gns3-gui/issues/3047
+* Implement full restart if user reload a Qemu VM which has been updated. Fixes https://github.com/GNS3/gns3-gui/issues/3038
+
+## 2.2.13 04/09/2020
+
+* Release Web-Ui 2020.3.0-beta.3
+* Fix issue when resuming Qemu VM. Fixes https://github.com/GNS3/gns3-gui/issues/3027
+
+## 2.2.12 07/08/2020
+
+* Release Web-Ui version 2020.3.0-beta.2
+* Catch exception when psutil returns OSError
+* Downgrade psutil to version 5.6.7
+* Use parent directory as working directory for project duplication and snapshots. Fixes https://github.com/GNS3/gns3-gui/issues/2909
+* Fix Key Error "vendor_id" is missing when configuring GNS3 VM with VirtualBox. Fixes https://github.com/GNS3/gns3-gui/issues/3018
+
+## 2.2.11 09/07/2020
+
+* Fix crash when project sets 'auto_open' option and a remote GNS3 VM is used. Fixes https://github.com/GNS3/gns3-gui/issues/3014
+* Fix Dynamips ghost image support when project contains a space. Fixes #3015
+* Release Web-Ui version 2020.3.0-beta.1
+* Fix issue when cannot skip slots for Dynamips routers. Fixes https://github.com/GNS3/gns3-gui/issues/3000
+* Allow tests to be run by root. Fixes #1784
+* Update classifiers in setup.py
+
+## 2.2.10 18/06/2020
+
+* Add pytest-aiohttp to tests_require in setup.py
+* Don't require hardware acceleration. Fixes #1780
+* Release Web-Ui version 2020.2.0-beta.5
+* Tests can be run with Python 3.8
+* Wait longer for x11 socket file to be created. Ref #1761
+* Allow Hyper-V to run on AMD when Windows 10 build 19640 or later is detected. Fixes #1777
+* Show error message if IPv6 is not enabled when using SPICE console. Fixes #1772
+* Move jsonschema 2.6.0 requirement in build repository.
+* Only use jsonschema 2.6.0 on Windows and macOS.
+* Disable default integrations for sentry sdk.
+* Remove unused bytes2human function.
+
 ## 2.2.9 04/06/2020
 
 * Release Web-Ui version 2020.2.0-beta.4

Dockerfile

@@ -28,7 +28,7 @@ RUN apt-get install -y vpcs ubridge
 ADD . /server
 WORKDIR /server
 
-RUN pip3 install -r /server/requirements.txt
+RUN pip3 install --no-cache-dir -r /server/requirements.txt
 
 EXPOSE 3080
 

DockerfileTests.tpl

@@ -1,15 +0,0 @@
-FROM python:${PYTHON_VERSION}
-
-RUN pip install -U setuptools pip
-
-ADD requirements.txt /server/requirements.txt
-ADD dev-requirements.txt /server/dev-requirements.txt
-
-RUN pip install -r/server/dev-requirements.txt
-
-RUN useradd -ms /bin/bash gns3
-
-USER gns3
-
-ADD . /server
-WORKDIR /server

MANIFEST.in

@@ -2,7 +2,6 @@ include README.rst
 include AUTHORS
 include LICENSE
 include MANIFEST.in
-include tox.ini
 include requirements.txt
 recursive-include tests *
 recursive-exclude docs *

README.rst

@@ -1,12 +1,15 @@
 GNS3-server
 ===========
 
-.. image:: https://travis-ci.org/GNS3/gns3-server.svg?branch=master
-    :target: https://travis-ci.org/GNS3/gns3-server
+.. image:: https://github.com/GNS3/gns3-server/workflows/testing/badge.svg
+    :target: https://github.com/GNS3/gns3-server/actions?query=workflow%3Atesting
 
 .. image:: https://img.shields.io/pypi/v/gns3-server.svg
     :target: https://pypi.python.org/pypi/gns3-server
 
+.. image:: https://snyk.io/test/github/GNS3/gns3-server/badge.svg
+    :target: https://snyk.io/test/github/GNS3/gns3-server
+
 This is the GNS3 server repository.
 
 The GNS3 server manages emulators such as Dynamips, VirtualBox or Qemu/KVM.
@@ -21,8 +24,9 @@ In addition of Python dependencies listed in a section below, other software may
 * `Dynamips <https://github.com/GNS3/dynamips/>`_ is required for running IOS routers (using real IOS images) as well as the internal switches and hubs.
 * `VPCS <https://github.com/GNS3/vpcs/>`_ is recommended, it is a builtin node simulating a very simple computer to perform connectitivy tests using ping, traceroute etc.
 * Qemu is strongly recommended on Linux, as most node types are based on Qemu, for example Cisco IOSv and Arista vEOS.
-* libvirt is recommended (Linux only), as it's needed for the NAT cloud
+* libvirt is recommended (Linux only), as it's needed for the NAT cloud.
 * Docker is optional (Linux only), some nodes are based on Docker.
+* mtools is recommended to support data transfer to/from QEMU VMs using virtual disks.
 * i386-libraries of libc and libcrypto are optional (Linux only), they are only needed to run IOU based nodes.
 
 Branches
@@ -56,7 +60,7 @@ You must be connected to the Internet in order to install the dependencies.
 
 Dependencies:
 
-- Python 3.5.3, setuptools and the ones listed `here <https://github.com/GNS3/gns3-server/blob/master/requirements.txt>`_
+- Python 3.6, setuptools and the ones listed `here <https://github.com/GNS3/gns3-server/blob/master/requirements.txt>`_
 
 The following commands will install some of these dependencies:
 

conf/gns3_server.conf

@@ -28,10 +28,19 @@ report_errors = True
 console_start_port_range = 5000
 ; Last console port of the range allocated to devices
 console_end_port_range = 10000
+
+; First VNC console port of the range allocated to devices.
+; The value MUST BE >= 5900 and <= 65535
+vnc_console_start_port_range = 5900
+; Last VNC console port of the range allocated to devices
+; The value MUST BE >= 5900 and <= 65535
+vnc_console_end_port_range = 10000
+
 ; First port of the range allocated for inter-device communication. Two ports are allocated per link.
 udp_start_port_range = 20000
 ; Last port of the range allocated for inter-device communication. Two ports are allocated per link
 udp_end_port_range = 30000
+
 ; uBridge executable location, default: search in PATH
 ;ubridge_path = ubridge
 
@@ -77,4 +86,4 @@ require_kvm = True
 ; Enable hardware acceleration (all platforms)
 enable_hardware_acceleration = True
 ; Require hardware acceleration in order to start VMs (all platforms)
-require_hardware_acceleration = True
+require_hardware_acceleration = False

dev-requirements.txt

@@ -1,6 +1,6 @@
 -rrequirements.txt
 
-sphinx==1.8.3
-pytest==4.4.1
-pep8==1.7.1
-pytest-timeout==1.3.3
+pytest==6.2.4
+flake8==3.9.2
+pytest-timeout==1.4.2
+pytest-aiohttp==0.3.0

docker-compose.yml

@@ -1,4 +0,0 @@
-tests:
-  build: .
-  dockerfile: /tmp/DockerfileTests
-  command: py.test -v -s tests

gns3server/appliances/6wind-turbo-router.gns3a

@@ -0,0 +1,46 @@
+{
+    "name": "6WIND Turbo Router",
+    "category": "router",
+    "description": "6WIND Turbo Router is a high performance, ready-to-use software virtual router. It can be deployed bare metal or in virtual machines on commercial-off-the-shelf (COTS) servers. It is a carrier-grade solution for Service Prodivers aiming at using white boxes to deploy network functions. Typical use-cases are transit/peering router, IPsec VPN gateway and CGNAT.",
+    "vendor_name": "6WIND",
+    "vendor_url": "https://www.6wind.com/",
+    "documentation_url": "https://doc.6wind.com/turbo-router-3/latest/turbo-router/",
+    "product_name": "6WIND Turbo Router",
+    "product_url": "https://www.6wind.com/vrouter-solutions/turbo-router/",
+    "registry_version": 4,
+    "status": "stable",
+    "maintainer": "GNS3 Team",
+    "maintainer_email": "developers@gns3.net",
+    "usage": "Default username / password is admin / admin.",
+    "symbol": "6wind.svg",
+    "port_name_format": "eth{0}",
+    "qemu": {
+        "adapter_type": "virtio-net-pci",
+        "adapters": 8,
+        "ram": 4096,
+        "cpus": 4,
+        "hda_disk_interface": "virtio",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "boot_priority": "c",
+        "kvm": "require",
+        "options": "-cpu host"
+    },
+    "images": [
+        {
+            "filename": "6wind-vrouter-tr-ae-x86_64-v3.1.4.m1.qcow2",
+            "version": "3.1.4.m1",
+            "md5sum": "bc84b81fba4f2f01eda6a338469e37a5",
+            "filesize": 693829632,
+            "download_url": "https://portal.6wind.com/register.php?utm_campaign=GNS3-2021-EVAL"
+        }
+    ],
+    "versions": [
+        {
+            "name": "3.1.4.m1",
+            "images": {
+                "hda_disk_image": "6wind-vrouter-tr-ae-x86_64-v3.1.4.m1.qcow2"
+            }
+        }
+    ]
+}

gns3server/appliances/IPCop.gns3a

@@ -0,0 +1,51 @@
+{
+    "name": "IP Cop",
+    "category": "firewall",
+    "description": "The IPCop Firewall is a Linux firewall distribution. It is geared towards home and SOHO users. The IPCop web-interface is very user-friendly and makes usage easy.",
+    "vendor_name": "IP Cop",
+    "vendor_url": "https://www.kali.org/",
+    "documentation_url": "http://www.ipcop.org/docs.html",
+    "product_name": "IP Cop",
+    "registry_version": 3,
+    "status": "stable",
+    "maintainer": "Brent Stewart",
+    "maintainer_email": "brent@stewart.tc",
+    "usage": "",
+    "symbol": "shieldedtux.png",
+    "port_name_format": "eth{0}",
+    "qemu": {
+        "adapter_type": "e1000",
+        "adapters": 3,
+        "ram": 1024,
+        "arch": "x86_64",
+        "console_type": "vnc",
+        "kvm": "require"
+    },
+    "images": [
+        {
+            "filename": "ipcop-2.1.8-install-cd.i486.iso",
+            "version": "2.1.9",
+            "md5sum": "1394a7bd4e5c6fe8db70007278826101",
+            "filesize": 65011712,
+            "download_url": "http://www.ipcop.org/download.html",
+            "direct_download_url": "https://sourceforge.net/projects/ipcop/files/IPCop/IPCop%202.1.8/ipcop-2.1.8-install-cd.i486.iso"
+        },
+        {
+            "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"
+        }
+    ],
+    "versions": [
+        {
+            "name": "2.1.9",
+            "images": {
+                "hda_disk_image": "empty8G.qcow2",
+                "cdrom_image": "ipcop-2.1.8-install-cd.i486.iso"
+            }
+        }
+    ]
+}

gns3server/appliances/Simulator.gns3a

@@ -17,6 +17,7 @@
         "adapter_type": "e1000",
         "adapters": 1,
         "ram": 2048,
+        "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "vnc",
         "kvm": "require"
@@ -46,7 +47,6 @@
             "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%30disk/",
             "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
         }
-    
     ],
     "versions": [
         {
@@ -63,6 +63,5 @@
                 "cdrom_image": "Parrot-security-3.11_amd64.iso"
             }
         }
-        
-]
+    ]
 }

gns3server/appliances/a10-vthunder.gns3a

@@ -31,7 +31,8 @@
             "version": "4.1.0.P9",
             "md5sum": "6ef0f69ba7a099a7f43b5815c2abc691",
             "filesize": 6311706624,
-            "download_url": "https://www.a10networks.com/vthunder-embed"        },
+            "download_url": "https://www.a10networks.com/vthunder-embed"
+        },
         {
             "filename": "vThunder_410_P3.qcow2",
             "version": "4.1.0.P3",

gns3server/appliances/aaa.gns3a

@@ -9,8 +9,8 @@
     "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.",
+    "symbol": "linux_guest.svg",
     "docker": {
         "adapters": 1,
         "image": "adosztal/aaa:latest",

gns3server/appliances/alcatel-7750.gns3a

@@ -18,6 +18,7 @@
         "adapter_type": "e1000",
         "adapters": 6,
         "ram": 2048,
+        "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "require",

gns3server/appliances/arista-veos.gns3a

@@ -19,11 +19,48 @@
         "adapter_type": "e1000",
         "adapters": 13,
         "ram": 2048,
+        "hda_disk_interface": "ide",
+        "hdb_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "vEOS-lab-4.26.2F.vmdk",
+            "version": "4.26.2F",
+            "md5sum": "de8ce9750fddb63bd3f71bccfcd7651e",
+            "filesize": 475332608,
+            "download_url": "https://www.arista.com/en/support/software-download"
+        },
+        {
+            "filename": "vEOS-lab-4.25.3M.vmdk",
+            "version": "4.25.3M",
+            "md5sum": "2f196969036b4d283e86f15118d59c26",
+            "filesize": 451543040,
+            "download_url": "https://www.arista.com/en/support/software-download"
+        },
+        {
+            "filename": "vEOS-lab-4.24.3M.vmdk",
+            "version": "4.24.3M",
+            "md5sum": "0a28e44c7ce4a8965f24a4a463a89b7d",
+            "filesize": 455213056,
+            "download_url": "https://www.arista.com/en/support/software-download"
+        },
+        {
+            "filename": "vEOS-lab-4.24.2.1F.vmdk",
+            "version": "4.24.2.1F",
+            "md5sum": "6bab8b59ce5230e243e56f4127448fc8",
+            "filesize": 455213056,
+            "download_url": "https://www.arista.com/en/support/software-download"
+        },
+        {
+            "filename": "vEOS-lab-4.23.4.2M.vmdk",
+            "version": "4.23.4.2M",
+            "md5sum": "d21cbef4e39f1e783b13a926cb54a242",
+            "filesize": 454295552,
+            "download_url": "https://www.arista.com/en/support/software-download"
+        },
         {
             "filename": "vEOS-lab-4.23.0.1F.vmdk",
             "version": "4.23.0.1F",
@@ -47,7 +84,7 @@
         },
         {
             "filename": "vEOS-lab-4.21.1.1F.vmdk",
-            "version": "4.21.1.1F",
+            "version": "4.21.1F",
             "md5sum": "02bfb7e53781fd44ff02357f201586d9",
             "filesize": 358809600,
             "download_url": "https://www.arista.com/en/support/software-download"
@@ -180,6 +217,41 @@
         }
     ],
     "versions": [
+        {
+            "name": "4.26.2F",
+            "images": {
+                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
+                "hdb_disk_image": "vEOS-lab-4.26.2F.vmdk"
+            }
+        },
+        {
+            "name": "4.25.3M",
+            "images": {
+                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
+                "hdb_disk_image": "vEOS-lab-4.25.3M.vmdk"
+            }
+        },
+        {
+            "name": "4.24.3M",
+            "images": {
+                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
+                "hdb_disk_image": "vEOS-lab-4.24.3M.vmdk"
+            }
+        },
+        {
+            "name": "4.24.2.1F",
+            "images": {
+                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
+                "hdb_disk_image": "vEOS-lab-4.24.2.1F.vmdk"
+            }
+        },
+        {
+            "name": "4.23.4.2M",
+            "images": {
+                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
+                "hdb_disk_image": "vEOS-lab-4.23.4.2M.vmdk"
+            }
+        },
         {
             "name": "4.23.0.1F",
             "images": {
@@ -200,7 +272,7 @@
                 "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
                 "hdb_disk_image": "vEOS-lab-4.22.0F.vmdk"
             }
-        },    
+        },
         {
             "name": "4.21.1F",
             "images": {

gns3server/appliances/aruba-arubaoscx.gns3a

@@ -1,36 +1,41 @@
 {
     "name": "ArubaOS-CX Simulation Software",
     "category": "multilayer_switch",
-    "status": "stable",
-    "product_name": "ArubaOS-CX Simulation Software",
     "description": "The ArubaOS-CX Simulation Software is a virtual platform to enable simulation of the ArubaOS-CX Network Operating System. Simulated networks can be created using many of the protocols in the ArubaOS-CX Operating system like OSPF, BGP (inc. EVPN). Key features like the Aruba Network Analytics Engine and the REST API can be simulated, providing a lightweight development platform to building the modern network.",
-    "maintainer_email": "vincent.giles@hpe.com",
-    "vendor_url": "arubanetworks.com",
     "vendor_name": "HPE Aruba",
+    "vendor_url": "arubanetworks.com",
+    "product_name": "ArubaOS-CX Simulation Software",
+    "registry_version": 4,
+    "status": "stable",
     "availability": "service-contract",
     "maintainer": "Aruba",
-    "registry_version": 4,
+    "maintainer_email": "vincent.giles@hpe.com",
     "usage": "Default username admin has to be set at first login.",
     "symbol": ":/symbols/route_switch_processor.svg",
     "first_port_name": "mgmt",
     "port_name_format": "1/1/{port1}",
-
     "qemu": {
-        "arch": "x86_64",
-        "ram": 4096,
+        "adapter_type": "virtio-net-pci",
         "adapters": 8,
+        "ram": 4096,
+        "cpus": 2,
+        "hda_disk_interface": "ide",
         "hdb_disk_interface": "ide",
         "hdc_disk_interface": "ide",
-        "hda_disk_interface": "ide",
-        "cpus": 2,
+        "arch": "x86_64",
+        "console_type": "telnet",
         "kvm": "require",
-        "adapter_type": "virtio-net-pci",
-        "console_type": "vnc",
         "options": "-nographic",
         "process_priority": "normal"
-    },   
-
+    },
     "images": [
+        {
+            "filename": "arubaoscx-disk-image-genericx86-p4-20201110192651.vmdk",
+            "version": "10.06.0001",
+            "md5sum": "f8b45bc52f6bad79b5ff563e0c1ea73b",
+            "filesize": 380304896,
+            "download_url": "https://asp.arubanetworks.com/"
+        },
         {
             "filename": "arubaoscx-disk-image-genericx86-p4-20200311173823.vmdk",
             "version": "10.04.1000",
@@ -45,10 +50,14 @@
             "filesize": 287734784,
             "download_url": "http://support.arubanetworks.com/"
         }
-
     ],
-
     "versions": [
+        {
+            "name": "10.06.0001",
+            "images": {
+                "hda_disk_image": "arubaoscx-disk-image-genericx86-p4-20201110192651.vmdk"
+            }
+        },
         {
             "name": "10.04.1000",
             "images": {

gns3server/appliances/aruba-vgw.gns3a

@@ -0,0 +1,59 @@
+{
+    "name": "Aruba VGW",
+    "category": "firewall",
+    "description": "Aruba Virtual Gateways allow customers to bring their public cloud infrastructure to the SD-WAN fabric and facilitate connectivity between branches and the public cloud.",
+    "vendor_name": "HPE Aruba",
+    "vendor_url": "arubanetworks.com",
+    "documentation_url": "https://asp.arubanetworks.com/downloads;products=Aruba%20SD-WAN",
+    "product_name": "Aruba SD-WAN Virtual Gateway",
+    "product_url": "https://www.arubanetworks.com/products/networking/gateways-and-controllers/",
+    "registry_version": 4,
+    "status": "stable",
+    "availability": "service-contract",
+    "maintainer": "Aruba",
+    "maintainer_email": "mitchell.pompe@hpe.com",
+    "usage": "The device must receive an user-data.iso image, which can be mounted to the CD/DVD-ROM and retrieved from Aruba Central. https://help.central.arubanetworks.com/latest/documentation/online_help/content/gateways/vgw/vgw_man-esxi-gen-ud.htm . By default the VGW can be used with VNC, but once provisioned the command '#serial console redirect enable' will enable telnet usage for GNS3.",
+    "symbol": ":/symbols/classic/gateway.svg",
+    "first_port_name": "mgmt",
+    "port_name_format": "GE0/0/{0}",
+    "qemu": {
+        "adapter_type": "e1000",
+        "adapters": 4,
+        "ram": 4096,
+        "cpus": 3,
+        "hda_disk_interface": "ide",
+        "hdb_disk_interface": "ide",
+        "hdc_disk_interface": "ide",
+        "arch": "x86_64",
+        "console_type": "vnc",
+        "kernel_command_line": "",
+        "kvm": "require",
+        "options": "-smp cores=3,threads=1,sockets=1 -cpu host",
+        "process_priority": "normal"
+    },
+    "images": [
+        {
+            "filename": "ArubaOS_VGW_8.6.0.4-2.2.0.0_76905-disk1.vmdk",
+            "version": "8.6.0.4-2.2.0.0",
+            "md5sum": "24d3fdcbec01c1faa2d4e68659024b40",
+            "filesize": 226974208,
+            "download_url": "https://asp.arubanetworks.com/downloads"
+        },
+        {
+            "filename": "ArubaOS_VGW_8.6.0.4-2.2.0.0_76905-disk2.vmdk",
+            "version": "8.6.0.4-2.2.0.0",
+            "md5sum": "354edd27dc320c739919f55766737d06",
+            "filesize": 4203008,
+            "download_url": "https://asp.arubanetworks.com/downloads"
+        }
+    ],
+    "versions": [
+        {
+            "name": "8.6.0.4-2.2.0.0",
+            "images": {
+                "hda_disk_image": "ArubaOS_VGW_8.6.0.4-2.2.0.0_76905-disk1.vmdk",
+                "hdb_disk_image": "ArubaOS_VGW_8.6.0.4-2.2.0.0_76905-disk2.vmdk"
+            }
+        }
+    ]
+}

gns3server/appliances/aruba-vmc.gns3a

@@ -1,19 +1,32 @@
 {
-    "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",
+    "category": "guest",
+    "description": "Aruba Virtual Mobility Controller",
     "vendor_name": "HPE Aruba",
+    "vendor_url": "arubanetworks.com",
+    "product_name": "Aruba VMC",
+    "registry_version": 4,
+    "status": "stable",
+    "availability": "service-contract",
+    "maintainer": "Gary Ossewaarde",
+    "maintainer_email": "gary.ossewaarde@gmail.com",
+    "first_port_name": "mgmt",
+    "port_name_format": "GE0/0/{0}",
+    "qemu": {
+        "adapter_type": "e1000",
+        "adapters": 4,
+        "ram": 6144,
+        "cpus": 3,
+        "hda_disk_interface": "ide",
+        "hdb_disk_interface": "ide",
+        "hdc_disk_interface": "ide",
+        "arch": "x86_64",
+        "console_type": "vnc",
+        "kernel_command_line": "-smp cores=3,threads=1,sockets=1 -cpu host -nographic",
+        "kvm": "require",
+        "options": "-smp cores=3,threads=1,sockets=1 -cpu host -nographic",
+        "process_priority": "normal"
+    },
     "images": [
         {
             "filename": "ArubaOS_VMC_8.2.1.1_65265-disk1.qcow2",
@@ -29,28 +42,14 @@
             "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
+    "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"
+            }
+        }
+    ]
 }

gns3server/appliances/bigswitch-bigcloud-fabric.gns3a

@@ -1,7 +1,7 @@
 {
     "name": "Big Cloud Fabric",
     "category": "router",
-    "description": "Big Cloud Fabric\u2122 is the industry\u2019s first data center fabric built using whitebox or britebox switches and SDN controller technology. Embracing hyperscale data center design principles, Big Cloud Fabric solution enables rapid innovation, ease of provisioning and management, while reducing overall costs, making it ideal for current and next generation data centers. Big Cloud Fabric is designed from the ground up to satisfy the requirements of physical, virtual, containerized, or a combination of such workloads. Some of the typical OpenStack or VMware data center workloads include NFV, High Performance Computing, Big Data and Software Defined Storage deployments.",
+    "description": "Big Cloud Fabric\u2122 is the industry's first data center fabric built using whitebox or britebox switches and SDN controller technology. Embracing hyperscale data center design principles, Big Cloud Fabric solution enables rapid innovation, ease of provisioning and management, while reducing overall costs, making it ideal for current and next generation data centers. Big Cloud Fabric is designed from the ground up to satisfy the requirements of physical, virtual, containerized, or a combination of such workloads. Some of the typical OpenStack or VMware data center workloads include NFV, High Performance Computing, Big Data and Software Defined Storage deployments.",
     "vendor_name": "Big Switch Networks",
     "vendor_url": "http://www.bigswitch.com/",
     "documentation_url": "http://www.bigswitch.com/support",
@@ -16,6 +16,7 @@
         "adapter_type": "e1000",
         "adapters": 8,
         "ram": 256,
+        "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "require"
@@ -23,7 +24,7 @@
     "images": [
         {
             "filename": "BCF-Controller-BCF-CE-3.5.0-2016-01-22.qcow2",
-            "version": "3.5.0-2016-01-22",
+            "version": "3.5.0",
             "md5sum": "d1c2ecf0db8101f6b6d311470697545a",
             "filesize": 2860253184,
             "download_url": "http://www.bigswitch.com/community-edition"
@@ -31,7 +32,7 @@
     ],
     "versions": [
         {
-            "name": "3.5",
+            "name": "3.5.0",
             "images": {
                 "hda_disk_image": "BCF-Controller-BCF-CE-3.5.0-2016-01-22.qcow2"
             }

gns3server/appliances/bird.gns3a

@@ -15,6 +15,7 @@
         "adapter_type": "e1000",
         "adapters": 4,
         "ram": 128,
+        "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "allow"

gns3server/appliances/brocade-vadx.gns3a

@@ -1,13 +1,12 @@
 {
     "name": "Brocade Virtual ADX",
     "category": "firewall",
-    "status": "experimental",
-    "maintainer": "GNS3 team",
-    "description": "The Brocade Virtual ADX (vADX™) is a full-fledged Application Delivery Controller (ADC) platform with a virtual footprint that leverages Intel advanced technology to deliver remarkable performance. The software is designed to run on standardsbased hypervisors, hosted on Intel x86 COTS hardware. It offers a complete suite of Layer 4 and Layer 7 server load balancing capabilities and application security services with extensible management via rich SOAP/XML APIs.",
+    "description": "The Brocade Virtual ADX (vADX\u2122) is a full-fledged Application Delivery Controller (ADC) platform with a virtual footprint that leverages Intel advanced technology to deliver remarkable performance. The software is designed to run on standardsbased hypervisors, hosted on Intel x86 COTS hardware. It offers a complete suite of Layer 4 and Layer 7 server load balancing capabilities and application security services with extensible management via rich SOAP/XML APIs.",
     "vendor_name": "Brocade",
     "vendor_url": "https://www.brocade.com",
     "product_name": "Virtual ADX",
     "registry_version": 3,
+    "status": "experimental",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
     "usage": "Login is root, type vadx-console to access to the console",
@@ -17,6 +16,7 @@
         "adapter_type": "virtio-net-pci",
         "adapters": 8,
         "ram": 2048,
+        "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "vnc",
         "kvm": "require",
@@ -26,8 +26,8 @@
         {
             "filename": "SSR03100KVM.qcow2",
             "version": "03100",
-            "filesize": 3327066112,
             "md5sum": "40e5717463fb2f5d1bb7c4de7df15c5c",
+            "filesize": 3327066112,
             "download_url": "http://www1.brocade.com/forms/jsp/virtual-adx-download/index.jsp"
         }
     ],

gns3server/appliances/brocade-vtm.gns3a

@@ -133,4 +133,3 @@
         }
     ]
 }
-

gns3server/appliances/bsdrp.gns3a

@@ -14,6 +14,7 @@
         "adapter_type": "e1000",
         "adapters": 4,
         "ram": 256,
+        "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "allow"

gns3server/appliances/centos-cloud.gns3a

@@ -27,7 +27,7 @@
     "images": [
         {
             "filename": "CentOS-7-x86_64-GenericCloud-1809.qcow2",
-            "version": "7-1809",
+            "version": "7 (1809)",
             "md5sum": "da79108d1324b27bd1759362b82fbe40",
             "filesize": 914948096,
             "download_url": "https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1809.qcow2"

gns3server/appliances/centos7.gns3a

@@ -26,7 +26,6 @@
         "options": "-vga qxl"
     },
     "images": [
-
         {
             "filename": "CentOS 7-18.10 (64bit).vmdk",
             "version": "7-1810",
@@ -34,7 +33,6 @@
             "filesize": 4886233088,
             "download_url": "http://www.osboxes.org/centos/"
         },
-
         {
             "filename": "CentOS 7-1804 (64bit).vmdk",
             "version": "7-1804",
@@ -42,7 +40,6 @@
             "filesize": 4701356032,
             "download_url": "http://www.osboxes.org/centos/"
         },
-
         {
             "filename": "CentOS 7-1611 (64bit).vmdk",
             "version": "7-1611",
@@ -58,14 +55,12 @@
                 "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": {

gns3server/appliances/checkpoint-gaia.gns3a

@@ -12,10 +12,11 @@
     "maintainer_email": "developers@gns3.net",
     "usage": "At boot choose the install on disk options. You need to open quickly the terminal after launching the appliance if you want to see the menu. You need a web browser in order to finalize the installation. You can use the firefox appliance for this.",
     "qemu": {
-        "cpus": 2,
         "adapter_type": "e1000",
         "adapters": 8,
         "ram": 4096,
+        "cpus": 2,
+        "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "telnet",
         "boot_priority": "dc",
@@ -75,6 +76,5 @@
                 "cdrom_image": "Check_Point_R77.20_T124_Install.Gaia.iso"
             }
         }
-
     ]
 }

gns3server/appliances/cisco-asa.gns3a

@@ -17,11 +17,12 @@
         "adapter_type": "i82559er",
         "adapters": 4,
         "ram": 512,
+        "hda_disk_interface": "ide",
         "arch": "i386",
         "console_type": "telnet",
         "kernel_command_line": "ide_generic.probe_mask=0x01 ide_core.chs=0.0:980,16,32 auto nousb console=ttyS0,9600 bigphysarea=65536 ide1=noprobe no-hlt",
         "kvm": "disable",
-        "options": "-no-kvm -icount auto -hdachs 980,16,32",
+        "options": "-machine accel=tcg -icount auto -hdachs 980,16,32",
         "cpu_throttling": 80,
         "process_priority": "low"
     },

gns3server/appliances/cisco-asav.gns3a

@@ -19,12 +19,26 @@
         "adapter_type": "e1000",
         "adapters": 8,
         "ram": 2048,
+        "hda_disk_interface": "virtio",
         "arch": "x86_64",
         "console_type": "vnc",
-        "hda_disk_interface": "virtio",
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "asav9-15-1.qcow2",
+            "version": "9.15.1",
+            "md5sum": "4e8747667f52e9046979f126128a61d1",
+            "filesize": 252444672,
+            "download_url": "https://software.cisco.com/download/home/286119613/type/280775065/release/9.15.1"
+        },
+        {
+            "filename": "asav9-14-1.qcow2",
+            "version": "9.14.1",
+            "md5sum": "03d89e18e7f8ad00fe8e979c4790587d",
+            "filesize": 211877888,
+            "download_url": "https://software.cisco.com/download/home/286119613/type/280775065/release/9.14.1"
+        },
         {
             "filename": "asav9-12-2-9.qcow2",
             "version": "9.12.2-9",
@@ -90,6 +104,18 @@
         }
     ],
     "versions": [
+        {
+            "name": "9.15.1",
+            "images": {
+                "hda_disk_image": "asav9-15-1.qcow2"
+            }
+        },
+        {
+            "name": "9.14.1",
+            "images": {
+                "hda_disk_image": "asav9-14-1.qcow2"
+            }
+        },
         {
             "name": "9.12.2-9",
             "images": {

gns3server/appliances/cisco-c8000v.gns3a

@@ -0,0 +1,55 @@
+{
+    "name": "Cisco Catalyst 8000V",
+    "category": "router",
+    "description": "The Cisco Catalyst 8000V Edge Software is a virtual, form-factor router deployed on a virtual machine (VM) running on an x86 server hardware.",
+    "vendor_name": "Cisco",
+    "vendor_url": "http://www.cisco.com/",
+    "documentation_url": "https://www.cisco.com/c/en/us/td/docs/routers/C8000V/Configuration/c8000v-installation-configuration-guide.html",
+    "product_name": "c8000v",
+    "product_url": "https://www.cisco.com/c/en/us/support/routers/catalyst-8000v-edge-software/series.html",
+    "registry_version": 3,
+    "status": "stable",
+    "maintainer": "GNS3 Team",
+    "maintainer_email": "developers@gns3.net",
+    "usage": "There is no default password and enable password. A default configuration is present.",
+    "port_name_format": "Gi{port1}",
+    "qemu": {
+        "adapter_type": "vmxnet3",
+        "adapters": 4,
+        "ram": 4096,
+        "hda_disk_interface": "ide",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "kvm": "require"
+    },
+    "images": [
+        {
+            "filename": "c8000v-universalk9_8G_serial.17.04.01a.qcow2",
+            "version": "17.04.01a 8G",
+            "md5sum": "5c1dd1d3757ea43b5b02e0af7a010525",
+            "filesize": 1623130112,
+            "download_url": "https://software.cisco.com/download/home/286327102/type/282046477/release/Bengaluru-17.4.1a"
+        },
+        {
+            "filename": "c8000v-universalk9_8G_serial.17.04.01b.qcow2",
+            "version": "17.04.01b 8G",
+            "md5sum": "84aebb7f5f38bdd4df8e7607643027be",
+            "filesize": 1623130112,
+            "download_url": "https://software.cisco.com/download/home/286327102/type/282046477/release/Bengaluru-17.4.1b"
+        }
+    ],
+    "versions": [
+        {
+            "name": "17.04.01a 8G",
+            "images": {
+                "hda_disk_image": "c8000v-universalk9_8G_serial.17.04.01a.qcow2"
+            }
+        },
+        {
+            "name": "17.04.01b 8G",
+            "images": {
+                "hda_disk_image": "c8000v-universalk9_8G_serial.17.04.01b.qcow2"
+            }
+        }
+    ]
+}

gns3server/appliances/cisco-csr1000v.gns3a

@@ -17,12 +17,13 @@
         "adapter_type": "vmxnet3",
         "adapters": 4,
         "ram": 3072,
+        "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "require"
     },
     "images": [
-            {
+        {
             "filename": "csr1000v-universalk9.16.12.03-serial.qcow2",
             "version": "16.12.3",
             "md5sum": "1fc380569ad3cc145fb9cbc993b2eb32",
@@ -49,7 +50,7 @@
             "md5sum": "7a07a182178243c1c107e68f04ecd8b5",
             "filesize": 920518656,
             "download_url": "https://software.cisco.com/download/home/284364978/type/282046477/release/Fuji-16.9.5"
-        },        
+        },
         {
             "filename": "csr1000v-universalk9.16.09.01-serial.qcow2",
             "version": "16.9.1",
@@ -77,7 +78,7 @@
             "md5sum": "2aba82d78091b4603224a13710399447",
             "filesize": 1573322752,
             "download_url": "https://software.cisco.com/download/release.html?mdfid=284364978&flowid=39582&softwareid=282046477&release=Everest-16.6.7"
-        },        
+        },
         {
             "filename": "csr1000v-universalk9.16.06.06-serial.qcow2",
             "version": "16.6.6",
@@ -162,7 +163,7 @@
             "images": {
                 "hda_disk_image": "csr1000v-universalk9.16.12.03-serial.qcow2"
             }
-        },    
+        },
         {
             "name": "16.12.1a",
             "images": {
@@ -180,7 +181,7 @@
             "images": {
                 "hda_disk_image": "csr1000v-universalk9.16.09.05-serial.qcow2"
             }
-        },        
+        },
         {
             "name": "16.9.1",
             "images": {
@@ -204,7 +205,7 @@
             "images": {
                 "hda_disk_image": "csr1000v-universalk9.16.06.07-serial.qcow2"
             }
-        },        
+        },
         {
             "name": "16.6.6",
             "images": {
@@ -253,7 +254,7 @@
                 "hda_disk_image": "csr1000v-universalk9.16.3.1-build2.qcow2"
             }
         },
-       {
+        {
             "name": "16.3.2",
             "images": {
                 "hda_disk_image": "csr1000v-universalk9.16.03.02.qcow2"

gns3server/appliances/cisco-dcnm.gns3a

@@ -1,7 +1,7 @@
 {
     "name": "Cisco DCNM",
     "category": "guest",
-    "description": "Cisco Data Center Network Manager (DCNM) 10 unifies and automates Cisco Nexus and Cisco MDS 9000 Family multitenant infrastructure for data center management across Cisco Nexus 5000, 6000, 7000, and 9000 Series Switches in NX‑OS mode using Cisco NX-OS Software as well as across Cisco MDS 9100 and 9300 Series Multilayer Fabric Switches, 9200 Series Multiservice Switches, and 9500 and 9700 Series Multilayer Directors. Data Center Network Manager 10 lets you manage very large numbers of devices while providing ready-to-use management and automation capabilities plus Virtual Extensible LAN (VXLAN) overlay visibility into Cisco Nexus LAN fabrics.",
+    "description": "Cisco Data Center Network Manager (DCNM) 10 unifies and automates Cisco Nexus and Cisco MDS 9000 Family multitenant infrastructure for data center management across Cisco Nexus 5000, 6000, 7000, and 9000 Series Switches in NX-OS mode using Cisco NX-OS Software as well as across Cisco MDS 9100 and 9300 Series Multilayer Fabric Switches, 9200 Series Multiservice Switches, and 9500 and 9700 Series Multilayer Directors. Data Center Network Manager 10 lets you manage very large numbers of devices while providing ready-to-use management and automation capabilities plus Virtual Extensible LAN (VXLAN) overlay visibility into Cisco Nexus LAN fabrics.",
     "vendor_name": "Cisco",
     "vendor_url": "http://www.cisco.com/",
     "documentation_url": "http://www.cisco.com/c/en/us/support/cloud-systems-management/data-center-network-manager-10/model.html",
@@ -12,8 +12,8 @@
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
     "usage": "Default credentials: root / cisco123",
-    "port_name_format": "eth{0}",
     "symbol": "mgmt_station.svg",
+    "port_name_format": "eth{0}",
     "qemu": {
         "adapter_type": "e1000",
         "adapters": 3,
@@ -25,6 +25,13 @@
         "options": "-smp 2"
     },
     "images": [
+        {
+            "filename": "dcnm-va.11.4.1.iso",
+            "version": "11.4.1",
+            "md5sum": "37b30d7a13b2fd436478e0e3049e4da6",
+            "filesize": 5378867680,
+            "download_url": "https://software.cisco.com/download/home/281722751/type/282088134/release/11.4%25281%2529"
+        },
         {
             "filename": "dcnm-va.11.2.1.iso",
             "version": "11.2.1",
@@ -56,6 +63,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "11.4.1",
+            "images": {
+                "hda_disk_image": "empty100G.qcow2",
+                "cdrom_image": "dcnm-va.11.4.1.iso"
+            }
+        },
         {
             "name": "11.2.1",
             "images": {

gns3server/appliances/cisco-fcnf.gns3a

@@ -1,7 +1,7 @@
 {
     "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. ",
+    "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",
@@ -14,12 +14,12 @@
     "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}",
+    "port_name_format": "eth{port1}",
     "qemu": {
-        "cpus": 2,
         "adapter_type": "e1000",
         "adapters": 1,
         "ram": 8192,
+        "cpus": 2,
         "hda_disk_interface": "scsi",
         "arch": "x86_64",
         "console_type": "vnc",

gns3server/appliances/cisco-fmcv.gns3a

@@ -11,116 +11,115 @@
     "status": "experimental",
     "availability": "service-contract",
     "maintainer": "Community",
-    "maintainer_email":"",
+    "maintainer_email": "",
     "usage": "BE PATIENT\nOn first boot FMCv generates about 6GB of data. This can take 30 minutes or more. Plan on a long wait after the following line in the boot up:\n\n    usbcore: registered new interface driver usb-storage\n\nInitial IP address: 192.168.45.45.\n\nDefault username/password: admin/Admin123.",
     "symbol": "cisco-fmcv.svg",
     "first_port_name": "eth0",
     "port_name_format": "eth{port1}",
     "qemu": {
-        "cpus": 4,
         "adapter_type": "virtio-net-pci",
         "adapters": 1,
         "ram": 8192,
+        "cpus": 4,
+        "hda_disk_interface": "scsi",
         "arch": "x86_64",
         "console_type": "telnet",
-        "hda_disk_interface": "scsi",
         "kvm": "require",
         "options": ""
     },
     "images": [
-       {
+        {
             "filename": "Cisco_Firepower_Management_Center_Virtual-6.0.0-1005-disk1.vmdk",
             "version": "6.0.0 (1005) vmdk",
             "md5sum": "3fed60f1e7d6910c22d13e966acebd7f",
             "filesize": 1681540608,
             "download_url": "https://software.cisco.com/download/"
-       },
-       {
+        },
+        {
             "filename": "Cisco_Firepower_Management_Center_Virtual-6.1.0-330.qcow2",
             "version": "6.1.0 (330)",
             "md5sum": "e3c64179ec46671caeb7ac3e4e58064f",
             "filesize": 1909391360,
             "download_url": "https://software.cisco.com/download/"
-       },
-       {
+        },
+        {
             "filename": "Cisco_Firepower_Management_Center_Virtual_VMware-6.1.0-330-disk1.vmdk",
             "version": "6.1.0 (330) vmdk",
             "md5sum": "8bc77b317cf0007dcbb0f187c1a0c01f",
             "filesize": 1938142720,
             "download_url": "https://software.cisco.com/download/"
-       },
-       {
+        },
+        {
             "filename": "Cisco_Firepower_Management_Center_Virtual-6.2.0-362.qcow2",
             "version": "6.2.0 (362)",
             "md5sum": "26e66882bf5f68adc0eca2f6bef7b613",
             "filesize": 1949302784,
             "download_url": "https://software.cisco.com/download/"
-       },
-       {
+        },
+        {
             "filename": "Cisco_Firepower_Management_Center_Virtual_VMware-6.2.0-362-disk1.vmdk",
             "version": "6.2.0 (362) vmdk",
             "md5sum": "772165cbda3c183bb0e77a1923dd4d09",
             "filesize": 1983376384,
             "download_url": "https://software.cisco.com/download/"
-       },
-      {
+        },
+        {
             "filename": "Cisco_Firepower_Management_Center_Virtual-6.2.1-342.qcow2",
             "version": "6.2.1 (342)",
             "md5sum": "29ebbbe71a6b766f6dea81e5ca32c275",
             "filesize": 2113732608,
             "download_url": "https://software.cisco.com/download/"
-       },
-      {
+        },
+        {
             "filename": "Cisco_Firepower_Management_Center_Virtual_VMware-6.2.1-342-disk1.vmdk",
             "version": "6.2.1 (342) vmdk",
             "md5sum": "4cf5b7fd68075b6f7ee0dd41a4029ca0",
             "filesize": 2150017536,
             "download_url": "https://software.cisco.com/download/"
-       }
-
+        }
     ],
     "versions": [
-         {
+        {
             "name": "6.0.0 (1005) vmdk",
             "images": {
                 "hda_disk_image": "Cisco_Firepower_Management_Center_Virtual-6.0.0-1005-disk1.vmdk"
             }
-         },
-         {
+        },
+        {
             "name": "6.1.0 (330)",
             "images": {
                 "hda_disk_image": "Cisco_Firepower_Management_Center_Virtual-6.1.0-330.qcow2"
             }
-         },
-         {
+        },
+        {
             "name": "6.1.0 (330) vmdk",
             "images": {
                 "hda_disk_image": "Cisco_Firepower_Management_Center_Virtual_VMware-6.1.0-330-disk1.vmdk"
             }
-         },
-         {
+        },
+        {
             "name": "6.2.0 (362)",
             "images": {
                 "hda_disk_image": "Cisco_Firepower_Management_Center_Virtual-6.2.0-362.qcow2"
             }
-         },
-         {
+        },
+        {
             "name": "6.2.0 (362) vmdk",
             "images": {
                 "hda_disk_image": "Cisco_Firepower_Management_Center_Virtual_VMware-6.2.0-362-disk1.vmdk"
             }
-         },
-         {
+        },
+        {
             "name": "6.2.1 (342)",
             "images": {
                 "hda_disk_image": "Cisco_Firepower_Management_Center_Virtual-6.2.1-342.qcow2"
             }
-         },
+        },
         {
             "name": "6.2.1 (342) vmdk",
             "images": {
                 "hda_disk_image": "Cisco_Firepower_Management_Center_Virtual_VMware-6.2.1-342-disk1.vmdk"
             }
-         }
+        }
     ]
 }

gns3server/appliances/cisco-fsve.gns3a

@@ -1,7 +1,7 @@
 {
     "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. ",
+    "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",
@@ -14,12 +14,12 @@
     "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}",
+    "port_name_format": "eth{port1}",
     "qemu": {
-        "cpus": 1,
         "adapter_type": "e1000",
         "adapters": 2,
         "ram": 8192,
+        "cpus": 1,
         "hda_disk_interface": "scsi",
         "arch": "x86_64",
         "console_type": "vnc",

gns3server/appliances/cisco-ftdv.gns3a

@@ -1,7 +1,7 @@
 {
     "name": "Cisco FTDv",
     "category": "firewall",
-    "description": "Cisco Firepower Threat Defense Virtual NGFW appliances combine Cisco's proven network firewall with the industry’s most effective next-gen IPS and advanced malware protection. All so you can get more visibility, be more flexible, save more, and protect better.",
+    "description": "Cisco Firepower Threat Defense Virtual NGFW appliances combine Cisco's proven network firewall with the industry's most effective next-gen IPS and advanced malware protection. All so you can get more visibility, be more flexible, save more, and protect better.",
     "vendor_name": "Cisco Systems",
     "vendor_url": "http://www.cisco.com/",
     "documentation_url": "http://www.cisco.com/c/en/us/td/docs/security/firepower/quick_start/kvm/ftdv-kvm-qsg.html",
@@ -17,83 +17,82 @@
     "first_port_name": "Gigabit0/0 (Mgmt)",
     "port_name_format": "Gigabit0/{port1}",
     "qemu": {
-        "cpus": 4,
         "adapter_type": "e1000",
         "adapters": 10,
         "ram": 8192,
+        "cpus": 4,
+        "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "telnet",
-        "hda_disk_interface": "ide",
         "kvm": "require"
     },
     "images": [
-       {
+        {
             "filename": "Cisco_Firepower_Threat_Defense_Virtual-6.2.0-363.qcow2",
             "version": "6.2.0 (363)",
             "md5sum": "fafdae94ead07b23d6c8dc5f7a731e74",
             "filesize": 1022885888,
             "download_url": "https://software.cisco.com/download/release.html?mdfid=286306503&catid=268438162&softwareid=286306337&release=6.2.0&relind=AVAILABLE&rellifecycle=&reltype=latest"
-       },
-       {
+        },
+        {
             "filename": "Cisco_Firepower_Threat_Defense_Virtual-6.2.0-363.vmdk",
             "version": "6.2.0 (363) vmdk",
             "md5sum": "10297ab20526a8b1586c6ce1cd3d9cbd",
             "filesize": 1042470912,
             "download_url": "https://software.cisco.com/download/release.html?mdfid=286306503&catid=268438162&softwareid=286306337&release=6.2.0&relind=AVAILABLE&rellifecycle=&reltype=latest"
-       },
-       {
+        },
+        {
             "filename": "Cisco_Firepower_Threat_Defense_Virtual-6.1.0-330.qcow2",
             "version": "6.1.0 (330)",
             "md5sum": "386ab2b3d6d1d28fd2cd03a83df5e00f",
             "filesize": 1004601344,
             "download_url": "https://software.cisco.com/download/release.html?mdfid=286306503&catid=268438162&softwareid=286306337&release=6.1.0&relind=AVAILABLE&rellifecycle=&reltype=latest"
-       },
-       {
+        },
+        {
             "filename": "Cisco_Firepower_Threat_Defense_Virtual-6.1.0-330.vmdk",
             "version": "6.1.0 (330) vmdk",
             "md5sum": "c1fa58448841b33d5eed6854dc608816",
             "filesize": 1024162816,
             "download_url": "https://software.cisco.com/download/release.html?mdfid=286306503&catid=268438162&softwareid=286306337&release=6.1.0&relind=AVAILABLE&rellifecycle=&reltype=latest"
-       },
-       {
+        },
+        {
             "filename": "Cisco_Firepower_Threat_Defense_Virtual-6.0.1-1213.vmdk",
             "version": "6.0.1 (1213) vmdk",
             "md5sum": "bc53461e2ec344814e41a6a8d3a5f774",
             "filesize": 714577408,
             "download_url": "https://software.cisco.com/download/release.html?mdfid=286306503&catid=268438162&softwareid=286306337&release=6.0.1&relind=AVAILABLE&rellifecycle=&reltype=latest"
-       }
-
+        }
     ],
     "versions": [
-         {
+        {
             "name": "6.2.0 (363)",
             "images": {
                 "hda_disk_image": "Cisco_Firepower_Threat_Defense_Virtual-6.2.0-363.qcow2"
             }
-         },
-         {
+        },
+        {
             "name": "6.2.0 (363) vmdk",
             "images": {
                 "hda_disk_image": "Cisco_Firepower_Threat_Defense_Virtual-6.2.0-363.vmdk"
             }
-         },
-         {
+        },
+        {
             "name": "6.1.0 (330)",
             "images": {
                 "hda_disk_image": "Cisco_Firepower_Threat_Defense_Virtual-6.1.0-330.qcow2"
             }
-         },
-         {
+        },
+        {
             "name": "6.1.0 (330) vmdk",
             "images": {
                 "hda_disk_image": "Cisco_Firepower_Threat_Defense_Virtual-6.1.0-330.vmdk"
             }
-         },
-         {
+        },
+        {
             "name": "6.0.1 (1213) vmdk",
             "images": {
                 "hda_disk_image": "Cisco_Firepower_Threat_Defense_Virtual-6.0.1-1213.vmdk"
             }
-         }
+        }
     ]
 }

gns3server/appliances/cisco-iosv.gns3a

@@ -31,6 +31,27 @@
             "download_url": "https://sourceforge.net/projects/gns-3/files",
             "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/IOSv_startup_config.img/download"
         },
+        {
+            "filename": "vios-adventerprisek9-m.spa.159-3.m3.qcow2",
+            "version": "15.9(3)M3",
+            "md5sum": "12893843af18e4c62f13d07266755653",
+            "filesize": 57296384,
+            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
+        },
+        {
+            "filename": "vios-adventerprisek9-m.spa.159-3.m2.qcow2",
+            "version": "15.9(3)M2",
+            "md5sum": "a19e998bc3086825c751d125af722329",
+            "filesize": 57308672,
+            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
+        },
+        {
+            "filename": "vios-adventerprisek9-m.spa.158-3.m2.qcow2",
+            "version": "15.8(3)M2",
+            "md5sum": "40e3d25b5b0cb13d639fcd2cf18e9965",
+            "filesize": 57129984,
+            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
+        },
         {
             "filename": "vios-adventerprisek9-m.vmdk.SPA.157-3.M3",
             "version": "15.7(3)M3",
@@ -61,6 +82,27 @@
         }
     ],
     "versions": [
+        {
+            "name": "15.9(3)M3",
+            "images": {
+                "hda_disk_image": "vios-adventerprisek9-m.spa.159-3.m3.qcow2",
+                "hdb_disk_image": "IOSv_startup_config.img"
+            }
+        },
+        {
+            "name": "15.9(3)M2",
+            "images": {
+                "hda_disk_image": "vios-adventerprisek9-m.spa.159-3.m2.qcow2",
+                "hdb_disk_image": "IOSv_startup_config.img"
+            }
+        },
+        {
+            "name": "15.8(3)M2",
+            "images": {
+                "hda_disk_image": "vios-adventerprisek9-m.spa.158-3.m2.qcow2",
+                "hdb_disk_image": "IOSv_startup_config.img"
+            }
+        },
         {
             "name": "15.7(3)M3",
             "images": {

gns3server/appliances/cisco-iosvl2.gns3a

@@ -23,7 +23,21 @@
         "kvm": "require"
     },
     "images": [
-	    {
+        {
+            "filename": "vios_l2-adventerprisek9-m.ssa.high_iron_20200929.qcow2",
+            "version": "15.2(20200924:215240)",
+            "md5sum": "99ecab32de12410c533e6abd4e9710aa",
+            "filesize": 90409984,
+            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
+        },
+        {
+            "filename": "vios_l2-adventerprisek9-m.ssa.high_iron_20190423.qcow2",
+            "version": "15.2(6.0.81)E",
+            "md5sum": "71cacb678f98a106f99e889b97b34686",
+            "filesize": 44950016,
+            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
+        },
+        {
             "filename": "vios_l2-adventerprisek9-m.SSA.high_iron_20180619.qcow2",
             "version": "15.2.1",
             "md5sum": "14b981002e40b660f2d7400401e04c14",
@@ -46,7 +60,19 @@
         }
     ],
     "versions": [
-	     {
+        {
+            "name": "15.2(20200924:215240)",
+            "images": {
+                "hda_disk_image": "vios_l2-adventerprisek9-m.ssa.high_iron_20200929.qcow2"
+            }
+        },
+        {
+            "name": "15.2(6.0.81)E",
+            "images": {
+                "hda_disk_image": "vios_l2-adventerprisek9-m.ssa.high_iron_20190423.qcow2"
+            }
+        },
+        {
             "name": "15.2.1",
             "images": {
                 "hda_disk_image": "vios_l2-adventerprisek9-m.SSA.high_iron_20180619.qcow2"

gns3server/appliances/cisco-iosxrv.gns3a

@@ -18,6 +18,7 @@
         "adapter_type": "e1000",
         "adapters": 9,
         "ram": 3072,
+        "hda_disk_interface": "ide",
         "arch": "i386",
         "console_type": "telnet",
         "kvm": "require"

gns3server/appliances/cisco-iosxrv9k.gns3a

@@ -18,12 +18,20 @@
         "adapter_type": "virtio-net-pci",
         "adapters": 7,
         "ram": 16384,
+        "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "require",
         "options": "-smp 4 -cpu host"
     },
     "images": [
+        {
+            "filename": "xrv9k-fullk9-x-7.1.1.qcow2",
+            "version": "7.1.1",
+            "md5sum": "dcf241e3f8df0151fec2c7bfac9d96ac",
+            "filesize": 1443758080,
+            "download_url": "https://software.cisco.com/download/home/286288939/type/280805694/release/7.1.1"
+        },
         {
             "filename": "xrv9k-fullk9-x-7.0.1.qcow2",
             "version": "7.0.1",
@@ -66,7 +74,8 @@
             "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",
+        {
+            "filename": "xrv9k-fullk9-x-6.4.1.qcow2",
             "version": "6.4.1",
             "md5sum": "9c56b684e307706005a503e289cb9317",
             "filesize": 1304887296,
@@ -95,6 +104,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "7.1.1",
+            "images": {
+                "hda_disk_image": "xrv9k-fullk9-x-7.1.1.qcow2"
+            }
+        },
         {
             "name": "7.0.1",
             "images": {

gns3server/appliances/cisco-ise.gns3a

@@ -15,10 +15,10 @@
     "symbol": "cisco-ise.svg",
     "port_name_format": "GigabitEthernet{0}",
     "qemu": {
-        "cpus": 2,
         "adapter_type": "e1000",
         "adapters": 6,
         "ram": 8192,
+        "cpus": 2,
         "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "vnc",
@@ -55,7 +55,7 @@
             "filesize": 8174278656,
             "download_url": "https://software.cisco.com/download/home/283801620/type/283802505/release/2.3.0"
         },
-		{
+        {
             "filename": "ise-2.2.0.470.SPA.x86_64.iso",
             "version": "2.2.0.470",
             "md5sum": "7fe5e730d0a51ef66e69d1463717ff3f",
@@ -121,7 +121,7 @@
                 "cdrom_image": "ise-2.3.0.298.SPA.x86_64.iso"
             }
         },
-		{
+        {
             "name": "2.2.0.470",
             "images": {
                 "hda_disk_image": "empty200G.qcow2",

gns3server/appliances/cisco-ngipsv.gns3a

@@ -17,57 +17,56 @@
     "first_port_name": "eth0 (Mgmt)",
     "port_name_format": "eth{port1}",
     "qemu": {
-        "cpus": 4,
         "adapter_type": "vmxnet3",
         "adapters": 10,
         "ram": 8192,
+        "cpus": 4,
+        "hda_disk_interface": "scsi",
         "arch": "x86_64",
         "console_type": "telnet",
-        "hda_disk_interface": "scsi",
         "kvm": "require"
     },
     "images": [
-       {
+        {
             "filename": "Cisco_Firepower_NGIPSv_VMware-6.0.0-1005-disk1.vmdk",
             "version": "6.0.0 (1005) vmdk",
             "md5sum": "72ed34d39c58a9d5ad1c6197d1ff9a62",
             "filesize": 804301312,
             "download_url": "https://software.cisco.com/download/release.html?mdfid=286259690&softwareid=286271056&release=6.0.0.0&relind=AVAILABLE&rellifecycle=&reltype=latest"
-       },
-       {
+        },
+        {
             "filename": "Cisco_Firepower_NGIPSv_VMware-6.1.0-330-disk1.vmdk",
             "version": "6.1.0 (330) vmdk",
             "md5sum": "7a771cc8c37a0371285f24c25f9886f0",
             "filesize": 860411392,
             "download_url": "https://software.cisco.com/download/release.html?mdfid=286259690&softwareid=286271056&release=6.1.0&relind=AVAILABLE&rellifecycle=&reltype=latest"
-       },
-       {
+        },
+        {
             "filename": "Cisco_Firepower_NGIPSv_VMware-6.2.0-362-disk1.vmdk",
             "version": "6.2.0 (362) vmdk",
             "md5sum": "46f629149e11ac5c224bae0486c7e406",
             "filesize": 877626368,
             "download_url": "https://software.cisco.com/download/release.html?mdfid=286259690&softwareid=286271056&release=6.2.0&relind=AVAILABLE&rellifecycle=&reltype=latest"
-       }
+        }
     ],
     "versions": [
-         {
+        {
             "name": "6.2.0 (362) vmdk",
             "images": {
                 "hda_disk_image": "Cisco_Firepower_NGIPSv_VMware-6.2.0-362-disk1.vmdk"
             }
-         },
-         {
+        },
+        {
             "name": "6.1.0 (330) vmdk",
             "images": {
                 "hda_disk_image": "Cisco_Firepower_NGIPSv_VMware-6.1.0-330-disk1.vmdk"
             }
-         },
-         {
+        },
+        {
             "name": "6.0.0 (1005) vmdk",
             "images": {
                 "hda_disk_image": "Cisco_Firepower_NGIPSv_VMware-6.0.0-1005-disk1.vmdk"
             }
-         }
-
+        }
     ]
 }

gns3server/appliances/cisco-nxosv.gns3a

@@ -17,6 +17,7 @@
         "adapter_type": "e1000",
         "adapters": 16,
         "ram": 3072,
+        "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "require"

gns3server/appliances/cisco-nxosv9k.gns3a

@@ -11,20 +11,34 @@
     "availability": "service-contract",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
-    "first_port_name": "mgmt0",
     "usage": "The old (I5) versions might require 8192 MB of RAM; adjust it if necessary.",
+    "first_port_name": "mgmt0",
     "port_name_format": "Ethernet1/{port1}",
     "qemu": {
-        "cpus": 2,
         "adapter_type": "e1000",
         "adapters": 10,
         "ram": 8096,
+        "cpus": 2,
         "hda_disk_interface": "sata",
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "nexus9500v64.10.1.1.qcow2",
+            "version": "9500v 10.1.1",
+            "md5sum": "35672370b0f43e725d5b2d92488524f0",
+            "filesize": 1592000512,
+            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/10.1(1)"
+        },
+        {
+            "filename": "nexus9500v.9.3.7.qcow2",
+            "version": "9500v 9.3.7",
+            "md5sum": "65f669e0dd379a05a8cdbb9d7592a064",
+            "filesize": 1986068480,
+            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/9.3(7)"
+        },
         {
             "filename": "nexus9500v.9.3.3.qcow2",
             "version": "9500v 9.3.3",
@@ -45,7 +59,7 @@
             "md5sum": "148fd38cb1ff78df2883f844e172fad9",
             "filesize": 1435041792,
             "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/9.3(1)?i=!pp"
-        },   
+        },
         {
             "filename": "nxosv-final.9.2.3.qcow2",
             "version": "9.2.3",
@@ -148,6 +162,20 @@
         }
     ],
     "versions": [
+        {
+            "name": "9500v 10.1.1",
+            "images": {
+                "bios_image": "OVMF-20160813.fd",
+                "hda_disk_image": "nexus9500v64.10.1.1.qcow2"
+            }
+        },
+        {
+            "name": "9500v 9.3.7",
+            "images": {
+                "bios_image": "OVMF-20160813.fd",
+                "hda_disk_image": "nexus9500v.9.3.7.qcow2"
+            }
+        },
         {
             "name": "9500v 9.3.3",
             "images": {
@@ -161,14 +189,14 @@
                 "bios_image": "OVMF-20160813.fd",
                 "hda_disk_image": "nexus9300v.9.3.3.qcow2"
             }
-        }, 
+        },
         {
             "name": "9.3.1",
             "images": {
                 "bios_image": "OVMF-20160813.fd",
                 "hda_disk_image": "nxosv.9.3.1.qcow2"
             }
-        },    
+        },
         {
             "name": "9.2.3",
             "images": {

gns3server/appliances/cisco-smc.gns3a

@@ -1,7 +1,7 @@
 {
     "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. ",
+    "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",
@@ -14,12 +14,12 @@
     "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}",
+    "port_name_format": "eth{port1}",
     "qemu": {
-        "cpus": 3,
         "adapter_type": "e1000",
         "adapters": 1,
         "ram": 8192,
+        "cpus": 3,
         "hda_disk_interface": "scsi",
         "arch": "x86_64",
         "console_type": "vnc",

gns3server/appliances/cisco-vWLC.gns3a

@@ -12,9 +12,9 @@
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
     "usage": "Starting vWLC will start an installation of vWLC onto a blank 8GB Drive.",
+    "symbol": ":/symbols/wlan_controller.svg",
     "first_port_name": "ServicePort",
     "port_name_format": "Management{port1}",
-    "symbol": ":/symbols/wlan_controller.svg",
     "qemu": {
         "adapter_type": "e1000",
         "adapters": 2,
@@ -26,27 +26,13 @@
         "kvm": "require",
         "options": ""
     },
-    "images": [    
+    "images": [
         {
-            "filename": "Cisco-vWLC-AIR-CTVM-7-3-101-0-file1.iso",
-            "version": "7.3.101.0",
-            "md5sum": "6bf17dceaf46e57aab0fb0d43eb6ea06",
-            "filesize": 157900800,
-            "download_url": "https://software.cisco.com/download/release.html?mdfid=284464214&flowid=&softwareid=280926587&release=7.3.101.0"
-        },
-        {
-            "filename": "AIR-CTVM-7-6-110-0-file1.iso",
-            "version": "7.6.110.0",
-            "md5sum": "7acbd88120f008a25d849b72b7207e92",
-            "filesize": 185561088,
-            "download_url": "https://software.cisco.com/download/release.html?mdfid=284464214&flowid=&softwareid=280926587&release=7.6.110.0"
-        },
-        {
-            "filename": "AIR-CTVM-k9-8-1-120.0.iso",
-            "version": "8.1.120.0",
-            "md5sum": "477363f88f07f64499bb4ab80ffa9d2f",
-            "filesize": 302104576,
-            "download_url": "https://software.cisco.com/download/release.html?mdfid=284464214&flowid=&softwareid=280926587&release=8.1.120.0"
+            "filename": "MFG_CTVM_8_3_102_0.iso",
+            "version": "8.3.102.0",
+            "md5sum": "7f6b7968b5bed04b5ecc119b6ba4e41c",
+            "filesize": 365996032,
+            "download_url": "https://software.cisco.com/download/release.html?mdfid=284464214&flowid=&softwareid=280926587&release=8.3.102.0"
         },
         {
             "filename": "MFG_CTVM_8_2_141_0.iso",
@@ -56,11 +42,25 @@
             "download_url": "https://software.cisco.com/download/release.html?mdfid=284464214&flowid=&softwareid=280926587&release=8.2.141.0"
         },
         {
-            "filename": "MFG_CTVM_8_3_102_0.iso",
-            "version": "8.3.102.0",
-            "md5sum": "7f6b7968b5bed04b5ecc119b6ba4e41c",
-            "filesize": 365996032,
-            "download_url": "https://software.cisco.com/download/release.html?mdfid=284464214&flowid=&softwareid=280926587&release=8.3.102.0"
+            "filename": "AIR-CTVM-k9-8-1-120.0.iso",
+            "version": "8.1.120.0",
+            "md5sum": "477363f88f07f64499bb4ab80ffa9d2f",
+            "filesize": 302104576,
+            "download_url": "https://software.cisco.com/download/release.html?mdfid=284464214&flowid=&softwareid=280926587&release=8.1.120.0"
+        },
+        {
+            "filename": "AIR-CTVM-7-6-110-0-file1.iso",
+            "version": "7.6.110.0",
+            "md5sum": "7acbd88120f008a25d849b72b7207e92",
+            "filesize": 185561088,
+            "download_url": "https://software.cisco.com/download/release.html?mdfid=284464214&flowid=&softwareid=280926587&release=7.6.110.0"
+        },
+        {
+            "filename": "Cisco-vWLC-AIR-CTVM-7-3-101-0-file1.iso",
+            "version": "7.3.101.0",
+            "md5sum": "6bf17dceaf46e57aab0fb0d43eb6ea06",
+            "filesize": 157900800,
+            "download_url": "https://software.cisco.com/download/release.html?mdfid=284464214&flowid=&softwareid=280926587&release=7.3.101.0"
         },
         {
             "filename": "empty8G.qcow2",
@@ -72,12 +72,11 @@
         }
     ],
     "versions": [
-
         {
-            "name": "8.1.120.0",
+            "name": "8.3.102.0",
             "images": {
                 "hda_disk_image": "empty8G.qcow2",
-                "cdrom_image": "AIR-CTVM-k9-8-1-120.0.iso"
+                "cdrom_image": "MFG_CTVM_8_3_102_0.iso"
             }
         },
         {
@@ -88,11 +87,25 @@
             }
         },
         {
-            "name": "8.3.102.0",
+            "name": "8.1.120.0",
             "images": {
                 "hda_disk_image": "empty8G.qcow2",
-                "cdrom_image": "MFG_CTVM_8_3_102_0.iso"
+                "cdrom_image": "AIR-CTVM-k9-8-1-120.0.iso"
             }
-        }     
+        },
+        {
+            "name": "7.6.110.0",
+            "images": {
+                "hda_disk_image": "empty8G.qcow2",
+                "cdrom_image": "AIR-CTVM-7-6-110-0-file1.iso"
+            }
+        },
+        {
+            "name": "7.3.101.0",
+            "images": {
+                "hda_disk_image": "empty8G.qcow2",
+                "cdrom_image": "Cisco-vWLC-AIR-CTVM-7-3-101-0-file1.iso"
+            }
+        }
     ]
 }

gns3server/appliances/cisco-wsav.gns3a

@@ -1,7 +1,7 @@
 {
     "name": "Web Security Virtual Appliance",
     "category": "firewall",
-    "description": "The Cisco WSA was one of the first secure web gateways to combine leading protections to help organizations address the growing challenges of securing and controlling web traffic. It enables simpler, faster deployment with fewer maintenance requirements, reduced latency, and lower operating costs. “Set and forget” technology frees staff after initial automated policy settings go live, and automatic security updates are pushed to network devices every 3 to 5 minutes. Flexible deployment options and integration with your existing security infrastructure help you meet quickly evolving security requirements.",
+    "description": "The Cisco WSA was one of the first secure web gateways to combine leading protections to help organizations address the growing challenges of securing and controlling web traffic. It enables simpler, faster deployment with fewer maintenance requirements, reduced latency, and lower operating costs. \"Set and forget\" technology frees staff after initial automated policy settings go live, and automatic security updates are pushed to network devices every 3 to 5 minutes. Flexible deployment options and integration with your existing security infrastructure help you meet quickly evolving security requirements.",
     "vendor_name": "Cisco",
     "vendor_url": "http://www.cisco.com/",
     "documentation_url": "http://www.cisco.com/c/en/us/support/security/web-security-appliance/tsd-products-support-series-home.html",

gns3server/appliances/citrix-netscaler-vpx.gns3a

@@ -1,7 +1,7 @@
 {
     "name": "NetScaler VPX",
     "category": "router",
-    "description": "Today’s enterprises face more demands than ever, from cloud computing to 24/7 availability to increasing security threats. NetScaler ADC, an advanced software-defined application delivery controller, is your networking power player. It provides outstanding delivery of business applications—to any device and any location—with unmatched security, superior L4-7 load balancing, reliable GSLB, and 100 percent uptime. In fact, NetScaler ADC offers up to five times the performance of our closest competitor. Plus our TriScale technology saves you money by allowing your network to scale up or down without additional hardware costs.",
+    "description": "Today's enterprises face more demands than ever, from cloud computing to 24/7 availability to increasing security threats. NetScaler ADC, an advanced software-defined application delivery controller, is your networking power player. It provides outstanding delivery of business applications-to any device and any location-with unmatched security, superior L4-7 load balancing, reliable GSLB, and 100 percent uptime. In fact, NetScaler ADC offers up to five times the performance of our closest competitor. Plus our TriScale technology saves you money by allowing your network to scale up or down without additional hardware costs.",
     "vendor_name": "Citrix",
     "vendor_url": "http://www.citrix.com/",
     "documentation_url": "https://www.citrix.com/products/netscaler-adc/support.html",

gns3server/appliances/cumulus-vx.gns3a

@@ -11,18 +11,35 @@
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
-    "usage": "Default username is cumulus and password is CumulusLinux!",
+    "usage": "Default username is cumulus and password is CumulusLinux! in version 4.1 and earlier, and cumulus in version 4.2 and later.",
     "first_port_name": "eth0",
     "port_name_format": "swp{port1}",
     "qemu": {
         "adapter_type": "virtio-net-pci",
         "adapters": 7,
-        "ram": 512,
+        "ram": 768,
+        "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "cumulus-linux-4.3.0-vx-amd64-qemu.qcow2",
+            "version": "4.3.0",
+            "md5sum": "aba2f0bb462b26a208afb6202bc97d51",
+            "filesize": 2819325952,
+            "download_url": "https://cumulusnetworks.com/cumulus-vx/download/",
+            "direct_download_url": "https://d2cd9e7ca6hntp.cloudfront.net/public/CumulusLinux-4.3.0/cumulus-linux-4.3.0-vx-amd64-qemu.qcow2"
+        },
+        {
+            "filename": "cumulus-linux-4.2.0-vx-amd64-qemu.qcow2",
+            "version": "4.2.0",
+            "md5sum": "b746616189a7d5cc69de4015e5c8b1d4",
+            "filesize": 2322137088,
+            "download_url": "https://cumulusnetworks.com/cumulus-vx/download/",
+            "direct_download_url": "https://d2cd9e7ca6hntp.cloudfront.net/public/CumulusLinux-4.2.0/cumulus-linux-4.2.0-vx-amd64-qemu.qcow2"
+        },
         {
             "filename": "cumulus-linux-3.7.10-vx-amd64-qemu.qcow2",
             "version": "3.7.10",
@@ -213,48 +230,60 @@
         }
     ],
     "versions": [
+        {
+            "name": "4.3.0",
+            "images": {
+                "hda_disk_image": "cumulus-linux-4.3.0-vx-amd64-qemu.qcow2"
+            }
+        },
+        {
+            "name": "4.2.0",
+            "images": {
+                "hda_disk_image": "cumulus-linux-4.2.0-vx-amd64-qemu.qcow2"
+            }
+        },
         {
             "name": "3.7.10",
             "images": {
                 "hda_disk_image": "cumulus-linux-3.7.10-vx-amd64-qemu.qcow2"
             }
-        }, 
+        },
         {
             "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": {

gns3server/appliances/danos.gns3a

@@ -1,7 +1,7 @@
 {
     "name": "DANOS",
     "category": "router",
-    "description": "The Disaggregated Network Operating System (DANOS) project enables community collaboration across network hardware, forwarding, and operating system layers. DANOS is initially based on AT&T’s “dNOS” software framework of a more open, cost-effective and flexible alternative to traditional networking equipment. As part of The Linux Foundation, it now incorporates contributions from complementary open source communities in building a standardized distributed Network Operating System (NOS) to speed the adoption and use of white boxes in a service provider’s infrastructure.",
+    "description": "The Disaggregated Network Operating System (DANOS) project enables community collaboration across network hardware, forwarding, and operating system layers. DANOS is initially based on AT&T's \"dNOS\" software framework of a more open, cost-effective and flexible alternative to traditional networking equipment. As part of The Linux Foundation, it now incorporates contributions from complementary open source communities in building a standardized distributed Network Operating System (NOS) to speed the adoption and use of white boxes in a service provider's infrastructure.",
     "vendor_name": "Linux",
     "vendor_url": "https://www.danosproject.org/",
     "documentation_url": "https://danosproject.atlassian.net/wiki/spaces/DAN/pages/753667/DANOS+1908",
@@ -9,30 +9,31 @@
     "product_url": "https://www.danosproject.org/",
     "registry_version": 4,
     "status": "stable",
-    "symbol": ":/symbols/affinity/circle/gray/router_cloud.svg",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
-    "usage": "Default username/password is vyatta/vyatta.  DANOS will live boot and drop into a shell. DANOS can then be installed inside the VM by typing install image.  Defaults to using a telnet console, but the vnc console can provide additional help if it's not booting.",
-    "port_name_format": "dp0p{1}s{0}",
+    "usage": "Default username / password is tmpuser / tmppwd.  DANOS will live boot and drop into a shell. DANOS can then be installed inside the VM by typing install image.  Defaults to using a telnet console, but the vnc console can provide additional help if it's not booting.",
+    "symbol": ":/symbols/affinity/circle/gray/router_cloud.svg",
+    "port_name_format": "dp0s{3}",
     "qemu": {
-        "cpus": 2,
         "adapter_type": "virtio-net-pci",
-        "adapters": 3,
+        "adapters": 8,
         "ram": 4096,
+        "cpus": 4,
+        "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "telnet",
-        "boot_priority": "dc",
-        "kvm": "allow",
+        "boot_priority": "cd",
+        "kvm": "require",
         "options": "-cpu host"
     },
     "images": [
         {
-            "filename": "danos-1908-amd64-vrouter.iso",
-            "version": "1908",
-            "md5sum": "e850b6aa2859de1075c11b9149fa50f4",
-            "filesize": 409993216,
-            "download_url": "https://danosproject.atlassian.net/wiki/spaces/DAN/pages/753667/DANOS+1908",
-            "direct_download_url": "http://repos.danosproject.org.s3-website-us-west-1.amazonaws.com/images/danos-1908-amd64-vrouter.iso"
+            "filename": "danos-2012-base-amd64.iso",
+            "version": "2012",
+            "md5sum": "fb7a60dc9afecdb274464832b3ab1ccb",
+            "filesize": 441450496,
+            "download_url": "https://danosproject.atlassian.net/wiki/spaces/DAN/pages/892141595/DANOS+2012",
+            "direct_download_url": "https://s3-us-west-1.amazonaws.com/2012.repos.danosproject.org/2012/iso/danos-2012-base-amd64.iso"
         },
         {
             "filename": "empty8G.qcow2",
@@ -45,10 +46,10 @@
     ],
     "versions": [
         {
-            "name": "danos-1908-amd64-vrouter",
+            "name": "2012",
             "images": {
                 "hda_disk_image": "empty8G.qcow2",
-                "cdrom_image": "danos-1908-amd64-vrouter.iso"
+                "cdrom_image": "danos-2012-base-amd64.iso"
             }
         }
     ]

gns3server/appliances/debian10-min.gns3a

@@ -0,0 +1,44 @@
+{
+    "name": "Debian 10 Minimal",
+    "category": "guest",
+    "description": "Debian 10 Custom, with automatic disk resize and ssh/nmap",
+    "vendor_name": "Debian",
+    "vendor_url": "https://debian.org",
+    "documentation_url": "https://wiki.debian.org",
+    "product_name": "Debian",
+    "product_url": "https://debian.org",
+    "registry_version": 3,
+    "status": "stable",
+    "maintainer": "Ramiro Magallanes",
+    "maintainer_email": "ramiro@gnubit.com",
+    "usage": "Username: root\nPassword: debian | MD5: 860d5051877bf4246eabc0bcb391b9a1",
+    "port_name_format": "enp1s{0}",
+    "qemu": {
+        "adapter_type": "virtio-net-pci",
+        "adapters": 1,
+        "ram": 2048,
+        "hda_disk_interface": "virtio",
+        "arch": "x86_64",
+        "console_type": "vnc",
+        "boot_priority": "c",
+        "kvm": "require",
+        "options": "-vga virtio"
+    },
+    "images": [
+        {
+            "filename": "debian10-gns3.qcow2",
+            "version": "10.2.0",
+            "md5sum": "860d5051877bf4246eabc0bcb391b9a1",
+            "filesize": 2685009920,
+            "download_url": "https://downloads.gnubit.com/gns3-deb10-min/"
+        }
+    ],
+    "versions": [
+        {
+            "name": "10.2.0",
+            "images": {
+                "hda_disk_image": "debian10-gns3.qcow2"
+            }
+        }
+    ]
+}

gns3server/appliances/deft-linux.gns3a

@@ -1,7 +1,7 @@
 {
     "name": "DEFT Linux",
     "category": "guest",
-    "description": "DEFT (acronym for Digital Evidence & Forensics Toolkit) is a distribution made for Computer Forensics, with the purpose of running live on systems without tampering or corrupting devices (hard disks, pendrives, etc…) connected to the PC where the boot process takes place.\nThe DEFT system is based on GNU Linux, it can run live (via DVDROM or USB pendrive), installed or run as a Virtual Appliance on VMware or Virtualbox. DEFT employs LXDE as desktop environment and WINE for executing Windows tools under Linux. It features a comfortable mount manager for device management.\nDEFT is paired with DART (acronym for Digital Advanced Response Toolkit), a Forensics System which can be run on Windows and contains the best tools for Forensics and Incident Response. DART features a GUI with logging and integrity check for the instruments here contained.\nBesides all this, the DEFT staff is devoted to implementing and developing applications which are released to Law Enforcement Officers, such as Autopsy 3 for Linux.",
+    "description": "DEFT (acronym for Digital Evidence & Forensics Toolkit) is a distribution made for Computer Forensics, with the purpose of running live on systems without tampering or corrupting devices (hard disks, pendrives, etc...) connected to the PC where the boot process takes place.\nThe DEFT system is based on GNU Linux, it can run live (via DVDROM or USB pendrive), installed or run as a Virtual Appliance on VMware or Virtualbox. DEFT employs LXDE as desktop environment and WINE for executing Windows tools under Linux. It features a comfortable mount manager for device management.\nDEFT is paired with DART (acronym for Digital Advanced Response Toolkit), a Forensics System which can be run on Windows and contains the best tools for Forensics and Incident Response. DART features a GUI with logging and integrity check for the instruments here contained.\nBesides all this, the DEFT staff is devoted to implementing and developing applications which are released to Law Enforcement Officers, such as Autopsy 3 for Linux.",
     "vendor_name": "DEFT Association",
     "vendor_url": "http://www.deftlinux.net/",
     "documentation_url": "http://www.deftlinux.net/deft-manual/",

gns3server/appliances/dns.gns3a

@@ -9,8 +9,8 @@
     "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",
+    "symbol": "linux_guest.svg",
     "docker": {
         "adapters": 1,
         "image": "adosztal/dns:latest",

gns3server/appliances/exos.gns3a

@@ -25,69 +25,116 @@
         "kvm": "allow",
         "options": "-cpu core2duo"
     },
-    
     "images": [
-
-		{
+        {
+            "filename": "EXOS-VM_v31.1.1.3.qcow2",
+            "version": "31.1.1.3",
+            "md5sum": "e4936ad94a5304bfeeca8dfc6f285cc0",
+            "filesize": 561512448,
+            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v31.1.1.3.qcow2"
+        },
+        {
+            "filename": "EXOS-VM_v30.7.1.1.qcow2",
+            "version": "30.7.1.1",
+            "md5sum": "c6b67023945102f984b47aa67c67fe33",
+            "filesize": 485687296,
+            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v30.7.1.1.qcow2"
+        },
+        {
+            "filename": "EXOS-VM_v30.6.1.11.qcow2",
+            "version": "30.6.1.11",
+            "md5sum": "bf3e13570417d7e3464165b344c196eb",
+            "filesize": 475332608,
+            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v30.6.1.11.qcow2"
+        },
+        {
+            "filename": "EXOS-VM_v30.5.1.15.qcow2",
+            "version": "30.5.1.15",
+            "md5sum": "380d0c7bb8f0aa272ceb84b85f367a63",
+            "filesize": 498663424,
+            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v30.5.1.15.qcow2"
+        },
+        {
             "filename": "EXOS-VM_v30.4.1.2.qcow2",
             "version": "30.4.1.2",
             "md5sum": "133fa38bf80daec9e389729c96e692c0",
             "filesize": 454557696,
             "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v30.4.1.2.qcow2"
         },
-		{
+        {
             "filename": "EXOS-VM_v30.3.1.6.qcow2",
             "version": "30.3.1.6",
             "md5sum": "edb86b406efe99434c6d5366d9bfa97f",
             "filesize": 448266240,
             "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v30.3.1.6.qcow2"
         },
-		{
+        {
             "filename": "EXOS-VM_v30.2.1.8.qcow2",
             "version": "30.2.1.8",
             "md5sum": "4bdbf3ddff7a030e19c6bb71270b56d2",
             "filesize": 355205120,
             "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v30.2.1.8.qcow2"
         },
-		{
+        {
             "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.7.1.2.qcow2",
             "version": "22.7.1.2",
             "md5sum": "a13e839b3fa05e8a5b0fb31f7e3dda86",
             "filesize": 180420608,
             "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v22.7.1.2.qcow2"
         },
-		{
+        {
             "filename": "EXOS-VM_v21.1.1.4-disk1.qcow2",
             "version": "21.1.1.4",
             "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": "31.1.1.3",
+            "images": {
+                "hda_disk_image": "EXOS-VM_v31.1.1.3.qcow2"
+            }
+        },
+        {
+            "name": "30.7.1.1",
+            "images": {
+                "hda_disk_image": "EXOS-VM_v30.7.1.1.qcow2"
+            }
+        },
+        {
+            "name": "30.6.1.11",
+            "images": {
+                "hda_disk_image": "EXOS-VM_v30.6.1.11.qcow2"
+            }
+        },
+        {
+            "name": "30.5.1.15",
+            "images": {
+                "hda_disk_image": "EXOS-VM_v30.5.1.15.qcow2"
+            }
+        },
         {
             "name": "30.4.1.2",
             "images": {
                 "hda_disk_image": "EXOS-VM_v30.4.1.2.qcow2"
             }
         },
-		{
+        {
             "name": "30.3.1.6",
             "images": {
                 "hda_disk_image": "EXOS-VM_v30.3.1.6.qcow2"
             }
         },
-		{
+        {
             "name": "30.2.1.8",
             "images": {
                 "hda_disk_image": "EXOS-VM_v30.2.1.8.qcow2"
@@ -99,12 +146,12 @@
                 "hda_disk_image": "EXOS-VM_v30.1.1.4.qcow2"
             }
         },
-		{
+        {
             "name": "22.7.1.2",
             "images": {
                 "hda_disk_image": "EXOS-VM_v22.7.1.2.qcow2"
             }
-		},
+        },
         {
             "name": "21.1.1.4",
             "images": {

gns3server/appliances/extreme-networks-voss.gns3a

@@ -14,8 +14,7 @@
     "symbol": ":/symbols/multilayer_switch.svg",
     "first_port_name": "Mgmt",
     "port_name_format": "1/{port1}",
-    "qemu":
-    {
+    "qemu": {
         "adapter_type": "e1000",
         "adapters": 9,
         "ram": 2048,
@@ -26,54 +25,99 @@
         "kvm": "allow",
         "options": "-nographic"
     },
-
-    "images":
-    [
+    "images": [
+        {
+            "filename": "VOSSGNS3.8.4.0.0.qcow2",
+            "version": "v8.4.0.0",
+            "md5sum": "f457e7da3c1dec50670624c421333ef3",
+            "filesize": 386203648,
+            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_VOSS/VOSSGNS3.8.4.0.0.qcow2"
+        },
+        {
+            "filename": "VOSSGNS3.8.3.0.0.qcow2",
+            "version": "v8.3.0.0",
+            "md5sum": "e1c789e439c5951728e349cf44690230",
+            "filesize": 384696320,
+            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_VOSS/VOSSGNS3.8.3.0.0.qcow2"
+        },
+        {
+            "filename": "VOSSGNS3.8.2.0.0.qcow2",
+            "version": "v8.2.0.0",
+            "md5sum": "9a0cd77c08644abbf3a69771c125c011",
+            "filesize": 331808768,
+            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_VOSS/VOSSGNS3.8.2.0.0.qcow2"
+        },
+        {
+            "filename": "VOSSGNS3.8.1.5.0.qcow2",
+            "version": "8.1.5.0",
+            "md5sum": "dff95f67fc04f82f627209ff7b7b3860",
+            "filesize": 331087872,
+            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_VOSS/VOSSGNS3.8.1.5.0.qcow2"
+        },
         {
             "filename": "VOSSGNS3.8.1.0.0.qcow2",
-            "version": "v8.1.0.0",
+            "version": "8.1.0.0",
             "md5sum": "6b46fd54999a4cd2369440809ccc5099",
             "filesize": 311820288,
-			"direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_VOSS/VOSSGNS3.8.1.0.0.qcow2"
+            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_VOSS/VOSSGNS3.8.1.0.0.qcow2"
         },
-		{
+        {
             "filename": "VOSSGNS3.7.1.0.0.qcow2",
-            "version": "voss_7.1.0.0",
+            "version": "7.1.0.0",
             "md5sum": "7bb2974efe1a1ab857debd9fa894dbe7",
             "filesize": 193724416,
-            "direct_download_url": "https://stackingtool.extremenetworks.com/github/VOSSGNS3.7.1.0.0.qcow2"
+            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_VOSS/VOSSGNS3.7.1.0.0.qcow2"
         },
-		{
+        {
             "filename": "VOSSGNS3.7.0.0.0.img",
-            "version": "voss_7.0.0.0",
+            "version": "7.0.0.0",
             "md5sum": "65fe97461156aa88c836a90be1287649",
             "filesize": 419430400,
-            "direct_download_url": "https://stackingtool.extremenetworks.com/github/VOSSGNS3.7.0.0.0.img"
-    	}
+            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_VOSS/VOSSGNS3.7.0.0.0.img"
+        }
     ],
-
-    "versions":
-    [
+    "versions": [
         {
-            "name": "v8.1.0.0",
-            "images":
-            {
+            "name": "v8.4.0.0",
+            "images": {
+                "hda_disk_image": "VOSSGNS3.8.4.0.0.qcow2"
+            }
+        },
+        {
+            "name": "v8.3.0.0",
+            "images": {
+                "hda_disk_image": "VOSSGNS3.8.3.0.0.qcow2"
+            }
+        },
+        {
+            "name": "v8.2.0.0",
+            "images": {
+                "hda_disk_image": "VOSSGNS3.8.2.0.0.qcow2"
+            }
+        },
+        {
+            "name": "8.1.5.0",
+            "images": {
+                "hda_disk_image": "VOSSGNS3.8.1.5.0.qcow2"
+            }
+        },
+        {
+            "name": "8.1.0.0",
+            "images": {
                 "hda_disk_image": "VOSSGNS3.8.1.0.0.qcow2"
             }
         },
-		{
+        {
             "name": "7.1.0.0",
-            "images":
-            {
+            "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"
-        	}
+            }
         }
     ]
-
 }

gns3server/appliances/f5-bigip.gns3a

@@ -27,6 +27,20 @@
         "options": "-smp 2 -cpu host"
     },
     "images": [
+        {
+            "filename": "BIGIP-16.0.0.1-0.0.3.qcow2",
+            "version": "16.0.0.1",
+            "md5sum": "f153120d46e84c018c8ff78c6c7164bc",
+            "filesize": 5393088512,
+            "download_url": "https://downloads.f5.com/esd/serveDownload.jsp?path=/big-ip/big-ip_v16.x/16.0.0/english/16.0.0.1_virtual-edition/&sw=BIG-IP&pro=big-ip_v16.x&ver=16.0.0&container=16.0.0.1_Virtual-Edition&file=BIGIP-16.0.0.1-0.0.3.ALL.qcow2.zip"
+        },
+        {
+            "filename": "BIGIP-16.0.0-0.0.12.qcow2",
+            "version": "16.0.0",
+            "md5sum": "c49cd2513e386f3259eb0ee6fe3bb502",
+            "filesize": 5344722944,
+            "download_url": "https://downloads.f5.com/esd/serveDownload.jsp?path=/big-ip/big-ip_v16.x/16.0.0/english/16.0.0_virtual-edition/&sw=BIG-IP&pro=big-ip_v16.x&ver=16.0.0&container=16.0.0_Virtual-Edition&file=BIGIP-16.0.0-0.0.12.ALL.qcow2.zip"
+        },
         {
             "filename": "BIGIP-15.1.0.2-0.0.9.qcow2",
             "version": "15.1.0.2",
@@ -163,6 +177,20 @@
         }
     ],
     "versions": [
+        {
+            "name": "16.0.0.1",
+            "images": {
+                "hda_disk_image": "BIGIP-16.0.0.1-0.0.3.qcow2",
+                "hdb_disk_image": "empty100G.qcow2"
+            }
+        },
+        {
+            "name": "16.0.0",
+            "images": {
+                "hda_disk_image": "BIGIP-16.0.0-0.0.12.qcow2",
+                "hdb_disk_image": "empty100G.qcow2"
+            }
+        },
         {
             "name": "15.1.0.2",
             "images": {

gns3server/appliances/f5-bigiq.gns3a

@@ -12,9 +12,9 @@
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
     "usage": "Console credentials: root/default\nWebUI credentials: admin/admin\nThe boot process might take a few minutes without providing any output to the console. Please be patient (or set console to vnc to see tty outputs).",
+    "symbol": "mgmt_station.svg",
     "first_port_name": "mgmt",
     "port_name_format": "1.{port1}",
-    "symbol": "mgmt_station.svg",
     "qemu": {
         "adapter_type": "virtio-net-pci",
         "adapters": 2,

gns3server/appliances/firefox.gns3a

@@ -16,6 +16,7 @@
         "adapter_type": "e1000",
         "adapters": 1,
         "ram": 256,
+        "hda_disk_interface": "ide",
         "arch": "i386",
         "console_type": "vnc",
         "kvm": "allow",

gns3server/appliances/fortiadc-manager.gns3a

@@ -12,8 +12,8 @@
     "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",
+    "port_name_format": "Port{port1}",
     "qemu": {
         "adapter_type": "virtio-net-pci",
         "adapters": 10,

gns3server/appliances/fortiadc.gns3a

@@ -12,9 +12,8 @@
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
     "usage": "Default username is admin, no password is set. Silent boot, it might take a while.",
-    "symbol": "loadbalancer.svg",
-    "port_name_format": "Port{port1}",
     "symbol": "fortinet.svg",
+    "port_name_format": "Port{port1}",
     "qemu": {
         "adapter_type": "virtio-net-pci",
         "adapters": 10,
@@ -235,14 +234,14 @@
         {
             "name": "5.0.1",
             "images": {
-                "hda_disk_image": "FAD_KVM-V400-build0989-FORTINET.out.kvm-boot.qcow2",
+                "hda_disk_image": "FAD_KVM-V500-build0056-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",
+                "hda_disk_image": "FAD_KVM-V500-build0045-FORTINET.out.kvm-boot.qcow2",
                 "hdb_disk_image": "FAD_KVM-FORTINET.out.kvm-data.qcow2"
             }
         },

gns3server/appliances/fortianalyzer.gns3a

@@ -12,12 +12,12 @@
     "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",
+    "port_name_format": "Port{port1}",
     "qemu": {
         "adapter_type": "e1000",
         "adapters": 4,
-        "ram": 1024,
+        "ram": 4096,
         "hda_disk_interface": "virtio",
         "hdb_disk_interface": "virtio",
         "arch": "x86_64",
@@ -26,6 +26,13 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "FAZ_VM64_KVM-v6-build2288-FORTINET.out.kvm.qcow2",
+            "version": "6.4.5",
+            "md5sum": "e220b48c6e86f8ddc660d578295051a9",
+            "filesize": 152698880,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FAZ_VM64_KVM-v6-build1183-FORTINET.out.kvm.qcow2",
             "version": "6.2.2",
@@ -169,6 +176,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "6.4.5",
+            "images": {
+                "hda_disk_image": "FAZ_VM64_KVM-v6-build2288-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "6.2.2",
             "images": {

gns3server/appliances/fortiauthenticator.gns3a

@@ -12,8 +12,8 @@
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
     "usage": "Default username is admin, no password is set. First book takes longer.",
-    "port_name_format": "Port{port1}",
     "symbol": "fortinet.svg",
+    "port_name_format": "Port{port1}",
     "qemu": {
         "adapter_type": "e1000",
         "adapters": 4,

gns3server/appliances/forticache.gns3a

@@ -12,8 +12,8 @@
     "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",
+    "port_name_format": "Port{port1}",
     "qemu": {
         "adapter_type": "e1000",
         "adapters": 3,

gns3server/appliances/fortigate.gns3a

@@ -12,8 +12,8 @@
     "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",
+    "port_name_format": "Port{port1}",
     "qemu": {
         "adapter_type": "e1000",
         "adapters": 10,
@@ -26,19 +26,28 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "FGT_VM64_KVM-v6-build1828-FORTINET.out.kvm.qcow2",
+            "version": "6.4.5",
+            "md5sum": "dc064e16fa65461183544d8ddb5d19d9",
+            "filesize": 36175872,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FGT_VM64_KVM-v6-build1010-FORTINET.out.kvm.qcow2",
             "version": "6.2.2",
             "md5sum": "da411e21e4c0bc25553d0e72201af7a4",
             "filesize": 58916864,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
-        },{
+        },
+        {
             "filename": "FGT_VM64_KVM-v6-build0932-FORTINET.out.kvm.qcow2",
             "version": "6.2.1",
             "md5sum": "725d41460ed1858dc905dbe2846a8400",
             "filesize": 58785792,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
-        },{
+        },
+        {
             "filename": "FGT_VM64_KVM-v6-build0866-FORTINET.out.kvm.qcow2",
             "version": "6.2.0",
             "md5sum": "588df9ba0db485976f6681810001ae73",
@@ -244,6 +253,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "6.4.5",
+            "images": {
+                "hda_disk_image": "FGT_VM64_KVM-v6-build1828-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "6.2.2",
             "images": {

gns3server/appliances/fortimail.gns3a

@@ -12,8 +12,8 @@
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
     "usage": "First boot takes a few minutes. Admin URL is https://x.x.x.x/admin, default username is admin, no password is set.",
-    "port_name_format": "Port{port1}",
     "symbol": "fortinet.svg",
+    "port_name_format": "Port{port1}",
     "qemu": {
         "adapter_type": "virtio-net-pci",
         "adapters": 4,

gns3server/appliances/fortimanager.gns3a

@@ -12,12 +12,12 @@
     "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",
+    "port_name_format": "Port{port1}",
     "qemu": {
         "adapter_type": "virtio-net-pci",
         "adapters": 4,
-        "ram": 1024,
+        "ram": 2048,
         "hda_disk_interface": "virtio",
         "hdb_disk_interface": "virtio",
         "arch": "x86_64",
@@ -26,6 +26,20 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "FMG_VM64_KVM-v6-build2288-FORTINET.out.kvm.qcow2",
+            "version": "6.4.5",
+            "md5sum": "bd2791984b03f55a6825297e83c6576a",
+            "filesize": 117014528,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
+        {
+            "filename": "FMG_VM64_KVM-v6-build2253-FORTINET.out.kvm.qcow2",
+            "version": "6.4.4",
+            "md5sum": "3554a47fde2dc91d17eec16fd0dc10a3",
+            "filesize": 116621312,
+            "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
+        },
         {
             "filename": "FMG_VM64_KVM-v6-build1183-FORTINET.out.kvm.qcow2",
             "version": "6.2.2",
@@ -162,6 +176,20 @@
         }
     ],
     "versions": [
+        {
+            "name": "6.4.5",
+            "images": {
+                "hda_disk_image": "FMG_VM64_KVM-v6-build2288-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
+        {
+            "name": "6.4.4",
+            "images": {
+                "hda_disk_image": "FMG_VM64_KVM-v6-build2253-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "6.2.2",
             "images": {
@@ -183,6 +211,13 @@
                 "hdb_disk_image": "empty30G.qcow2"
             }
         },
+        {
+            "name": "6.0.3",
+            "images": {
+                "hda_disk_image": "FMG_VM64_KVM-v6-build0255-FORTINET.out.kvm.qcow2",
+                "hdb_disk_image": "empty30G.qcow2"
+            }
+        },
         {
             "name": "6.0.2",
             "images": {

gns3server/appliances/fortiproxy.gns3a

@@ -12,8 +12,8 @@
     "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",
+    "port_name_format": "Port{port1}",
     "qemu": {
         "adapter_type": "virtio-net-pci",
         "adapters": 10,

gns3server/appliances/fortirecorder.gns3a

@@ -12,8 +12,8 @@
     "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",
+    "port_name_format": "Port{port1}",
     "qemu": {
         "adapter_type": "virtio-net-pci",
         "adapters": 10,

gns3server/appliances/fortisandbox.gns3a

@@ -12,8 +12,8 @@
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
     "usage": "First boot will take some time without console output. Default username is admin, no password is set.",
-    "port_name_format": "Port{port1}",
     "symbol": "fortinet.svg",
+    "port_name_format": "Port{port1}",
     "qemu": {
         "adapter_type": "virtio-net-pci",
         "adapters": 3,

gns3server/appliances/fortisiem-super_worker.gns3a

@@ -12,8 +12,8 @@
     "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.\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",
+    "port_name_format": "Port{port1}",
     "qemu": {
         "adapter_type": "virtio-net-pci",
         "adapters": 2,

gns3server/appliances/fortiweb.gns3a

@@ -12,8 +12,8 @@
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
     "usage": "Default username is admin, no password is set. Console keeps sending 'access uuid file failed, error number 2' messages; ignore it.",
-    "port_name_format": "Port{port1}",
     "symbol": "fortinet.svg",
+    "port_name_format": "Port{port1}",
     "qemu": {
         "adapter_type": "virtio-net-pci",
         "adapters": 4,
@@ -118,7 +118,6 @@
             "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
             "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
         }
-
     ],
     "versions": [
         {

gns3server/appliances/freeRouter.gns3a

@@ -0,0 +1,43 @@
+{
+    "name": "freeRouter",
+    "category": "router",
+    "description": "networking swiss army knife - it speaks routing protocols, and (re)encapsulates packets on interfaces",
+    "vendor_name": "freeRouter",
+    "vendor_url": "http://freerouter.nop.hu/",
+    "documentation_url": "http://freerouter.nop.hu/",
+    "product_name": "freeRouter",
+    "product_url": "http://freerouter.nop.hu/",
+    "registry_version": 3,
+    "status": "stable",
+    "maintainer": "GNS3 Team",
+    "maintainer_email": "developers@gns3.net",
+    "usage": "There is no default password and enable password. A default configuration is present.",
+    "port_name_format": "ethernet{port1}",
+    "qemu": {
+        "adapter_type": "e1000",
+        "adapters": 8,
+        "ram": 2048,
+        "hda_disk_interface": "ide",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "kvm": "require"
+    },
+    "images": [
+        {
+            "filename": "rtr.qcow2",
+            "version": "20.7.1",
+            "md5sum": "4707415d15d20ced92423d90e52eedcd",
+            "filesize": 254767616,
+            "download_url": "http://freerouter.nop.hu/",
+            "direct_download_url": "http://dl.nop.hu/rtr.qcow2"
+        }
+    ],
+    "versions": [
+        {
+            "name": "20.7.1",
+            "images": {
+                "hda_disk_image": "rtr.qcow2"
+            }
+        }
+    ]
+}

gns3server/appliances/frr.gns3a

@@ -1,41 +1,54 @@
 {
     "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.",
+    "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 of FRR.",
     "vendor_name": "FRRouting Project",
     "vendor_url": "https://frrouting.org",
     "product_name": "FRR",
     "registry_version": 3,
     "status": "stable",
-    "maintainer": "Andras Dosztal",
+    "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
-    "usage": "Credentials: frradmin / frr\nIf you exit from the router CLI, you can get back by typing 'vtysh' to the console.",
-    "port_name_format": "ens{port3}",
+    "usage": "Credentials: root / root\nIf you exit from the router CLI, you can get back by typing 'vtysh' to the console.",
+    "port_name_format": "eth{0}",
     "qemu": {
-        "adapter_type": "virtio-net-pci",
+        "adapter_type": "e1000",
         "adapters": 8,
-        "ram": 512,
-        "hda_disk_interface": "virtio",
+        "ram": 256,
+        "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "telnet",
-        "kvm": "require"
+        "kvm": "allow"
     },
     "images": [
         {
-            "filename": "frr7.1-vm0.4.qcow2",
-            "version": "7.1 - VM0.4",
-            "md5sum": "08390f257203126e5edffb9710e47974",
-            "filesize": 2051801088,
-            "download_url": "https://sourceforge.net/projects/frr/files/",
-            "direct_download_url": "https://sourceforge.net/projects/frr/files/frr7.1-vm0.4.qcow2.bz2/download",
-            "compression": "bzip2"
+            "filename": "frr-7.5.1.qcow2",
+            "version": "7.5.1",
+            "md5sum": "4b3ca0932a396b282ba35f102be1ed3b",
+            "filesize": 51169280,
+            "download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/",
+            "direct_download_url": "http://downloads.sourceforge.net/project/gns-3/Qemu%20Appliances/frr-7.5.1.qcow2"
+        },
+        {
+            "filename": "frr-7.3.1.qcow2",
+            "version": "7.3.1",
+            "md5sum": "e6bd9591a5c630bfe2c8688dc043b20b",
+            "filesize": 47348224,
+            "download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/",
+            "direct_download_url": "http://downloads.sourceforge.net/project/gns-3/Qemu%20Appliances/frr-7.3.1.qcow2"
         }
     ],
     "versions": [
         {
-            "name": "7.1 - VM0.4",
+            "name": "7.5.1",
             "images": {
-                "hda_disk_image": "frr7.1-vm0.4.qcow2"
+                "hda_disk_image": "frr-7.5.1.qcow2"
+            }
+        },
+        {
+            "name": "7.3.1",
+            "images": {
+                "hda_disk_image": "frr-7.3.1.qcow2"
             }
         }
     ]

gns3server/appliances/hp-vsr1001.gns3a

@@ -15,8 +15,8 @@
     "qemu": {
         "adapter_type": "virtio-net-pci",
         "adapters": 16,
-        "hda_disk_interface": "virtio",
         "ram": 1024,
+        "hda_disk_interface": "virtio",
         "arch": "x86_64",
         "console_type": "vnc",
         "boot_priority": "c",

gns3server/appliances/huawei-ar1kv.gns3a

@@ -0,0 +1,44 @@
+{
+    "name": "HuaWei AR1000v",
+    "category": "router",
+    "description": "Huawei AR1000V Virtual Router (Virtual CPE, vCPE) is an NFV product based on the industry-leading Huawei VRP platform. The product has rich business capabilities, integrating routing, switching, security, VPN, QoS and other functions, with software and hardware decoupling, Features such as easy business deployment and intelligent operation and maintenance can be applied to scenarios such as enterprise interconnection (SD-WAN) corporate headquarters (Hub point), POP point access, and cloud access.",
+    "vendor_name": "HuaWei",
+    "vendor_url": "https://www.huawei.com",
+    "product_name": "HuaWei AR1000v",
+    "product_url": "https://support.huawei.com/enterprise/en/routers/ar1000v-pid-21768212",
+    "registry_version": 4,
+    "status": "experimental",
+    "availability": "service-contract",
+    "maintainer": "none",
+    "maintainer_email": "none",
+    "usage": "Default user is super, default password is super.",
+    "port_name_format": "GigabitEthernet0/0/{0}",
+    "qemu": {
+        "adapter_type": "virtio-net-pci",
+        "adapters": 6,
+        "ram": 4096,
+        "cpus": 1,
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "boot_priority": "cd",
+        "kvm": "require",
+        "options": "-machine type=pc,accel=kvm -vga std -usbdevice tablet -cpu host"
+    },
+    "images": [
+        {
+            "filename": "ar1k-V300R019C00SPC300.qcow2",
+            "version": "V300R019C00SPC300",
+            "md5sum": "5263e1d8964643a22c87f59ff14a5bdc",
+            "filesize": 534904832,
+            "download_url": "https://support.huawei.com/enterprise/en/routers/ar1000v-pid-21768212/software"
+        }
+    ],
+    "versions": [
+        {
+            "name": "V300R019C00SPC300",
+            "images": {
+                "hda_disk_image": "ar1k-V300R019C00SPC300.qcow2"
+            }
+        }
+    ]
+}

gns3server/appliances/huawei-ce12800.gns3a

@@ -0,0 +1,42 @@
+{
+    "name": "HuaWei CE12800",
+    "category": "multilayer_switch",
+    "description": "CE12800 series switches are high-performance core switches designed for data center networks and high-end campus networks. The switches provide stable, reliable, secure, and high-performance Layer 2/Layer 3 switching services, to help build an elastic, virtualized, agile, and high-quality network.",
+    "vendor_name": "HuaWei",
+    "vendor_url": "https://www.huawei.com",
+    "product_name": "HuaWei CE12800",
+    "registry_version": 4,
+    "status": "experimental",
+    "availability": "service-contract",
+    "maintainer": "none",
+    "maintainer_email": "none",
+    "port_name_format": "GE1/0/{0}",
+    "qemu": {
+        "adapter_type": "e1000",
+        "adapters": 12,
+        "ram": 2048,
+        "cpus": 2,
+        "hda_disk_interface": "ide",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "kvm": "require",
+        "options": "-machine type=pc-1.0,accel=kvm -serial mon:stdio -nographic -nodefaults -rtc base=utc -cpu host"
+    },
+    "images": [
+        {
+            "filename": "ce12800-V200R005C10SPC607B607.qcow2",
+            "version": "V200R005C10SPC607B607",
+            "md5sum": "a6f2b358b299e2b5f0da2820ef315368",
+            "filesize": 707002368,
+            "download_url": "https://support.huawei.com/enterprise/en/switches/cloudengine-12800-pid-7542409/software"
+        }
+    ],
+    "versions": [
+        {
+            "name": "V200R005C10SPC607B607",
+            "images": {
+                "hda_disk_image": "ce12800-V200R005C10SPC607B607.qcow2"
+            }
+        }
+    ]
+}

gns3server/appliances/huawei-ne40e.gns3a

@@ -0,0 +1,44 @@
+{
+    "name": "HuaWei NE40E",
+    "category": "router",
+    "description": "Based on a 2T platform, the NetEngine 40E-X series provides the industry\u2019s highest capacity 2T routing line cards. Combining performance with low power consumption, innovative Internet Protocol (IP) hard pipe technology, and quick evolution capabilities, NetEngine 40E-X routers meet the low latency and high reliability requirements of business-critical services as well as mature Wide Area Network (WAN) Software-Defined Networking (SDN) solutions. They can serve as core nodes on enterprise WANs, access nodes on large-scale enterprise networks, interconnection and aggregation nodes on campus networks, and edge nodes on large-scale Internet Data Center (IDC) networks.",
+    "vendor_name": "HuaWei",
+    "vendor_url": "https://www.huawei.com",
+    "product_name": "HuaWei NE40E",
+    "product_url": "https://e.huawei.com/en/products/enterprise-networking/routers/ne/ne40e",
+    "registry_version": 4,
+    "status": "experimental",
+    "availability": "service-contract",
+    "maintainer": "none",
+    "maintainer_email": "none",
+    "first_port_name": "eth0",
+    "port_name_format": "Ethernet1/0/{0}",
+    "qemu": {
+        "adapter_type": "e1000",
+        "adapters": 12,
+        "ram": 2048,
+        "cpus": 2,
+        "hda_disk_interface": "ide",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "kvm": "require",
+        "options": "-machine type=pc-1.0,accel=kvm -serial mon:stdio -nographic -nodefaults -rtc base=utc -cpu host"
+    },
+    "images": [
+        {
+            "filename": "ne40e-V800R011C00SPC607B607.qcow2",
+            "version": "V800R011C00SPC607B607",
+            "md5sum": "2ac9c477e22a17860b76b3dc1d5aa119",
+            "filesize": 496959488,
+            "download_url": "https://support.huawei.com/enterprise/en/routers/ne40e-pid-15837/software"
+        }
+    ],
+    "versions": [
+        {
+            "name": "V800R011C00SPC607B607",
+            "images": {
+                "hda_disk_image": "ne40e-V800R011C00SPC607B607.qcow2"
+            }
+        }
+    ]
+}

gns3server/appliances/huawei-usg6kv.gns3a

@@ -0,0 +1,49 @@
+{
+    "name": "HuaWei USG6000v",
+    "category": "firewall",
+    "description": "Huawei USG6000V is a virtual service gateway based on Network Functions Virtualization (NFV). It features high virtual resource usage and provides virtualized gateway services, such as vFW, vIPsec, vLB, vIPS, vAV, and vURL Remote Query.\nHuawei USG6000V is compatible with most mainstream virtual platforms. It provides standard APIs, together with the OpenStack cloud platform, SDN Controller, and MANO to achieve intelligent solutions for cloud security. This gateway meets flexible service customization requirements for frequent security service changes, elastic and on-demand resource allocation, visualized network management, and rapid rollout.",
+    "vendor_name": "HuaWei",
+    "vendor_url": "https://www.huawei.com",
+    "product_name": "HuaWei USG6000v",
+    "product_url": "https://e.huawei.com/en/products/enterprise-networking/security/firewall-gateway/usg6000v",
+    "registry_version": 4,
+    "status": "experimental",
+    "availability": "service-contract",
+    "maintainer": "none",
+    "maintainer_email": "none",
+    "usage": "Default password is admin. Default username and password for web is admin/Admin@123.",
+    "first_port_name": "GigabitEthernet0/0/0",
+    "port_name_format": "GigabitEthernet1/0/{0}",
+    "qemu": {
+        "adapter_type": "virtio-net-pci",
+        "adapters": 6,
+        "ram": 4096,
+        "cpus": 2,
+        "hda_disk_interface": "ide",
+        "hdb_disk_interface": "ide",
+        "hdc_disk_interface": "ide",
+        "hdd_disk_interface": "ide",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "boot_priority": "dc",
+        "kvm": "require",
+        "options": "-machine type=pc,accel=kvm -vga std -usbdevice tablet"
+    },
+    "images": [
+        {
+            "filename": "usg6kv-v2-V500R001C10.qcow2",
+            "version": "V500R001C10",
+            "md5sum": "07f87aaa4f4d8b9a713d90eb32f89111",
+            "filesize": 737476608,
+            "download_url": "https://support.huawei.com/enterprise/en/security/usg6000v-pid-21431620/software"
+        }
+    ],
+    "versions": [
+        {
+            "name": "V500R001C10",
+            "images": {
+                "hda_disk_image": "usg6kv-v2-V500R001C10.qcow2"
+            }
+        }
+    ]
+}

gns3server/appliances/internet.gns3a

@@ -16,6 +16,7 @@
         "adapter_type": "e1000",
         "adapters": 1,
         "ram": 64,
+        "hda_disk_interface": "ide",
         "arch": "i386",
         "console_type": "telnet",
         "kvm": "allow",

gns3server/appliances/ipfire.gns3a

@@ -117,7 +117,13 @@
     ],
     "versions": [
         {
-            "name": "2.23",
+            "name": "2.23.136",
+            "images": {
+                "hda_disk_image": "ipfire-2.23.2gb-ext4.x86_64-full-core136.img"
+            }
+        },
+        {
+            "name": "2.23.131",
             "images": {
                 "hda_disk_image": "ipfire-2.23.2gb-ext4.x86_64-full-core131.img"
             }

gns3server/appliances/ipxe.gns3a

@@ -0,0 +1,46 @@
+{
+    "name": "ipxe",
+    "category": "guest",
+    "description": "boot guest from network via iPXE",
+    "vendor_name": "Linux",
+    "vendor_url": "http://gns3.com/",
+    "documentation_url": "http://ipxe.org",
+    "product_name": "iPXE netboot",
+    "product_url": "http://ipxe.org/",
+    "registry_version": 3,
+    "status": "stable",
+    "maintainer": "GNS3 Team",
+    "maintainer_email": "developers@gns3.net",
+    "usage": "x86_64 guest booted from network via iPXE. If you need latest ipxe version - download, attach and boot iso from http://boot.ipxe.org/ipxe.iso. Don't forget to adjust memory according guest requirements. If guest is linux, you can add serial console options to kernel arguments.",
+    "symbol": "linux_guest.svg",
+    "port_name_format": "eth{0}",
+    "qemu": {
+        "adapter_type": "e1000",
+        "adapters": 1,
+        "ram": 1024,
+        "hda_disk_interface": "ide",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "boot_priority": "n",
+        "kvm": "allow",
+        "options": "-nographic"
+    },
+    "images": [
+        {
+            "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"
+        }
+    ],
+    "versions": [
+        {
+            "name": "1.0",
+            "images": {
+                "hda_disk_image": "empty8G.qcow2"
+            }
+        }
+    ]
+}

gns3server/appliances/juniper-junos-space.gns3a

@@ -11,13 +11,14 @@
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
-    "symbol": "juniper-vqfx.svg",
     "usage": "16 GB RAM is the bare minimum; you should use 32/64 GB in production deplyments.\nDefault credentials:\n- CLI: admin / abc123\n- WebUI: super / juniper123",
+    "symbol": "juniper-vqfx.svg",
     "port_name_format": "em{0}",
     "qemu": {
         "adapter_type": "e1000",
         "adapters": 4,
         "ram": 16384,
+        "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "require",

gns3server/appliances/juniper-vmx-legacy.gns3a

@@ -0,0 +1,54 @@
+{
+    "name": "Juniper vMX",
+    "category": "router",
+    "description": "The vMX is a full-featured, carrier-grade virtual MX Series 3D Universal Edge Router that extends 15+ years of Juniper Networks edge routing expertise to the virtual realm. This appliance is a single VM pre-release version that does not require to be paired with another VM like in the vCP/vFP architecture.",
+    "vendor_name": "Juniper",
+    "vendor_url": "https://www.juniper.net/us/en/",
+    "documentation_url": "http://www.juniper.net/techpubs/",
+    "product_name": "Juniper vMX",
+    "product_url": "http://www.juniper.net/us/en/products-services/routing/mx-series/vmx/",
+    "registry_version": 6,
+    "status": "experimental",
+    "maintainer": "none",
+    "maintainer_email": "developers@gns3.net",
+    "usage": "Initial username is root, no password.\n\nTIPS:\n* Use the 'show chassis fpc pic-status' command to check that PIC 0 is online and shows 'Virtual 10x1GE PIC'\n* Use the second adapter (em2) and above to connect to other nodes (the first two interfaces are for internal purposes).",
+    "symbol": "juniper-vmx.svg",
+    "first_port_name": "fxp0",
+    "port_name_format": "em{port1}",
+    "qemu": {
+        "adapter_type": "virtio-net-pci",
+        "adapters": 12,
+        "custom_adapters": [
+            {
+                "adapter_number": 0,
+                "adapter_type": "e1000"
+            },
+            {
+                "adapter_number": 1,
+                "adapter_type": "e1000"
+            }
+        ],
+        "ram": 1024,
+        "hda_disk_interface": "ide",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "kvm": "require",
+        "options": "-nographic"
+    },
+    "images": [
+        {
+            "filename": "jinstall-vmx-14.1R4.8-domestic.img",
+            "version": "14.1R4.8",
+            "md5sum": "85aa3048e8648bf91e893455645cad03",
+            "filesize": 681377792
+        }
+    ],
+    "versions": [
+        {
+            "name": "14.1R4.8",
+            "images": {
+                "hda_disk_image": "jinstall-vmx-14.1R4.8-domestic.img"
+            }
+        }
+    ]
+}

gns3server/appliances/juniper-vmx-vcp.gns3a

@@ -11,14 +11,17 @@
     "status": "experimental",
     "maintainer": "none",
     "maintainer_email": "developers@gns3.net",
-    "symbol": "juniper-vmx.svg",
     "usage": "Initial username is root, no password.\n\nUSAGE INSTRUCTIONS\n\nConnect the first interface (fxp0) to your admin VLAN. Connect the second interface (em1) directly to the second interface (eth1) of the vFP.",
+    "symbol": "juniper-vmx.svg",
     "first_port_name": "fxp0",
     "port_name_format": "em{port1}",
     "qemu": {
         "adapter_type": "e1000",
         "adapters": 2,
         "ram": 1024,
+        "hda_disk_interface": "ide",
+        "hdb_disk_interface": "ide",
+        "hdc_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "require",
@@ -26,21 +29,21 @@
     },
     "images": [
         {
-            "filename": "junos-vmx-x86-64-19.3R1.8.qcow2",
-            "version": "19.3R1.8-KVM",
-            "md5sum": "cd14a6884edeb6b337d3c2be02241c63",
-            "filesize": 1435238400
+            "filename": "junos-vmx-x86-64-20.2R1.10.qcow2",
+            "version": "20.2R1.10-KVM",
+            "md5sum": "182484474accf07bd403ef17fa2959a9",
+            "filesize": 1413349376
         },
         {
-            "filename": "vmxhdd-19.3R1.8.img",
-            "version": "19.3R1.8-KVM",
+            "filename": "vmxhdd-20.2R1.10.img",
+            "version": "20.2R1.10-KVM",
             "md5sum": "ae26e0f32605a53a5c85342bad677c9f",
             "filesize": 197120
         },
         {
-            "filename": "metadata-usb-re-19.3R1.8.img",
-            "version": "19.3R1.8-KVM",
-            "md5sum": "3c66c4657773a0cd2b38ffd84115446a",
+            "filename": "metadata-usb-re-20.2R1.10.img",
+            "version": "20.2R1.10-KVM",
+            "md5sum": "25322c2caf542059de72e9adbec1fb68",
             "filesize": 10485760
         },
         {
@@ -337,11 +340,11 @@
     ],
     "versions": [
         {
-            "name": "19.3R1.8-KVM",
+            "name": "20.2R1.10-KVM",
             "images": {
-                "hda_disk_image": "junos-vmx-x86-64-19.3R1.8.qcow2",
-                "hdb_disk_image": "vmxhdd-19.3R1.8.img",
-                "hdc_disk_image": "metadata-usb-re-19.3R1.8.img"
+                "hda_disk_image": "junos-vmx-x86-64-20.2R1.10.qcow2",
+                "hdb_disk_image": "vmxhdd-20.2R1.10.img",
+                "hdc_disk_image": "metadata-usb-re-20.2R1.10.img"
             }
         },
         {
@@ -465,7 +468,7 @@
             }
         },
         {
-            "name": "15.1F6.9",
+            "name": "15.1F6.9-KVM",
             "images": {
                 "hda_disk_image": "junos-vmx-x86-64-15.1F6.9.qcow2",
                 "hdb_disk_image": "vmxhdd-15.1F6.9.img",

gns3server/appliances/juniper-vmx-vfp.gns3a

@@ -11,20 +11,28 @@
     "status": "experimental",
     "maintainer": "none",
     "maintainer_email": "developers@gns3.net",
-    "symbol": "juniper-vmx.svg",
     "usage": "Initial username is root, password is root.\n",
+    "symbol": "juniper-vmx.svg",
     "first_port_name": "Eth0",
     "port_name_format": "Eth{port1}",
     "qemu": {
         "adapter_type": "virtio-net-pci",
         "adapters": 12,
         "ram": 4096,
+        "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "require",
         "options": "-nographic -enable-kvm -smp cpus=3"
     },
     "images": [
+        {
+            "filename": "vFPC-20200526.img",
+            "version": "20.2R1.10-KVM",
+            "md5sum": "400652d7e450b0bf8ad4cc37db46b78c",
+            "filesize": 2447376384,
+            "download_url": "http://www.juniper.net/us/en/products-services/routing/mx-series/vmx/"
+        },
         {
             "filename": "vFPC-20190819.img",
             "version": "19.3R1.8-KVM",
@@ -145,8 +153,13 @@
             "download_url": "http://www.juniper.net/us/en/products-services/routing/mx-series/vmx/"
         }
     ],
-
     "versions": [
+        {
+            "name": "20.2R1.10-KVM",
+            "images": {
+                "hda_disk_image": "vFPC-20200526.img"
+            }
+        },
         {
             "name": "19.3R1.8-KVM",
             "images": {
@@ -249,6 +262,5 @@
                 "hda_disk_image": "vFPC-20151203.img"
             }
         }
-
     ]
 }

gns3server/appliances/juniper-vqfx-pfe.gns3a

@@ -11,19 +11,27 @@
     "status": "experimental",
     "maintainer": "none",
     "maintainer_email": "developers@gns3.net",
-    "symbol": "juniper-vqfx.svg",
     "usage": "\n\nUSAGE INSTRUCTIONS\n\nConnect the first interface (em0) to your admin VLAN. Connect the second interface (em1) directly to the second interface (em1) of the RE. The switch ports do not connect here, but on the RE",
+    "symbol": "juniper-vqfx.svg",
     "port_name_format": "em{0}",
     "qemu": {
         "adapter_type": "e1000",
         "adapters": 2,
         "ram": 2048,
+        "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "vnc",
         "kvm": "require",
         "options": "-nographic"
     },
     "images": [
+        {
+            "filename": "vqfx-20.2R1-2019010209-pfe-qemu.qcow",
+            "version": "20.2R1",
+            "md5sum": "d8b68ba6b8c987717f5298ba9292d3a4",
+            "filesize": 762839040,
+            "download_url": "https://www.juniper.net/us/en/dm/free-vqfx-trial/"
+        },
         {
             "filename": "cosim-18.4R1.8_20180212.qcow2",
             "version": "17.4R1 & 18.4R1",
@@ -40,6 +48,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "20.2R1",
+            "images": {
+                "hda_disk_image": "vqfx-20.2R1-2019010209-pfe-qemu.qcow"
+            }
+        },
         {
             "name": "17.4R1 & 18.4R1",
             "images": {

gns3server/appliances/juniper-vqfx-re.gns3a

@@ -11,13 +11,14 @@
     "status": "experimental",
     "maintainer": "none",
     "maintainer_email": "developers@gns3.net",
-    "symbol": "juniper-vqfx.svg",
     "usage": "Initial username is root, password is Juniper (capitol J).\n\nUSAGE INSTRUCTIONS\n\nConnect the first interface (em0) to your admin VLAN. Connect the second interface (em1) directly to the second interface (em1) of the PFE. The switch ports connect here on the RE",
+    "symbol": "juniper-vqfx.svg",
     "port_name_format": "em{0}",
     "qemu": {
         "adapter_type": "virtio-net-pci",
         "adapters": 12,
         "ram": 1024,
+        "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "require",
@@ -25,28 +26,41 @@
     },
     "images": [
         {
-           "filename": "jinstall-vqfx-10-f-18.4R1.8.qcow2",
-           "version": "18.4R1",
-           "md5sum": "1b0dbd9a235f887e56a8506c0b2f684f",
-           "filesize": 549584896,
-           "download_url": "https://www.juniper.net/us/en/dm/free-vqfx-trial/"
+            "filename": "vqfx-20.2R1.10-re-qemu.qcow2",
+            "version": "20.2R1",
+            "md5sum": "20220bfa3d387184fce957936eeeb4ec",
+            "filesize": 675020800,
+            "download_url": "https://www.juniper.net/us/en/dm/free-vqfx-trial/"
         },
         {
-           "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": "jinstall-vqfx-10-f-18.4R1.8.qcow2",
+            "version": "18.4R1",
+            "md5sum": "1b0dbd9a235f887e56a8506c0b2f684f",
+            "filesize": 549584896,
+            "download_url": "https://www.juniper.net/us/en/dm/free-vqfx-trial/"
         },
         {
-           "filename": "vqfx10k-re-15.1X53-D60.vmdk",
-           "version": "15.1X53-D60",
-           "md5sum": "758669e88213fbd7943f5da7f6d7bd59",
-           "filesize": 355542528,
-           "download_url": "https://www.juniper.net/us/en/dm/free-vqfx-trial/"
+            "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",
+            "md5sum": "758669e88213fbd7943f5da7f6d7bd59",
+            "filesize": 355542528,
+            "download_url": "https://www.juniper.net/us/en/dm/free-vqfx-trial/"
         }
     ],
     "versions": [
+        {
+            "name": "20.2R1",
+            "images": {
+                "hda_disk_image": "vqfx-20.2R1.10-re-qemu.qcow2"
+            }
+        },
         {
             "name": "18.4R1",
             "images": {

gns3server/appliances/juniper-vrr.gns3a

@@ -0,0 +1,52 @@
+{
+    "name": "Juniper vRR",
+    "category": "router",
+    "description": "The vRR is a full-featured, carrier-grade virtual route reflector software that extends 15+ years of Juniper Networks edge routing expertise to the virtual realm.",
+    "vendor_name": "Juniper",
+    "vendor_url": "https://www.juniper.net/us/en/",
+    "documentation_url": "https://www.juniper.net/documentation/product/en_US/virtual-route-reflector",
+    "product_name": "Juniper vRR",
+    "product_url": "https://www.juniper.net/us/en/products-services/nos/junos/",
+    "registry_version": 3,
+    "status": "experimental",
+    "maintainer": "none",
+    "maintainer_email": "developers@gns3.net",
+    "usage": "Initial username is root, no password.\n\nUSAGE INSTRUCTIONS\n\nConnect the first interface (em0) to your admin VLAN.",
+    "symbol": "juniper-vmx.svg",
+    "first_port_name": "em0",
+    "port_name_format": "em{port1}",
+    "qemu": {
+        "adapter_type": "e1000",
+        "adapters": 2,
+        "ram": 8192,
+        "hda_disk_interface": "ide",
+        "hdb_disk_interface": "ide",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "kvm": "require",
+        "options": "-nographic -enable-kvm"
+    },
+    "images": [
+        {
+            "filename": "junos-x86-64-20.3R1.8.img",
+            "version": "20.3R1.8-KVM",
+            "md5sum": "5cd41a792daae2b3fefac1928f2a1894",
+            "filesize": 2761162752
+        },
+        {
+            "filename": "metadata.img",
+            "version": "20.3R1.8-KVM",
+            "md5sum": "ae4e3562aa389929476d82420c79d511",
+            "filesize": 393216
+        }
+    ],
+    "versions": [
+        {
+            "name": "20.3R1.8-KVM",
+            "images": {
+                "hda_disk_image": "junos-x86-64-20.3R1.8.img",
+                "hdb_disk_image": "metadata.img"
+            }
+        }
+    ]
+}

gns3server/appliances/juniper-vsrx.gns3a

@@ -1,7 +1,7 @@
 {
     "name": "vSRX",
     "category": "firewall",
-    "description": "The vSRX delivers core firewall, networking, advanced security, and automated lifecycle management capabilities for enterprises and service providers. The industry\u2019s fastest virtual security platform, the vSRX offers firewall speeds up to 17 Gbps using only two virtual CPUs, providing scalable, secure protection across private, public, and hybrid clouds.\n\nJuniper version 12 can support only 1GB of ram.",
+    "description": "The vSRX delivers core firewall, networking, advanced security, and automated lifecycle management capabilities for enterprises and service providers. The industry's fastest virtual security platform, the vSRX offers firewall speeds up to 17 Gbps using only two virtual CPUs, providing scalable, secure protection across private, public, and hybrid clouds.\n\nJuniper version 12 can support only 1GB of ram.",
     "vendor_name": "Juniper",
     "vendor_url": "https://www.juniper.net/us/en/",
     "documentation_url": "http://www.juniper.net/techpubs/",
@@ -18,12 +18,27 @@
         "adapter_type": "vmxnet3",
         "adapters": 6,
         "ram": 4096,
+        "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "require",
         "options": "-smp 2"
     },
     "images": [
+        {
+            "filename": "junos-media-vsrx-x86-64-vmdisk-20.4R1.12.qcow2",
+            "version": "20.4R1",
+            "md5sum": "a445304c6f710d6d5401b486ef68cd20",
+            "filesize": 6796738560,
+            "download_url": "https://www.juniper.net/us/en/dm/free-vsrx-trial/"
+        },
+        {
+            "filename": "junos-vsrx3-x86-64-20.4R1.12.qcow2",
+            "version": "20.4R1 3.0",
+            "md5sum": "0e7a44a56c0326908fcbdc70451e08f5",
+            "filesize": 942211072,
+            "download_url": "https://www.juniper.net/us/en/dm/free-vsrx-trial/"
+        },
         {
             "filename": "junos-media-vsrx-x86-64-vmdisk-19.3R1.8.qcow2",
             "version": "19.3R1",
@@ -31,6 +46,13 @@
             "filesize": 5185142784,
             "download_url": "https://www.juniper.net/us/en/dm/free-vsrx-trial/"
         },
+        {
+            "filename": "junos-vsrx3-x86-64-19.3R1.8.qcow2",
+            "version": "19.3R1 3.0",
+            "md5sum": "b94d6e5b38737af09c5c9f49c623b69b",
+            "filesize": 834928640,
+            "download_url": "https://www.juniper.net/us/en/dm/free-vsrx-trial/"
+        },
         {
             "filename": "junos-media-vsrx-vmdisk-18.1R1.9.qcow2",
             "version": "18.1R1",
@@ -38,6 +60,13 @@
             "filesize": 4418961408,
             "download_url": "https://www.juniper.net/us/en/dm/free-vsrx-trial/"
         },
+        {
+            "filename": "junos-vsrx3-x86-64-18.4R3.3.qcow2",
+            "version": "18.4R3 3.0",
+            "md5sum": "bb1dec15bb047446f80d85a129cb57c6",
+            "filesize": 764805120,
+            "download_url": "https://www.juniper.net/us/en/dm/free-vsrx-trial/"
+        },
         {
             "filename": "media-vsrx-vmdisk-17.4R1.16.qcow2",
             "version": "17.4R1",
@@ -138,32 +167,56 @@
         },
         {
             "filename": "junos-vsrx-vmdisk-15.1X49-D20.2.qcow2",
-            "version": "15.1X49-D20.2",
+            "version": "15.1X49-D20",
             "md5sum": "43e8000870207db47c1382192319eb45",
             "filesize": 2904096768,
             "download_url": "https://www.juniper.net/us/en/dm/free-vsrx-trial/"
         },
         {
             "filename": "junos-vsrx-12.1X47-D20.7-domestic-disk1.vmdk",
-            "version": "12.1X47-D20.7",
+            "version": "12.1X47-D20",
             "md5sum": "d22ed7a7eb131984e892a4430c5f4730",
             "filesize": 235894272,
             "download_url": "https://www.juniper.net/us/en/dm/free-vsrx-trial/"
         }
     ],
     "versions": [
+        {
+            "name": "20.4R1",
+            "images": {
+                "hda_disk_image": "junos-media-vsrx-x86-64-vmdisk-20.4R1.12.qcow2"
+            }
+        },
+        {
+            "name": "20.4R1 3.0",
+            "images": {
+                "hda_disk_image": "junos-vsrx3-x86-64-20.4R1.12.qcow2"
+            }
+        },
         {
             "name": "19.3R1",
             "images": {
                 "hda_disk_image": "junos-media-vsrx-x86-64-vmdisk-19.3R1.8.qcow2"
             }
         },
+        {
+            "name": "19.3R1 3.0",
+            "images": {
+                "hda_disk_image": "junos-vsrx3-x86-64-19.3R1.8.qcow2"
+            }
+        },
         {
             "name": "18.1R1",
             "images": {
                 "hda_disk_image": "junos-media-vsrx-vmdisk-18.1R1.9.qcow2"
             }
         },
+        {
+            "name": "18.4R3 3.0",
+            "images": {
+                "hda_disk_image": "junos-vsrx3-x86-64-18.4R3.3.qcow2"
+            }
+        },
         {
             "name": "17.4R1",
             "images": {

gns3server/appliances/kali-linux.gns3a

@@ -16,107 +16,116 @@
         "adapter_type": "e1000",
         "adapters": 8,
         "ram": 1024,
+        "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "vnc",
         "boot_priority": "d",
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "kali-linux-2021.1-live-amd64.iso",
+            "version": "2021.1",
+            "md5sum": "3a3716fef866e5c29a1c1ccfc94264b5",
+            "filesize": 3591385088,
+            "download_url": "http://cdimage.kali.org/kali-2021.1/",
+            "direct_download_url": "http://cdimage.kali.org/kali-2021.1/kali-linux-2021.1-live-amd64.iso"
+        },
         {
             "filename": "kali-linux-2019.3-amd64.iso",
             "version": "2019.3",
             "md5sum": "9c6fb00558f78ed06992d89f745ef975",
             "filesize": 3037736960,
-            "download_url": "https://www.kali.org/downloads/",
-            "direct_download_url": "http://cdimage.kali.org/kali-2019.3/kali-linux-2019.3-amd64.iso"
+            "download_url": "http://old.kali.org/kali-images/kali-2019.3",
+            "direct_download_url": "http://old.kali.org/kali-images/kali-2019.3/kali-linux-2019.3-amd64.iso"
         },
         {
             "filename": "kali-linux-2019.2-amd64.iso",
             "version": "2019.2",
             "md5sum": "0f89b6225d7ea9c18682f7cc541c1179",
             "filesize": 3353227264,
-            "download_url": "https://www.kali.org/downloads/",
-            "direct_download_url": "http://cdimage.kali.org/kali-2019.2/kali-linux-2019.2-amd64.iso"
+            "download_url": "http://old.kali.org/kali-images/kali-2019.2",
+            "direct_download_url": "http://old.kali.org/kali-images/kali-2019.2/kali-linux-2019.2-amd64.iso"
         },
         {
             "filename": "kali-linux-mate-2019.2-amd64.iso",
             "version": "2019.2 (MATE)",
             "md5sum": "fec8dd7009f932c51a74323df965a709",
             "filesize": 3313217536,
-            "download_url": "https://www.kali.org/downloads/",
-            "direct_download_url": "http://cdimage.kali.org/kali-2019.2/kali-linux-mate-2019.2-amd64.iso"
+            "download_url": "http://old.kali.org/kali-images/kali-2019.2",
+            "direct_download_url": "http://old.kali.org/kali-images/kali-2019.2/kali-linux-mate-2019.2-amd64.iso"
         },
         {
             "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"
+            "download_url": "http://old.kali.org/kali-images/kali-2019.1a",
+            "direct_download_url": "http://old.kali.org/kali-images/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"
+            "download_url": "http://old.kali.org/kali-images/kali-2018.4",
+            "direct_download_url": "http://old.kali.org/kali-images/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"
+            "download_url": "http://old.kali.org/kali-images/kali-2018.3a",
+            "direct_download_url": "http://old.kali.org/kali-images/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"
+            "download_url": "http://old.kali.org/kali-images/kali-2018.1",
+            "direct_download_url": "http://old.kali.org/kali-images/kali-2018.1/kali-linux-2018.1-amd64.iso"
         },
         {
             "filename": "kali-linux-2017.3-amd64.iso",
             "version": "2017.3",
             "md5sum": "b465580c897e94675ac1daf031fa66b9",
             "filesize": 2886402048,
-            "download_url": "http://cdimage.kali.org/kali-2017.3/",
-            "direct_download_url": "http://cdimage.kali.org/kali-2017.3/kali-linux-2017.3-amd64.iso"
+            "download_url": "http://old.kali.org/kali-images/kali-2017.3/",
+            "direct_download_url": "http://old.kali.org/kali-images/kali-2017.3/kali-linux-2017.3-amd64.iso"
         },
         {
             "filename": "kali-linux-2017.2-amd64.iso",
             "version": "2017.2",
             "md5sum": "541654f8f818450dc0db866a0a0f6eec",
             "filesize": 3020619776,
-            "download_url": "http://cdimage.kali.org/kali-2017.2/",
-            "direct_download_url": "http://cdimage.kali.org/kali-2017.2/kali-linux-2017.2-amd64.iso"
+            "download_url": "http://old.kali.org/kali-images/kali-2017.2/",
+            "direct_download_url": "http://old.kali.org/kali-images/kali-2017.2/kali-linux-2017.2-amd64.iso"
         },
         {
             "filename": "kali-linux-2017.1-amd64.iso",
             "version": "2017.1",
             "md5sum": "c8e742283929d7a12dbe7c58e398ff08",
             "filesize": 2794307584,
-            "download_url": "http://cdimage.kali.org/kali-2017.1/",
-            "direct_download_url": "http://cdimage.kali.org/kali-2017.1/kali-linux-2017.1-amd64.iso"
+            "download_url": "http://old.kali.org/kali-images/kali-2017.1/",
+            "direct_download_url": "http://old.kali.org/kali-images/kali-2017.1/kali-linux-2017.1-amd64.iso"
         },
         {
             "filename": "kali-linux-2016.2-amd64.iso",
             "version": "2016.2",
             "md5sum": "3d163746bc5148e61ad689d94bc263f9",
             "filesize": 3076767744,
-            "download_url": "http://cdimage.kali.org/kali-2016.2/",
-            "direct_download_url": "http://cdimage.kali.org/kali-2016.2/kali-linux-2016.2-amd64.iso"
+            "download_url": "http://old.kali.org/kali-images/kali-2016.2/",
+            "direct_download_url": "http://old.kali.org/kali-images/kali-2016.2/kali-linux-2016.2-amd64.iso"
         },
         {
             "filename": "kali-linux-2016.1-amd64.iso",
             "version": "2016.1",
             "md5sum": "2e1230dc14036935b3279dfe3e49ad39",
             "filesize": 2945482752,
-            "download_url": "http://cdimage.kali.org/kali-2016.1/",
-            "direct_download_url": "http://cdimage.kali.org/kali-2016.1/kali-linux-2016.1-amd64.iso"
+            "download_url": "http://old.kali.org/kali-images/kali-2016.1/",
+            "direct_download_url": "http://old.kali.org/kali-images/kali-2016.1/kali-linux-2016.1-amd64.iso"
         },
         {
             "filename": "kali-linux-2.0-amd64.iso",
@@ -136,6 +145,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "2021.1",
+            "images": {
+                "hda_disk_image": "kali-linux-persistence-1gb.qcow2",
+                "cdrom_image": "kali-linux-2021.1-live-amd64.iso"
+            }
+        },
         {
             "name": "2019.3",
             "images": {

gns3server/appliances/kemp-vlm.gns3a

@@ -1,7 +1,7 @@
 {
     "name": "KEMP Free VLM",
     "category": "router",
-    "description": "KEMP Technologies free LoadMaster Application Load Balancer is a fully featured member of our award winning and industry leading Load Balancer family. It can be used without charge in production environments with throughput requirements that don\u2019t exceed 20 Mbps, and for services that do not directly generate revenue. It is an ideal choice for low traffic web sites and applications, DevOps testing environments, technical training environments, and for any other deployments that suit your non-commercial needs.",
+    "description": "KEMP Technologies free LoadMaster Application Load Balancer is a fully featured member of our award winning and industry leading Load Balancer family. It can be used without charge in production environments with throughput requirements that don't exceed 20 Mbps, and for services that do not directly generate revenue. It is an ideal choice for low traffic web sites and applications, DevOps testing environments, technical training environments, and for any other deployments that suit your non-commercial needs.",
     "vendor_name": "KEMP",
     "vendor_url": "http://freeloadbalancer.com/",
     "documentation_url": "https://support.kemptechnologies.com/hc/en-us/articles/204427785",
@@ -49,7 +49,7 @@
         },
         {
             "filename": "LoadMaster-VLM-7.2.36.2.14271.RELEASE-Linux-KVM-XEN-FREE.disk",
-            "version": "7.1.36.2",
+            "version": "7.2.36.2",
             "md5sum": "eebfc96bd6c1c50827d00647206b59dd",
             "filesize": 17179869185,
             "download_url": "http://freeloadbalancer.com/download/"

gns3server/appliances/kerio-connect.gns3a

@@ -1,7 +1,7 @@
 {
     "name": "Kerio Connect",
     "category": "guest",
-    "description": "Kerio Connect makes email, calendars, contacts and task management easy and affordable. With Kerio Connect, you have immediate, secure access to your communications anytime, anywhere, on any device — without complexity or expensive overhead.",
+    "description": "Kerio Connect makes email, calendars, contacts and task management easy and affordable. With Kerio Connect, you have immediate, secure access to your communications anytime, anywhere, on any device - without complexity or expensive overhead.",
     "vendor_name": "Kerio Technologies Inc.",
     "vendor_url": "http://www.kerio.com",
     "documentation_url": "http://kb.kerio.com/product/kerio-connect/",

gns3server/appliances/kerio-control.gns3a

@@ -77,14 +77,16 @@
             "md5sum": "0405890e323e29a4808ec288600875ba",
             "filesize": 254364160,
             "download_url": "http://www.kerio.com/support/kerio-control",
-            "direct_download_url": "http://cdn.kerio.com/dwn/control/control-9.2.1-2019/kerio-control-appliance-9.2.1-2019-vmware-disk1.vmdk"        },
+            "direct_download_url": "http://cdn.kerio.com/dwn/control/control-9.2.1-2019/kerio-control-appliance-9.2.1-2019-vmware-disk1.vmdk"
+        },
         {
             "filename": "kerio-control-appliance-9.1.4-1535-vmware.vmdk",
             "version": "9.1.4",
             "md5sum": "5ea5a7f103b1f008d4c24444400333ec",
             "filesize": 483459072,
             "download_url": "http://www.kerio.com/support/kerio-control",
-            "direct_download_url": "http://cdn.kerio.com/dwn/control/control-9.1.4-1535/kerio-control-appliance-9.1.4-1535-vmware.vmdk"        }
+            "direct_download_url": "http://cdn.kerio.com/dwn/control/control-9.1.4-1535/kerio-control-appliance-9.1.4-1535-vmware.vmdk"
+        }
     ],
     "versions": [
         {

gns3server/appliances/macos-install.gns3a

@@ -0,0 +1,71 @@
+{
+    "name": "macOS",
+    "category": "guest",
+    "description": "macOS",
+    "vendor_name": "Apple",
+    "vendor_url": "https://www.apple.com/mac/",
+    "documentation_url": "https://www.nicksherlock.com/2020/04/installing-macos-catalina-on-proxmox-with-opencore/",
+    "product_name": "macOS",
+    "product_url": "https://www.apple.com/mac/",
+    "registry_version": 4,
+    "status": "stable",
+    "maintainer": "GNS3 Team",
+    "maintainer_email": "developers@gns3.net",
+    "usage": "qemu-convert BaseSystem.dmg -O raw Catalina-installer.iso\n- gzip -d OpenCore.iso.gz\n\nTo have appliance working, please remove HDC(Secondary Mater) & HDD(Secondary Slave) from template.\nThen install Mac OS\nAt reboot, select MacOS installer to select your MacOS partition to boot on\n\nTo install the boot on the HD, pop open Terminal and run 'diskutil list' to see what drives we have available.\nThen use 'sudo dd if=<source> of=<dest>' to copy the 'EFI' partition from the OpenCore CD (the small disk ~150MB) and overwrite the EFI partition on the hard disk (the one with the large Apple_APFS 'Container' partition on it.\n\nTo end, remove the OpenCore drive and define the SATA one as boot. You're done :-)\nFinally, dont define an iCloud account until your SMBIOS uuid is the final one.\n\nOnce your Mac is booting, remove the references to Catalina-Installer.iso from the advanced args line: '  -drive file=/home/gns3/GNS3/images/QEMU/Catalina-installer.iso,if=none,id=drive-ide0,cache=unsafe,format=raw,aio=threads,detect-zeroes=on -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0,id=ide0' to boot faster.\n",
+    "qemu": {
+        "adapter_type": "vmxnet3",
+        "adapters": 1,
+        "ram": 4096,
+        "cpus": 4,
+        "hda_disk_interface": "ide",
+        "hdb_disk_interface": "sata",
+        "hdc_disk_interface": "ide",
+        "hdd_disk_interface": "ide",
+        "arch": "x86_64",
+        "console_type": "vnc",
+        "boot_priority": "dc",
+        "kvm": "require",
+        "options": "-machine q35,accel=kvm -cpu Penryn,kvm=on -device isa-applesmc,osk='ourhardworkbythesewordsguardedpleasedontsteal(c)AppleComputerInc'  -smbios type=2 -usb -device usb-kbd -device usb-tablet -drive file=/home/gns3/GNS3/images/QEMU/OpenCore.iso,if=none,id=drive-ide2,cache=unsafe,format=raw,aio=threads,detect-zeroes=on -device ide-hd,bus=ide.1,unit=0,drive=drive-ide2,id=ide2,bootindex=101 -drive file=/home/gns3/GNS3/images/QEMU/Catalina-installer.iso,if=none,id=drive-ide0,cache=unsafe,format=raw,aio=threads,detect-zeroes=on -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0,id=ide0"
+    },
+    "images": [
+        {
+            "filename": "empty30G.qcow2",
+            "version": "Catalina",
+            "md5sum": "3411a599e822f2ac6be560a26405821a",
+            "filesize": 197120,
+            "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
+        },
+        {
+            "filename": "OVMF_CODE_2.202002-1.fd",
+            "version": "Catalina",
+            "md5sum": "94470f80fb1da3053a4aea96f46e0e72",
+            "filesize": 1966080,
+            "download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/OVMF_CODE_2.202002-1.fd/download"
+        },
+        {
+            "filename": "OpenCore.iso",
+            "version": "Catalina",
+            "md5sum": "84fb7be0ebe80e746c07f8dc464b3234",
+            "filesize": 157286400,
+            "download_url": "https://github.com/thenickdude/KVM-Opencore/releases/download/v4/OpenCore.iso.gz"
+        },
+        {
+            "filename": "Catalina-installer.iso",
+            "version": "Catalina",
+            "md5sum": "fadfcfe48d1a4e21736665ae91d35561",
+            "filesize": 2146168832,
+            "download_url": "http://swcdn.apple.com/content/downloads/59/18/001-15219-A_EE9FN7UHJA/efuz3h0zlmx4qlinf4bxlguigo9jvhcr55/BaseSystem.dmg"
+        }
+    ],
+    "versions": [
+        {
+            "name": "Catalina",
+            "images": {
+                "bios_image": "OVMF_CODE_2.202002-1.fd",
+                "hdb_disk_image": "empty30G.qcow2",
+                "hdc_disk_image": "OpenCore.iso",
+                "hdd_disk_image": "Catalina-installer.iso"
+            }
+        }
+    ]
+}

gns3server/appliances/mcjoin.gns3a

@@ -0,0 +1,18 @@
+{
+    "name": "mcjoin",
+    "category": "guest",
+    "description": "mcjoin is a very simple and easy-to-use tool to test IPv4 and IPv6 multicast.",
+    "vendor_name": "Joachim Nilsson",
+    "vendor_url": "https://github.com/troglobit",
+    "product_name": "mcjoin",
+    "registry_version": 3,
+    "status": "stable",
+    "maintainer": "GNS3 Team",
+    "maintainer_email": "developers@gns3.net",
+    "symbol": "linux_guest.svg",
+    "docker": {
+        "adapters": 1,
+        "image": "troglobit/mcjoin:latest",
+        "console_type": "telnet"
+    }
+}

gns3server/appliances/microcore-linux.gns3a

@@ -17,6 +17,7 @@
         "adapter_type": "e1000",
         "adapters": 1,
         "ram": 64,
+        "hda_disk_interface": "ide",
         "arch": "i386",
         "console_type": "telnet",
         "kvm": "allow"