Release v2.2.0

# Conflicts:
#	gns3/version.py

.github/ISSUE_TEMPLATE/gns3-bug-report.md

@@ -0,0 +1,34 @@
+---
+name: GNS3 bug report
+about: Create a report to help us fix a bug
+title: 'Short description of the bug'
+labels: Bug
+assignees: ''
+
+---
+
+**Before you start**
+Please open an issue only if you suspect there is a bug or any problem with GNS3. Go to https://gns3.com/community for any other questions or for requesting help with GNS3.
+
+You may also post this issue directly on the GNS3 server repository if you know the bug comes from the server: https://github.com/GNS3/gns3-server/issues/new
+
+**Describe the bug**
+Please provide a clear and detailed description of what the bug is.
+
+**GNS3 version and operating system (please complete the following information):**
+ - OS: [e.g. Windows, Linux or macOS]
+ - GNS3 version [e.g. 2.1.14]
+ - Any use of the GNS3 VM or remote server (ESXi, bare metal etc.)
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Screenshots or videos**
+If applicable, add screenshots (e.g. of the topology and/or error message) or links to videos to help explain the problem. This will help us a lot to quickly find the bug and fix it.
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/gns3-development.md

@@ -0,0 +1,10 @@
+---
+name: GNS3 development
+about: Any question or discussion regarding GNS3 development
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+

.github/ISSUE_TEMPLATE/gns3-feature-request.md

@@ -0,0 +1,25 @@
+---
+name: GNS3 feature request
+about: Suggest an idea for GNS3
+title: 'Short description of the feature request'
+labels: Enhancement
+assignees: ''
+
+---
+
+**Before you start**
+Please check if a similar feature request has already been submitted.
+
+You may also post this issue directly on the GNS3 server repository if you know the feature request only applies to the server: https://github.com/GNS3/gns3-server/issues/new
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen. If applicable, please provide screenshots
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

CHANGELOG

@@ -1,5 +1,93 @@
 # Change Log
 
+## 2.2.0 30/09/2019
+
+* No changes
+
+## 2.2.0rc5 09/09/2019
+
+* Adjust size for setup dialog and remove question about running the wizard again. Ref #2846
+
+## 2.2.0rc4 30/08/2019
+
+* Fix issue when asking to run the setup wizard again. Ref #2846
+* Remove warning about VirtualBox not supporting nested virtualization. Ref https://github.com/GNS3/gns3-server/issues/1610
+* Ask user if they want to see the wizard again. Ref #2846
+
+## 2.2.0rc3 12/08/2019
+
+* Revert to jsonschema 2.6.0 due to packaging problem.
+
+## 2.2.0rc2 10/08/2019
+
+* Bump jsonschema to version 3.0.2
+* Fix "Unable to change Remote Main Server IP". Fixes #2823
+* Fix "AttributeError: 'QGraphicsTextItem' object has no attribute 'locked'". Fixes #2814
+* Fix a minor typo in the setup wizard
+
+## 2.2.0b4 11/07/2019
+
+* Fix issue preventing to open the QFileDialog in the correct directory.
+* Remove unused edit readme action. Fixes #2816
+* Remove deprecated Qemu parameter to run legacy ASA VMs. Fixes #2827
+* Upload images on remote controller. Fixes #2828
+* Preferences dialog: send API request only if connected to controller
+* Fix AttributeError: 'QGraphicsTextItem' object has no attribute 'locked'. Fixes #2814
+* Fix KeyError: 'chassis' when converting old IOS templates. Fixes #2813
+
+## 2.2.0b3 15/06/2019
+
+* Fix template migration issues from GUI to controller. Fixes https://github.com/GNS3/gns3-gui/issues/2803
+* %guest-cid% variable implementation for Qemu VMs. Fixes https://github.com/GNS3/gns3-gui/issues/2804
+* Increase timeout from 2 to 5 seconds for synchronous check. Ref #2805
+
+## 2.2.0b2 29/05/2019
+
+* Fix KeyError: 'endpoint' issue. Fixes #2802
+* Fix wrong aligment of symbols in saved/exported projects. Fixes #2800
+* Replace urllib.request by Qt implementation for local server synchronous check. Fixes #2793
+* Support snapshots for portable projects. Fixes https://github.com/GNS3/gns3-gui/issues/2792
+* Fix event notification problem for projects and how snapshots are restored.
+* Do not close the nodes dock widget when creating project.
+* Fix no scan for images on remote controller. Fixes #2799
+* Use QNetworkAccessManager to download custom appliance symbols.
+* Experimental auto upgrade should not be available for "frozen" app. Fixes #2797
+* Don't allow link labels to be moved for locked nodes. Fixes #2794
+* Catch more OSError/PermissionError when checking md5 on remote images. Fixes #2582
+* Fix exception when grid size is 0. Fixes #2790
+* Catch PermissionError when scanning local image directories. Fixes #2791
+
+## 2.1.20 29/05/2019
+
+* Fix KeyError: 'endpoint' issue. Fixes #2802
+
+## 2.1.19 28/05/2019
+
+* Fix wrong aligment of symbols in saved/exported projects. Fixes #2800
+* Replace urllib.request by Qt implementation for local server synchronous check. Fixes #2793
+* Set grid's minimum to 5. Fixes #2795
+
+## 2.1.18 22/05/2019
+
+* Fix error in HTTPConnection.request for Python3.6. Fixes #2793
+* Catch more OSError/PermissionError when checking md5 on remote images. Fixes #2582
+* Fix exception when grid size is 0. Fixes #2790
+* Catch PermissionError when scanning local image directories. Fixes #2791
+* Revert "Make sure the latest PyQt5 version 5.12.x is used on Windows." Ref #2778
+
+## 2.2.0b1 21/05/2019
+
+* Change behavior when an IOU license is verified. Fixes https://github.com/GNS3/gns3-server/issues/1555
+* Fix cannot load new profile. Fixes #2784
+* Fix remote packet capture when controller is also remote. Fixes #2785
+* Set console type to "none" by default for Ethernet switches and add a warning if trying to use "telnet". Fixes https://github.com/GNS3/gns3-gui/issues/2776
+* Add tooltip for symbol theme support in general preferences. Fixes #2770
+* Support for persistent docker volumes
+
+## 2.1.17 17/05/2019
+
+* No changes.
+
 ## 2.2.0a5 15/04/2019
 
 * Revert "Drop old Qemu support (Windows and macOS) and legacy ASA support." Ref https://github.com/GNS3/gns3-server/issues/1579

Dockerfile

@@ -1,5 +1,5 @@
 # Run tests inside a container
-FROM ubuntu:17.10
+FROM ubuntu:18.04
 
 MAINTAINER GNS3 Team
 

dev-requirements.txt

@@ -1,6 +1,6 @@
 -rrequirements.txt
 
 pep8==1.7.0
-pytest==4.4.0
+pytest==4.4.1
 pytest-pythonpath==0.7.3 # useful for running tests outside tox
 pytest-timeout==1.3.3

gns3/controller.py

@@ -54,8 +54,7 @@ class Controller(QtCore.QObject):
         self._error_dialog = None
         self._display_error = True
         self._projects = []
-        self._controller_websocket = QtWebSockets.QWebSocket()
-        self._project_websocket = QtWebSockets.QWebSocket()
+        self._websocket = QtWebSockets.QWebSocket()
 
         # If we do multiple call in order to download the same symbol we queue them
         self._static_asset_download_queue = {}
@@ -247,12 +246,6 @@ class Controller(QtCore.QObject):
         if self._http_client:
             return self._http_client.createHTTPQuery(method, path, *args, **kwargs)
 
-    def getSynchronous(self, endpoint, timeout=2):
-        return self._http_client.getSynchronous(endpoint, timeout)
-
-    def connectProjectWebSocket(self, path, *args):
-        return self._http_client.connectWebSocket(self._project_websocket, path)
-
     @staticmethod
     def instance():
         """
@@ -427,7 +420,7 @@ class Controller(QtCore.QObject):
                                                                               ignoreErrors=True)
 
         else:
-            self._notification_stream = self._http_client.connectWebSocket(self._controller_websocket, "/notifications/ws")
+            self._notification_stream = self._http_client.connectWebSocket(self._websocket, "/notifications/ws")
             self._notification_stream.textMessageReceived.connect(self._websocket_event_received)
             self._notification_stream.error.connect(self._websocket_error)
 

gns3/crash_report.py

@@ -52,7 +52,7 @@ class CrashReport:
     Report crash to a third party service
     """
 
-    DSN = "https://d4962cd8f9ed4259a568b6931d8d2404:4f5cb4bbc93742e89620d4b1522900da@sentry.io/38506"
+    DSN = "https://d2660ce45df5459a964576111ea6b651:584df32b61cc483384b73ec36a98d31f@sentry.io/38506"
     if hasattr(sys, "frozen"):
         cacert = get_resource("cacert.pem")
         if cacert is not None and os.path.isfile(cacert):

gns3/dialogs/appliance_wizard.py

@@ -197,7 +197,7 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
                     QtWidgets.QMessageBox.warning(self, "GNS3 VM", "The GNS3 VM is not available, please configure the GNS3 VM before adding a new appliance.")
 
         elif self.page(page_id) == self.uiFilesWizardPage:
-            if self._compute_id != "local":
+            if Controller.instance().isRemote() or self._compute_id != "local":
                 self._registry.getRemoteImageList(self._appliance.emulator(), self._compute_id)
             else:
                 self.images_changed_signal.emit()
@@ -419,7 +419,8 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
                     if img.location == "local":
                         image["status"] = "Found locally"
                     else:
-                        image["status"] = "Found on {}".format(self._compute_id)
+                        compute = ComputeManager.instance().getCompute(self._compute_id)
+                        image["status"] = "Found on {}".format(compute.name())
                     image["md5sum"] = img.md5sum
                     image["filesize"] = img.filesize
                     image["path"] = img.path
@@ -574,7 +575,7 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
         if "qemu" in appliance_configuration:
             appliance_configuration["qemu"]["path"] = self.uiQemuListComboBox.currentData()
 
-        new_template = ApplianceToTemplate().new_template(appliance_configuration, self._compute_id, self._symbols)
+        new_template = ApplianceToTemplate().new_template(appliance_configuration, self._compute_id, self._symbols, parent=self)
         TemplateManager.instance().createTemplate(Template(new_template), callback=self._templateCreatedCallback)
         return False
 
@@ -615,7 +616,7 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
             return
         for image in appliance_configuration["images"]:
             if image["location"] == "local":
-                if self._compute_id == "local" and image["path"].startswith(ImageManager.instance().getDirectory()):
+                if not Controller.instance().isRemote() and self._compute_id == "local" and image["path"].startswith(ImageManager.instance().getDirectory()):
                     log.debug("{} is already on the local server".format(image["path"]))
                     return
                 image = Image(self._appliance.emulator(), image["path"], filename=image["filename"])

gns3/dialogs/preferences_dialog.py

