From eb9b973bc6b3a37c7463b49a6914d1b086b00461 Mon Sep 17 00:00:00 2001 From: Daniel Wu Date: Mon, 5 Oct 2020 00:29:40 +0800 Subject: [PATCH 1/5] Add juniper-vrr support\nFix the missing comma in appliances/Raspian.gns3a --- appliances/juniper-vrr.gns3a | 53 ++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 appliances/juniper-vrr.gns3a diff --git a/appliances/juniper-vrr.gns3a b/appliances/juniper-vrr.gns3a new file mode 100644 index 0000000..ee120f0 --- /dev/null +++ b/appliances/juniper-vrr.gns3a @@ -0,0 +1,53 @@ +{ + "name": "Juniper Virtual Route Reflector", + "category": "router", + "description": "The vRR is a full-featured, carrier-grade virtual route reflector software that extends 15+ years of Juniper Networks edge routing expertise to the virtual realm.", + "vendor_name": "Juniper", + "vendor_url": "https://www.juniper.net/us/en/", + "documentation_url": "https://www.juniper.net/documentation/product/en_US/virtual-route-reflector", + "product_name": "Juniper Virtual Route Reflector", + "product_url": "https://www.juniper.net/us/en/products-services/nos/junos/", + "registry_version": 3, + "status": "experimental", + "availability": "service-contract", + "maintainer": "none", + "maintainer_email": "developers@gns3.net", + "usage": "Initial username is root, no password.\\n\\nUSAGE INSTRUCTIONS\\n\\nConnect the first interface (em0) to your admin VLAN.", + "symbol": "juniper-vmx.svg", + "first_port_name": "em0", + "port_name_format": "em{port1}", + "qemu": { + "adapter_type": "virtio", + "adapters": 2, + "ram": 8192, + "hda_disk_interface": "virtio", + "hdb_disk_interface": "virtio", + "arch": "x86_64", + "console_type": "telnet", + "kvm": "require", + "options": "-nographic -enable-kvm" + }, + "images": [ + { + "filename": "junos-x86-64-20.3R1.8.img", + "version": "20.3R1.8-KVM", + "md5sum": "5cd41a792daae2b3fefac1928f2a1894", + "filesize": 2761162752 + }, + { + "filename": "metadata.img", + "version": "20.3R1.8-KVM", + "md5sum": "ae4e3562aa389929476d82420c79d511", + "filesize": 393216 + } + ], + "versions": [ + { + "name": "20.3R1.8-KVM", + "images": { + "hda_disk_image": "junos-x86-64-20.3R1.8.img", + "hdb_disk_image": "metadata.img" + } + } + ] +} From 32b2e414c2c922b441f6154976080f01f31c8ab4 Mon Sep 17 00:00:00 2001 From: Daniel Wu Date: Mon, 5 Oct 2020 00:32:44 +0800 Subject: [PATCH 2/5] Add juniper-vrr support\nFix the missing comma in appliances/Raspian.gns3a --- appliances/IPCop.gns3a | 2 +- appliances/Raspian.gns3a | 6 +++--- appliances/cisco-dcnm.gns3a | 3 ++- appliances/juniper-vmx-vcp.gns3a | 4 ++-- appliances/juniper-vmx-vfp.gns3a | 4 ++-- appliances/openwrt.gns3a | 2 +- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/appliances/IPCop.gns3a b/appliances/IPCop.gns3a index 7102232..2fdb1ef 100644 --- a/appliances/IPCop.gns3a +++ b/appliances/IPCop.gns3a @@ -11,8 +11,8 @@ "maintainer": "Brent Stewart", "maintainer_email": "brent@stewart.tc", "usage": "", + "symbol": "shieldedtux.png", "port_name_format": "eth{0}", - "symbol": "shieldedtux.png", "qemu": { "adapter_type": "e1000", "adapters": 3, diff --git a/appliances/Raspian.gns3a b/appliances/Raspian.gns3a index f9707c1..2e7af20 100644 --- a/appliances/Raspian.gns3a +++ b/appliances/Raspian.gns3a @@ -11,7 +11,7 @@ "availability": "free", "maintainer": "Brent Stewart", "maintainer_email": "brent@stewart.tc", - "usage": "Default password is raspberry" + "usage": "Default password is raspberry", "symbol": "rpi.png", "qemu": { "adapter_type": "virtio", @@ -40,11 +40,11 @@ ], "versions": [ { + "name": "2020-02-12", "images": { "hda_disk_image": "empty8G.qcow2", "cdrom_image": "2020-02-12-rpd-x86-buster.iso" - }, - "name": "2020-02-12" + } } ] } diff --git a/appliances/cisco-dcnm.gns3a b/appliances/cisco-dcnm.gns3a index 1204330..3fba6a3 100644 --- a/appliances/cisco-dcnm.gns3a +++ b/appliances/cisco-dcnm.gns3a @@ -69,7 +69,8 @@ "hda_disk_image": "empty100G.qcow2", "cdrom_image": "dcnm-va.11.4.1.iso" } - }, { + }, + { "name": "11.2.1", "images": { "hda_disk_image": "empty100G.qcow2", diff --git a/appliances/juniper-vmx-vcp.gns3a b/appliances/juniper-vmx-vcp.gns3a index 4100ffb..1f1a276 100644 --- a/appliances/juniper-vmx-vcp.gns3a +++ b/appliances/juniper-vmx-vcp.gns3a @@ -28,7 +28,7 @@ "options": "-nographic -enable-kvm" }, "images": [ - { + { "filename": "junos-vmx-x86-64-20.2R1.10.qcow2", "version": "20.2R1.10-KVM", "md5sum": "182484474accf07bd403ef17fa2959a9", @@ -357,7 +357,7 @@ } ], "versions": [ - { + { "name": "20.2R1.10-KVM", "images": { "hda_disk_image": "junos-vmx-x86-64-20.2R1.10.qcow2", diff --git a/appliances/juniper-vmx-vfp.gns3a b/appliances/juniper-vmx-vfp.gns3a index f723023..9e6a9e3 100644 --- a/appliances/juniper-vmx-vfp.gns3a +++ b/appliances/juniper-vmx-vfp.gns3a @@ -26,7 +26,7 @@ "options": "-nographic -enable-kvm -smp cpus=3" }, "images": [ - { + { "filename": "vFPC-20200526.img", "version": "20.2R1.10-KVM", "md5sum": "400652d7e450b0bf8ad4cc37db46b78c", @@ -154,7 +154,7 @@ } ], "versions": [ - { + { "name": "20.2R1.10-KVM", "images": { "hda_disk_image": "vFPC-20200526.img" diff --git a/appliances/openwrt.gns3a b/appliances/openwrt.gns3a index 396d1b3..44c3756 100644 --- a/appliances/openwrt.gns3a +++ b/appliances/openwrt.gns3a @@ -22,7 +22,7 @@ "kvm": "allow" }, "images": [ - { + { "filename": "openwrt-19.07.4-x86-64-combined-ext4.img", "version": "19.07.4", "md5sum": "e8bde404ab527ab40ef9643bca9f7432", From 21afd0c2e6069f194a228b7473ff2e4b730ac6c2 Mon Sep 17 00:00:00 2001 From: Daniel Wu Date: Mon, 5 Oct 2020 00:42:21 +0800 Subject: [PATCH 3/5] Change the storage type to ide, change the nic type to e1000. --- appliances/juniper-vrr.gns3a | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/appliances/juniper-vrr.gns3a b/appliances/juniper-vrr.gns3a index ee120f0..593194a 100644 --- a/appliances/juniper-vrr.gns3a +++ b/appliances/juniper-vrr.gns3a @@ -1,27 +1,26 @@ { - "name": "Juniper Virtual Route Reflector", + "name": "Juniper vRR", "category": "router", "description": "The vRR is a full-featured, carrier-grade virtual route reflector software that extends 15+ years of Juniper Networks edge routing expertise to the virtual realm.", "vendor_name": "Juniper", "vendor_url": "https://www.juniper.net/us/en/", "documentation_url": "https://www.juniper.net/documentation/product/en_US/virtual-route-reflector", - "product_name": "Juniper Virtual Route Reflector", + "product_name": "Juniper vRR", "product_url": "https://www.juniper.net/us/en/products-services/nos/junos/", "registry_version": 3, "status": "experimental", - "availability": "service-contract", "maintainer": "none", "maintainer_email": "developers@gns3.net", - "usage": "Initial username is root, no password.\\n\\nUSAGE INSTRUCTIONS\\n\\nConnect the first interface (em0) to your admin VLAN.", + "usage": "Initial username is root, no password.\n\nUSAGE INSTRUCTIONS\n\nConnect the first interface (em0) to your admin VLAN.", "symbol": "juniper-vmx.svg", "first_port_name": "em0", "port_name_format": "em{port1}", "qemu": { - "adapter_type": "virtio", + "adapter_type": "e1000", "adapters": 2, "ram": 8192, - "hda_disk_interface": "virtio", - "hdb_disk_interface": "virtio", + "hda_disk_interface": "ide", + "hdb_disk_interface": "ide", "arch": "x86_64", "console_type": "telnet", "kvm": "require", From 91d3a1a506b6df9652882a47806354d254e8040e Mon Sep 17 00:00:00 2001 From: Daniel Wu Date: Mon, 5 Oct 2020 02:00:30 +0800 Subject: [PATCH 4/5] Update Cisco XRv9000 --- appliances/cisco-iosxrv9k.gns3a | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/appliances/cisco-iosxrv9k.gns3a b/appliances/cisco-iosxrv9k.gns3a index b8598ae..0115704 100644 --- a/appliances/cisco-iosxrv9k.gns3a +++ b/appliances/cisco-iosxrv9k.gns3a @@ -25,6 +25,13 @@ "options": "-smp 4 -cpu host" }, "images": [ + { + "filename": "xrv9k-fullk9-x-7.1.1.qcow2", + "version": "7.1.1", + "md5sum": "dcf241e3f8df0151fec2c7bfac9d96ac", + "filesize": 1443758080, + "download_url": "https://software.cisco.com/download/home/286288939/type/280805694/release/7.1.1" + }, { "filename": "xrv9k-fullk9-x-7.0.1.qcow2", "version": "7.0.1", From f9366f65f30cbdedcb306ad9379d012d2b2398a7 Mon Sep 17 00:00:00 2001 From: Daniel Wu Date: Mon, 5 Oct 2020 02:04:40 +0800 Subject: [PATCH 5/5] Update Cisco XRv9000 --- appliances/cisco-iosxrv9k.gns3a | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/appliances/cisco-iosxrv9k.gns3a b/appliances/cisco-iosxrv9k.gns3a index 0115704..e1084ab 100644 --- a/appliances/cisco-iosxrv9k.gns3a +++ b/appliances/cisco-iosxrv9k.gns3a @@ -104,6 +104,12 @@ } ], "versions": [ + { + "name": "7.1.1", + "images": { + "hda_disk_image": "xrv9k-fullk9-x-7.1.1.qcow2" + } + }, { "name": "7.0.1", "images": {