Sync appliances

grossmj · grossmj · commit b1c1c0520c4d · 2024-08-06T12:34:07.000+02:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -14,7 +14,7 @@
     "symbol": "linux_guest.svg",
     "docker": {
         "adapters": 1,
-        "image": "gns3/ubuntu:focal",
+        "image": "gns3/ubuntu:noble",
         "console_type": "telnet"
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`"arch": "x86_64",`
`35`	`35`	`"console_type": "telnet",`
`36`	`36`	`"kvm": "require",`
`37`		`- "options": "-nographic"`
	`37`	`+ "options": "-nographic -machine q35,smbios-entry-point-type=32"`
`38`	`38`	`},`
`39`	`39`	`"images": [`
`40`	`40`	`{`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`"arch": "x86_64",`
`27`	`27`	`"console_type": "telnet",`
`28`	`28`	`"kvm": "require",`
`29`		`- "options": "-nographic -enable-kvm"`
	`29`	`+ "options": "-nographic -enable-kvm -machine q35,smbios-entry-point-type=32"`
`30`	`30`	`},`
`31`	`31`	`"images": [`
`32`	`32`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`"arch": "x86_64",`
`24`	`24`	`"console_type": "vnc",`
`25`	`25`	`"kvm": "require",`
`26`		`- "options": "-nographic"`
	`26`	`+ "options": "-nographic -machine q35,smbios-entry-point-type=32"`
`27`	`27`	`},`
`28`	`28`	`"images": [`
`29`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`"arch": "x86_64",`
`26`	`26`	`"console_type": "telnet",`
`27`	`27`	`"kvm": "require",`
`28`		`- "options": "-nographic -enable-kvm"`
	`28`	`+ "options": "-nographic -enable-kvm -machine q35,smbios-entry-point-type=32"`
`29`	`29`	`},`
`30`	`30`	`"images": [`
`31`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`"symbol": "linux_guest.svg",`
`15`	`15`	`"docker": {`
`16`	`16`	`"adapters": 1,`
`17`		`- "image": "gns3/ubuntu:focal",`
	`17`	`+ "image": "gns3/ubuntu:noble",`
`18`	`18`	`"console_type": "telnet"`
`19`	`19`	`}`
`20`	`20`	`}`