@@ -128,7 +128,7 @@ class PreferencesDialog(QtWidgets.QDialog, Ui_PreferencesDialog):
 
         # Class name, changed signal
         widget_to_watch = {
-            #QtWidgets.QLineEdit: "textChanged",
+            QtWidgets.QLineEdit: "textChanged",
             QtWidgets.QPlainTextEdit: "textChanged",
             # QtWidgets.QTreeWidget: "itemChanged",
             QtWidgets.QComboBox: "currentIndexChanged",

gns3/dialogs/profile_select.py

@@ -22,6 +22,7 @@ import shutil
 from gns3.qt import QtWidgets
 from gns3.local_config import LocalConfig
 from gns3.ui.profile_select_dialog_ui import Ui_ProfileSelectDialog
+from gns3.version import __version_info__
 
 import logging
 log = logging.getLogger(__name__)
@@ -39,8 +40,8 @@ class ProfileSelectDialog(QtWidgets.QDialog, Ui_ProfileSelectDialog):
             self._main.hide()
             parent = self._main
         super().__init__(parent)
-        self.setupUi(self)
 
+        self.setupUi(self)
         self.uiNewPushButton.clicked.connect(self._newPushButtonSlot)
         self.uiDeletePushButton.clicked.connect(self._deletePushButtonSlot)
 
@@ -48,12 +49,13 @@ class ProfileSelectDialog(QtWidgets.QDialog, Ui_ProfileSelectDialog):
         screen = QtWidgets.QApplication.desktop().screenGeometry()
         self.move(screen.center() - self.rect().center())
 
+        version = "{}.{}".format(__version_info__[0], __version_info__[1])
         if sys.platform.startswith("win"):
             appdata = os.path.expandvars("%APPDATA%")
-            path = os.path.join(appdata, "GNS3")
+            path = os.path.join(appdata, "GNS3", version)
         else:
             home = os.path.expanduser("~")
-            path = os.path.join(home, ".config", "GNS3")
+            path = os.path.join(home, ".config", "GNS3", version)
         self.profiles_path = os.path.join(path, "profiles")
 
         self.uiShowAtStartupCheckBox.setChecked(LocalConfig.instance().multiProfiles())
@@ -65,9 +67,9 @@ class ProfileSelectDialog(QtWidgets.QDialog, Ui_ProfileSelectDialog):
 
         try:
             if os.path.exists(self.profiles_path):
-                for profil in sorted(os.listdir(self.profiles_path)):
-                    if not profil.startswith("."):
-                        self.uiProfileSelectComboBox.addItem(profil)
+                for profile in sorted(os.listdir(self.profiles_path)):
+                    if not profile.startswith("."):
+                        self.uiProfileSelectComboBox.addItem(profile)
         except OSError:
             pass
 
@@ -79,7 +81,7 @@ class ProfileSelectDialog(QtWidgets.QDialog, Ui_ProfileSelectDialog):
         super().accept()
 
     def _newPushButtonSlot(self):
-        profile, ok = QtWidgets.QInputDialog.getText(self.parent(), "New profile", "Profile name:")
+        profile, ok = QtWidgets.QInputDialog.getText(self, "New profile", "Profile name:")
         if ok:
             self.uiProfileSelectComboBox.addItem(profile)
             self.uiProfileSelectComboBox.setCurrentText(profile)
@@ -88,13 +90,13 @@ class ProfileSelectDialog(QtWidgets.QDialog, Ui_ProfileSelectDialog):
     def _deletePushButtonSlot(self):
         profile = self.uiProfileSelectComboBox.currentText()
         if profile == "default":
-            QtWidgets.QMessageBox.critical(self.parentWidget(), "Delete profile", "You can't delete the default profile")
+            QtWidgets.QMessageBox.critical(self, "Delete profile", "The default profile cannot be deleted")
         else:
             try:
                 shutil.rmtree(os.path.join(self.profiles_path, profile))
                 self._refresh()
             except (OSError, PermissionError) as e:
-                QtWidgets.QMessageBox.critical(self.parentWidget(), "Delete profile", str(e))
+                QtWidgets.QMessageBox.critical(self, "Cannot delete profile", str(e))
 
 
 if __name__ == '__main__':

gns3/dialogs/project_export_wizard.py

@@ -119,8 +119,12 @@ class ExportProjectWizard(QtWidgets.QWizard, Ui_ExportProjectWizard):
                 include_images = "yes"
             else:
                 include_images = "no"
+            if self.uiIncludeSnapshotsCheckBox.isChecked():
+                include_snapshots = "yes"
+            else:
+                include_snapshots = "no"
             compression = self.uiCompressionComboBox.currentData()
-            export_worker = ExportProjectWorker(self._project, self._path, include_images, compression)
+            export_worker = ExportProjectWorker(self._project, self._path, include_images, include_snapshots, compression)
             progress_dialog = ProgressDialog(export_worker, "Exporting project", "Exporting portable project files...", "Cancel", parent=self, create_thread=False)
             progress_dialog.show()
             progress_dialog.exec_()

gns3/dialogs/setup_wizard.py

@@ -43,6 +43,7 @@ class SetupWizard(QtWidgets.QWizard, Ui_SetupWizard):
 
         super().__init__(parent)
         self.setupUi(self)
+        self.adjustSize()
 
         self._gns3_vm_settings = {
             "enable": True,
@@ -83,7 +84,8 @@ class SetupWizard(QtWidgets.QWizard, Ui_SetupWizard):
             if address.protocol() in [QtNetwork.QAbstractSocket.IPv4Protocol, QtNetwork.QAbstractSocket.IPv6Protocol]:
                 address_string = address.toString()
                 if address_string.startswith("169.254") or address_string.startswith("fe80"):
-                    # ignore link-local addresses
+                    # ignore link-local addresses, could not use https://doc.qt.io/qt-5/qhostaddress.html#isLinkLocal
+                    # because it was introduced in Qt 5.11
                     continue
                 self.uiLocalServerHostComboBox.addItem(address_string, address_string)
 
@@ -141,7 +143,6 @@ class SetupWizard(QtWidgets.QWizard, Ui_SetupWizard):
         Slot to refresh the VirtualBox VMs list.
         """
 
-        QtWidgets.QMessageBox.warning(self, "GNS3 VM on VirtualBox", "VirtualBox doesn't support nested virtualization, this means running Qemu based VM could be very slow")
         download_url = "https://github.com/GNS3/gns3-gui/releases/download/v{version}/GNS3.VM.VirtualBox.{version}.zip".format(version=__version__)
         self.uiGNS3VMDownloadLinkUrlLabel.setText('If you don\'t have the GNS3 Virtual Machine you can <a href="{download_url}">download it here</a>.<br>And import the VM in the virtualization software and hit refresh.'.format(download_url=download_url))
         self.uiVmwareRadioButton.setChecked(False)
@@ -417,8 +418,7 @@ class SetupWizard(QtWidgets.QWizard, Ui_SetupWizard):
             if local_server_settings["host"] is None:
                 local_server_settings["host"] = DEFAULT_LOCAL_SERVER_HOST
                 LocalServer.instance().updateLocalServerSettings(local_server_settings)
-            settings["hide_setup_wizard"] = self.uiShowCheckBox.isChecked()
-
+            settings["hide_setup_wizard"] = not self.uiShowCheckBox.isChecked()
         self.parentWidget().setSettings(settings)
         super().done(result)
 

gns3/graphics_view.py

@@ -1602,10 +1602,12 @@ class GraphicsView(QtWidgets.QGraphicsView):
     def drawBackground(self, painter, rect):
         super().drawBackground(painter, rect)
         if self._main_window.uiShowGridAction.isChecked():
-            grids = [(self.drawingGridSize(),QtGui.QColor(208, 208, 208)),
-                     (self.nodeGridSize(),QtGui.QColor(190, 190, 190))]
+            grids = [(self.drawingGridSize(), QtGui.QColor(208, 208, 208)),
+                     (self.nodeGridSize(), QtGui.QColor(190, 190, 190))]
             painter.save()
-            for (grid,colour) in grids:
+            for (grid, colour) in grids:
+                if not grid:
+                    continue
                 painter.setPen(QtGui.QPen(colour))
 
                 left = int(rect.left()) - (int(rect.left()) % grid)

gns3/http_client.py

@@ -471,7 +471,7 @@ class HTTPClient(QtCore.QObject):
         host = self._getHostForQuery()
         request = websocket.request()
         ws_url = "ws://{host}:{port}{prefix}{path}".format(host=host, port=self._port, path=path, prefix=prefix)
-        log.debug("Connectin to WebSocket endpoint: {}".format(ws_url))
+        log.debug("Connecting to WebSocket endpoint: {}".format(ws_url))
         request.setUrl(QtCore.QUrl(ws_url))
         self._addAuth(request)
         websocket.open(request)
@@ -727,46 +727,54 @@ class HTTPClient(QtCore.QObject):
                     e = HttpBadRequest(body)
                 raise e
 
-    def getSynchronous(self, endpoint, timeout=2):
+    def getSynchronous(self, method, endpoint, prefix="/v2", timeout=5):
         """
         Synchronous check if a server is running
 
-        :returns: Tuple (Status code, json of anwser). Status 0 is a non HTTP error
+        :returns: Tuple (Status code, json of answer). Status 0 is a non HTTP error
         """
-        try:
-            url = "{protocol}://{host}:{port}/v2/{endpoint}".format(protocol=self._protocol, host=self._host, port=self._port, endpoint=endpoint)
 
-            if self._user is not None and len(self._user) > 0:
-                log.debug("Synchronous get {} with user '{}'".format(url, self._user))
-                auth_handler = urllib.request.HTTPBasicAuthHandler()
-                auth_handler.add_password(realm="GNS3 server",
-                                          uri=url,
-                                          user=self._user,
-                                          passwd=self._password)
-                opener = urllib.request.build_opener(auth_handler)
-                urllib.request.install_opener(opener)
-            else:
-                log.debug("Synchronous get {} (no authentication)".format(url))
-            response = urllib.request.urlopen(url, timeout=timeout)
-            content_type = response.getheader("CONTENT-TYPE")
-            if response.status == 200:
+        host = self._getHostForQuery()
+
+        log.debug("{method} {protocol}://{host}:{port}{prefix}{endpoint}".format(method=method, protocol=self._protocol, host=host, port=self._port, prefix=prefix, endpoint=endpoint))
+        if self._user:
+            url = QtCore.QUrl("{protocol}://{user}@{host}:{port}{prefix}{endpoint}".format(protocol=self._protocol, user=self._user, host=host, port=self._port, prefix=prefix, endpoint=endpoint))
+        else:
+            url = QtCore.QUrl("{protocol}://{host}:{port}{prefix}{endpoint}".format(protocol=self._protocol, host=host, port=self._port, prefix=prefix, endpoint=endpoint))
+
+        request = self._request(url)
+        request = self._addAuth(request)
+        request.setRawHeader(b"User-Agent", "GNS3 QT Client v{version}".format(version=__version__).encode())
+
+        try:
+            response = self._network_manager.sendCustomRequest(request, method.encode())
+        except SystemError as e:
+            log.error("Can't send query: {}".format(str(e)))
+            return
+
+        loop = QtCore.QEventLoop()
+        response.finished.connect(loop.quit)
+
+        if timeout is not None:
+            QtCore.QTimer.singleShot(timeout * 1000, qpartial(self._timeoutSlot, response, timeout))
+
+        if not loop.isRunning():
+            loop.exec_()
+
+        status = response.attribute(QtNetwork.QNetworkRequest.HttpStatusCodeAttribute)
+        if response.error() != QtNetwork.QNetworkReply.NoError:
+            log.debug("Error while connecting to local server {}".format(response.errorString()))
+            return status, None
+        else:
+            content_type = response.header(QtNetwork.QNetworkRequest.ContentTypeHeader)
+            if status == 200:
                 if content_type == "application/json":
-                    content = response.read()
+                    content = bytes(response.readAll())
                     json_data = json.loads(content.decode("utf-8"))
-                    return response.status, json_data
+                    return status, json_data
             else:
-                return response.status, None
-        except http.client.InvalidURL as e:
-            log.warning("Invalid local server url: {}".format(e))
-            return 0, None
-        except urllib.error.URLError:
-            # Connection refused. It's a normal behavior if server is not started
-            return 0, None
-        except urllib.error.HTTPError as e:
-            log.debug("Error during get on {}:{}: {}".format(self.host(), self.port(), e))
-            return e.code, None
-        except (OSError, http.client.BadStatusLine, ValueError) as e:
-            log.debug("Error during get on {}:{}: {}".format(self.host(), self.port(), e))
+                return status, None
+
         return 0, None
 
     @classmethod

gns3/items/ethernet_link_item.py

@@ -147,6 +147,7 @@ class EthernetLinkItem(LinkItem):
                 self._source_port.setLabel(source_port_label)
 
             if self._draw_port_labels:
+                source_port_label.setFlag(source_port_label.ItemIsMovable, not self._source_item.locked())
                 source_port_label.show()
             else:
                 source_port_label.hide()
@@ -189,6 +190,7 @@ class EthernetLinkItem(LinkItem):
                 self._destination_port.setLabel(destination_port_label)
 
             if self._draw_port_labels:
+                destination_port_label.setFlag(destination_port_label.ItemIsMovable, not self._destination_item.locked())
                 destination_port_label.show()
             else:
                 destination_port_label.hide()

gns3/items/node_item.py

@@ -103,22 +103,11 @@ class NodeItem(QtSvg.QGraphicsSvgItem):
 
         from ..main_window import MainWindow
         self._main_window = MainWindow.instance()
-        if self._main_window.uiSnapToGridAction.isChecked():
-            self._snapToGrid()
         self._settings = self._main_window.uiGraphicsView.settings()
 
         if node.initialized():
             self.createdSlot(node.id())
 
-    def _snapToGrid(self):
-
-        grid_size = self._main_window.uiGraphicsView.nodeGridSize()
-        mid_x = self.boundingRect().width() / 2
-        x = (grid_size * round((self.x() + mid_x) / grid_size)) - mid_x
-        mid_y = self.boundingRect().height() / 2
-        y = (grid_size * round((self.y() + mid_y) / grid_size)) - mid_y
-        self.setPos(x, y)
-
     def updateNode(self):
         """
         Sync change to the node

gns3/items/serial_link_item.py

@@ -136,6 +136,7 @@ class SerialLinkItem(LinkItem):
                 self._source_port.setLabel(source_port_label)
 
             if self._draw_port_labels:
+                source_port_label.setFlag(source_port_label.ItemIsMovable, not self._source_item.locked())
                 source_port_label.show()
             else:
                 source_port_label.hide()
@@ -167,6 +168,7 @@ class SerialLinkItem(LinkItem):
                 self._destination_port.setLabel(destination_port_label)
 
             if self._draw_port_labels:
+                destination_port_label.setFlag(destination_port_label.ItemIsMovable, not self._destination_item.locked())
                 destination_port_label.show()
             else:
                 destination_port_label.hide()

gns3/link.py

@@ -109,9 +109,9 @@ class Link(QtCore.QObject):
         if self._capturing:
             self._capture_compute_id = result.get("capture_compute_id", None)
             self._capture_file_path = result.get("capture_file_path", None)
-            if self._capture_compute_id and self._capture_compute_id != "local":
-                # We need to stream the pcap file content if the compute is remote
-                if self._capture_file_path is None:
+            if Controller.instance().isRemote() or (self._capture_compute_id and self._capture_compute_id != "local"):
+                # We need to stream the pcap file content if the controller or compute is remote
+                if Controller.instance().isRemote() or self._capture_file_path is None:
                     self._capture_file = QtCore.QTemporaryFile()
                     self._capture_file.open(QtCore.QFile.WriteOnly)
                     self._capture_file.setAutoRemove(True)
@@ -372,7 +372,7 @@ class Link(QtCore.QObject):
 
     def stopCapture(self):
 
-        if self._capture_compute_id and self._capture_compute_id != "local":
+        if Controller.instance().isRemote() or (self._capture_compute_id and self._capture_compute_id != "local"):
             if self._capture_file:
                 self._capture_file.close()
                 self._capture_file = None

gns3/local_config.py

@@ -95,7 +95,7 @@ class LocalConfig(QtCore.QObject):
                 else:
                     old_config_path = os.path.join(os.path.expanduser("~"), ".config", "GNS3", filename)
 
-                # TODO: migrate versioned config file from a previous version of GNS3 (for instance 2.2.0 -> 2.2.1)
+                # TODO: migrate versioned config file from a previous version of GNS3 (for instance 2.2 -> 2.3) + support profiles
                 if os.path.exists(old_config_path):
                     # migrate post version 2.2.0 configuration file
                     shutil.copyfile(old_config_path, self._config_file)

gns3/local_server.py

@@ -36,7 +36,6 @@ from gns3.local_config import LocalConfig
 from gns3.local_server_config import LocalServerConfig
 from gns3.utils.wait_for_connection_worker import WaitForConnectionWorker
 from gns3.utils.progress_dialog import ProgressDialog
-from gns3.utils.http import getSynchronous
 from gns3.utils.sudo import sudo
 from gns3.http_client import HTTPClient
 from gns3.controller import Controller
@@ -514,9 +513,7 @@ class LocalServer(QtCore.QObject):
         :returns: boolean
         """
 
-        status, json_data = getSynchronous(self._settings["protocol"], self._settings["host"], self._port, "version",
-                                           timeout=2, user=self._settings["user"], password=self._settings["password"])
-
+        status, json_data = HTTPClient(self._settings).getSynchronous("GET", "/version")
         if status == 401:  # Auth issue that need to be solved later
             return True
         elif json_data is None:

gns3/main_window.py

@@ -190,7 +190,8 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
             self.uiSnapshotAction,
             self.uiEditProjectAction,
             self.uiDeleteProjectAction,
-            self.uiImportExportConfigsAction
+            self.uiImportExportConfigsAction,
+            self.uiLockAllAction
         ]
 
         # This widgets are not enabled if it's a remote controller (no access to the local file system)
@@ -259,7 +260,6 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
         self.uiDrawRectangleAction.triggered.connect(self._drawRectangleActionSlot)
         self.uiDrawEllipseAction.triggered.connect(self._drawEllipseActionSlot)
         self.uiDrawLineAction.triggered.connect(self._drawLineActionSlot)
-        self.uiEditReadmeAction.triggered.connect(self._editReadmeActionSlot)
 
         # help menu connections
         self.uiOnlineHelpAction.triggered.connect(self._onlineHelpActionSlot)
@@ -363,15 +363,16 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
         :return: None
         """
 
-        for item in self.uiGraphicsView.items():
-            if not isinstance(item, LinkItem) and not isinstance(item, LabelItem) and not isinstance(item, SvgIconItem):
-                if self.uiLockAllAction.isChecked() and not item.locked():
-                    item.setLocked(True)
-                elif not self.uiLockAllAction.isChecked() and item.locked():
-                    item.setLocked(False)
-                if item.parentItem() is None:
-                    item.updateNode()
-                item.update()
+        if self.uiGraphicsView.isEnabled():
+            for item in self.uiGraphicsView.items():
+                if not isinstance(item, LinkItem) and not isinstance(item, LabelItem) and not isinstance(item, SvgIconItem):
+                    if self.uiLockAllAction.isChecked() and not item.locked():
+                        item.setLocked(True)
+                    elif not self.uiLockAllAction.isChecked() and item.locked():
+                        item.setLocked(False)
+                    if item.parentItem() is None:
+                        item.updateNode()
+                    item.update()
 
     def analyticsClient(self):
         """
@@ -392,9 +393,6 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
         self._project_dialog = ProjectDialog(self)
         self._project_dialog.show()
         create_new_project = self._project_dialog.exec_()
-        # Close the device dock so it repopulates.  Done in case switching between cloud and local.
-        self.uiNodesDockWidget.setVisible(False)
-        self.uiNodesDockWidget.setWindowTitle("")
 
         if create_new_project:
             Topology.instance().createLoadProject(self._project_dialog.getProjectSettings())
@@ -436,7 +434,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
             self._newProjectActionSlot()
         else:
             directory = self._project_dir
-            if self._project_dir and not os.path.exists(self._project_dir):
+            if self._project_dir is None or not os.path.exists(self._project_dir):
                 directory = Topology.instance().projectsDirPath()
             path, _ = QtWidgets.QFileDialog.getOpenFileName(self, "Open project", directory,
                                                             "All files (*.*);;GNS3 Project (*.gns3);;GNS3 Portable Project (*.gns3project *.gns3p);;NET files (*.net)",
@@ -1066,12 +1064,6 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
             self._settings["preferences_dialog_geometry"] = bytes(dialog.saveGeometry().toBase64()).decode()
             self.setSettings(self._settings)
 
-    def _editReadmeActionSlot(self):
-        """
-        Slot to edit the README file
-        """
-        Topology.instance().editReadme()
-
     def resizeEvent(self, event):
         self._notif_dialog.resize()
         super().resizeEvent(event)

gns3/modules/builtin/ethernet_switch.py

@@ -38,7 +38,7 @@ class EthernetSwitch(Node):
         # this is an always-on node
         self.setStatus(Node.started)
         self._always_on = True
-        self.settings().update({"ports_mapping": [], "console_type": "telnet"})
+        self.settings().update({"ports_mapping": [], "console_type": "none"})
 
     def info(self):
         """

gns3/modules/builtin/settings.py

@@ -59,7 +59,7 @@ ETHERNET_SWITCH_SETTINGS = {
     "default_name_format": "Switch{0}",
     "symbol": ":/symbols/ethernet_switch.svg",
     "category": Node.switches,
-    "console_type": "telnet",
+    "console_type": "none",
     "ports_mapping": [],
     "node_type": "ethernet_switch"
 }

gns3/modules/docker/docker_vm.py

@@ -51,7 +51,8 @@ class DockerVM(Node):
                               "console_resolution": DOCKER_CONTAINER_SETTINGS["console_resolution"],
                               "console_http_port": DOCKER_CONTAINER_SETTINGS["console_http_port"],
                               "console_http_path": DOCKER_CONTAINER_SETTINGS["console_http_path"],
-                              "extra_hosts": DOCKER_CONTAINER_SETTINGS["extra_hosts"]}
+                              "extra_hosts": DOCKER_CONTAINER_SETTINGS["extra_hosts"],
+                              "extra_volumes": DOCKER_CONTAINER_SETTINGS["extra_volumes"]}
 
         self.settings().update(docker_vm_settings)
 

