From b639630974f03764bbcc720f32f66c61cbfa400f Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Wed, 31 Jan 2018 18:58:49 +0700
Subject: [PATCH] Merge changes.

---
 appliances/cisco-csr1000v.gns3a |  8 ++++----
 appliances/cisco-iosvl2.gns3a   | 13 -------------
 appliances/ubuntu-gui.gns3a     | 13 -------------
 3 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/appliances/cisco-csr1000v.gns3a b/appliances/cisco-csr1000v.gns3a
index 9f857bd..505cbcb 100644
--- a/appliances/cisco-csr1000v.gns3a
+++ b/appliances/cisco-csr1000v.gns3a
@@ -27,28 +27,28 @@
             "version": "16.7.1",
             "md5sum": "bad9000d4ae8317bbc99a34a8cdd2eb4",
             "filesize": 884539392,
-            "download_url": "https://software.cisco.com/portal/pub/download/portal/select.html?&mdfid=284364978&flowid=39582&softwareid=282046477"
+            "download_url": "https://software.cisco.com/download/release.html?mdfid=284364978&flowid=39582&softwareid=282046477&release=Fuji-16.7.1"
         },
         {
             "filename": "csr1000v-universalk9.16.06.02-serial.qcow2",
             "version": "16.6.2",
             "md5sum": "11e393b31ab9d1ace8e5f7551c491ba2",
             "filesize": 1570242560,
-            "download_url": "https://software.cisco.com/portal/pub/download/portal/select.html?&mdfid=284364978&flowid=39582&softwareid=282046477"
+            "download_url": "https://software.cisco.com/download/release.html?mdfid=284364978&flowid=39582&softwareid=282046477&release=Everest-16.6.2"
         },
         {
             "filename": "csr1000v-universalk9.16.06.01-serial.qcow2",
             "version": "16.6.1",
             "md5sum": "909e74446d3ff0b82c14327c0058fdc2",
             "filesize": 1566179328,
-            "download_url": "https://software.cisco.com/portal/pub/download/portal/select.html?&mdfid=284364978&flowid=39582&softwareid=282046477"
+            "download_url": "https://software.cisco.com/download/release.html?mdfid=284364978&flowid=39582&softwareid=282046477&release=Everest-16.6.1"
         },
         {
             "filename": "csr1000v-universalk9.16.05.02-serial.qcow2",
             "version": "16.5.2",
             "md5sum": "59a84da28d59ee75176aa05ecde7f72a",
             "filesize": 1322385408,
-            "download_url": "https://software.cisco.com/portal/pub/download/portal/select.html?&mdfid=284364978&flowid=39582&softwareid=282046477"
+            "download_url": "https://software.cisco.com/download/release.html?mdfid=284364978&flowid=39582&softwareid=282046477&release=Everest-16.5.2"
         },
         {
             "filename": "csr1000v-universalk9.16.5.1b-serial.qcow2",
diff --git a/appliances/cisco-iosvl2.gns3a b/appliances/cisco-iosvl2.gns3a
index a5ef495..b7d0dce 100644
--- a/appliances/cisco-iosvl2.gns3a
+++ b/appliances/cisco-iosvl2.gns3a
@@ -23,13 +23,6 @@
         "kvm": "require"
     },
     "images": [
-        {
-            "filename": "vios_l2-adventerprisek9-m.03.2017.vmdk",
-            "version": "15.2(20170321:233949)",
-            "md5sum": "3610c56ee8012d148c4b99225dc2d004",
-            "filesize": 97124352,
-            "download_url": "https://virl.mediuscorp.com/my-account/"
-        },
         {
             "filename": "vios_l2-adventerprisek9-m.03.2017.qcow2",
             "version": "15.2(20170321:233949)",
@@ -46,12 +39,6 @@
         }
     ],
     "versions": [
-        {
-            "name": "15.2(20170321:233949)",
-            "images": {
-                "hda_disk_image": "vios_l2-adventerprisek9-m.03.2017.vmdk"
-            }
-        },
         {
             "name": "15.2(20170321:233949)",
             "images": {
diff --git a/appliances/ubuntu-gui.gns3a b/appliances/ubuntu-gui.gns3a
index 0c48fde..410abe1 100644
--- a/appliances/ubuntu-gui.gns3a
+++ b/appliances/ubuntu-gui.gns3a
@@ -45,13 +45,6 @@
             "md5sum": "45bccf63f2777e492f022dbf025f67d0",
             "filesize": 4302110720,
             "download_url": "http://www.osboxes.org/ubuntu/"
-        },
-        {
-            "filename": "ubuntu-16.04-server-cloudimg-amd64-disk1.img",
-            "version": "16.04.03",
-            "md5sum": "7e24f437418013d6600ac9f998a0e617",
-            "filesize": 290717696,
-            "download_url": "https://cloud-images.ubuntu.com/"
         }
     ],
     "versions": [
@@ -72,12 +65,6 @@
             "images": {
                 "hda_disk_image": "Ubuntu_16.04.3-VM-64bit.vmdk"
             }
-        },
-        {
-            "name": "16.04.03",
-            "images": {
-                "hda_disk_image": "ubuntu-16.04-server-cloudimg-amd64-disk1.img"
-            }
         }
     ]
 }