Merging 2.1 into 2.2 branch

5 years ago · 336b77e28a
parent 591d4f29ff 3dbce3fa40
commit 336b77e28a
4 changed files with 46 additions and 98 deletions
--- a/15
+++ b/15
@ -1,5 +1,20 @@
 # Change Log

+## 2.1.20 29/05/2019
+
+* Ignore Unicode errors when reading base config file contents.
+
+## 2.1.19 28/05/2019
+
+* Sync appliances.
+* Remove yarl from requirements.txt since it is installed by aiohttp.
+* Drop typing dependency.
+
+## 2.1.18 22/05/2019
+
+* Revert "Force aiohttp version to 2.3.10 and aiohttp-cors version to 0.5.3" Ref https://github.com/GNS3/gns3-server/issues/1583 Ref https://github.com/GNS3/gns3-server/issues/1592
+* Fix invalid reStructuredText for long description in setup.py
+
 ## 2.2.0b1 21/05/2019

 * Upgrade GNS3 Web UI to v2019.2.0-alpha.3
--- a/gns3server/appliances/centos7.gns3a
+++ b/gns3server/appliances/centos7.gns3a
@ -27,6 +27,22 @@
    },
    "images": [

+        {
+            "filename": "CentOS 7-18.10 (64bit).vmdk",
+            "version": "7-1810",
+            "md5sum": "7307e143c11910f3c782b1e013e6f14f",
+            "filesize": 4886233088,
+            "download_url": "http://www.osboxes.org/centos/"
+        },
+
+        {
+            "filename": "CentOS 7-1804 (64bit).vmdk",
+            "version": "7-1804",
+            "md5sum": "eae8dc48bb390c0c2d9a9a0432ced9bc",
+            "filesize": 4701356032,
+            "download_url": "http://www.osboxes.org/centos/"
+        },
+
        {
            "filename": "CentOS 7-1611 (64bit).vmdk",
            "version": "7-1611",
@ -36,6 +52,20 @@
        }
    ],
    "versions": [
+        {
+            "name": "7-1810",
+            "images": {
+                "hda_disk_image": "CentOS 7-18.10 (64bit).vmdk"
+            }
+        },
+
+        {
+            "name": "7-1804",
+            "images": {
+                "hda_disk_image": "CentOS 7-1804 (64bit).vmdk"
+            }
+        },
+
        {
            "name": "7-1611",
            "images": {
--- a/gns3server/appliances/lede.gns3a
+++ b/gns3server/appliances/lede.gns3a
@ -1,97 +0,0 @@
-{
-    "name": "LEDE",
-    "category": "router",
-    "description": "LEDE is a highly extensible GNU/Linux distribution for embedded devices (typically wireless routers). Unlike many other distributions for these routers, OpenWrt is built from the ground up to be a full-featured, easily modifiable operating system for your router. In practice, this means that you can have all the features you need with none of the bloat, powered by a Linux kernel that's more recent than most other distributions.",
-    "vendor_name": "LEDE Project",
-    "vendor_url": "https://lede-project.org/",
-    "documentation_url": "http://wiki.openwrt.org/doc/",
-    "product_name": "LEDE",
-    "product_url": "https://lede-project.org/",
-    "registry_version": 3,
-    "status": "stable",
-    "maintainer": "GNS3 Team",
-    "maintainer_email": "developers@gns3.net",
-    "usage": "Ethernet0 is the LAN link, Ethernet1 the WAN link.",
-    "qemu": {
-        "adapter_type": "virtio-net-pci",
-        "adapters": 2,
-        "ram": 64,
-        "arch": "i386",
-        "console_type": "telnet",
-        "kvm": "allow"
-    },
-    "images": [
-        {
-            "filename": "lede-17.01.4-x86-generic-combined-squashfs.img",
-            "version": "17.01.4",
-            "md5sum": "ae5d8d3fcab109565fe337d28e51c4b4",
-            "filesize": 19779546,
-            "download_url": "https://downloads.lede-project.org/releases/17.01.4/targets/x86/generic/",
-            "direct_download_url": "https://downloads.lede-project.org/releases/17.01.4/targets/x86/generic/lede-17.01.4-x86-generic-combined-squashfs.img"
-        },
-        {
-            "filename": "lede-17.01.3-x86-generic-combined-squashfs.img",
-            "version": "17.01.3",
-            "md5sum": "d315fc638160a9aec0966d58828bfccf",
-            "filesize": 19775618,
-            "download_url": "https://downloads.lede-project.org/releases/17.01.3/targets/x86/generic/",
-            "direct_download_url": "https://downloads.lede-project.org/releases/17.01.3/targets/x86/generic/lede-17.01.3-x86-generic-combined-squashfs.img"
-        },
-        {
-            "filename": "lede-17.01.2-x86-generic-combined-squashfs.img",
-            "version": "17.01.2",
-            "md5sum": "a466e493ef12935dad5e0c622b1a7859",
-            "filesize": 19774794,
-            "download_url": "https://downloads.lede-project.org/releases/17.01.2/targets/x86/generic/",
-            "direct_download_url": "https://downloads.lede-project.org/releases/17.01.2/targets/x86/generic/lede-17.01.2-x86-generic-combined-squashfs.img"
-        },
-        {
-            "filename": "lede-17.01.1-x86-generic-combined-squashfs.img",
-            "version": "17.01.1",
-            "md5sum": "b050e734c605a34a429389c752ae7c30",
-            "filesize": 19771166,
-            "download_url": "https://downloads.lede-project.org/releases/17.01.1/targets/x86/generic/",
-            "direct_download_url": "https://downloads.lede-project.org/releases/17.01.1/targets/x86/generic/lede-17.01.1-x86-generic-combined-squashfs.img"
-        },
-        {
-            "filename": "lede-17.01.0-r3205-59508e3-x86-generic-combined-squashfs.img",
-            "version": "17.01.0",
-            "md5sum": "3c5e068d50a377d4e26b548ab1ca7b1e",
-            "filesize": 19755118,
-            "download_url": "https://downloads.lede-project.org/releases/17.01.0/targets/x86/generic/",
-            "direct_download_url": "https://downloads.lede-project.org/releases/17.01.0/targets/x86/generic/lede-17.01.0-r3205-59508e3-x86-generic-combined-squashfs.img"
-        }
-    ],
-    "versions": [
-        {
-            "name": "lede 17.01.4",
-            "images": {
-                "hda_disk_image": "lede-17.01.4-x86-generic-combined-squashfs.img"
-            }
-        },
-        {
-            "name": "lede 17.01.3",
-            "images": {
-                "hda_disk_image": "lede-17.01.3-x86-generic-combined-squashfs.img"
-            }
-        },
-        {
-            "name": "lede 17.01.2",
-            "images": {
-                "hda_disk_image": "lede-17.01.2-x86-generic-combined-squashfs.img"
-            }
-        },
-        {
-            "name": "lede 17.01.1",
-            "images": {
-                "hda_disk_image": "lede-17.01.1-x86-generic-combined-squashfs.img"
-            }
-        },
-        {
-            "name": "lede 17.01.0",
-            "images": {
-                "hda_disk_image": "lede-17.01.0-r3205-59508e3-x86-generic-combined-squashfs.img"
-            }
-        }
-    ]
-}
--- a/gns3server/controller/node.py
+++ b/gns3server/controller/node.py
@ -187,7 +187,7 @@ class Node:
        if not os.path.isabs(path):
            path = os.path.join(self.project.controller.configs_path(), path)
        try:
-            with open(path, encoding="utf-8") as f:
+            with open(path, encoding="utf-8", errors="ignore") as f:
                return f.read()
        except OSError:
            return None