gns3/modules/docker/pages/docker_vm_configuration_page.py

@@ -103,7 +103,8 @@ class DockerVMConfigurationPage(QtWidgets.QWidget, Ui_dockerVMConfigPageWidget):
         self.uiConsoleResolutionComboBox.setCurrentIndex(self.uiConsoleResolutionComboBox.findText(settings["console_resolution"]))
         self.uiConsoleHttpPortSpinBox.setValue(settings["console_http_port"])
         self.uiHttpConsolePathLineEdit.setText(settings["console_http_path"])
-        self.uiExtraHostsTextEdit.setText(settings["extra_hosts"])
+        self.uiExtraHostsTextEdit.setPlainText(settings["extra_hosts"])
+        self.uiExtraVolumeTextEdit.setPlainText("\n".join(settings["extra_volumes"]))
 
         if not group:
             self.uiNameLineEdit.setText(settings["name"])
@@ -175,6 +176,8 @@ class DockerVMConfigurationPage(QtWidgets.QWidget, Ui_dockerVMConfigPageWidget):
         settings["console_http_port"] = self.uiConsoleHttpPortSpinBox.value()
         settings["console_http_path"] = self.uiHttpConsolePathLineEdit.text()
         settings["extra_hosts"] = self.uiExtraHostsTextEdit.toPlainText()
+        # only tidy input here, validation is performed server side
+        settings["extra_volumes"] = [ y for x in self.uiExtraVolumeTextEdit.toPlainText().split("\n") for y in [ x.strip() ] if y ]
 
         if not group:
             adapters = self.uiAdapterSpinBox.value()

gns3/modules/docker/pages/docker_vm_preferences_page.py

@@ -95,6 +95,9 @@ class DockerVMPreferencesPage(QtWidgets.QWidget, Ui_DockerVMPreferencesPageWidge
         if docker_container["extra_hosts"]:
             QtWidgets.QTreeWidgetItem(section_item, ["Extra hosts:", str(docker_container["extra_hosts"])])
 
+        if docker_container["extra_volumes"]:
+            QtWidgets.QTreeWidgetItem(section_item, ["Extra volumes:", "\n".join(docker_container["extra_volumes"])])
+
         self.uiDockerVMInfoTreeWidget.expandAll()
         self.uiDockerVMInfoTreeWidget.resizeColumnToContents(0)
         self.uiDockerVMInfoTreeWidget.resizeColumnToContents(1)

gns3/modules/docker/settings.py

@@ -43,5 +43,6 @@ DOCKER_CONTAINER_SETTINGS = {
     "console_http_port": 80,
     "console_http_path": "/",
     "extra_hosts": "",
+    "extra_volumes": [],
     "node_type": "docker"
 }

gns3/modules/docker/ui/docker_vm_configuration_page.ui

@@ -297,9 +297,34 @@ one per line)</string>
         </widget>
        </item>
        <item row="0" column="1">
-        <widget class="QTextEdit" name="uiExtraHostsTextEdit"/>
+        <widget class="QPlainTextEdit" name="uiExtraHostsTextEdit">
+         <property name="placeholderText">
+          <string>e.g. router:192.168.0.1</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="uiExtraVolumeLabel">
+         <property name="text">
+          <string>Additional directories to
+make persistent that are
+not included in the image
+VOLUMES config. One
+directory per line.</string>
+         </property>
+        </widget>
        </item>
        <item row="1" column="1">
+        <widget class="QPlainTextEdit" name="uiExtraVolumeTextEdit">
+         <property name="plainText">
+          <string/>
+         </property>
+         <property name="placeholderText">
+          <string>e.g. /etc/sysctl.d</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1">
         <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>

gns3/modules/docker/ui/docker_vm_configuration_page_ui.py

