From b1c1c0520c4d5889d5aabb3f77b1b2e849818d9e Mon Sep 17 00:00:00 2001 From: grossmj Date: Tue, 6 Aug 2024 12:34:07 +0200 Subject: [PATCH] Sync appliances --- .../appliances/juniper-junos-space.gns3a | 5 ++-- .../appliances/juniper-vmx-legacy.gns3a | 2 +- gns3server/appliances/juniper-vmx-vcp.gns3a | 2 +- gns3server/appliances/juniper-vmx-vfp.gns3a | 3 +- gns3server/appliances/juniper-vqfx-pfe.gns3a | 2 +- gns3server/appliances/juniper-vqfx-re.gns3a | 3 +- gns3server/appliances/juniper-vrr.gns3a | 2 +- gns3server/appliances/juniper-vsrx.gns3a | 3 +- gns3server/appliances/security-onion.gns3a | 30 +++++++++++++++++-- gns3server/appliances/ubuntu-docker.gns3a | 2 +- 10 files changed, 41 insertions(+), 13 deletions(-) diff --git a/gns3server/appliances/juniper-junos-space.gns3a b/gns3server/appliances/juniper-junos-space.gns3a index c333c349..659d6a5e 100644 --- a/gns3server/appliances/juniper-junos-space.gns3a +++ b/gns3server/appliances/juniper-junos-space.gns3a @@ -12,18 +12,19 @@ "status": "stable", "maintainer": "GNS3 Team", "maintainer_email": "developers@gns3.net", - "usage": "16 GB RAM is the bare minimum; you should use 32/64 GB in production deplyments.\nDefault credentials:\n- CLI: admin / abc123\n- WebUI: super / juniper123", + "usage": "16 GB RAM is the bare minimum; you should use 32/64 GB in production deployments.\nDefault credentials:\n- CLI: admin / abc123\n- WebUI: super / juniper123", "symbol": "juniper-vqfx.svg", "port_name_format": "em{0}", "qemu": { "adapter_type": "e1000", "adapters": 4, "ram": 16384, + "cpus": 4, "hda_disk_interface": "ide", "arch": "x86_64", "console_type": "telnet", "kvm": "require", - "options": "-smp 4 -nographic" + "options": "-nographic -machine q35,smbios-entry-point-type=32" }, "images": [ { diff --git a/gns3server/appliances/juniper-vmx-legacy.gns3a b/gns3server/appliances/juniper-vmx-legacy.gns3a index 1409c4c7..592c4a60 100644 --- a/gns3server/appliances/juniper-vmx-legacy.gns3a +++ b/gns3server/appliances/juniper-vmx-legacy.gns3a @@ -34,7 +34,7 @@ "arch": "x86_64", "console_type": "telnet", "kvm": "require", - "options": "-nographic" + "options": "-nographic -machine q35,smbios-entry-point-type=32" }, "images": [ { diff --git a/gns3server/appliances/juniper-vmx-vcp.gns3a b/gns3server/appliances/juniper-vmx-vcp.gns3a index 089f4dce..d1d9493c 100644 --- a/gns3server/appliances/juniper-vmx-vcp.gns3a +++ b/gns3server/appliances/juniper-vmx-vcp.gns3a @@ -26,7 +26,7 @@ "arch": "x86_64", "console_type": "telnet", "kvm": "require", - "options": "-nographic -enable-kvm" + "options": "-nographic -enable-kvm -machine q35,smbios-entry-point-type=32" }, "images": [ { diff --git a/gns3server/appliances/juniper-vmx-vfp.gns3a b/gns3server/appliances/juniper-vmx-vfp.gns3a index dba3ee1e..ff1145ef 100644 --- a/gns3server/appliances/juniper-vmx-vfp.gns3a +++ b/gns3server/appliances/juniper-vmx-vfp.gns3a @@ -20,11 +20,12 @@ "adapter_type": "virtio-net-pci", "adapters": 13, "ram": 4096, + "cpus": 4, "hda_disk_interface": "ide", "arch": "x86_64", "console_type": "telnet", "kvm": "require", - "options": "-nographic -enable-kvm -smp cpus=3" + "options": "-nographic -enable-kvm -machine q35,smbios-entry-point-type=32" }, "images": [ { diff --git a/gns3server/appliances/juniper-vqfx-pfe.gns3a b/gns3server/appliances/juniper-vqfx-pfe.gns3a index 23cacef5..7a4c4e21 100644 --- a/gns3server/appliances/juniper-vqfx-pfe.gns3a +++ b/gns3server/appliances/juniper-vqfx-pfe.gns3a @@ -23,7 +23,7 @@ "arch": "x86_64", "console_type": "vnc", "kvm": "require", - "options": "-nographic" + "options": "-nographic -machine q35,smbios-entry-point-type=32" }, "images": [ { diff --git a/gns3server/appliances/juniper-vqfx-re.gns3a b/gns3server/appliances/juniper-vqfx-re.gns3a index b47c34d5..855d2a11 100644 --- a/gns3server/appliances/juniper-vqfx-re.gns3a +++ b/gns3server/appliances/juniper-vqfx-re.gns3a @@ -19,11 +19,12 @@ "adapter_type": "virtio-net-pci", "adapters": 12, "ram": 1024, + "cpus": 2, "hda_disk_interface": "ide", "arch": "x86_64", "console_type": "telnet", "kvm": "require", - "options": "-nographic -smp 2" + "options": "-nographic -machine q35,smbios-entry-point-type=32" }, "images": [ { diff --git a/gns3server/appliances/juniper-vrr.gns3a b/gns3server/appliances/juniper-vrr.gns3a index 8c447a26..8ec4d506 100644 --- a/gns3server/appliances/juniper-vrr.gns3a +++ b/gns3server/appliances/juniper-vrr.gns3a @@ -25,7 +25,7 @@ "arch": "x86_64", "console_type": "telnet", "kvm": "require", - "options": "-nographic -enable-kvm" + "options": "-nographic -enable-kvm -machine q35,smbios-entry-point-type=32" }, "images": [ { diff --git a/gns3server/appliances/juniper-vsrx.gns3a b/gns3server/appliances/juniper-vsrx.gns3a index bd13122d..347632b3 100644 --- a/gns3server/appliances/juniper-vsrx.gns3a +++ b/gns3server/appliances/juniper-vsrx.gns3a @@ -19,11 +19,12 @@ "adapter_type": "vmxnet3", "adapters": 6, "ram": 4096, + "cpus": 2, "hda_disk_interface": "ide", "arch": "x86_64", "console_type": "telnet", "kvm": "require", - "options": "-smp 2" + "options": "-machine q35,smbios-entry-point-type=32" }, "images": [ { diff --git a/gns3server/appliances/security-onion.gns3a b/gns3server/appliances/security-onion.gns3a index f4f6cf1a..4841de8f 100644 --- a/gns3server/appliances/security-onion.gns3a +++ b/gns3server/appliances/security-onion.gns3a @@ -13,18 +13,27 @@ "status": "stable", "maintainer": "Brent Stewart", "maintainer_email": "brent@stewart.tc", - "usage": "Your default account will have sudo priviledges. Squil and Squert username and password are configured in the Setup wizard. MySQL root is set to null. For more info see https://github.com/Security-Onion-Solutions/security-onion/wiki/Passwords.", + "usage": "Your default account will have sudo privileges. Squil and Squert username and password are configured in the Setup wizard. MySQL root is set to null. For more info see https://github.com/Security-Onion-Solutions/security-onion/wiki/Passwords.", "symbol": "securityonion-logo.png", "qemu": { "adapter_type": "e1000", "adapters": 2, - "ram": 3072, + "ram": 4096, "hda_disk_interface": "ide", "arch": "x86_64", "console_type": "vnc", - "kvm": "allow" + "kvm": "allow", + "options": "-cpu host" }, "images": [ + { + "filename": "securityonion-2.4.80-20240624.iso", + "version": "2.4.80-20240624", + "md5sum": "139f9762e926f9cb3c4a9528a3752c31", + "filesize": 12391022592, + "download_url": "https://github.com/Security-Onion-Solutions/securityonion/blob/2.4/main/DOWNLOAD_AND_VERIFY_ISO.md", + "direct_download_url": "https://download.securityonion.net/file/securityonion/securityonion-2.4.80-20240624.iso" + }, { "filename": "securityonion-16.04.7.1.iso", "version": "16.04.7.1", @@ -49,6 +58,14 @@ "download_url": "https://github.com/Security-Onion-Solutions/security-onion/releases/", "direct_download_url": "https://github.com/Security-Onion-Solutions/security-onion/releases/download/v14.04.5.4_20171031/securityonion-14.04.5.4.iso" }, + { + "filename": "empty100G.qcow2", + "version": "1.0", + "md5sum": "5d9fec18a980f13002028491259f158d", + "filesize": 198656, + "download_url": "https://github.com/riverbed/Riverbed-Community-Toolkit/raw/master/SteelHead/GNS3", + "direct_download_url": "https://github.com/riverbed/Riverbed-Community-Toolkit/raw/master/SteelHead/GNS3/empty100G.qcow2" + }, { "filename": "empty30G.qcow2", "version": "1.0", @@ -59,6 +76,13 @@ } ], "versions": [ + { + "name": "2.4.80-20240624", + "images": { + "hda_disk_image": "empty100G.qcow2", + "cdrom_image": "securityonion-2.4.80-20240624.iso" + } + }, { "name": "16.04.7.1", "images": { diff --git a/gns3server/appliances/ubuntu-docker.gns3a b/gns3server/appliances/ubuntu-docker.gns3a index 110fba40..9cde03e7 100644 --- a/gns3server/appliances/ubuntu-docker.gns3a +++ b/gns3server/appliances/ubuntu-docker.gns3a @@ -14,7 +14,7 @@ "symbol": "linux_guest.svg", "docker": { "adapters": 1, - "image": "gns3/ubuntu:focal", + "image": "gns3/ubuntu:noble", "console_type": "telnet" } }