Release v2.2.13

# Conflicts:
#	tests/handlers/api/compute/test_dynamips.py
#	tests/handlers/api/compute/test_qemu.py

.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]
+
+    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,33 +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.5
-    - 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,106 @@
 # Change Log
 
+## 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
+* Support to activate/deactive network connection state replication in Qemu.
+* Possible fix for problem connecting to the GNS3 VM. Ref https://github.com/GNS3/gns3-gui/issues/2969 #1760
+* Option to reset or not all MAC addresses when exporting or duplicating a project.
+* Fix bug when changing properties for closed project. Fixes #1754
+* Fix issues with crash reporting & bump version to 2.2.9dev2. Ref https://github.com/GNS3/gns3-server/issues/1758
+* Lock listing VMs. Ref #1755
+* Try to fix error when listing Hyper-V VMs. Ref #1755
+* Catch VirtualBox errors when listing VMs. Fixes #1759
+* Deprecate running with Python 3.5
+* aiocontextvars is only necessary for Python < 3.7
+* Replace Raven by Sentry SDK. Fixes https://github.com/GNS3/gns3-server/issues/1758
+* Require setuptools>=17.1 in setup.py. Ref https://github.com/GNS3/gns3-server/issues/1751 This is to support environmental markers. https://github.com/pypa/setuptools/blob/master/CHANGES.rst#171
+
+## 2.2.8 07/05/2020
+
+* Release Web-Ui 2020.2.0-beta.3
+* Default port set to 80 for server running in the GNS3 VM. Fixes #1737
+* Make the Web UI the default page. Ref https://github.com/GNS3/gns3-server/issues/1737
+* Support controller reloading for templates, appliances and projects. Ref #1743
+* Return exit status 1 if server fails to start. Fixes #1744
+* Use Environmental Markers to force jsonschema version. Fixes https://github.com/GNS3/gns3-gui/issues/2849 Version 3.2.0 with Python >= 3.8 Version 2.6.0 with Python < 3.8
+* Use Environmental Markers to force jsonschema version 2.6.0 on Windows/macOS. Ref https://github.com/GNS3/gns3-gui/issues/2849
+* Implement a minimum interval between cpu_percent() calls. Fixes #1738
+* Add clipboard support for TigerVnc
+* Sort snapshots by (created_at, name)
+* Unprotected access for websocket consoles. Ref https://github.com/GNS3/gns3-gui/issues/2883#issuecomment-580677552
+* Support for WebSocket consoles
+* Return array for controller statistics endpoint
+* Server statistics implementation
+
+## 2.2.7 07/04/2020
+
+* Release 2020.2.0-beta.1
+* Fix uBrigde error popups when Docker image has stopped. Fixes https://github.com/GNS3/gns3-gui/issues/2957
+* Fix warning that you are explicitly comparing literals
+
+## 2.2.6 26/03/2020
+
+* Remove --local when starting Docker dev server.
+* Release 2020.1.0-alpha.1
+* Monitor ubrige processes.
+* Add Xvnc command to the VNC servers list. Fixes #172
+* Allow controller to reconnect to compute if communication is lost. Ref #1634
+* Improvement of support for docker USER directive. Fixes #1727.
+* Fix cannot delete Dynamips router the content of the "usage" field. Fixes https://github.com/GNS3/gns3-gui/issues/2947
+* Prevent locked drawings to be deleted. Fixes https://github.com/GNS3/gns3-gui/issues/2948
+* Fix issues with empty project variables. Fixes https://github.com/GNS3/gns3-gui/issues/2941
+* Upgrade psutil to version 5.6.6 due to CVE-2019-18874 https://github.com/advisories/GHSA-qfc5-mcwq-26q8
+* Remove 'format=raw' from the Qemu options of the disk interfaces. Ref #1699
+* Allocate application IDs for IOU nodes on the controller. An application ID is used by IOU to generate its interface Mac addresses. They must be unique across all opened projects sharing the same computes to avoid Mac address collisions.
+* Require VirtualBox >= 6.0 on AMD and >= 6.1 on Intel processors (for GNS3 VM only). Fixes #1610
+* Add nvme disk interface and fix scsi disk interface for Qemu VMs.
+* Disallow using "legacy networking mode" with Qemu >= 2.9.0
+* Add latest Qemu nic models.
+* Attempt to fix error when loading wmi module. Fixes #1712
+* Handle "aborted" state for VirtualBox VMs. Fixes #1702
+* Change how Hyper-V VMs are found. Ref #1612
+
+## 2.2.5 09/01/2020
+
+* No changes
+
 ## 2.2.4 08/01/2020
 
 * Accept a node name when creating a node from a template using the API. Fixes #1708

Dockerfile

@@ -16,7 +16,6 @@ RUN apt-get update && apt-get install -y \
     python3-pip \
     python3-dev \ 
     qemu-system-x86 \
-    qemu-system-arm \
     qemu-kvm \
     libvirt-bin \
     x11vnc 
@@ -33,4 +32,4 @@ RUN pip3 install -r /server/requirements.txt
 
 EXPOSE 3080
 
-CMD python3 -m gns3server --local
+CMD python3 -m gns3server

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,18 +1,32 @@
 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.
-Clients like the GNS3 GUI controls the server using a HTTP REST API.
+Clients like the `GNS3 GUI <https://github.com/GNS3/gns3-gui/>`_ and the `GNS3 Web UI <https://github.com/GNS3/gns3-web-ui>`_ control the server using a HTTP REST API.
 