@@ -143,11 +143,18 @@ class Ui_dockerVMConfigPageWidget(object):
         self.uiExtraHostsLabel.setWordWrap(True)
         self.uiExtraHostsLabel.setObjectName("uiExtraHostsLabel")
         self.gridLayout_2.addWidget(self.uiExtraHostsLabel, 0, 0, 1, 1)
-        self.uiExtraHostsTextEdit = QtWidgets.QTextEdit(self.tab_2)
+        self.uiExtraHostsTextEdit = QtWidgets.QPlainTextEdit(self.tab_2)
         self.uiExtraHostsTextEdit.setObjectName("uiExtraHostsTextEdit")
         self.gridLayout_2.addWidget(self.uiExtraHostsTextEdit, 0, 1, 1, 1)
+        self.uiExtraVolumeLabel = QtWidgets.QLabel(self.tab_2)
+        self.uiExtraVolumeLabel.setObjectName("uiExtraVolumeLabel")
+        self.gridLayout_2.addWidget(self.uiExtraVolumeLabel, 1, 0, 1, 1)
+        self.uiExtraVolumeTextEdit = QtWidgets.QPlainTextEdit(self.tab_2)
+        self.uiExtraVolumeTextEdit.setPlainText("")
+        self.uiExtraVolumeTextEdit.setObjectName("uiExtraVolumeTextEdit")
+        self.gridLayout_2.addWidget(self.uiExtraVolumeTextEdit, 1, 1, 1, 1)
         spacerItem = QtWidgets.QSpacerItem(20, 388, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.gridLayout_2.addItem(spacerItem, 1, 1, 1, 1)
+        self.gridLayout_2.addItem(spacerItem, 2, 1, 1, 1)
         self.uiTabWidget.addTab(self.tab_2, "")
         self.tab_3 = QtWidgets.QWidget()
         self.tab_3.setObjectName("tab_3")
@@ -201,6 +208,13 @@ class Ui_dockerVMConfigPageWidget(object):
 "to the /etc/hosts file.\n"
 "(hostname:IP\n"
 "one per line)"))
+        self.uiExtraHostsTextEdit.setPlaceholderText(_translate("dockerVMConfigPageWidget", "e.g. router:192.168.0.1"))
+        self.uiExtraVolumeLabel.setText(_translate("dockerVMConfigPageWidget", "Additional directories to\n"
+"make persistent that are\n"
+"not included in the image\n"
+"VOLUMES config. One\n"
+"directory per line."))
+        self.uiExtraVolumeTextEdit.setPlaceholderText(_translate("dockerVMConfigPageWidget", "e.g. /etc/sysctl.d"))
         self.uiTabWidget.setTabText(self.uiTabWidget.indexOf(self.tab_2), _translate("dockerVMConfigPageWidget", "Advanced"))
         self.uiTabWidget.setTabText(self.uiTabWidget.indexOf(self.tab_3), _translate("dockerVMConfigPageWidget", "Usage"))
 

gns3/modules/dynamips/__init__.py

@@ -130,7 +130,7 @@ class Dynamips(Module):
             for router in self._settings.get("routers"):
                 router_settings = IOS_ROUTER_SETTINGS.copy()
                 router_settings.update(router)
-                if not router_settings.get("chassis"):
+                if router_settings.get("chassis"):
                     del router_settings["chassis"]
                 templates.append(Template(router_settings))
             TemplateManager.instance().updateList(templates)

gns3/modules/iou/pages/iou_preferences_page.py

@@ -98,7 +98,10 @@ class IOUPreferencesPage(QtWidgets.QWidget, Ui_IOUPreferencesPageWidget):
         :param settings: IOU settings
         """
 
-        self.IOULicenceTextEdit.setPlainText(settings["iourc_content"])
+        if settings["iourc_content"]:
+            self.IOULicenceTextEdit.blockSignals(True)
+            self.IOULicenceTextEdit.setPlainText(settings["iourc_content"])
+            self.IOULicenceTextEdit.blockSignals(False)
         self.uiLicensecheckBox.setChecked(settings["license_check"])
 
     def loadPreferences(self):
@@ -106,7 +109,10 @@ class IOUPreferencesPage(QtWidgets.QWidget, Ui_IOUPreferencesPageWidget):
         Loads IOU preferences.
         """
 
-        Controller.instance().get("/iou_license", self._getSettingsCallback)
+        if Controller.instance().connected():
+            Controller.instance().get("/iou_license", self._getSettingsCallback)
+        else:
+            log.error("Cannot load the IOU license in the preferences dialog: not connected to the controller")
 
     @qslot
     def _getSettingsCallback(self, result, error=False, **kwargs):
@@ -115,7 +121,7 @@ class IOUPreferencesPage(QtWidgets.QWidget, Ui_IOUPreferencesPageWidget):
             return
         if error:
             if "message" in result:
-                log.error("Error while getting settings : {}".format(result["message"]))
+                log.error("Error while getting the IOU license information: {}".format(result["message"]))
             return
         self._old_settings = copy.copy(result)
         self._populateWidgets(result)

gns3/modules/iou/ui/iou_preferences_page.ui

@@ -14,6 +14,13 @@
    <string>IOS on UNIX</string>
   </property>
   <layout class="QVBoxLayout">
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>IOU licence (iourc file):</string>
+     </property>
+    </widget>
+   </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_5">
      <item>

gns3/modules/iou/ui/iou_preferences_page_ui.py

@@ -1,21 +1,22 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file '/Users/noplay/code/gns3/gns3-gui/gns3/modules/iou/ui/iou_preferences_page.ui'
+# Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/modules/iou/ui/iou_preferences_page.ui'
 #
-# Created by: PyQt5 UI code generator 5.7.1
+# Created by: PyQt5 UI code generator 5.9
 #
 # WARNING! All changes made in this file will be lost!
 
 from PyQt5 import QtCore, QtGui, QtWidgets
 
-
 class Ui_IOUPreferencesPageWidget(object):
-
     def setupUi(self, IOUPreferencesPageWidget):
         IOUPreferencesPageWidget.setObjectName("IOUPreferencesPageWidget")
         IOUPreferencesPageWidget.resize(490, 532)
         self.vboxlayout = QtWidgets.QVBoxLayout(IOUPreferencesPageWidget)
         self.vboxlayout.setObjectName("vboxlayout")
+        self.label = QtWidgets.QLabel(IOUPreferencesPageWidget)
+        self.label.setObjectName("label")
+        self.vboxlayout.addWidget(self.label)
         self.horizontalLayout_5 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_5.setObjectName("horizontalLayout_5")
         self.IOULicenceTextEdit = QtWidgets.QPlainTextEdit(IOUPreferencesPageWidget)
@@ -47,7 +48,9 @@ class Ui_IOUPreferencesPageWidget(object):
     def retranslateUi(self, IOUPreferencesPageWidget):
         _translate = QtCore.QCoreApplication.translate
         IOUPreferencesPageWidget.setWindowTitle(_translate("IOUPreferencesPageWidget", "IOS on UNIX"))
+        self.label.setText(_translate("IOUPreferencesPageWidget", "IOU licence (iourc file):"))
         self.IOULicenceTextEdit.setToolTip(_translate("IOUPreferencesPageWidget", "A license is required to run IOU. Copy & paste the content of your iourc file here or use the browse button to select a file. The license will be pushed to remote servers."))
         self.uiIOURCPathToolButton.setText(_translate("IOUPreferencesPageWidget", "&Browse..."))
         self.uiLicensecheckBox.setText(_translate("IOUPreferencesPageWidget", "Check for a valid IOU license key"))
         self.uiRestoreDefaultsPushButton.setText(_translate("IOUPreferencesPageWidget", "Restore defaults"))
+

gns3/modules/qemu/dialogs/qemu_vm_wizard.py

@@ -163,7 +163,7 @@ class QemuVMWizard(VMWithImagesWizard, Ui_QemuVMWizard):
             settings["initrd"] = self.uiInitrdImageLineEdit.text()
             settings["kernel_image"] = self.uiKernelImageLineEdit.text()
             settings["kernel_command_line"] = "ide_generic.probe_mask=0x01 ide_core.chs=0.0:980,16,32 auto nousb console=ttyS0,9600 bigphysarea=65536 ide1=noprobe no-hlt -net nic"
-            settings["options"] = "-no-kvm -icount auto -hdachs 980,16,32"
+            settings["options"] = "-no-kvm -icount auto"
             if not sys.platform.startswith("darwin"):
                 settings["cpu_throttling"] = 80  # limit to 80% CPU usage
             settings["process_priority"] = "low"

gns3/modules/qemu/ui/qemu_vm_configuration_page.ui

@@ -860,6 +860,8 @@
 <li>%vm-id% =VM ID</li>
 <li>%project-id% = project ID</li>
 <li>%project-path% = project path</li>
+<li>%console-port% = console port number</li>
+<li>%guest-cid% = unique ID from 3 to 65535</li>
 </ul>
 &lt;/body&gt;&lt;/html&gt;</string>
             </property>

gns3/modules/qemu/ui/qemu_vm_configuration_page_ui.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/modules/qemu/ui/qemu_vm_configuration_page.ui'
 #
-# Created by: PyQt5 UI code generator 5.11.3
+# Created by: PyQt5 UI code generator 5.9
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -541,6 +541,8 @@ class Ui_QemuVMConfigPageWidget(object):
 "<li>%vm-id% =VM ID</li>\n"
 "<li>%project-id% = project ID</li>\n"
 "<li>%project-path% = project path</li>\n"
+"<li>%console-port% = console port number</li>\n"
+"<li>%guest-cid% = unique ID from 3 to 65535</li>\n"
 "</ul>\n"
 "</body></html>"))
         self.uiBaseVMCheckBox.setText(_translate("QemuVMConfigPageWidget", "Use as a linked base VM"))

gns3/pages/gns3_vm_preferences_page.py

@@ -72,7 +72,11 @@ class GNS3VMPreferencesPage(QtWidgets.QWidget, Ui_GNS3VMPreferencesPageWidget):
         """
         Loads the preference from controller.
         """
-        Controller.instance().get("/gns3vm", self._getSettingsCallback)
+
+        if Controller.instance().connected():
+            Controller.instance().get("/gns3vm", self._getSettingsCallback)
+        else:
+            log.error("Cannot load the GNS3 VM settings in the preferences dialog: not connected to the controller")
 
     @qslot
     def _getSettingsCallback(self, result, error=False, **kwargs):
@@ -81,7 +85,7 @@ class GNS3VMPreferencesPage(QtWidgets.QWidget, Ui_GNS3VMPreferencesPageWidget):
             return
         if error:
             if "message" in result:
-                log.error("Error while getting settings : {}".format(result["message"]))
+                log.error("Error while getting the GNS3 VM settings : {}".format(result["message"]))
             return
         self._old_settings = copy.copy(result)
         self._settings = result

gns3/project.py

@@ -17,14 +17,12 @@
 
 import os
 import json
-from .qt import QtCore, qpartial, QtWidgets, QtNetwork, qslot
+from .qt import QtCore, qpartial, QtNetwork, QtWebSockets, qslot
 
 from gns3.controller import Controller
-from gns3.compute_manager import ComputeManager
 from gns3.topology import Topology
 from gns3.local_config import LocalConfig
 from gns3.settings import GRAPHICS_VIEW_SETTINGS
-from gns3.template_manager import TemplateManager
 from gns3.utils import parse_version
 
 import logging
@@ -49,7 +47,6 @@ class Project(QtCore.QObject):
     # Called when project is fully loaded
     project_loaded_signal = QtCore.Signal()
 
-
     def __init__(self):
 
         self._id = None
@@ -84,6 +81,7 @@ class Project(QtCore.QObject):
         # Due to bug in Qt on some version we need a dedicated network manager
         self._notification_network_manager = QtNetwork.QNetworkAccessManager()
         self._notification_stream = None
+        self._websocket = QtWebSockets.QWebSocket()
 
         super().__init__()
 
@@ -485,7 +483,8 @@ class Project(QtCore.QObject):
         if self._closed:
             self._closed = False
             self._closing = False
-            self._startListenNotifications()
+            if not self._notification_stream:
+                self._startListenNotifications()
 
         self.project_updated_signal.emit()
         self.project_loaded_signal.emit()
@@ -537,7 +536,8 @@ class Project(QtCore.QObject):
         if self._closed:
             self._closed = False
             self._closing = False
-            self._startListenNotifications()
+            if not self._notification_stream:
+                self._startListenNotifications()
         self.project_updated_signal.emit()
 
         self.get("/nodes", self._listNodesCallback)
@@ -609,7 +609,7 @@ class Project(QtCore.QObject):
             log.debug("Stop listening for notifications from project %s", self._id)
             stream = self._notification_stream
             self._notification_stream = None
-            stream.abort()
+            stream.close()
 
     def _startListenNotifications(self):
         if not Controller.instance().connected():
@@ -627,7 +627,7 @@ class Project(QtCore.QObject):
 
         else:
             path = "/projects/{project_id}/notifications/ws".format(project_id=self._id)
-            self._notification_stream = Controller.instance().connectProjectWebSocket(path)
+            self._notification_stream = Controller.instance().httpClient().connectWebSocket(self._websocket, path)
             self._notification_stream.textMessageReceived.connect(self._websocket_event_received)
             self._notification_stream.error.connect(self._websocket_error)
 
@@ -700,7 +700,7 @@ class Project(QtCore.QObject):
         elif result["action"] == "project.updated":
             self._projectUpdatedCallback(result["event"])
         elif result["action"] == "snapshot.restored":
-            Topology.instance().createLoadProject({"project_id": result["event"]["project_id"]})
+            Topology.instance().restoreSnapshot(result["event"]["project_id"])
         elif result["action"] == "log.error":
             log.error(result["event"]["message"])
         elif result["action"] == "log.warning":

gns3/registry/appliance_to_template.py

@@ -17,10 +17,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-import urllib.request
 import shutil
 from ssl import CertificateError
 
+from ..qt import QtCore, QtWidgets, QtNetwork
 from ..controller import Controller
 from .config import Config, ConfigException
 
@@ -33,7 +33,7 @@ class ApplianceToTemplate:
     Appliance installation.
     """
 
-    def new_template(self, appliance_config, server, controller_symbols=None):
+    def new_template(self, appliance_config, server, controller_symbols=None, parent=None):
         """
         Creates a new template from an appliance.
 
@@ -41,6 +41,7 @@ class ApplianceToTemplate:
         :param server
         """
 
+        self._parent = parent
         new_template = {
             "compute_id": server,
             "name": appliance_config["name"]
@@ -195,7 +196,7 @@ class ApplianceToTemplate:
 
         url = "https://raw.githubusercontent.com/GNS3/gns3-registry/master/symbols/{}".format(symbol_id)
         try:
-            urllib.request.urlretrieve(url, path)
+            self._downloadApplianceSymbol(url, path)
             controller = Controller.instance()
             controller.clearStaticCache()
             if controller.isRemote():
@@ -203,3 +204,31 @@ class ApplianceToTemplate:
             return os.path.basename(path)
         except (OSError, CertificateError):
             return None
+
+    def _downloadApplianceSymbol(self, url, path, timeout=30):
+        """
+        Download an appliance symbol in a synchronous way.
+        """
+
+        network_manager = QtNetwork.QNetworkAccessManager()
+        request = QtNetwork.QNetworkRequest(QtCore.QUrl(url))
+        request.setRawHeader(b'User-Agent', b'GNS3 symbol downloader')
+        reply = network_manager.get(request)
+        progress_dialog = QtWidgets.QProgressDialog("Downloading '{}' appliance symbol...".format(os.path.basename(path)), "Cancel", 0, 0, self._parent)
+        progress_dialog.setMinimumDuration(0)
+        reply.finished.connect(progress_dialog.close)
+        QtCore.QTimer.singleShot(timeout * 1000, progress_dialog.close)
+        log.debug("Downloading appliance symbol from '{}'".format(url))
+        progress_dialog.show()
+        progress_dialog.exec_()
+        status = reply.attribute(QtNetwork.QNetworkRequest.HttpStatusCodeAttribute)
+        if reply.error() == QtNetwork.QNetworkReply.NoError and status == 200:
+            try:
+                with open(path, 'wb+') as f:
+                    f.write(reply.readAll())
+            except OSError as e:
+                log.debug("Error while saving appliance symbol to '{}': {}".format(path, e))
+                raise
+            log.debug("Appliance symbol downloaded and saved to '{}'".format(path))
+        else:
+            log.warning("Error when downloading appliance symbol from '{}': {}".format(url, reply.errorString()))

gns3/registry/image.py

@@ -114,16 +114,16 @@ class Image:
             try:
                 if not os.path.isfile(self._path):
                     return None
+                m = hashlib.md5()
+                with open(self._path, "rb") as f:
+                    while True:
+                        buf = f.read(4096)
+                        if not buf:
+                            break
+                        m.update(buf)
             except (OSError, PermissionError) as e:
                 log.debug("Cannot access '{}': {}".format(self._path, e))
                 return None
-            m = hashlib.md5()
-            with open(self._path, "rb") as f:
-                while True:
-                    buf = f.read(4096)
-                    if not buf:
-                        break
-                    m.update(buf)
             self._md5sum = m.hexdigest()
         Image._cache[self._path] = self._md5sum
         return self._md5sum

gns3/registry/registry.py

@@ -89,10 +89,10 @@ class Registry(QtCore.QObject):
         for directory in self._images_dirs:
             log.debug("Search image {} (MD5={} SIZE={}) in '{}'".format(filename, md5sum, size, directory))
             if os.path.exists(directory):
-                for file in os.listdir(directory):
-                    if not file.endswith(".md5sum") and not file.startswith("."):
-                        path = os.path.join(directory, file)
-                        try:
+                try:
+                    for file in os.listdir(directory):
+                        if not file.endswith(".md5sum") and not file.startswith("."):
+                            path = os.path.join(directory, file)
                             if os.path.isfile(path):
                                 if md5sum is None or strict_md5_check is False:
                                     if filename == os.path.basename(path):
@@ -106,7 +106,7 @@ class Registry(QtCore.QObject):
                                         if image.md5sum == md5sum:
                                             log.debug("Found image {} (MD5={}) in {}".format(filename, md5sum, image.path))
                                             return image
-                        except (OSError, PermissionError) as e:
-                            log.error("Cannot scan {}: {}".format(path, e))
+                except (OSError, PermissionError) as e:
+                    log.error("Cannot scan {}: {}".format(path, e))
 
         return None

gns3/schemas/appliance.json

@@ -166,6 +166,13 @@
             "extra_hosts": {
                 "description": "Hosts which will be written to /etc/hosts into container" ,
                 "type": "string"
+            },
+            "extra_volumes": {
+                "description": "Additional directories to make persistent that are not included in the images VOLUME directive" ,
+                "type": "array",
+                "items": {
+                    "type": "string"
+                }
             }
         },
         "required": [

gns3/style.py

@@ -76,7 +76,6 @@ class Style:
         self._mw.uiDrawRectangleAction.setIcon(self._getStyleIcon(":/icons/rectangle.svg", ":/icons/rectangle-hover.svg"))
         self._mw.uiDrawEllipseAction.setIcon(self._getStyleIcon(":/icons/ellipse.svg", ":/icons/ellipse-hover.svg"))
         self._mw.uiDrawLineAction.setIcon(QtGui.QIcon(":/icons/vertically.svg"))
-        self._mw.uiEditReadmeAction.setIcon(QtGui.QIcon(":/icons/edit.svg"))
         self._mw.uiOnlineHelpAction.setIcon(QtGui.QIcon(":/icons/help.svg"))
         self._mw.uiBrowseRoutersAction.setIcon(self._getStyleIcon(":/icons/router.png", ":/icons/router-hover.png"))
         self._mw.uiBrowseSwitchesAction.setIcon(self._getStyleIcon(":/icons/switch.png", ":/icons/switch-hover.png"))
@@ -128,7 +127,6 @@ class Style:
         self._mw.uiDrawRectangleAction.setIcon(self._getStyleIcon(":/classic_icons/rectangle.svg", ":/classic_icons/rectangle-hover.svg"))
         self._mw.uiDrawEllipseAction.setIcon(self._getStyleIcon(":/classic_icons/ellipse.svg", ":/classic_icons/ellipse-hover.svg"))
         self._mw.uiDrawLineAction.setIcon(self._getStyleIcon(":/classic_icons/line.svg", ":/classic_icons/line-hover.svg"))
-        self._mw.uiEditReadmeAction.setIcon(self._getStyleIcon(":/classic_icons/edit.svg", ":/classic_icons/edit-hover.svg"))
         self._mw.uiOnlineHelpAction.setIcon(self._getStyleIcon(":/classic_icons/help.svg", ":/classic_icons/help-hover.svg"))
         self._mw.uiBrowseRoutersAction.setIcon(self._getStyleIcon(":/classic_icons/router.svg", ":/classic_icons/router-hover.svg"))
         self._mw.uiBrowseSwitchesAction.setIcon(self._getStyleIcon(":/classic_icons/switch.svg", ":/classic_icons/switch-hover.svg"))
@@ -190,7 +188,6 @@ class Style:
         self._mw.uiDrawRectangleAction.setIcon(self._getStyleIcon(":/charcoal_icons/rectangle.svg", ":/charcoal_icons/rectangle-hover.svg"))
         self._mw.uiDrawEllipseAction.setIcon(self._getStyleIcon(":/charcoal_icons/ellipse.svg", ":/charcoal_icons/ellipse-hover.svg"))
         self._mw.uiDrawLineAction.setIcon(self._getStyleIcon(":/charcoal_icons/line.svg", ":/charcoal_icons/line-hover.svg"))
-        self._mw.uiEditReadmeAction.setIcon(self._getStyleIcon(":/charcoal_icons/edit.svg", ":/charcoal_icons/edit-hover.svg"))
         self._mw.uiOnlineHelpAction.setIcon(self._getStyleIcon(":/charcoal_icons/help.svg", ":/charcoal_icons/help-hover.svg"))
         self._mw.uiBrowseRoutersAction.setIcon(self._getStyleIcon(":/charcoal_icons/router.svg", ":/charcoal_icons/router-hover.svg"))
         self._mw.uiBrowseSwitchesAction.setIcon(self._getStyleIcon(":/charcoal_icons/switch.svg", ":/charcoal_icons/switch-hover.svg"))

gns3/template.py

@@ -30,6 +30,10 @@ class Template:
             settings["template_id"] = str(uuid.uuid4())
         self._settings = copy.deepcopy(settings)
 
+        # The "appliance_id" setting has been replaced by "template_id" setting in version 2.2
+        if "appliance_id" in self._settings:
+            self._settings["template_id"] = self._settings.pop("appliance_id")
+
         # The "node_type" setting has been replaced by "template_type" setting in version 2.2
         if "node_type" in self._settings:
             self._settings["template_type"] = self._settings.pop("node_type")
@@ -38,6 +42,11 @@ class Template:
         if "server" in self._settings:
             self._settings["compute_id"] = self._settings.pop("server")
 
+        for setting in self._settings.copy():
+            # remove deprecated settings
+            if setting in ["enable_remote_console", "use_ubridge", "acpi_shutdown", "default_symbol", "hover_symbol"]:
+                del self._settings[setting]
+
     def id(self):
         """
         Returns the template ID.

gns3/topology.py

@@ -109,14 +109,14 @@ class Topology(QtCore.QObject):
 
         return self._project
 
-    def setProject(self, project):
+    def setProject(self, project, snapshot=False):
         """
         Set current project
 
         :param project: Project instance
         """
 
-        if self._project:
+        if self._project and snapshot is False:
             # Assert to detect when we create a new project object for the same project
             assert project is None or (project != self._project and project.id != self._project.id)
             self._project.stopListenNotifications()
@@ -134,7 +134,6 @@ class Topology(QtCore.QObject):
 
         self.project_changed_signal.emit()
 
-
     def _projectUpdatedSlot(self):
         if not self._project or not self._project.filesDir() or not self._project.filename():
             return
@@ -193,6 +192,7 @@ class Topology(QtCore.QObject):
         """
         Create load a project based on settings, not on the .gns3
         """
+
         self.setProject(None)
         from .project import Project
         project = Project()
@@ -215,6 +215,17 @@ class Topology(QtCore.QObject):
             self._main_window.uiStatusBar.showMessage("Project created", 2000)
         return project
 
