Release v2.2.10

Refactor tests

.travis.yml

@@ -27,7 +27,6 @@ deploy:
 
 env:
   matrix:
-    - PYTHON_VERSION=3.5
     - PYTHON_VERSION=3.6
     - PYTHON_VERSION=3.7
     - PYTHON_VERSION=3.8

CHANGELOG

@@ -1,5 +1,52 @@
 # Change Log
 
+## 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

README.rst

@@ -10,9 +10,20 @@ 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 +33,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 +56,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,7 @@
 -rrequirements.txt
 
 sphinx==1.8.3
-pytest==4.4.1
+pytest==5.4.3
 pep8==1.7.1
 pytest-timeout==1.3.3
+pytest-aiohttp==0.3.0

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

@@ -44,7 +44,7 @@
             "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"
         }
     
     ],

gns3server/appliances/aruba-arubaoscx.gns3a

@@ -3,17 +3,17 @@
     "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",
+    "description": "The ArubaOS-CX Simulation Software is a virtual platform to enable simulation of the ArubaOS-CX Network Operating System. Simulated networks can be created using many of the protocols in the ArubaOS-CX Operating system like OSPF, BGP (inc. EVPN). Key features like the Aruba Network Analytics Engine and the REST API can be simulated, providing a lightweight development platform to building the modern network.",
+    "maintainer_email": "vincent.giles@hpe.com",
     "vendor_url": "arubanetworks.com",
     "vendor_name": "HPE Aruba",
     "availability": "service-contract",
-    "maintainer": "Tak Mem Loy",
+    "maintainer": "Aruba",
     "registry_version": 4,
-    "usage": "Default username admin with blank password.",
+    "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",
@@ -31,6 +31,13 @@
     },   
 
     "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",
@@ -42,12 +49,17 @@
     ],
 
     "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/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/cisco-csr1000v.gns3a

