Merge 2.1 into 2.2

CHANGELOG

@@ -1,5 +1,9 @@
 # Change Log
 
+## 2.1.15 21/03/2019
+
+* No changes on the GUI.
+
 ## 2.2.0a4 05/04/2019
 
 * Use the full version number for path to config files. Ref https://github.com/GNS3/gns3-gui/issues/2756

gns3/http_client.py

@@ -207,16 +207,16 @@ class HTTPClient(QtCore.QObject):
         Called when a query upload progress
         """
         if not sip_is_deleted(HTTPClient._progress_callback):
-            HTTPClient._progress_callback.progress_signal.emit(query_id, str(sent), str(total))
+            HTTPClient._progress_callback.progress_signal.emit(query_id, str(abs(sent)), str(abs(total)))
 
     def _notify_progress_download(self, query_id, sent, total):
         """
         Called when a query download progress
         """
         if not sip_is_deleted(HTTPClient._progress_callback):
-            # abs() for maxium because sometimes the system send negative
+            # abs() for maximum because sometimes the system send negative
             # values
-            HTTPClient._progress_callback.progress_signal.emit(query_id, str(sent), str(abs(total)))
+            HTTPClient._progress_callback.progress_signal.emit(query_id, str(abs(sent)), str(abs(total)))
 
     @classmethod
     def setProgressCallback(cls, progress_callback):

gns3/modules/module.py

@@ -152,9 +152,14 @@ class Module(QtCore.QObject):
         :param directory: destination directory path
         """
 
+        node_names_cannot_export = []
         for node in self._nodes:
             if hasattr(node, "initialized") and node.initialized():
-                node.exportConfigsToDirectory(directory)
+                if not node.exportConfigsToDirectory(directory):
+                    node_names_cannot_export.append(node.name())
+
+        if node_names_cannot_export:
+            log.warning("Config export is not supported by the following nodes: {}".format(" ".join(node_names_cannot_export)))
 
     def importConfigs(self, directory):
         """

gns3/modules/traceng/traceng_node.py

@@ -72,7 +72,7 @@ class TraceNGNode(Node):
             self._last_destination = destination
             params = {"destination": destination}
             log.debug("{} is starting".format(self.name()))
-            self.controllerHttpPost("/nodes/{node_id}/start".format(node_id=self._node_id), self._startCallback, body=params, timeout=None, progressText="{} is starting".format(self.name()))
+            self.controllerHttpPost("/nodes/{node_id}/start".format(node_id=self._node_id), self._startCallback, body=params, timeout=None, showProgress=False)
 
     def info(self):
         """

gns3/node.py

@@ -223,7 +223,7 @@ class Node(BaseNode):
             return
 
         log.debug("{} is starting".format(self.name()))
-        self.post("/start", self._startCallback, timeout=None, progressText="{} is starting".format(self.name()))
+        self.post("/start", self._startCallback, timeout=None, showProgress=False)
 
     def _startCallback(self, result, error=False, **kwargs):
         """
@@ -249,7 +249,7 @@ class Node(BaseNode):
             return
 
         log.debug("{} is stopping".format(self.name()))
-        self.post("/stop", self._stopCallback, timeout=None, progressText="{} is stopping".format(self.name()))
+        self.post("/stop", self._stopCallback, timeout=None, showProgress=False)
 
     def _stopCallback(self, result, error=False, **kwargs):
         """
@@ -279,7 +279,7 @@ class Node(BaseNode):
             return
 
         log.debug("{} is being suspended".format(self.name()))
-        self.post("/suspend", self._suspendCallback, timeout=None, progressText="{} is suspending".format(self.name()))
+        self.post("/suspend", self._suspendCallback, timeout=None, showProgress=False)
 
     def _suspendCallback(self, result, error=False, **kwargs):
         """
@@ -301,7 +301,7 @@ class Node(BaseNode):
         """
 
         log.debug("{} is being reloaded".format(self.name()))
-        self.post("/reload", self._reloadCallback, timeout=None, progressText="{} is reloading".format(self.name()))
+        self.post("/reload", self._reloadCallback, timeout=None, showProgress=False)
 
     def _reloadCallback(self, result, error=False, **kwargs):
         """
@@ -455,7 +455,7 @@ class Node(BaseNode):
         if not skip_controller:
             for link in self.links():
                 link.setDeleting()
-            self.controllerHttpDelete("/nodes/{node_id}".format(node_id=self._node_id), self._deleteCallback)
+            self.controllerHttpDelete("/nodes/{node_id}".format(node_id=self._node_id), self._deleteCallback, showProgress=False)
         else:
             self.deleted_signal.emit()
             self._module.removeNode(self)
@@ -485,7 +485,7 @@ class Node(BaseNode):
                   "y": int(y),
                   "z": int(z)}
 
-        self.post("/duplicate", self._duplicateCallback, body=params, timeout=None, progressText="{} is being duplicated".format(self.name()))
+        self.post("/duplicate", self._duplicateCallback, body=params, timeout=None, showProgress=False)
 
     def _duplicateCallback(self, result, error=False, **kwargs):
         """
@@ -775,12 +775,13 @@ class Node(BaseNode):
         """
 
         if not hasattr(self, "configFiles"):
-            return
+            return False
         for file in self.configFiles():
             self.get("/files/{file}".format(file=file),
                      self._exportConfigsToDirectoryCallback,
                      context={"directory": directory, "file": file},
                      raw=True)
+        return True
 
     def _exportConfigsToDirectoryCallback(self, result, error=False, raw_body=None, context={}, **kwargs):
         """

gns3/progress.py

@@ -189,7 +189,10 @@ class Progress(QtCore.QObject):
                     # Due to Qt limitations for large numbers (above 32bit int) we calculate "progress" ourselves
                     current, maximum = self._normalize(query['current'], query['maximum'])
                     progress_dialog.setMaximum(maximum)
-                    progress_dialog.setValue(current)
+                    try:
+                        progress_dialog.setValue(current)
+                    except OverflowError:
+                        progress_dialog.setValue(100)
 
                 if text and query["maximum"] > 1000:
                     text += "\n{} / {}".format(human_filesize(query["current"]), human_filesize(query["maximum"]))

gns3/template_manager.py

@@ -213,6 +213,7 @@ class TemplateManager(QtCore.QObject):
         self._controller.post("/projects/{project_id}/templates/{template_id}".format(project_id=project.id(), template_id=template_id),
                               self._createNodeFromTemplateCallback,
                               params,
+                              showProgress=False,
                               timeout=None)
         return True
 

win-requirements.txt

@@ -1,4 +1,4 @@
 -rrequirements.txt
 
-PyQt5==5.12 # pyup: ignore
+PyQt5>=5.12,<5.13 # pyup: ignore
 pywin32>=223 # pyup: ignore