Merge branch '2.2' into 3.0

# Conflicts:
#	gns3server/version.py

gns3server/appliances/asterfusion-vAsterNOS.gns3a

@@ -0,0 +1,49 @@
+{
+    "appliance_id": "e8001e2b-8ef3-44eb-ace5-79f68f3773e8",
+    "name": "Asterfusion vAsterNOS",
+    "category": "multilayer_switch",
+    "description": "AsterNOS is the core technology of Asterfusion's one-stop turnkey SONiC solution for cloud, enterprise and AI. As an enterprise ready SONiC distribution, AsterNOS features rich functionality enhancement such as MC-LAG, VXLAN, BGP EVPN-Multihoming, RoCEv2(Easy RoCE), and more, making it powerful and easy-to-use in a variety of production scenarios. Currently, AsterNOS is compatible with top commercial  switching chips (e.g. Marvell Teralynx, Prestera Falcon/Aldrin/Alleycat, Broadcom Tomahawk/Trident, Intel Tofino and some of NVIDIA's chips.)Through AsterNOS's rich L2/L3 features and enhancements in virtualization and management, cloud architecture built with Asterfusion switching families from 1G-800G (or other standard whitebox switches) can scale to tens of thousands of compute and storage nodes, working smoothly both in underlay nework and overlay cloud fabric with OpenStack integrated, supporting ultra low latency lossless RoCE network in AIGC, distributed storage , or building easily managed access clusters for campus networks.NOTICE: This appliance file is a virtualized version of AsterNOS and is intended to be used only to experience the basic functionality and industry standard CLI (Klish), not for official software testing. For more information about AsterNOS commercial version, please feel free to contact us via Email: bd@cloudswit.ch",
+    "vendor_name": "Asterfusion",
+    "vendor_url": "https://cloudswit.ch/",
+    "vendor_logo_url": "https://raw.githubusercontent.com/GNS3/gns3-registry/master/vendor-logos/asterfusion.png",
+    "documentation_url": "https://help.cloudswit.ch/portal/en/home",
+    "product_name": "vAsterNOS",
+    "product_url": "https://cloudswit.ch/product/sonic-enterprise-distribution",
+    "registry_version": 4,
+    "status": "experimental",
+    "maintainer": "Asterfusion",
+    "maintainer_email": "bd@cloudswit.ch",
+    "usage": "The login is admin, passwd asteros",
+    "symbol": "asterfusion-vAsterNOS.svg",
+    "first_port_name": "eth0",
+    "port_name_format": "Ethernet{0}",
+    "qemu": {
+        "adapter_type": "e1000",
+        "adapters": 10,
+        "ram": 4096,
+        "cpus": 2,
+        "hda_disk_interface": "virtio",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "boot_priority": "d",
+        "kvm": "require"
+    },
+    "images": [
+        {
+            "filename": "vAsterNOS-V3.1.img",
+            "version": "V3.1",
+            "md5sum": "c323c9c3f60e1a93eca2acdc5034b85c",
+            "filesize": 2724659200,
+            "download_url": "https://cloudswit.ch/product/sonic-enterprise-distribution/#vAsterNOS"
+        }
+    ],
+    "versions": [
+        {
+            "name": "V3.1",
+            "images": {
+                "hda_disk_image": "vAsterNOS-V3.1.img"
+            }
+        }
+    ]
+}
+

gns3server/appliances/cisco-cat9k.gns3a

@@ -12,20 +12,27 @@
     "status": "experimental",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