@@ -22,6 +22,13 @@
         "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 +43,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 +71,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 +111,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 +139,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 +147,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 +175,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 +199,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": {
@@ -218,6 +264,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

@@ -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

@@ -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-fsve.gns3a

@@ -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-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

@@ -28,21 +28,21 @@
             "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": [

gns3server/appliances/cisco-iosxrv.gns3a

@@ -28,14 +28,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

@@ -77,21 +77,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

@@ -89,7 +89,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-nxosv.gns3a

@@ -27,14 +27,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-smc.gns3a

@@ -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

@@ -68,7 +68,7 @@
             "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": [

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/deft-linux.gns3a

@@ -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/exos.gns3a

@@ -28,6 +28,20 @@
     
     "images": [
 
+		{
+            "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",
@@ -75,6 +89,18 @@
     
     "versions": [
 
+        {
+            "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": {

gns3server/appliances/extreme-networks-voss.gns3a

@@ -30,6 +30,13 @@
     "images":
     [
         {
+            "filename": "VOSSGNS3.8.1.5.0.qcow2",
+            "version": "v8.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",
             "md5sum": "6b46fd54999a4cd2369440809ccc5099",
@@ -41,20 +48,27 @@
             "version": "voss_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",
             "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":
     [
         {
+            "name": "v8.1.5.0",
+            "images":
+            {
+                "hda_disk_image": "VOSSGNS3.8.1.5.0.qcow2"
+            }
+        },
+		{
             "name": "v8.1.0.0",
             "images":
             {

gns3server/appliances/f5-bigip.gns3a

@@ -27,12 +27,33 @@
         "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": "356520eedb615c93e985474f2b2ec603",
-            "filesize": 5036834816,
-            "download_url": "https://downloads.f5.com"
+            "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",
@@ -132,23 +153,37 @@
             "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": {
@@ -253,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

@@ -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/fortianalyzer.gns3a

@@ -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/forticache.gns3a

@@ -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

@@ -240,7 +240,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

@@ -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

@@ -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": [

gns3server/appliances/fortiproxy.gns3a

@@ -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

@@ -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/fortiweb.gns3a

@@ -116,7 +116,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"
         }
 
     ],

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/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/mikrotik-chr.gns3a

@@ -26,104 +26,104 @@
         "options": "-nographic"
     },
     "images": [
-            {
-              "filename": "chr-7.0beta5.img",
-              "version": "7.0beta5",
-              "md5sum": "3c9855f0efdc23df29511c76aee52c95",
-              "filesize": 67108864,
-              "download_url": "http://www.mikrotik.com/download",
-              "direct_download_url": "https://download.mikrotik.com/routeros/7.0beta5/chr-7.0beta5.img.zip",
-              "compression": "zip"
-           },
-			{
-              "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.46.3.img",
-              "version": "6.46.3",
-              "md5sum": "72d72c4a585a04eb9ed24ec9e4678486",
-              "filesize": 67108864,
-              "download_url": "http://www.mikrotik.com/download",
-              "direct_download_url": "https://download.mikrotik.com/routeros/6.46.3/chr-6.46.3.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://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",
+          {
+             "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.44.5/chr-6.44.5.img.zip",
+             "direct_download_url": "https://download.mikrotik.com/routeros/7.0beta8/chr-7.0beta8.img.zip",
              "compression": "zip"
-          },
-          {
-            "filename": "chr-6.42.12.img",
-            "version": "6.42.12",
-            "md5sum": "8485c606eb38e629fb1f5356d31bbc86",
-            "filesize": 45537201,
+         },
+         {
+             "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://download2.mikrotik.com/routeros/6.42.12/chr-6.42.12.img.zip",
+            "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",
@@ -131,7 +131,7 @@
            "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",
+           "direct_download_url": "https://download.mikrotik.com/routeros/6.42.9/chr-6.42.9.img.zip",
            "compression": "zip"
         },
         {
@@ -140,66 +140,30 @@
             "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.0beta5",
+            "name": "7.0beta8",
             "images": {
-                "hda_disk_image": "chr-7.0beta5.img"
+                "hda_disk_image": "chr-7.0beta8.img"
             }
         },
-		{
-            "name": "7.0beta3",
+        {
+            "name": "6.47",
             "images": {
-                "hda_disk_image": "chr-7.0beta3.img"
+                "hda_disk_image": "chr-6.47.img"
             }
         },
-		{
-            "name": "6.46.3",
+        {
+            "name": "6.46.5",
             "images": {
-                "hda_disk_image": "chr-6.46.3.img"
+                "hda_disk_image": "chr-6.46.5.img"
             }
         },
-		{
+        {
             "name": "6.45.8",
             "images": {
                 "hda_disk_image": "chr-6.45.8.img"
@@ -229,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": {
@@ -242,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/netem.gns3a

@@ -9,7 +9,7 @@
     "registry_version": 3,
     "status": "experimental",
     "maintainer": "Bernhard Ehlers",
-    "maintainer_email": "be@bernhard-ehlers.de",
+    "maintainer_email": "none@b-ehlers.de",
     "usage": "Insert the NETem VM between two network elements and connect it to them. NETem is fully transparent, it bridges the traffic from one interface to the other one. As NETem only bridges, it needs no IP addresses. On start a menu on the console allows a user-friendy configuration of the line parameters.",
     "port_name_format": "eth{0}",
     "qemu": {
@@ -27,8 +27,8 @@
             "version": "0.4",
             "md5sum": "e678698c97804901c7a53f6b68c8b861",
             "filesize": 26476544,
-            "download_url": "http://bernhard-ehlers.de/projects/netem/index.html",
-            "direct_download_url": "http://bernhard-ehlers.de/projects/netem/NETem-v4.qcow2"
+            "download_url": "https://www.b-ehlers.de/projects/netem/index.html",
+            "direct_download_url": "https://www.b-ehlers.de/projects/netem/NETem-v4.qcow2"
         }
     ],
     "versions": [

gns3server/appliances/opennac.gns3a

@@ -29,7 +29,7 @@
             "md5sum": "88d6129265860aa58c5306cd7b413aab",
             "filesize": 3968729088,
             "download_url": "http://www.opennac.org/opennac/en/download.html",
-            "direct_download_url": "http://sourceforge.net/projects/opennac/files/ova/opennac_3711_img.ova/download"
+            "direct_download_url": "https://sourceforge.net/projects/opennac/files/ova/opennac_3711_img.ova/download"
         }
     ],
     "versions": [

gns3server/appliances/openwrt.gns3a

@@ -21,6 +21,33 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "openwrt-19.07.3-x86-64-combined-ext4.img",
+            "version": "19.07.3",
+            "md5sum": "d150595d624cba9c8989a675fdfbc329",
+            "filesize": 285736960,
+            "download_url": "https://downloads.openwrt.org/releases/19.07.3/targets/x86/64/",
+            "direct_download_url": "https://downloads.openwrt.org/releases/19.07.3/targets/x86/64/openwrt-19.07.3-x86-64-combined-ext4.img.gz",
+            "compression": "gzip"
+        },
+        {
+            "filename": "openwrt-19.07.2-x86-64-combined-ext4.img",
+            "version": "19.07.2",
+            "md5sum": "333e06eb0f767efda56a35644ace47c0",
+            "filesize": 285736960,
+            "download_url": "https://downloads.openwrt.org/releases/19.07.2/targets/x86/64/",
+            "direct_download_url": "https://downloads.openwrt.org/releases/19.07.2/targets/x86/64/openwrt-19.07.2-x86-64-combined-ext4.img.gz",
+            "compression": "gzip"
+        },
+        {
+            "filename": "openwrt-18.06.8-x86-64-combined-ext4.img",
+            "version": "18.06.8",
+            "md5sum": "8b235443df9d1a236b147c1c29a97083",
+            "filesize": 285736960,
+            "download_url": "https://downloads.openwrt.org/releases/18.06.8/targets/x86/64/",
+            "direct_download_url": "https://downloads.openwrt.org/releases/18.06.8/targets/x86/64/openwrt-18.06.8-x86-64-combined-ext4.img.gz",
+            "compression": "gzip"
+        },
         {
             "filename": "openwrt-19.07.1-x86-64-combined-ext4.img",
             "version": "19.07.1",
@@ -104,6 +131,24 @@
         }
     ],
     "versions": [
+        {
+            "name": "19.07.3",
+            "images": {
+                "hda_disk_image": "openwrt-19.07.3-x86-64-combined-ext4.img"
+            }
+        },
+        {
+            "name": "19.07.2",
+            "images": {
+                "hda_disk_image": "openwrt-19.07.2-x86-64-combined-ext4.img"
+            }
+        },
+        {
+            "name": "18.06.8",
+            "images": {
+                "hda_disk_image": "openwrt-18.06.8-x86-64-combined-ext4.img"
+            }
+        },
         {
             "name": "19.07.1",
             "images": {

gns3server/appliances/packetfence-zen.gns3a

@@ -74,7 +74,7 @@
             "md5sum": "dfeb8a97bba2e475ce418b02327c0ea1",
             "filesize": 3221225472,
             "download_url": "https://packetfence.org/download.html#/zen",
-            "direct_download_url": "http://sourceforge.net/projects/packetfence/files/PacketFence%20ZEN/7.3.0/PacketFenceZEN_USB-7.3.0.tar.bz2/download",
+            "direct_download_url": "https://sourceforge.net/projects/packetfence/files/PacketFence%20ZEN/7.3.0/PacketFenceZEN_USB-7.3.0.tar.bz2/download",
             "compression": "bzip2"
         },
         {

gns3server/appliances/parrot-os.gns3a

@@ -44,7 +44,7 @@
             "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"
         }
     
     ],

gns3server/appliances/pfsense.gns3a

@@ -23,6 +23,13 @@
         "process_priority": "normal"
     },
     "images": [
+        {
+            "filename": "pfSense-CE-2.4.5-RELEASE-p1-amd64.iso",
+            "version": "2.4.5-p1",
+            "md5sum": "bd1120494be5f36cba3a7ab34e8278da",
+            "filesize": 752506880,
+            "download_url": "https://www.pfsense.org/download/mirror.php?section=downloads"
+        },
         {
             "filename": "pfSense-CE-2.4.4-RELEASE-p3-amd64.iso",
             "version": "2.4.4-p3",
@@ -48,6 +55,13 @@
 
     ],
     "versions": [
+        {
+            "name": "2.4.5-p1",
+            "images": {
+                "hda_disk_image": "empty100G.qcow2",
+                "cdrom_image": "pfSense-CE-2.4.5-RELEASE-p1-amd64.iso"
+            }
+        },
         {
             "name": "2.4.4-p3",
             "images": {

gns3server/appliances/proxmox-mg.gns3a

@@ -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/riverbed-steelhead-cx.gns3a

@@ -35,7 +35,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/security-onion.gns3a

@@ -60,7 +60,7 @@
             "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"
         }
     
     ],

gns3server/appliances/smoothwall.gns3a

@@ -30,7 +30,7 @@
             "md5sum": "cfaf7f11901a164cd00c07518c7311ba",
             "filesize": 214206464,
             "download_url": "http://www.smoothwall.org/download/",
-            "direct_download_url": "http://sourceforge.net/projects/smoothwall/files/SmoothWall/3.1/Express-3.1-x86_64.iso/download"
+            "direct_download_url": "https://sourceforge.net/projects/smoothwall/files/SmoothWall/3.1/Express-3.1-x86_64.iso/download"
         },
         {
             "filename": "empty8G.qcow2",

gns3server/appliances/sophos-utm.gns3a

@@ -142,7 +142,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/trendmicro-iwsva.gns3a

@@ -37,7 +37,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/untangle.gns3a

@@ -114,7 +114,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/viptela-vmanage-genericx86-64.gns3a

@@ -42,7 +42,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/vrin.gns3a

@@ -26,7 +26,7 @@
             "md5sum": "40afad2f5136e56f0cb45466847eae63",
             "filesize": 957087744,
             "download_url": "https://sourceforge.net/projects/vrin/files",
-            "direct_download_url": "http://sourceforge.net/projects/vrin/files/vRIN-0.9.2.qcow2.bz2/download",
+            "direct_download_url": "https://sourceforge.net/projects/vrin/files/vRIN-0.9.2.qcow2.bz2/download",
             "compression": "bzip2"
         },
         {
@@ -35,7 +35,7 @@
             "md5sum": "9f09f104917e19649598d9e2a5a3476b",
             "filesize": 1008926720,
             "download_url": "https://sourceforge.net/projects/vrin/files",
-            "direct_download_url": "http://sourceforge.net/projects/vrin/files/vRIN-0.9.1.qcow2.bz2/download",
+            "direct_download_url": "https://sourceforge.net/projects/vrin/files/vRIN-0.9.1.qcow2.bz2/download",
             "compression": "bzip2"
         },
         {
@@ -44,7 +44,7 @@
             "md5sum": "b9ec187d7a4743bb02339cf262767959",
             "filesize": 922943488,
             "download_url": "https://sourceforge.net/projects/vrin/files",
-            "direct_download_url": "http://sourceforge.net/projects/vrin/files/vRIN-0.9.qcow2.bz2/download",
+            "direct_download_url": "https://sourceforge.net/projects/vrin/files/vRIN-0.9.qcow2.bz2/download",
             "compression": "bzip2"
         },
         {
@@ -53,7 +53,7 @@
             "md5sum": "38eb48d098d3e465422347f7983b9d86",
             "filesize": 625999872,
             "download_url": "https://sourceforge.net/projects/vrin/files",
-            "direct_download_url": "http://sourceforge.net/projects/vrin/files/vRIN-0.8.qcow2.bz2/download",
+            "direct_download_url": "https://sourceforge.net/projects/vrin/files/vRIN-0.8.qcow2.bz2/download",
             "compression": "bzip2"
         },
         {
@@ -62,7 +62,7 @@
             "md5sum": "2e9802c403e34a91871922b9a26592ad",
             "filesize": 614268928,
             "download_url": "https://sourceforge.net/projects/vrin/files",
-            "direct_download_url": "http://sourceforge.net/projects/vrin/files/vRIN-0.7.qcow2.bz2/download",
+            "direct_download_url": "https://sourceforge.net/projects/vrin/files/vRIN-0.7.qcow2.bz2/download",
             "compression": "bzip2"
         },
         {
@@ -71,7 +71,7 @@
             "md5sum": "6c763f609c05b5b9a3b1d422ab89dbac",
             "filesize": 609681408,
             "download_url": "https://sourceforge.net/projects/vrin/files",
-            "direct_download_url": "http://sourceforge.net/projects/vrin/files/vRIN-0.6.qcow2.bz2/download",
+            "direct_download_url": "https://sourceforge.net/projects/vrin/files/vRIN-0.6.qcow2.bz2/download",
             "compression": "bzip2"
         }
     ],

gns3server/appliances/vyos.gns3a

@@ -25,44 +25,44 @@
     },
     "images": [
         {
-            "filename": "vyos-1.2.0-rolling+201906040337-amd64.iso",
-            "version": "1.2.0-2019-06-04",
-            "md5sum": "2a1342985b2a9edfef9f66310ce11a92",
-            "filesize": 427819008,
-            "download_url": "http://dev.packages.vyos.net/iso/preview/1.2.0-beta1/",
-            "direct_download_url": "http://dev.packages.vyos.net/iso/preview/1.2.0-beta1/vyos-1.2.0-beta1-amd64.iso"
+            "filename": "vyos-1.3-rolling-202005040117-amd64.iso",
+            "version": "1.3-rolling-202005040117",
+            "md5sum": "0500d5138cd05239b50f93fb24ac8b55",
+            "filesize": 438304768,
+            "download_url": "https://downloads.vyos.io/?dir=rolling/current/amd64",
+            "direct_download_url": "https://downloads.vyos.io/rolling/current/amd64/vyos-1.3-rolling-202005040117-amd64.iso"
         },
         {
             "filename": "vyos-1.1.8-amd64.iso",
             "version": "1.1.8",
             "md5sum": "95a141d4b592b81c803cdf7e9b11d8ea",
             "filesize": 241172480,
-            "download_url": "https://downloads.vyos.io/?dir=release/1.1.8",
-            "direct_download_url": "https://downloads.vyos.io/release/1.1.8/vyos-1.1.8-amd64.iso"
+            "download_url": "https://downloads.vyos.io/?dir=release/legacy/1.1.8",
+            "direct_download_url": "https://downloads.vyos.io/release/legacy/1.1.8/vyos-1.1.8-amd64.iso"
         },
         {
             "filename": "vyos-1.1.7-amd64.iso",
             "version": "1.1.7",
             "md5sum": "9a7f745a0b0db0d4f1d9eee2a437fb54",
             "filesize": 245366784,
-            "download_url": "https://downloads.vyos.io/?dir=release/1.1.7/",
-            "direct_download_url": "https://downloads.vyos.io/release/1.1.7/vyos-1.1.7-amd64.iso"
+            "download_url": "https://downloads.vyos.io/?dir=release/legacy/1.1.7/",
+            "direct_download_url": "https://downloads.vyos.io/release/legacy/1.1.7/vyos-1.1.7-amd64.iso"
         },
         {
             "filename": "vyos-1.1.6-amd64.iso",
             "version": "1.1.6",
             "md5sum": "3128954d026e567402a924c2424ce2bf",
             "filesize": 245366784,
-            "download_url": "hhttps://downloads.vyos.io/?dir=release/1.1.6/",
-            "direct_download_url": "https://downloads.vyos.io/release/1.1.6/vyos-1.1.6-amd64.iso"
+            "download_url": "hhttps://downloads.vyos.io/?dir=release/legacy/1.1.6/",
+            "direct_download_url": "https://downloads.vyos.io/release/legacy/1.1.6/vyos-1.1.6-amd64.iso"
         },
         {
             "filename": "vyos-1.1.5-amd64.iso",
             "version": "1.1.5",
             "md5sum": "193179532011ceaa87ee725bd8f22022",
             "filesize": 247463936,
-            "download_url": "https://downloads.vyos.io/?dir=release/1.1.5/",
-            "direct_download_url": "https://downloads.vyos.io/release/1.1.5/vyos-1.1.5-amd64.iso"
+            "download_url": "https://downloads.vyos.io/?dir=release/legacy/1.1.5/",
+            "direct_download_url": "https://downloads.vyos.io/release/legacy/1.1.5/vyos-1.1.5-amd64.iso"
         },
         {
             "filename": "empty8G.qcow2",
@@ -75,10 +75,10 @@
     ],
     "versions": [
         {
-            "name": "1.2.0-2019-06-04",
+            "name": "1.3-rolling-202005040117",
             "images": {
                 "hda_disk_image": "empty8G.qcow2",
-                "cdrom_image": "vyos-1.2.0-rolling+201906040337-amd64.iso"
+                "cdrom_image": "vyos-1.3-rolling-202005040117-amd64.iso"
             }
         },
         {

gns3server/appliances/windows_server.gns3a

@@ -46,7 +46,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"
         }
 
     ],

gns3server/appliances/zentyal-server.gns3a

@@ -94,7 +94,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/compute/base_node.py

@@ -27,6 +27,7 @@ import psutil
 import platform
 import re
 
+from aiohttp.web import WebSocketResponse
 from gns3server.utils.interfaces import interfaces
 from ..compute.port_manager import PortManager
 from ..utils.asyncio import wait_run_in_executor, locking
@@ -339,8 +340,8 @@ class BaseNode:
 
     async def start_wrap_console(self):
         """
-        Start a telnet proxy for the console allowing multiple client
-        connected at the same time
+        Start a telnet proxy for the console allowing multiple telnet clients
+        to be connected at the same time
         """
 
         if not self._wrap_console or self._console_type != "telnet":
@@ -369,6 +370,62 @@ class BaseNode:
             self._wrapper_telnet_server.close()
             await self._wrapper_telnet_server.wait_closed()
 
+    async def start_websocket_console(self, request):
+        """
+        Connect to console using Websocket.
+
+        :param ws: Websocket object
+        """
+
+        if self.status != "started":
+            raise NodeError("Node {} is not started".format(self.name))
+
+        if self._console_type != "telnet":
+            raise NodeError("Node {} console type is not telnet".format(self.name))
+
+        try:
+            (telnet_reader, telnet_writer) = await asyncio.open_connection(self._manager.port_manager.console_host, self.console)
+        except ConnectionError as e:
+            raise NodeError("Cannot connect to node {} telnet server: {}".format(self.name, e))
+
+        log.info("Connected to Telnet server")
+
+        ws = WebSocketResponse()
+        await ws.prepare(request)
+        request.app['websockets'].add(ws)
+
+        log.info("New client has connected to console WebSocket")
+
+        async def ws_forward(telnet_writer):
+
+            async for msg in ws:
+                if msg.type == aiohttp.WSMsgType.TEXT:
+                    telnet_writer.write(msg.data.encode())
+                    await telnet_writer.drain()
+                elif msg.type == aiohttp.WSMsgType.BINARY:
+                    await telnet_writer.write(msg.data)
+                    await telnet_writer.drain()
+                elif msg.type == aiohttp.WSMsgType.ERROR:
+                    log.debug("Websocket connection closed with exception {}".format(ws.exception()))
+
+        async def telnet_forward(telnet_reader):
+
+            while not ws.closed and not telnet_reader.at_eof():
+                data = await telnet_reader.read(1024)
+                if data:
+                    await ws.send_bytes(data)
+
+        try:
+            # keep forwarding websocket data in both direction
+            await asyncio.wait([ws_forward(telnet_writer), telnet_forward(telnet_reader)], return_when=asyncio.FIRST_COMPLETED)
+        finally:
+            log.info("Client has disconnected from console WebSocket")
+            if not ws.closed:
+                await ws.close()
+            request.app['websockets'].discard(ws)
+
+        return ws
+
     @property
     def allocate_aux(self):
         """

gns3server/compute/docker/docker_vm.py

@@ -19,6 +19,7 @@
 Docker container instance.
 """
 
+import sys
 import asyncio
 import shutil
 import psutil
@@ -86,6 +87,7 @@ class DockerVM(BaseNode):
         self._telnet_servers = []
         self._xvfb_process = None
         self._vnc_process = None
+        self._vncconfig_process = None
         self._console_resolution = console_resolution
         self._console_http_path = console_http_path
         self._console_http_port = console_http_port
@@ -613,7 +615,16 @@ class DockerVM(BaseNode):
             raise DockerError("Please install TigerVNC server (recommended) or Xvfb + x11vnc before using VNC support")
         await self._start_vnc_process()
         x11_socket = os.path.join("/tmp/.X11-unix/", "X{}".format(self._display))
-        await wait_for_file_creation(x11_socket)
+        try:
+            await wait_for_file_creation(x11_socket)
+        except asyncio.TimeoutError:
+            raise DockerError('x11 socket file "{}" does not exist'.format(x11_socket))
+
+        if not hasattr(sys, "_called_from_test") or not sys._called_from_test:
+            # Start vncconfig for tigervnc clipboard support, connection available only after socket creation.
+            tigervncconfig_path = shutil.which("vncconfig")
+            if tigervnc_path and tigervncconfig_path:
+                self._vncconfig_process = await asyncio.create_subprocess_exec(tigervncconfig_path, "-display", ":{}".format(self._display), "-nowin")
 
         # sometimes the VNC process can crash
         monitor_process(self._vnc_process, self._vnc_callback)
@@ -825,6 +836,12 @@ class DockerVM(BaseNode):
                 await self.stop()
 
             if self.console_type == "vnc":
+                if self._vncconfig_process:
+                    try:
+                        self._vncconfig_process.terminate()
+                        await self._vncconfig_process.wait()
+                    except ProcessLookupError:
+                        pass
                 if self._vnc_process:
                     try:
                         self._vnc_process.terminate()

gns3server/compute/qemu/qemu_vm.py

@@ -117,6 +117,7 @@ class QemuVM(BaseNode):
         self._kernel_image = ""
         self._kernel_command_line = ""
         self._legacy_networking = False
+        self._replicate_network_connection_state = True
         self._on_close = "power_off"
         self._cpu_throttling = 0  # means no CPU throttling
         self._process_priority = "low"
@@ -615,6 +616,30 @@ class QemuVM(BaseNode):
             log.info('QEMU VM "{name}" [{id}] has disabled legacy networking'.format(name=self._name, id=self._id))
         self._legacy_networking = legacy_networking
 
+    @property
+    def replicate_network_connection_state(self):
+        """
+        Returns whether the network connection state for links is replicated in QEMU.
+
+        :returns: boolean
+        """
+
+        return self._replicate_network_connection_state
+
+    @replicate_network_connection_state.setter
+    def replicate_network_connection_state(self, replicate_network_connection_state):
+        """
+        Sets whether the network connection state for links is replicated in QEMU
+
+        :param replicate_network_connection_state: boolean
+        """
+
+        if replicate_network_connection_state:
+            log.info('QEMU VM "{name}" [{id}] has enabled network connection state replication'.format(name=self._name, id=self._id))
+        else:
+            log.info('QEMU VM "{name}" [{id}] has disabled network connection state replication'.format(name=self._name, id=self._id))
+        self._replicate_network_connection_state = replicate_network_connection_state
+
     @property
     def on_close(self):
         """
@@ -1004,12 +1029,12 @@ class QemuVM(BaseNode):
                     await self.add_ubridge_udp_connection("QEMU-{}-{}".format(self._id, adapter_number),
                                                                self._local_udp_tunnels[adapter_number][1],
                                                                nio)
-                    if nio.suspend:
+                    if nio.suspend and self._replicate_network_connection_state:
                         set_link_commands.append("set_link gns3-{} off".format(adapter_number))
-                else:
+                elif self._replicate_network_connection_state:
                     set_link_commands.append("set_link gns3-{} off".format(adapter_number))
 
-            if "-loadvm" not in command_string:
+            if "-loadvm" not in command_string and self._replicate_network_connection_state:
                 # only set the link statuses if not restoring a previous VM state
                 await self._control_vm_commands(set_link_commands)
 
@@ -1293,7 +1318,8 @@ class QemuVM(BaseNode):
                 await self.add_ubridge_udp_connection("QEMU-{}-{}".format(self._id, adapter_number),
                                                            self._local_udp_tunnels[adapter_number][1],
                                                            nio)
-                await self._control_vm("set_link gns3-{} on".format(adapter_number))
+                if self._replicate_network_connection_state:
+                    await self._control_vm("set_link gns3-{} on".format(adapter_number))
             except (IndexError, KeyError):
                 raise QemuError('Adapter {adapter_number} does not exist on QEMU VM "{name}"'.format(name=self._name,
                                                                                                      adapter_number=adapter_number))
@@ -1317,10 +1343,11 @@ class QemuVM(BaseNode):
                 await self.update_ubridge_udp_connection("QEMU-{}-{}".format(self._id, adapter_number),
                                                               self._local_udp_tunnels[adapter_number][1],
                                                               nio)
-                if nio.suspend:
-                    await self._control_vm("set_link gns3-{} off".format(adapter_number))
-                else:
-                    await self._control_vm("set_link gns3-{} on".format(adapter_number))
+                if self._replicate_network_connection_state:
+                    if nio.suspend:
+                        await self._control_vm("set_link gns3-{} off".format(adapter_number))
+                    else:
+                        await self._control_vm("set_link gns3-{} on".format(adapter_number))
             except IndexError:
                 raise QemuError('Adapter {adapter_number} does not exist on QEMU VM "{name}"'.format(name=self._name,
                                                                                                      adapter_number=adapter_number))
@@ -1342,7 +1369,8 @@ class QemuVM(BaseNode):
 
         await self.stop_capture(adapter_number)
         if self.is_running():
-            await self._control_vm("set_link gns3-{} off".format(adapter_number))
+            if self._replicate_network_connection_state:
+                await self._control_vm("set_link gns3-{} off".format(adapter_number))
             await self._ubridge_send("bridge delete {name}".format(name="QEMU-{}-{}".format(self._id, adapter_number)))
 
         nio = adapter.get_nio(0)
@@ -1512,11 +1540,14 @@ class QemuVM(BaseNode):
 
         if self._console:
             console_host = self._manager.port_manager.console_host
-            if console_host == "0.0.0.0" and socket.has_ipv6:
-                # to fix an issue with Qemu when IPv4 is not enabled
-                # see https://github.com/GNS3/gns3-gui/issues/2352
-                # FIXME: consider making this more global (not just for Qemu + SPICE)
-                console_host = "::"
+            if console_host == "0.0.0.0":
+                if socket.has_ipv6:
+                    # to fix an issue with Qemu when IPv4 is not enabled
+                    # see https://github.com/GNS3/gns3-gui/issues/2352
+                    # FIXME: consider making this more global (not just for Qemu + SPICE)
+                    console_host = "::"
+                else:
+                    raise QemuError("IPv6 must be enabled in order to use the SPICE console")
             return ["-spice",
                     "addr={},port={},disable-ticketing".format(console_host, self._console),
                     "-vga", "qxl"]

gns3server/controller/__init__.py

@@ -80,7 +80,7 @@ class Controller:
         if name == "gns3vm":
             name = "Main server"
 
-        computes = await self._load_controller_settings()
+        computes = self._load_controller_settings()
         try:
             self._local_server = await self.add_compute(compute_id="local",
                                                         name=name,
@@ -118,7 +118,7 @@ class Controller:
 
     async def stop(self):
 
-        log.info("Controller is Stopping")
+        log.info("Controller is stopping")
         for project in self._projects.values():
             await project.close()
         for compute in self._computes.values():
@@ -132,6 +132,12 @@ class Controller:
         self._computes = {}
         self._projects = {}
 
+    async def reload(self):
+
+        log.info("Controller is reloading")
+        self._load_controller_settings()
+        await self.load_projects()
+
     def check_can_write_config(self):
         """
         Check if the controller configuration can be written on disk
@@ -182,7 +188,7 @@ class Controller:
         except OSError as e:
             log.error("Cannot write controller configuration file '{}': {}".format(self._config_file, e))
 
-    async def _load_controller_settings(self):
+    def _load_controller_settings(self):
         """
         Reload the controller configuration from disk
         """
@@ -199,7 +205,12 @@ class Controller:
 
         # load GNS3 VM settings
         if "gns3vm" in controller_settings:
-            self.gns3vm.settings = controller_settings["gns3vm"]
+            gns3_vm_settings = controller_settings["gns3vm"]
+            if "port" not in gns3_vm_settings:
+                # port setting was added in version 2.2.8
+                # the default port was 3080 before this
+                gns3_vm_settings["port"] = 3080
+            self.gns3vm.settings = gns3_vm_settings
 
         # load the IOU license settings
         if "iou_license" in controller_settings:

gns3server/controller/appliance.py

@@ -18,6 +18,9 @@
 import copy
 import uuid
 
+import logging
+log = logging.getLogger(__name__)
+
 
 class Appliance:
 
@@ -33,6 +36,9 @@ class Appliance:
         if "appliance_id" in self._data:
             del self._data["appliance_id"]
 
+        if self.status != 'broken':
+            log.debug('Appliance "{name}" [{id}] loaded'.format(name=self.name, id=self._id))
+
     @property
     def id(self):
         return self._id
@@ -45,6 +51,10 @@ class Appliance:
     def symbol(self):
         return self._data.get("symbol")
 
+    @property
+    def name(self):
+        return self._data.get("name")
+
     @symbol.setter
     def symbol(self, new_symbol):
         self._data["symbol"] = new_symbol

gns3server/controller/compute.py

@@ -361,17 +361,17 @@ class Compute:
                 response = await self._run_http_query("GET", "/capabilities")
             except ComputeError as e:
                 log.warning("Cannot connect to compute '{}': {}".format(self._id, e))
-                # Try to reconnect after 2 seconds if server unavailable only if not during tests (otherwise we create a ressource usage bomb)
+                # Try to reconnect after 5 seconds if server unavailable only if not during tests (otherwise we create a ressource usage bomb)
                 if not hasattr(sys, "_called_from_test") or not sys._called_from_test:
-                    if self.id != "local" and not self._controller.compute_has_open_project(self):
-                        log.info("Not reconnecting to compute '{}' because there is no project opened on it".format(self._id))
+                    if self.id != "local" and self.id != "vm" and not self._controller.compute_has_open_project(self):
+                        log.warning("Not reconnecting to compute '{}' because there is no project opened on it".format(self._id))
                         return
                     self._connection_failure += 1
                     # After 5 failure we close the project using the compute to avoid sync issues
                     if self._connection_failure == 10:
                         log.error("Could not connect to compute '{}' after multiple attempts: {}".format(self._id, e))
                         await self._controller.close_compute_projects(self)
-                    asyncio.get_event_loop().call_later(2, lambda: asyncio.ensure_future(self._try_reconnect()))
+                    asyncio.get_event_loop().call_later(5, lambda: asyncio.ensure_future(self._try_reconnect()))
                 return
             except aiohttp.web.HTTPNotFound:
                 raise aiohttp.web.HTTPConflict(text="The server {} is not a GNS3 server or it's a 1.X server".format(self._id))

gns3server/controller/gns3vm/__init__.py

@@ -39,7 +39,7 @@ class GNS3VM:
     Proxy between the controller and the GNS3 VM engine
     """
 
-    def __init__(self, controller, settings={}):
+    def __init__(self, controller):
         self._controller = controller
         # Keep instance of the loaded engines
         self._engines = {}
@@ -50,9 +50,9 @@ class GNS3VM:
             "enable": False,
             "engine": "vmware",
             "ram": 2048,
-            "vcpus": 1
+            "vcpus": 1,
+            "port": 80,
         }
-        self.settings = settings
 
     def engine_list(self):
         """
@@ -72,10 +72,11 @@ class GNS3VM:
         else:
             vmware_info["name"] = "VMware Workstation / Player (recommended)"
 
+        download_url = "https://github.com/GNS3/gns3-gui/releases/download/v{version}/GNS3.VM.Hyper-V.{version}.zip".format(version=__version__)
         hyperv_info = {
             "engine_id": "hyper-v",
             "name": "Hyper-V",
-            "description": 'Hyper-V support (Windows 10/Server 2016 and above). Nested virtualization must be supported and enabled (Intel processor only)',
+            "description": 'Hyper-V support (Windows 10/Server 2016 and above). Nested virtualization must be supported and enabled (Intel processor only)<br>The GNS3 VM can be <a href="{}">downloaded here</a>'.format(download_url),
             "support_when_exit": True,
             "support_headless": False,
             "support_ram": True
@@ -85,7 +86,7 @@ class GNS3VM:
         virtualbox_info = {
             "engine_id": "virtualbox",
             "name": "VirtualBox",
-            "description": 'VirtualBox doesn\'t support nested virtualization, this means Qemu based VMs will run extremely slowly.<br>The GNS3 VM can be <a href="{}">downloaded here</a>'.format(download_url),
+            "description": 'VirtualBox support. Nested virtualization for both Intel and AMD processors is supported since version 6.1<br>The GNS3 VM can be <a href="{}">downloaded here</a>'.format(download_url),
             "support_when_exit": True,
             "support_headless": True,
             "support_ram": True
@@ -249,6 +250,7 @@ class GNS3VM:
     def __json__(self):
         return self._settings
 
+    @locking
     async def list(self, engine):
         """
         List VMS for an engine
@@ -278,9 +280,9 @@ class GNS3VM:
                 # User will receive the error later when they will try to use the node
                 try:
                     compute = await self._controller.add_compute(compute_id="vm",
-                                                                      name="GNS3 VM ({})".format(self.current_engine().vmname),
-                                                                      host=None,
-                                                                      force=True)
+                                                                 name="GNS3 VM ({})".format(self.current_engine().vmname),
+                                                                 host=None,
+                                                                 force=True)
                     compute.set_last_error(str(e))
 
                 except aiohttp.web.HTTPConflict:
@@ -313,6 +315,7 @@ class GNS3VM:
             engine.ram = self._settings["ram"]
             engine.vcpus = self._settings["vcpus"]
             engine.headless = self._settings["headless"]
+            engine.port = self._settings["port"]
             compute = await self._controller.add_compute(compute_id="vm",
                                                          name="GNS3 VM is starting ({})".format(engine.vmname),
                                                          host=None,
@@ -329,11 +332,11 @@ class GNS3VM:
                 raise e
             await compute.connect()  # we can connect now that the VM has started
             await compute.update(name="GNS3 VM ({})".format(engine.vmname),
-                                      protocol=self.protocol,
-                                      host=self.ip_address,
-                                      port=self.port,
-                                      user=self.user,
-                                      password=self.password)
+                                 protocol=self.protocol,
+                                 host=self.ip_address,
+                                 port=self.port,
+                                 user=self.user,
+                                 password=self.password)
 
             # check if the VM is in the same subnet as the local server, start 10 seconds later to give
             # some time for the compute in the VM to be ready for requests

gns3server/controller/gns3vm/base_gns3_vm.py

@@ -15,7 +15,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import asyncio
 import psutil
 
 import logging
@@ -29,7 +28,7 @@ class BaseGNS3VM:
         self._controller = controller
         self._vmname = None
         self._ip_address = None
-        self._port = 3080
+        self._port = 80  # value not used, will be overwritten
         self._headless = False
         self._vcpus = 1
         self._ram = 1024

gns3server/controller/gns3vm/hyperv_gns3_vm.py

@@ -57,9 +57,10 @@ class HyperVGNS3VM(BaseGNS3VM):
         if sys.getwindowsversion().platform_version[0] < 10:
             raise GNS3VMError("Windows 10/Windows Server 2016 or a later version is required to run Hyper-V with nested virtualization enabled (version {} detected)".format(sys.getwindowsversion().platform_version[0]))
 
-        if sys.getwindowsversion().platform_version[0] == 10 and sys.getwindowsversion().platform_version[1] == 0:
-            if sys.getwindowsversion().platform_version[2] < 14393:
-                raise GNS3VMError("Hyper-V with nested virtualization is only supported on Windows 10 Anniversary Update (build 10.0.14393) or later")
+        is_windows_10 = sys.getwindowsversion().platform_version[0] == 10 and sys.getwindowsversion().platform_version[1] == 0
+
+        if is_windows_10 and sys.getwindowsversion().platform_version[2] < 14393:
+            raise GNS3VMError("Hyper-V with nested virtualization is only supported on Windows 10 Anniversary Update (build 10.0.14393) or later")
 
         try:
             import pythoncom
@@ -74,7 +75,11 @@ class HyperVGNS3VM(BaseGNS3VM):
             raise GNS3VMError("Hyper-V is not installed or activated")
 
         if conn.Win32_Processor()[0].Manufacturer != "GenuineIntel":
-            raise GNS3VMError("An Intel processor is required by Hyper-V to support nested virtualization")
+            if is_windows_10 and conn.Win32_Processor()[0].Manufacturer == "AuthenticAMD":
+                if sys.getwindowsversion().platform_version[2] < 19640:
+                    raise GNS3VMError("Windows 10 (build 10.0.19640) or later is required by Hyper-V to support nested virtualization with AMD processors")
+            else:
+                raise GNS3VMError("An Intel processor is required by Hyper-V to support nested virtualization on this version of Windows")
 
         # This is not reliable
         #if not conn.Win32_Processor()[0].VirtualizationFirmwareEnabled:
@@ -179,7 +184,7 @@ class HyperVGNS3VM(BaseGNS3VM):
         List all Hyper-V VMs
         """
 
-        if self._conn is None:
+        if self._conn is None or self._management is None:
             self._connect()
 
         vms = []

gns3server/controller/gns3vm/virtualbox_gns3_vm.py

@@ -212,8 +212,11 @@ class VirtualBoxGNS3VM(BaseGNS3VM):
         List all VirtualBox VMs
         """
 
-        await self._check_requirements()
-        return await self._virtualbox_manager.list_vms()
+        try:
+            await self._check_requirements()
+            return await self._virtualbox_manager.list_vms()
+        except VirtualBoxError as e:
+            raise GNS3VMError("Could not list VirtualBox VMs: {}".format(str(e)))
 
     async def start(self):
         """
@@ -285,13 +288,12 @@ class VirtualBoxGNS3VM(BaseGNS3VM):
             log.info("Removing GNS3VM NAT port forwarding rule from interface {}".format(nat_interface_number))
             await self._execute("controlvm", [self._vmname, "natpf{}".format(nat_interface_number), "delete", "GNS3VM"])
 
-        # add a GNS3VM NAT port forwarding rule to redirect 127.0.0.1 with random port to port 3080 in the VM
+        # add a GNS3VM NAT port forwarding rule to redirect 127.0.0.1 with random port to the port in the VM
         log.info("Adding GNS3VM NAT port forwarding rule with port {} to interface {}".format(api_port, nat_interface_number))
         await self._execute("controlvm", [self._vmname, "natpf{}".format(nat_interface_number),
-                                               "GNS3VM,tcp,{},{},,3080".format(ip_address, api_port)])
+                                               "GNS3VM,tcp,{},{},,{}".format(ip_address, api_port, self.port)])
 
         self.ip_address = await self._get_ip(hostonly_interface_number, api_port)
-        self.port = 3080
         log.info("GNS3 VM has been started with IP {}".format(self.ip_address))
         self.running = True
 

gns3server/controller/gns3vm/vmware_gns3_vm.py

@@ -115,6 +115,7 @@ class VMwareGNS3VM(BaseGNS3VM):
         """
         List all VMware VMs
         """
+
         try:
             return (await self._vmware_manager.list_vms())
         except VMwareError as e:

gns3server/controller/project.py

@@ -129,6 +129,8 @@ class Project:
 
         self._iou_id_lock = asyncio.Lock()
 
+        log.debug('Project "{name}" [{id}] loaded'.format(name=self.name, id=self._id))
+
     def emit_notification(self, action, event):
         """
         Emit a notification to all clients using this project.
@@ -435,6 +437,9 @@ class Project:
         """
         :return: List of computes used by the project
         """
+
+        if self._status == "closed":
+            return self._get_closed_data("computes", "compute_id").values()
         return self._project_created_on_compute
 
     def remove_allocated_node_name(self, name):
@@ -994,7 +999,7 @@ class Project:
         while self._loading:
             await asyncio.sleep(0.5)
 
-    async def duplicate(self, name=None, location=None):
+    async def duplicate(self, name=None, location=None, reset_mac_addresses=True):
         """
         Duplicate a project
 
@@ -1004,6 +1009,7 @@ class Project:
 
         :param name: Name of the new project. A new one will be generated in case of conflicts
         :param location: Parent directory of the new project
+        :param reset_mac_addresses: Reset MAC addresses for the new project
         """
         # If the project was not open we open it temporary
         previous_status = self._status
@@ -1017,7 +1023,7 @@ class Project:
             with tempfile.TemporaryDirectory() as tmpdir:
                 # Do not compress the exported project when duplicating
                 with aiozipstream.ZipFile(compression=zipfile.ZIP_STORED) as zstream:
-                    await export_project(zstream, self, tmpdir, keep_compute_id=True, allow_all_nodes=True, reset_mac_addresses=True)
+                    await export_project(zstream, self, tmpdir, keep_compute_id=True, allow_all_nodes=True, reset_mac_addresses=reset_mac_addresses)
 
                     # export the project to a temporary location
                     project_path = os.path.join(tmpdir, "project.gns3p")

gns3server/controller/template.py

@@ -147,6 +147,8 @@ class Template:
                 # special case for Dynamips to cover all platform types that contain specific settings
                 self.validate_and_apply_defaults(DYNAMIPS_PLATFORM_TO_SHEMA[self._settings["platform"]])
 
+        log.debug('Template "{name}" [{id}] loaded'.format(name=self.name, id=self._id))
+
     @property
     def id(self):
         return self._id

gns3server/controller/topology.py

@@ -99,19 +99,28 @@ def project_to_topology(project):
         "version": __version__
     }
 
-    computes = set()
     for node in project.nodes.values():
-        computes.add(node.compute)
-        data["topology"]["nodes"].append(node.__json__(topology_dump=True))
+        if hasattr(node, "__json__"):
+            data["topology"]["nodes"].append(node.__json__(topology_dump=True))
+        else:
+            data["topology"]["nodes"].append(node)
     for link in project.links.values():
-        data["topology"]["links"].append(link.__json__(topology_dump=True))
+        if hasattr(link, "__json__"):
+            data["topology"]["links"].append(link.__json__(topology_dump=True))
+        else:
+            data["topology"]["links"].append(link)
     for drawing in project.drawings.values():
-        data["topology"]["drawings"].append(drawing.__json__(topology_dump=True))
-    for compute in computes:
+        if hasattr(drawing, "__json__"):
+            data["topology"]["drawings"].append(drawing.__json__(topology_dump=True))
+        else:
+            data["topology"]["drawings"].append(drawing)
+    for compute in project.computes:
         if hasattr(compute, "__json__"):
             compute = compute.__json__(topology_dump=True)
             if compute["compute_id"] not in ("vm", "local", ):
                 data["topology"]["computes"].append(compute)
+        elif isinstance(compute, dict):
+            data["topology"]["computes"].append(compute)
     _check_topology_schema(data)
     return data
 

gns3server/crash_report.py

@@ -15,22 +15,21 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+try:
+    import sentry_sdk
+    from sentry_sdk.integrations.logging import LoggingIntegration
+    SENTRY_SDK_AVAILABLE = True
+except ImportError:
+    # Sentry SDK is not installed with deb package in order to simplify packaging
+    SENTRY_SDK_AVAILABLE = False
+
 import os
 import sys
 import struct
-import aiohttp
 import platform
 import locale
 import distro
 
-try:
-    import raven
-    from raven.transport.http import HTTPTransport
-    RAVEN_AVAILABLE = True
-except ImportError:
-    # raven is not installed with deb package in order to simplify packaging
-    RAVEN_AVAILABLE = False
-
 from .version import __version__, __version_info__
 from .config import Config
 from .utils.get_resource import get_resource
@@ -43,7 +42,8 @@ log = logging.getLogger(__name__)
 if __version_info__[3] != 0:
     import faulthandler
 
-    # Display a traceback in case of segfault crash. Usefull when frozen
+    # Display a traceback in case of segfault crash.
+    # Useful when this application is frozen.
     # Not enabled by default for security reason
     log.info("Enable catching segfault")
     try:
@@ -58,49 +58,50 @@ class CrashReport:
     Report crash to a third party service
     """
 
-    DSN = "https://3b34198e8fa84f519ed6d6d5354c5cc5:1b0bec61fd654380b597ba4f11452f1f@o19455.ingest.sentry.io/38482"
-    if hasattr(sys, "frozen"):
-        cacert = get_resource("cacert.pem")
-        if cacert is not None and os.path.isfile(cacert):
-            DSN += "?ca_certs={}".format(cacert)
-        else:
-            log.warning("The SSL certificate bundle file '{}' could not be found".format(cacert))
+    DSN = "https://d4a76fe0441b47c28b19b66ce6d1c7c0:129a91b7ae0e4ec6acba1cccb61b97f3@o19455.ingest.sentry.io/38482"
     _instance = None
 
     def __init__(self):
-        self._client = None
 
-        # We don't want sentry making noise if an error is catched when you don't have internet
+        # We don't want sentry making noise if an error is caught when you don't have internet
         sentry_errors = logging.getLogger('sentry.errors')
         sentry_errors.disabled = True
 
         sentry_uncaught = logging.getLogger('sentry.errors.uncaught')
         sentry_uncaught.disabled = True
 
-    def capture_exception(self, request=None):
-        if not RAVEN_AVAILABLE:
-            return
-        if os.path.exists(".git"):
-            log.warning("A .git directory exist crash report is turn off for developers")
-            return
-        server_config = Config.instance().get_section_config("Server")
-        if server_config.getboolean("report_errors"):
-            if self._client is None:
-                self._client = raven.Client(CrashReport.DSN, release=__version__, raise_send_errors=True, transport=HTTPTransport)
-            if request is not None:
-                self._client.http_context({
-                    "method": request.method,
-                    "url": request.path,
-                    "data": request.json,
-                })
+        if SENTRY_SDK_AVAILABLE:
+            cacert = None
+            if hasattr(sys, "frozen"):
+                cacert_resource = get_resource("cacert.pem")
+                if cacert_resource is not None and os.path.isfile(cacert_resource):
+                    cacert = cacert_resource
+                else:
+                    log.error("The SSL certificate bundle file '{}' could not be found".format(cacert_resource))
 
-            context = {
+            # Don't send log records as events.
+            sentry_logging = LoggingIntegration(level=logging.INFO, event_level=None)
+
+            sentry_sdk.init(dsn=CrashReport.DSN,
+                            release=__version__,
+                            ca_certs=cacert,
+                            default_integrations=False,
+                            integrations=[sentry_logging])
+
+            tags = {
                 "os:name": platform.system(),
                 "os:release": platform.release(),
                 "os:win_32": " ".join(platform.win32_ver()),
                 "os:mac": "{} {}".format(platform.mac_ver()[0], platform.mac_ver()[2]),
                 "os:linux": " ".join(distro.linux_distribution()),
-                "aiohttp:version": aiohttp.__version__,
+
+            }
+
+            with sentry_sdk.configure_scope() as scope:
+                for key, value in tags.items():
+                    scope.set_tag(key, value)
+
+            extra_context = {
                 "python:version": "{}.{}.{}".format(sys.version_info[0],
                                                     sys.version_info[1],
                                                     sys.version_info[2]),
@@ -113,8 +114,8 @@ class CrashReport:
                 # add locale information
                 try:
                     language, encoding = locale.getlocale()
-                    context["locale:language"] = language
-                    context["locale:encoding"] = encoding
+                    extra_context["locale:language"] = language
+                    extra_context["locale:encoding"] = encoding
                 except ValueError:
                     pass
 
@@ -124,17 +125,47 @@ class CrashReport:
                 if os.path.isfile(gns3vm_version):
                     try:
                         with open(gns3vm_version) as fd:
-                            context["gns3vm:version"] = fd.readline().strip()
+                            extra_context["gns3vm:version"] = fd.readline().strip()
                     except OSError:
                         pass
 
-            self._client.tags_context(context)
-            try:
-                report = self._client.captureException()
-            except Exception as e:
-                log.error("Can't send crash report to Sentry: {}".format(e))
+            with sentry_sdk.configure_scope() as scope:
+                for key, value in extra_context.items():
+                    scope.set_extra(key, value)
+
+    def capture_exception(self, request):
+
+        if not SENTRY_SDK_AVAILABLE:
+            return
+
+        if not hasattr(sys, "frozen") and os.path.exists(os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", ".git")):
+            log.warning(".git directory detected, crash reporting is turned off for developers.")
+            return
+
+        server_config = Config.instance().get_section_config("Server")
+        if server_config.getboolean("report_errors"):
+
+            if not SENTRY_SDK_AVAILABLE:
+                log.warning("Cannot capture exception: Sentry SDK is not available")
                 return
-            log.info("Crash report sent with event ID: {}".format(self._client.get_ident(report)))
+
+            if os.path.exists(".git"):
+                log.warning(".git directory detected, crash reporting is turned off for developers.")
+                return
+
+            try:
+                if request:
+                    # add specific extra request information
+                    with sentry_sdk.push_scope() as scope:
+                        scope.set_extra("method", request.method)
+                        scope.set_extra("url", request.path)
+                        scope.set_extra("json", request.json)
+                        sentry_sdk.capture_exception()
+                else:
+                    sentry_sdk.capture_exception()
+                log.info("Crash report sent with event ID: {}".format(sentry_sdk.last_event_id()))
+            except Exception as e:
+                log.warning("Can't send crash report to Sentry: {}".format(e))
 
     @classmethod
     def instance(cls):

gns3server/handlers/api/compute/docker_handler.py

@@ -412,3 +412,16 @@ class DockerHandler:
         docker_manager = Docker.instance()
         images = await docker_manager.list_images()
         response.json(images)
+
+    @Route.get(
+        r"/projects/{project_id}/docker/nodes/{node_id}/console/ws",
+        description="WebSocket for console",
+        parameters={
+            "project_id": "Project UUID",
+            "node_id": "Node UUID",
+        })
+    async def console_ws(request, response):
+
+        docker_manager = Docker.instance()
+        container = docker_manager.get_node(request.match_info["node_id"], project_id=request.match_info["project_id"])
+        return await container.start_websocket_console(request)

gns3server/handlers/api/compute/dynamips_vm_handler.py

@@ -513,3 +513,15 @@ class DynamipsVMHandler:
         response.set_status(201)
         response.json(new_node)
 
+    @Route.get(
+        r"/projects/{project_id}/dynamips/nodes/{node_id}/console/ws",
+        description="WebSocket for console",
+        parameters={
+            "project_id": "Project UUID",
+            "node_id": "Node UUID",
+        })
+    async def console_ws(request, response):
+
+        dynamips_manager = Dynamips.instance()
+        vm = dynamips_manager.get_node(request.match_info["node_id"], project_id=request.match_info["project_id"])
+        return await vm.start_websocket_console(request)

gns3server/handlers/api/compute/iou_handler.py

@@ -453,3 +453,16 @@ class IOUHandler:
             raise aiohttp.web.HTTPForbidden()
 
         await response.stream_file(image_path)
+
+    @Route.get(
+        r"/projects/{project_id}/iou/nodes/{node_id}/console/ws",
+        description="WebSocket for console",
+        parameters={
+            "project_id": "Project UUID",
+            "node_id": "Node UUID",
+        })
+    async def console_ws(request, response):
+
+        iou_manager = IOU.instance()
+        vm = iou_manager.get_node(request.match_info["node_id"], project_id=request.match_info["project_id"])
+        return await vm.start_websocket_console(request)

gns3server/handlers/api/compute/project_handler.py

@@ -19,12 +19,13 @@ import aiohttp
 import asyncio
 import json
 import os
+import psutil
 import tempfile
 
 from gns3server.web.route import Route
 from gns3server.compute.project_manager import ProjectManager
 from gns3server.compute import MODULES
-from gns3server.utils.ping_stats import PingStats
+from gns3server.utils.cpu_percent import CpuPercent
 
 from gns3server.schemas.project import (
     PROJECT_OBJECT_SCHEMA,
@@ -206,7 +207,11 @@ class ProjectHandler:
 
         :returns: hash
         """
-        return {"action": "ping", "event": PingStats.get()}
+        stats = {}
+        # Non blocking call in order to get cpu usage. First call will return 0
+        stats["cpu_usage_percent"] = CpuPercent.get(interval=None)
+        stats["memory_usage_percent"] = psutil.virtual_memory().percent
+        return {"action": "ping", "event": stats}
 
     @Route.get(
         r"/projects/{project_id}/files",

gns3server/handlers/api/compute/qemu_handler.py

@@ -580,3 +580,16 @@ class QEMUHandler:
             raise aiohttp.web.HTTPForbidden()
 
         await response.stream_file(image_path)
+
+    @Route.get(
+        r"/projects/{project_id}/qemu/nodes/{node_id}/console/ws",
+        description="WebSocket for console",
+        parameters={
+            "project_id": "Project UUID",
+            "node_id": "Node UUID",
+        })
+    async def console_ws(request, response):
+
+        qemu_manager = Qemu.instance()
+        vm = qemu_manager.get_node(request.match_info["node_id"], project_id=request.match_info["project_id"])
+        return await vm.start_websocket_console(request)

gns3server/handlers/api/compute/server_handler.py

@@ -23,9 +23,9 @@ from gns3server.config import Config
 from gns3server.schemas.version import VERSION_SCHEMA
 from gns3server.schemas.server_statistics import SERVER_STATISTICS_SCHEMA
 from gns3server.compute.port_manager import PortManager
+from gns3server.utils.cpu_percent import CpuPercent
 from gns3server.version import __version__
 from aiohttp.web import HTTPConflict
-from psutil._common import bytes2human
 
 
 class ServerHandler:
@@ -57,7 +57,7 @@ class ServerHandler:
             swap_total = psutil.swap_memory().total
             swap_free = psutil.swap_memory().free
             swap_used = psutil.swap_memory().used
-            cpu_percent = int(psutil.cpu_percent())
+            cpu_percent = int(CpuPercent.get())
             load_average_percent = [int(x / psutil.cpu_count() * 100) for x in psutil.getloadavg()]
             memory_percent = int(psutil.virtual_memory().percent)
             swap_percent = int(psutil.swap_memory().percent)

gns3server/handlers/api/compute/virtualbox_handler.py

@@ -424,3 +424,16 @@ class VirtualBoxHandler:
         vbox_manager = VirtualBox.instance()
         vms = await vbox_manager.list_vms()
         response.json(vms)
+
+    @Route.get(
+        r"/projects/{project_id}/virtualbox/nodes/{node_id}/console/ws",
+        description="WebSocket for console",
+        parameters={
+            "project_id": "Project UUID",
+            "node_id": "Node UUID",
+        })
+    async def console_ws(request, response):
+
+        virtualbox_manager = VirtualBox.instance()
+        vm = virtualbox_manager.get_node(request.match_info["node_id"], project_id=request.match_info["project_id"])
+        return await vm.start_websocket_console(request)

gns3server/handlers/api/compute/vmware_handler.py

@@ -409,3 +409,16 @@ class VMwareHandler:
         vmware_manager = VMware.instance()
         vms = await vmware_manager.list_vms()
         response.json(vms)
+
+    @Route.get(
+        r"/projects/{project_id}/vmware/nodes/{node_id}/console/ws",
+        description="WebSocket for console",
+        parameters={
+            "project_id": "Project UUID",
+            "node_id": "Node UUID",
+        })
+    async def console_ws(request, response):
+
+        vmware_manager = VMware.instance()
+        vm = vmware_manager.get_node(request.match_info["node_id"], project_id=request.match_info["project_id"])
+        return await vm.start_websocket_console(request)

gns3server/handlers/api/compute/vpcs_handler.py

@@ -362,3 +362,16 @@ class VPCSHandler:
         port_number = int(request.match_info["port_number"])
         nio = vm.get_nio(port_number)
         await vpcs_manager.stream_pcap_file(nio, vm.project.id, request, response)
+
+    @Route.get(
+        r"/projects/{project_id}/vpcs/nodes/{node_id}/console/ws",
+        description="WebSocket for console",
+        parameters={
+            "project_id": "Project UUID",
+            "node_id": "Node UUID",
+        })
+    async def console_ws(request, response):
+
+        vpcs_manager = VPCS.instance()
+        vm = vpcs_manager.get_node(request.match_info["node_id"], project_id=request.match_info["project_id"])
+        return await vm.start_websocket_console(request)

gns3server/handlers/api/controller/node_handler.py

@@ -16,6 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import aiohttp
+import asyncio
 
 from gns3server.web.route import Route
 from gns3server.controller import Controller
@@ -453,3 +454,57 @@ class NodeHandler:
         data = await request.content.read()  #FIXME: are we handling timeout or large files correctly?
         await node.compute.http_query("POST", "/projects/{project_id}/files{path}".format(project_id=project.id, path=path), data=data, timeout=None, raw=True)
         response.set_status(201)
+
+    @Route.get(
+        r"/projects/{project_id}/nodes/{node_id}/console/ws",
+        parameters={
+            "project_id": "Project UUID",
+            "node_id": "Node UUID"
+        },
+        description="Connect to WebSocket console",
+        status_codes={
+            200: "File returned",
+            403: "Permission denied",
+            404: "The file doesn't exist"
+        })
+    async def ws_console(request, response):
+
+        project = await Controller.instance().get_loaded_project(request.match_info["project_id"])
+        node = project.get_node(request.match_info["node_id"])
+        compute = node.compute
+        ws = aiohttp.web.WebSocketResponse()
+        await ws.prepare(request)
+        request.app['websockets'].add(ws)
+
+        ws_console_compute_url = "ws://{compute_host}:{compute_port}/v2/compute/projects/{project_id}/{node_type}/nodes/{node_id}/console/ws".format(compute_host=compute.host,
+                                                                                                                                                     compute_port=compute.port,
+                                                                                                                                                     project_id=project.id,
+                                                                                                                                                     node_type=node.node_type,
+                                                                                                                                                     node_id=node.id)
+
+        async def ws_forward(ws_client):
+            async for msg in ws:
+                if msg.type == aiohttp.WSMsgType.TEXT:
+                    await ws_client.send_str(msg.data)
+                elif msg.type == aiohttp.WSMsgType.BINARY:
+                    await ws_client.send_bytes(msg.data)
+                elif msg.type == aiohttp.WSMsgType.ERROR:
+                    break
+
+        try:
+            async with aiohttp.ClientSession(connector=aiohttp.TCPConnector(limit=None, force_close=True)) as session:
+                async with session.ws_connect(ws_console_compute_url) as ws_client:
+                    asyncio.ensure_future(ws_forward(ws_client))
+                    async for msg in ws_client:
+                        if msg.type == aiohttp.WSMsgType.TEXT:
+                            await ws.send_str(msg.data)
+                        elif msg.type == aiohttp.WSMsgType.BINARY:
+                            await ws.send_bytes(msg.data)
+                        elif msg.type == aiohttp.WSMsgType.ERROR:
+                            break
+        finally:
+            if not ws.closed:
+                await ws.close()
+            request.app['websockets'].discard(ws)
+
+        return ws

gns3server/handlers/api/controller/project_handler.py

@@ -35,7 +35,8 @@ from gns3server.schemas.project import (
     PROJECT_OBJECT_SCHEMA,
     PROJECT_UPDATE_SCHEMA,
     PROJECT_LOAD_SCHEMA,
-    PROJECT_CREATE_SCHEMA
+    PROJECT_CREATE_SCHEMA,
+    PROJECT_DUPLICATE_SCHEMA
 )
 
 import logging
@@ -313,6 +314,11 @@ class ProjectHandler:
             include_images = True
         else:
             include_images = False
+        if request.query.get("reset_mac_addresses", "no").lower() == "yes":
+            reset_mac_addresses = True
+        else:
+            reset_mac_addresses = False
+
         compression_query = request.query.get("compression", "zip").lower()
         if compression_query == "zip":
             compression = zipfile.ZIP_DEFLATED
@@ -327,7 +333,7 @@ class ProjectHandler:
             begin = time.time()
             with tempfile.TemporaryDirectory() as tmp_dir:
                 with aiozipstream.ZipFile(compression=compression) as zstream:
-                    await export_project(zstream, project, tmp_dir, include_snapshots=include_snapshots, include_images=include_images)
+                    await export_project(zstream, project, tmp_dir, include_snapshots=include_snapshots, include_images=include_images, reset_mac_addresses=reset_mac_addresses)
 
                     # We need to do that now because export could failed and raise an HTTP error
                     # that why response start need to be the later possible
@@ -398,7 +404,7 @@ class ProjectHandler:
         parameters={
             "project_id": "Project UUID",
         },
-        input=PROJECT_CREATE_SCHEMA,
+        input=PROJECT_DUPLICATE_SCHEMA,
         output=PROJECT_OBJECT_SCHEMA,
         status_codes={
             201: "Project duplicate",
@@ -419,7 +425,9 @@ class ProjectHandler:
         else:
             location = None
 
-        new_project = await project.duplicate(name=request.json.get("name"), location=location)
+        reset_mac_addresses = request.json.get("reset_mac_addresses", False)
+
+        new_project = await project.duplicate(name=request.json.get("name"), location=location, reset_mac_addresses=reset_mac_addresses)
 
         response.json(new_project)
         response.set_status(201)

gns3server/handlers/api/controller/snapshot_handler.py

@@ -40,7 +40,7 @@ class SnapshotHandler:
         input=SNAPSHOT_CREATE_SCHEMA,
         output=SNAPSHOT_OBJECT_SCHEMA,
         status_codes={
-            201: "Snasphot created",
+            201: "Snapshot created",
             404: "The project doesn't exist"
         })
     async def create(request, response):
@@ -57,21 +57,21 @@ class SnapshotHandler:
             "project_id": "Project UUID",
         },
         status_codes={
-            200: "Snasphot list returned",
+            200: "Snapshot list returned",
             404: "The project doesn't exist"
         })
     def list(request, response):
         controller = Controller.instance()
         project = controller.get_project(request.match_info["project_id"])
         snapshots = [s for s in project.snapshots.values()]
-        response.json(sorted(snapshots, key=lambda s: s.created_at))
+        response.json(sorted(snapshots, key=lambda s: (s.created_at, s.name)))
 
     @Route.delete(
         r"/projects/{project_id}/snapshots/{snapshot_id}",
         description="Delete a snapshot from disk",
         parameters={
             "project_id": "Project UUID",
-            "snapshot_id": "Snasphot UUID"
+            "snapshot_id": "Snapshot UUID"
         },
         status_codes={
             204: "Changes have been written on disk",
@@ -89,7 +89,7 @@ class SnapshotHandler:
         description="Restore a snapshot from disk",
         parameters={
             "project_id": "Project UUID",
-            "snapshot_id": "Snasphot UUID"
+            "snapshot_id": "Snapshot UUID"
         },
         output=PROJECT_OBJECT_SCHEMA,
         status_codes={

gns3server/handlers/index_handler.py

@@ -31,7 +31,15 @@ class IndexHandler:
         r"/",
         description="Home page of the GNS3 server"
     )
-    def index(request, response):
+    async def index(request, response):
+
+        raise aiohttp.web.HTTPFound(location="/static/web-ui/bundled")
+
+    @Route.get(
+        r"/debug",
+        description="Old index page"
+    )
+    def upload(request, response):
         response.template("index.html")
 
     @Route.get(

gns3server/notification_queue.py

@@ -17,8 +17,9 @@
 
 import asyncio
 import json
+import psutil
 
-from gns3server.utils.ping_stats import PingStats
+from gns3server.utils.cpu_percent import CpuPercent
 
 
 class NotificationQueue(asyncio.Queue):
@@ -38,14 +39,24 @@ class NotificationQueue(asyncio.Queue):
         # At first get we return a ping so the client immediately receives data
         if self._first:
             self._first = False
-            return ("ping", PingStats.get(), {})
+            return ("ping", self._getPing(), {})
 
         try:
             (action, msg, kwargs) = await asyncio.wait_for(super().get(), timeout)
         except asyncio.TimeoutError:
-            return ("ping", PingStats.get(), {})
+            return ("ping", self._getPing(), {})
         return (action, msg, kwargs)
 
+    def _getPing(self):
+        """
+        Return the content of the ping notification
+        """
+        msg = {}
+        # Non blocking call in order to get cpu usage. First call will return 0
+        msg["cpu_usage_percent"] = CpuPercent.get(interval=None)
+        msg["memory_usage_percent"] = psutil.virtual_memory().percent
+        return msg
+
     async def get_json(self, timeout):
         """
         Get a message as a JSON

gns3server/run.py

@@ -236,13 +236,12 @@ def run():
             return
         log.info("HTTP authentication is enabled with username '{}'".format(user))
 
-    # we only support Python 3 version >= 3.5.3
-    if sys.version_info < (3, 5, 3):
-        raise SystemExit("Python 3.5.3 or higher is required")
+    # we only support Python 3 version >= 3.6
+    if sys.version_info < (3, 6, 0):
+        raise SystemExit("Python 3.6 or higher is required")
 
-    user_log.info("Running with Python {major}.{minor}.{micro} and has PID {pid}".format(
-                  major=sys.version_info[0], minor=sys.version_info[1],
-                  micro=sys.version_info[2], pid=os.getpid()))
+    user_log.info("Running with Python {major}.{minor}.{micro} and has PID {pid}".format(major=sys.version_info[0], minor=sys.version_info[1],
+                                                                                         micro=sys.version_info[2], pid=os.getpid()))
 
     # check for the correct locale (UNIX/Linux only)
     locale_check()
@@ -255,7 +254,6 @@ def run():
 
     CrashReport.instance()
     host = server_config["host"]
-
     port = int(server_config["port"])
 
     server = WebServer.instance(host, port)
@@ -269,10 +267,10 @@ def run():
         log.critical("Critical error while running the server: {}".format(e), exc_info=1)
         CrashReport.instance().capture_exception()
         return
-
-    if args.pid:
-        log.info("Remove PID file %s", args.pid)
-        try:
-            os.remove(args.pid)
-        except OSError as e:
-            log.critical("Can't remove pid file %s: %s", args.pid, str(e))
+    finally:
+        if args.pid:
+            log.info("Remove PID file %s", args.pid)
+            try:
+                os.remove(args.pid)
+            except OSError as e:
+                log.critical("Can't remove pid file %s: %s", args.pid, str(e))

gns3server/schemas/gns3vm.py

@@ -48,6 +48,12 @@ GNS3VM_SETTINGS_SCHEMA = {
         "ram": {
             "description": "Amount of ram affected to the VM",
             "type": "integer"
+        },
+        "port": {
+            "description": "Server port",
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 65535
         }
     },
     "additionalProperties": False

gns3server/schemas/project.py

@@ -15,6 +15,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import copy
+
 SUPPLIER_OBJECT_SCHEMA = {
     "type": ["object", "null"],
     "description": "Supplier of the project",
@@ -120,6 +122,13 @@ PROJECT_CREATE_SCHEMA = {
     "required": ["name"]
 }
 
+# Create a project duplicate schema based on create schema and add "reset_mac_addresses" properties
+PROJECT_DUPLICATE_SCHEMA = copy.deepcopy(PROJECT_CREATE_SCHEMA)
+PROJECT_DUPLICATE_SCHEMA["description"] = "Request validation to duplicate a Project instance"
+PROJECT_DUPLICATE_SCHEMA["properties"].update({"reset_mac_addresses": {"type": "boolean",
+                                                                       "description": "Reset MAC addresses for this project"
+                                                                      }})
+
 PROJECT_UPDATE_SCHEMA = {
     "$schema": "http://json-schema.org/draft-04/schema#",
     "description": "Request validation to update a Project instance",

gns3server/schemas/qemu.py

@@ -186,6 +186,10 @@ QEMU_CREATE_SCHEMA = {
             "description": "Use QEMU legagy networking commands (-net syntax)",
             "type": ["boolean", "null"],
         },
+        "replicate_network_connection_state": {
+            "description": "Replicate the network connection state for links in Qemu",
+            "type": ["boolean", "null"],
+        },
         "on_close": {
             "description": "Action to execute on the VM is closed",
             "enum": ["power_off", "shutdown_signal", "save_vm_state"],
@@ -372,6 +376,10 @@ QEMU_UPDATE_SCHEMA = {
             "description": "Use QEMU legagy networking commands (-net syntax)",
             "type": ["boolean", "null"],
         },
+        "replicate_network_connection_state": {
+            "description": "Replicate the network connection state for links in Qemu",
+            "type": ["boolean", "null"],
+        },
         "on_close": {
             "description": "Action to execute on the VM is closed",
             "enum": ["power_off", "shutdown_signal", "save_vm_state"],
@@ -571,6 +579,10 @@ QEMU_OBJECT_SCHEMA = {
             "description": "Use QEMU legagy networking commands (-net syntax)",
             "type": "boolean",
         },
+        "replicate_network_connection_state": {
+            "description": "Replicate the network connection state for links in Qemu",
+            "type": "boolean",
+        },
         "on_close": {
             "description": "Action to execute on the VM is closed",
             "enum": ["power_off", "shutdown_signal", "save_vm_state"],
@@ -640,6 +652,7 @@ QEMU_OBJECT_SCHEMA = {
                  "kernel_image_md5sum",
                  "kernel_command_line",
                  "legacy_networking",
+                 "replicate_network_connection_state",
                  "on_close",
                  "cpu_throttling",
                  "process_priority",

gns3server/schemas/qemu_template.py

@@ -178,6 +178,11 @@ QEMU_TEMPLATE_PROPERTIES = {
         "type": "boolean",
         "default": False
     },
+    "replicate_network_connection_state": {
+        "description": "Replicate the network connection state for links in Qemu",
+        "type": "boolean",
+        "default": True
+    },
     "on_close": {
         "description": "Action to execute on the VM is closed",
         "enum": ["power_off", "shutdown_signal", "save_vm_state"],

gns3server/static/web-ui/3rdpartylicenses.txt

@@ -2682,6 +2682,30 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
+webpack
+MIT
+Copyright JS Foundation and other contributors
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
 xterm
 MIT
 Copyright (c) 2017-2019, The xterm.js authors (https://github.com/xtermjs/xterm.js)

gns3server/static/web-ui/ReleaseNotes.txt

@@ -1,6 +1,68 @@
 GNS3 WebUI is web implementation of user interface for GNS3 software.
 
-Current version: GNS3 Web UI 2020.2.0
+Current version: 2020.2.0-beta.5
+
+Bug Fixes
+
+- Bug in symbol selection
+- Same question is asked after going back to project
+- Cannot read property 'forEach' of undefined
+- Error when selecting existing Docker image
+- Invalid property when adding VMware VM template
+- Invalid type for adapters field when adding Docker template
+- Prevent user to move to another step when adding template
+- Web UI cannot set flag "Leave this project running in the background after closing"
+
+What's new
+- Default values in templates
+- New option for Qemu VMs
+- Ability to quickly change Hostname from right click
+- Progress bar for node creation
+
+GNS3 Web UI 2020.2.0-beta.4
+
+Bug Fixes
+- New port setting for GNS3 VM preferences
+- Option to auto-hide menu toolbar on the left side
+- Server type in template preferences
+- Error when selecting existing Docker image
+- Default values in templates
+- TypeError: Cannot read property 'message' of undefined
+- TypeError: e.error is undefined
+- TypeError: Cannot read property 'placements' of null
+- Creating IOS templates -> fix for platforms and network adapters
+
+GNS3 Web UI 2020.2.0-beta.2
+
+What's New
+- Drag & drop to add new nodes on topology
+- Option to minimize/maximize and hide console widget
+- Ability to add IOS templates
+- Node names in HTTP console tabs
+- Default settings for templates
+- Support for adding IOS images
+- Node dialog updated
+- Messages with description in toasts
+- Adding interfaces to cloud nodes
+- Changes in notification box mechanism (once per day option)
+- Additional tooltips added
+- Copy/paste options in console (only Chrome full support)
+- More details for server failed connections
+
+Bug Fixes
+- Fix for console icons
+- Fix for creating ethernet switches and hubs
+- Fix for opening console from context menu
+- Qemu configurator now works properly
+- Fixes in snap to grid option
+- Symbols preview now works correctly
+- Error messages in preferences should be displayed
+- Default values for New Ethernet devices in configurator
+- Fix for wrong adapter types in Qemu
+- Fix for fit in view option on Firefox
+- Fix for navigation errors
+
+GNS3 Web UI 2020.2.0-beta.1
 
 What's New
 - Support for suspended status added

gns3server/static/web-ui/index.html

@@ -48,5 +48,5 @@
 
       gtag('config', 'G-5D6FZL9923');
     </script>
-  <script src="runtime.a8ef3a8272419c2e2c66.js" defer></script><script src="polyfills-es5.adfecedb3e8b94a475d4.js" nomodule defer></script><script src="polyfills.312ad1f991887572d9bc.js" defer></script><script src="main.aa6cb03c3f73db41a2a8.js" defer></script></body>
+  <script src="runtime.a8ef3a8272419c2e2c66.js" defer></script><script src="polyfills-es5.849120501c8352255eba.js" nomodule defer></script><script src="polyfills.8da7948d04c4164345d4.js" defer></script><script src="main.d57a9d38b9770af301d8.js" defer></script></body>
 </html>

gns3server/static/web-ui/main.aa6cb03c3f73db41a2a8.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["./node_modules/css-tree/lib/syntax/node/Declaration.js","./node_modules/css-tree/lib/syntax/function/var.js","./node_modules/rxjs/_esm5/internal/operators/throttle.js.pre-build-optimizer.js","./node_modules/angular2-hotkeys/src/hotkey.options.js","./node_modules/rxjs/_esm5/internal/util/subscribeToArray.js.pre-build-optimizer.js","./node_modules/rxjs/_esm5/internal/util/noop.js.pre-build-optimizer.js","./node_modules/css-tree/lib/lexer/trace.js","./node_modules/rxjs/_esm5/internal/util/isNumeric.js.pre-build-optimizer.js","./node_modules/css-tree/lib/syntax/node/Selector.js","./node_modules/rxjs/_esm5/internal/operators/withLatestFrom.js.pre-build-optimizer.js","./node_modules/xterm/lib/xterm.js","./node_modules/rxjs/_esm5/internal/util/isPromise.js.pre-build-optimizer.js","./node_modules/rxjs/_esm5/internal/operators/sampleTime.js.pre-build-optimizer.js","./node_modules/css-tree/lib/lexer/generic-an-plus-b.js","./node_modules/rxjs/_esm5/internal/observable/from.js.pre-build-optimizer.js","./node_modules/css-tree/lib/syntax/node/Value.js","./node_modules/rxjs/_esm5/internal/operators/skipUntil.js.pre-build-optimizer.js","./node_modules/rxjs/_esm5/internal/operators/skip.js.pre-build-optimizer.js","./node_modules/rxjs/_esm5/internal/operators/timeout.js.pre-build-optimizer.js","./node_modules/rxjs/_esm5/internal/operators/skipLast.js.pre-build-optimizer.js","./node_modules/rxjs/_esm5/internal/operators/switchMap.js.pre-build-optimizer.js","./node_modules/css-tree/lib/common/SyntaxError.js","./node_modules/rxjs/_esm5/internal/util/canReportError.js.pre-build-optimizer.js","./node_modules/rxjs/_esm5/internal/BehaviorSubject.js.pre-build-optimizer.js","./node_modules/rxjs/_esm5/internal/util/isFunction.js.pre-build-optimizer.js","./node_modules/css-tree/lib/syntax/node/AttributeSelector.js","./node_modules/css-tree/lib/lexer/generic-urange.js","./node_modules/rxjs/_esm5/internal/operators/finalize.js.pre-build-optimizer.js","./node_modules/rxjs/_esm5/internal/util/isArrayLike.js.pre-build-optimizer.js","./node_modules/css-tree/lib/syntax/pseudo/common/selectorList.js","./node_modules/raven-js/vendor/md5/md5.js.pre-build-optimizer.js","./node_modules/rxjs/_esm5/internal/operators/exhaust.js.pre-build-optimizer.js","./node_modules/css-tree/lib/syntax/node/MediaQuery.js","./node_modules/rxjs/_esm5/internal/operators/publishBehavior.js.pre-build-optimizer.js","./node_modules/rxjs/_esm5/internal/util/TimeoutError.js.pre-build-optimizer.js","./node_modules/css-tree/lib/tokenizer/char-code-definitions.js","./node_modules/rxjs/_esm5/internal/util/EmptyError.js.pre-build-optimizer.js","./node_modules/rxjs/_esm5/internal/operators/dematerialize.js.pre-build-optimizer.js","./node_modules/css-tree/lib/walker/create.js","./node_modules/raven-js/vendor/TraceKit/tracekit.js.pre-build-optimizer.js","./node_modules/uuid/lib/rng-browser.js","./node_modules/css-tree/lib/syntax/node/Raw.js","./node_modules/css-tree/lib/syntax/node/index.js","./node_modules/rxjs/_esm5/internal/operators/timestamp.js.pre-build-optimizer.js","./node_modules/rxjs/_esm5/internal/operators/retry.js.pre-build-optimizer.js","./node_modules/rxjs/_esm5/internal/Notification.js.pre-build-optimizer.js","./node_modules/rxjs/_esm5/internal/operators/map.js.pre-build-optimizer.js","./node_modules/rxjs/_esm5/internal/operators/count.js.pre-build-optimizer.js","./node_modules/css-tree/lib/syntax/node/StyleSheet.js","./node_modules/rxjs/_esm5/internal/operators/exhaustMap.js.pre-build-optimizer.js","./node_modules/rxjs/_esm5/internal/Observer.js.pre-build-optimizer.js","./node_modules/rxjs/_esm5/internal/Observable.js.pre-build-optimizer.js","./node_modules/rxjs/_esm5/internal/util/toSubscriber.js.pre-build-optimizer.js","./node_modules/css-tree/lib/syntax/atrule/index.js","./node_modules/rxjs/_esm5/internal/operators/timeInterval.js.pre-build-optimizer.js","./node_modules/create-point-cb/dist/bundle.js","./node_modules/css-tree/lib/syntax/scope/default.js","./node_modules/rxjs/_esm5/internal/observable/using.js.pre-build-optimizer.js","./node_modules/css-tree/lib/syntax/scope/index.js","../node_modules/xterm-addon-fit/lib/xterm-addon-fit.js","./node_modules/css-tree/lib/syntax/config/mix.js","./node_modules/rxjs/_esm5/internal/util/ObjectUnsubscribedError.js.pre-build-optimizer.js","./node_modules/css-tree/lib/syntax/node/Combinator.js","./node_modules/css-tree/lib/common/TokenStream.js","./node_modules/rxjs/_esm5/internal/observable/zip.js.pre-build-optimizer.js","./node_modules/css-tree/lib/syntax/node/HexColor.js","./node_modules/rxjs/_esm5/internal/operators/catchError.js.pre-build-optimizer.js","./node_modules/rxjs/_esm5/internal/observable/SubscribeOnObservable.js.pre-build-optimizer.js","./node_modules/rxjs/_esm5/internal/operators/subscribeOn.js.pre-build-optimizer.js","./node_modules/rxjs/_esm5/internal/operators/throttleTime.js.pre-build-optimizer.js","./node_modules/raven-js/src/console.js.pre-build-optimizer.js","./node_moduleLine truncated

gns3server/static/web-ui/main.d57a9d38b9770af301d8.js

@@ -1 +1 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([[1],{"+/L5":function(n,e,t){var l=t("t1UP").isCustomProperty,o=t("vd7W").TYPE,i=t("4njK").mode,r=o.Ident,a=o.Hash,u=o.Colon,s=o.Semicolon,d=o.Delim,c=33,p=35,f=36,h=38,m=42,v=43,g=47;function b(n){return this.Raw(n,i.exclamationMarkOrSemicolon,!0)}function _(n){return this.Raw(n,i.exclamationMarkOrSemicolon,!1)}function y(){var n=this.scanner.tokenIndex,e=this.Value();return"Raw"!==e.type&&!1===this.scanner.eof&&this.scanner.tokenType!==s&&!1===this.scanner.isDelim(c)&&!1===this.scanner.isBalanceEdge(n)&&this.error(),e}function C(){var n=this.scanner.tokenStart;if(this.scanner.tokenType===d)switch(this.scanner.source.charCodeAt(this.scanner.tokenStart)){case m:case f:case v:case p:case h:this.scanner.next();break;case g:this.scanner.next(),this.scanner.isDelim(g)&&this.scanner.next()}return this.eat(this.scanner.tokenType===a?a:r),this.scanner.substrToCursor(n)}function w(){this.eat(d),this.scanner.skipSC();var n=this.consume(r);return"important"===n||n}n.exports={name:"Declaration",structure:{important:[Boolean,String],property:String,value:["Value","Raw"]},parse:function(){var n,e=this.scanner.tokenStart,t=this.scanner.tokenIndex,o=C.call(this),i=l(o),r=i?this.parseCustomProperty:this.parseValue,a=i?_:b,d=!1;return this.scanner.skipSC(),this.eat(u),i||this.scanner.skipSC(),n=r?this.parseWithFallback(y,a):a.call(this,this.scanner.tokenIndex),this.scanner.isDelim(c)&&(d=w.call(this),this.scanner.skipSC()),!1===this.scanner.eof&&this.scanner.tokenType!==s&&!1===this.scanner.isBalanceEdge(t)&&this.error(),{type:"Declaration",loc:this.getLocation(e,this.scanner.tokenStart),important:d,property:o,value:n}},generate:function(n){this.chunk(n.property),this.chunk(":"),this.node(n.value),n.important&&this.chunk(!0===n.important?"!important":"!"+n.important)},walkContext:"declaration"}},"+Kd2":function(n,e,t){var l=t("vd7W").TYPE,o=t("4njK").mode,i=l.Comma;n.exports=function(){var n=this.createList();return this.scanner.skipSC(),n.push(this.Identifier()),this.scanner.skipSC(),this.scanner.tokenType===i&&(n.push(this.Operator()),n.push(this.parseCustomProperty?this.Value(null):this.Raw(this.scanner.tokenIndex,o.exclamationMarkOrSemicolon,!1))),n}},"+gEr":function(n,e,t){"use strict";t.d(e,"a",(function(){return r})),t.d(e,"b",(function(){return a}));var l=t("mrSG"),o=t("MGBS"),i=t("zotm"),r={leading:!0,trailing:!1};function a(n,e){return void 0===e&&(e=r),function(t){return t.lift(new u(n,e.leading,e.trailing))}}var u=function(){function n(n,e,t){this.durationSelector=n,this.leading=e,this.trailing=t}return n.prototype.call=function(n,e){return e.subscribe(new s(n,this.durationSelector,this.leading,this.trailing))},n}(),s=function(n){function e(e,t,l,o){var i=n.call(this,e)||this;return i.destination=e,i.durationSelector=t,i._leading=l,i._trailing=o,i._hasValue=!1,i}return l.c(e,n),e.prototype._next=function(n){this._hasValue=!0,this._sendValue=n,this._throttled||(this._leading?this.send():this.throttle(n))},e.prototype.send=function(){var n=this._sendValue;this._hasValue&&(this.destination.next(n),this.throttle(n)),this._hasValue=!1,this._sendValue=null},e.prototype.throttle=function(n){var e=this.tryDurationSelector(n);e&&this.add(this._throttled=Object(i.a)(this,e))},e.prototype.tryDurationSelector=function(n){try{return this.durationSelector(n)}catch(e){return this.destination.error(e),null}},e.prototype.throttlingDone=function(){var n=this._throttled,e=this._trailing;n&&n.unsubscribe(),this._throttled=null,e&&this.send()},e.prototype.notifyNext=function(n,e,t,l,o){this.throttlingDone()},e.prototype.notifyComplete=function(){this.throttlingDone()},e}(o.a)},"+ryv":function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var l=t("CcnG");e.HotkeyOptions=new l.InjectionToken("HotkeyOptions")},"+tJ4":function(n,e,t){"use strict";t.d(e,"a",(function(){return l}));var l=function(n){return function(e){for(var t=0,l=n.length;t<l&&!e.closed;t++)e.next(n[t]);e.complete()}}},"+umK":function(n,e,t){"use strict";function l(){}t.d(e,"a",(function(){return l}))},"/+5V":function(n,e){function t(n){function e(n){return null!==n&&("Type"===n.type||"Property"===n.type||"Keyword"===n.type)}var t=null;return null!==this.matched&&function l(o){if(Array.isArray(o.match)){for(var i=0;i<o.match.length;i++)if(l(o.match[i]))return e(o.syntax)&&t.unshift(o.syntax),!0}else if(o.node===n)return t=e(o.syntax)?[o.syntax]:[],!0;return!1}(this.matched),t}function l(n,e,l){var o=t.call(n,e);return null!==o&&o.some(l)}n.exports={getTrace:t,isType:function(n,e){return l(this,n,(function(n){return"Type"===n.type&&n.name===e}))},isProperty:function(n,e){return l(this,n,(function(n){return"Property"===n.type&&n.name===e}))},isKeyword:function(n){return l(this,n,(function(n){return"Keyword"===n.type}))}}},"/21U":function(n,e,t){"use strict";t.d(e,"a",(function(){return o}));var l=t("isby");function o(n){return!Object(l.a)(n)&&n-parseFloat(n)+1>=0}},"/BcF":function(n,e){n.exports={nLine truncated
+(window.webpackJsonp=window.webpackJsonp||[]).push([[1],{"+/L5":function(n,e,t){var l=t("t1UP").isCustomProperty,o=t("vd7W").TYPE,i=t("4njK").mode,r=o.Ident,a=o.Hash,u=o.Colon,s=o.Semicolon,d=o.Delim,c=33,p=35,f=36,h=38,m=42,v=43,g=47;function b(n){return this.Raw(n,i.exclamationMarkOrSemicolon,!0)}function _(n){return this.Raw(n,i.exclamationMarkOrSemicolon,!1)}function y(){var n=this.scanner.tokenIndex,e=this.Value();return"Raw"!==e.type&&!1===this.scanner.eof&&this.scanner.tokenType!==s&&!1===this.scanner.isDelim(c)&&!1===this.scanner.isBalanceEdge(n)&&this.error(),e}function C(){var n=this.scanner.tokenStart;if(this.scanner.tokenType===d)switch(this.scanner.source.charCodeAt(this.scanner.tokenStart)){case m:case f:case v:case p:case h:this.scanner.next();break;case g:this.scanner.next(),this.scanner.isDelim(g)&&this.scanner.next()}return this.eat(this.scanner.tokenType===a?a:r),this.scanner.substrToCursor(n)}function w(){this.eat(d),this.scanner.skipSC();var n=this.consume(r);return"important"===n||n}n.exports={name:"Declaration",structure:{important:[Boolean,String],property:String,value:["Value","Raw"]},parse:function(){var n,e=this.scanner.tokenStart,t=this.scanner.tokenIndex,o=C.call(this),i=l(o),r=i?this.parseCustomProperty:this.parseValue,a=i?_:b,d=!1;return this.scanner.skipSC(),this.eat(u),i||this.scanner.skipSC(),n=r?this.parseWithFallback(y,a):a.call(this,this.scanner.tokenIndex),this.scanner.isDelim(c)&&(d=w.call(this),this.scanner.skipSC()),!1===this.scanner.eof&&this.scanner.tokenType!==s&&!1===this.scanner.isBalanceEdge(t)&&this.error(),{type:"Declaration",loc:this.getLocation(e,this.scanner.tokenStart),important:d,property:o,value:n}},generate:function(n){this.chunk(n.property),this.chunk(":"),this.node(n.value),n.important&&this.chunk(!0===n.important?"!important":"!"+n.important)},walkContext:"declaration"}},"+Kd2":function(n,e,t){var l=t("vd7W").TYPE,o=t("4njK").mode,i=l.Comma;n.exports=function(){var n=this.createList();return this.scanner.skipSC(),n.push(this.Identifier()),this.scanner.skipSC(),this.scanner.tokenType===i&&(n.push(this.Operator()),n.push(this.parseCustomProperty?this.Value(null):this.Raw(this.scanner.tokenIndex,o.exclamationMarkOrSemicolon,!1))),n}},"+gEr":function(n,e,t){"use strict";t.d(e,"a",(function(){return r})),t.d(e,"b",(function(){return a}));var l=t("mrSG"),o=t("MGBS"),i=t("zotm"),r={leading:!0,trailing:!1};function a(n,e){return void 0===e&&(e=r),function(t){return t.lift(new u(n,e.leading,e.trailing))}}var u=function(){function n(n,e,t){this.durationSelector=n,this.leading=e,this.trailing=t}return n.prototype.call=function(n,e){return e.subscribe(new s(n,this.durationSelector,this.leading,this.trailing))},n}(),s=function(n){function e(e,t,l,o){var i=n.call(this,e)||this;return i.destination=e,i.durationSelector=t,i._leading=l,i._trailing=o,i._hasValue=!1,i}return l.c(e,n),e.prototype._next=function(n){this._hasValue=!0,this._sendValue=n,this._throttled||(this._leading?this.send():this.throttle(n))},e.prototype.send=function(){var n=this._sendValue;this._hasValue&&(this.destination.next(n),this.throttle(n)),this._hasValue=!1,this._sendValue=null},e.prototype.throttle=function(n){var e=this.tryDurationSelector(n);e&&this.add(this._throttled=Object(i.a)(this,e))},e.prototype.tryDurationSelector=function(n){try{return this.durationSelector(n)}catch(e){return this.destination.error(e),null}},e.prototype.throttlingDone=function(){var n=this._throttled,e=this._trailing;n&&n.unsubscribe(),this._throttled=null,e&&this.send()},e.prototype.notifyNext=function(n,e,t,l,o){this.throttlingDone()},e.prototype.notifyComplete=function(){this.throttlingDone()},e}(o.a)},"+ryv":function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var l=t("CcnG");e.HotkeyOptions=new l.InjectionToken("HotkeyOptions")},"+tJ4":function(n,e,t){"use strict";t.d(e,"a",(function(){return l}));var l=function(n){return function(e){for(var t=0,l=n.length;t<l&&!e.closed;t++)e.next(n[t]);e.complete()}}},"+umK":function(n,e,t){"use strict";function l(){}t.d(e,"a",(function(){return l}))},"/+5V":function(n,e){function t(n){function e(n){return null!==n&&("Type"===n.type||"Property"===n.type||"Keyword"===n.type)}var t=null;return null!==this.matched&&function l(o){if(Array.isArray(o.match)){for(var i=0;i<o.match.length;i++)if(l(o.match[i]))return e(o.syntax)&&t.unshift(o.syntax),!0}else if(o.node===n)return t=e(o.syntax)?[o.syntax]:[],!0;return!1}(this.matched),t}function l(n,e,l){var o=t.call(n,e);return null!==o&&o.some(l)}n.exports={getTrace:t,isType:function(n,e){return l(this,n,(function(n){return"Type"===n.type&&n.name===e}))},isProperty:function(n,e){return l(this,n,(function(n){return"Property"===n.type&&n.name===e}))},isKeyword:function(n){return l(this,n,(function(n){return"Keyword"===n.type}))}}},"/21U":function(n,e,t){"use strict";t.d(e,"a",(function(){return o}));var l=t("isby");function o(n){return!Object(l.a)(n)&&n-parseFloat(n)+1>=0}},"/BcF":function(n,e){n.exports={nLine truncated

gns3server/static/web-ui/polyfills-es5.849120501c8352255eba.js

@@ -0,0 +1 @@
+(window.webpackJsonp=window.webpackJsonp||[]).push([[3],{"+5Eg":function(t,e,n){var r=n("wA6s"),o=n("6XUM"),i=n("M7Xk").onFreeze,a=n("cZY6"),c=n("rG8t"),u=Object.seal;r({target:"Object",stat:!0,forced:c((function(){u(1)})),sham:!a},{seal:function(t){return u&&o(t)?u(i(t)):t}})},"+IJR":function(t,e,n){n("wA6s")({target:"Number",stat:!0},{isNaN:function(t){return t!=t}})},"/AsP":function(t,e,n){var r=n("yIiL"),o=n("SDMg"),i=r("keys");t.exports=function(t){return i[t]||(i[t]=o(t))}},"/Ybd":function(t,e,n){var r=n("T69T"),o=n("XdSI"),i=n("F26l"),a=n("LdO1"),c=Object.defineProperty;e.f=r?c:function(t,e,n){if(i(t),e=a(e,!0),i(n),o)try{return c(t,e,n)}catch(r){}if("get"in n||"set"in n)throw TypeError("Accessors not supported");return"value"in n&&(t[e]=n.value),t}},"0Ds2":function(t,e,n){var r=n("m41k")("match");t.exports=function(t){var e=/./;try{"/./"[t](e)}catch(n){try{return e[r]=!1,"/./"[t](e)}catch(o){}}return!1}},"0luR":function(t,e,n){"use strict";var r=n("wA6s"),o=n("T69T"),i=n("ocAm"),a=n("OG5q"),c=n("6XUM"),u=n("/Ybd").f,s=n("NIlc"),f=i.Symbol;if(o&&"function"==typeof f&&(!("description"in f.prototype)||void 0!==f().description)){var l={},p=function(){var t=arguments.length<1||void 0===arguments[0]?void 0:String(arguments[0]),e=this instanceof p?new f(t):void 0===t?f():f(t);return""===t&&(l[e]=!0),e};s(p,f);var h=p.prototype=f.prototype;h.constructor=p;var v=h.toString,d="Symbol(test)"==String(f("test")),g=/^Symbol\((.*)\)[^)]+$/;u(h,"description",{configurable:!0,get:function(){var t=c(this)?this.valueOf():this,e=v.call(t);if(a(l,t))return"";var n=d?e.slice(7,-1):e.replace(g,"$1");return""===n?void 0:n}}),r({global:!0,forced:!0},{Symbol:p})}},1:function(t,e,n){n("mRIq"),t.exports=n("hN/g")},"149L":function(t,e,n){var r=n("Ew/G");t.exports=r("document","documentElement")},"1p6F":function(t,e,n){var r=n("6XUM"),o=n("ezU2"),i=n("m41k")("match");t.exports=function(t){var e;return r(t)&&(void 0!==(e=t[i])?!!e:"RegExp"==o(t))}},"2MGJ":function(t,e,n){var r=n("ocAm"),o=n("yIiL"),i=n("HEFl"),a=n("OG5q"),c=n("Fqhe"),u=n("uxAC"),s=n("XH/I"),f=s.get,l=s.enforce,p=String(u).split("toString");o("inspectSource",(function(t){return u.call(t)})),(t.exports=function(t,e,n,o){var u=!!o&&!!o.unsafe,s=!!o&&!!o.enumerable,f=!!o&&!!o.noTargetGet;"function"==typeof n&&("string"!=typeof e||a(n,"name")||i(n,"name",e),l(n).source=p.join("string"==typeof e?e:"")),t!==r?(u?!f&&t[e]&&(s=!0):delete t[e],s?t[e]=n:i(t,e,n)):s?t[e]=n:c(e,n)})(Function.prototype,"toString",(function(){return"function"==typeof this&&f(this).source||u.call(this)}))},"2RDa":function(t,e,n){var r=n("F26l"),o=n("5y2d"),i=n("aAjO"),a=n("yQMY"),c=n("149L"),u=n("qx7X"),s=n("/AsP")("IE_PROTO"),f=function(){},l=function(){var t,e=u("iframe"),n=i.length;for(e.style.display="none",c.appendChild(e),e.src=String("javascript:"),(t=e.contentWindow.document).open(),t.write("<script>document.F=Object<\/script>"),t.close(),l=t.F;n--;)delete l.prototype[i[n]];return l()};t.exports=Object.create||function(t,e){var n;return null!==t?(f.prototype=r(t),n=new f,f.prototype=null,n[s]=t):n=l(),void 0===e?n:o(n,e)},a[s]=!0},"3caY":function(t,e,n){var r=n("wA6s"),o=Math.asinh,i=Math.log,a=Math.sqrt;r({target:"Math",stat:!0,forced:!(o&&1/o(0)>0)},{asinh:function t(e){return isFinite(e=+e)&&0!=e?e<0?-t(-e):i(e+a(e*e+1)):e}})},"3vMK":function(t,e,n){"use strict";var r=n("6XUM"),o=n("/Ybd"),i=n("wIVT"),a=n("m41k")("hasInstance"),c=Function.prototype;a in c||o.f(c,a,{value:function(t){if("function"!=typeof this||!r(t))return!1;if(!r(this.prototype))return t instanceof this;for(;t=i(t);)if(this.prototype===t)return!0;return!1}})},"3xQm":function(t,e,n){var r,o,i,a,c,u,s,f,l=n("ocAm"),p=n("7gGY").f,h=n("ezU2"),v=n("Ox9q").set,d=n("4U6Q"),g=l.MutationObserver||l.WebKitMutationObserver,y=l.process,m=l.Promise,b="process"==h(y),w=p(l,"queueMicrotask"),k=w&&w.value;k||(r=function(){var t,e;for(b&&(t=y.domain)&&t.exit();o;){e=o.fn,o=o.next;try{e()}catch(n){throw o?a():i=void 0,n}}i=void 0,t&&t.enter()},b?a=function(){y.nextTick(r)}:g&&!/(iphone|ipod|ipad).*applewebkit/i.test(d)?(c=!0,u=document.createTextNode(""),new g(r).observe(u,{characterData:!0}),a=function(){u.data=c=!c}):m&&m.resolve?(s=m.resolve(void 0),f=s.then,a=function(){f.call(s,r)}):a=function(){v.call(l,r)}),t.exports=k||function(t){var e={fn:t,next:void 0};i&&(i.next=e),o||(o=e,a()),i=e}},"48xZ":function(t,e,n){var r=n("n/2t"),o=Math.abs,i=Math.pow,a=i(2,-52),c=i(2,-23),u=i(2,127)*(2-c),s=i(2,-126);t.exports=Math.fround||function(t){var e,n,i=o(t),f=r(t);return i<s?f*(i/s/c+1/a-1/a)*s*c:(n=(e=(1+c/a)*i)-(e-i))>u||n!=n?f*(1/0):f*n}},"4GtL":function(t,e,n){"use strict";var r=n("VCQ8"),o=n("7Oj1"),i=n("xpLY"),a=Math.min;t.exports=[].copyWithin||function(t,e){var n=r(this),c=i(n.length),u=o(t,c),s=o(e,c),f=arguments.length>2?arguments[2]:void 0,l=a((void 0===f?c:o(f,c))-s,c-u),p=1;for(s<u&&u<s+l&&(p=-1,s+=l-1,u+=l-1);l-- >0;)s in n?n[u]=n[s]:delete n[u],u+=p,s+=p;return n}},"4Kt7":function(t,e,n){"use strict";var r=n("wA6s"),o=n("Line truncated