Release v2.2.14

CHANGELOG

@@ -1,5 +1,11 @@
 # Change Log
 
+## 2.2.14 14/09/2020
+
+* Release Web-Ui version 2020.3.0-beta.4
+* Add '-smp sockets=1' by default for Qemu VMs. Ref https://github.com/GNS3/gns3-gui/issues/3047
+* Implement full restart if user reload a Qemu VM which has been updated. Fixes https://github.com/GNS3/gns3-gui/issues/3038
+
 ## 2.2.13 04/09/2020
 
 * Release Web-Ui 2020.3.0-beta.3

gns3server/appliances/arista-veos.gns3a

@@ -26,6 +26,20 @@
         "kvm": "require"
     },
     "images": [
+        {
+            "filename": "vEOS-lab-4.25.0FX-LDP-RSVP.vmdk",
+            "version": "4.25.0FX",
+            "md5sum": "b7c2efdbe48301a78f124db989710346",
+            "filesize": 468647936,
+            "download_url": "https://www.arista.com/en/support/software-download"
+        },
+        {
+            "filename": "vEOS-lab-4.24.2.1F.vmdk",
+            "version": "4.24.2.1F",
+            "md5sum": "6bab8b59ce5230e243e56f4127448fc8",
+            "filesize": 455213056,
+            "download_url": "https://www.arista.com/en/support/software-download"
+        },
         {
             "filename": "vEOS-lab-4.23.4.2M.vmdk",
             "version": "4.23.4.2M",
@@ -189,6 +203,20 @@
         }
     ],
     "versions": [
+        {
+            "name": "4.25.0FX",
+            "images": {
+                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
+                "hdb_disk_image": "vEOS-lab-4.25.0FX-LDP-RSVP.vmdk"
+            }
+        },
+        {
+            "name": "4.24.2.1F",
+            "images": {
+                "hda_disk_image": "Aboot-veos-serial-8.0.0.iso",
+                "hdb_disk_image": "vEOS-lab-4.24.2.1F.vmdk"
+            }
+        },
         {
             "name": "4.23.4.2M",
             "images": {

gns3server/compute/qemu/qemu_vm.py

@@ -81,12 +81,13 @@ class QemuVM(BaseNode):
         self._execute_lock = asyncio.Lock()
         self._local_udp_tunnels = {}
         self._guest_cid = None
+        self._command_line_changed = False
 
         # QEMU VM settings
         if qemu_path:
             try:
                 self.qemu_path = qemu_path
-            except QemuError as e:
+            except QemuError:
                 # If the binary is not found for topologies 1.4 and later
                 # search via the platform otherwise use the binary name
                 if platform:
@@ -444,7 +445,18 @@ class QemuVM(BaseNode):
         else:
             self._cdrom_image = ""
 
-    async def update_cdrom_image(self):
+    async def update(self, name, value):
+        """
+        Update Qemu VM properties.
+        """
+
+        setattr(self, name, value)
+        if name == "cdrom_image":
+            # let the guest know about the new cdrom image
+            await self._update_cdrom_image()
+        self._command_line_changed = True
+
+    async def _update_cdrom_image(self):
         """
         Update the cdrom image path for the Qemu guest OS
         """
@@ -1007,6 +1019,7 @@ class QemuVM(BaseNode):
                                                                               stderr=subprocess.STDOUT,
                                                                               cwd=self.working_dir)
                 log.info('QEMU VM "{}" started PID={}'.format(self._name, self._process.pid))
+                self._command_line_changed = False
                 self.status = "started"
                 monitor_process(self._process, self._termination_callback)
             except (OSError, subprocess.SubprocessError, UnicodeEncodeError) as e:
@@ -1282,7 +1295,11 @@ class QemuVM(BaseNode):
         Reloads this QEMU VM.
         """
 
-        await self._control_vm("system_reset")
+        if self._command_line_changed:
+            await self.stop()
+            await self.start()
+        else:
+            await self._control_vm("system_reset")
         log.debug("QEMU VM has been reset")
 
     async def resume(self):
@@ -2014,8 +2031,8 @@ class QemuVM(BaseNode):
         command = [self.qemu_path]
         command.extend(["-name", self._name])
         command.extend(["-m", "{}M".format(self._ram)])
-        command.extend(["-smp", "cpus={}".format(self._cpus)])
-        if (await self._run_with_hardware_acceleration(self.qemu_path, self._options)):
+        command.extend(["-smp", "cpus={},sockets=1".format(self._cpus)])
+        if await self._run_with_hardware_acceleration(self.qemu_path, self._options):
             if sys.platform.startswith("linux"):
                 command.extend(["-enable-kvm"])
                 version = await self.manager.get_qemu_version(self.qemu_path)

gns3server/crash_report.py

@@ -58,7 +58,7 @@ class CrashReport:
     Report crash to a third party service
     """
 
-    DSN = "https://f4321d95918b4f87a4e684ef2611ce36:c0eec6e073b04969a9d79f0ff4402dd1@o19455.ingest.sentry.io/38482"
+    DSN = "https://451594d76eaa42d08e1133e52df65616:2a7c754170b847dda3e559e59c13aa86@o19455.ingest.sentry.io/38482"
     _instance = None
 
     def __init__(self):

gns3server/handlers/api/compute/qemu_handler.py

@@ -124,11 +124,7 @@ class QEMUHandler:
         vm.console = request.json.pop("console", vm.console)
         for name, value in request.json.items():
             if hasattr(vm, name) and getattr(vm, name) != value:
-                setattr(vm, name, value)
-                if name == "cdrom_image":
-                    # let the guest know about the new cdrom image
-                    await vm.update_cdrom_image()
-
+                await vm.update(name, value)
         vm.updated()
         response.json(vm)
 

gns3server/static/web-ui/index.html

@@ -48,5 +48,5 @@
 
       gtag('config', 'G-5D6FZL9923');
     </script>
-  <script src="runtime.c51bd5b1c616d9ffddc1.js" defer></script><script src="polyfills-es5.fa7ed98c2915002d6a80.js" nomodule defer></script><script src="polyfills.e3de9c33e285997df00a.js" defer></script><script src="main.fc6e4d196640e6d4d699.js" defer></script></body>
+  <script src="runtime.c51bd5b1c616d9ffddc1.js" defer></script><script src="polyfills-es5.fa7ed98c2915002d6a80.js" nomodule defer></script><script src="polyfills.e3de9c33e285997df00a.js" defer></script><script src="main.e7b089d7c8fa292097fb.js" defer></script></body>
 </html>

gns3server/static/web-ui/main.e7b089d7c8fa292097fb.js

@@ -1 +1 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([[1],{"+/L5":function(t,e,n){var i=n("t1UP").isCustomProperty,r=n("vd7W").TYPE,o=n("4njK").mode,a=r.Ident,s=r.Hash,c=r.Colon,l=r.Semicolon,u=r.Delim;function h(t){return this.Raw(t,o.exclamationMarkOrSemicolon,!0)}function d(t){return this.Raw(t,o.exclamationMarkOrSemicolon,!1)}function f(){var t=this.scanner.tokenIndex,e=this.Value();return"Raw"!==e.type&&!1===this.scanner.eof&&this.scanner.tokenType!==l&&!1===this.scanner.isDelim(33)&&!1===this.scanner.isBalanceEdge(t)&&this.error(),e}function p(){var t=this.scanner.tokenStart;if(this.scanner.tokenType===u)switch(this.scanner.source.charCodeAt(this.scanner.tokenStart)){case 42:case 36:case 43:case 35:case 38:this.scanner.next();break;case 47:this.scanner.next(),this.scanner.isDelim(47)&&this.scanner.next()}return this.eat(this.scanner.tokenType===s?s:a),this.scanner.substrToCursor(t)}function m(){this.eat(u),this.scanner.skipSC();var t=this.consume(a);return"important"===t||t}t.exports={name:"Declaration",structure:{important:[Boolean,String],property:String,value:["Value","Raw"]},parse:function(){var t,e=this.scanner.tokenStart,n=this.scanner.tokenIndex,r=p.call(this),o=i(r),a=o?this.parseCustomProperty:this.parseValue,s=o?d:h,u=!1;return this.scanner.skipSC(),this.eat(c),o||this.scanner.skipSC(),t=a?this.parseWithFallback(f,s):s.call(this,this.scanner.tokenIndex),this.scanner.isDelim(33)&&(u=m.call(this),this.scanner.skipSC()),!1===this.scanner.eof&&this.scanner.tokenType!==l&&!1===this.scanner.isBalanceEdge(n)&&this.error(),{type:"Declaration",loc:this.getLocation(e,this.scanner.tokenStart),important:u,property:r,value:t}},generate:function(t){this.chunk(t.property),this.chunk(":"),this.node(t.value),t.important&&this.chunk(!0===t.important?"!important":"!"+t.important)},walkContext:"declaration"}},"+4/i":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var i=n("qCKp"),r=n("odkN");i.Observable.prototype.let=r.letProto,i.Observable.prototype.letBind=r.letProto},"+Kd2":function(t,e,n){var i=n("vd7W").TYPE,r=n("4njK").mode,o=i.Comma;t.exports=function(){var t=this.createList();return this.scanner.skipSC(),t.push(this.Identifier()),this.scanner.skipSC(),this.scanner.tokenType===o&&(t.push(this.Operator()),t.push(this.parseCustomProperty?this.Value(null):this.Raw(this.scanner.tokenIndex,r.exclamationMarkOrSemicolon,!1))),t}},"+oeQ":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var i=n("qCKp"),r=n("H+DX");i.Observable.prototype.observeOn=r.observeOn},"+psR":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var i=n("qCKp"),r=n("16Oq");i.Observable.prototype.retry=r.retry},"+qxJ":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var i=n("qCKp"),r=n("GsYY");i.Observable.prototype.distinctUntilChanged=r.distinctUntilChanged},"+v8i":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var i=n("qCKp");i.Observable.concat=i.concat},"/+5V":function(t,e){function n(t){function e(t){return null!==t&&("Type"===t.type||"Property"===t.type||"Keyword"===t.type)}var n=null;return null!==this.matched&&function i(r){if(Array.isArray(r.match)){for(var o=0;o<r.match.length;o++)if(i(r.match[o]))return e(r.syntax)&&n.unshift(r.syntax),!0}else if(r.node===t)return n=e(r.syntax)?[r.syntax]:[],!0;return!1}(this.matched),n}function i(t,e,i){var r=n.call(t,e);return null!==r&&r.some(i)}t.exports={getTrace:n,isType:function(t,e){return i(this,t,(function(t){return"Type"===t.type&&t.name===e}))},isProperty:function(t,e){return i(this,t,(function(t){return"Property"===t.type&&t.name===e}))},isKeyword:function(t){return i(this,t,(function(t){return"Keyword"===t.type}))}}},"/BcF":function(t,e){t.exports={name:"Selector",structure:{children:[["TypeSelector","IdSelector","ClassSelector","AttributeSelector","PseudoClassSelector","PseudoElementSelector","Combinator","WhiteSpace"]]},parse:function(){var t=this.readSequence(this.scope.Selector);return null===this.getFirstListNode(t)&&this.error("Selector is expected"),{type:"Selector",loc:this.getLocationFromList(t),children:t}},generate:function(t){this.children(t)}}},"/POA":function(t,e,n){window,t.exports=function(t){var e={};function n(i){if(e[i])return e[i].exports;var r=e[i]={i:i,l:!1,exports:{}};return t[i].call(r.exports,r,r.exports,n),r.l=!0,r.exports}return n.m=t,n.c=e,n.d=function(t,e,i){n.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:i})},n.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},n.t=function(t,e){if(1&e&&(t=n(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var i=Object.create(null);if(n.r(i),Object.defineProperty(i,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var r in t)n.d(i,r,(function(e){return t[e]}).bind(null,r));return i},n.n=function(t){var e=t&&t.__esModuleLine truncated
+(window.webpackJsonp=window.webpackJsonp||[]).push([[1],{"+/L5":function(t,e,n){var i=n("t1UP").isCustomProperty,r=n("vd7W").TYPE,o=n("4njK").mode,a=r.Ident,s=r.Hash,c=r.Colon,l=r.Semicolon,u=r.Delim;function h(t){return this.Raw(t,o.exclamationMarkOrSemicolon,!0)}function d(t){return this.Raw(t,o.exclamationMarkOrSemicolon,!1)}function f(){var t=this.scanner.tokenIndex,e=this.Value();return"Raw"!==e.type&&!1===this.scanner.eof&&this.scanner.tokenType!==l&&!1===this.scanner.isDelim(33)&&!1===this.scanner.isBalanceEdge(t)&&this.error(),e}function p(){var t=this.scanner.tokenStart;if(this.scanner.tokenType===u)switch(this.scanner.source.charCodeAt(this.scanner.tokenStart)){case 42:case 36:case 43:case 35:case 38:this.scanner.next();break;case 47:this.scanner.next(),this.scanner.isDelim(47)&&this.scanner.next()}return this.eat(this.scanner.tokenType===s?s:a),this.scanner.substrToCursor(t)}function m(){this.eat(u),this.scanner.skipSC();var t=this.consume(a);return"important"===t||t}t.exports={name:"Declaration",structure:{important:[Boolean,String],property:String,value:["Value","Raw"]},parse:function(){var t,e=this.scanner.tokenStart,n=this.scanner.tokenIndex,r=p.call(this),o=i(r),a=o?this.parseCustomProperty:this.parseValue,s=o?d:h,u=!1;return this.scanner.skipSC(),this.eat(c),o||this.scanner.skipSC(),t=a?this.parseWithFallback(f,s):s.call(this,this.scanner.tokenIndex),this.scanner.isDelim(33)&&(u=m.call(this),this.scanner.skipSC()),!1===this.scanner.eof&&this.scanner.tokenType!==l&&!1===this.scanner.isBalanceEdge(n)&&this.error(),{type:"Declaration",loc:this.getLocation(e,this.scanner.tokenStart),important:u,property:r,value:t}},generate:function(t){this.chunk(t.property),this.chunk(":"),this.node(t.value),t.important&&this.chunk(!0===t.important?"!important":"!"+t.important)},walkContext:"declaration"}},"+4/i":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var i=n("qCKp"),r=n("odkN");i.Observable.prototype.let=r.letProto,i.Observable.prototype.letBind=r.letProto},"+Kd2":function(t,e,n){var i=n("vd7W").TYPE,r=n("4njK").mode,o=i.Comma;t.exports=function(){var t=this.createList();return this.scanner.skipSC(),t.push(this.Identifier()),this.scanner.skipSC(),this.scanner.tokenType===o&&(t.push(this.Operator()),t.push(this.parseCustomProperty?this.Value(null):this.Raw(this.scanner.tokenIndex,r.exclamationMarkOrSemicolon,!1))),t}},"+oeQ":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var i=n("qCKp"),r=n("H+DX");i.Observable.prototype.observeOn=r.observeOn},"+psR":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var i=n("qCKp"),r=n("16Oq");i.Observable.prototype.retry=r.retry},"+qxJ":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var i=n("qCKp"),r=n("GsYY");i.Observable.prototype.distinctUntilChanged=r.distinctUntilChanged},"+v8i":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var i=n("qCKp");i.Observable.concat=i.concat},"/+5V":function(t,e){function n(t){function e(t){return null!==t&&("Type"===t.type||"Property"===t.type||"Keyword"===t.type)}var n=null;return null!==this.matched&&function i(r){if(Array.isArray(r.match)){for(var o=0;o<r.match.length;o++)if(i(r.match[o]))return e(r.syntax)&&n.unshift(r.syntax),!0}else if(r.node===t)return n=e(r.syntax)?[r.syntax]:[],!0;return!1}(this.matched),n}function i(t,e,i){var r=n.call(t,e);return null!==r&&r.some(i)}t.exports={getTrace:n,isType:function(t,e){return i(this,t,(function(t){return"Type"===t.type&&t.name===e}))},isProperty:function(t,e){return i(this,t,(function(t){return"Property"===t.type&&t.name===e}))},isKeyword:function(t){return i(this,t,(function(t){return"Keyword"===t.type}))}}},"/BcF":function(t,e){t.exports={name:"Selector",structure:{children:[["TypeSelector","IdSelector","ClassSelector","AttributeSelector","PseudoClassSelector","PseudoElementSelector","Combinator","WhiteSpace"]]},parse:function(){var t=this.readSequence(this.scope.Selector);return null===this.getFirstListNode(t)&&this.error("Selector is expected"),{type:"Selector",loc:this.getLocationFromList(t),children:t}},generate:function(t){this.children(t)}}},"/POA":function(t,e,n){window,t.exports=function(t){var e={};function n(i){if(e[i])return e[i].exports;var r=e[i]={i:i,l:!1,exports:{}};return t[i].call(r.exports,r,r.exports,n),r.l=!0,r.exports}return n.m=t,n.c=e,n.d=function(t,e,i){n.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:i})},n.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},n.t=function(t,e){if(1&e&&(t=n(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var i=Object.create(null);if(n.r(i),Object.defineProperty(i,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var r in t)n.d(i,r,(function(e){return t[e]}).bind(null,r));return i},n.n=function(t){var e=t&&t.__esModuleLine truncated

gns3server/version.py

@@ -23,8 +23,8 @@
 # or negative for a release candidate or beta (after the base version
 # number has been incremented)
 
-__version__ = "2.2.13"
-__version_info__ = (2, 2, 13, 0)
+__version__ = "2.2.14"
+__version_info__ = (2, 2, 14, 0)
 
 if "dev" in __version__:
     try:

tests/compute/qemu/test_qemu_vm.py

@@ -494,7 +494,7 @@ async def test_build_command(vm, fake_qemu_binary):
             "-m",
             "256M",
             "-smp",
-            "cpus=1",
+            "cpus=1,sockets=1",
             "-boot",
             "order=c",
             "-uuid",
@@ -544,7 +544,7 @@ async def test_build_command_kvm(linux_platform, vm, fake_qemu_binary):
                 "-m",
                 "256M",
                 "-smp",
-                "cpus=1",
+                "cpus=1,sockets=1",
                 "-enable-kvm",
                 "-boot",
                 "order=c",
@@ -580,7 +580,7 @@ async def test_build_command_kvm_2_4(linux_platform, vm, fake_qemu_binary):
                 "-m",
                 "256M",
                 "-smp",
-                "cpus=1",
+                "cpus=1,sockets=1",
                 "-enable-kvm",
                 "-machine",
                 "smm=off",
@@ -626,7 +626,7 @@ async def test_build_command_two_adapters(vm, fake_qemu_binary):
             "-m",
             "256M",
             "-smp",
-            "cpus=1",
+            "cpus=1,sockets=1",
             "-boot",
             "order=c",
             "-uuid",