From e1aa13fa73e8c394e354d959130b3e976217dcd7 Mon Sep 17 00:00:00 2001 From: Jeremy Grossmann Date: Tue, 26 Feb 2019 15:28:11 +0700 Subject: [PATCH 1/7] Force jsonschema dependency to 2.6.0 This is to fix this issue when starting the (frozen) application on Windows: ``` File "C:\Python36-x64\lib\site-packages\jsonschema\validators.py", line 505, in File "C:\Python36-x64\lib\site-packages\jsonschema\_utils.py", line 57, in load_schema File "C:\Python36-x64\lib\pkgutil.py", line 634, in get_data OSError: [Errno 34] Result too large: 'jsonschema\\schemas\\draft6.json' ``` --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index edd65a31..2578f031 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -jsonschema>=2.4.0 +jsonschema==2.6.0 aiohttp>=2.3.3,<2.4.0 # pyup: ignore aiohttp-cors>=0.5.3,<0.6.0 # pyup: ignore yarl>=0.11 @@ -8,4 +8,4 @@ psutil>=3.0.0 zipstream>=1.1.4 typing>=3.5.3.0 # Otherwise yarl fails with python 3.4 prompt-toolkit==1.0.15 -async-timeout<3.0.0 # pyup: ignore; 3.0 drops support for python 3.4 \ No newline at end of file +async-timeout<3.0.0 # pyup: ignore; 3.0 drops support for python 3.4 From b5deb9d177b35785e8403f729bef5aa966eda51d Mon Sep 17 00:00:00 2001 From: grossmj Date: Tue, 26 Feb 2019 16:46:02 +0700 Subject: [PATCH 2/7] Release v2.1.13 --- CHANGELOG | 15 +++++++++++++++ gns3server/crash_report.py | 2 +- gns3server/version.py | 5 ++--- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index bc8d5085..b13bdd1b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,20 @@ # Change Log +## 2.1.13 26/02/2019 + +* Force jsonschema dependency to 2.6.0 +* Less aggressive connections to uBridge. Ref #1289 +* Fix topology images (Pictures) disappearing from projects. Fixes #1514. +* Reset MAC addresses when duplicating a project. Fixes #1522 +* Fix API call to create a node from an appliance doesn't return the new node data. Fixes #1527 +* Detect invalid environment variable and send a warning when creating a Docker node. Ref #2683 +* Do not export/import symlinks for projects. Fixes #2699 +* Fix symlink not being created for duplicated IOU devices. Fixes https://github.com/GNS3/gns3-gui/issues/2699 +* Configure coresPerSocket value in VMX file for the GNS3 VM. Fixes https://github.com/GNS3/gns3-gui/issues/2688 +* Count logical CPUs to detect if the number of vCPUs is too high when configuring the GNS3 VM. Fixes #2688. +* Add explicit error when trying to pull a Docker image from Docker Hub without Internet access. Fixes #1506. +* Fixes double display output in GRUB in QEMU v3.1. Fixes #1516. + ## 2.1.12 23/01/2019 * Tune how to get the size of SVG images. Ref https://github.com/GNS3/gns3-gui/issues/2674. diff --git a/gns3server/crash_report.py b/gns3server/crash_report.py index ff631963..ef6766b4 100644 --- a/gns3server/crash_report.py +++ b/gns3server/crash_report.py @@ -57,7 +57,7 @@ class CrashReport: Report crash to a third party service """ - DSN = "https://edb72a54588b4d04afc2de56b8cb5b24:7830885c8a2a4d0cb311de10ddfe3d27@sentry.io/38482" + DSN = "https://f4b829dcc310479882c429a04ec8e05e:e429c6d7e7d346d0b539da15fb737055@sentry.io/38482" if hasattr(sys, "frozen"): cacert = get_resource("cacert.pem") if cacert is not None and os.path.isfile(cacert): diff --git a/gns3server/version.py b/gns3server/version.py index 5c7e2b08..daf3b56c 100644 --- a/gns3server/version.py +++ b/gns3server/version.py @@ -23,9 +23,8 @@ # or negative for a release candidate or beta (after the base version # number has been incremented) -__version__ = "2.1.13dev1" -__version_info__ = (2, 1, 13, 9) - +__version__ = "2.1.13" +__version_info__ = (2, 1, 13, 0) # If it's a git checkout try to add the commit if "dev" in __version__: try: From 01481cde1fad012fe66a7322141e2ce2d4f560bb Mon Sep 17 00:00:00 2001 From: grossmj Date: Tue, 26 Feb 2019 18:10:23 +0700 Subject: [PATCH 3/7] Development on 2.1.14dev1 --- gns3server/version.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gns3server/version.py b/gns3server/version.py index daf3b56c..d71ea144 100644 --- a/gns3server/version.py +++ b/gns3server/version.py @@ -23,8 +23,9 @@ # or negative for a release candidate or beta (after the base version # number has been incremented) -__version__ = "2.1.13" -__version_info__ = (2, 1, 13, 0) +__version__ = "2.1.14dev1" +__version_info__ = (2, 1, 14, 99) + # If it's a git checkout try to add the commit if "dev" in __version__: try: From 879e32eb9ac54fe1f34a5b68e4942ad017d1b40a Mon Sep 17 00:00:00 2001 From: grossmj Date: Tue, 26 Feb 2019 23:19:33 +0700 Subject: [PATCH 4/7] Bump ACPI Shutdown Timeout to 120 seconds. Ref #1536 --- gns3server/compute/qemu/qemu_vm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gns3server/compute/qemu/qemu_vm.py b/gns3server/compute/qemu/qemu_vm.py index 4ee17f8a..9f2e5182 100644 --- a/gns3server/compute/qemu/qemu_vm.py +++ b/gns3server/compute/qemu/qemu_vm.py @@ -974,7 +974,7 @@ class QemuVM(BaseNode): try: if self.acpi_shutdown: yield from self._control_vm("system_powerdown") - yield from gns3server.utils.asyncio.wait_for_process_termination(self._process, timeout=30) + yield from gns3server.utils.asyncio.wait_for_process_termination(self._process, timeout=120) else: self._process.terminate() yield from gns3server.utils.asyncio.wait_for_process_termination(self._process, timeout=3) From 7aae682f0a1f20ded160555f4f05f50b45f45aad Mon Sep 17 00:00:00 2001 From: grossmj Date: Wed, 27 Feb 2019 14:47:45 +0700 Subject: [PATCH 5/7] Fix issue when setting cpuid.corespersocket for the GNS3 VM. Fixes https://github.com/GNS3/gns3-gui/issues/2723 --- gns3server/controller/gns3vm/vmware_gns3_vm.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gns3server/controller/gns3vm/vmware_gns3_vm.py b/gns3server/controller/gns3vm/vmware_gns3_vm.py index cd1915b9..2931de6d 100644 --- a/gns3server/controller/gns3vm/vmware_gns3_vm.py +++ b/gns3server/controller/gns3vm/vmware_gns3_vm.py @@ -76,11 +76,12 @@ class VMwareGNS3VM(BaseGNS3VM): if vcpus > available_vcpus: raise GNS3VMError("You have allocated too many vCPUs for the GNS3 VM! (max available is {} vCPUs)".format(available_vcpus)) - cores_per_sockets = int(available_vcpus / psutil.cpu_count(logical=False)) try: pairs = VMware.parse_vmware_file(self._vmx_path) pairs["numvcpus"] = str(vcpus) - pairs["cpuid.coresPerSocket"] = str(cores_per_sockets) + cores_per_sockets = int(available_vcpus / psutil.cpu_count(logical=False)) + if cores_per_sockets >= 1: + pairs["cpuid.corespersocket"] = str(cores_per_sockets) pairs["memsize"] = str(ram) VMware.write_vmx_file(self._vmx_path, pairs) log.info("GNS3 VM vCPU count set to {} and RAM amount set to {}".format(vcpus, ram)) From 32f5dbb6453091619cf0d5ba2e12147cd74c4215 Mon Sep 17 00:00:00 2001 From: grossmj Date: Wed, 27 Feb 2019 14:58:52 +0700 Subject: [PATCH 6/7] Release v2.1.14 --- CHANGELOG | 5 +++++ gns3server/crash_report.py | 2 +- gns3server/version.py | 5 ++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index b13bdd1b..f2680b73 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,10 @@ # Change Log +## 2.1.14 27/02/2019 + +* Fix issue when setting cpuid.corespersocket for the GNS3 VM. Fixes https://github.com/GNS3/gns3-gui/issues/2723 +* Bump ACPI Shutdown Timeout to 120 seconds. Ref #1536 + ## 2.1.13 26/02/2019 * Force jsonschema dependency to 2.6.0 diff --git a/gns3server/crash_report.py b/gns3server/crash_report.py index ef6766b4..547c9c02 100644 --- a/gns3server/crash_report.py +++ b/gns3server/crash_report.py @@ -57,7 +57,7 @@ class CrashReport: Report crash to a third party service """ - DSN = "https://f4b829dcc310479882c429a04ec8e05e:e429c6d7e7d346d0b539da15fb737055@sentry.io/38482" + DSN = "https://3abf3feab0b14c51bfecaa170e846bb9:54b92432fbe94f0e9afe4cbf0dad0126@sentry.io/38482" if hasattr(sys, "frozen"): cacert = get_resource("cacert.pem") if cacert is not None and os.path.isfile(cacert): diff --git a/gns3server/version.py b/gns3server/version.py index d71ea144..96c98859 100644 --- a/gns3server/version.py +++ b/gns3server/version.py @@ -23,9 +23,8 @@ # or negative for a release candidate or beta (after the base version # number has been incremented) -__version__ = "2.1.14dev1" -__version_info__ = (2, 1, 14, 99) - +__version__ = "2.1.14" +__version_info__ = (2, 1, 14, 0) # If it's a git checkout try to add the commit if "dev" in __version__: try: From 4eca82174dd68bbb0fe02f011ce54a52af1833b8 Mon Sep 17 00:00:00 2001 From: grossmj Date: Wed, 27 Feb 2019 15:59:16 +0700 Subject: [PATCH 7/7] Development on 2.1.15dev1 --- gns3server/version.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gns3server/version.py b/gns3server/version.py index 96c98859..1bbb3f80 100644 --- a/gns3server/version.py +++ b/gns3server/version.py @@ -23,8 +23,9 @@ # or negative for a release candidate or beta (after the base version # number has been incremented) -__version__ = "2.1.14" -__version_info__ = (2, 1, 14, 0) +__version__ = "2.1.15dev1" +__version_info__ = (2, 1, 15, 99) + # If it's a git checkout try to add the commit if "dev" in __version__: try: