From bf67fec24296d11c1fab77599b07c4dd98b83995 Mon Sep 17 00:00:00 2001 From: grossmj Date: Tue, 6 Jun 2023 10:07:50 +0930 Subject: [PATCH] Sync appliances --- gns3server/appliances/almalinux.gns3a | 3 +- gns3server/appliances/aruba-arubaoscx.gns3a | 13 ++++ gns3server/appliances/centos-cloud.gns3a | 30 ++++---- gns3server/appliances/debian.gns3a | 3 +- gns3server/appliances/fedora-cloud.gns3a | 6 +- gns3server/appliances/mikrotik-winbox.gns3a | 19 +++++ gns3server/appliances/ntopng.gns3a | 2 +- .../appliances/oracle-linux-cloud.gns3a | 70 +++++++++++++++++++ gns3server/appliances/rockylinux.gns3a | 3 +- gns3server/appliances/ubuntu-cloud.gns3a | 64 ++++------------- 10 files changed, 143 insertions(+), 70 deletions(-) create mode 100644 gns3server/appliances/mikrotik-winbox.gns3a create mode 100644 gns3server/appliances/oracle-linux-cloud.gns3a diff --git a/gns3server/appliances/almalinux.gns3a b/gns3server/appliances/almalinux.gns3a index 78c7cf43..0f60291b 100644 --- a/gns3server/appliances/almalinux.gns3a +++ b/gns3server/appliances/almalinux.gns3a @@ -37,7 +37,8 @@ "version": "1.0", "md5sum": "72fb52af76e9561d125dd99224e2c1d1", "filesize": 374784, - "download_url": "https://github.com/GNS3/gns3-registry/raw/master/cloud-init/AlmaLinux/almalinux-cloud-init-data.iso" + "download_url": "https://github.com/GNS3/gns3-registry/tree/master/cloud-init/AlmaLinux", + "direct_download_url": "https://github.com/GNS3/gns3-registry/raw/master/cloud-init/AlmaLinux/almalinux-cloud-init-data.iso" } ], "versions": [ diff --git a/gns3server/appliances/aruba-arubaoscx.gns3a b/gns3server/appliances/aruba-arubaoscx.gns3a index a0a08345..1fecc275 100644 --- a/gns3server/appliances/aruba-arubaoscx.gns3a +++ b/gns3server/appliances/aruba-arubaoscx.gns3a @@ -32,6 +32,13 @@ "process_priority": "normal" }, "images": [ + { + "filename": "arubaoscx-disk-image-genericx86-p4-20230531220439.vmdk", + "version": "10.12.0006", + "md5sum": "c4f80fecd02ef93b431b75dd610e0063", + "filesize": 384638464, + "download_url": "https://asp.arubanetworks.com/" + }, { "filename": "arubaoscx-disk-image-genericx86-p4-20221130174651.vmdk", "version": "10.11.0001", @@ -111,6 +118,12 @@ } ], "versions": [ + { + "name": "10.12.0006", + "images": { + "hda_disk_image": "arubaoscx-disk-image-genericx86-p4-20230531220439.vmdk" + } + }, { "name": "10.11.0001", "images": { diff --git a/gns3server/appliances/centos-cloud.gns3a b/gns3server/appliances/centos-cloud.gns3a index 52bfd90f..4a41ff7d 100644 --- a/gns3server/appliances/centos-cloud.gns3a +++ b/gns3server/appliances/centos-cloud.gns3a @@ -26,33 +26,37 @@ "options": "-nographic" }, "images": [ + { + "filename": "CentOS-8-GenericCloud-8.4.2105-20210603.0.x86_64.qcow2", + "version": "8.4 (2105)", + "md5sum": "032eed270415526546eac07628905a62", + "filesize": 1309652992, + "download_url": "https://cloud.centos.org/centos/8/x86_64/images", + "direct_download_url": "https://cloud.centos.org/centos/8/x86_64/images/CentOS-8-GenericCloud-8.4.2105-20210603.0.x86_64.qcow2" + }, { "filename": "CentOS-7-x86_64-GenericCloud-2111.qcow2", "version": "7 (2111)", "md5sum": "730b8662695831670721c8245be61dac", "filesize": 897384448, - "download_url": "https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-2111.qcow2" + "download_url": "https://cloud.centos.org/centos/7/images", + "direct_download_url": "https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-2111.qcow2" }, { "filename": "CentOS-7-x86_64-GenericCloud-1809.qcow2", "version": "7 (1809)", "md5sum": "da79108d1324b27bd1759362b82fbe40", "filesize": 914948096, - "download_url": "https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1809.qcow2" - }, - { - "filename": "CentOS-8-GenericCloud-8.4.2105-20210603.0.x86_64.qcow2", - "version": "8.4 (2105)", - "md5sum": "032eed270415526546eac07628905a62", - "filesize": 1309652992, - "download_url": "https://cloud.centos.org/centos/8/x86_64/images/CentOS-8-GenericCloud-8.4.2105-20210603.0.x86_64.qcow2" + "download_url": "https://cloud.centos.org/centos/7/images", + "direct_download_url": "https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1809.qcow2" }, { "filename": "centos-cloud-init-data.iso", - "version": "1.0", - "md5sum": "15ca60c12db6d13b8eeae1a19613fd6e", - "filesize": 378880, - "download_url": "https://github.com/asenci/gns3-centos-cloud-init-data/raw/master/centos-cloud-init-data.iso" + "version": "1.1", + "md5sum": "59ea8223fd659d8bce9081ff175912e9", + "filesize": 374784, + "download_url": "https://github.com/GNS3/gns3-registry/tree/master/cloud-init/centos-cloud", + "direct_download_url": "https://github.com/GNS3/gns3-registry/raw/master/cloud-init/centos-cloud/centos-cloud-init-data.iso" } ], "versions": [ diff --git a/gns3server/appliances/debian.gns3a b/gns3server/appliances/debian.gns3a index 6bee9798..49858688 100644 --- a/gns3server/appliances/debian.gns3a +++ b/gns3server/appliances/debian.gns3a @@ -44,7 +44,8 @@ "version": "1.0", "md5sum": "43f6bf70c178a9d3c270b5c24971e578", "filesize": 374784, - "download_url": "https://github.com/GNS3/gns3-registry/raw/master/cloud-init/Debian/debian-cloud-init-data.iso" + "download_url": "https://github.com/GNS3/gns3-registry/tree/master/cloud-init/Debian", + "direct_download_url": "https://github.com/GNS3/gns3-registry/raw/master/cloud-init/Debian/debian-cloud-init-data.iso" } ], "versions": [ diff --git a/gns3server/appliances/fedora-cloud.gns3a b/gns3server/appliances/fedora-cloud.gns3a index 9679fe69..93ec221b 100644 --- a/gns3server/appliances/fedora-cloud.gns3a +++ b/gns3server/appliances/fedora-cloud.gns3a @@ -31,14 +31,16 @@ "version": "35-1.2", "md5sum": "cfa9cdcfb946e5f4cf9dd4d7906008d0", "filesize": 376897536, - "download_url": "https://download.fedoraproject.org/pub/fedora/linux/releases/35/Cloud/x86_64/images/Fedora-Cloud-Base-35-1.2.x86_64.qcow2" + "download_url": "https://download.fedoraproject.org/pub/fedora/linux/releases/35/Cloud/x86_64/images", + "direct_download_url": "https://download.fedoraproject.org/pub/fedora/linux/releases/35/Cloud/x86_64/images/Fedora-Cloud-Base-35-1.2.x86_64.qcow2" }, { "filename": "fedora-cloud-init-data.iso", "version": "1.0", "md5sum": "3d0d6391d3f5ece1180c70b9667c4dca", "filesize": 374784, - "download_url": "https://github.com/GNS3/gns3-registry/raw/master/cloud-init/fedora-cloud/fedora-cloud-init-data.iso" + "download_url": "https://github.com/GNS3/gns3-registry/tree/master/cloud-init/fedora-cloud", + "direct_download_url": "https://github.com/GNS3/gns3-registry/raw/master/cloud-init/fedora-cloud/fedora-cloud-init-data.iso" } ], "versions": [ diff --git a/gns3server/appliances/mikrotik-winbox.gns3a b/gns3server/appliances/mikrotik-winbox.gns3a new file mode 100644 index 00000000..ce0f9caf --- /dev/null +++ b/gns3server/appliances/mikrotik-winbox.gns3a @@ -0,0 +1,19 @@ +{ + "appliance_id": "b770027f-1822-4ab6-b2f9-73336ca0983d", + "name": "Mikrotik WinBox", + "category": "guest", + "description": "Mikrotik's WinBox router management software for GNS3", + "vendor_name": "Mikrotik", + "vendor_url": "https://mikrotik.com", + "product_name": "Mikrotik WinBox", + "registry_version": 4, + "status": "stable", + "availability": "free", + "maintainer": "Alexander Horner", + "maintainer_email": "contact@alexhorner.cc", + "docker": { + "adapters": 1, + "image": "gns3/mikrotik-winbox", + "console_type": "vnc" + } +} diff --git a/gns3server/appliances/ntopng.gns3a b/gns3server/appliances/ntopng.gns3a index 78639951..c54cc217 100644 --- a/gns3server/appliances/ntopng.gns3a +++ b/gns3server/appliances/ntopng.gns3a @@ -14,7 +14,7 @@ "usage": "In the web interface login as admin/admin\n\nPersistent configuration:\n- Add \"/var/lib/redis\" as an additional persistent directory.\n- Use \"redis-cli save\" in an auxiliary console to save the configuration.", "docker": { "adapters": 1, - "image": "ntop/ntopng:latest", + "image": "ntop/ntopng:stable", "start_command": "--dns-mode 2 --interface eth0", "console_type": "http", "console_http_port": 3000, diff --git a/gns3server/appliances/oracle-linux-cloud.gns3a b/gns3server/appliances/oracle-linux-cloud.gns3a new file mode 100644 index 00000000..a9709bcc --- /dev/null +++ b/gns3server/appliances/oracle-linux-cloud.gns3a @@ -0,0 +1,70 @@ +{ + "appliance_id": "88e67f45-e0de-4e5e-9f36-2dc83e4a6c60", + "name": "Oracle Linux Cloud Guest", + "category": "guest", + "description": "A highly performant and secure operating environment, Oracle Linux delivers virtualization, management, automation, and cloud native computing tools, along with the operating system, in a single, easy-to-manage support offering. Oracle Linux provides a 100% application binary compatible alternative to Red Hat Enterprise Linux and CentOS Linux and is supported across both hybrid and multicloud environments.", + "vendor_name": "Oracle Corporation", + "vendor_url": "https://www.oracle.com", + "documentation_url": "https://docs.oracle.com/en-us/iaas/images/", + "product_name": "Oracle Linux Cloud Guest", + "product_url": "https://www.oracle.com/au/linux/", + "registry_version": 4, + "status": "stable", + "maintainer": "GNS3 Team", + "maintainer_email": "developers@gns3.net", + "usage": "Username: oracle\nPassword: oracle", + "port_name_format": "Ethernet{0}", + "qemu": { + "adapter_type": "virtio-net-pci", + "adapters": 1, + "ram": 1024, + "hda_disk_interface": "virtio", + "arch": "x86_64", + "console_type": "telnet", + "boot_priority": "c", + "kvm": "require", + "options": "-cpu host -nographic" + }, + "images": [ + { + "filename": "OL9U1_x86_64-kvm-b158.qcow", + "version": "9.1", + "md5sum": "9f32851b96fc38191892197fa11f7435", + "filesize": 539033600, + "download_url": "https://yum.oracle.com/oracle-linux-templates.html", + "direct_download_url": "https://yum.oracle.com/templates/OracleLinux/OL9/u1/x86_64/OL9U1_x86_64-kvm-b158.qcow" + }, + { + "filename": "OL8U7_x86_64-kvm-b148.qcow", + "version": "8.7", + "md5sum": "962cdde7e810888b9914e937222f687f", + "filesize": 913965056, + "download_url": "https://yum.oracle.com/oracle-linux-templates.html", + "direct_download_url": "https://yum.oracle.com/templates/OracleLinux/OL8/u7/x86_64/OL8U7_x86_64-kvm-b148.qcow" + }, + { + "filename": "oracle-cloud-init-data.iso", + "version": "1.1", + "md5sum": "cb51bc42ae9dfb7345bfa7362a313baf", + "filesize": 374784, + "download_url": "https://github.com/GNS3/gns3-registry/tree/master/cloud-init/oracle-cloud", + "direct_download_url": "https://github.com/GNS3/gns3-registry/raw/master/cloud-init/oracle-cloud/oracle-cloud-init-data.iso" + } + ], + "versions": [ + { + "name": "9.1", + "images": { + "hda_disk_image": "OL9U1_x86_64-kvm-b158.qcow", + "cdrom_image": "oracle-cloud-init-data.iso" + } + }, + { + "name": "8.7", + "images": { + "hda_disk_image": "OL8U7_x86_64-kvm-b148.qcow", + "cdrom_image": "oracle-cloud-init-data.iso" + } + } + ] +} diff --git a/gns3server/appliances/rockylinux.gns3a b/gns3server/appliances/rockylinux.gns3a index 86900cb9..2dd3fd1b 100644 --- a/gns3server/appliances/rockylinux.gns3a +++ b/gns3server/appliances/rockylinux.gns3a @@ -39,7 +39,8 @@ "version": "1.0", "md5sum": "33ffda3a81436e305f37fb913edd6d43", "filesize": 374784, - "download_url": "https://github.com/GNS3/gns3-registry/raw/master/cloud-init/rocky-cloud/rocky-cloud-init-data.iso" + "download_url": "https://github.com/GNS3/gns3-registry/tree/master/cloud-init/rocky-cloud", + "direct_download_url": "https://github.com/GNS3/gns3-registry/raw/master/cloud-init/rocky-cloud/rocky-cloud-init-data.iso" } ], "versions": [ diff --git a/gns3server/appliances/ubuntu-cloud.gns3a b/gns3server/appliances/ubuntu-cloud.gns3a index 59aba8a7..ad8d2421 100644 --- a/gns3server/appliances/ubuntu-cloud.gns3a +++ b/gns3server/appliances/ubuntu-cloud.gns3a @@ -29,51 +29,34 @@ { "filename": "ubuntu-22.04-server-cloudimg-amd64.img", "version": "22.04 (LTS)", - "md5sum": "ac2351289daa173fa1ed6b2b81d81d7c", - "filesize": 624295936, - "download_url": "https://cloud-images.ubuntu.com/releases/jammy/release/ubuntu-22.04-server-cloudimg-amd64.img" + "md5sum": "3ce0b84f9592482fb645e8253b979827", + "filesize": 686096384, + "download_url": "https://cloud-images.ubuntu.com/releases/jammy/release", + "direct_download_url": "https://cloud-images.ubuntu.com/releases/jammy/release/ubuntu-22.04-server-cloudimg-amd64.img" }, { "filename": "ubuntu-20.04-server-cloudimg-amd64.img", "version": "20.04 (LTS)", "md5sum": "044bc979b2238192ee3edb44e2bb6405", "filesize": 552337408, - "download_url": "https://cloud-images.ubuntu.com/releases/focal/release-20210119.1/ubuntu-20.04-server-cloudimg-amd64.img" + "download_url": "https://cloud-images.ubuntu.com/releases/focal/release-20210119.1/", + "direct_download_url": "https://cloud-images.ubuntu.com/releases/focal/release-20210119.1/ubuntu-20.04-server-cloudimg-amd64.img" }, { "filename": "ubuntu-18.04-server-cloudimg-amd64.img", "version": "18.04 (LTS)", "md5sum": "f4134e7fa16d7fa766c7467cbe25c949", "filesize": 336134144, - "download_url": "https://cloud-images.ubuntu.com/releases/18.04/release-20180426.2/ubuntu-18.04-server-cloudimg-amd64.img" - }, - { - "filename": "ubuntu-17.10-server-cloudimg-amd64.img", - "version": "17.10", - "md5sum": "331b44f2b05858c251b3ea92c8b65152", - "filesize": 320405504, - "download_url": "https://cloud-images.ubuntu.com/releases/17.10/release-20180404/ubuntu-17.10-server-cloudimg-amd64.img" - }, - { - "filename": "ubuntu-16.04-server-cloudimg-amd64-disk1.img", - "version": "16.04 (LTS)", - "md5sum": "22c124ba65ea096cdef8b0a197dd613a", - "filesize": 290193408, - "download_url": "https://cloud-images.ubuntu.com/releases/16.04/release-20180405/ubuntu-16.04-server-cloudimg-amd64-disk1.img" - }, - { - "filename": "ubuntu-14.04-server-cloudimg-amd64-disk1.img", - "version": "14.04 (LTS)", - "md5sum": "d11b89321d41d0eeddcacf73bf0d2262", - "filesize": 262668800, - "download_url": "https://cloud-images.ubuntu.com/releases/14.04/release-20180404/ubuntu-14.04-server-cloudimg-amd64-disk1.img" + "download_url": "https://cloud-images.ubuntu.com/releases/18.04/release-20180426.2/", + "direct_download_url": "https://cloud-images.ubuntu.com/releases/18.04/release-20180426.2/ubuntu-18.04-server-cloudimg-amd64.img" }, { "filename": "ubuntu-cloud-init-data.iso", - "version": "1.0", - "md5sum": "328469100156ae8dbf262daa319c27ff", - "filesize": 131072, - "download_url": "https://github.com/asenci/gns3-ubuntu-cloud-init-data/raw/master/ubuntu-cloud-init-data.iso" + "version": "1.1", + "md5sum": "9a90ee8f88736204c756015b3cd86500", + "filesize": 374784, + "download_url": "https://github.com/GNS3/gns3-registry/tree/master/cloud-init/ubuntu-cloud", + "direct_download_url": "https://github.com/GNS3/gns3-registry/raw/master/cloud-init/ubuntu-cloud/ubuntu-cloud-init-data.iso" } ], "versions": [ @@ -97,27 +80,6 @@ "hda_disk_image": "ubuntu-18.04-server-cloudimg-amd64.img", "cdrom_image": "ubuntu-cloud-init-data.iso" } - }, - { - "name": "17.10", - "images": { - "hda_disk_image": "ubuntu-17.10-server-cloudimg-amd64.img", - "cdrom_image": "ubuntu-cloud-init-data.iso" - } - }, - { - "name": "16.04 (LTS)", - "images": { - "hda_disk_image": "ubuntu-16.04-server-cloudimg-amd64-disk1.img", - "cdrom_image": "ubuntu-cloud-init-data.iso" - } - }, - { - "name": "14.04 (LTS)", - "images": { - "hda_disk_image": "ubuntu-14.04-server-cloudimg-amd64-disk1.img", - "cdrom_image": "ubuntu-cloud-init-data.iso" - } } ] }