+    def restoreSnapshot(self, project_id):
+        """
+        Restore a snapshot for a given project.
+        """
+
+        assert self._project.id() == project_id
+        project = self._project
+        self.setProject(project, snapshot=True)
+        project.load()
+        self._main_window.uiStatusBar.showMessage("Snapshot restored", 2000)
+
     def loadProject(self, path):
         """
         Loads a project into GNS3.

gns3/ui/edit_project_dialog.ui

@@ -67,13 +67,13 @@
        <item row="4" column="1">
         <widget class="QSpinBox" name="uiNodeGridSizeSpinBox">
          <property name="minimum">
-          <number>10</number>
+          <number>5</number>
          </property>
          <property name="maximum">
           <number>150</number>
          </property>
          <property name="singleStep">
-          <number>10</number>
+          <number>5</number>
          </property>
          <property name="value">
           <number>75</number>
@@ -83,13 +83,13 @@
        <item row="5" column="1">
         <widget class="QSpinBox" name="uiDrawingGridSizeSpinBox">
          <property name="minimum">
-          <number>10</number>
+          <number>5</number>
          </property>
          <property name="maximum">
           <number>100</number>
          </property>
          <property name="singleStep">
-          <number>10</number>
+          <number>5</number>
          </property>
          <property name="value">
           <number>25</number>

gns3/ui/edit_project_dialog_ui.py

@@ -37,16 +37,16 @@ class Ui_EditProjectDialog(object):
         self.uiSceneWidthSpinBox.setObjectName("uiSceneWidthSpinBox")
         self.uiGeneralGrid.addWidget(self.uiSceneWidthSpinBox, 2, 1, 1, 1)
         self.uiNodeGridSizeSpinBox = QtWidgets.QSpinBox(self.uiGeneralTab)
-        self.uiNodeGridSizeSpinBox.setMinimum(10)
+        self.uiNodeGridSizeSpinBox.setMinimum(5)
         self.uiNodeGridSizeSpinBox.setMaximum(150)
-        self.uiNodeGridSizeSpinBox.setSingleStep(10)
+        self.uiNodeGridSizeSpinBox.setSingleStep(5)
         self.uiNodeGridSizeSpinBox.setProperty("value", 75)
         self.uiNodeGridSizeSpinBox.setObjectName("uiNodeGridSizeSpinBox")
         self.uiGeneralGrid.addWidget(self.uiNodeGridSizeSpinBox, 4, 1, 1, 1)
         self.uiDrawingGridSizeSpinBox = QtWidgets.QSpinBox(self.uiGeneralTab)
-        self.uiDrawingGridSizeSpinBox.setMinimum(10)
+        self.uiDrawingGridSizeSpinBox.setMinimum(5)
         self.uiDrawingGridSizeSpinBox.setMaximum(100)
-        self.uiDrawingGridSizeSpinBox.setSingleStep(10)
+        self.uiDrawingGridSizeSpinBox.setSingleStep(5)
         self.uiDrawingGridSizeSpinBox.setProperty("value", 25)
         self.uiDrawingGridSizeSpinBox.setObjectName("uiDrawingGridSizeSpinBox")
         self.uiGeneralGrid.addWidget(self.uiDrawingGridSizeSpinBox, 5, 1, 1, 1)

gns3/ui/export_project_wizard.ui

@@ -61,14 +61,24 @@
       </property>
      </widget>
     </item>
-    <item row="2" column="0" colspan="2">
+    <item row="1" column="1" colspan="2">
+     <widget class="QComboBox" name="uiCompressionComboBox"/>
+    </item>
+    <item row="2" column="0" colspan="3">
      <widget class="QCheckBox" name="uiIncludeImagesCheckBox">
       <property name="text">
        <string>Include base images</string>
       </property>
      </widget>
     </item>
-    <item row="3" column="1">
+    <item row="3" column="0" colspan="2">
+     <widget class="QCheckBox" name="uiIncludeSnapshotsCheckBox">
+      <property name="text">
+       <string>Include snapshots</string>
+      </property>
+     </widget>
+    </item>
+    <item row="4" column="2">
      <spacer name="verticalSpacer">
       <property name="orientation">
        <enum>Qt::Vertical</enum>
@@ -81,9 +91,6 @@
       </property>
      </spacer>
     </item>
-    <item row="1" column="1" colspan="2">
-     <widget class="QComboBox" name="uiCompressionComboBox"/>
-    </item>
    </layout>
   </widget>
   <widget class="QWizardPage" name="uiProjectReadmeWizardPage">

gns3/ui/export_project_wizard_ui.py

@@ -38,14 +38,17 @@ class Ui_ExportProjectWizard(object):
         self.uiCompressionLabel = QtWidgets.QLabel(self.uiExportOptionsWizardPage)
         self.uiCompressionLabel.setObjectName("uiCompressionLabel")
         self.gridLayout.addWidget(self.uiCompressionLabel, 1, 0, 1, 1)
-        self.uiIncludeImagesCheckBox = QtWidgets.QCheckBox(self.uiExportOptionsWizardPage)
-        self.uiIncludeImagesCheckBox.setObjectName("uiIncludeImagesCheckBox")
-        self.gridLayout.addWidget(self.uiIncludeImagesCheckBox, 2, 0, 1, 2)
-        spacerItem = QtWidgets.QSpacerItem(20, 247, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.gridLayout.addItem(spacerItem, 3, 1, 1, 1)
         self.uiCompressionComboBox = QtWidgets.QComboBox(self.uiExportOptionsWizardPage)
         self.uiCompressionComboBox.setObjectName("uiCompressionComboBox")
         self.gridLayout.addWidget(self.uiCompressionComboBox, 1, 1, 1, 2)
+        self.uiIncludeImagesCheckBox = QtWidgets.QCheckBox(self.uiExportOptionsWizardPage)
+        self.uiIncludeImagesCheckBox.setObjectName("uiIncludeImagesCheckBox")
+        self.gridLayout.addWidget(self.uiIncludeImagesCheckBox, 2, 0, 1, 3)
+        self.uiIncludeSnapshotsCheckBox = QtWidgets.QCheckBox(self.uiExportOptionsWizardPage)
+        self.uiIncludeSnapshotsCheckBox.setObjectName("uiIncludeSnapshotsCheckBox")
+        self.gridLayout.addWidget(self.uiIncludeSnapshotsCheckBox, 3, 0, 1, 2)
+        spacerItem = QtWidgets.QSpacerItem(20, 247, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.gridLayout.addItem(spacerItem, 4, 2, 1, 1)
         ExportProjectWizard.addPage(self.uiExportOptionsWizardPage)
         self.uiProjectReadmeWizardPage = QtWidgets.QWizardPage()
         self.uiProjectReadmeWizardPage.setObjectName("uiProjectReadmeWizardPage")
@@ -68,6 +71,7 @@ class Ui_ExportProjectWizard(object):
         self.uiPathBrowserToolButton.setText(_translate("ExportProjectWizard", "Browse..."))
         self.uiCompressionLabel.setText(_translate("ExportProjectWizard", "Compression:"))
         self.uiIncludeImagesCheckBox.setText(_translate("ExportProjectWizard", "Include base images"))
+        self.uiIncludeSnapshotsCheckBox.setText(_translate("ExportProjectWizard", "Include snapshots"))
         self.uiProjectReadmeWizardPage.setTitle(_translate("ExportProjectWizard", "Readme file"))
         self.uiProjectReadmeWizardPage.setSubTitle(_translate("ExportProjectWizard", "Write a summary of the project."))
         self.uiReadmeTextEdit.setHtml(_translate("ExportProjectWizard", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"

gns3/ui/general_preferences_page.ui

@@ -136,11 +136,15 @@
        <item>
         <widget class="QGroupBox" name="uiSymbolThemeGroupBox">
          <property name="title">
-          <string>Symbol theme</string>
+          <string>Symbol theme for new templates</string>
          </property>
          <layout class="QHBoxLayout" name="horizontalLayout_15">
           <item>
-           <widget class="QComboBox" name="uiSymbolThemeComboBox"/>
+           <widget class="QComboBox" name="uiSymbolThemeComboBox">
+            <property name="toolTip">
+             <string>Symbol theme support only works when adding a new template using the recommended method in the template wizard.</string>
+            </property>
+           </widget>
           </item>
          </layout>
         </widget>
@@ -876,13 +880,13 @@
           </sizepolicy>
          </property>
          <property name="minimum">
-          <number>10</number>
+          <number>5</number>
          </property>
          <property name="maximum">
           <number>100</number>
          </property>
          <property name="singleStep">
-          <number>10</number>
+          <number>5</number>
          </property>
          <property name="value">
           <number>25</number>
@@ -898,13 +902,13 @@
           </sizepolicy>
          </property>
          <property name="minimum">
-          <number>10</number>
+          <number>5</number>
          </property>
          <property name="maximum">
           <number>150</number>
          </property>
          <property name="singleStep">
-          <number>10</number>
+          <number>5</number>
          </property>
          <property name="value">
           <number>75</number>

gns3/ui/general_preferences_page_ui.py

@@ -396,9 +396,9 @@ class Ui_GeneralPreferencesPageWidget(object):
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.uiDrawingGridSizeSpinBox.sizePolicy().hasHeightForWidth())
         self.uiDrawingGridSizeSpinBox.setSizePolicy(sizePolicy)
-        self.uiDrawingGridSizeSpinBox.setMinimum(10)
+        self.uiDrawingGridSizeSpinBox.setMinimum(5)
         self.uiDrawingGridSizeSpinBox.setMaximum(100)
-        self.uiDrawingGridSizeSpinBox.setSingleStep(10)
+        self.uiDrawingGridSizeSpinBox.setSingleStep(5)
         self.uiDrawingGridSizeSpinBox.setProperty("value", 25)
         self.uiDrawingGridSizeSpinBox.setObjectName("uiDrawingGridSizeSpinBox")
         self.gridLayout_3.addWidget(self.uiDrawingGridSizeSpinBox, 3, 1, 1, 1)
@@ -408,9 +408,9 @@ class Ui_GeneralPreferencesPageWidget(object):
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.uiNodeGridSizeSpinBox.sizePolicy().hasHeightForWidth())
         self.uiNodeGridSizeSpinBox.setSizePolicy(sizePolicy)
-        self.uiNodeGridSizeSpinBox.setMinimum(10)
+        self.uiNodeGridSizeSpinBox.setMinimum(5)
         self.uiNodeGridSizeSpinBox.setMaximum(150)
-        self.uiNodeGridSizeSpinBox.setSingleStep(10)
+        self.uiNodeGridSizeSpinBox.setSingleStep(5)
         self.uiNodeGridSizeSpinBox.setProperty("value", 75)
         self.uiNodeGridSizeSpinBox.setObjectName("uiNodeGridSizeSpinBox")
         self.gridLayout_3.addWidget(self.uiNodeGridSizeSpinBox, 2, 1, 1, 1)
@@ -488,7 +488,8 @@ class Ui_GeneralPreferencesPageWidget(object):
         self.label_3.setText(_translate("GeneralPreferencesPageWidget", "My custom appliances:"))
         self.uiAppliancesPathToolButton.setText(_translate("GeneralPreferencesPageWidget", "Browse..."))
         self.uiStyleGroupBox.setTitle(_translate("GeneralPreferencesPageWidget", "Interface style"))
-        self.uiSymbolThemeGroupBox.setTitle(_translate("GeneralPreferencesPageWidget", "Symbol theme"))
+        self.uiSymbolThemeGroupBox.setTitle(_translate("GeneralPreferencesPageWidget", "Symbol theme for new templates"))
+        self.uiSymbolThemeComboBox.setToolTip(_translate("GeneralPreferencesPageWidget", "Symbol theme support only works when adding a new template using the recommended method in the template wizard."))
         self.uiConfigurationFileGroupBox.setTitle(_translate("GeneralPreferencesPageWidget", "Configuration file"))
         self.uiImportConfigurationFilePushButton.setText(_translate("GeneralPreferencesPageWidget", "&Import"))
         self.uiExportConfigurationFilePushButton.setText(_translate("GeneralPreferencesPageWidget", "&Export"))

gns3/ui/main_window.ui

@@ -151,7 +151,6 @@ background-none;
     <addaction name="uiDrawRectangleAction"/>
     <addaction name="uiDrawEllipseAction"/>
     <addaction name="uiDrawLineAction"/>
-    <addaction name="uiEditReadmeAction"/>
    </widget>
    <widget class="QMenu" name="uiDeviceMenu">
     <property name="title">
@@ -1157,15 +1156,6 @@ background-none;
     <string>Import portable project</string>
    </property>
   </action>
-  <action name="uiEditReadmeAction">
-   <property name="icon">
-    <iconset resource="../../resources/resources.qrc">
-     <normaloff>:/icons/edit.svg</normaloff>:/icons/edit.svg</iconset>
-   </property>
-   <property name="text">
-    <string>Edit readme</string>
-   </property>
-  </action>
   <action name="uiAcademyAction">
    <property name="text">
     <string>GNS3 &amp;Academy</string>

gns3/ui/main_window_ui.py

@@ -214,22 +214,22 @@ class Ui_MainWindow(object):
         self.uiOnlineHelpAction.setObjectName("uiOnlineHelpAction")
         self.uiScreenshotAction = QtWidgets.QAction(MainWindow)
         icon4 = QtGui.QIcon()
-        icon4.addPixmap(QtGui.QPixmap(":/icons/camera-photo.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         icon4.addPixmap(QtGui.QPixmap(":/icons/camera-photo-hover.svg"), QtGui.QIcon.Active, QtGui.QIcon.Off)
+        icon4.addPixmap(QtGui.QPixmap(":/icons/camera-photo.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.uiScreenshotAction.setIcon(icon4)
         self.uiScreenshotAction.setObjectName("uiScreenshotAction")
         self.uiStartAllAction = QtWidgets.QAction(MainWindow)
         self.uiStartAllAction.setEnabled(True)
         icon5 = QtGui.QIcon()
-        icon5.addPixmap(QtGui.QPixmap(":/icons/start.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         icon5.addPixmap(QtGui.QPixmap(":/icons/start-hover.svg"), QtGui.QIcon.Active, QtGui.QIcon.Off)
+        icon5.addPixmap(QtGui.QPixmap(":/icons/start.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.uiStartAllAction.setIcon(icon5)
         self.uiStartAllAction.setObjectName("uiStartAllAction")
         self.uiStopAllAction = QtWidgets.QAction(MainWindow)
         self.uiStopAllAction.setEnabled(True)
         icon6 = QtGui.QIcon()
-        icon6.addPixmap(QtGui.QPixmap(":/icons/stop.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         icon6.addPixmap(QtGui.QPixmap(":/icons/stop-hover.svg"), QtGui.QIcon.Active, QtGui.QIcon.Off)
+        icon6.addPixmap(QtGui.QPixmap(":/icons/stop.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.uiStopAllAction.setIcon(icon6)
         self.uiStopAllAction.setObjectName("uiStopAllAction")
         self.uiConsoleAllAction = QtWidgets.QAction(MainWindow)
@@ -243,14 +243,14 @@ class Ui_MainWindow(object):
         self.uiAboutQtAction.setObjectName("uiAboutQtAction")
         self.uiZoomInAction = QtWidgets.QAction(MainWindow)
         icon8 = QtGui.QIcon()
-        icon8.addPixmap(QtGui.QPixmap(":/icons/zoom-in.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         icon8.addPixmap(QtGui.QPixmap(":/icons/zoom-in-hover.png"), QtGui.QIcon.Active, QtGui.QIcon.Off)
+        icon8.addPixmap(QtGui.QPixmap(":/icons/zoom-in.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.uiZoomInAction.setIcon(icon8)
         self.uiZoomInAction.setObjectName("uiZoomInAction")
         self.uiZoomOutAction = QtWidgets.QAction(MainWindow)
         icon9 = QtGui.QIcon()
-        icon9.addPixmap(QtGui.QPixmap(":/icons/zoom-out.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         icon9.addPixmap(QtGui.QPixmap(":/icons/zoom-out-hover.png"), QtGui.QIcon.Active, QtGui.QIcon.Off)
+        icon9.addPixmap(QtGui.QPixmap(":/icons/zoom-out.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.uiZoomOutAction.setIcon(icon9)
         self.uiZoomOutAction.setObjectName("uiZoomOutAction")
         self.uiZoomResetAction = QtWidgets.QAction(MainWindow)
@@ -267,8 +267,8 @@ class Ui_MainWindow(object):
         self.uiPreferencesAction.setObjectName("uiPreferencesAction")
         self.uiSuspendAllAction = QtWidgets.QAction(MainWindow)
         icon11 = QtGui.QIcon()
-        icon11.addPixmap(QtGui.QPixmap(":/icons/pause.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         icon11.addPixmap(QtGui.QPixmap(":/icons/pause-hover.svg"), QtGui.QIcon.Active, QtGui.QIcon.Off)
+        icon11.addPixmap(QtGui.QPixmap(":/icons/pause.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.uiSuspendAllAction.setIcon(icon11)
         self.uiSuspendAllAction.setObjectName("uiSuspendAllAction")
         self.uiAddNoteAction = QtWidgets.QAction(MainWindow)
@@ -296,15 +296,15 @@ class Ui_MainWindow(object):
         self.uiDrawRectangleAction = QtWidgets.QAction(MainWindow)
         self.uiDrawRectangleAction.setCheckable(True)
         icon16 = QtGui.QIcon()
-        icon16.addPixmap(QtGui.QPixmap(":/icons/rectangle.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         icon16.addPixmap(QtGui.QPixmap(":/icons/rectangle-hover.svg"), QtGui.QIcon.Active, QtGui.QIcon.Off)
+        icon16.addPixmap(QtGui.QPixmap(":/icons/rectangle.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.uiDrawRectangleAction.setIcon(icon16)
         self.uiDrawRectangleAction.setObjectName("uiDrawRectangleAction")
         self.uiDrawEllipseAction = QtWidgets.QAction(MainWindow)
         self.uiDrawEllipseAction.setCheckable(True)
         icon17 = QtGui.QIcon()
-        icon17.addPixmap(QtGui.QPixmap(":/icons/ellipse.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         icon17.addPixmap(QtGui.QPixmap(":/icons/ellipse-hover.svg"), QtGui.QIcon.Active, QtGui.QIcon.Off)
+        icon17.addPixmap(QtGui.QPixmap(":/icons/ellipse.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.uiDrawEllipseAction.setIcon(icon17)
         self.uiDrawEllipseAction.setObjectName("uiDrawEllipseAction")
         self.uiShowPortNamesAction = QtWidgets.QAction(MainWindow)
@@ -346,41 +346,41 @@ class Ui_MainWindow(object):
         self.uiCheckForUpdateAction.setObjectName("uiCheckForUpdateAction")
         self.uiBrowseRoutersAction = QtWidgets.QAction(MainWindow)
         icon23 = QtGui.QIcon()
-        icon23.addPixmap(QtGui.QPixmap(":/icons/router.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         icon23.addPixmap(QtGui.QPixmap(":/icons/router-hover.png"), QtGui.QIcon.Active, QtGui.QIcon.Off)
+        icon23.addPixmap(QtGui.QPixmap(":/icons/router.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.uiBrowseRoutersAction.setIcon(icon23)
         self.uiBrowseRoutersAction.setObjectName("uiBrowseRoutersAction")
         self.uiBrowseSwitchesAction = QtWidgets.QAction(MainWindow)
         icon24 = QtGui.QIcon()
-        icon24.addPixmap(QtGui.QPixmap(":/icons/switch.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         icon24.addPixmap(QtGui.QPixmap(":/icons/switch-hover.png"), QtGui.QIcon.Active, QtGui.QIcon.Off)
+        icon24.addPixmap(QtGui.QPixmap(":/icons/switch.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.uiBrowseSwitchesAction.setIcon(icon24)
         self.uiBrowseSwitchesAction.setObjectName("uiBrowseSwitchesAction")
         self.uiBrowseEndDevicesAction = QtWidgets.QAction(MainWindow)
         icon25 = QtGui.QIcon()
-        icon25.addPixmap(QtGui.QPixmap(":/icons/PC.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         icon25.addPixmap(QtGui.QPixmap(":/icons/PC-hover.png"), QtGui.QIcon.Active, QtGui.QIcon.Off)
+        icon25.addPixmap(QtGui.QPixmap(":/icons/PC.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.uiBrowseEndDevicesAction.setIcon(icon25)
         self.uiBrowseEndDevicesAction.setObjectName("uiBrowseEndDevicesAction")
         self.uiBrowseSecurityDevicesAction = QtWidgets.QAction(MainWindow)
         icon26 = QtGui.QIcon()
-        icon26.addPixmap(QtGui.QPixmap(":/icons/firewall.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         icon26.addPixmap(QtGui.QPixmap(":/icons/firewall-hover.png"), QtGui.QIcon.Active, QtGui.QIcon.Off)
+        icon26.addPixmap(QtGui.QPixmap(":/icons/firewall.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.uiBrowseSecurityDevicesAction.setIcon(icon26)
         self.uiBrowseSecurityDevicesAction.setObjectName("uiBrowseSecurityDevicesAction")
         self.uiBrowseAllDevicesAction = QtWidgets.QAction(MainWindow)
         icon27 = QtGui.QIcon()
-        icon27.addPixmap(QtGui.QPixmap(":/icons/browse-all-icons.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         icon27.addPixmap(QtGui.QPixmap(":/icons/browse-all-icons-hover.png"), QtGui.QIcon.Active, QtGui.QIcon.Off)
+        icon27.addPixmap(QtGui.QPixmap(":/icons/browse-all-icons.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.uiBrowseAllDevicesAction.setIcon(icon27)
         self.uiBrowseAllDevicesAction.setObjectName("uiBrowseAllDevicesAction")
         self.uiAddLinkAction = QtWidgets.QAction(MainWindow)
         self.uiAddLinkAction.setCheckable(True)
         icon28 = QtGui.QIcon()
-        icon28.addPixmap(QtGui.QPixmap(":/icons/connection-new.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        icon28.addPixmap(QtGui.QPixmap(":/icons/cancel-connection.svg"), QtGui.QIcon.Active, QtGui.QIcon.On)
-        icon28.addPixmap(QtGui.QPixmap(":/icons/cancel-connection.svg"), QtGui.QIcon.Normal, QtGui.QIcon.On)
         icon28.addPixmap(QtGui.QPixmap(":/icons/connection-new-hover.svg"), QtGui.QIcon.Active, QtGui.QIcon.Off)
+        icon28.addPixmap(QtGui.QPixmap(":/icons/connection-new.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon28.addPixmap(QtGui.QPixmap(":/icons/cancel-connection.svg"), QtGui.QIcon.Normal, QtGui.QIcon.On)
+        icon28.addPixmap(QtGui.QPixmap(":/icons/cancel-connection.svg"), QtGui.QIcon.Active, QtGui.QIcon.On)
         self.uiAddLinkAction.setIcon(icon28)
         self.uiAddLinkAction.setObjectName("uiAddLinkAction")
         self.uiFitInViewAction = QtWidgets.QAction(MainWindow)
@@ -407,23 +407,20 @@ class Ui_MainWindow(object):
         icon30.addPixmap(QtGui.QPixmap(":/icons/import.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.uiImportProjectAction.setIcon(icon30)
         self.uiImportProjectAction.setObjectName("uiImportProjectAction")
-        self.uiEditReadmeAction = QtWidgets.QAction(MainWindow)
-        icon31 = QtGui.QIcon()
-        icon31.addPixmap(QtGui.QPixmap(":/icons/edit.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.uiEditReadmeAction.setIcon(icon31)
-        self.uiEditReadmeAction.setObjectName("uiEditReadmeAction")
         self.uiAcademyAction = QtWidgets.QAction(MainWindow)
         self.uiAcademyAction.setObjectName("uiAcademyAction")
         self.uiDeleteProjectAction = QtWidgets.QAction(MainWindow)
-        icon32 = QtGui.QIcon()
-        icon32.addPixmap(QtGui.QPixmap(":/icons/delete.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.uiDeleteProjectAction.setIcon(icon32)
+        icon31 = QtGui.QIcon()
+        icon31.addPixmap(QtGui.QPixmap(":/icons/delete.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.uiDeleteProjectAction.setIcon(icon31)
         self.uiDeleteProjectAction.setObjectName("uiDeleteProjectAction")
         self.uiShowGridAction = QtWidgets.QAction(MainWindow)
         self.uiShowGridAction.setCheckable(True)
         self.uiShowGridAction.setObjectName("uiShowGridAction")
         self.uiEditProjectAction = QtWidgets.QAction(MainWindow)
-        self.uiEditProjectAction.setIcon(icon31)
+        icon32 = QtGui.QIcon()
+        icon32.addPixmap(QtGui.QPixmap(":/icons/edit.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.uiEditProjectAction.setIcon(icon32)
         self.uiEditProjectAction.setObjectName("uiEditProjectAction")
         self.uiWebInterfaceAction = QtWidgets.QAction(MainWindow)
         self.uiWebInterfaceAction.setObjectName("uiWebInterfaceAction")
@@ -437,10 +434,10 @@ class Ui_MainWindow(object):
         self.uiLockAllAction.setCheckable(True)
         self.uiLockAllAction.setChecked(False)
         icon34 = QtGui.QIcon()
-        icon34.addPixmap(QtGui.QPixmap(":/icons/unlock.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        icon34.addPixmap(QtGui.QPixmap(":/icons/lock.svg"), QtGui.QIcon.Active, QtGui.QIcon.On)
-        icon34.addPixmap(QtGui.QPixmap(":/icons/lock.svg"), QtGui.QIcon.Normal, QtGui.QIcon.On)
         icon34.addPixmap(QtGui.QPixmap(":/icons/unlock.svg"), QtGui.QIcon.Active, QtGui.QIcon.Off)
+        icon34.addPixmap(QtGui.QPixmap(":/icons/unlock.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon34.addPixmap(QtGui.QPixmap(":/icons/lock.svg"), QtGui.QIcon.Normal, QtGui.QIcon.On)
+        icon34.addPixmap(QtGui.QPixmap(":/icons/lock.svg"), QtGui.QIcon.Active, QtGui.QIcon.On)
         self.uiLockAllAction.setIcon(icon34)
         self.uiLockAllAction.setObjectName("uiLockAllAction")
         self.uiWebUIAction = QtWidgets.QAction(MainWindow)
@@ -500,7 +497,6 @@ class Ui_MainWindow(object):
         self.uiAnnotateMenu.addAction(self.uiDrawRectangleAction)
         self.uiAnnotateMenu.addAction(self.uiDrawEllipseAction)
         self.uiAnnotateMenu.addAction(self.uiDrawLineAction)
-        self.uiAnnotateMenu.addAction(self.uiEditReadmeAction)
         self.uiToolsMenu.addAction(self.uiScreenshotAction)
         self.uiToolsMenu.addAction(self.uiImportExportConfigsAction)
         self.uiToolsMenu.addAction(self.uiWebInterfaceAction)
@@ -702,7 +698,6 @@ class Ui_MainWindow(object):
         self.uiDoctorAction.setText(_translate("MainWindow", "GNS3 &Doctor"))
         self.uiExportProjectAction.setText(_translate("MainWindow", "Export portable project"))
         self.uiImportProjectAction.setText(_translate("MainWindow", "Import portable project"))
-        self.uiEditReadmeAction.setText(_translate("MainWindow", "Edit readme"))
         self.uiAcademyAction.setText(_translate("MainWindow", "GNS3 &Academy"))
         self.uiDeleteProjectAction.setText(_translate("MainWindow", "Delete project"))
         self.uiShowGridAction.setText(_translate("MainWindow", "Show the grid"))

gns3/ui/setup_wizard.ui

@@ -6,16 +6,10 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1069</width>
-    <height>615</height>
+    <width>1081</width>
+    <height>534</height>
    </rect>
   </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
   <property name="windowTitle">
    <string>Setup Wizard</string>
   </property>
@@ -83,7 +77,7 @@
        </font>
       </property>
       <property name="toolTip">
-       <string>Eveything that is supported by your system will run on your computer.</string>
+       <string>Everything that is supported by your system will run on your computer.</string>
       </property>
       <property name="text">
        <string>Run appliances on my local computer</string>

gns3/ui/setup_wizard_ui.py

@@ -2,21 +2,18 @@
 
 # Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/ui/setup_wizard.ui'
 #
-# Created by: PyQt5 UI code generator 5.9
+# Created by: PyQt5 UI code generator 5.13.0
 #
 # WARNING! All changes made in this file will be lost!
 
+
 from PyQt5 import QtCore, QtGui, QtWidgets
 
+
 class Ui_SetupWizard(object):
     def setupUi(self, SetupWizard):
         SetupWizard.setObjectName("SetupWizard")
-        SetupWizard.resize(1069, 615)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(SetupWizard.sizePolicy().hasHeightForWidth())
-        SetupWizard.setSizePolicy(sizePolicy)
+        SetupWizard.resize(1081, 534)
         SetupWizard.setModal(True)
         SetupWizard.setWizardStyle(QtWidgets.QWizard.ModernStyle)
         SetupWizard.setOptions(QtWidgets.QWizard.NoBackButtonOnStartPage)
@@ -247,7 +244,7 @@ class Ui_SetupWizard(object):
         self.uiVMRadioButton.setToolTip(_translate("SetupWizard", "Dynamips, IOU, VPCS and Qemu will use this virtual machine."))
         self.uiVMRadioButton.setText(_translate("SetupWizard", "Run appliances in a virtual machine"))
         self.label.setText(_translate("SetupWizard", "Requires to download and install the GNS3 VM (available for free) "))
-        self.uiLocalRadioButton.setToolTip(_translate("SetupWizard", "Eveything that is supported by your system will run on your computer."))
+        self.uiLocalRadioButton.setToolTip(_translate("SetupWizard", "Everything that is supported by your system will run on your computer."))
         self.uiLocalRadioButton.setText(_translate("SetupWizard", "Run appliances on my local computer"))
         self.uiLocalLabel.setText(_translate("SetupWizard", "A limited number of appliances like the Cisco IOS routers <= C7200 can be run"))
         self.uiRemoteControllerRadioButton.setText(_translate("SetupWizard", "Run appliances on a remote server (advanced usage)"))
@@ -286,5 +283,4 @@ class Ui_SetupWizard(object):
         self.uiSummaryWizardPage.setSubTitle(_translate("SetupWizard", "The server type has been configured, please see the summary of the settings below"))
         self.uiSummaryTreeWidget.headerItem().setText(0, _translate("SetupWizard", "1"))
         self.uiSummaryTreeWidget.headerItem().setText(1, _translate("SetupWizard", "2"))
-
 from . import resources_rc

gns3/update_manager.py

@@ -92,7 +92,7 @@ class UpdateManager(QtCore.QObject):
         self._silent = silent
         self._parent = parent
 
-        if hasattr(sys, "frozen") and LocalConfig.instance().experimental():
+        if not hasattr(sys, "frozen") and LocalConfig.instance().experimental():
             url = 'https://pypi.org/pypi/gns3-gui/json'
             self._get(url, self._pypiReplySlot)
         else:

gns3/utils/export_project_worker.py

@@ -28,16 +28,17 @@ class ExportProjectWorker(QtCore.QObject):
     finished = QtCore.pyqtSignal()
     updated = QtCore.pyqtSignal(int)
 
-    def __init__(self, project, path, include_images, compression):
+    def __init__(self, project, path, include_images, include_snapshots, compression):
         super().__init__()
         self._project = project
         self._include_images = include_images
+        self._include_snapshots = include_snapshots
         self._path = path
         self._compression = compression
 
     def run(self):
         if self._project:
-            self._project.get("/export?include_images={}&compression={}".format(self._include_images, self._compression),
+            self._project.get("/export?include_images={}&include_snapshots={}&compression={}".format(self._include_images, self._include_snapshots, self._compression),
                               self._exportReceived,
                               downloadProgressCallback=self._downloadFileProgress,
                               timeout=None)

gns3/utils/http.py

@@ -1,74 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (C) 2016 GNS3 Technologies Inc.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import sys
-import ssl
-import http
-import json
-import base64
-import urllib.request
-
-import logging
-log = logging.getLogger(__name__)
-
-
-def getSynchronous(protocol, host, port, endpoint, timeout=2, user=None, password=None):
-    """
-    :returns: Tuple (Status code, json of anwser). Status 0 is a non HTTP error
-    """
-    try:
-        url = "{protocol}://{host}:{port}/v2/{endpoint}".format(protocol=protocol, host=host, port=port, endpoint=endpoint)
-        request = urllib.request.Request(url)
-
-        if user is not None and len(user) > 0:
-            log.debug("Synchronous get {} with user '{}'".format(url, user))
-            base64string = base64.encodebytes('{}:{}'.format(user, password).encode()).replace(b'\n', b'')
-            request.add_header("Authorization", "Basic {}".format(base64string.decode()))
-        else:
-            log.debug("Synchronous get {} (no authentication)".format(url))
-
-        if sys.version_info >= (3, 5):
-            ctx = ssl.create_default_context()
-            ctx.check_hostname = False
-            ctx.verify_mode = ssl.CERT_NONE
-            response = urllib.request.urlopen(request, timeout=timeout, context=ctx)
-        else:
-            response = urllib.request.urlopen(request, timeout=timeout)
-
-        content_type = response.getheader("CONTENT-TYPE")
-        if response.status == 200:
-            if content_type == "application/json":
-                content = response.read()
-                json_data = json.loads(content.decode("utf-8"))
-                return response.status, json_data
-        else:
-            return response.status, None
-    except http.client.InvalidURL as e:
-        log.warning("Invalid local server url: {}".format(e))
-        return 0, None
-    except http.client.UnknownProtocol:
-        log.warning("Unknown server running on {}:{}".format(host, port))
-        return 0, None
-    except urllib.error.URLError:
-        # Connection refused. It's a normal behavior if server is not started
-        return 0, None
-    except urllib.error.HTTPError as e:
-        log.debug("Error during get on {}:{}: {}".format(host, port, e))
-        return e.code, None
-    except (OSError, http.client.BadStatusLine, ValueError, SystemError) as e:
-        log.debug("Error during get on {}:{}: {}".format(host, port, e))
-    return 0, None

gns3/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.0a5"
-__version_info__ = (2, 2, 0, -99)
+__version__ = "2.2.0"
+__version_info__ = (2, 2, 0, 0)
 
 # If it's a git checkout try to add the commit
 if "dev" in __version__:

tests/registry/test_appliance_to_template.py

@@ -18,7 +18,6 @@
 import pytest
 import json
 import os
-from unittest.mock import patch
 
 from gns3.registry.config import Config
 from gns3.settings import LOCAL_SERVER_SETTINGS
@@ -209,47 +208,6 @@ def test_add_appliance_with_symbol_from_symbols_dir(empty_config, linux_microcor
     assert new_template["symbol"] == "linux_guest.svg"
 
 
-def test_add_appliance_with_symbol_from_web(empty_config, linux_microcore_img, symbols_dir):
-    with open("tests/registry/appliances/microcore-linux.gns3a", encoding="utf-8") as f:
-        config = json.load(f)
-    config["images"] = [
-        {
-            "type": "hda_disk_image",
-            "filename": "linux-microcore-3.4.1.img",
-            "path": linux_microcore_img
-        }
-    ]
-    config["symbol"] = "linux_guest.svg"
-    symbol_path = os.path.join(symbols_dir, "linux_guest.svg")
-
-    with patch("urllib.request.urlretrieve") as mock:
-        new_template = ApplianceToTemplate().new_template(config, "local")
-        mock.assert_called_with("https://raw.githubusercontent.com/GNS3/gns3-registry/master/symbols/linux_guest.svg", symbol_path)
-    assert new_template["symbol"] == "linux_guest.svg"
-
-
-def test_add_appliance_with_symbol_from_web_error(empty_config, linux_microcore_img, symbols_dir):
-    with open("tests/registry/appliances/microcore-linux.gns3a", encoding="utf-8") as f:
-        config = json.load(f)
-    config["images"] = [
-        {
-            "type": "hda_disk_image",
-            "filename": "linux-microcore-3.4.1.img",
-            "path": linux_microcore_img
-        }
-    ]
-    config["symbol"] = "linux_guest.svg"
-    symbol_path = os.path.join(symbols_dir, "linux_guest.svg")
-
-    with patch("urllib.request.urlretrieve") as mock:
-        mock.side_effect = OSError
-        new_template = ApplianceToTemplate().new_template(config, "local")
-        mock.assert_called_with("https://raw.githubusercontent.com/GNS3/gns3-registry/master/symbols/linux_guest.svg", symbol_path)
-
-    # In case of error we fallback on default symbol
-    assert new_template["symbol"] == ":/symbols/qemu_guest.svg"
-
-
 def test_add_appliance_with_port_name_format(linux_microcore_img):
     with open("tests/registry/appliances/microcore-linux.gns3a", encoding="utf-8") as f:
         config = json.load(f)

win-requirements.txt

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