From 84e33dc8d7da14e5062f6f6c97347d95509849cd Mon Sep 17 00:00:00 2001 From: grossmj Date: Tue, 23 Jun 2020 18:37:59 +0930 Subject: [PATCH 1/5] Update TinyCore appliance to include version 11.1 --- appliances/tinycore-linux.gns3a | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/appliances/tinycore-linux.gns3a b/appliances/tinycore-linux.gns3a index 509d3ca..b2828da 100644 --- a/appliances/tinycore-linux.gns3a +++ b/appliances/tinycore-linux.gns3a @@ -11,7 +11,7 @@ "status": "stable", "maintainer": "GNS3 Team", "maintainer_email": "developers@gns3.net", - "usage": "Login is gns3/gns3. sudo works without password", + "usage": "Login/password is tc/tc or gns3/gns3 for older versions. sudo works without password", "symbol": "linux_guest.svg", "qemu": { "adapter_type": "e1000", @@ -20,9 +20,18 @@ "arch": "i386", "console_type": "vnc", "kvm": "allow", + "hda_disk_interface": "virtio", "options": "-vga std -usbdevice tablet" }, "images": [ + { + "filename": "linux-tinycore-11.1.qcow2", + "version": "11.1", + "md5sum": "993d1ce9b86cb131c90e8263891d51b8", + "filesize": 33816576, + "download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/", + "direct_download_url": "http://downloads.sourceforge.net/project/gns-3/Qemu%20Appliances/linux-tinycore-11.1.qcow2" + }, { "filename": "linux-tinycore-6.4-2.img", "version": "6.4", @@ -41,6 +50,12 @@ } ], "versions": [ + { + "name": "11.1", + "images": { + "hda_disk_image": "linux-tinycore-11.1.qcow2" + } + }, { "name": "6.4~2", "images": { From 763dfebcf6de1c1375506bb854872536c0659ae5 Mon Sep 17 00:00:00 2001 From: grossmj Date: Fri, 26 Jun 2020 15:29:52 +0930 Subject: [PATCH 2/5] Appliance for single VM pre-release version of Juniper vMX. --- appliances/juniper-vmx-legacy.gns3a | 43 +++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 appliances/juniper-vmx-legacy.gns3a diff --git a/appliances/juniper-vmx-legacy.gns3a b/appliances/juniper-vmx-legacy.gns3a new file mode 100644 index 0000000..cd092c7 --- /dev/null +++ b/appliances/juniper-vmx-legacy.gns3a @@ -0,0 +1,43 @@ +{ + "name": "Juniper vMX", + "category": "router", + "description": "The vMX is a full-featured, carrier-grade virtual MX Series 3D Universal Edge Router that extends 15+ years of Juniper Networks edge routing expertise to the virtual realm. This appliance is a single VM pre-release version that does not require to be paired with another VM like in the vCP/vFP architecture.", + "vendor_name": "Juniper", + "vendor_url": "https://www.juniper.net/us/en/", + "documentation_url": "http://www.juniper.net/techpubs/", + "product_name": "Juniper vMX", + "product_url": "http://www.juniper.net/us/en/products-services/routing/mx-series/vmx/", + "registry_version": 3, + "status": "experimental", + "maintainer": "none", + "maintainer_email": "developers@gns3.net", + "symbol": "juniper-vmx.svg", + "usage": "Initial username is root, no password.\n\nTIP: use the 'show chassis fpc pic-status' command to check that PIC 0 is online and shows 'Virtual 10x1GE PIC'\n\nUse the second adapter (em2) and above to connect to other nodes", + "first_port_name": "em0", + "port_name_format": "em{port1}", + "qemu": { + "adapter_type": "virtio-net-pci", + "adapters": 12, + "ram": 512, + "arch": "x86_64", + "console_type": "telnet", + "kvm": "require", + "options": "-nographic" + }, + "images": [ + { + "filename": "jinstall-vmx-14.1R4.8-domestic.img", + "version": "14.1R4.8", + "md5sum": "85aa3048e8648bf91e893455645cad03", + "filesize": 681377792 + } + ], + "versions": [ + { + "name": "14.1R4.8", + "images": { + "hda_disk_image": "jinstall-vmx-14.1R4.8-domestic.img" + } + } + ] +} From a9bb224ef89c8560f3c095a65e5d1e4f86722c52 Mon Sep 17 00:00:00 2001 From: grossmj Date: Sat, 27 Jun 2020 12:28:18 +0930 Subject: [PATCH 3/5] Update schema for custom adapters support. Use e1000 for the first 2 adapters in Juniper VMX legacy appliance. --- appliances/juniper-vmx-legacy.gns3a | 18 +++++-- schemas/appliance_v6.json | 77 ++++++++++++++++++----------- 2 files changed, 63 insertions(+), 32 deletions(-) diff --git a/appliances/juniper-vmx-legacy.gns3a b/appliances/juniper-vmx-legacy.gns3a index cd092c7..0c56a5c 100644 --- a/appliances/juniper-vmx-legacy.gns3a +++ b/appliances/juniper-vmx-legacy.gns3a @@ -7,13 +7,13 @@ "documentation_url": "http://www.juniper.net/techpubs/", "product_name": "Juniper vMX", "product_url": "http://www.juniper.net/us/en/products-services/routing/mx-series/vmx/", - "registry_version": 3, + "registry_version": 6, "status": "experimental", "maintainer": "none", "maintainer_email": "developers@gns3.net", "symbol": "juniper-vmx.svg", - "usage": "Initial username is root, no password.\n\nTIP: use the 'show chassis fpc pic-status' command to check that PIC 0 is online and shows 'Virtual 10x1GE PIC'\n\nUse the second adapter (em2) and above to connect to other nodes", - "first_port_name": "em0", + "usage": "Initial username is root, no password.\n\nTIPS:\n* Use the 'show chassis fpc pic-status' command to check that PIC 0 is online and shows 'Virtual 10x1GE PIC'\n* Use the second adapter (em2) and above to connect to other nodes (the first two interfaces are for internal purposes).", + "first_port_name": "fxp0", "port_name_format": "em{port1}", "qemu": { "adapter_type": "virtio-net-pci", @@ -22,7 +22,17 @@ "arch": "x86_64", "console_type": "telnet", "kvm": "require", - "options": "-nographic" + "options": "-nographic", + "custom_adapters": [ + { + "adapter_number": 0, + "adapter_type": "e1000" + }, + { + "adapter_number": 1, + "adapter_type": "e1000" + } + ] }, "images": [ { diff --git a/schemas/appliance_v6.json b/schemas/appliance_v6.json index fbe2360..1c95221 100644 --- a/schemas/appliance_v6.json +++ b/schemas/appliance_v6.json @@ -251,34 +251,55 @@ "title": "Number of adapters" }, "custom_adapters": { - "type": "array", - "title": "Customer drivers for each adapter", - "items": { - "type": "string", - "enum": [ - "e1000", - "i82550", - "i82551", - "i82557a", - "i82557b", - "i82557c", - "i82558a", - "i82558b", - "i82559a", - "i82559b", - "i82559c", - "i82559er", - "i82562", - "i82801", - "ne2k_pci", - "pcnet", - "rtl8139", - "virtio", - "virtio-net-pci", - "vmxnet3" - ], - "title": "Type of the custom network adapter" - } + "type": "array", + "title": "Custom adapters", + "items": { + "type": "object", + "properties": { + "adapter_number": { + "title": "Adapter number", + "type": "integer" + }, + "port_name": { + "title": "Custom port name", + "type": "string", + "minimum": 1 + }, + "adapter_type": { + "title": "Custom adapter type", + "type": "string", + "enum": [ + "e1000", + "i82550", + "i82551", + "i82557a", + "i82557b", + "i82557c", + "i82558a", + "i82558b", + "i82559a", + "i82559b", + "i82559c", + "i82559er", + "i82562", + "i82801", + "ne2k_pci", + "pcnet", + "rtl8139", + "virtio", + "virtio-net-pci", + "vmxnet3" + ] + }, + "mac_address": { + "title": "Custom MAC address", + "type": "string", + "minimum": 1, + "pattern": "^([0-9a-fA-F]{2}[:]){5}([0-9a-fA-F]{2})$" + } + }, + "required": ["adapter_number"] + } }, "ram": { "type": "integer", From 37039ee7535c9747c1e6a835d9807fcf3972c8a6 Mon Sep 17 00:00:00 2001 From: grossmj Date: Sat, 27 Jun 2020 17:37:13 +0930 Subject: [PATCH 4/5] Use 1024MB of RAM in juniper-vmx-legacy.gns3a --- appliances/juniper-vmx-legacy.gns3a | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appliances/juniper-vmx-legacy.gns3a b/appliances/juniper-vmx-legacy.gns3a index 0c56a5c..2ef38c4 100644 --- a/appliances/juniper-vmx-legacy.gns3a +++ b/appliances/juniper-vmx-legacy.gns3a @@ -7,7 +7,7 @@ "documentation_url": "http://www.juniper.net/techpubs/", "product_name": "Juniper vMX", "product_url": "http://www.juniper.net/us/en/products-services/routing/mx-series/vmx/", - "registry_version": 6, + "registry_version": 5, "status": "experimental", "maintainer": "none", "maintainer_email": "developers@gns3.net", @@ -18,7 +18,7 @@ "qemu": { "adapter_type": "virtio-net-pci", "adapters": 12, - "ram": 512, + "ram": 1024, "arch": "x86_64", "console_type": "telnet", "kvm": "require", From f6182b80e2e001f583ebbabfa987580ac3969892 Mon Sep 17 00:00:00 2001 From: Jeremy Grossmann Date: Mon, 6 Jul 2020 15:34:40 +0930 Subject: [PATCH 5/5] Use registry version 6 --- appliances/juniper-vmx-legacy.gns3a | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appliances/juniper-vmx-legacy.gns3a b/appliances/juniper-vmx-legacy.gns3a index 2ef38c4..cddcaa7 100644 --- a/appliances/juniper-vmx-legacy.gns3a +++ b/appliances/juniper-vmx-legacy.gns3a @@ -7,7 +7,7 @@ "documentation_url": "http://www.juniper.net/techpubs/", "product_name": "Juniper vMX", "product_url": "http://www.juniper.net/us/en/products-services/routing/mx-series/vmx/", - "registry_version": 5, + "registry_version": 6, "status": "experimental", "maintainer": "none", "maintainer_email": "developers@gns3.net",