-You will need the GNS3 GUI (gns3-gui repository) to control the server.
+Software dependencies
+---------------------
+
+In addition of Python dependencies listed in a section below, other software may be required, recommended or optional.
+
+* `uBridge <https://github.com/GNS3/ubridge/>`_ is required, it interconnects the nodes.
+* `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
+* Docker is optional (Linux only), some nodes are based on Docker.
+* i386-libraries of libc and libcrypto are optional (Linux only), they are only needed to run IOU based nodes.
 
 Branches
 --------
@@ -22,7 +36,7 @@ master
 master is the next stable release, you can test it in your day to day activities.
 Bug fixes or small improvements pull requests go here.
 
-2.x (2.1 for example)
+2.x (2.3 for example)
 *********************
 Next major release
 
@@ -45,11 +59,7 @@ You must be connected to the Internet in order to install the dependencies.
 
 Dependencies:
 
-- Python 3.4 or above
-- aiohttp
-- setuptools
-- psutil
-- jsonschema
+- Python 3.5.3, 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

@@ -77,4 +77,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==5.4.3
+flake8==3.8.3
+pytest-timeout==1.4.1
+pytest-aiohttp==0.3.0

docker-compose.yml

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

docs/api/v2/controller/snapshot/projectsprojectidsnapshots.rst

@@ -13,7 +13,7 @@ Parameters
 
 Response status codes
 **********************
-- **201**: Snasphot created
+- **201**: Snapshot created
 - **404**: The project doesn't exist
 
 Input
@@ -54,7 +54,7 @@ Parameters
 
 Response status codes
 **********************
-- **200**: Snasphot list returned
+- **200**: Snapshot list returned
 - **404**: The project doesn't exist
 
 Sample session

docs/api/v2/controller/snapshot/projectsprojectidsnapshotssnapshotid.rst

@@ -10,7 +10,7 @@ Delete a snapshot from disk
 Parameters
 **********
 - **project_id**: Project UUID
-- **snapshot_id**: Snasphot UUID
+- **snapshot_id**: Snapshot UUID
 
 Response status codes
 **********************

docs/api/v2/controller/snapshot/projectsprojectidsnapshotssnapshotidrestore.rst

@@ -10,7 +10,7 @@ Restore a snapshot from disk
 Parameters
 **********
 - **project_id**: Project UUID
-- **snapshot_id**: Snasphot UUID
+- **snapshot_id**: Snapshot UUID
 
 Response status codes
 **********************

docs/file_format.rst

@@ -58,7 +58,7 @@ The zip can be a ZIP64 if the project is too big for standard zip file.
 These files contain everything needed to create a new appliance template in GNS3.
 
 A JSON schema is available there:
-https://github.com/GNS3/gns3-registry/blob/master/schemas/appliance.json
+https://github.com/GNS3/gns3-registry/blob/master/schemas/appliance_v6.json
 
 And samples there:
 https://github.com/GNS3/gns3-registry/tree/master/appliances

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"
@@ -44,9 +45,8 @@
             "md5sum": "3411a599e822f2ac6be560a26405821a",
             "filesize": 197120,
             "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%30disk/",
-            "direct_download_url": "http://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
+            "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,20 @@
         "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.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 +56,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 +189,13 @@
         }
     ],
     "versions": [
+        {
+            "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 +216,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 OVA is a virtual platform to enable simulation of the ArubaOS-CX Network Operating System. Simulated networks can be created using many of the protocols in the ArubaOS-CX Operating system like OSPF and BGP. Key features like the Aruba Network Analytics Engine and the REST API can be simulated, providing a lightweight development platform to building the modern network. This software can be easily implemented in the GNS3 simulation software to enable drag and drop network design for building complex simulated topologies.",
-    "maintainer_email": "alloytm@gmail.com",
-    "vendor_url": "arubanetworks.com",
+    "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.",
     "vendor_name": "HPE Aruba",
-    "availability": "service-contract",
-    "maintainer": "Tak Mem Loy",
+    "vendor_url": "arubanetworks.com",
+    "product_name": "ArubaOS-CX Simulation Software",
     "registry_version": 4,
-    "usage": "Default username admin with blank password.",
+    "status": "stable",
+    "availability": "service-contract",
+    "maintainer": "Aruba",
+    "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/{0}",
-
+    "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,
-        "kvm": "require",
-        "adapter_type": "virtio-net-pci",
+        "arch": "x86_64",
         "console_type": "vnc",
+        "kvm": "require",
         "options": "-nographic",
         "process_priority": "normal"
-    },   
-
+    },
     "images": [
+        {
+            "filename": "arubaoscx-disk-image-genericx86-p4-20200311173823.vmdk",
+            "version": "10.04.1000",
+            "md5sum": "4e000d73c3593dfed6c49259c31401ea",
+            "filesize": 356249088,
+            "download_url": "https://asp.arubanetworks.com/"
+        },
         {
             "filename": "arubaoscx-disk-image-genericx86-p4-20180712161119.vmdk",
             "version": "10.01.0001",
@@ -38,16 +43,19 @@
             "filesize": 287734784,
             "download_url": "http://support.arubanetworks.com/"
         }
-
     ],
-
     "versions": [
+        {
+            "name": "10.04.1000",
+            "images": {
+                "hda_disk_image": "arubaoscx-disk-image-genericx86-p4-20200311173823.vmdk"
+            }
+        },
         {
             "name": "10.01.0001",
             "images": {
                 "hda_disk_image": "arubaoscx-disk-image-genericx86-p4-20180712161119.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/asterisk.gns3a

@@ -70,7 +70,7 @@
             "md5sum": "3411a599e822f2ac6be560a26405821a",
             "filesize": 197120,
             "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
-            "direct_download_url": "http://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
+            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
         }
     ],
     "versions": [

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-2691.gns3a

@@ -11,7 +11,7 @@
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
     "dynamips": {
-        "platform": "c3600",
+        "platform": "c2691",
         "ram": 192,
         "nvram": 256,
         "startup_config": "ios_base_startup-config.txt",

gns3server/appliances/cisco-asa.gns3a

@@ -17,6 +17,7 @@
         "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",

gns3server/appliances/cisco-asav.gns3a

@@ -19,9 +19,9 @@
         "adapter_type": "e1000",
         "adapters": 8,
         "ram": 2048,
+        "hda_disk_interface": "virtio",
         "arch": "x86_64",
         "console_type": "vnc",
-        "hda_disk_interface": "virtio",
         "kvm": "require"
     },
     "images": [

gns3server/appliances/cisco-csr1000v.gns3a

@@ -17,11 +17,19 @@
         "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",
+            "filesize": 986775552,
+            "download_url": "https://software.cisco.com/download/home/284364978/type/282046477/release/Gibraltar-16.12.3"
+        },
         {
             "filename": "csr1000v-universalk9.16.12.01a-serial.qcow2",
             "version": "16.12.1a",
@@ -36,6 +44,13 @@
             "filesize": 950468608,
             "download_url": "https://software.cisco.com/download/home/284364978/type/282046477/release/Gibraltar-16.10.1b"
         },
+        {
+            "filename": "csr1000v-universalk9.16.09.05-serial.qcow2",
+            "version": "16.9.5",
+            "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",
@@ -57,12 +72,19 @@
             "filesize": 884539392,
             "download_url": "https://software.cisco.com/download/release.html?mdfid=284364978&flowid=39582&softwareid=282046477&release=Fuji-16.7.1"
         },
+        {
+            "filename": "csr1000v-universalk9.16.06.07-serial.qcow2",
+            "version": "16.6.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",
             "md5sum": "31bd32ef6b0d83a8ca19c7b566737a36",
             "filesize": 1573191680,
-            "download_url": "https://software.cisco.com/download/release.html?mdfid=284364978&flowid=39582&softwareid=282046477&release=Everest-16.6.2"
+            "download_url": "https://software.cisco.com/download/release.html?mdfid=284364978&flowid=39582&softwareid=282046477&release=Everest-16.6.6"
         },
         {
             "filename": "csr1000v-universalk9.16.06.02-serial.qcow2",
@@ -90,21 +112,21 @@
             "version": "16.5.1b",
             "md5sum": "ac11d33041b8ff6dc3553e324d02cccb",
             "filesize": 1209543680,
-            "download_url": "https://virl.mediuscorp.com/my-account/"
+            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
         },
         {
             "filename": "csr1000v-universalk9.03.17.00.S.156-1.S-ext.qcow2",
             "version": "3.17",
             "md5sum": "06cbfcd11f3557391db64fe2a6015a6e",
             "filesize": 1346305024,
-            "download_url": "https://virl.mediuscorp.com/my-account/"
+            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
         },
         {
             "filename": "csr1000v-universalk9.16.3.1-build2.qcow2",
             "version": "16.3.1-build2",
             "md5sum": "a770e96de928265515304c9c9d6b46b9",
             "filesize": 1280835584,
-            "download_url": "https://virl.mediuscorp.com/my-account/"
+            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
         },
         {
             "filename": "csr1000v-universalk9.16.03.01.qcow2",
@@ -118,7 +140,7 @@
             "version": "16.3.2",
             "md5sum": "2e5803d23cd52cba5d55fa8306be5f13",
             "filesize": 1167720448,
-            "download_url": "https://virl.mediuscorp.com/my-account/"
+            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
         },
         {
             "filename": "csr1000v-universalk9.16.4.1.qcow2",
@@ -126,9 +148,22 @@
             "md5sum": "3428e0dcf5132a1b11ab7696d8c61b2e",
             "filesize": 1261961216,
             "download_url": "https://virl.mediuscorp.com/my-account/"
+        },
+        {
+            "filename": "csr1000v-universalk9.16.6.1.qcow2",
+            "version": "16.6.1-VIRL",
+            "md5sum": "996eb6dbf54781f6393bd689571a818c",
+            "filesize": 1316301824,
+            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
         }
     ],
     "versions": [
+        {
+            "name": "16.12.3",
+            "images": {
+                "hda_disk_image": "csr1000v-universalk9.16.12.03-serial.qcow2"
+            }
+        },
         {
             "name": "16.12.1a",
             "images": {
@@ -141,6 +176,12 @@
                 "hda_disk_image": "csr1000v-universalk9.16.10.01b-serial.qcow2"
             }
         },
+        {
+            "name": "16.9.5",
+            "images": {
+                "hda_disk_image": "csr1000v-universalk9.16.09.05-serial.qcow2"
+            }
+        },
         {
             "name": "16.9.1",
             "images": {
@@ -159,6 +200,12 @@
                 "hda_disk_image": "csr1000v-universalk9.16.07.01-serial.qcow2"
             }
         },
+        {
+            "name": "16.6.7",
+            "images": {
+                "hda_disk_image": "csr1000v-universalk9.16.06.07-serial.qcow2"
+            }
+        },
         {
             "name": "16.6.6",
             "images": {
@@ -207,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"
@@ -218,6 +265,12 @@
             "images": {
                 "hda_disk_image": "csr1000v-universalk9.16.4.1.qcow2"
             }
+        },
+        {
+            "name": "16.6.1-VIRL",
+            "images": {
+                "hda_disk_image": "csr1000v-universalk9.16.6.1.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,
@@ -52,7 +52,7 @@
             "md5sum": "1e6409a4523ada212dea2ebc50e50a65",
             "filesize": 198656,
             "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
-            "direct_download_url": "http://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty100G.qcow2/download"
+            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty100G.qcow2/download"
         }
     ],
     "versions": [

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",
@@ -48,7 +48,7 @@
             "md5sum": "d1686d2f25695dee32eab9a6f4652c7c",
             "filesize": 200192,
             "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
-            "direct_download_url": "http://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty200G.qcow2/download"
+            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty200G.qcow2/download"
         }
     ],
     "versions": [

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",
@@ -41,7 +41,7 @@
             "md5sum": "1e6409a4523ada212dea2ebc50e50a65",
             "filesize": 198656,
             "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
-            "direct_download_url": "http://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty100G.qcow2/download"
+            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty100G.qcow2/download"
         }
     ],
     "versions": [

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

@@ -29,35 +29,35 @@
             "md5sum": "bc605651c4688276f81fd59dcf5cc786",
             "filesize": 1048576,
             "download_url": "https://sourceforge.net/projects/gns-3/files",
-            "direct_download_url": "http://sourceforge.net/projects/gns-3/files/Qemu Appliances/IOSv_startup_config.img/download"
+            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/IOSv_startup_config.img/download"
         },
         {
             "filename": "vios-adventerprisek9-m.vmdk.SPA.157-3.M3",
             "version": "15.7(3)M3",
             "md5sum": "37c148ffa14a82f418a6e9c2b049fafe",
             "filesize": 134021120,
-            "download_url": "https://virl.mediuscorp.com/my-account/"
+            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
         },
         {
             "filename": "vios-adventerprisek9-m.vmdk.SPA.156-2.T",
             "version": "15.6(2)T",
             "md5sum": "83707e3cc93646da58ee6563a68002b5",
             "filesize": 128450560,
-            "download_url": "https://virl.mediuscorp.com/my-account/"
+            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
         },
         {
             "filename": "vios-adventerprisek9-m.vmdk.SPA.156-1.T",
             "version": "15.6(1)T",
             "md5sum": "e7cb1bbd0c59280dd946feefa68fa270",
             "filesize": 128122880,
-            "download_url": "https://virl.mediuscorp.com/my-account/"
+            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
         },
         {
             "filename": "vios-adventerprisek9-m.vmdk.SPA.155-3.M",
             "version": "15.5(3)M",
             "md5sum": "79f613ac3b179d5a64520730925130b2",
             "filesize": 127926272,
-            "download_url": "https://virl.mediuscorp.com/my-account/"
+            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
         }
     ],
     "versions": [

gns3server/appliances/cisco-iosvl2.gns3a

@@ -23,30 +23,30 @@
         "kvm": "require"
     },
     "images": [
-	    {
+        {
             "filename": "vios_l2-adventerprisek9-m.SSA.high_iron_20180619.qcow2",
             "version": "15.2.1",
             "md5sum": "14b981002e40b660f2d7400401e04c14",
             "filesize": 44938752,
-            "download_url": "https://virl.mediuscorp.com/my-account/"
+            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
         },
         {
             "filename": "vios_l2-adventerprisek9-m.03.2017.qcow2",
             "version": "15.2(20170321:233949)",
             "md5sum": "8f14b50083a14688dec2fc791706bb3e",
             "filesize": 41157632,
-            "download_url": "https://virl.mediuscorp.com/my-account/"
+            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
         },
         {
             "filename": "vios_l2-adventerprisek9-m.vmdk.SSA.152-4.0.55.E",
             "version": "15.2(4.0.55)E",
             "md5sum": "1a3a21f5697cae64bb930895b986d71e",
             "filesize": 96862208,
-            "download_url": "https://virl.mediuscorp.com/my-account/"
+            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
         }
     ],
     "versions": [
-	     {
+        {
             "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"
@@ -28,14 +29,14 @@
             "version": "6.1.3",
             "md5sum": "1693b5d22a398587dd0fed2877d8dfac",
             "filesize": 428588544,
-            "download_url": "https://virl.mediuscorp.com/my-account/"
+            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
         },
         {
             "filename": "iosxrv-k9-demo-6.0.1.qcow2",
             "version": "6.0.1",
             "md5sum": "0831ecf43628eccb752ebb275de9a62a",
             "filesize": 908132352,
-            "download_url": "https://virl.mediuscorp.com/my-account/"
+            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
         }
     ],
     "versions": [

gns3server/appliances/cisco-iosxrv9k.gns3a

@@ -18,6 +18,7 @@
         "adapter_type": "virtio-net-pci",
         "adapters": 7,
         "ram": 16384,
+        "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "require",
@@ -66,7 +67,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,
@@ -77,21 +79,21 @@
             "version": "6.2.25",
             "md5sum": "3f54e62b6f7cedfb2607233e5e465766",
             "filesize": 1190723584,
-            "download_url": "https://virl.mediuscorp.com/my-account/"
+            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
         },
         {
             "filename": "xrv9k-fullk9-x.qcow2-6.0.1",
             "version": "6.0.1",
             "md5sum": "e20d046807075046c35b6ce7d6766a7f",
             "filesize": 2109210624,
-            "download_url": "https://virl.mediuscorp.com/my-account/"
+            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
         },
         {
             "filename": "xrv9k-fullk9-x.qcow2-6.0.0",
             "version": "6.0.0",
             "md5sum": "64c538c34252aaeb4ed1ddb93d6803fd",
             "filesize": 2572943360,
-            "download_url": "https://virl.mediuscorp.com/my-account/"
+            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
         }
     ],
     "versions": [

gns3server/appliances/cisco-ise.gns3a

@@ -7,7 +7,7 @@
     "documentation_url": "http://www.cisco.com/c/en/us/support/security/identity-services-engine/tsd-products-support-series-home.html",
     "product_name": "Identity Services Engine",
     "product_url": "http://www.cisco.com/c/en/us/products/security/identity-services-engine/index.html",
-    "registry_version": 3,
+    "registry_version": 4,
     "status": "experimental",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
@@ -16,8 +16,9 @@
     "port_name_format": "GigabitEthernet{0}",
     "qemu": {
         "adapter_type": "e1000",
-        "adapters": 2,
-        "ram": 4096,
+        "adapters": 6,
+        "ram": 8192,
+        "cpus": 2,
         "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "vnc",
@@ -26,14 +27,35 @@
         "options": "-smp 2 -smbios type=1,product=KVM"
     },
     "images": [
+        {
+            "filename": "ise-2.7.0.356.SPA.x86_64.iso",
+            "version": "2.7.0.356",
+            "md5sum": "efbc831bf05513e4df8695eb3a362921",
+            "filesize": 9184415744,
+            "download_url": "https://software.cisco.com/download/home/283801620/type/283802505/release/2.7.0"
+        },
+        {
+            "filename": "ise-2.6.0.156.SPA.x86_64.iso",
+            "version": "2.6.0.156",
+            "md5sum": "296e65b662821269ad67dd3dea8804d9",
+            "filesize": 8618913792,
+            "download_url": "https://software.cisco.com/download/home/283801620/type/283802505/release/2.6.0"
+        },
         {
             "filename": "ise-2.4.0.357.SPA.x86_64.iso",
             "version": "2.4.0.357",
-            "md5sum": "766945618a0ff35f6c720b3bc4b46bfb",
+            "md5sum": "7f32a28f8d95c7525885786a6556913e",
             "filesize": 8326062080,
             "download_url": "https://software.cisco.com/download/home/283801620/type/283802505/release/2.4.0"
         },
-		{
+        {
+            "filename": "ise-2.3.0.298.SPA.x86_64.iso",
+            "version": "2.3.0.298",
+            "md5sum": "da98d1a34f6b11d63da0f29bd5ef9caf",
+            "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",
@@ -67,10 +89,24 @@
             "md5sum": "d1686d2f25695dee32eab9a6f4652c7c",
             "filesize": 200192,
             "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
-            "direct_download_url": "http://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty200G.qcow2/download"
+            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty200G.qcow2/download"
         }
     ],
     "versions": [
+        {
+            "name": "2.7.0.356",
+            "images": {
+                "hda_disk_image": "empty200G.qcow2",
+                "cdrom_image": "ise-2.7.0.356.SPA.x86_64.iso"
+            }
+        },
+        {
+            "name": "2.6.0.156",
+            "images": {
+                "hda_disk_image": "empty200G.qcow2",
+                "cdrom_image": "ise-2.6.0.156.SPA.x86_64.iso"
+            }
+        },
         {
             "name": "2.4.0.357",
             "images": {
@@ -78,7 +114,14 @@
                 "cdrom_image": "ise-2.4.0.357.SPA.x86_64.iso"
             }
         },
-		{
+        {
+            "name": "2.3.0.298",
+            "images": {
+                "hda_disk_image": "empty200G.qcow2",
+                "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"
@@ -27,14 +28,14 @@
             "version": "7.3.0",
             "md5sum": "b4cd6edf15ab4c6bce53c3f6c1e3a742",
             "filesize": 214368256,
-            "download_url": "https://virl.mediuscorp.com/my-account/"
+            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
         },
         {
             "filename": "titanium-d1.7.2.0.D1.1.vmdk",
             "version": "7.2.0",
             "md5sum": "0ee38c7d717840cb4ca822f4870671d0",
             "filesize": 361103360,
-            "download_url": "https://virl.mediuscorp.com/my-account/"
+            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
         }
     ],
     "versions": [

gns3server/appliances/cisco-nxosv9k.gns3a

@@ -11,27 +11,41 @@
     "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": "nexus9500v.9.3.3.qcow2",
+            "version": "9500v 9.3.3",
+            "md5sum": "7230c944041fdaa0e1b18cecccbc9a32",
+            "filesize": 1714159616,
+            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/9.3(3)"
+        },
+        {
+            "filename": "nexus9300v.9.3.3.qcow2",
+            "version": "9300v 9.3.3",
+            "md5sum": "8e9a7c4815907ef47d850623f77042e2",
+            "filesize": 1714225152,
+            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/9.3(3)"
+        },
+        {
             "filename": "nxosv.9.3.1.qcow2",
             "version": "9.3.1",
             "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",
@@ -134,13 +148,27 @@
         }
     ],
     "versions": [
+        {
+            "name": "9500v 9.3.3",
+            "images": {
+                "bios_image": "OVMF-20160813.fd",
+                "hda_disk_image": "nexus9500v.9.3.3.qcow2"
+            }
+        },
+        {
+            "name": "9300v 9.3.3",
+            "images": {
+                "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",
@@ -48,7 +48,7 @@
             "md5sum": "d1686d2f25695dee32eab9a6f4652c7c",
             "filesize": 200192,
             "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
-            "direct_download_url": "http://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty200G.qcow2/download"
+            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty200G.qcow2/download"
         }
     ],
     "versions": [

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",
@@ -68,16 +68,15 @@
             "md5sum": "f1d2c25b6990f99bd05b433ab603bdb4",
             "filesize": 197120,
             "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
-            "direct_download_url": "http://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty8G.qcow2/download"
+            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty8G.qcow2/download"
         }
     ],
     "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/clearos.gns3a

@@ -63,7 +63,7 @@
             "md5sum": "3411a599e822f2ac6be560a26405821a",
             "filesize": 197120,
             "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
-            "direct_download_url": "http://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
+            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
         }
     ],
     "versions": [

gns3server/appliances/cumulus-vx.gns3a

@@ -18,11 +18,20 @@
         "adapter_type": "virtio-net-pci",
         "adapters": 7,
         "ram": 512,
+        "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "require"
     },
     "images": [
+        {
+            "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 +222,54 @@
         }
     ],
     "versions": [
+        {
+            "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,16 +9,17 @@
     "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.",
+    "symbol": ":/symbols/affinity/circle/gray/router_cloud.svg",
     "port_name_format": "dp0p{1}s{0}",
     "qemu": {
-        "cpus": 2,
         "adapter_type": "virtio-net-pci",
         "adapters": 3,
         "ram": 4096,
+        "cpus": 2,
+        "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "telnet",
         "boot_priority": "dc",
@@ -45,7 +46,7 @@
     ],
     "versions": [
         {
-            "name": "danos-1908-amd64-vrouter",
+            "name": "1908",
             "images": {
                 "hda_disk_image": "empty8G.qcow2",
                 "cdrom_image": "danos-1908-amd64-vrouter.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/",
@@ -59,7 +59,7 @@
             "md5sum": "3411a599e822f2ac6be560a26405821a",
             "filesize": 197120,
             "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
-            "direct_download_url": "http://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
+            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
         }
     ],
     "versions": [

gns3server/appliances/dell-ftos.gns3a

@@ -38,7 +38,7 @@
             "md5sum": "3411a599e822f2ac6be560a26405821a",
             "filesize": 197120,
             "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
-            "direct_download_url": "http://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
+            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
         }
     ],
     "versions": [

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,103 @@
         "kvm": "allow",
         "options": "-cpu core2duo"
     },
-    
     "images": [
-
-		{
+        {
+            "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": "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 +133,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,60 @@
         "kvm": "allow",
         "options": "-nographic"
     },
-
-    "images":
-    [
+    "images": [
+        {
+            "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": "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,34 @@
         "options": "-smp 2 -cpu host"
     },
     "images": [
+        {
+            "filename": "BIGIP-15.1.0.2-0.0.9.qcow2",
+            "version": "15.1.0.2",
+            "md5sum": "95ff618b7d0b53c4252299cd49b0e564",
+            "filesize": 5236588544,
+            "download_url": "https://downloads.f5.com/esd/serveDownload.jsp?path=/big-ip/big-ip_v15.x/15.1.0/english/15.1.0.2_virtual-edition/&sw=BIG-IP&pro=big-ip_v15.x&ver=15.1.0&container=15.1.0.2_Virtual-Edition&file=BIGIP-15.1.0.2-0.0.9.ALL.qcow2.zip"
+        },
+        {
+            "filename": "BIGIP-15.0.1.3-0.0.4.qcow2",
+            "version": "15.0.1.3",
+            "md5sum": "9caf1fb3e373ab37b9d489c038ff1908",
+            "filesize": 5236588544,
+            "download_url": "https://downloads.f5.com/esd/serveDownload.jsp?path=/big-ip/big-ip_v15.x/15.0.1/english/15.0.1.3_virtual-edition/&sw=BIG-IP&pro=big-ip_v15.x&ver=15.0.1&container=15.0.1.3_Virtual-Edition&file=BIGIP-15.0.1.3-0.0.4.ALL.qcow2.zip"
+        },
+        {
+            "filename": "BIGIP-15.0.0-0.0.39.qcow2",
+            "version": "15.0.0",
+            "md5sum": "978ede3addc717ff853e9d05dc0e9289",
+            "filesize": 5251923968,
+            "download_url": "https://downloads.f5.com/esd/serveDownload.jsp?path=/big-ip/big-ip_v15.x/15.0.0/english/virtual-edition/&sw=BIG-IP&pro=big-ip_v15.x&ver=15.0.0&container=Virtual-Edition&file=BIGIP-15.0.0-0.0.39.ALL.qcow2.zip"
+        },
+        {
+            "filename": "BIGIP-14.1.2.3-0.0.5.qcow2",
+            "version": "14.1.2.3",
+            "md5sum": "a16fbbd264605460cf254d0f0fb7faad",
+            "filesize": 5110169600,
+            "download_url": "https://downloads.f5.com/esd/serveDownload.jsp?path=/big-ip/big-ip_v14.x/14.1.2/english/14.1.2.3_virtual-edition/&sw=BIG-IP&pro=big-ip_v14.x&ver=14.1.2&container=14.1.2.3_Virtual-Edition&file=BIGIP-14.1.2.3-0.0.5.ALL.qcow2.zip"
+        },
         {
             "filename": "BIGIP-14.0.0.3-0.0.4.qcow2",
             "version": "14.0.0 HF3",
@@ -125,23 +153,44 @@
             "filesize": 2851733504,
             "download_url": "https://downloads.f5.com/esd/serveDownload.jsp?path=/big-ip/big-ip_v11.x/11.6.0/english/virtual-edition/&sw=BIG-IP&pro=big-ip_v11.x&ver=11.6.0&container=Virtual-Edition&file=BIGIP-11.6.0.0.0.401.ALL.qcow2.zip"
         },
-        {
-            "filename": "BIGIP-11.3.0.39.0.qcow2",
-            "version": "11.3.0",
-            "md5sum": "f3dec4565484fe81233077ab2ce426ae",
-            "filesize": 1842020352,
-            "download_url": "https://downloads.f5.com/esd/serveDownload.jsp?path=/big-ip/big-ip_v11.x/11.3.0/english/virtual-edition-trial/&sw=BIG-IP&pro=big-ip_v11.x&ver=11.3.0&container=Virtual-Edition-Trial&file=BIGIP-11.3.0.39.0.qcow2.zip"
-        },
         {
             "filename": "empty100G.qcow2",
             "version": "1.0",
             "md5sum": "1e6409a4523ada212dea2ebc50e50a65",
             "filesize": 198656,
             "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
-            "direct_download_url": "http://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty100G.qcow2/download"
+            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty100G.qcow2/download"
         }
     ],
     "versions": [
+        {
+            "name": "15.1.0.2",
+            "images": {
+                "hda_disk_image": "BIGIP-15.1.0.2-0.0.9.qcow2",
+                "hdb_disk_image": "empty100G.qcow2"
+            }
+        },
+        {
+            "name": "15.0.1.3",
+            "images": {
+                "hda_disk_image": "BIGIP-15.0.1.3-0.0.4.qcow2",
+                "hdb_disk_image": "empty100G.qcow2"
+            }
+        },
+        {
+            "name": "15.0.0",
+            "images": {
+                "hda_disk_image": "BIGIP-15.0.0-0.0.39.qcow2",
+                "hdb_disk_image": "empty100G.qcow2"
+            }
+        },
+        {
+            "name": "14.1.2.3",
+            "images": {
+                "hda_disk_image": "BIGIP-14.1.2.3-0.0.5.qcow2",
+                "hdb_disk_image": "empty100G.qcow2"
+            }
+        },
         {
             "name": "14.0.0 HF3",
             "images": {
@@ -239,13 +288,6 @@
                 "hda_disk_image": "BIGIP-11.6.0.0.0.401.qcow2",
                 "hdb_disk_image": "empty100G.qcow2"
             }
-        },
-        {
-            "name": "11.3.0",
-            "images": {
-                "hda_disk_image": "BIGIP-11.3.0.39.0.qcow2",
-                "hdb_disk_image": "empty100G.qcow2"
-            }
         }
     ]
 }

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,
@@ -30,11 +30,18 @@
     },
     "images": [
         {
-            "filename": "BIG-IQ-7.0.0.0.0.1854.qcow2",
-            "version": "7.0.0.0",
-            "md5sum": "89ff128c4ba82c266a6cefa21c80029b",
-            "filesize": 4312006656,
-            "download_url": "https://downloads.f5.com/esd/serveDownload.jsp?path=/big-iq/big-iq_cm/7.0.0/english/v7.0.0/&sw=BIG-IQ&pro=big-iq_CM&ver=7.0.0&container=v7.0.0&file=BIG-IQ-7.0.0.0.0.1854.qcow2.zip"
+            "filename": "BIG-IQ-7.1.0.0.0.1511.qcow2",
+            "version": "7.1.0.0",
+            "md5sum": "8d93b06e6eec656584a73ad16be6efa3",
+            "filesize": 4567072768,
+            "download_url": "https://downloads.f5.com/esd/serveDownload.jsp?path=/big-iq/big-iq_cm/7.1.0/english/v7.1.0/&sw=BIG-IQ&pro=big-iq_CM&ver=7.1.0&container=v7.1.0&file=BIG-IQ-7.1.0.0.0.1511.qcow2.zip"
+        },
+        {
+            "filename": "BIG-IQ-7.0.0.1.0.0.6.qcow2",
+            "version": "7.0.0.1",
+            "md5sum": "e86c851a1c43c8c0743f32742d97eba2",
+            "filesize": 4294246400,
+            "download_url": "https://downloads.f5.com/esd/serveDownload.jsp?path=/big-iq/big-iq_cm/7.0.0/english/v7.0.0.1/&sw=BIG-IQ&pro=big-iq_CM&ver=7.0.0&container=v7.0.0.1&file=BIG-IQ-7.0.0.1.0.0.6.qcow2.zip"
         },
         {
             "filename": "BIG-IQ-6.0.1.1.0.0.9.qcow2",
@@ -50,13 +57,6 @@
             "filesize": 3480748032,
             "download_url": "https://downloads.f5.com/esd/serveDownload.jsp?path=/big-iq/big-iq_cm/5.4.0/english/virtual-edition_base-plus-hf2/&sw=BIG-IQ&pro=big-iq_CM&ver=5.4.0&container=Virtual-Edition_Base-Plus-HF2&file=BIG-IQ-5.4.0.2.24.7467.qcow2.zip"
         },
-        {
-            "filename": "BIG-IQ-5.4.0.0.0.7437.qcow2",
-            "version": "5.4.0",
-            "md5sum": "068b1f4d21048b9b2a082c0c27ef4d53",
-            "filesize": 3300917248,
-            "download_url": "https://downloads.f5.com/esd/serveDownload.jsp?path=/big-iq/big-iq_cm/5.4.0/english/v5.4.0/&sw=BIG-IQ&pro=big-iq_CM&ver=5.4.0&container=v5.4.0&file=BIG-IQ-5.4.0.0.0.7437.qcow2.zip"
-        },
         {
             "filename": "BIG-IQ-5.3.0.0.0.1119.qcow2",
             "version": "5.3.0",
@@ -98,14 +98,21 @@
             "md5sum": "1e6409a4523ada212dea2ebc50e50a65",
             "filesize": 198656,
             "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
-            "direct_download_url": "http://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty100G.qcow2/download"
+            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty100G.qcow2/download"
         }
     ],
     "versions": [
         {
-            "name": "7.0.0.0",
+            "name": "7.1.0.0",
             "images": {
-                "hda_disk_image": "BIG-IQ-7.0.0.0.0.1854.qcow2",
+                "hda_disk_image": "BIG-IQ-7.1.0.0.0.1511.qcow2",
+                "hdb_disk_image": "empty100G.qcow2"
+            }
+        },
+        {
+            "name": "7.0.0.1",
+            "images": {
+                "hda_disk_image": "BIG-IQ-7.0.0.1.0.0.6.qcow2",
                 "hdb_disk_image": "empty100G.qcow2"
             }
         },
@@ -123,13 +130,6 @@
                 "hdb_disk_image": "empty100G.qcow2"
             }
         },
-        {
-            "name": "5.4.0",
-            "images": {
-                "hda_disk_image": "BIG-IQ-5.4.0.0.0.7437.qcow2",
-                "hdb_disk_image": "empty100G.qcow2"
-            }
-        },
         {
             "name": "5.3.0",
             "images": {

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,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": 4,
@@ -165,7 +165,7 @@
             "md5sum": "3411a599e822f2ac6be560a26405821a",
             "filesize": 197120,
             "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
-            "direct_download_url": "http://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
+            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
         }
     ],
     "versions": [

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,
@@ -116,7 +116,7 @@
             "md5sum": "1e6409a4523ada212dea2ebc50e50a65",
             "filesize": 198656,
             "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
-            "direct_download_url": "http://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty100G.qcow2/download"
+            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty100G.qcow2/download"
         }
     ],
     "versions": [

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,
@@ -32,13 +32,15 @@
             "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",
@@ -240,7 +242,7 @@
             "md5sum": "3411a599e822f2ac6be560a26405821a",
             "filesize": 197120,
             "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
-            "direct_download_url": "http://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
+            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
         }
     ],
     "versions": [

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,
@@ -179,7 +179,7 @@
             "md5sum": "3411a599e822f2ac6be560a26405821a",
             "filesize": 197120,
             "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
-            "direct_download_url": "http://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
+            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
         }
     ],
     "versions": [

gns3server/appliances/fortimanager.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": 4,
@@ -158,7 +158,7 @@
             "md5sum": "3411a599e822f2ac6be560a26405821a",
             "filesize": 197120,
             "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
-            "direct_download_url": "http://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
+            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
         }
     ],
     "versions": [
@@ -183,6 +183,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,
@@ -46,7 +46,7 @@
             "md5sum": "3411a599e822f2ac6be560a26405821a",
             "filesize": 197120,
             "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
-            "direct_download_url": "http://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
+            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
         }
     ],
     "versions": [

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,
@@ -46,7 +46,7 @@
             "md5sum": "3411a599e822f2ac6be560a26405821a",
             "filesize": 197120,
             "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
-            "direct_download_url": "http://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
+            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
         }
     ],
     "versions": [

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,
@@ -116,9 +116,8 @@
             "md5sum": "3411a599e822f2ac6be560a26405821a",
             "filesize": 197120,
             "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
-            "direct_download_url": "http://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
+            "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/freenas.gns3a

@@ -102,7 +102,7 @@
             "md5sum": "3411a599e822f2ac6be560a26405821a",
             "filesize": 197120,
             "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
-            "direct_download_url": "http://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
+            "direct_download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
         }
     ],
     "versions": [

gns3server/appliances/frr.gns3a

@@ -1,41 +1,40 @@
 {
     "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.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.3.1",
             "images": {
-                "hda_disk_image": "frr7.1-vm0.4.qcow2"
+                "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/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/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,20 +11,41 @@
     "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",
         "options": "-nographic -enable-kvm"
     },
     "images": [
+		{
+            "filename": "junos-vmx-x86-64-20.2R1.10.qcow2",
+            "version": "20.2R1.10-KVM",
+            "md5sum": "182484474accf07bd403ef17fa2959a9",
+            "filesize": 1413349376
+        },
+        {
+            "filename": "vmxhdd-20.2R1.10.img",
+            "version": "20.2R1.10-KVM",
+            "md5sum": "ae26e0f32605a53a5c85342bad677c9f",
+            "filesize": 197120
+        },
+        {
+            "filename": "metadata-usb-re-20.2R1.10.img",
+            "version": "20.2R1.10-KVM",
+            "md5sum": "25322c2caf542059de72e9adbec1fb68",
+            "filesize": 10485760
+        },
         {
             "filename": "junos-vmx-x86-64-19.3R1.8.qcow2",
             "version": "19.3R1.8-KVM",
@@ -336,6 +357,14 @@
         }
     ],
     "versions": [
+		{
+            "name": "20.2R1.10-KVM",
+            "images": {
+                "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"
+            }
+        },
         {
             "name": "19.3R1.8-KVM",
             "images": {
@@ -465,7 +494,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,13 +11,14 @@
     "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",

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,25 +26,25 @@
     },
     "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": "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": "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-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/"
+            "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": [

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,6 +18,7 @@
         "adapter_type": "vmxnet3",
         "adapters": 6,
         "ram": 4096,
+        "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "require",
@@ -138,14 +139,14 @@
         },
         {
             "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/"

gns3server/appliances/kali-linux-cli.gns3a

@@ -12,6 +12,6 @@
     "maintainer_email": "developers@gns3.net",
     "docker": {
         "adapters": 2,
-        "image": "gns3/kalilinux:v2"
+        "image": "gns3/kalilinux:latest"
     }
 }

gns3server/appliances/kali-linux.gns3a

@@ -16,6 +16,7 @@
         "adapter_type": "e1000",
         "adapters": 8,
         "ram": 1024,
+        "hda_disk_interface": "ide",
         "arch": "x86_64",
         "console_type": "vnc",
         "boot_priority": "d",

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/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"

gns3server/appliances/mikrotik-chr.gns3a

@@ -26,86 +26,113 @@
         "options": "-nographic"
     },
     "images": [
-            {
-              "filename": "chr-7.0beta3.img",
-              "version": "7.0beta3",
-              "md5sum": "938c59989df039cb9f33e0da96c22174",
-              "filesize": 67108864,
-              "download_url": "http://www.mikrotik.com/download",
-              "direct_download_url": "https://download.mikrotik.com/routeros/7.0beta3/chr-7.0beta3.img.zip",
-              "compression": "zip"
-           },
-            {
-              "filename": "chr-6.45.6.img",
-              "version": "6.45.6",
-              "md5sum": "e68db699ba23ac7e4fba95b3075c1c6b",
-              "filesize": 67108864,
-              "download_url": "http://www.mikrotik.com/download",
-              "direct_download_url": "https://download2.mikrotik.com/routeros/6.45.6/chr-6.45.6.img.zip",
-              "compression": "zip"
-           },
-           {
-             "filename": "chr-6.44.5.img",
-             "version": "6.44.5",
-             "md5sum": "19aa21073c8ea4540daacde69bacda24",
-             "filesize": 67108864,
-             "download_url": "http://www.mikrotik.com/download",
-             "direct_download_url": "https://download2.mikrotik.com/routeros/6.44.5/chr-6.44.5.img.zip",
-             "compression": "zip"
-          },
-          {
-            "filename": "chr-6.42.12.img",
-            "version": "6.42.12",
-            "md5sum": "8485c606eb38e629fb1f5356d31bbc86",
-            "filesize": 45537201,
+        {
+            "filename": "chr-7.0beta8.img",
+            "version": "7.0beta8",
+            "md5sum": "dbc5b9a1d7cc0e56d5361a0e212dbd96",
+            "filesize": 67108864,
             "download_url": "http://www.mikrotik.com/download",
-            "direct_download_url": "https://download2.mikrotik.com/routeros/6.42.12/chr-6.42.12.img.zip",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.0beta8/chr-7.0beta8.img.zip",
             "compression": "zip"
-         },
-         {
+        },
+        {
+            "filename": "chr-6.47.img",
+            "version": "6.47",
+            "md5sum": "39dea5d6a58708eebfa73332456566f4",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.47/chr-6.47.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-6.46.5.img",
+            "version": "6.46.5",
+            "md5sum": "f9ea37f5a5ac3110f8f5de33e24a7749",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.46.5/chr-6.46.5.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-6.45.8.img",
+            "version": "6.45.8",
+            "md5sum": "73cc01e22e0b301dc29416f59ced8a7d",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.45.8/chr-6.45.8.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-6.45.6.img",
+            "version": "6.45.6",
+            "md5sum": "e68db699ba23ac7e4fba95b3075c1c6b",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.45.6/chr-6.45.6.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-6.44.5.img",
+            "version": "6.44.5",
+            "md5sum": "19aa21073c8ea4540daacde69bacda24",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.44.5/chr-6.44.5.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-6.44.3.img",
+            "version": "6.44.3",
+            "md5sum": "c46b33125d536faa24473a519abbb89d",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.44.3/chr-6.44.3.img.zip",
+            "compression": "zip"
+        },
+        {
+            "filename": "chr-6.44.2.img",
+            "version": "6.44.2",
+            "md5sum": "f1ddaa47829e12c1f9f023d8c06b88cc",
+            "filesize": 67108864,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.44.2/chr-6.44.2.img.zip",
+            "compression": "zip"
+        },
+        {
             "filename": "chr-6.44.img",
             "version": "6.44",
             "md5sum": "86fdf9f0093b4e8f9e7b1c8019fb37b5",
             "filesize": 33621035,
             "download_url": "http://www.mikrotik.com/download",
-            "direct_download_url": "https://download2.mikrotik.com/routeros/6.44/chr-6.44.img.zip",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.44/chr-6.44.img.zip",
             "compression": "zip"
-         },
-        {
-           "filename": "chr-6.44.3.img",
-           "version": "6.44.3",
-           "md5sum": "c46b33125d536faa24473a519abbb89d",
-           "filesize": 67108864,
-           "download_url": "http://www.mikrotik.com/download",
-           "direct_download_url": "https://download.mikrotik.com/routeros/6.44.3/chr-6.44.3.img.zip",
-           "compression": "zip"
         },
         {
-           "filename": "chr-6.44.2.img",
-           "version": "6.44.2",
-           "md5sum": "f1ddaa47829e12c1f9f023d8c06b88cc",
-           "filesize": 67108864,
-           "download_url": "http://www.mikrotik.com/download",
-           "direct_download_url": "https://download.mikrotik.com/routeros/6.44.2/chr-6.44.2.img.zip",
-           "compression": "zip"
+            "filename": "chr-6.43.8.img",
+            "version": "6.43.8",
+            "md5sum": "9437133fc7e77779dc3ff62b98f30dc2",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.43.8/chr-6.43.8.img.zip",
+            "compression": "zip"
         },
         {
-           "filename": "chr-6.43.8.img",
-           "version": "6.43.8",
-           "md5sum": "9437133fc7e77779dc3ff62b98f30dc2",
-           "filesize": 134217728,
-           "download_url": "http://www.mikrotik.com/download",
-           "direct_download_url": "https://download2.mikrotik.com/routeros/6.43.8/chr-6.43.8.img.zip",
-           "compression": "zip"
+            "filename": "chr-6.42.12.img",
+            "version": "6.42.12",
+            "md5sum": "8485c606eb38e629fb1f5356d31bbc86",
+            "filesize": 45537201,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.42.12/chr-6.42.12.img.zip",
+            "compression": "zip"
         },
         {
-           "filename": "chr-6.42.9.img",
-           "version": "6.42.9",
-           "md5sum": "1f856978cfc3ceb4b5e18e4e079f2e32",
-           "filesize": 134217728,
-           "download_url": "http://www.mikrotik.com/download",
-           "direct_download_url": "https://download2.mikrotik.com/routeros/6.42.9/chr-6.42.9.img.zip",
-           "compression": "zip"
+            "filename": "chr-6.42.9.img",
+            "version": "6.42.9",
+            "md5sum": "1f856978cfc3ceb4b5e18e4e079f2e32",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.42.9/chr-6.42.9.img.zip",
+            "compression": "zip"
         },
         {
             "filename": "chr-6.42.img",
@@ -113,51 +140,33 @@
             "md5sum": "279bb518497b40f41c8585128916a2fb",
             "filesize": 134217728,
             "download_url": "http://www.mikrotik.com/download",
-            "direct_download_url": "https://download2.mikrotik.com/routeros/6.42/chr-6.42.img.zip",
-            "compression": "zip"
-        },
-        {
-            "filename": "chr-6.41.4.img",
-            "version": "6.41.4",
-            "md5sum": "63b555b2b7f0d78b79edb92f7e7d2ed7",
-            "filesize": 134217728,
-            "download_url": "http://www.mikrotik.com/download",
-            "direct_download_url": "https://download2.mikrotik.com/routeros/6.41.4/chr-6.41.4.img.zip",
-            "compression": "zip"
-        },
-        {
-            "filename": "chr-6.40.7.img",
-            "version": "6.40.7",
-            "md5sum": "424b897d631c4cac4324ca310e81b494",
-            "filesize": 134217728,
-            "download_url": "http://www.mikrotik.com/download",
-            "direct_download_url": "https://download2.mikrotik.com/routeros/6.40.7/chr-6.40.7.img.zip",
-            "compression": "zip"
-        },
-        {
-            "filename": "chr-6.40.5.img",
-            "version": "6.40.5",
-            "md5sum": "5d3bef219a859d417fea704ae7109eb7",
-            "filesize": 134217728,
-            "download_url": "http://www.mikrotik.com/download",
-            "direct_download_url": "https://download2.mikrotik.com/routeros/6.40.5/chr-6.40.5.img.zip",
-            "compression": "zip"
-        },
-        {
-            "filename": "chr-6.40.3.img",
-            "version": "6.40.3",
-            "md5sum": "1861df67e9bbf17433f11f33f7dedd1e",
-            "filesize": 134217728,
-            "download_url": "http://www.mikrotik.com/download",
-            "direct_download_url": "https://download2.mikrotik.com/routeros/6.40.3/chr-6.40.3.img.zip",
+            "direct_download_url": "https://download.mikrotik.com/routeros/6.42/chr-6.42.img.zip",
             "compression": "zip"
         }
     ],
     "versions": [
         {
-            "name": "7.0beta3",
+            "name": "7.0beta8",
             "images": {
-                "hda_disk_image": "chr-7.0beta3.img"
+                "hda_disk_image": "chr-7.0beta8.img"
+            }
+        },
+        {
+            "name": "6.47",
+            "images": {
+                "hda_disk_image": "chr-6.47.img"
+            }
+        },
+        {
+            "name": "6.46.5",
+            "images": {
+                "hda_disk_image": "chr-6.46.5.img"
+            }
+        },
+        {
+            "name": "6.45.8",
+            "images": {
+                "hda_disk_image": "chr-6.45.8.img"
             }
         },
         {
@@ -184,12 +193,24 @@
                 "hda_disk_image": "chr-6.44.2.img"
             }
         },
+        {
+            "name": "6.44",
+            "images": {
+                "hda_disk_image": "chr-6.44.img"
+            }
+        },
         {
             "name": "6.43.8",
             "images": {
                 "hda_disk_image": "chr-6.43.8.img"
             }
         },
+        {
+            "name": "6.42.12",
+            "images": {
+                "hda_disk_image": "chr-6.42.12.img"
+            }
+        },
         {
             "name": "6.42.9",
             "images": {
@@ -197,27 +218,9 @@
             }
         },
         {
-            "name": "6.41.4",
+            "name": "6.42",
             "images": {
-                "hda_disk_image": "chr-6.41.4.img"
-            }
-        },
-        {
-            "name": "6.40.7",
-            "images": {
-                "hda_disk_image": "chr-6.40.7.img"
-            }
-        },
-        {
-            "name": "6.40.5",
-            "images": {
-                "hda_disk_image": "chr-6.40.5.img"
-            }
-        },
-        {
-            "name": "6.40.3",
-            "images": {
-                "hda_disk_image": "chr-6.40.3.img"
+                "hda_disk_image": "chr-6.42.img"
             }
         }
     ]

gns3server/appliances/mininet.gns3a

@@ -1,29 +1,29 @@
 {
+    "name": "Mininet",
     "category": "guest",
+    "description": "Mininet creates a realistic virtual network, running real kernel, switch and application code, on a single machine (VM, cloud or native), in seconds, with a single command.",
+    "vendor_name": "Mininet Team",
+    "vendor_url": "http://mininet.org/",
+    "documentation_url": "http://mininet.org/walkthrough/",
+    "product_name": "Mininet",
+    "product_url": "http://mininet.org/",
+    "registry_version": 4,
     "status": "stable",
+    "availability": "free",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
-    "description": "Mininet creates a realistic virtual network, running real kernel, switch and application code, on a single machine (VM, cloud or native), in seconds, with a single command.",
-    "product_name": "Mininet",
-    "registry_version": 4,
-    "product_url": "http://mininet.org/",
-    "documentation_url": "http://mininet.org/walkthrough/",
-    "first_port_name": "eth0",
     "usage": "Username: mininet\nPassword: mininet",
+    "first_port_name": "eth0",
     "port_name_format": "eth{0}",
-    "vendor_name": "Mininet Team",
     "qemu": {
-        "adapters": 1,
         "adapter_type": "virtio-net-pci",
-        "arch": "x86_64",
+        "adapters": 1,
         "ram": 2048,
-        "console_type": "vnc",
         "hda_disk_interface": "virtio",
+        "arch": "x86_64",
+        "console_type": "vnc",
         "kvm": "allow"
     },
-    "availability": "free",
-    "vendor_url": "http://mininet.org/",
-    "name": "Mininet",
     "images": [
         {
             "filename": "mininet-vm-x86_64.vmdk",
@@ -37,10 +37,10 @@
     ],
     "versions": [
         {
+            "name": "2.2.2",
             "images": {
                 "hda_disk_image": "mininet-vm-x86_64.vmdk"
-            },
-            "name": "2.2.2"
+            }
         }
     ]
 }