-    "usage": "There is no default configuration present. Virtual Switch and Interfaces may take several minutes to be usable after appliance boot.",
+    "usage": "There is no default configuration present. Virtual Switch and Interfaces may take several minutes to be usable after appliance boot.\n\nOnly has basic Layer 2 switching features. Will need to enable advance features and reboot to gain access to things like BGP, etc... \n\nconfigure terminal \nlicense boot level network-advantage addon dna-advantage \nend \nwrite memory \nreload",
     "first_port_name": "GigabitEthernet0/0",
     "port_name_format": "GigabitEthernet1/0/{port1}",
     "qemu": {
         "adapter_type": "virtio-net-pci",
         "adapters": 9,
-        "ram": 16384,
+        "ram": 24576,
-	"cpus": 2,
+	"cpus": 4,
         "hda_disk_interface": "virtio",
         "arch": "x86_64",
         "console_type": "telnet",
         "kvm": "require"
 		},
     "images": [
+        {
+            "filename": "cat9kv-prd-17.12.01prd9.qcow2",
+            "version": "17.12(1)",
+            "md5sum": "e587e92186f42bdf69d7fa27f34425f7",
+            "filesize": 2739404800,
+            "download_url": "https://learningnetworkstore.cisco.com/myaccount"
+        },
         {
             "filename": "cat9kv-prd-17.10.01prd7.qcow2",
             "version": "17.10(1)",
@@ -35,6 +42,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "17.12(1)",
+            "images": {
+                "hda_disk_image": "cat9kv-prd-17.12.01prd9.qcow2"
+            }
+		},
         {
             "name": "17.10(1)",
             "images": {

gns3server/appliances/cisco-iosv.gns3a

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

gns3server/appliances/cisco-iou-l2.gns3a

@@ -18,6 +18,12 @@
         "startup_config": "iou_l2_base_startup-config.txt"
     },
     "images": [
+        {
+            "filename": "x86_64_crb_linux_l2-adventerprisek9-ms",
+            "version": "17.12.1",
+            "md5sum": "2b5055e4cef8fd257416d74a94adb626",
+            "filesize": 240355720
+        },
         {
             "filename": "i86bi-linux-l2-ipbasek9-15.1g.bin",
             "version": "15.1g",
@@ -38,6 +44,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "17.12.1",
+            "images": {
+                "image": "x86_64_crb_linux_l2-adventerprisek9-ms"
+            }
+        },
         {
             "name": "15.1g",
             "images": {

gns3server/appliances/cisco-iou-l3.gns3a

@@ -18,6 +18,12 @@
         "startup_config": "iou_l3_base_startup-config.txt"
     },
     "images": [
+        {
+            "filename": "x86_64_crb_linux-adventerprisek9-ms",
+            "version": "17.12.1",
+            "md5sum": "4a2fce8de21d1831fbceffd155e41ae7",
+            "filesize": 288947184
+        },
         {
             "filename": "i86bi_LinuxL3-AdvEnterpriseK9-M2_157_3_May_2018.bin",
             "version": "15.7(3)M2",
@@ -38,6 +44,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "17.12.1",
+            "images": {
+                "image": "x86_64_crb_linux-adventerprisek9-ms"
+            }
+        },
         {
             "name": "15.7(3)M2",
             "images": {

gns3server/appliances/clavister-netsheild.gns3a

@@ -5,7 +5,7 @@
     "description": "Clavister NetShield (cOS Stream) Virtual Appliance offers the same functionality as the Clavister NetShield physical NGappliances FWs in a virtual environment.",
     "vendor_name": "Clavister",
     "vendor_url": "https://www.clavister.com/",
-    "documentation_url": "https://kb.clavister.com",
+    "documentation_url": "https://docs.clavister.com",
     "product_name": "NetShield",
     "product_url": "https://www.clavister.com/products/netshield/",
     "registry_version": 4,
@@ -13,7 +13,7 @@
     "availability": "free-to-try",
     "maintainer": "Mattias Nordlund",
     "maintainer_email": "mattias.nordlund@clavister.com",
-    "usage": "No configuration by default, oen console to set IPs and activate configuration.",
+    "usage": "No configuration by default, use console to set IPs and activate configuration.",
     "port_name_format": "if{0}",
     "qemu": {
         "adapter_type": "virtio-net-pci",
@@ -27,6 +27,13 @@
         "options": "-cpu Nehalem"
     },
     "images": [
+        {
+            "filename": "clavister-cos-stream-4.00.00.34-virtual-x64-generic.qcow2",
+            "version": "cOS Stream 4.00.00",
+            "md5sum": "02b480621d9bf1a9a4e116cd47bef006",
+            "filesize": 132841472,
+            "download_url": "https://my.clavister.com/download/86399b21-44c7-ee11-a434-005056bdfeb0"
+        },
         {
             "filename": "clavister-cos-stream-3.80.09.01-virtual-x64-generic.qcow2",
             "version": "cOS Stream 3.80.09",
@@ -36,6 +43,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "cOS Stream 4.00.00",
+            "images": {
+                "hda_disk_image": "clavister-cos-stream-4.00.00.34-virtual-x64-generic.qcow2"
+            }
+        },
         {
             "name": "cOS Stream 3.80.09",
             "images": {

gns3server/appliances/clavister-netwall.gns3a

@@ -5,7 +5,7 @@
     "description": "Clavister NetWall (cOS Core) Virtual Appliance offers the same functionality as the Clavister  NetWall physical NGFWs in a virtual environment.",
     "vendor_name": "Clavister",
     "vendor_url": "https://www.clavister.com/",
-    "documentation_url": "https://kb.clavister.com",
+    "documentation_url": "https://docs.clavister.com",
     "product_name": "NetWall",
     "product_url": "https://www.clavister.com/products/ngfw/",
     "registry_version": 4,
@@ -13,7 +13,7 @@
     "availability": "free-to-try",
     "maintainer": "Mattias Nordlund",
     "maintainer_email": "mattias.nordlund@clavister.com",
-    "usage": "DHCP enabled on all interfaces by default, WebUI/SSH access enabled on the local network connected to If1.",
+    "usage": "DHCP & cloud-init enabled on all interfaces by default, WebUI/SSH access enabled on the local network connected to If1.",
     "port_name_format": "If{0}",
     "qemu": {
         "adapter_type": "e1000",
@@ -26,6 +26,13 @@
         "kvm": "allow"
     },
     "images": [
+        {
+            "filename": "clavister-cos-core-14.00.13.08-kvm-en.img",
+            "version": "cOS Core 14.00.13 (x86)",
+            "md5sum": "d36797077378accb2b8fc72d09d07ee1",
+            "filesize": 536870912,
+            "download_url": "https://my.clavister.com/download/f3f494a3-9ee7-ee11-a434-005056bdfeb0"
+        },
         {
             "filename": "clavister-cos-core-14.00.01.13-kvm-en.img",
             "version": "cOS Core 14.00.01 (x86)",
@@ -42,6 +49,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "cOS Core 14.00.13 (x86)",
+            "images": {
+                "hda_disk_image": "clavister-cos-core-14.00.13.08-kvm-en.img"
+            }
+        },
         {
             "name": "cOS Core 14.00.01 (x86)",
             "images": {

gns3server/appliances/exos.gns3a

@@ -26,163 +26,25 @@
         "kvm": "allow",
         "options": "-cpu core2duo"
     },
+    
     "images": [
+
 		{
-            "filename": "EXOS-VM_v32.1.1.6.qcow2",
+            "filename": "EXOS-VM_v32.6.3.126.qcow2",
-            "version": "32.1.1.6",
+            "version": "32.6.3.126",
-            "md5sum": "48868bbcb4255d6365049b5941dd2af7",
+            "md5sum": "5856b6c427bd605fe1c7adb6ee6b2659",
-            "filesize": 231211008,
+            "filesize": 236716032,
-            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v32.1.1.6.qcow2"
+            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v32.6.3.126.qcow2"
-        },
-        {
-            "filename": "EXOS-VM_v31.7.1.4.qcow2",
-            "version": "31.7.1.4",
-            "md5sum": "a70e4fa3bc361434237ad12937aaf0fb",
-            "filesize": 458227712,
-            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v31.7.1.4.qcow2"
-        },
-        {
-            "filename": "EXOS-VM_v31.1.1.3.qcow2",
-            "version": "31.1.1.3",
-            "md5sum": "e4936ad94a5304bfeeca8dfc6f285cc0",
-            "filesize": 561512448,
-            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v31.1.1.3.qcow2"
-        },
-        {
-            "filename": "EXOS-VM_v30.7.1.1.qcow2",
-            "version": "30.7.1.1",
-            "md5sum": "c6b67023945102f984b47aa67c67fe33",
-            "filesize": 485687296,
-            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v30.7.1.1.qcow2"
-        },
-        {
-            "filename": "EXOS-VM_v30.6.1.11.qcow2",
-            "version": "30.6.1.11",
-            "md5sum": "bf3e13570417d7e3464165b344c196eb",
-            "filesize": 475332608,
-            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v30.6.1.11.qcow2"
-        },
-        {
-            "filename": "EXOS-VM_v30.5.1.15.qcow2",
-            "version": "30.5.1.15",
-            "md5sum": "380d0c7bb8f0aa272ceb84b85f367a63",
-            "filesize": 498663424,
-            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v30.5.1.15.qcow2"
-        },
-        {
-            "filename": "EXOS-VM_v30.4.1.2.qcow2",
-            "version": "30.4.1.2",
-            "md5sum": "133fa38bf80daec9e389729c96e692c0",
-            "filesize": 454557696,
-            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v30.4.1.2.qcow2"
-        },
-        {
-            "filename": "EXOS-VM_v30.3.1.6.qcow2",
-            "version": "30.3.1.6",
-            "md5sum": "edb86b406efe99434c6d5366d9bfa97f",
-            "filesize": 448266240,
-            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v30.3.1.6.qcow2"
-        },
-        {
-            "filename": "EXOS-VM_v30.2.1.8.qcow2",
-            "version": "30.2.1.8",
-            "md5sum": "4bdbf3ddff7a030e19c6bb71270b56d2",
-            "filesize": 355205120,
-            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v30.2.1.8.qcow2"
-        },
-        {
-            "filename": "EXOS-VM_v30.1.1.4.qcow2",
-            "version": "30.1.1.4",
-            "md5sum": "92d3f9b13d750f7bfa804823fa545772",
-            "filesize": 383385600,
-            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v30.1.1.4.qcow2"
-        },
-        {
-            "filename": "EXOS-VM_v22.7.1.2.qcow2",
-            "version": "22.7.1.2",
-            "md5sum": "a13e839b3fa05e8a5b0fb31f7e3dda86",
-            "filesize": 180420608,
-            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v22.7.1.2.qcow2"
-        },
-        {
-            "filename": "EXOS-VM_v21.1.1.4-disk1.qcow2",
-            "version": "21.1.1.4",
-            "md5sum": "654606809b6fd3bca400377483eb4a79",
-            "filesize": 117560832,
-            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v21.1.1.4-disk1.qcow2"
         }
+
     ],
+    
     "versions": [
+
         {
-            "name": "32.1.1.6",
+            "name": "32.6.3.126",
             "images": {
-                "hda_disk_image": "EXOS-VM_v32.1.1.6.qcow2"
+                "hda_disk_image": "EXOS-VM_v32.6.3.126.qcow2"
-            }
-        },
-        {
-            "name": "31.7.1.4",
-            "images": {
-                "hda_disk_image": "EXOS-VM_v31.7.1.4.qcow2"
-            }
-        },
-        {
-            "name": "31.1.1.3",
-            "images": {
-                "hda_disk_image": "EXOS-VM_v31.1.1.3.qcow2"
-            }
-        },
-        {
-            "name": "30.7.1.1",
-            "images": {
-                "hda_disk_image": "EXOS-VM_v30.7.1.1.qcow2"
-            }
-        },
-        {
-            "name": "30.6.1.11",
-            "images": {
-                "hda_disk_image": "EXOS-VM_v30.6.1.11.qcow2"
-            }
-        },
-        {
-            "name": "30.5.1.15",
-            "images": {
-                "hda_disk_image": "EXOS-VM_v30.5.1.15.qcow2"
-            }
-        },
-        {
-            "name": "30.4.1.2",
-            "images": {
-                "hda_disk_image": "EXOS-VM_v30.4.1.2.qcow2"
-            }
-        },
-        {
-            "name": "30.3.1.6",
-            "images": {
-                "hda_disk_image": "EXOS-VM_v30.3.1.6.qcow2"
-            }
-        },
-        {
-            "name": "30.2.1.8",
-            "images": {
-                "hda_disk_image": "EXOS-VM_v30.2.1.8.qcow2"
-            }
-        },
-        {
-            "name": "30.1.1.4",
-            "images": {
-                "hda_disk_image": "EXOS-VM_v30.1.1.4.qcow2"
-            }
-        },
-        {
-            "name": "22.7.1.2",
-            "images": {
-                "hda_disk_image": "EXOS-VM_v22.7.1.2.qcow2"
-            }
-        },
-        {
-            "name": "21.1.1.4",
-            "images": {
-                "hda_disk_image": "EXOS-VM_v21.1.1.4-disk1.qcow2"
             }
         }
     ]

gns3server/appliances/freebsd.gns3a

@@ -24,13 +24,22 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "FreeBSD-14.0-RELEASE-amd64.qcow2",
+            "version": "14.0",
+            "md5sum": "87b988eaa4a8aaabea1c10649c98b3f0",
+            "filesize": 3506569216,
+            "download_url": "https://www.freebsd.org/where.html",
+            "direct_download_url": "https://download.freebsd.org/releases/VM-IMAGES/14.0-RELEASE/amd64/Latest/FreeBSD-14.0-RELEASE-amd64.qcow2.xz",
+            "compression": "xz"
+        },
         {
             "filename": "FreeBSD-13.0-RELEASE-amd64.qcow2",
             "version": "13.0",
             "md5sum": "e8e598959da456c03260421b5f9890de",
             "filesize": 3466854400,
             "download_url": "https://www.freebsd.org/where.html",
-            "direct_download_url": "https://download.freebsd.org/ftp/releases/VM-IMAGES/13.0-RELEASE/amd64/Latest/FreeBSD-13.0-RELEASE-amd64.qcow2.xz",
+            "direct_download_url": "http://ftp-archive.freebsd.org/pub/FreeBSD-Archive/old-releases/VM-IMAGES/13.0-RELEASE/amd64/Latest/FreeBSD-13.0-RELEASE-amd64.qcow2.xz",
             "compression": "xz"
         },
         {
@@ -39,11 +48,17 @@
             "md5sum": "3d7d5396f3d89ed30c2bfa2ee2e6b013",
             "filesize": 3412000768,
             "download_url": "https://www.freebsd.org/where.html",
-            "direct_download_url": "https://download.freebsd.org/ftp/releases/VM-IMAGES/12.3-RELEASE/amd64/Latest/FreeBSD-12.3-RELEASE-amd64.qcow2.xz",
+            "direct_download_url": "http://ftp-archive.freebsd.org/pub/FreeBSD-Archive/old-releases/VM-IMAGES/12.3-RELEASE/amd64/Latest/FreeBSD-12.3-RELEASE-amd64.qcow2.xz",
             "compression": "xz"
         }
     ],
     "versions": [
+        {
+            "name": "14.0",
+            "images": {
+                "hda_disk_image": "FreeBSD-14.0-RELEASE-amd64.qcow2"
+            }
+        },
         {
             "name": "13.0",
             "images": {

gns3server/appliances/mikrotik-chr.gns3a

@@ -27,6 +27,15 @@
         "options": "-nographic"
     },
     "images": [
+        {
+            "filename": "chr-7.14.2.img",
+            "version": "7.14.2",
+            "md5sum": "531901dac85b67b23011e946a62abc7b",
+            "filesize": 134217728,
+            "download_url": "http://www.mikrotik.com/download",
+            "direct_download_url": "https://download.mikrotik.com/routeros/7.14.2/chr-7.14.2.img.zip",
+            "compression": "zip"
+        },
         {
             "filename": "chr-7.11.2.img",
             "version": "7.11.2",

gns3server/appliances/open-media-vault.gns3a

@@ -26,6 +26,14 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "openmediavault_7.0.32-amd64.iso",
+            "version": "7.0.32",
+            "md5sum": "36d1fda7de0c8dd6806a65145845d362",
+            "filesize": 981467136,
+            "download_url": "https://www.openmediavault.org/download.html",
+            "direct_download_url": "https://sourceforge.net/projects/openmediavault/files/iso/7.0-32/openmediavault_7.0-32-amd64.iso"
+        },
         {
             "filename": "openmediavault_6.5.0-amd64.iso",
             "version": "6.5.0",
@@ -68,6 +76,14 @@
         }
     ],
     "versions": [
+        {
+            "name": "7.0.32",
+            "images": {
+                "hda_disk_image": "empty30G.qcow2",
+                "hdb_disk_image": "empty30G.qcow2",
+                "cdrom_image": "openmediavault_7.0.32-amd64.iso"
+            }
+        },
         {
             "name": "6.5.0",
             "images": {

gns3server/appliances/opnsense.gns3a

@@ -25,6 +25,13 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "OPNsense-24.1-OpenSSL-nano-amd64.img",
+            "version": "24.1",
+            "md5sum": "ea8472df2c272419b7834cddaf68048d",
+            "filesize": 3221225472,
+            "download_url": "https://opnsense.c0urier.net/releases/24.1/"
+        },
         {
             "filename": "OPNsense-23.1-OpenSSL-nano-amd64.img",
             "version": "23.1",
@@ -62,6 +69,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "24.1",
+            "images": {
+                "hda_disk_image": "OPNsense-24.1-OpenSSL-nano-amd64.img"
+            }
+        },
         {
             "name": "23.1",
             "images": {