Re-release v2.1.3 to fix idna packaging issue.

Fix dragging appliance into topology from nodes window, fixes: #2363

.gitignore

@@ -60,3 +60,6 @@ keys
 updates
 .cache
 __pycache__
+
+# Virtualenv
+env

.pyup.yml

@@ -1,2 +1,2 @@
 branch:
-    2.0
+    2.2

.travis.yml

@@ -6,6 +6,9 @@ notifications:
 script:
 - docker build -t gns3-gui-test .
 - docker run gns3-gui-test
+before_deploy:
+- sudo pip install twine
+- sudo pip install urllib3[secure]
 deploy:
   provider: pypi
   user: noplay

CHANGELOG

@@ -1,5 +1,153 @@
 # Change Log
 
+## 2.1.3 19/01/2018
+
+* Change messages when there are different client and server versions. Fixes #2391.
+* Fix "Transport selection via DSN is deprecated" message. Sync is configured with HTTPTransport.
+* Refresh CPU/RAM info every 1 second. Ref #2262.
+* Only check for AVG on Windows
+* Improve the search for VBoxManage.
+* Allow telnet console to node with name containing double quotes. Fixes #2371.
+
+## 2.1.2 08/01/2018
+
+* Update VMware promotion in setup wizard.
+* Confirm exit. Fixes #2359.
+* Fix with .exe build
+
+## 2.1.1 22/12/2017
+
+* Fix dragging appliance into topology from nodes window, fixes: #2363
+* Fix Appliances in Docked mode, fixes: #2362
+* Create local variable in order to debug issue in the next occurrence, #2366
+* Fix ParseError: not well-formed (invalid token), #2364
+* Fix local variable 'vm' referenced before assignment #2365
+* Fix: 'NodesDockWidget' object has no attribute 'uiNodesView', #2362
+* Tentative fix for packet capture not working correctly when remote main server is configured. Ref #2111.
+* Log Qt messages with log.debug() instead of log.info().
+* Fix auto idle-pc from preferences. Fixes #2344.
+* Snapshoting project without timeout but with  button. Ref. #2314
+* Improve validation for idle-pc.
+* Activate faulthandler.
+* Add PATH to OS X console commands
+* Use raw triple quotes in large console settings This eliminates one level of quoting
+* Fix issue in node summary when console is not supported by a node.
+* Remove unused symbols. Fixes #2320.
+* Show console information in Topology Summary Dock. Fixes #2258.
+* New option: require KVM. If false, Qemu VMs will not be prevented to run without KVM.
+* Implement variable replacement for Qemu VM options.
+* Show on what server a node is installed in the servers summary pane. Fixes #2279.
+* Add more info when cannot remove capture file after stopping packet capture in a remote project. Ref #1223.
+* Do not overwrites the disk images when copied to default directory. Fixes #2326.
+* Only replace quoted telnet for macOS Telnet commands. Ref #2328.
+* Support Telnet path containing spaces. Ref #2328.
+* Fix problem when embedded telnet client path contains a space on macOS. Ref #2328.
+* Do not launch console for builtin nodes when using the "Console to all nodes" button. Fixes #2309.
+* Update frame_relay_switch_configuration_page_ui.py
+* Turn off timeout for node creation
+
+## 2.1.0 09/11/2017
+
+* Update dynamips binary on OSX
+
+## 2.1.0rc4 07/11/2017
+
+* Accurate upload progress dialogs for large files
+* Disable direct file upload on default
+* Add registry version 5
+* Direct file upload enabled on default
+* Progress Dialog: don't count finished queries done in background
+* Add debug messages to file upload
+* Image Upload Manager for uploading
+* Fix race condition on NodesDockWidget, fixes: #2304
+* Do not write an error message when importing non existing config from a directory. Fixes #2296.
+* Fix bug when replacing Telnet path on OSX. Ref #2274.
+* Back to development on 2.1.0rc3
+
+## 2.1.0rc3 19/10/2017
+
+* Add debug when using Telnet path on OSX. Ref #2274.
+* Force to use the telnet client embedded in DMG. Ref #2274.
+* Upload directly to compute - experimental feature
+* Filter additional QXcbConnection log messages
+* Do not add missing file extension for screenshot file names on Mac. Fixes #2287.
+* Log Qt messages as info instead of error. Ref #2281.
+
+## 2.1.0rc2 04/10/2017
+
+* Only show "can't get settings from controller" message in debug mode.
+* Remove explicit Telnet path on OS X. Ref #2274
+* Disable WebSocket notification for lower PyQT version than 5.6. Fixes #2272
+* Increase timeout to 5 minutes when creating and restoring a snapshot.
+* Add more information when a request timeouts. Ref #2277.
+* Do not show the progress dialog when moving a node. Ref #2275.
+* Increase timer before showing a progress dialog from 250ms to 500ms. Ref #2275.
+* Use embedded Telnet client on OS X. Ref #2274.
+* Fix small bug when adding an appliance template and the name already exists.
+* Use RAW sockets by default on Linux for VMware VM connections.
+* Increase timeout to get compute servers from controller. Ref #2269.
+* Fix "Node doesn't exist" after deletion, but still on the canvas. Fixes #2266.
+* Make sure the warning button icon appears in cloud properties dialog on Windows. Fixes #2245.
+* Fix bug when cancelling the importation of a configuration file. Fixes #2260.
+
+## 2.1.0rc1 13/09/2017
+
+* Fix missing spice console option in appliance template schema. Fixes #2255.
+
+## 2.1.0b2 05/09/2017
+
+* Fix resources dependencies for cloud configuration page (Fixes: #2251)
+* Disabled possibility of moving items under zero layer (Fixes #2220)
+* dialog-warning.svg fallback for themed icon (Ref. #2245)
+* Change width of packet filters dialog (Fixes #2244)
+* Fix high CPU usage when using packet filters. Fixes #2240.
+* Toggle Node menu item (Fixes #2227)
+* Fixes multiselection styles change crash on LineItem (#2216)
+* Fixes loading symbols for QEMU at Edit Page (#2214)
+* Fixes exception when right click on Dynamips router in the device dock (#2211)
+* Update frame_relay_switch_configuration_page.ui
+
+## 2.1.0b1 04/08/2017
+
+* Info added to the Nat node
+* Add missing popup information in cloud and docker node
+* Handle invalid json in websockets
+* Avoid invalid bad request error when receiving partial answer
+* Catch parse error for broken SVG
+* Filter QXcbConnection log messages
+* Catch class 'PyQt5.QtNetwork.QNetworkReply'> returned a result with an error set
+* Fix KeyError: 'overlay_notifications'
+
+## 2.1.0a2 31/07/2017
+
+* Fix permission error when importing a project on a remote server
+* Fix RecursionError
+* Fix 'NodesDockWidget' object has no attribute 'loadPath'
+* Fix 'MainWindow' object has no attribute '_settings
+* Fix object has no attribute 'warning_signal'
+* Fix timeout issues when using an appliance
+* Make sure ubridge path is not a directory
+
+## 2.1.0a1 24/07/2017
+
+* Packet filtering
+* Suspend a link
+* Duplicate a node
+* Move config to central server
+* Appliance templates on server
+
+## 2.0.3 13/06/2017
+
+* Display error when we can't export files
+* Fix auth header not sent is some conditions
+* If we have auth issue at server startup continue to get better error
+* Do not override IOU configuration file when you change the image
+* Fix some PNG loading issues on Windows
+* Handle label with missing elements
+* Support floating value for font size
+* Handle partial json in a response
+* Add Dominik as a new team member
+
 ## 2.0.2 30/05/2017
 
 * Show a default symbol in case of corrupted file

Dockerfile

@@ -1,12 +1,12 @@
 # Run tests inside a container
-FROM ubuntu:vivid
+FROM ubuntu:17.10
 
 MAINTAINER GNS3 Team
 
 #ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update
-RUN apt-get install -y --force-yes python3.4 python3-pyqt5 python3-pip python3-pyqt5.qtsvg python3.4-dev xvfb
+RUN apt-get install -y --force-yes python3.6 python3-pyqt5 python3-pip python3-pyqt5.qtsvg python3-pyqt5.qtwebsockets python3.6-dev xvfb
 RUN apt-get clean
 
 
@@ -19,4 +19,4 @@ ADD . /src
 
 WORKDIR /src
 
-CMD xvfb-run python3.4 -m pytest -vv
+CMD xvfb-run python3.6 -m pytest -vv

gns3/appliance_manager.py

@@ -0,0 +1,119 @@
+#!/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/>.
+
+from .qt import QtCore
+from .controller import Controller
+from .utils.server_select import server_select
+
+import logging
+log = logging.getLogger(__name__)
+
+
+class ApplianceManager(QtCore.QObject):
+
+    appliances_changed_signal = QtCore.Signal()
+
+    def __init__(self):
+        super().__init__()
+        self._appliance_templates = []
+        self._appliances = []
+        self._controller = Controller.instance()
+        self._controller.connected_signal.connect(self.refresh)
+        self._controller.disconnected_signal.connect(self._controllerDisconnectedSlot)
+        self.refresh()
+
+    def refresh(self):
+        if self._controller.connected():
+            self._controller.get("/appliances/templates", self._listApplianceTemplateCallback)
+            self._controller.get("/appliances", self._listAppliancesCallback)
+
+    def _controllerDisconnectedSlot(self):
+        self._appliance_templates = []
+        self._appliances = []
+        self.appliances_changed_signal.emit()
+
+    def appliance_templates(self):
+        return self._appliance_templates
+
+    def appliances(self):
+        return self._appliances
+
+    def getAppliance(self, appliance_id):
+        """
+        Look for an appliance by appliance ID
+        """
+        for appliance in self._appliances:
+            if appliance["appliance_id"] == appliance_id:
+                return appliance
+        return None
+
+    def _listAppliancesCallback(self, result, error=False, **kwargs):
+        if error is True:
+            log.error("Error while getting appliances list: {}".format(result["message"]))
+            return
+        self._appliances = result
+        self.appliances_changed_signal.emit()
+
+    def _listApplianceTemplateCallback(self, result, error=False, **kwargs):
+        if error is True:
+            log.error("Error while getting appliance templates list: {}".format(result["message"]))
+            return
+        self._appliance_templates = result
+        self.appliances_changed_signal.emit()
+
+    def createNodeFromApplianceId(self, project, appliance_id, x, y):
+        for appliance in self._appliances:
+            if appliance["appliance_id"] == appliance_id:
+                break
+
+        project_id = project.id()
+
+        if appliance.get("compute_id") is None:
+            from .main_window import MainWindow
+            server = server_select(MainWindow.instance(), node_type=appliance["node_type"])
+            if server is None:
+                return False
+            self._controller.post("/projects/" + project_id + "/appliances/" + appliance_id, self._createNodeFromApplianceCallback, {
+                "compute_id": server.id(),
+                "x": int(x),
+                "y": int(y)
+            },
+                timeout=None)
+        else:
+            self._controller.post("/projects/" + project_id + "/appliances/" + appliance_id, self._createNodeFromApplianceCallback, {
+                "x": int(x),
+                "y": int(y)
+            },
+                timeout=None)
+        return True
+
+    def _createNodeFromApplianceCallback(self, result, error=False, **kwargs):
+        if error:
+            if "message" in result:
+                log.error("Error while creating node: {}".format(result["message"]))
+            return
+
+    @staticmethod
+    def instance():
+        """
+        Singleton to return only on instance of ApplianceManager.
+        :returns: instance of ApplianceManager
+        """
+
+        if not hasattr(ApplianceManager, '_instance') or ApplianceManager._instance is None:
+            ApplianceManager._instance = ApplianceManager()
+        return ApplianceManager._instance

gns3/base_node.py

@@ -19,8 +19,12 @@
 Base class for node classes.
 """
 
+import os
+import pathlib
+
 from .qt import QtCore
 from .ports.port import Port
+from .utils.normalize_filename import normalize_filename
 
 
 import logging
@@ -176,19 +180,16 @@ class BaseNode(QtCore.QObject):
                 # set ports as started
                 port.setStatus(Port.started)
             self.started_signal.emit()
-            log.info("{} has started".format(self.name()))
         elif status == self.stopped:
             for port in self._ports:
                 # set ports as stopped
                 port.setStatus(Port.stopped)
             self.stopped_signal.emit()
-            log.info("{} has stopped".format(self.name()))
         elif status == self.suspended:
             for port in self._ports:
                 # set ports as suspended
                 port.setStatus(Port.suspended)
             self.suspended_signal.emit()
-            log.info("{} has suspended".format(self.name()))
 
     def initialized(self):
         """
@@ -326,3 +327,73 @@ class BaseNode(QtCore.QObject):
         """
 
         self._project.delete(path, callback, context=context, **kwargs)
+
+    def exportConfigToDirectory(self, directory):
+        """
+        Exports the initial-config to a directory.
+
+        :param directory: destination directory path
+        """
+
+        if not hasattr(self, "configFiles"):
+            return
+        for file in self.configFiles():
+            self.controllerHttpGet("/nodes/{node_id}/files/{file}".format(node_id=self._node_id, file=file),
+                                   self._exportConfigToDirectoryCallback,
+                                   context={"directory": directory, "file": file},
+                                   raw=True)
+
+    def _exportConfigToDirectoryCallback(self, result, error=False, raw_body=None, context={}, **kwargs):
+        """
+        Callback for exportConfigToDirectory.
+
+        :param result: server response
+        :param error: indicates an error (boolean)
+        """
+
+        if error:
+            # The file could be missing if you have not private config for
+            # exemple
+            return
+        export_directory = context["directory"]
+
+        filename = normalize_filename(self.name()) + "_{}".format(context["file"].replace("/", "_"))  # We can have / in the case of Docker
+        config_path = os.path.join(export_directory, filename)
+        try:
+            with open(config_path, "wb") as f:
+                log.debug("saving {} config to {}".format(self.name(), config_path))
+                f.write(raw_body)
+        except OSError as e:
+            self.error_signal.emit(self.id(), "could not export config to {}: {}".format(config_path, e))
+
+    def importConfigFromDirectory(self, directory):
+        """
+        Imports an initial-config from a directory.
+
+        :param directory: source directory path
+        """
+
+        if not hasattr(self, "configFiles"):
+            return
+
+        try:
+            contents = os.listdir(directory)
+        except OSError as e:
+            self.error_signal.emit(self.id(), "Can't list file in {}: {}".format(directory, str(e)))
+            return
+
+        for file in self.configFiles():
+            filename = normalize_filename(self.name()) + "_{}".format(file.replace("/", "_"))  # We can have / in the case of Docker
+            if filename in contents:
+                self.controllerHttpPost("/nodes/{node_id}/files/{file}".format(
+                    node_id=self._node_id,
+                    file=file), self._importConfigCallback,
+                    pathlib.Path(os.path.join(directory, filename)))
+            else:
+                log.warning("{}: config file '{}' not found".format(self.name(), filename))
+
+    def _importConfigCallback(self, result, error=False, **kwargs):
+        if error:
+            if "message" in result:
+                log.error("Error while import config: {}".format(result["message"]))
+            return

gns3/compute_manager.py

@@ -55,15 +55,15 @@ class ComputeManager(QtCore.QObject):
     def _refreshComputesSlot(self):
         if self._refreshingComputes:
             return
-        if self._controller.connected() and datetime.datetime.now().timestamp() - self._last_computes_refresh > 5:
+        if self._controller.connected() and datetime.datetime.now().timestamp() - self._last_computes_refresh > 1:
             self._last_computes_refresh = datetime.datetime.now().timestamp()
             self._refreshingComputes = True
-            self._controller.get("/computes", self._listComputesCallback, showProgress=False, timeout=15)
+            self._controller.get("/computes", self._listComputesCallback, showProgress=False, timeout=30)
 
     def _controllerConnectedSlot(self):
         if self._controller.connected():
             self._refreshingComputes = True
-            self._controller.get("/computes", self._listComputesCallback, showProgress=False, timeout=15)
+            self._controller.get("/computes", self._listComputesCallback, showProgress=False, timeout=30)
 
     def _controllerDisconnectedSlot(self):
         for compute_id in list(self._computes):
@@ -84,6 +84,7 @@ class ComputeManager(QtCore.QObject):
         Called when we received data from a compute
         node.
         """
+
         self._last_computes_refresh = datetime.datetime.now().timestamp()
 
         new_node = False

gns3/compute_summary_view.py

@@ -19,10 +19,10 @@
 Compute summary view that list all the compute, their status.
 """
 
-import sip
-
 from .qt import QtGui, QtCore, QtWidgets
 from .compute_manager import ComputeManager
+from .topology import Topology
+from .node import Node
 
 import logging
 log = logging.getLogger(__name__)
@@ -78,6 +78,21 @@ class ComputeItem(QtWidgets.QTreeWidgetItem):
                 self.setIcon(0, QtGui.QIcon(':/icons/led_red.svg'))
         self._parent.sortItems(0, QtCore.Qt.AscendingOrder)
 
+        # add nodes belonging to this compute
+        self.takeChildren()
+        nodes = Topology.instance().nodes()
+        for node in nodes:
+            if node.compute().id() == self._compute.id():
+                item = QtWidgets.QTreeWidgetItem()
+                item.setText(0, node.name())
+                if node.status() == Node.started:
+                    item.setIcon(0, QtGui.QIcon(':/icons/led_green.svg'))
+                elif node.status() == Node.suspended:
+                    item.setIcon(0, QtGui.QIcon(':/icons/led_yellow.svg'))
+                else:
+                    item.setIcon(0, QtGui.QIcon(':/icons/led_red.svg'))
+                self.addChild(item)
+        self.sortChildren(0, QtCore.Qt.AscendingOrder)
 
 class ComputeSummaryView(QtWidgets.QTreeWidget):
 

gns3/configs/ios_base_startup-config.txt

@@ -1,26 +0,0 @@
-!
-service timestamps debug datetime msec
-service timestamps log datetime msec
-no service password-encryption
-!
-hostname %h
-!
-ip cef
-no ip domain-lookup
-no ip icmp rate-limit unreachable
-ip tcp synwait 5
-no cdp log mismatch duplex
-!
-line con 0
- exec-timeout 0 0
- logging synchronous
- privilege level 15
- no login
-line aux 0
- exec-timeout 0 0
- logging synchronous
- privilege level 15
- no login
-!
-!
-end

gns3/configs/ios_etherswitch_startup-config.txt

@@ -1,181 +0,0 @@
-!
-service timestamps debug datetime msec
-service timestamps log datetime msec
-no service password-encryption
-no service dhcp
-!
-hostname %h
-!
-ip cef
-no ip routing
-no ip domain-lookup
-no ip icmp rate-limit unreachable
-ip tcp synwait 5
-no cdp log mismatch duplex
-vtp file nvram:vlan.dat
-!
-!
-interface FastEthernet0/0
- description *** Unused for Layer2 EtherSwitch ***
- no ip address
- shutdown
-!
-interface FastEthernet0/1
- description *** Unused for Layer2 EtherSwitch ***
- no ip address
- shutdown
-!
-interface FastEthernet1/0
- no shutdown
- duplex full
- speed 100
-!
-interface FastEthernet1/1
- no shutdown
- duplex full
- speed 100
-!
-interface FastEthernet1/2
- no shutdown
- duplex full
- speed 100
-!
-interface FastEthernet1/3
- no shutdown
- duplex full
- speed 100
-!
-interface FastEthernet1/4
- no shutdown
- duplex full
- speed 100
-!
-interface FastEthernet1/5
- no shutdown
- duplex full
- speed 100
-!
-interface FastEthernet1/6
- no shutdown
- duplex full
- speed 100
-!
-interface FastEthernet1/7
- no shutdown
- duplex full
- speed 100
-!
-interface FastEthernet1/8
- no shutdown
- duplex full
- speed 100
-!
-interface FastEthernet1/9
- no shutdown
- duplex full
- speed 100
-!
-interface FastEthernet1/10
- no shutdown
- duplex full
- speed 100
-!
-interface FastEthernet1/11
- no shutdown
- duplex full
- speed 100
-!
-interface FastEthernet1/12
- no shutdown
- duplex full
- speed 100
-!
-interface FastEthernet1/13
- no shutdown
- duplex full
- speed 100
-!
-interface FastEthernet1/14
- no shutdown
- duplex full
- speed 100
-!
-interface FastEthernet1/15
- no shutdown
- duplex full
- speed 100
-!
-interface Vlan1
- no ip address
- shutdown
-!
-!
-line con 0
- exec-timeout 0 0
- logging synchronous
- privilege level 15
- no login
-line aux 0
- exec-timeout 0 0
- logging synchronous
- privilege level 15
- no login
-!
-!
-banner exec $
-
-***************************************************************
-This is a normal Router with a SW module inside (NM-16ESW)
-It has been preconfigured with hard coded speed and duplex
-
-To create vlans use the command "vlan database" from exec mode
-After creating all desired vlans use "exit" to apply the config
-
-To view existing vlans use the command "show vlan-switch brief"
-
-Warning: You are using an old IOS image for this router.
-Please update the IOS to enable the "macro" command!
-***************************************************************
-
-$
-!
-!Warning: If the IOS is old and doesn't support macro, it will stop the configuration loading from this point!
-!
-macro name add_vlan
-end
-vlan database
-vlan $v
-exit
-@
-macro name del_vlan
-end
-vlan database
-no vlan $v
-exit
-@
-!
-!
-banner exec $
-
-***************************************************************
-This is a normal Router with a Switch module inside (NM-16ESW)
-It has been pre-configured with hard-coded speed and duplex
-
-To create vlans use the command "vlan database" in exec mode
-After creating all desired vlans use "exit" to apply the config
-
-To view existing vlans use the command "show vlan-switch brief"
-
-Alias(exec)     : vl   - "show vlan-switch brief" command
-Alias(configure): va X - macro to add vlan X
-Alias(configure): vd X - macro to delete vlan X
-***************************************************************
-
-$
-!
-alias configure va macro global trace add_vlan $v
-alias configure vd macro global trace del_vlan $v
-alias exec vl show vlan-switch brief
-!
-!
-end

gns3/configs/iou_l2_base_startup-config.txt

@@ -1,132 +0,0 @@
-!
-service timestamps debug datetime msec
-service timestamps log datetime msec
-no service password-encryption
-!
-hostname %h
-!
-!
-!
-logging discriminator EXCESS severity drops 6 msg-body drops EXCESSCOLL 
-logging buffered 50000
-logging console discriminator EXCESS
-!
-no ip icmp rate-limit unreachable
-!
-ip cef
-no ip domain-lookup
-!
-!
-!
-!
-!
-!
-ip tcp synwait-time 5
-! 
-!
-!
-!
-!
-!
-interface Ethernet0/0
- no ip address
- no shutdown
- duplex auto
-!
-interface Ethernet0/1
- no ip address
- no shutdown
- duplex auto
-!
-interface Ethernet0/2
- no ip address
- no shutdown
- duplex auto
-!
-interface Ethernet0/3
- no ip address
- no shutdown
- duplex auto
-!
-interface Ethernet1/0
- no ip address
- no shutdown
- duplex auto
-!
-interface Ethernet1/1
- no ip address
- no shutdown
- duplex auto
-!
-interface Ethernet1/2
- no ip address
- no shutdown
- duplex auto
-!
-interface Ethernet1/3
- no ip address
- no shutdown
- duplex auto
-!
-interface Ethernet2/0
- no ip address
- no shutdown
- duplex auto
-!
-interface Ethernet2/1
- no ip address
- no shutdown
- duplex auto
-!
-interface Ethernet2/2
- no ip address
- no shutdown
- duplex auto
-!
-interface Ethernet2/3
- no ip address
- no shutdown
- duplex auto
-!
-interface Ethernet3/0
- no ip address
- no shutdown
- duplex auto
-!
-interface Ethernet3/1
- no ip address
- no shutdown
- duplex auto
-!
-interface Ethernet3/2
- no ip address
- no shutdown
- duplex auto
-!
-interface Ethernet3/3
- no ip address
- no shutdown
- duplex auto
-!
-interface Vlan1
- no ip address
- shutdown
-!
-!
-!
-!
-!
-!
-!
-!
-!
-line con 0
- exec-timeout 0 0
- privilege level 15
- logging synchronous
-line aux 0
- exec-timeout 0 0
- privilege level 15
- logging synchronous
-!
-end

gns3/configs/iou_l3_base_startup-config.txt

@@ -1,108 +0,0 @@
-!
-service timestamps debug datetime msec
-service timestamps log datetime msec
-no service password-encryption
-!
-hostname %h
-!
-!
-!
-no ip icmp rate-limit unreachable
-!
-!         
-!
-!
-ip cef
-no ip domain-lookup
-!
-!
-ip tcp synwait-time 5
-!
-!
-!
-!
-interface Ethernet0/0
- no ip address
- shutdown
-!
-interface Ethernet0/1
- no ip address
- shutdown
-!
-interface Ethernet0/2
- no ip address
- shutdown 
-!
-interface Ethernet0/3
- no ip address
- shutdown
-!
-interface Ethernet1/0
- no ip address
- shutdown
-!
-interface Ethernet1/1
- no ip address
- shutdown
-!
-interface Ethernet1/2
- no ip address
- shutdown
-!
-interface Ethernet1/3
- no ip address
- shutdown
-!
-interface Serial2/0
- no ip address
- shutdown
- serial restart-delay 0
-!
-interface Serial2/1
- no ip address
- shutdown
- serial restart-delay 0
-!
-interface Serial2/2
- no ip address
- shutdown
- serial restart-delay 0
-!
-interface Serial2/3
- no ip address
- shutdown
- serial restart-delay 0
-!
-interface Serial3/0
- no ip address
- shutdown
- serial restart-delay 0
-!         
-interface Serial3/1
- no ip address
- shutdown
- serial restart-delay 0
-!
-interface Serial3/2
- no ip address
- shutdown
- serial restart-delay 0
-!
-interface Serial3/3
- no ip address
- shutdown
- serial restart-delay 0
-!
-!
-no cdp log mismatch duplex
-!
-line con 0
- exec-timeout 0 0
- privilege level 15
- logging synchronous
-line aux 0
- exec-timeout 0 0
- privilege level 15
- logging synchronous
-!
-end

gns3/configs/vpcs_base_config.txt

@@ -1 +0,0 @@
-set pcname %h

gns3/console_cmd.py

@@ -21,7 +21,6 @@ Handles commands typed in the GNS3 console.
 
 import sys
 import cmd
-import logging
 import struct
 import sip
 import json
@@ -30,6 +29,9 @@ from .node import Node
 from .qt import QtCore
 from .version import __version__
 
+import logging
+log = logging.getLogger(__name__)
+
 
 class ConsoleCmd(cmd.Cmd):
 
@@ -177,6 +179,24 @@ class ConsoleCmd(cmd.Cmd):
                             print("Cannot console to {}".format(device))
                         break
 
+    def do_log(self, args):
+        """
+        Log a message
+
+        log level message
+        """
+
+        args = args.split()
+        if len(args) == 0:
+            return
+        level = args.pop(0)
+        if level == "info":
+            log.info(" ".join(args))
+        elif level == "warning":
+            log.warning(" ".join(args))
+        else:
+            log.error(" ".join(args))
+
     def _start_console(self, node):
         """
         Starts a console application for a specific node.

gns3/controller.py

@@ -92,6 +92,12 @@ class Controller(QtCore.QObject):
             self._http_client.connection_disconnected_signal.connect(self._httpClientDisconnectedSlot)
             self._connectingToServer()
 
+    def getHttpClient(self):
+        """
+        :return: Instance of HTTP client to communicate with the server
+        """
+        return self._http_client
+
     def setDisplayError(self, val):
         """
         Allow error to be visible or not
@@ -181,6 +187,14 @@ class Controller(QtCore.QObject):
                 return compute_id
         return compute_id
 
+    def getEndpoint(self, path, compute_id, *args, **kwargs):
+        """
+        API post on a specific compute
+        """
+        compute_id = self.__fix_compute_id(compute_id)
+        path = "/computes/endpoint/{}{}".format(compute_id, path)
+        return self.get(path, *args, **kwargs)
+
     def put(self, *args, **kwargs):
         return self.createHTTPQuery("PUT", *args, **kwargs)
 
@@ -197,6 +211,9 @@ class Controller(QtCore.QObject):
     def getSynchronous(self, endpoint, timeout=2):
         return self._http_client.getSynchronous(endpoint, timeout)
 
+    def connectWebSocket(self, path, *args):
+        return self._http_client.connectWebSocket(path)
+
     @staticmethod
     def instance():
         """
@@ -208,12 +225,13 @@ class Controller(QtCore.QObject):
             Controller._instance = Controller()
         return Controller._instance
 
-    def getStatic(self, url, callback):
+    def getStatic(self, url, callback, fallback=None):
         """
         Get a URL from the /static on controller and cache it on disk
 
         :param url: URL without the protocol and host part
         :param callback: Callback to call when file is ready
+        :param fallback: Fallback url in case of error
         """
 
         if not self._http_client:
@@ -229,16 +247,25 @@ class Controller(QtCore.QObject):
         if os.path.exists(path):
             callback(path)
         elif path in self._static_asset_download_queue:
-            self._static_asset_download_queue[path].append(callback)
+            self._static_asset_download_queue[path].append((callback, fallback, ))
         else:
-            self._static_asset_download_queue[path] = [callback]
+            self._static_asset_download_queue[path] = [(callback, fallback, )]
             self._http_client.createHTTPQuery("GET", url, qpartial(self._getStaticCallback, url, path))
 
     def _getStaticCallback(self, url, path, result, error=False, raw_body=None, **kwargs):
+        if path not in self._static_asset_download_queue:
+            return
+
         if error:
+            fallback_used = False
+            for callback, fallback in self._static_asset_download_queue[path]:
+                if fallback:
+                    self.getStatic(fallback, callback)
+                fallback_used = True
+            if fallback_used:
+                log.error("Error while downloading file: {}".format(url))
             log.error("Error while downloading file: {}".format(url))
-            if path in self._static_asset_download_queue:
-                del self._static_asset_download_queue[path]
+            del self._static_asset_download_queue[path]
             return
         try:
             with open(path, "wb+") as f:
@@ -247,18 +274,24 @@ class Controller(QtCore.QObject):
             log.error("Can't write to {}: {}".format(path, str(e)))
             return
         log.debug("File stored {} for {}".format(path, url))
-        for callback in self._static_asset_download_queue[path]:
+        for callback, fallback in self._static_asset_download_queue[path]:
             callback(path)
         del self._static_asset_download_queue[path]
 
-    def getSymbolIcon(self, symbol_id, callback):
+    def getSymbolIcon(self, symbol_id, callback, fallback=None):
         """
         Get a QIcon for a symbol from the controller
 
-        :param url: URL without the protocol and host part
+        :param symbol_id: Symbol id
         :param callback: Callback to call when file is ready
+        :param fallback: Fallback symbol if not found
         """
-        self.getStatic(Symbol(symbol_id).url(), qpartial(self._getIconCallback, callback))
+        if symbol_id is None:
+            self.getStatic(Symbol(fallback).url(), qpartial(self._getIconCallback, callback))
+        else:
+            if fallback:
+                fallback = Symbol(fallback).url()
+            self.getStatic(Symbol(symbol_id).url(), qpartial(self._getIconCallback, callback), fallback=fallback)
 
     def _getIconCallback(self, callback, path):
         icon = QtGui.QIcon()

gns3/crash_report.py

@@ -41,7 +41,7 @@ if __version_info__[3] != 0:
     import faulthandler
     # Display a traceback in case of segfault crash. Usefull when frozen
     # Not enabled by default for security reason
-    log.info("Enable catching segfault")
+    log.debug("Enable catching segfault")
     faulthandler.enable()
 
 
@@ -51,7 +51,7 @@ class CrashReport:
     Report crash to a third party service
     """
 
-    DSN = "sync+https://063691a489374eda912ad454a1d80777:5ddb34d6b23c4a08b040efce23aaac78@sentry.io/38506"
+    DSN = "sync+https://9a23499382c64b82bfc707a3716bd0b1:6ad6c81972af4b12837ca4d1895eac8b@sentry.io/38506"
     if hasattr(sys, "frozen"):
         cacert = get_resource("cacert.pem")
         if cacert is not None and os.path.isfile(cacert):
@@ -70,11 +70,18 @@ class CrashReport:
 
     def captureException(self, exception, value, tb):
         from .local_server import LocalServer
+        from .local_config import LocalConfig
 
         local_server = LocalServer.instance().localServerSettings()
         if local_server["report_errors"]:
             if not RAVEN_AVAILABLE:
                 return
+
+            if os.path.exists(LocalConfig.instance().runAsRootPath()):
+                log.warning("User has run application as root. Crash reports are disabled.")
+                sys.exit(1)
+                return
+
             if os.path.exists(".git"):
                 log.warning("A .git directory exist crash report is turn off for developers. Instant exit")
                 sys.exit(1)
@@ -104,7 +111,7 @@ class CrashReport:
             except Exception as e:
                 log.error("Can't send crash report to Sentry: {}".format(e))
                 return
-            log.info("Crash report sent with event ID: {}".format(client.get_ident(report)))
+            log.debug("Crash report sent with event ID: {}".format(client.get_ident(report)))
 
     def _add_qt_information(self, context):
         try:

gns3/dialogs/appliance_wizard.py

@@ -17,6 +17,7 @@
 
 import os
 import sip
+import shutil
 
 from ..qt import QtWidgets, QtCore, QtGui, qpartial, qslot
 from ..ui.appliance_wizard_ui import Ui_ApplianceWizard
@@ -31,6 +32,7 @@ from ..utils.progress_dialog import ProgressDialog
 from ..compute_manager import ComputeManager
 from ..controller import Controller
 from ..local_config import LocalConfig
+from ..image_upload_manager import ImageUploadManager
 
 
 class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
@@ -71,7 +73,16 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
 
         self.uiLocalRadioButton.toggled.connect(self._localToggledSlot)
         if Controller.instance().isRemote():
-            self.uiLocalRadioButton.setText("Run the appliance on the main server")
+            self.uiLocalRadioButton.setText("Install the appliance on the main server")
+        else:
+            if not path.endswith('.builtin.gns3a'):
+                destination = Config().appliances_dir
+                try:
+                    os.makedirs(destination, exist_ok=True)
+                    destination = os.path.join(destination, os.path.basename(path))
+                    shutil.copy(path, destination)
+                except OSError as e:
+                    QtWidgets.QMessageBox.warning(self.parent(), "Can't copy {} to {}".format(path, destination), str(e))
 
         self.uiServerWizardPage.isComplete = self._uiServerWizardPage_isComplete
 
@@ -128,6 +139,9 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
                 self.uiInfoTreeWidget.addTopLevelItem(item)
 
         elif self.page(page_id) == self.uiServerWizardPage:
+            is_mac = ComputeManager.instance().localPlatform().startswith("darwin")
+            is_win = ComputeManager.instance().localPlatform().startswith("win")
+
             self.uiRemoteServersComboBox.clear()
             if len(ComputeManager.instance().remoteComputes()) == 0:
                 self.uiRemoteRadioButton.setEnabled(False)
@@ -141,7 +155,7 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
 
             if ComputeManager.instance().localPlatform() is None:
                 self.uiLocalRadioButton.setEnabled(False)
-            elif (ComputeManager.instance().localPlatform().startswith("darwin") or ComputeManager.instance().localPlatform().startswith("win")):
+            elif is_mac or is_win:
                 if type == "qemu":
                     # Qemu has issues on OSX and Windows we disallow usage of the local server
                     if not LocalConfig.instance().experimental():
@@ -158,6 +172,14 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
             else:
                 self.uiRemoteRadioButton.setChecked(False)
 
+            if is_mac or is_win:
+                if not self.uiRemoteRadioButton.isEnabled() \
+                        and not self.uiVMRadioButton.isEnabled() \
+                        and not self.uiLocalRadioButton.isEnabled():
+                    QtWidgets.QMessageBox.warning(
+                        self, "No GNS3 VM available.",
+                        "GNS3 VM is not available, please configure GNS3 VM before adding new Appliance.")
+
         elif self.page(page_id) == self.uiFilesWizardPage:
             self._registry.getRemoteImageList(self._appliance.emulator(), self._compute_id)
 
@@ -398,7 +420,11 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
         except OSError as e:
             QtWidgets.QMessageBox.warning(self.parent(), "Add appliance", "Can't access to the image file {}: {}.".format(path, str(e)))
             return
-        image.upload(self._compute_id, callback=self._imageUploadedCallback)
+
+        image_upload_manger = ImageUploadManager(
+            image, Controller.instance(), self._compute_id,
+            self._imageUploadedCallback, LocalConfig.instance().directFileUpload())
+        image_upload_manger.upload()
 
     def _getQemuBinariesFromServerCallback(self, result, error=False, **kwargs):
         """
@@ -449,6 +475,8 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
         while len(appliance_configuration["name"]) == 0 or not config.is_name_available(appliance_configuration["name"]):
             QtWidgets.QMessageBox.warning(self.parent(), "Add appliance", "The name \"{}\" is already used by another appliance".format(appliance_configuration["name"]))
             appliance_configuration["name"], ok = QtWidgets.QInputDialog.getText(self.parent(), "Add appliance", "New name:", QtWidgets.QLineEdit.Normal, appliance_configuration["name"])
+            if not ok:
+                return False
             appliance_configuration["name"] = appliance_configuration["name"].strip()
 
         if "qemu" in appliance_configuration:
@@ -476,7 +504,12 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
         for image in appliance_configuration["images"]:
             if image["location"] == "local":
                 image = Image(self._appliance.emulator(), image["path"], filename=image["filename"])
-                image.upload(self._compute_id, self._applianceImageUploadedCallback)
+
+                image_upload_manger = ImageUploadManager(
+                    image, Controller.instance(), self._compute_id,
+                    self._applianceImageUploadedCallback, LocalConfig.instance().directFileUpload())
+                image_upload_manger.upload()
+
                 self._image_uploading_count += 1
 
     def _applianceImageUploadedCallback(self, result, error=False, **kwargs):

gns3/dialogs/console_command_dialog.py

@@ -23,6 +23,7 @@ from gns3.local_config import LocalConfig
 from gns3.ui.console_command_dialog_ui import Ui_uiConsoleCommandDialog
 from gns3.settings import PRECONFIGURED_TELNET_CONSOLE_COMMANDS, \
         PRECONFIGURED_VNC_CONSOLE_COMMANDS,                      \
+        PRECONFIGURED_SPICE_CONSOLE_COMMANDS,                    \
         CUSTOM_CONSOLE_COMMANDS_SETTINGS
 
 
@@ -38,7 +39,7 @@ class ConsoleCommandDialog(QtWidgets.QDialog, Ui_uiConsoleCommandDialog):
 
     def __init__(self, parent, console_type="telnet", current=None):
         """
-        :params console_type: telnet, serial or vnc
+        :params console_type: telnet, serial, vnc or spice
         :params current: Current console command
         """
         super().__init__(parent)
@@ -62,6 +63,9 @@ class ConsoleCommandDialog(QtWidgets.QDialog, Ui_uiConsoleCommandDialog):
         elif self._console_type == "vnc":
             self._consoles = copy.copy(PRECONFIGURED_VNC_CONSOLE_COMMANDS)
             self._consoles.update(self._settings[self._console_type])
+        elif self._console_type == "spice":
+            self._consoles = copy.copy(PRECONFIGURED_SPICE_CONSOLE_COMMANDS)
+            self._consoles.update(self._settings[self._console_type])
 
         self.uiCommandComboBox.clear()
         self.uiCommandComboBox.addItem("Custom", "")

gns3/dialogs/doctor_dialog.py

@@ -95,13 +95,14 @@ class DoctorDialog(QtWidgets.QDialog, Ui_DoctorDialog):
     def checkAVGInstalled(self):
         """Checking if AVG software is not installed"""
 
-        for proc in psutil.process_iter():
-            try:
-                psinfo = proc.as_dict(["exe"])
-                if psinfo["exe"] and "AVG\\" in psinfo["exe"]:
-                    return (2, "AVG has known issues with GNS3, even after you disable it. You must whitelist dynamips.exe in the AVG preferences.")
-            except psutil.NoSuchProcess:
-                pass
+        if sys.platform.startswith("win32"):
+            for proc in psutil.process_iter():
+                try:
+                    psinfo = proc.as_dict(["exe"])
+                    if psinfo["exe"] and "AVG\\" in psinfo["exe"]:
+                        return (2, "AVG has known issues with GNS3, even after you disable it. You must whitelist dynamips.exe in the AVG preferences.")
+                except psutil.NoSuchProcess:
+                    pass
         return (0, None)
 
     def checkFreeRam(self):
@@ -136,22 +137,15 @@ class DoctorDialog(QtWidgets.QDialog, Ui_DoctorDialog):
         if not os.path.exists(path):
             return (2, "Ubridge path {path} doesn't exists".format(path=path))
 
-        request_setuid = False
         if sys.platform.startswith("linux"):
             try:
-                if "security.capability" in os.listxattr(path):
-                    caps = os.getxattr(path, "security.capability")
-                    # test the 2nd byte and check if the 13th bit (CAP_NET_RAW) is set
-                    if not struct.unpack("<IIIII", caps)[1] & 1 << 13:
-                        return (2, "Ubridge requires CAP_NET_RAW. Run sudo setcap cap_net_admin,cap_net_raw=ep {path}".format(path=path))
-                else:
-                    # capabilities not supported
-                    request_setuid = True
-            except AttributeError:
+                if "security.capability" not in os.listxattr(path) or not struct.unpack("<IIIII", os.getxattr(path, "security.capability"))[1] & 1 << 13:
+                    return (2, "Ubridge requires CAP_NET_RAW. Run sudo setcap cap_net_admin,cap_net_raw=ep {path}".format(path=path))
+            except (OSError, AttributeError) as e:
                 # Due to a Python bug, os.listxattr could be missing: https://github.com/GNS3/gns3-gui/issues/2010
-                return (1, "Could not determine if CAP_NET_RAW capability is set for uBridge (Python bug)".format(path=path))
+                return (1, "Could not determine if CAP_NET_RAW capability is set for uBridge: {}".format(e))
 
-        if sys.platform.startswith("darwin") or request_setuid:
+        if sys.platform.startswith("darwin"):
             if os.stat(path).st_uid != 0 or not os.stat(path).st_mode & stat.S_ISUID:
                 return (2, "Ubridge should be setuid. Run sudo chown root:admin {path} and sudo chmod 4750 {path}".format(path=path))
         return (0, None)

gns3/dialogs/edit_compute_dialog.py

@@ -41,9 +41,6 @@ class EditComputeDialog(QtWidgets.QDialog, Ui_EditComputeDialog):
             self.uiServerHostLineEdit.setText(self._compute.host())
             self.uiServerPortSpinBox.setValue(self._compute.port())
 
-            index = self.uiServerProtocolComboBox.findText(self._compute.protocol().upper())
-            self.uiServerProtocolComboBox.setCurrentIndex(index)
-
             if self._compute.user():
                 self.uiEnableAuthenticationCheckBox.setChecked(True)
                 self.uiServerUserLineEdit.setText(self._compute.user())
@@ -81,7 +78,7 @@ class EditComputeDialog(QtWidgets.QDialog, Ui_EditComputeDialog):
 
         host = self.uiServerHostLineEdit.text().strip()
         name = self.uiServerNameLineEdit.text().strip()
-        protocol = self.uiServerProtocolComboBox.currentText().lower()
+        protocol = "http"
         port = self.uiServerPortSpinBox.value()
         user = self.uiServerUserLineEdit.text().strip()
         password = self.uiServerPasswordLineEdit.text().strip()

gns3/dialogs/export_debug_dialog.py

@@ -62,7 +62,7 @@ class ExportDebugDialog(QtWidgets.QDialog, Ui_ExportDebugDialog):
             self._exportDebugCallback({}, error=True)
 
     def _exportDebugCallback(self, result, error=False, **kwargs):
-        log.info("Export debug information to %s", self._path)
+        log.debug("Export debug information to %s", self._path)
 
         try:
             with ZipFile(self._path, 'w') as zip:

gns3/dialogs/filter_dialog.py

@@ -0,0 +1,174 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2014 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/>.
+
+from ..qt import QtGui, QtWidgets, qslot
+from ..ui.filter_dialog_ui import Ui_FilterDialog
+
+
+class FilterDialog(QtWidgets.QDialog, Ui_FilterDialog):
+
+    """
+    Filter dialog.
+    """
+
+    def __init__(self, parent, link):
+
+        super().__init__(parent)
+        self.setupUi(self)
+        self._link = link
+        self._link.updated_link_signal.connect(self._updateUiSlot)
+        self._link.listAvailableFilters(self._listAvailableFiltersCallback)
+        self._initialized = False
+        self._filter_items = {}
+        self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Apply).clicked.connect(self._applyPreferencesSlot)
+        self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Help).clicked.connect(self._helpSlot)
+        self.uiButtonBox.button(QtWidgets.QDialogButtonBox.Reset).clicked.connect(self._resetSlot)
+
+    def _listAvailableFiltersCallback(self, result, error=False, *args, **kwargs):
+        if error:
+            QtWidgets.QMessageBox.warning(None, "Link", "Error while listing information about the link: {}".format(result["message"]))
+            return
+        self._filters = result
+        self._initialized = True
+        self._updateUiSlot()
+
+    @qslot
+    def _updateUiSlot(self, *args):
+
+        # Empty the main layout
+        while True:
+            item = self.uiVerticalLayout.takeAt(0)
+            if item is None:
+                break
+            elif item.widget():
+                item.widget().deleteLater()
+
+        if len(self._filters) == 0:
+            QtWidgets.QMessageBox.critical(self, "Link", "No filter available for this link. Try with a different node type.")
+            self.reject()
+
+        self._tabWidget = QtWidgets.QTabWidget(self)
+        for i, filter in enumerate(self._filters):
+            tab = QtWidgets.QWidget()
+            self._tabWidget.addTab(tab, filter['name'])
+            self._tabWidget.setTabToolTip(i, filter['description'])
+            self._tabWidget.setTabIcon(i, QtGui.QIcon(':/icons/led_red.svg'))
+            vlayout = QtWidgets.QVBoxLayout()
+
+            gridLayout = QtWidgets.QGridLayout()
+            line = 0
+            filter["spinBoxes"] = []
+            filter["textEdits"] = []
+
+            nb_spin = 0
+
+            for param in filter["parameters"]:
+                label = QtWidgets.QLabel()
+                label.setText(param["name"] + ":")
+                gridLayout.addWidget(label, line, 0, 1, 1)
+
+                if param["type"] == "int":
+                    spinBox = QtWidgets.QSpinBox()
+                    filter["spinBoxes"].append(spinBox)
+                    spinBox.setMinimum(param["minimum"])
+                    spinBox.setMaximum(param["maximum"])
+
+                    sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed)
+                    sizePolicy.setHorizontalStretch(0)
+                    sizePolicy.setVerticalStretch(0)
+                    sizePolicy.setHeightForWidth(spinBox.sizePolicy().hasHeightForWidth())
+                    spinBox.setSizePolicy(sizePolicy)
+                    try:
+                        value = self._link.filters()[filter["type"]][nb_spin]
+                        spinBox.setValue(value)
+                        if value != 0:
+                            self._tabWidget.setTabIcon(i, QtGui.QIcon(':/icons/led_green.svg'))
+                    except(KeyError, IndexError):
+                        pass
+                    nb_spin += 1
+                    gridLayout.addWidget(spinBox, line, 1, 1, 1)
+                    unit = QtWidgets.QLabel()
+                    unit.setText(param["unit"])
+                    gridLayout.addWidget(unit, line, 2, 1, 1)
+                elif param["type"] == "text":
+                    textEdit = QtWidgets.QTextEdit()
+                    textEdit.setAcceptRichText(False)
+                    filter["textEdits"].append(textEdit)
+                    sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
+                    sizePolicy.setHorizontalStretch(0)
+                    sizePolicy.setVerticalStretch(0)
+                    textEdit.setMinimumWidth(300)
+                    textEdit.setSizePolicy(sizePolicy)
+                    try:
+                        text = self._link.filters()[filter["type"]][0]
+                        textEdit.setPlainText(text)
+                        if text:
+                            self._tabWidget.setTabIcon(i, QtGui.QIcon(':/icons/led_green.svg'))
+                    except(KeyError, IndexError):
+                        pass
+                    gridLayout.addWidget(textEdit, line, 1, 1, 1)
+
+                line += 1
+
+            spacerItem = QtWidgets.QSpacerItem(1, 1, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+            gridLayout.addItem(spacerItem, line, 0, 1, 1)
+            vlayout.addLayout(gridLayout)
+            tab.setLayout(vlayout)
+
+        self.uiVerticalLayout.addWidget(self._tabWidget)
+
+    @qslot
+    def _applyPreferencesSlot(self, *args):
+        new_filters = {}
+        for filter in self._filters:
+            new_filters[filter["type"]] = []
+            for spinBox in filter["spinBoxes"]:
+                new_filters[filter["type"]].append(spinBox.value())
+            for spinBox in filter["textEdits"]:
+                new_filters[filter["type"]].append(spinBox.toPlainText())
+        self._link.setFilters(new_filters)
+        self._link.update()
+
+    @qslot
+    def _helpSlot(self, *args):
+        help_text = "Filters are applied to packets in both direction.\n\n"
+
+        filter_nb = 0
+        for filter in self._filters:
+            help_text += "{}: {}".format(filter["name"], filter["description"])
+            filter_nb += 1
+            if len(self._filters) != filter_nb:
+                help_text += "\n\n"
+
+        QtWidgets.QMessageBox.information(self, "Help for filters", help_text)
+
+    @qslot
+    def _resetSlot(self, *args):
+
+        filters = {}
+        self._link.setFilters(filters)
+        self._link.update()
+
+    def done(self, result):
+        """
+        Called when the dialog is closed.
+
+        :param result: boolean (accepted or rejected)
+        """
+        if result and self._initialized:
+            self._applyPreferencesSlot()
+        super().done(result)

gns3/dialogs/idlepc_dialog.py

@@ -40,7 +40,8 @@ class IdlePCDialog(QtWidgets.QDialog, Ui_IdlePCDialog):
         self._idlepcs = idlepcs
 
         for value in self._idlepcs:
-            match = re.search(r"^(0x[0-9a-f]+)\s+\[(\d+)\]$", value)
+            # validate idle-pc format, e.g. 0x60c09aa0
+            match = re.search(r"^(0x[0-9a-f]{8})\s+\[(\d+)\]$", value)
             if match:
                 idlepc = match.group(1)
                 count = int(match.group(2))

gns3/dialogs/notif_dialog.py

@@ -0,0 +1,190 @@
+# -*- coding: utf-8 -*-
+#
+# 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/>.
+
+"""
+Display error to the user in an overlay popup
+"""
+
+import time
+
+from gns3.qt import QtWidgets, QtCore, qslot
+
+import logging
+log = logging.getLogger(__name__)
+
+
+MAX_ELEMENTS = 3
+DISPLAY_DURATION = {
+    "CRITICAL": 120,
+    "ERROR": 120,
+    "WARNING": 20,
+    "INFO": 5
+}
+
+
+class NotifDialogHandler(logging.StreamHandler):
+
+    def __init__(self, dialog):
+        super().__init__()
+        self._dialog = dialog
+        self.setLevel(logging.INFO)
+        self._dialog.show()
+
+    def emit(self, record):
+        self._dialog.addNotif(record.levelname, record.getMessage())
+
+
+class NotifDialog(QtWidgets.QWidget):
+
+    def __init__(self, parent):
+        super().__init__(parent)
+        self._notifs = []
+
+        self.setWindowFlags(QtCore.Qt.FramelessWindowHint |
+                            QtCore.Qt.WindowDoesNotAcceptFocus |
+                            QtCore.Qt.SubWindow)
+        # QtCore.Qt.Tool)
+        # QtCore.Qt.WindowStaysOnTopHint)
+        self.setAttribute(QtCore.Qt.WA_ShowWithoutActivating)  # | QtCore.Qt.WA_TranslucentBackground)
+
+        self._layout = QtWidgets.QVBoxLayout()
+
+        self._timer = QtCore.QTimer()
+        self._timer.setInterval(1000)
+        self._timer.timeout.connect(self._refreshSlot)
+        self._timer.start()
+
+        for i in range(0, MAX_ELEMENTS):
+            l = QtWidgets.QLabel()
+            l.setAlignment(QtCore.Qt.AlignTop)
+            l.setWordWrap(True)
+            l.hide()
+            self._layout.addWidget(l)
+        self.setLayout(self._layout)
+
+    @qslot
+    def addNotif(self, level, message):
+        if not self.parent().settings().get("overlay_notifications", True):
+            return
+
+        # This unicode char prevent the wordwrap at /
+        message = message.replace("/", "\u2060/\u2060")
+        if len(self._notifs) == MAX_ELEMENTS:
+            self._notifs.pop(0)
+        self._notifs.append((level, message, time.time()))
+        self.update()
+
+    @qslot
+    def _refreshSlot(self):
+        """
+        Hide the notifs after some delay
+        """
+        notifs = []
+        for (i, (level, message, when)) in enumerate(self._notifs):
+            if when + DISPLAY_DURATION[level] > time.time():
+                notifs.append((level, message, when))
+        if notifs != self._notifs:
+            self._notifs = notifs
+            self.update()
+        elif len(notifs) > 0:
+            self.resize()
+
+    def update(self):
+        if len(self._notifs) == 0:
+            self.hide()
+        else:
+            for (i, (level, message, when)) in enumerate(self._notifs):
+                w = self._layout.itemAt(i).widget()
+                w.setText(message)
+                if level == "ERROR" or level == "CRITICAL":
+                    w.setStyleSheet("""
+                        color: black;
+                        padding-left: 12px;
+                        background-color: rgb(247, 205, 198);
+                        border-left: 10px solid red;
+                    """)
+                elif level == "WARNING":
+                    w.setStyleSheet("""
+                        color: black;
+                        padding-left: 12px;
+                        background-color: #f4f2b5;
+                        border-left: 10px solid orange;
+                    """)
+                elif level == "INFO":
+                    w.setStyleSheet("""
+                        color: black;
+                        padding-left: 12px;
+                        background-color: #cfffc9;
+                        border-left: 10px solid green;
+                    """)
+
+                w.show()
+            for i in range(i + 1, MAX_ELEMENTS):
+                w = self._layout.itemAt(i).widget()
+                w.hide()
+
+            self.resize()
+            self.show()
+
+    def resize(self):
+        x = self.parent().width() - self.width() - 10
+        y = 10
+        self.setGeometry(x, y, self.sizeHint().width(), self.sizeHint().height())
+
+    @qslot
+    def mousePressEvent(self, event):
+        self._notifs.clear()
+        self.update()
+
+
+if __name__ == '__main__':
+    """
+    A demo main for testing the features
+    """
+    import sys
+    app = QtWidgets.QApplication(sys.argv)
+    logging.basicConfig(level=logging.INFO)
+
+    class MainWindow(QtWidgets.QWidget):
+
+        def __init__(self):
+            super().__init__()
+            l1 = QtWidgets.QLabel()
+            l1.setText("Hello World")
+
+            vbox = QtWidgets.QVBoxLayout()
+            vbox.addWidget(l1)
+            self.setLayout(vbox)
+            self.setStyleSheet("background-color:blue;")
+            self._dialog = NotifDialog(self)
+            log.addHandler(NotifDialogHandler(self._dialog))
+            log.info("test")
+
+        def moveEvent(self, event):
+            log.error("An error")
+            log.info("An info with an url http://test")
+            log.warning("A warning with a long long long longlong longlong longlong longlong longlong longlong longlong long message")
+            self._dialog.update()
+
+        def resizeEvent(self, event):
+            self._dialog.update()
+
+    main = MainWindow()
+    main.setMinimumWidth(600)
+    main.setMinimumHeight(600)
+    main.show()
+    exit_code = app.exec_()

gns3/dialogs/project_dialog.py

@@ -144,7 +144,7 @@ class ProjectDialog(QtWidgets.QDialog, Ui_ProjectDialog):
 
     def _duplicateCallback(self, result, error=False, **kwargs):
         if error:
-            log.error("Error while duplicate project: {}".format(result["message"]))
+            log.error("Error while duplicating project: {}".format(result["message"]))
             return
         Controller.instance().refreshProjectList()
 

gns3/dialogs/setup_wizard.py

@@ -86,9 +86,9 @@ class SetupWizard(QtWidgets.QWizard, Ui_SetupWizard):
                 self.uiLocalServerHostComboBox.addItem(address_string, address.toString())
 
         if sys.platform.startswith("darwin"):
-            self.uiVMwareBannerButton.setIcon(QtGui.QIcon(":/images/vmware_fusion_banner.jpg"))
+            self.uiVMwareBannerButton.setIcon(QtGui.QIcon(":/images/vmware_fusion_banner.png"))
         else:
-            self.uiVMwareBannerButton.setIcon(QtGui.QIcon(":/images/vmware_workstation_banner.jpg"))
+            self.uiVMwareBannerButton.setIcon(QtGui.QIcon(":/images/vmware_workstation_banner.png"))
 
         if sys.platform.startswith("linux"):
             self.uiVMRadioButton.setText("Run the topologies in an isolated and standard VM")
@@ -116,9 +116,9 @@ class SetupWizard(QtWidgets.QWizard, Ui_SetupWizard):
 
     def _VMwareBannerButtonClickedSlot(self):
         if sys.platform.startswith("darwin"):
-            url = "http://send.onenetworkdirect.net/z/616461/CD225091/"
+            url = "http://send.onenetworkdirect.net/z/621394/CD225091/"
         else:
-            url = "http://send.onenetworkdirect.net/z/616460/CD225091/"
+            url = "http://send.onenetworkdirect.net/z/616207/CD225091/"
         QtGui.QDesktopServices.openUrl(QtCore.QUrl(url))
 
     def _listVMwareVMsSlot(self):
@@ -216,7 +216,6 @@ class SetupWizard(QtWidgets.QWizard, Ui_SetupWizard):
                 self.uiRemoteMainServerUserLineEdit.setText(local_server_settings["user"])
                 self.uiRemoteMainServerPasswordLineEdit.setText(local_server_settings["password"])
             self.uiRemoteMainServerPortSpinBox.setValue(local_server_settings["port"])
-            self.uiRemoteMainServerProtocolComboBox.setCurrentText(local_server_settings["protocol"])
         elif self.page(page_id) == self.uiLocalServerStatusWizardPage:
             self._refreshLocalServerStatusSlot()
 
@@ -331,7 +330,7 @@ class SetupWizard(QtWidgets.QWizard, Ui_SetupWizard):
             local_server_settings["auto_start"] = False
             local_server_settings["host"] = self.uiRemoteMainServerHostLineEdit.text()
             local_server_settings["port"] = self.uiRemoteMainServerPortSpinBox.value()
-            local_server_settings["protocol"] = self.uiRemoteMainServerProtocolComboBox.currentText()
+            local_server_settings["protocol"] = "http"
             local_server_settings["user"] = self.uiRemoteMainServerUserLineEdit.text()
             local_server_settings["password"] = self.uiRemoteMainServerPasswordLineEdit.text()
             local_server_settings["auth"] = self.uiRemoteMainServerAuthCheckBox.isChecked()

gns3/dialogs/snapshots_dialog.py

@@ -22,6 +22,8 @@ Dialog to manage the snapshots.
 from ..qt import QtCore, QtWidgets
 from ..ui.snapshots_dialog_ui import Ui_SnapshotsDialog
 from ..controller import Controller
+from ..utils.progress_dialog import ProgressDialog
+from ..utils.create_snapshot_worker import CreateSnapshotWorker
 
 from datetime import datetime
 
@@ -85,15 +87,21 @@ class SnapshotsDialog(QtWidgets.QDialog, Ui_SnapshotsDialog):
 
         snapshot_name, ok = QtWidgets.QInputDialog.getText(self, "Snapshot", "Snapshot name:", QtWidgets.QLineEdit.Normal, "Unnamed")
         if ok and snapshot_name and self._project:
-            Controller.instance().post("/projects/{}/snapshots".format(self._project.id()), self._createSnapshotsCallback, {"name": snapshot_name})
+            snapshot_worker = CreateSnapshotWorker(self._project, snapshot_name)
+            snapshot_worker.finished.connect(self._createSnapshotsCallback)
 
-    def _createSnapshotsCallback(self, result, error=False, server=None, context={}, **kwargs):
-        if error:
-            if result:
-                log.error(result["message"])
-            return
+            progress_dialog = ProgressDialog(snapshot_worker, "Snapshot progress", "Creation of snapshot in progress...",
+                                             "Cancel", busy=True, parent=self, create_thread=False, cancelable=True)
+            progress_dialog.show()
+            progress_dialog.exec_()
+
+
+    def _createSnapshotsCallback(self):
         self._listSnapshots()
 
+    def _createSnapshotsErrorCallback(self, message, error):
+        log.error(message)
+
     def _deleteSnapshotSlot(self):
         """
         Slot to delete a snapshot.
@@ -131,7 +139,7 @@ class SnapshotsDialog(QtWidgets.QDialog, Ui_SnapshotsDialog):
         if reply == QtWidgets.QMessageBox.Cancel:
             return
 
-        Controller.instance().post("/projects/{}/snapshots/{}/restore".format(self._project.id(), snapshot_id), self._restoreSnapshotsCallback)
+        Controller.instance().post("/projects/{}/snapshots/{}/restore".format(self._project.id(), snapshot_id), self._restoreSnapshotsCallback, timeout=300)
 
     def _restoreSnapshotsCallback(self, result, error=False, server=None, context={}, **kwargs):
         if error:

gns3/dialogs/style_editor_dialog.py

@@ -21,6 +21,7 @@ Style editor to edit Shape items.
 
 from ..qt import QtCore, QtWidgets, QtGui
 from ..ui.style_editor_dialog_ui import Ui_StyleEditorDialog
+from ..items.shape_item import ShapeItem
 
 
 class StyleEditorDialog(QtWidgets.QDialog, Ui_StyleEditorDialog):
@@ -52,12 +53,18 @@ class StyleEditorDialog(QtWidgets.QDialog, Ui_StyleEditorDialog):
         # use the first item in the list as the model
         first_item = items[0]
         pen = first_item.pen()
-        brush = first_item.brush()
-        self._color = brush.color()
-        self.uiColorPushButton.setStyleSheet("background-color: rgba({}, {}, {}, {});".format(self._color.red(),
-                                                                                              self._color.green(),
-                                                                                              self._color.blue(),
-                                                                                              self._color.alpha()))
+        if hasattr(first_item, "brush"):  # Line don't have brush
+            brush = first_item.brush()
+            self._color = brush.color()
+            self.uiColorPushButton.setStyleSheet("background-color: rgba({}, {}, {}, {});".format(self._color.red(),
+                                                                                                  self._color.green(),
+                                                                                                  self._color.blue(),
+                                                                                                  self._color.alpha()))
+        else:
+            self.uiColorLabel.hide()
+            self.uiColorPushButton.hide()
+            self._color = None
+
         self._border_color = pen.color()
         self.uiBorderColorPushButton.setStyleSheet("background-color: rgba({}, {}, {}, {});".format(self._border_color.red(),
                                                                                                     self._border_color.green(),
@@ -102,11 +109,17 @@ class StyleEditorDialog(QtWidgets.QDialog, Ui_StyleEditorDialog):
 
         border_style = QtCore.Qt.PenStyle(self.uiBorderStyleComboBox.itemData(self.uiBorderStyleComboBox.currentIndex()))
         pen = QtGui.QPen(self._border_color, self.uiBorderWidthSpinBox.value(), border_style, QtCore.Qt.RoundCap, QtCore.Qt.RoundJoin)
-        brush = QtGui.QBrush(self._color)
+        if self._color:
+            brush = QtGui.QBrush(self._color)
+        else:
+            brush = None
 
         for item in self._items:
             item.setPen(pen)
-            item.setBrush(brush)
+            # on multiselection it's possible to select many type of items
+            # but brush can be applied only on ShapeItem,
+            if brush and isinstance(item, ShapeItem):
+                item.setBrush(brush)
             item.setRotation(self.uiRotationSpinBox.value())
 
     def done(self, result):

gns3/graphics_view.py

@@ -22,7 +22,7 @@ Graphical view on the scene where items are drawn.
 import logging
 import os
 import sip
-import pickle
+import sys
 
 from .qt import QtCore, QtGui, QtNetwork, QtWidgets, qpartial, qslot
 from .items.node_item import NodeItem
@@ -31,8 +31,10 @@ from .link import Link
 from .node import Node
 from .modules import MODULES
 from .modules.module_error import ModuleError
+from .modules.builtin import Builtin
 from .settings import GRAPHICS_VIEW_SETTINGS
 from .topology import Topology
+from .appliance_manager import ApplianceManager
 from .dialogs.style_editor_dialog import StyleEditorDialog
 from .dialogs.text_editor_dialog import TextEditorDialog
 from .dialogs.symbol_selection_dialog import SymbolSelectionDialog
@@ -55,6 +57,7 @@ from .items.text_item import TextItem
 from .items.shape_item import ShapeItem
 from .items.drawing_item import DrawingItem
 from .items.rectangle_item import RectangleItem
+from .items.line_item import LineItem
 from .items.ellipse_item import EllipseItem
 from .items.image_item import ImageItem
 
@@ -82,6 +85,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
         self._adding_note = False
         self._adding_rectangle = False
         self._adding_ellipse = False
+        self._adding_line = False
         self._newlink = None
         self._dragging = False
         self._last_mouse_position = None
@@ -113,6 +117,16 @@ class GraphicsView(QtWidgets.QGraphicsView):
     def setSceneSize(self, width, height):
         self.scene().setSceneRect(-(width / 2), -(height / 2), width, height)
 
+    def setZoom(self, zoom):
+        """
+        Sets zoom of the Graphics View
+        :param zoom:
+        :return:
+        """
+        if zoom:
+            factor = zoom / 100.
+            self.scale(factor, factor)
+
     def setEnabled(self, enabled):
 
         if enabled is False:
@@ -122,6 +136,8 @@ class GraphicsView(QtWidgets.QGraphicsView):
             self.scene().addItem(item)
         super().setEnabled(enabled)
 
+        self.toggleUiDeviceMenu()
+
     def reset(self):
         """
         Remove all the items from the scene and
@@ -233,6 +249,20 @@ class GraphicsView(QtWidgets.QGraphicsView):
             self._adding_ellipse = False
             self.setCursor(QtCore.Qt.ArrowCursor)
 
+    def addLine(self, state):
+        """
+        Adds a line.
+
+        :param state: boolean
+        """
+
+        if state:
+            self._adding_line = True
+            self.setCursor(QtCore.Qt.PointingHandCursor)
+        else:
+            self._adding_line = False
+            self.setCursor(QtCore.Qt.ArrowCursor)
+
     def addImage(self, image_path):
         """
         Adds an image.
@@ -437,9 +467,17 @@ class GraphicsView(QtWidgets.QGraphicsView):
             self._main_window.uiDrawEllipseAction.setChecked(False)
             self.setCursor(QtCore.Qt.ArrowCursor)
             self._adding_ellipse = False
+        elif event.button() == QtCore.Qt.LeftButton and self._adding_line:
+            pos = self.mapToScene(event.pos())
+            self.createDrawingItem("line", pos.x(), pos.y(), 0)
+            self._main_window.uiDrawLineAction.setChecked(False)
+            self.setCursor(QtCore.Qt.ArrowCursor)
+            self._adding_line = False
         else:
             super().mousePressEvent(event)
 
+        self.toggleUiDeviceMenu()
+
     def mouseReleaseEvent(self, event):
         """
         Handles all mouse release events.
@@ -462,6 +500,8 @@ class GraphicsView(QtWidgets.QGraphicsView):
                 item.setSelected(True)
             super().mouseReleaseEvent(event)
 
+        self.toggleUiDeviceMenu()
+
     def wheelEvent(self, event):
         """
         Handles zoom in or out using the mouse wheel.
@@ -474,6 +514,8 @@ class GraphicsView(QtWidgets.QGraphicsView):
             if delta is not None and delta.x() == 0:
                 # CTRL is pressed then use the mouse wheel to zoom in or out.
                 self.scaleView(pow(2.0, delta.y() / 240.0))
+                self._topology.project().setZoom(round(self.transform().m11() * 100))
+                self._topology.project().update()
         else:
             super().wheelEvent(event)
 
@@ -486,6 +528,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
         if factor < 0.10 or factor > 10:
             return
         self.scale(scale_factor, scale_factor)
+        self._main_window.uiStatusBar.showMessage("Zoom: {}%".format(round(self.transform().m11() * 100)), 2000)
 
     def keyPressEvent(self, event):
         """
@@ -554,6 +597,8 @@ class GraphicsView(QtWidgets.QGraphicsView):
                     self.configureSlot()
                     return
                 else:
+                    if sys.platform.startswith("win") and item.node().bringToFront():
+                        return
                     self.consoleFromItems(self.scene().selectedItems())
                     return
             elif isinstance(item, NoteItem) and isinstance(item.parentItem(), NodeItem):
@@ -587,7 +632,8 @@ class GraphicsView(QtWidgets.QGraphicsView):
         """
 
         # check if what is dragged is handled by this view
-        if event.mimeData().hasFormat("application/x-gns3-node") or event.mimeData().hasFormat("text/uri-list"):
+        if event.mimeData().hasFormat("text/uri-list") \
+                or event.mimeData().hasFormat("application/x-gns3-appliance"):
             event.acceptProposedAction()
             event.accept()
         else:
@@ -601,10 +647,8 @@ class GraphicsView(QtWidgets.QGraphicsView):
         """
 
         # check if what has been dropped is handled by this view
-        if event.mimeData().hasFormat("application/x-gns3-node"):
-            data = event.mimeData().data("application/x-gns3-node")
-            # load the pickled node data
-            node_data = pickle.loads(data)
+        if event.mimeData().hasFormat("application/x-gns3-appliance"):
+            appliance_id = event.mimeData().data("application/x-gns3-appliance").data().decode()
             event.setDropAction(QtCore.Qt.CopyAction)
             event.accept()
             if event.keyboardModifiers() == QtCore.Qt.ShiftModifier:
@@ -615,12 +659,12 @@ class GraphicsView(QtWidgets.QGraphicsView):
                     for node_number in range(integer):
                         x = event.pos().x() - (150 / 2) + (node_number % max_nodes_per_line) * offset
                         y = event.pos().y() - (70 / 2) + (node_number // max_nodes_per_line) * offset
-                        node_item = self.createNode(node_data, QtCore.QPoint(x, y))
-                        if node_item is None:
-                            # stop if there is any error
+                        if self.createNodeFromApplianceId(appliance_id, QtCore.QPoint(x, y)) is False:
+                            event.ignore()
                             break
             else:
-                self.createNode(node_data, event.pos())
+                if self.createNodeFromApplianceId(appliance_id, event.pos()) is False:
+                    event.ignore()
         elif event.mimeData().hasFormat("text/uri-list") and event.mimeData().hasUrls():
             # This should not arrive but we received bug report with it...
             if len(event.mimeData().urls()) == 0:
@@ -678,6 +722,12 @@ class GraphicsView(QtWidgets.QGraphicsView):
             change_symbol_action.triggered.connect(self.changeSymbolActionSlot)
             menu.addAction(change_symbol_action)
 
+        if True in list(map(lambda item: isinstance(item, DrawingItem) or isinstance(item, NodeItem), items)):
+            duplicate_action = QtWidgets.QAction("Duplicate", menu)
+            duplicate_action.setIcon(QtGui.QIcon(':/icons/new.svg'))
+            duplicate_action.triggered.connect(self.duplicateActionSlot)
+            menu.addAction(duplicate_action)
+
         if True in list(map(lambda item: isinstance(item, NodeItem) and hasattr(item.node(), "nodeDir"), items)):
             # Action: Show in file manager
             show_in_file_manager_action = QtWidgets.QAction("Show in file manager", menu)
@@ -703,6 +753,13 @@ class GraphicsView(QtWidgets.QGraphicsView):
             aux_console_action.triggered.connect(self.auxConsoleActionSlot)
             menu.addAction(aux_console_action)
 
+        if sys.platform.startswith("win") and True in list(map(lambda item: isinstance(item, NodeItem) and hasattr(item.node(), "bringToFront"), items)):
+            # Action: bring console or window to front (Windows only)
+            bring_to_front_action = QtWidgets.QAction("Bring to front", menu)
+            bring_to_front_action.setIcon(QtGui.QIcon(':/icons/front.svg'))
+            bring_to_front_action.triggered.connect(self.bringToFrontSlot)
+            menu.addAction(bring_to_front_action)
+
         if True in list(map(lambda item: isinstance(item, NodeItem) and hasattr(item.node(), "configFiles"), items)):
             import_config_action = QtWidgets.QAction("Import config", menu)
             import_config_action.setIcon(QtGui.QIcon(':/icons/import_config.svg'))
@@ -757,12 +814,6 @@ class GraphicsView(QtWidgets.QGraphicsView):
             reload_action.triggered.connect(self.reloadActionSlot)
             menu.addAction(reload_action)
 
-        if True in list(map(lambda item: isinstance(item, DrawingItem), items)):
-            duplicate_action = QtWidgets.QAction("Duplicate", menu)
-            duplicate_action.setIcon(QtGui.QIcon(':/icons/new.svg'))
-            duplicate_action.triggered.connect(self.duplicateActionSlot)
-            menu.addAction(duplicate_action)
-
         if True in list(map(lambda item: isinstance(item, NoteItem), items)):
             text_edit_action = QtWidgets.QAction("Text edit", menu)
             text_edit_action.setIcon(QtGui.QIcon(':/icons/show-hostname.svg'))
@@ -775,7 +826,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
             text_edit_action.triggered.connect(self.textEditActionSlot)
             menu.addAction(text_edit_action)
 
-        if True in list(map(lambda item: isinstance(item, ShapeItem), items)):
+        if True in list(map(lambda item: isinstance(item, ShapeItem) or isinstance(item, LineItem), items)):
             style_action = QtWidgets.QAction("Style", menu)
             style_action.setIcon(QtGui.QIcon(':/icons/drawing.svg'))
             style_action.triggered.connect(self.styleActionSlot)
@@ -952,6 +1003,11 @@ class GraphicsView(QtWidgets.QGraphicsView):
             # returns True to ignore this node.
             return True
 
+        # TightVNC has lack support of IPv6 host at this moment
+        if "vncviewer" in node.consoleCommand() and ":" in node.consoleHost():
+            QtWidgets.QMessageBox.warning(
+                self, "TightVNC", "TightVNC (vncviewer) may not start because of lack of IPv6 support.")
+
         try:
             node.openConsole(aux=aux)
         except (OSError, ValueError) as e:
@@ -989,6 +1045,15 @@ class GraphicsView(QtWidgets.QGraphicsView):
             self._main_window.run_later(counter, callback)
             counter += delay
 
+    def consoleFromAllItems(self):
+        """
+        Console from all scene items, except builtin devices.
+        """
+
+        items = [item for item in self.scene().items()
+                 if not (isinstance(item, NodeItem) and isinstance(item.node().module(), Builtin))]
+        self.consoleFromItems(items)
+
     def consoleActionSlot(self):
         """
         Slot to receive events from the console action in the
@@ -1006,7 +1071,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
         console_type = "telnet"
         for item in self.scene().selectedItems():
             if isinstance(item, NodeItem) and hasattr(item.node(), "console") and item.node().initialized() and item.node().status() == Node.started:
-                if item.node().consoleType() not in ("telnet", "serial", "vnc"):
+                if item.node().consoleType() not in ("telnet", "serial", "vnc", "spice"):
                     continue
                 current_cmd = item.node().consoleCommand()
                 console_type = item.node().consoleType()
@@ -1016,7 +1081,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
             for item in self.scene().selectedItems():
                 if isinstance(item, NodeItem) and hasattr(item.node(), "console") and item.node().initialized() and item.node().status() == Node.started:
                     node = item.node()
-                    if node.consoleType() not in ("telnet", "serial", "vnc"):
+                    if node.consoleType() not in ("telnet", "serial", "vnc", "spice"):
                         continue
                     try:
                         node.openConsole(command=cmd)
@@ -1091,6 +1156,8 @@ class GraphicsView(QtWidgets.QGraphicsView):
                                                             self._import_config_dir,
                                                             "All files (*.*);;Config files (*.cfg)",
                                                             "Config files (*.cfg)")
+            if not path:
+                continue
             self._import_config_dir = os.path.dirname(path)
             item.node().importFile(config_file, path)
 
@@ -1138,12 +1205,9 @@ class GraphicsView(QtWidgets.QGraphicsView):
         for item in items:
             for config_file in item.node().configFiles():
                 path, ok = QtWidgets.QFileDialog.getSaveFileName(self, "Export file", os.path.join(self._export_configs_to_dir, item.node().name() + "_" + os.path.basename(config_file)), "All files (*.*);;Config files (*.cfg)")
-
                 if not path:
                     continue
-
                 self._export_configs_to_dir = os.path.dirname(path)
-
                 item.node().exportFile(config_file, path)
 
     def getCommandLineSlot(self):
@@ -1171,6 +1235,16 @@ class GraphicsView(QtWidgets.QGraphicsView):
                 dialog.show()
                 dialog.exec_()
 
+    def bringToFrontSlot(self):
+        """
+        Slot to receive events from the bring to front action in the
+        contextual menu.
+        """
+
+        for item in self.scene().selectedItems():
+            if isinstance(item, NodeItem) and hasattr(item.node(), "bringToFront"):
+                item.node().bringToFront()
+
     def idlepcActionSlot(self):
         """
         Slot to receive events from the idlepc action in the
@@ -1195,7 +1269,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
             QtWidgets.QMessageBox.critical(self, "Idle-PC", "Error: {}".format(result["message"]))
         else:
             router = context["router"]
-            log.info("{} has received Idle-PC proposals".format(router.name()))
+            log.debug("{} has received Idle-PC proposals".format(router.name()))
             idlepcs = result
             if idlepcs and idlepcs[0] != "0x0":
                 dialog = IdlePCDialog(router, idlepcs, parent=self)
@@ -1229,7 +1303,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
         else:
             router = context["router"]
             idlepc = result["idlepc"]
-            log.info("{} has received the auto idle-pc value: {}".format(router.name(), idlepc))
+            log.debug("{} has received the auto idle-pc value: {}".format(router.name(), idlepc))
             router.setIdlepc(idlepc)
             # apply Idle-PC to all routers with the same IOS image
             ios_image = os.path.basename(router.settings()["image"])
@@ -1259,6 +1333,8 @@ class GraphicsView(QtWidgets.QGraphicsView):
                 else:
                     type = "image"
                 self.createDrawingItem(type, item.pos().x() + 20, item.pos().y() + 20, item.zValue(), rotation=item.rotation(), svg=item.toSvg())
+            elif isinstance(item, NodeItem):
+                item.node().duplicate(item.pos().x() + 20, item.pos().y() + 20, item.zValue())
 
     def styleActionSlot(self):
         """
@@ -1268,7 +1344,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
 
         items = []
         for item in self.scene().selectedItems():
-            if isinstance(item, ShapeItem):
+            if isinstance(item, ShapeItem) or isinstance(item, LineItem):
                 items.append(item)
         if items:
             style_dialog = StyleEditorDialog(self._main_window, items)
@@ -1393,6 +1469,9 @@ class GraphicsView(QtWidgets.QGraphicsView):
             elif item.parentItem() is None:
                 item.delete()
 
+        self.scene().clearSelection()
+        self.toggleUiDeviceMenu()
+
     def allocateCompute(self, node_data, module_instance):
         """
         Allocates a server.
@@ -1413,48 +1492,18 @@ class GraphicsView(QtWidgets.QGraphicsView):
             raise ModuleError("Please select a server")
         return server
 
-    def createNode(self, node_data, pos):
+    def createNodeFromApplianceId(self, appliance_id, pos):
         """
-        Creates a new node on the scene.
-
-        :param node_data: node data to create a new node
-        :param pos: position of the drop event
-
-        :returns: NodeItem instance
+        Ask the server to create a node using this appliance
         """
-        try:
-            node_module = None
-            for module in MODULES:
-                instance = module.instance()
-                node_class = module.getNodeClass(node_data["class"])
-                if node_class in instance.classes():
-                    node_module = instance
-                    break
-
-            if not node_module:
-                raise ModuleError("Could not find any module for {}".format(node_class))
-            if self._topology.project() is None:
-                return
-            node = node_module.instantiateNode(node_class, self.allocateCompute(node_data, instance), self._topology.project())
-        # If no server is available a ValueError is raised
-        except (ModuleError, ValueError) as e:
-            QtWidgets.QMessageBox.critical(self, "Node creation", "{}".format(e))
-            return
-
         pos = self.mapToScene(pos)
-        node_item = self.createNodeItem(node, node_data["symbol"], pos.x(), pos.y())
-        node.setGraphics(node_item)
-        try:
-            node_module.createNode(node, node_data["name"])
-        except ModuleError as e:
-            QtWidgets.QMessageBox.critical(self, "Node creation", "{}".format(e))
-            return
-        return node_item
+        return ApplianceManager().instance().createNodeFromApplianceId(self._topology.project(), appliance_id, pos.x(), pos.y())
 
     def createNodeItem(self, node, symbol, x, y):
         node.setSymbol(symbol)
         node.setPos(x, y)
         node_item = NodeItem(node)
+
         self.scene().addItem(node_item)
         self._topology.addNode(node)
 
@@ -1470,9 +1519,8 @@ class GraphicsView(QtWidgets.QGraphicsView):
         """
         node = Topology.instance().getNode(node_id)
         name = "Node"
-        if node:
-            if node.name():
-                name = node.name()
+        if node and node.name():
+            name = node.name()
         if self._main_window and not sip.isdeleted(self._main_window):
             QtWidgets.QMessageBox.critical(self._main_window, name, message.strip())
 
@@ -1482,6 +1530,8 @@ class GraphicsView(QtWidgets.QGraphicsView):
             item = EllipseItem(pos=QtCore.QPoint(x, y), z=z, rotation=rotation, project=self._topology.project(), drawing_id=drawing_id, svg=svg)
         elif type == "rect":
             item = RectangleItem(pos=QtCore.QPoint(x, y), z=z, rotation=rotation, project=self._topology.project(), drawing_id=drawing_id, svg=svg)
+        elif type == "line":
+            item = LineItem(pos=QtCore.QPoint(x, y), dst=QtCore.QPoint(200, 0), z=z, rotation=rotation, project=self._topology.project(), drawing_id=drawing_id, svg=svg)
         elif type == "image":
             item = ImageItem(pos=QtCore.QPoint(x, y), z=z, rotation=rotation, project=self._topology.project(), drawing_id=drawing_id, svg=svg)
         elif type == "text":
@@ -1513,3 +1563,11 @@ class GraphicsView(QtWidgets.QGraphicsView):
                 painter.drawLine(rect.left(), y, rect.right(), y)
                 y += gridSize
             painter.restore()
+
+    def toggleUiDeviceMenu(self):
+        """ Hook which enables/disables uiDeviceMenu based on the current items selection"""
+        items = self.scene().selectedItems()
+        if len(items) > 0:
+            self._main_window.uiDeviceMenu.setEnabled(True)
+        else:
+            self._main_window.uiDeviceMenu.setEnabled(False)

gns3/http_client.py

@@ -25,9 +25,11 @@ import base64
 import datetime
 import ipaddress
 import urllib.request
+import urllib.parse
+
 
 from .version import __version__, __version_info__
-from .qt import QtCore, QtNetwork, qpartial, sip_is_deleted
+from .qt import QtCore, QtNetwork, qpartial, sip_is_deleted, QtWebSockets
 from .utils import parse_version
 
 import logging
@@ -49,17 +51,13 @@ class HTTPClient(QtCore.QObject):
     :param network_manager: A QT network manager
     """
 
-    # How many times we need to retry a connection
-    MAX_RETRY_CONNECTION = 5
-
     # Callback class used for displaying progress
     _progress_callback = None
 
     connection_connected_signal = QtCore.Signal()
     connection_disconnected_signal = QtCore.Signal()
 
-    def __init__(self, settings, network_manager=None):
-
+    def __init__(self, settings, network_manager=None, max_retry_connection=5):
         super().__init__()
 
         self._protocol = settings.get("protocol", "http")
@@ -74,8 +72,9 @@ class HTTPClient(QtCore.QObject):
         self._port = int(settings["port"])
         self._user = settings.get("user", None)
         self._password = settings.get("password", None)
-        # How many time we have retry connection
+        # How many time we have already retried connection
         self._retry = 0
+        self._max_retry_connection = max_retry_connection
         self._connected = False
         self._shutdown = False  # Shutdown in progress
         self._accept_insecure_certificate = settings.get("accept_insecure_certificate", None)
@@ -84,7 +83,6 @@ class HTTPClient(QtCore.QObject):
         # query and disconnect if time is too long between two query
         self._last_query_timestamp = None
         self._max_time_difference_between_queries = None
-
         if network_manager:
             self._network_manager = network_manager
         else:
@@ -95,6 +93,8 @@ class HTTPClient(QtCore.QObject):
         # List of query waiting for the connection
         self._query_waiting_connections = []
 
+        self._websocket = QtWebSockets.QWebSocket()
+
     def setMaxTimeDifferenceBetweenQueries(self, value):
         self._max_time_difference_between_queries = value
 
@@ -167,6 +167,25 @@ class HTTPClient(QtCore.QObject):
         self.createHTTPQuery("POST", "/shutdown", None, showProgress=False)
         self._shutdown = True
 
+    def getNetworkManager(self):
+        """
+        :return: instance of NetworkManager
+        """
+        return self._network_manager
+
+    def setMaxRetryConnection(self, retries):
+        """
+        Sets how many times we need to retry a connection
+        :param retries: integer
+        """
+        self._max_retry_connection = retries
+
+    def getMaxRetryConnection(self):
+        """
+        Returns how many times we need to retry a connection
+        """
+        return self._max_retry_connection
+
     def _notify_progress_start_query(self, query_id, progress_text, response):
         """
         Called when a query start
@@ -190,7 +209,7 @@ class HTTPClient(QtCore.QObject):
         Called when a query upload progress
         """
         if not sip_is_deleted(HTTPClient._progress_callback):
-            HTTPClient._progress_callback.progress_signal.emit(query_id, sent, total)
+            HTTPClient._progress_callback.progress_signal.emit(query_id, str(sent), str(total))
 
     def _notify_progress_download(self, query_id, sent, total):
         """
@@ -199,7 +218,7 @@ class HTTPClient(QtCore.QObject):
         if not sip_is_deleted(HTTPClient._progress_callback):
             # abs() for maxium because sometimes the system send negative
             # values
-            HTTPClient._progress_callback.progress_signal.emit(query_id, sent, abs(total))
+            HTTPClient._progress_callback.progress_signal.emit(query_id, str(sent), str(abs(total)))
 
     @classmethod
     def setProgressCallback(cls, progress_callback):
@@ -253,6 +272,7 @@ class HTTPClient(QtCore.QObject):
                         prefix="/v2",
                         params={},
                         networkManager=None,
+                        eventsHandler=None,
                         **kwargs):
         """
         Call the remote server, if not connected, check connection before
@@ -270,6 +290,8 @@ class HTTPClient(QtCore.QObject):
         :param timeout: Delay in seconds before raising a timeout
         :param prefix: Prefix to the path
         :param networkManager: QNetworkAccessManager None use the default
+        :param eventsHandler: Handler receiving and triggering events like `updated`, `cancelled`.
+                              If not specified and showProgress is `True` then `ProgressDialog` receives them.
         :param params: Query arguments parameters
         :returns: QNetworkReply
         """
@@ -301,16 +323,17 @@ class HTTPClient(QtCore.QObject):
                            server=server,
                            timeout=timeout,
                            prefix=prefix,
+                           eventsHandler=eventsHandler,
                            params=params)
 
         if self._connected:
             return request()
         else:
             self._query_waiting_connections.append((request, callback))
-            # If we are not connected and we enqueue the first query we open the conection
+            # enqueue the first query and open the connection if we are not connected
             if len(self._query_waiting_connections) == 1:
-                log.info("Connection to {}".format(self.url()))
-                self._executeHTTPQuery("GET", "/version", self._callbackConnect, {}, server=server, timeout=5, showProgress=False)
+                log.debug("Connection to {}".format(self.url()))
+                self._executeHTTPQuery("GET", "/version", self._callbackConnect, {}, server=server, timeout=10, showProgress=False)
 
     def _connectionError(self, callback, msg="", server=None):
         """
@@ -327,7 +350,7 @@ class HTTPClient(QtCore.QObject):
             msg = "Cannot connect to {}. Please check if GNS3 is allowed in your antivirus and firewall. And that server version is {}.".format(self.url(), __version__)
         for request, callback in self._query_waiting_connections:
             if callback is not None:
-                callback({"message": msg}, error=True, server=server)
+                callback({"message": msg}, error=True, server=server, connection_error=True)
         self._query_waiting_connections = []
 
     def _retryConnection(self, server=None):
@@ -347,7 +370,7 @@ class HTTPClient(QtCore.QObject):
         """
 
         if error is not False:
-            if self._retry < self.MAX_RETRY_CONNECTION:
+            if self._retry < self.getMaxRetryConnection():
                 self._retryConnection(server=server)
                 return
             for request, callback in self._query_waiting_connections:
@@ -356,7 +379,7 @@ class HTTPClient(QtCore.QObject):
             return
 
         if "version" not in params or "local" not in params:
-            if self._retry < self.MAX_RETRY_CONNECTION:
+            if self._retry < self.getMaxRetryConnection():
                 self._retryConnection(server=server)
                 return
             msg = "The remote server {} is not a GNS3 server".format(self.url())
@@ -368,21 +391,22 @@ class HTTPClient(QtCore.QObject):
             return
 
         if params["version"].split("-")[0] != __version__.split("-")[0]:
-            msg = "Client version {} differs with server version {}".format(__version__, params["version"])
-            log.error(msg)
+            msg = "Client version {} is not the same as server version {}".format(__version__, params["version"])
             # Stable release
             if __version_info__[3] == 0:
+                log.error(msg)
                 for request, callback in self._query_waiting_connections:
                     if callback is not None:
                         callback({"message": msg}, error=True, server=server)
                 return
             # We don't allow different major version to interact even with dev build
             elif parse_version(__version__)[:2] != parse_version(params["version"])[:2]:
+                log.error(msg)
                 for request, callback in self._query_waiting_connections:
                     if callback is not None:
                         callback({"message": msg}, error=True, server=server)
                 return
-            log.warning("Use a different client and server version can create bugs. Use it at your own risk.")
+            log.warning("{}\nUsing different versions may result in unexpected problems. Please use at your own risk.".format(msg))
 
         self._connected = True
         self._retry = 0
@@ -441,7 +465,47 @@ class HTTPClient(QtCore.QObject):
             request.setRawHeader(b"Authorization", auth_string.encode())
         return request
 
-    def _executeHTTPQuery(self, method, path, callback, body, context={}, downloadProgressCallback=None, showProgress=True, ignoreErrors=False, progressText=None, server=None, timeout=120, prefix="/v2", params={}, networkManager=None, **kwargs):
+    def connectWebSocket(self, path, prefix="/v2"):
+        """
+        Path of the websocket endpoint
+        """
+        host = self._getHostForQuery()
+        request = self._websocket.request()
+        request.setUrl(QtCore.QUrl("ws://{host}:{port}{prefix}{path}".format(host=host, port=self._port, path=path, prefix=prefix)))
+        self._addAuth(request)
+        self._websocket.open(request)
+        return self._websocket
+
+    def _getHostForQuery(self):
+        """
+        Get hostname that could be use by Qt
+        """
+        try:
+            ip = self._host.rsplit('%', 1)[0]
+            ipaddress.IPv6Address(ip)  # remove any scope ID
+            # this is an IPv6 address, we must surround it with brackets to be used with QUrl.
+            host = "[{}]".format(ip)
+        except ipaddress.AddressValueError:
+            host = self._host
+        return host
+
+    def _paramsToQueryString(self, params):
+        """
+        :param params: Dictionnary of query string parameters
+        :returns: String of the query string
+        """
+        if params == {}:
+            query_string = ""
+        else:
+            query_string = "?"
+            params = params.copy()
+            for key, value in params.copy().items():
+                if value is None:
+                    del params[key]
+            query_string += urllib.parse.urlencode(params)
+        return query_string
+
+    def _executeHTTPQuery(self, method, path, callback, body, context={}, downloadProgressCallback=None, showProgress=True, ignoreErrors=False, progressText=None, server=None, timeout=120, prefix="/v2", params={}, networkManager=None, eventsHandler=None, **kwargs):
         """
         Call the remote server
 
@@ -457,22 +521,14 @@ class HTTPClient(QtCore.QObject):
         :param ignoreErrors: Ignore connection error (usefull to not closing a connection when notification feed is broken)
         :param server: The server where the query is executed
         :param timeout: Delay in seconds before raising a timeout
+        :param eventsHandler: Handler receiving and triggering events like `updated`, `cancelled`.
+                      If not specified and showProgress is `True` then `ProgressDialog` receives them.
         :param params: Query arguments parameters
         :returns: QNetworkReply
         """
 
-        try:
-            ip = self._host.rsplit('%', 1)[0]
-            ipaddress.IPv6Address(ip)  # remove any scope ID
-            # this is an IPv6 address, we must surround it with brackets to be used with QUrl.
-            host = "[{}]".format(ip)
-        except ipaddress.AddressValueError:
-            host = self._host
-
-        if params == {}:
-            query_string = ""
-        else:
-            query_string = "?" + urllib.parse.urlencode(params)
+        host = self._getHostForQuery()
+        query_string = self._paramsToQueryString(params)
 
         log.debug("{method} {protocol}://{host}:{port}{prefix}{path} {body}{query_string}".format(method=method, protocol=self._protocol, host=host, port=self._port, path=path, body=body, prefix=prefix, query_string=query_string))
         if self._user:
@@ -491,7 +547,11 @@ class HTTPClient(QtCore.QObject):
         if not networkManager:
             networkManager = self._network_manager
 
-        response = networkManager.sendCustomRequest(request, method.encode(), body)
+        try:
+            response = networkManager.sendCustomRequest(request, method.encode(), body)
+        except SystemError as e:
+            log.error("Can't send query: {}".format(str(e)))
+            return
 
         context = copy.copy(context)
         context["query_id"] = str(uuid.uuid4())
@@ -502,8 +562,11 @@ class HTTPClient(QtCore.QObject):
         if downloadProgressCallback is not None:
             response.readyRead.connect(qpartial(self._readyReadySlot, response, downloadProgressCallback, context, server))
 
-        if not sip_is_deleted(HTTPClient._progress_callback) and HTTPClient._progress_callback.progress_dialog():
-            request_canceled = qpartial(self._requestCanceled, response, context)
+        request_canceled = qpartial(self._requestCanceled, response, context)
+
+        if eventsHandler is not None:
+            eventsHandler.canceled.connect(request_canceled)
+        elif not sip_is_deleted(HTTPClient._progress_callback) and HTTPClient._progress_callback.progress_dialog():
             HTTPClient._progress_callback.progress_dialog().canceled.connect(request_canceled)
 
         if showProgress:
@@ -514,7 +577,7 @@ class HTTPClient(QtCore.QObject):
             self._notify_progress_start_query(context["query_id"], progressText, response)
 
         if timeout is not None:
-            QtCore.QTimer.singleShot(timeout * 1000, qpartial(self._timeoutSlot, response))
+            QtCore.QTimer.singleShot(timeout * 1000, qpartial(self._timeoutSlot, response, timeout))
 
         return response
 
@@ -549,14 +612,14 @@ class HTTPClient(QtCore.QObject):
         else:
             callback(content, server=server, context=context)
 
-    def _timeoutSlot(self, response):
+    def _timeoutSlot(self, response, timeout):
         """
         Beware it's call for all request you need to check the status of the response
         """
         # We check if we received HTTP headers
         if not sip.isdeleted(response) and response.isRunning() and not len(response.rawHeaderList()) > 0:
             if not response.error() != QtNetwork.QNetworkReply.NoError:
-                log.warn("Timeout request {}".format(response.url().toString()))
+                log.warning("Timeout after {} seconds for request {}".format(timeout, response.url().toString()))
                 response.abort()
 
     def disconnect(self):
@@ -607,7 +670,7 @@ class HTTPClient(QtCore.QObject):
                 if not body or content_type != "application/json":
                     callback({"message": error_message}, error=True, server=server, context=context)
                 else:
-                    log.debug(body)
+                    # log.debug(body)
                     try:
                         callback(json.loads(body), error=True, server=server, context=context)
                     except ValueError:
@@ -637,9 +700,12 @@ class HTTPClient(QtCore.QObject):
             except UnicodeDecodeError:
                 body = None
             content_type = response.header(QtNetwork.QNetworkRequest.ContentTypeHeader)
-            log.debug(body)
             if body and len(body.strip(" \n\t")) > 0 and content_type == "application/json":
-                params = json.loads(body)
+                try:
+                    params = json.loads(body)
+                except ValueError:  # Partial JSON
+                    params = {}
+                    status = 504
             else:
                 params = {}
             if callback is not None:
@@ -698,3 +764,23 @@ class HTTPClient(QtCore.QObject):
         except (OSError, http.client.BadStatusLine, ValueError) as e:
             log.debug("Error during get on {}:{}: {}".format(self.host(), self.port(), e))
         return 0, None
+
+    @classmethod
+    def fromUrl(cls, url, network_manager=None, base_settings=None):
+        """
+        Returns HttpClient instance based on the url
+        :param url: Url to parse
+        :param network_manager: Optional network_manager
+        :param base_settings: Source of the settings, if necessary
+        :return: HttpClient
+        """
+        settings = {}
+        if base_settings is not None:
+            settings.update(**base_settings)
+        parse_results = urllib.parse.urlparse(url)
+        settings['protocol'] = parse_results.scheme
+        settings['host'] = parse_results.hostname
+        settings['port'] = parse_results.port
+        settings['user'] = parse_results.username
+        settings['password'] = parse_results.password
+        return cls(settings, network_manager)

gns3/image_manager.py

@@ -25,6 +25,7 @@ from gns3.settings import LOCAL_SERVER_SETTINGS
 from gns3.controller import Controller
 from gns3.utils.file_copy_worker import FileCopyWorker
 from gns3.utils.progress_dialog import ProgressDialog
+from gns3.registry.image import Image
 
 
 class ImageManager:
@@ -33,7 +34,29 @@ class ImageManager:
         # Remember if we already ask the user about this image for this server
         self._asked_for_this_image = {}
 
-    def askCopyUploadImage(self, parent, path, server, node_type):
+    def _getUniqueDestinationPath(self, source_image, node_type, path):
+        """
+        Get a unique destination path (with counter).
+        """
+
+        if not os.path.exists(path):
+            return path
+        path, extension = os.path.splitext(path)
+        counter = 1
+        new_path = "{}-{}{}".format(path, counter, extension)
+        while os.path.exists(new_path):
+            destination_image = Image(node_type, new_path, filename=os.path.basename(new_path))
+            try:
+                if source_image.md5sum == destination_image.md5sum:
+                    # the source and destination images are identical
+                    return new_path
+            except OSError:
+                continue
+            counter += 1
+            new_path = "{}-{}{}".format(path, counter, extension)
+        return new_path
+
+    def askCopyUploadImage(self, parent, source_path, server, node_type):
         """
         Ask user for copying the image to the default directory or upload
         it to remote server.
@@ -46,34 +69,51 @@ class ImageManager:
         """
 
         if (server and server != "local") or Controller.instance().isRemote():
-            return self._uploadImageToRemoteServer(path, server, node_type)
+            return self._uploadImageToRemoteServer(source_path, server, node_type)
         else:
             destination_directory = self.getDirectoryForType(node_type)
-            if os.path.normpath(os.path.dirname(path)) != destination_directory:
-                # the IOS image is not in the default images directory
+            destination_path = os.path.join(destination_directory, os.path.basename(source_path))
+            source_filename = os.path.basename(source_path)
+            destination_filename = os.path.basename(destination_path)
+            if os.path.normpath(os.path.dirname(source_path)) != destination_directory:
+                # the image is not in the default images directory
+                if source_filename == destination_filename:
+                    # the filename already exists in the default images directory
+                    source_image = Image(node_type, source_path, filename=source_filename)
+                    destination_image = Image(node_type, destination_path, filename=destination_filename)
+                    try:
+                        if source_image.md5sum == destination_image.md5sum:
+                            # the source and destination images are identical
+                            return source_path
+                    except OSError as e:
+                        QtWidgets.QMessageBox.critical(parent, 'Image', 'Cannot compare image file {} with {}: {}.'.format(source_path, destination_path, str(e)))
+                        return source_path
+                    # find a new unique path to avoid overwriting existing destination file
+                    destination_path = self._getUniqueDestinationPath(source_image, node_type, destination_path)
+
                 reply = QtWidgets.QMessageBox.question(parent,
                                                        'Image',
-                                                       'Would you like to copy {} to the default images directory'.format(os.path.basename(path)),
+                                                       'Would you like to copy {} to the default images directory'.format(source_filename),
                                                        QtWidgets.QMessageBox.Yes,
                                                        QtWidgets.QMessageBox.No)
                 if reply == QtWidgets.QMessageBox.Yes:
-                    destination_path = os.path.join(destination_directory, os.path.basename(path))
                     try:
                         os.makedirs(destination_directory, exist_ok=True)
                     except OSError as e:
                         QtWidgets.QMessageBox.critical(parent, 'Image', 'Could not create destination directory {}: {}'.format(destination_directory, str(e)))
-                        return path
-                    worker = FileCopyWorker(path, destination_path)
-                    progress_dialog = ProgressDialog(worker, 'Image', 'Copying {}'.format(os.path.basename(path)), 'Cancel', busy=True, parent=parent)
+                        return source_path
+
+                    worker = FileCopyWorker(source_path, destination_path)
+                    progress_dialog = ProgressDialog(worker, 'Image', 'Copying {}'.format(source_filename), 'Cancel', busy=True, parent=parent)
                     progress_dialog.show()
                     progress_dialog.exec_()
                     errors = progress_dialog.errors()
                     if errors:
                         QtWidgets.QMessageBox.critical(parent, 'Image', '{}'.format(''.join(errors)))
-                        return path
+                        return source_path
                     else:
-                        path = destination_path
-            return path
+                        source_path = destination_path
+            return source_path
 
     def _uploadImageToRemoteServer(self, path, server, node_type):
         """
@@ -95,22 +135,9 @@ class ImageManager:
             raise Exception('Invalid node type')
 
         filename = self._getRelativeImagePath(path, node_type).replace("\\", "/")
-
         Controller.instance().postCompute('{}/{}'.format(upload_endpoint, filename), server, None, body=pathlib.Path(path), progressText="Uploading {}".format(filename), timeout=None)
         return filename
 
-    def _askForUploadMissingImage(self, filename, server):
-        from gns3.main_window import MainWindow
-        parent = MainWindow.instance()
-        reply = QtWidgets.QMessageBox.warning(parent,
-                                              'Image',
-                                              '{} is missing on server {} but exist on your computer. Do you want to upload it?'.format(filename, server.url()),
-                                              QtWidgets.QMessageBox.Yes,
-                                              QtWidgets.QMessageBox.No)
-        if reply == QtWidgets.QMessageBox.Yes:
-            return True
-        return False
-
     def _getRelativeImagePath(self, path, node_type):
         """
         Get a path relative to images directory path

gns3/image_upload_manager.py

@@ -0,0 +1,91 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2017 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 pathlib
+import urllib.parse
+
+from gns3.http_client import HTTPClient
+
+import logging
+log = logging.getLogger(__name__)
+
+
+class ImageUploadManager(object):
+    """
+    Manager over the image upload. Encapsulates file uploads to computes or via controller.
+    """
+
+    def __init__(self, image, controller, compute_id, callback=None, directFileUpload=False):
+        self._image = image
+        self._compute_id = compute_id
+        self._callback = callback
+        self._directFileUpload = directFileUpload
+        self._controller = controller
+
+    def upload(self):
+        if self._directFileUpload:
+            # first obtain endpoint and know when target request
+            self._controller.getEndpoint(
+                self._getComputePath(), self._compute_id, self._onLoadEndpointCallback, showProgress=False)
+        else:
+            self._fileUploadToController()
+
+    def _getComputePath(self):
+        return '/{emulator}/images/{filename}'.format(
+            emulator=self._image.emulator, filename=self._image.filename)
+
+    def _onLoadEndpointCallback(self, result, error=False, **kwargs):
+        if error:
+            if "message" in result:
+                log.error("Error while getting endpoint: {}".format(result["message"]))
+            return
+
+        # we know where is the endpoint and we trying to post there a file
+        endpoint = result['endpoint']
+        self._fileUploadToCompute(endpoint)
+
+    def _checkIfSuccessfulCallback(self, result, error=False, **kwargs):
+        if error:
+            connection_error = kwargs.get('connection_error', False)
+            if connection_error:
+                log.debug("During direct file upload compute is not visible. Fallback to upload via controller.")
+                # there was an issue with connection, probably we don't have a direct access to compute
+                # we need to fallback to uploading files via controller
+                self._fileUploadToController()
+            else:
+                if "message" in result:
+                    log.error("Error while direct file upload: {}".format(result["message"]))
+            return
+        self._callback(result, error, **kwargs)
+
+    def _fileUploadToCompute(self, endpoint):
+        log.info("Uploading file to compute: {}".format(endpoint))
+
+        parse_results = urllib.parse.urlparse(endpoint)
+        network_manager = self._controller.getHttpClient().getNetworkManager()
+        client = HTTPClient.fromUrl(endpoint, network_manager=network_manager)
+        # We don't retry connection as in case of fail we try direct file upload
+        client.setMaxRetryConnection(0)
+        client.createHTTPQuery(
+            'POST', parse_results.path, self._checkIfSuccessfulCallback, body=pathlib.Path(self._image.path),
+            progressText="Uploading {}".format(self._image.filename), timeout=None, prefix="")
+
+    def _fileUploadToController(self):
+        log.info("Uploading file to controller: {}".format(self._getComputePath()))
+        self._controller.postCompute(
+            self._getComputePath(), self._compute_id, self._callback, body=pathlib.Path(self._image.path),
+            progressText="Uploading {}".format(self._image.filename), timeout=None)

gns3/items/drawing_item.py

@@ -15,7 +15,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from ..qt import QtCore, QtWidgets, qslot
+from ..qt import QtCore, QtWidgets, qslot, QtGui
+from .utils import colorFromSvg
 
 import uuid
 import logging
@@ -24,6 +25,15 @@ log = logging.getLogger(__name__)
 
 
 class DrawingItem:
+    # Map QT stroke to SVG style
+    QT_DASH_TO_SVG = {
+        QtCore.Qt.SolidLine: "",
+        QtCore.Qt.NoPen: None,
+        QtCore.Qt.DashLine: "25, 25",
+        QtCore.Qt.DotLine: "5, 25",
+        QtCore.Qt.DashDotLine: "5, 25, 25",
+        QtCore.Qt.DashDotDotLine: "25, 25, 5, 25, 5"
+    }
 
     show_layer = False
 
@@ -78,7 +88,7 @@ class DrawingItem:
 
     def updateDrawing(self):
         if self._id:
-            self._project.put("/drawings/" + self._id, self.updateDrawingCallback, body=self.__json__())
+            self._project.put("/drawings/" + self._id, self.updateDrawingCallback, body=self.__json__(), showProgress=False)
 
     @qslot
     def updateDrawingCallback(self, result, error=False, **kwargs):
@@ -155,6 +165,7 @@ class DrawingItem:
         """
 
         QtWidgets.QGraphicsItem.setZValue(self, value)
+
         if self.zValue() < 0:
             self.setFlag(self.ItemIsSelectable, False)
             self.setFlag(self.ItemIsMovable, False)
@@ -215,3 +226,48 @@ class DrawingItem:
         painter.setPen(QtCore.Qt.black)
         zval = str(int(self.zValue()))
         painter.drawText(QtCore.QPointF(center.x() - 4, center.y() + 4), zval)
+
+    def _styleSvg(self, element):
+        """
+        Add style from the shape item to the SVG element that we will
+        export
+        """
+        style = ""
+        pen = self.pen()
+        if hasattr(self, "brush"):  # Line don't have a brush
+            element.set("fill", "#{}".format(hex(self.brush().color().rgba())[4:]))
+            element.set("fill-opacity", str(self.brush().color().alphaF()))
+
+        dasharray = self.QT_DASH_TO_SVG[pen.style()]
+        if dasharray is None:  # No border to the element
+            return element
+        elif dasharray == "":
+            pass  # Solid line
+        else:
+            element.set("stroke-dasharray", dasharray)
+        element.set("stroke-width", str(pen.width()))
+        element.set("stroke", "#" + hex(pen.color().rgba())[4:])
+        return element
+
+    def _penFromSVGElement(self, svg):
+        """
+        Get a pen from a SVG element
+
+        :param svg:
+        """
+        pen = QtGui.QPen()
+        if svg.get("stroke-width"):
+            pen.setWidth(int(svg.get("stroke-width")))
+        if svg.get("stroke"):
+            pen.setColor(colorFromSvg(svg.get("stroke")))
+        # Map SVG stroke style (border of the element to the Qt version)
+        if not svg.get("stroke"):
+            pen.setStyle(QtCore.Qt.NoPen)
+        else:
+            pen.setStyle(QtCore.Qt.SolidLine)
+            stroke = svg.get("stroke-dasharray")
+            if stroke:
+                for (qt_stroke, svg_stroke) in self.QT_DASH_TO_SVG.items():
+                    if svg_stroke == stroke:
+                        pen.setStyle(qt_stroke)
+        return pen

gns3/items/ellipse_item.py

@@ -48,6 +48,13 @@ class EllipseItem(QtWidgets.QGraphicsEllipseItem, ShapeItem):
         super().paint(painter, option, widget)
         self.drawLayerInfo(painter)
 
+    def setZValue(self, value):
+        """
+        Sets Z value of the item
+        :param value: z layer
+        """
+        return ShapeItem.setZValue(self, value)
+
     def toSvg(self):
         """
         Return an SVG version of the shape

gns3/items/ethernet_link_item.py

@@ -112,14 +112,14 @@ class EthernetLinkItem(LinkItem):
             if self.length < 100:
                 return
 
-            if self._source_port.status() == Port.started:
+            if self._link.suspended() or self._source_port.status() == Port.suspended:
+                # link or port is suspended
+                color = QtCore.Qt.yellow
+                shape = QtCore.Qt.RoundCap
+            elif self._source_port.status() == Port.started:
                 # port is active
                 color = QtCore.Qt.green
                 shape = QtCore.Qt.RoundCap
-            elif self._source_port.status() == Port.suspended:
-                # port is suspended
-                color = QtCore.Qt.yellow
-                shape = QtCore.Qt.RoundCap
             else:
                 color = QtCore.Qt.red
                 shape = QtCore.Qt.SquareCap
@@ -153,14 +153,14 @@ class EthernetLinkItem(LinkItem):
 
             painter.drawPoint(point1)
 
-            if self._destination_port.status() == Port.started:
+            if self._link.suspended() or self._destination_port.status() == Port.suspended:
+                # link or port is suspended
+                color = QtCore.Qt.yellow
+                shape = QtCore.Qt.RoundCap
+            elif self._destination_port.status() == Port.started:
                 # port is active
                 color = QtCore.Qt.green
                 shape = QtCore.Qt.RoundCap
-            elif self._destination_port.status() == Port.suspended:
-                # port is suspended
-                color = QtCore.Qt.yellow
-                shape = QtCore.Qt.RoundCap
             else:
                 color = QtCore.Qt.red
                 shape = QtCore.Qt.SquareCap
@@ -194,4 +194,4 @@ class EthernetLinkItem(LinkItem):
 
             painter.drawPoint(point2)
 
-        self._drawCaptureSymbol()
+        self._drawSymbol()

gns3/items/image_item.py

@@ -64,6 +64,13 @@ class ImageItem(QtSvg.QGraphicsSvgItem, DrawingItem):
         super().paint(painter, option, widget)
         self.drawLayerInfo(painter)
 
+    def setZValue(self, value):
+        """
+        Sets Z value of the item
+        :param value: z layer
+        """
+        return DrawingItem.setZValue(self, value)
+
     def fromSvg(self, svg):
         renderer = QImageSvgRenderer(svg)
         self.setSharedRenderer(renderer)

gns3/items/line_item.py

@@ -0,0 +1,223 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2014 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/>.
+
+"""
+Graphical representation of a rectangle on the QGraphicsScene.
+"""
+
+import xml.etree.ElementTree as ET
+
+from ..qt import QtCore, QtGui, QtWidgets
+from .drawing_item import DrawingItem
+
+
+class LineItem(QtWidgets.QGraphicsLineItem, DrawingItem):
+
+    """
+    Class to draw a rectangle on the scene.
+    """
+
+    def __init__(self, dst=None, svg=None, **kws):
+        super().__init__(svg=svg, **kws)
+        self.setAcceptHoverEvents(True)
+
+        self._edge = None
+        self._border = 20
+
+        if svg is None:
+            if dst is not None:
+                self.setLine(0,
+                             0,
+                             dst.x(),
+                             dst.y())
+                pen = QtGui.QPen(QtCore.Qt.black, 2, QtCore.Qt.SolidLine, QtCore.Qt.RoundCap, QtCore.Qt.RoundJoin)
+                self.setPen(pen)
+        else:
+            self.fromSvg(svg)
+        if self._id is None:
+            self.create()
+
+    def paint(self, painter, option, widget=None):
+        """
+        Paints the contents of an item in local coordinates.
+
+        :param painter: QPainter instance
+        :param option: QStyleOptionGraphicsItem instance
+        :param widget: QWidget instance
+        """
+
+        super().paint(painter, option, widget)
+        self.drawLayerInfo(painter)
+
+    def setZValue(self, value):
+        """
+        Sets Z value of the item
+        :param value: z layer
+        """
+        return DrawingItem.setZValue(self, value)
+
+    def toSvg(self):
+        """
+        Return an SVG version of the shape
+        """
+        svg = ET.Element("svg")
+        width = abs(self.line().x1() - self.line().x2())
+        height = abs(self.line().y1() - self.line().y2())
+        svg.set("width", str(int(width)))
+        svg.set("height", str(int(height)))
+
+        line = ET.SubElement(svg, "line")
+        line.set("x1", str(int(self.line().x1())))
+        line.set("x2", str(int(self.line().x2())))
+        line.set("y1", str(int(self.line().y1())))
+        line.set("y2", str(int(self.line().y2())))
+        line = self._styleSvg(line)
+
+        return ET.tostring(svg, encoding="utf-8").decode("utf-8")
+
+    def fromSvg(self, svg):
+        """
+        Import element informations from an SVG
+        """
+        svg = ET.fromstring(svg)
+        width = float(svg.get("width", 0))
+        height = float(svg.get("height", 0))
+
+        # Backup the pos and restore it
+        pos = self.pos()
+        y1 = self.line().y1()
+        self.setLine(0, 0, width, height)
+
+        pen = QtGui.QPen()
+
+        if len(svg):
+            pen = self._penFromSVGElement(svg[0])
+            self.setLine(
+                float(svg[0].get("x1")),
+                float(svg[0].get("y1")),
+                float(svg[0].get("x2")),
+                float(svg[0].get("y2"))
+            )
+        self.setPos(pos)
+        self.setPen(pen)
+        self.update()
+
+    def _isHorizontalLine(self):
+        return abs(self.line().x1() - self.line().x2()) > abs(self.line().y1() - self.line().y2())
+
+    def hoverMoveEvent(self, event):
+        """
+        Handles all hover move events.
+
+        :param event: QGraphicsSceneHoverEvent instance
+        """
+
+        # objects on the background layer don't need cursors
+        if self.zValue() >= 0:
+
+            if self._isHorizontalLine():
+                if event.pos().x() > (self.line().x2() - self._border):
+                    self._graphics_view.setCursor(QtCore.Qt.SizeHorCursor)
+                elif event.pos().x() < self._border:
+                    self._graphics_view.setCursor(QtCore.Qt.SizeHorCursor)
+                else:
+                    self._graphics_view.setCursor(QtCore.Qt.SizeAllCursor)
+            # Vertical line
+            else:
+                if event.pos().y() > (self.line().y2() - self._border):
+                    self._graphics_view.setCursor(QtCore.Qt.SizeVerCursor)
+                elif event.pos().y() < self._border:
+                    self._graphics_view.setCursor(QtCore.Qt.SizeVerCursor)
+                else:
+                    self._graphics_view.setCursor(QtCore.Qt.SizeAllCursor)
+
+    def mouseMoveEvent(self, event):
+        """
+        Handles all mouse move events.
+
+        :param event: QMouseEvent instance
+        """
+
+        self.update()
+        if self._edge:
+            scenePos = event.scenePos()
+            if self._edge == "left" or self._edge == "bottom":
+                diff_x = self.x() - scenePos.x()
+                diff_y = self.y() - scenePos.y()
+                self.setPos(scenePos.x(), scenePos.y())
+                self.setLine(
+                    0,
+                    0,
+                    self.line().x2() + diff_x,
+                    self.line().y2() + diff_y)
+            elif self._edge == "right" or self._edge == "top":
+                pos = self.mapFromScene(scenePos)
+                self.setLine(
+                    0,
+                    0,
+                    pos.x(),
+                    pos.y())
+                self.setPos(self.x(), self.y())
+        super().mouseMoveEvent(event)
+
+    def mousePressEvent(self, event):
+        """
+        Handles all mouse press events.
+
+        :param event: QMouseEvent instance
+        """
+
+        self.update()
+        if self._isHorizontalLine():
+            if event.pos().x() > (self.line().x2() - self._border):
+                self.setFlag(QtWidgets.QGraphicsItem.ItemIsMovable, False)
+                self._edge = "right"
+            elif event.pos().x() < (self.line().x1() + self._border):
+                self.setFlag(QtWidgets.QGraphicsItem.ItemIsMovable, False)
+                self._edge = "left"
+        else:
+            if event.pos().y() > (self.line().y2() - self._border):
+                self.setFlag(QtWidgets.QGraphicsItem.ItemIsMovable, False)
+                self._edge = "top"
+            elif event.pos().y() < (self.line().y1() + self._border):
+                self.setFlag(QtWidgets.QGraphicsItem.ItemIsMovable, False)
+                self._edge = "bottom"
+        super().mousePressEvent(event)
+
+    def mouseReleaseEvent(self, event):
+        """
+        Handles all mouse release events.
+
+        :param: QMouseEvent instance
+        """
+
+        self.update()
+        self.setFlag(QtWidgets.QGraphicsItem.ItemIsMovable)
+
+        self._edge = None
+        super().mouseReleaseEvent(event)
+
+    def hoverLeaveEvent(self, event):
+        """
+        Handles all hover leave events.
+
+        :param event: QGraphicsSceneHoverEvent instance
+        """
+
+        # objects on the background layer don't need cursors
+        if self.zValue() >= 0:
+            self._graphics_view.setCursor(QtCore.Qt.ArrowCursor)

gns3/items/link_item.py

@@ -24,9 +24,10 @@ import math
 from ..qt import QtCore, QtGui, QtWidgets, QtSvg, qslot
 
 from ..packet_capture import PacketCapture
+from ..dialogs.filter_dialog import FilterDialog
 
 
-class SvgCaptureItem(QtSvg.QGraphicsSvgItem):
+class SvgIconItem(QtSvg.QGraphicsSvgItem):
 
     def __init__(self, symbol, parent):
 
@@ -86,11 +87,17 @@ class LinkItem(QtWidgets.QGraphicsPathItem):
 
         # QGraphicsSvgItem to indicate a capture
         self._capturing_item = None
+        # QGraphicsSvgItem to indicate a filter is applied
+        self._filter_item = None
+        # QGraphicsSvgItem to indicate we suspend a link
+        self._suspend_item = None
+        # QGraphicsSvgItem to indicate a filter is applied and a capture is active
+        self._filter_capturing_item = None
 
         if not self._adding_flag:
             # there is a destination
             self._link = link
-            self._link.updated_link_signal.connect(self._drawCaptureSymbol)
+            self._link.updated_link_signal.connect(self._drawSymbol)
             self._link.delete_link_signal.connect(self._linkDeletedSlot)
             self.setFlag(self.ItemIsFocusable)
             source_item.addLink(self)
@@ -118,6 +125,16 @@ class LinkItem(QtWidgets.QGraphicsPathItem):
             if self in self.scene().items():
                 self.scene().removeItem(self)
 
+    @qslot
+    def _filterActionSlot(self, *args):
+        dialog = FilterDialog(self._main_window, self._link)
+        dialog.show()
+        dialog.exec_()
+
+    @qslot
+    def _suspendActionSlot(self, *args):
+        self._link.toggleSuspend()
+
     def delete(self):
         """
         Delete this link
@@ -228,12 +245,32 @@ class LinkItem(QtWidgets.QGraphicsPathItem):
                 analyze_action.triggered.connect(self._analyzeCaptureActionSlot)
                 menu.addAction(analyze_action)
 
+        if self._link.suspended() is False:
+            # Edit filters
+            filter_action = QtWidgets.QAction("Packet filters", menu)
+            filter_action.setIcon(QtGui.QIcon(':/icons/filter.svg'))
+            filter_action.triggered.connect(self._filterActionSlot)
+            menu.addAction(filter_action)
+
+            # Suspend link
+            suspend_action = QtWidgets.QAction("Suspend", menu)
+            suspend_action.setIcon(QtGui.QIcon(':/icons/pause.svg'))
+            suspend_action.triggered.connect(self._suspendActionSlot)
+            menu.addAction(suspend_action)
+        else:
+            # Resume link
+            resume_action = QtWidgets.QAction("Resume", menu)
+            resume_action.setIcon(QtGui.QIcon(':/icons/start.svg'))
+            resume_action.triggered.connect(self._suspendActionSlot)
+            menu.addAction(resume_action)
+
         # delete
         delete_action = QtWidgets.QAction("Delete", menu)
         delete_action.setIcon(QtGui.QIcon(':/icons/delete.svg'))
         delete_action.triggered.connect(self._deleteActionSlot)
         menu.addAction(delete_action)
 
+    @qslot
     def mousePressEvent(self, event):
         """
         Called when the link is clicked and shows a contextual menu.
@@ -433,19 +470,90 @@ class LinkItem(QtWidgets.QGraphicsPathItem):
         self.update()
 
     @qslot
-    def _drawCaptureSymbol(self, *args):
+    def _drawSymbol(self, *args):
         """
-        Draws a capture symbol in the middle of the link to indicate a capture is active.
+        Draws a symbol in the middle of the link to indicate a capture, a suspend or a filter is active.
         """
 
+        #FIXME: refactor ugly symbol management
         if not self._adding_flag:
-            if self._link.capturing() and self.length >= 150:
-                link_center = QtCore.QPointF(self.source.x() + self.dx / 2.0 - 11, self.source.y() + self.dy / 2.0 - 11)
-                if self._capturing_item is None:
-                    self._capturing_item = SvgCaptureItem(':/icons/inspect.svg', self)
-                    self._capturing_item.setScale(0.6)
-                self._capturing_item.setPos(link_center)
-                if not self._capturing_item.isVisible():
-                    self._capturing_item.show()
-            elif self._capturing_item:
-                self._capturing_item.hide()
+
+            if self._link.suspended():
+                if self.length >= 150:
+                    link_center = QtCore.QPointF(self.source.x() + self.dx / 2.0 - 11, self.source.y() + self.dy / 2.0 - 11)
+                    if self._suspend_item is None:
+                        self._suspend_item = SvgIconItem(':/icons/pause.svg', self)
+                        self._suspend_item.setScale(0.6)
+                    if not self._suspend_item.isVisible():
+                        self._suspend_item.show()
+                    self._suspend_item.setPos(link_center)
+                    if self._filter_item:
+                        self._filter_item.hide()
+                elif self._suspend_item:
+                    self._suspend_item.hide()
+                if self._filter_capturing_item:
+                    self._filter_capturing_item.hide()
+                if self._capturing_item:
+                    self._capturing_item.hide()
+                if self._filter_item:
+                    self._filter_item.hide()
+
+            elif self._link.capturing() and len(self._link.filters()) > 0:
+                if self.length >= 150:
+                    link_center = QtCore.QPointF(self.source.x() + self.dx / 2.0 - 11, self.source.y() + self.dy / 2.0 - 11)
+                    if self._filter_capturing_item is None:
+                        self._filter_capturing_item = SvgIconItem(':/icons/filter-capture.svg', self)
+                        self._filter_capturing_item.setScale(0.6)
+                    if not self._filter_capturing_item.isVisible():
+                        self._filter_capturing_item.show()
+                    self._filter_capturing_item.setPos(link_center)
+                elif self._filter_capturing_item:
+                    self._filter_capturing_item.hide()
+                if self._capturing_item:
+                    self._capturing_item.hide()
+                if self._filter_item:
+                    self._filter_item.hide()
+                if self._suspend_item:
+                    self._suspend_item.hide()
+
+            elif self._link.capturing():
+                if self.length >= 150:
+                    link_center = QtCore.QPointF(self.source.x() + self.dx / 2.0 - 11, self.source.y() + self.dy / 2.0 - 11)
+                    if self._capturing_item is None:
+                        self._capturing_item = SvgIconItem(':/icons/inspect.svg', self)
+                        self._capturing_item.setScale(0.6)
+                    self._capturing_item.setPos(link_center)
+                    if not self._capturing_item.isVisible():
+                        self._capturing_item.show()
+                elif self._capturing_item:
+                    self._capturing_item.hide()
+                if self._filter_capturing_item:
+                    self._filter_capturing_item.hide()
+                if self._suspend_item:
+                    self._suspend_item.hide()
+
+            elif len(self._link.filters()) > 0:
+                if self.length >= 150:
+                    link_center = QtCore.QPointF(self.source.x() + self.dx / 2.0 - 11, self.source.y() + self.dy / 2.0 - 11)
+                    if self._filter_item is None:
+                        self._filter_item = SvgIconItem(':/icons/filter.svg', self)
+                        self._filter_item.setScale(0.6)
+                    if not self._filter_item.isVisible():
+                        self._filter_item.show()
+                    self._filter_item.setPos(link_center)
+                elif self._filter_item:
+                    self._filter_item.hide()
+                if self._filter_capturing_item:
+                    self._filter_capturing_item.hide()
+                if self._suspend_item:
+                    self._suspend_item.hide()
+
+            else:
+                if self._capturing_item:
+                    self._capturing_item.hide()
+                if self._suspend_item:
+                    self._suspend_item.hide()
+                if self._filter_item:
+                    self._filter_item.hide()
+                if self._filter_capturing_item:
+                    self._filter_capturing_item.hide()

gns3/items/node_item.py

@@ -374,8 +374,8 @@ class NodeItem(QtSvg.QGraphicsSvgItem):
 
         if self._node_label.toPlainText() != label_data["text"]:
             self._node_label.setPlainText(label_data["text"])
-        self._node_label.setStyle(label_data["style"])
-        self._node_label.setRotation(label_data["rotation"])
+        self._node_label.setStyle(label_data.get("style", ""))
+        self._node_label.setRotation(label_data.get("rotation", 0))
         if label_data["x"] is None:
             self._centerLabel()
             self.updateNode()

gns3/items/note_item.py

@@ -201,7 +201,7 @@ class NoteItem(QtWidgets.QGraphicsTextItem):
                 val = val.strip()
 
                 if key == "font-size":
-                    font.setPointSize(int(val))
+                    font.setPointSizeF(float(val))
                 elif key == "font-family":
                     font.setFamily(val)
                 elif key == "font-style" and val == "italic":
@@ -252,7 +252,7 @@ class NoteItem(QtWidgets.QGraphicsTextItem):
         style = ""
 
         style += "font-family: {};".format(self.font().family())
-        style += "font-size: {};".format(self.font().pointSize())
+        style += "font-size: {};".format(self.font().pointSizeF())
 
         if self.font().italic():
             style += "font-style: italic;"

gns3/items/rectangle_item.py

@@ -46,6 +46,13 @@ class RectangleItem(QtWidgets.QGraphicsRectItem, ShapeItem):
         super().paint(painter, option, widget)
         self.drawLayerInfo(painter)
 
+    def setZValue(self, value):
+        """
+        Sets Z value of the item
+        :param value: z layer
+        """
+        return ShapeItem.setZValue(self, value)
+
     def toSvg(self):
         """
         Return an SVG version of the shape
@@ -61,4 +68,3 @@ class RectangleItem(QtWidgets.QGraphicsRectItem, ShapeItem):
         rect = self._styleSvg(rect)
 
         return ET.tostring(svg, encoding="utf-8").decode("utf-8")
-

gns3/items/serial_link_item.py

@@ -114,19 +114,19 @@ class SerialLinkItem(LinkItem):
                 return
 
             # source point color
-            if self._source_port.status() == Port.started:
+            if self._link.suspended() or self._source_port.status() == Port.suspended:
+                # link or port is suspended
+                shape = QtCore.Qt.RoundCap
+                color = QtCore.Qt.yellow
+            elif self._source_port.status() == Port.started:
                 # port is active
                 shape = QtCore.Qt.RoundCap
                 color = QtCore.Qt.green
-            elif self._source_port.status() == Port.suspended:
-                # port is suspended
-                shape = QtCore.Qt.RoundCap
-                color = QtCore.Qt.yellow
             else:
                 shape = QtCore.Qt.SquareCap
                 color = QtCore.Qt.red
 
-            painter.setPen(QtGui.QPen(color, self._point_size, QtCore.Qt.SolidLine, QtCore.Qt.RoundCap, QtCore.Qt.MiterJoin))
+            painter.setPen(QtGui.QPen(color, self._point_size, QtCore.Qt.SolidLine, shape, QtCore.Qt.MiterJoin))
 
             source_port_label = self._source_port.label()
             if source_port_label is None:
@@ -143,14 +143,14 @@ class SerialLinkItem(LinkItem):
             painter.drawPoint(self.source_point)
 
             # destination point color
-            if self._destination_port.status() == Port.started:
+            if self._link.suspended() or self._destination_port.status() == Port.suspended:
+                # link or port is suspended
+                color = QtCore.Qt.yellow
+                shape = QtCore.Qt.RoundCap
+            elif self._destination_port.status() == Port.started:
                 # port is active
                 color = QtCore.Qt.green
                 shape = QtCore.Qt.RoundCap
-            elif self._destination_port.status() == Port.suspended:
-                # port is suspended
-                color = QtCore.Qt.yellow
-                shape = QtCore.Qt.RoundCap
             else:
                 color = QtCore.Qt.red
                 shape = QtCore.Qt.SquareCap
@@ -172,4 +172,4 @@ class SerialLinkItem(LinkItem):
 
             painter.drawPoint(self.destination_point)
 
-        self._drawCaptureSymbol()
+        self._drawSymbol()

gns3/items/shape_item.py

@@ -30,16 +30,6 @@ log = logging.getLogger(__name__)
 
 class ShapeItem(DrawingItem):
 
-    # Map QT stroke to SVG style
-    QT_DASH_TO_SVG = {
-        QtCore.Qt.SolidLine: "",
-        QtCore.Qt.NoPen: None,
-        QtCore.Qt.DashLine: "25, 25",
-        QtCore.Qt.DotLine: "5, 25",
-        QtCore.Qt.DashDotLine: "5, 25, 25",
-        QtCore.Qt.DashDotDotLine: "25, 25, 5, 25, 5"
-    }
-
     """
     Base class to draw shapes on the scene.
     """
@@ -180,27 +170,6 @@ class ShapeItem(DrawingItem):
         if self.zValue() >= 0:
             self._graphics_view.setCursor(QtCore.Qt.ArrowCursor)
 
-    def _styleSvg(self, element):
-        """
-        Add style from the shape item to the SVG element that we will
-        export
-        """
-        style = ""
-        pen = self.pen()
-        element.set("fill", "#{}".format(hex(self.brush().color().rgba())[4:]))
-        element.set("fill-opacity", str(self.brush().color().alphaF()))
-
-        dasharray = self.QT_DASH_TO_SVG[pen.style()]
-        if dasharray is None:  # No border to the element
-            return element
-        elif dasharray == "":
-            pass  # Solid line
-        else:
-            element.set("stroke-dasharray", dasharray)
-        element.set("stroke-width", str(pen.width()))
-        element.set("stroke", "#" + hex(pen.color().rgba())[4:])
-        return element
-
     def fromSvg(self, svg):
         """
         Import element informations from an SVG
@@ -214,10 +183,7 @@ class ShapeItem(DrawingItem):
         brush = QtGui.QBrush(QtCore.Qt.SolidPattern)
 
         if len(svg):
-            if svg[0].get("stroke-width"):
-                pen.setWidth(int(svg[0].get("stroke-width")))
-            if svg[0].get("stroke"):
-                pen.setColor(colorFromSvg(svg[0].get("stroke")))
+            pen = self._penFromSVGElement(svg[0])
             if svg[0].get("fill"):
                 new_color = colorFromSvg(svg[0].get("fill"))
                 color = brush.color()
@@ -230,17 +196,6 @@ class ShapeItem(DrawingItem):
                 color.setAlphaF(float(svg[0].get("fill-opacity")))
                 brush.setColor(color)
 
-            # Map SVG stroke style (border of the element to the Qt version)
-            if not svg[0].get("stroke"):
-                pen.setStyle(QtCore.Qt.NoPen)
-            else:
-                pen.setStyle(QtCore.Qt.SolidLine)
-                stroke = svg[0].get("stroke-dasharray")
-                if stroke:
-                    for (qt_stroke, svg_stroke) in self.QT_DASH_TO_SVG.items():
-                        if svg_stroke == stroke:
-                            pen.setStyle(qt_stroke)
-
         self.setPen(pen)
         self.setBrush(brush)
         self.update()

gns3/items/text_item.py

@@ -111,6 +111,13 @@ class TextItem(QtWidgets.QGraphicsTextItem, DrawingItem):
         super().paint(painter, option, widget)
         self.drawLayerInfo(painter)
 
+    def setZValue(self, value):
+        """
+        Sets Z value of the item
+        :param value: z layer
+        """
+        return DrawingItem.setZValue(self, value)
+
     def toSvg(self):
         """
         Return an SVG version of the text
@@ -121,7 +128,7 @@ class TextItem(QtWidgets.QGraphicsTextItem, DrawingItem):
 
         text = ET.SubElement(svg, "text")
         text.set("font-family", self.font().family())
-        text.set("font-size", str(self.font().pointSize()))
+        text.set("font-size", str(self.font().pointSizeF()))
         if self.font().italic():
             text.set("font-style", "italic")
         if self.font().bold():
@@ -138,7 +145,19 @@ class TextItem(QtWidgets.QGraphicsTextItem, DrawingItem):
         return svg
 
     def fromSvg(self, svg):
-        svg = ET.fromstring(svg)
+
+        # sometimes we receive \0 at the end of string inside <svg> element
+        try:
+            svg = svg.replace("\u0000", "")
+        except AttributeError:
+            pass
+
+        try:
+            svg = ET.fromstring(svg)
+        except ET.ParseError:
+            self.setPlainText("Unable to parse `text_item`")
+            return
+
         text = svg[0]
 
         font = QtGui.QFont()
@@ -157,7 +176,7 @@ class TextItem(QtWidgets.QGraphicsTextItem, DrawingItem):
             color.setAlphaF(float(opacity))
             self.setDefaultTextColor(color)
 
-        font.setPointSize(int(text.get("font-size", self.font().pointSize())))
+        font.setPointSizeF(float(text.get("font-size", self.font().pointSizeF())))
         font.setFamily(text.get("font-family", self.font().family()))
         if text.get("font-style") == "italic":
             font.setItalic(True)

gns3/link.py

@@ -59,10 +59,10 @@ class Link(QtCore.QObject):
 
         super().__init__()
 
-        log.info("adding link from {} {} to {} {}".format(source_node.name(),
-                                                          source_port.name(),
-                                                          destination_node.name(),
-                                                          destination_port.name()))
+        log.debug("adding link from {} {} to {} {}".format(source_node.name(),
+                                                           source_port.name(),
+                                                           destination_node.name(),
+                                                           destination_port.name()))
 
         # create an unique ID
         self._id = Link._instance_count
@@ -79,10 +79,12 @@ class Link(QtCore.QObject):
         self._capture_file_path = None
         self._capture_file = None
         self._initialized = False
+        self._filters = {}
+        self._suspend = False
 
-        # Boolean if True we are creatin the first instance of this node
+        # Boolean if True we are creating the first instance of this node
         # if false the node already exist in the topology
-        # use to avoid erasing informations when reloading
+        # use to avoid erasing information when reloading
         self._creator = False
 
         self._nodes = []
@@ -103,32 +105,44 @@ class Link(QtCore.QObject):
         self._capturing = result.get("capturing", False)
 
         # If the controller is remote the capture path should be rewrite to something local
-        if Controller.instance().isRemote():
-            if self._capture_file_path is None and result.get("capture_file_path", None) is not None:
-                self._capture_file = QtCore.QTemporaryFile()
-                self._capture_file.open(QtCore.QFile.WriteOnly)
-                self._capture_file.setAutoRemove(True)
-                self._capture_file_path = self._capture_file.fileName()
-                Controller.instance().get(
-                    "/projects/{project_id}/links/{link_id}/pcap".format(
-                        project_id=self.project().id(),
-                        link_id=self._link_id),
-                    None,
-                    showProgress=False,
-                    downloadProgressCallback=self._downloadPcapProgress,
-                    ignoreErrors=True,  # If something is wrong avoid disconnect us from server
-                    timeout=None)
-        else:
-            self._capture_file_path = result["capture_file_path"]
+        if self._capturing:
+            if Controller.instance().isRemote():
+                if self._capture_file_path is None and result.get("capture_file_path", None) is not None:
+                    self._capture_file = QtCore.QTemporaryFile()
+                    self._capture_file.open(QtCore.QFile.WriteOnly)
+                    self._capture_file.setAutoRemove(True)
+                    self._capture_file_path = self._capture_file.fileName()
+                    Controller.instance().get(
+                        "/projects/{project_id}/links/{link_id}/pcap".format(
+                            project_id=self.project().id(),
+                            link_id=self._link_id),
+                        None,
+                        showProgress=False,
+                        downloadProgressCallback=self._downloadPcapProgress,
+                        ignoreErrors=True,  # If something is wrong avoid disconnect us from server
+                        timeout=None)
+            else:
+                self._capture_file_path = result["capture_file_path"]
 
         if "nodes" in result:
             self._nodes = result["nodes"]
             self._updateLabels()
+        if "filters" in result:
+            self._filters = result["filters"]
+        if "suspend" in result:
+            self._suspend = result["suspend"]
         self.updated_link_signal.emit(self._id)
 
     def creator(self):
         return self._creator
 
+    def suspended(self):
+        return self._suspend
+
+    def toggleSuspend(self):
+        self._suspend = not self._suspend
+        self.update()
+
     def initialized(self):
         return self._initialized
 
@@ -149,6 +163,12 @@ class Link(QtCore.QObject):
         body = self._prepareParams()
         Controller.instance().put("/projects/{project_id}/links/{link_id}".format(project_id=self._source_node.project().id(), link_id=self._link_id), self.updateLinkCallback, body=body)
 
+    def listAvailableFilters(self, callback):
+        """
+        Get the list of available filters
+        """
+        Controller.instance().get("/projects/{project_id}/links/{link_id}/available_filters".format(project_id=self._source_node.project().id(), link_id=self._link_id), callback)
+
     def updateLinkCallback(self, result, error=False, *args, **kwargs):
         if error:
             QtWidgets.QMessageBox.warning(None, "Update link", "Error while updating link: {}".format(result["message"]))
@@ -167,10 +187,14 @@ class Link(QtCore.QObject):
     def _updateLabel(self, label, label_data):
         if not label or sip.isdeleted(label):
             return
-        label.setPlainText(label_data["text"])
-        label.setPos(label_data["x"], label_data["y"])
-        label.setStyle(label_data["style"])
-        label.setRotation(label_data["rotation"])
+        if "text" in label_data:
+            label.setPlainText(label_data["text"])
+        if "x" in label_data and "y" in label_data:
+            label.setPos(label_data["x"], label_data["y"])
+        if "style" in label_data:
+            label.setStyle(label_data["style"])
+        if "rotation" in label_data:
+            label.setRotation(label_data["rotation"])
 
     def _prepareParams(self):
         body = {
@@ -185,7 +209,9 @@ class Link(QtCore.QObject):
                     "adapter_number": self._destination_port.adapterNumber(),
                     "port_number": self._destination_port.portNumber()
                 }
-            ]
+            ],
+            "filters": self._filters,
+            "suspend": self._suspend
         }
         if self._source_port.label():
             body["nodes"][0]["label"] = self._source_port.label().dump()
@@ -243,10 +269,18 @@ class Link(QtCore.QObject):
 
     def __str__(self):
 
-        return "Link from {} port {} to {} port {}".format(self._source_node.name(),
-                                                           self._source_port.name(),
-                                                           self._destination_node.name(),
-                                                           self._destination_port.name())
+        description = "Link from {} port {} to {} port {}".format(self._source_node.name(),
+                                                                  self._source_port.name(),
+                                                                  self._destination_node.name(),
+                                                                  self._destination_port.name())
+
+        if self.capturing():
+            description += "\nPacket capture is active"
+
+        for filter_type in self._filters.keys():
+            description += "\nPacket filter '{}' is active".format(filter_type)
+
+        return description
 
     def capture_file_name(self):
         """
@@ -264,10 +298,10 @@ class Link(QtCore.QObject):
         Deletes this link.
         """
 
-        log.info("deleting link from {} {} to {} {}".format(self._source_node.name(),
-                                                            self._source_port.name(),
-                                                            self._destination_node.name(),
-                                                            self._destination_port.name()))
+        log.debug("deleting link from {} {} to {} {}".format(self._source_node.name(),
+                                                             self._source_port.name(),
+                                                             self._destination_node.name(),
+                                                             self._destination_port.name()))
 
         if skip_controller:
             self._linkDeletedCallback({})
@@ -325,11 +359,11 @@ class Link(QtCore.QObject):
             if self._capture_file:
                 self._capture_file.close()
                 self._capture_file = None
-            if self._capture_file_path:
+            if self._capture_file_path and os.path.exists(self._capture_file_path):
                 try:
                     os.remove(self._capture_file_path)
                 except OSError as e:
-                    log.error("Can't remove file {}".format(self._capture_file_path))
+                    log.error("Can't remove file {}: {}".format(self._capture_file_path, e))
         self._capture_file_path = None
         Controller.instance().post(
             "/projects/{project_id}/links/{link_id}/stop_capture".format(
@@ -409,3 +443,15 @@ class Link(QtCore.QObject):
         if self._destination_node == node:
             return self._destination_port
         return self._source_port
+
+    def filters(self):
+        """
+        :returns: List the filters active on the node
+        """
+        return self._filters
+
+    def setFilters(self, filters):
+        """
+        :params filters: List of filters
+        """
+        self._filters = filters

gns3/local_config.py

@@ -150,7 +150,7 @@ class LocalConfig(QtCore.QObject):
     def _getSettingsCallback(self, result, error=False, **kwargs):
         self._refreshingSettings = False
         if error:
-            log.error("Can't get settings from controller")
+            log.debug("Can't get settings from controller")
             return
         if result == {} and self._settings != {}:
             self._settings_retrieved_from_controller = True
@@ -183,6 +183,13 @@ class LocalConfig(QtCore.QObject):
 
         return os.path.normpath(path)
 
+    def runAsRootPath(self):
+        """
+        Gets run as root filename
+        :return: string
+        """
+        return os.path.join(self.configDirectory(), "run_as_root")
+
     def _migrateOldConfigPath(self):
         """
         Migrate pre 1.4 config path
@@ -269,7 +276,7 @@ class LocalConfig(QtCore.QObject):
         Read the configuration file.
         """
 
-        log.info("Load config from %s", config_path)
+        log.debug("Load config from %s", config_path)
         try:
             with open(config_path, "r", encoding="utf-8") as f:
                 self._last_config_changed = os.stat(config_path).st_mtime
@@ -296,7 +303,7 @@ class LocalConfig(QtCore.QObject):
             with open(temporary, "w", encoding="utf-8") as f:
                 json.dump(self._settings, f, sort_keys=True, indent=4)
             shutil.move(temporary, self._config_file)
-            log.info("Configuration save to %s", self._config_file)
+            log.debug("Configuration save to %s", self._config_file)
             self._last_config_changed = os.stat(self._config_file).st_mtime
         except (ValueError, OSError) as e:
             log.error("Could not write the config file {}: {}".format(self._config_file, e))
@@ -324,7 +331,7 @@ class LocalConfig(QtCore.QObject):
 
         try:
             if self._last_config_changed and self._last_config_changed < os.stat(self._config_file).st_mtime:
-                log.info("Client config has changed, reloading it...")
+                log.debug("Client config has changed, reloading it...")
                 self._readConfig(self._config_file)
                 self.config_changed_signal.emit()
         except OSError as e:
@@ -402,9 +409,8 @@ class LocalConfig(QtCore.QObject):
         self._settings[section] = settings
 
         if changed:
-            log.info("Section %s has missing default values. Adding keys %s Saving configuration", section, ','.join(set(default_settings.keys()) - set(settings.keys())))
+            log.debug("Section %s has missing default values. Adding keys %s Saving configuration", section, ','.join(set(default_settings.keys()) - set(settings.keys())))
             self.writeConfig()
-
         return copy.deepcopy(settings)
 
     def saveSectionSettings(self, section, settings):
@@ -420,7 +426,7 @@ class LocalConfig(QtCore.QObject):
 
         if self._settings[section] != settings:
             self._settings[section].update(copy.deepcopy(settings))
-            log.info("Section %s has changed. Saving configuration", section)
+            log.debug("Section %s has changed. Saving configuration", section)
             self.writeConfig()
         else:
             log.debug("Section %s has not changed. Skip saving configuration", section)
@@ -455,6 +461,20 @@ class LocalConfig(QtCore.QObject):
         settings["multi_profiles"] = value
         self.saveSectionSettings("MainWindow", settings)
 
+    def directFileUpload(self):
+        """
+        :returns: Boolean. True if direct_file_upload is enabled
+        """
+
+        from gns3.settings import GENERAL_SETTINGS
+        return self.loadSectionSettings("MainWindow", GENERAL_SETTINGS)["direct_file_upload"]
+
+    def setDirectFileUpload(self, value):
+        from gns3.settings import GENERAL_SETTINGS
+        settings = self.loadSectionSettings("MainWindow", GENERAL_SETTINGS)
+        settings["direct_file_upload"] = value
+        self.saveSectionSettings("MainWindow", settings)
+
     @staticmethod
     def instance():
         """

gns3/local_server.py

@@ -30,7 +30,7 @@ import signal
 import subprocess
 
 
-from gns3.qt import QtWidgets, QtCore
+from gns3.qt import QtWidgets, QtCore, qslot
 from gns3.settings import LOCAL_SERVER_SETTINGS
 from gns3.local_config import LocalConfig
 from gns3.local_server_config import LocalServerConfig
@@ -59,17 +59,20 @@ class StopLocalServerWorker(QtCore.QObject):
     def __init__(self, local_server_process):
         super().__init__()
         self._local_server_process = local_server_process
+        self._precision = 100  # In MS
+        self._remaining_trial = int(10 * (1000 / self._precision))
+
+    @qslot
+    def _callbackSlot(self, *params):
+        self._local_server_process.poll()
+        if self._local_server_process.returncode is None and self._remaining_trial > 0:
+            self._remaining_trial -= 1
+            QtCore.QTimer.singleShot(self._precision, self._callbackSlot)
+        else:
+            self.finished.emit()
 
     def run(self):
-        precision = 1
-        remaining_trial = 4 / precision  # 4 Seconds
-        while remaining_trial > 0:
-            if self._local_server_process.returncode is None:
-                remaining_trial -= 1
-                self.thread().sleep(precision)
-            else:
-                break
-        self.finished.emit()
+        QtCore.QTimer.singleShot(1000, self._callbackSlot)
 
     def cancel(self):
         return
@@ -129,7 +132,7 @@ class LocalServer(QtCore.QObject):
             if win32serviceutil.QueryServiceStatus(service_name, None)[1] != win32service.SERVICE_RUNNING:
                 return False
         except pywintypes.error as e:
-            if e.winerror == 1060:
+            if e.winerror == 1060:  # service is not installed
                 return False
             else:
                 log.error("Could not check if the {} service is running: {}".format(service_name, e.strerror))
@@ -142,7 +145,7 @@ class LocalServer(QtCore.QObject):
 
         path = os.path.abspath(self._settings["ubridge_path"])
 
-        if not path or len(path) == 0 or not os.path.exists(path):
+        if not path or len(path) == 0 or not os.path.exists(path) or not os.path.isfile(path):
             return False
 
         if sys.platform.startswith("win"):
@@ -157,28 +160,23 @@ class LocalServer(QtCore.QObject):
         if sys.platform.startswith("linux"):
             # test if the executable has the CAP_NET_RAW capability (Linux only)
             try:
-                if "security.capability" in os.listxattr(path):
-                    caps = os.getxattr(path, "security.capability")
-                    # test the 2nd byte and check if the 13th bit (CAP_NET_RAW) is set
-                    if not struct.unpack("<IIIII", caps)[1] & 1 << 13:
-                        proceed = QtWidgets.QMessageBox.question(
-                            self.parent(),
-                            "uBridge",
-                            "uBridge requires CAP_NET_RAW capability to interact with network interfaces. Set the capability to uBridge? All users on the system will be able to read packet from the network interfaces.",
-                            QtWidgets.QMessageBox.Yes,
-                            QtWidgets.QMessageBox.No)
-                        if proceed == QtWidgets.QMessageBox.Yes:
-                            sudo(["setcap", "cap_net_admin,cap_net_raw=ep"])
-                else:
-                    # capabilities not supported
-                    request_setuid = True
+                # test the 2nd byte and check if the 13th bit (CAP_NET_RAW) is set
+                if "security.capability" not in os.listxattr(path) or not struct.unpack("<IIIII", os.getxattr(path, "security.capability"))[1] & 1 << 13:
+                    proceed = QtWidgets.QMessageBox.question(
+                        self.parent(),
+                        "uBridge",
+                        "uBridge requires CAP_NET_RAW capability to interact with network interfaces. Set the capability to uBridge? All users on the system will be able to read packet from the network interfaces.",
+                        QtWidgets.QMessageBox.Yes,
+                        QtWidgets.QMessageBox.No)
+                    if proceed == QtWidgets.QMessageBox.Yes:
+                        sudo(["setcap", "cap_net_admin,cap_net_raw=ep", path])
             except AttributeError:
                 # Due to a Python bug, os.listxattr could be missing: https://github.com/GNS3/gns3-gui/issues/2010
                 log.warning("Could not determine if CAP_NET_RAW capability is set for uBridge (Python bug)")
                 return True
             except OSError as e:
                 QtWidgets.QMessageBox.critical(self.parent(), "uBridge", "Can't set CAP_NET_RAW capability to uBridge {}: {}".format(path, str(e)))
-                return False
+                request_setuid = True
 
         if sys.platform.startswith("darwin") or request_setuid:
             try:
@@ -186,7 +184,7 @@ class LocalServer(QtCore.QObject):
                     proceed = QtWidgets.QMessageBox.question(
                         self.parent(),
                         "uBridge",
-                        "uBridge requires root permissions to interact with network interfaces. Set root permissions to uBridge?  All admin users on the system will be able to read packet from the network interfaces.",
+                        "uBridge requires root permissions to interact with network interfaces. Set root permissions to uBridge? All admin users on the system will be able to read packet from the network interfaces.",
                         QtWidgets.QMessageBox.Yes,
                         QtWidgets.QMessageBox.No)
                     if proceed == QtWidgets.QMessageBox.Yes:
@@ -332,7 +330,7 @@ class LocalServer(QtCore.QObject):
             return True
 
         if self.isLocalServerRunning():
-            log.info("A local server already running on this host")
+            log.debug("A local server already running on this host")
             # Try to kill the server. The server can be still running after
             # if the server was started by hand
             self._killAlreadyRunningServer()
@@ -467,7 +465,7 @@ class LocalServer(QtCore.QObject):
                     log.warn("could not delete server log file {}: {}".format(logpath, e))
             command += ' --log="{}" --pid="{}"'.format(logpath, self._pid_path())
 
-        log.info("Starting local server process with {}".format(command))
+        log.debug("Starting local server process with {}".format(command))
         try:
             if sys.platform.startswith("win"):
                 # use the string on Windows
@@ -480,7 +478,7 @@ class LocalServer(QtCore.QObject):
             log.warning('Could not start local server "{}": {}'.format(command, e))
             return False
 
-        log.info("Local server process has started (PID={})".format(self._local_server_process.pid))
+        log.debug("Local server process has started (PID={})".format(self._local_server_process.pid))
         return True
 
     def _checkLocalServerRunningSlot(self):
@@ -517,7 +515,11 @@ class LocalServer(QtCore.QObject):
         status, json_data = getSynchronous(self._settings["protocol"], self._settings["host"], self._port, "version",
                                            timeout=2, user=self._settings["user"], password=self._settings["password"])
 
-        if json_data is None or status != 200:
+        if status == 401:  # Auth issue that need to be solved later
+            return True
+        elif json_data is None:
+            return False
+        elif status != 200:
             return False
         else:
             version = json_data.get("version", None)
@@ -535,7 +537,7 @@ class LocalServer(QtCore.QObject):
 
         if self.localServerProcessIsRunning():
             self._stopping = True
-            log.info("Stopping local server (PID={})".format(self._local_server_process.pid))
+            log.debug("Stopping local server (PID={})".format(self._local_server_process.pid))
             # local server is running, let's stop it
             if self._http_client:
                 self._http_client.shutdown()

gns3/main.py

@@ -18,6 +18,7 @@
 
 import sys
 import os
+import faulthandler
 
 # Try to install updates & restart application if an update is installed
 try:
@@ -110,6 +111,9 @@ def main():
     Entry point for GNS3 GUI.
     """
 
+    # Get Python tracebacks explicitly, on a fault like segfault
+    faulthandler.enable()
+
     # Sometimes (for example at first launch) the OSX app service launcher add
     # an extra argument starting with -psn_. We filter it
     if sys.platform.startswith("darwin"):
@@ -184,8 +188,8 @@ def main():
     if sys.version_info < (3, 4):
         raise SystemExit("Python 3.4 or higher is required")
 
-    if parse_version(QtCore.QT_VERSION_STR) < parse_version("5.0.0"):
-        raise SystemExit("Requirement is PyQt5 version 5.0.0 or higher, got version {}".format(QtCore.QT_VERSION_STR))
+    if parse_version(QtCore.QT_VERSION_STR) < parse_version("5.5.0"):
+        raise SystemExit("Requirement is PyQt5 version 5.5.0 or higher, got version {}".format(QtCore.QT_VERSION_STR))
 
     if parse_version(psutil.__version__) < parse_version("2.2.1"):
         raise SystemExit("Requirement is psutil version 2.2.1 or higher, got version {}".format(psutil.__version__))
@@ -228,8 +232,10 @@ def main():
     if local_config.multiProfiles() and not options.profile:
         profile_select = ProfileSelectDialog()
         profile_select.show()
-        profile_select.exec_()
-        options.profile = profile_select.profile()
+        if profile_select.exec_():
+            options.profile = profile_select.profile()
+        else:
+            sys.exit(0)
 
     # Init the config
     if options.config:

gns3/main_window.py

@@ -51,6 +51,8 @@ from .update_manager import UpdateManager
 from .utils.analytics import AnalyticsClient
 from .dialogs.appliance_wizard import ApplianceWizard
 from .dialogs.new_appliance_dialog import NewApplianceDialog
+from .dialogs.notif_dialog import NotifDialog, NotifDialogHandler
+from .status_bar import StatusBarHandler
 from .registry.appliance import ApplianceError
 
 log = logging.getLogger(__name__)
@@ -73,8 +75,15 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
         """
 
         super().__init__(parent)
+        self._settings = {}
+
         self.setupUi(self)
 
+        self._notif_dialog = NotifDialog(self)
+        # Setup logger
+        logging.getLogger().addHandler(NotifDialogHandler(self._notif_dialog))
+        logging.getLogger().addHandler(StatusBarHandler(self.uiStatusBar))
+
         self._open_file_at_startup = open_file
 
         MainWindow._instance = self
@@ -82,8 +91,8 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
         topology.setMainWindow(self)
         topology.project_changed_signal.connect(self._projectChangedSlot)
         Controller.instance().setParent(self)
+        LocalServer.instance().setParent(self)
 
-        self._settings = {}
         HTTPClient.setProgressCallback(Progress.instance(self))
 
         self._first_file_load = True
@@ -114,6 +123,8 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
         action.setIconText("All devices")
         self.uiDocksMenu.addAction(action)
 
+        # Sometimes the parent seem invalid https://github.com/GNS3/gns3-gui/issues/2182
+        self.uiNodesDockWidget.setParent(self)
         # make sure the dock widget is not open
         self.uiNodesDockWidget.setVisible(False)
 
@@ -212,6 +223,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
         self.uiResetPortLabelsAction.triggered.connect(self._resetPortLabelsActionSlot)
         self.uiShowPortNamesAction.triggered.connect(self._showPortNamesActionSlot)
         self.uiShowGridAction.triggered.connect(self._showGridActionSlot)
+        self.uiSnapToGridAction.triggered.connect(self._snapToGridActionSlot)
 
         # tool menu connections
         self.uiWebInterfaceAction.triggered.connect(self._openWebInterfaceActionSlot)
@@ -232,6 +244,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
         self.uiInsertImageAction.triggered.connect(self._insertImageActionSlot)
         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
@@ -299,8 +312,26 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
         """
         Called when we ask to display the grid
         """
+        self.showGrid(self.uiShowGridAction.isChecked())
 
-        self.uiGraphicsView.viewport().update()
+        # save settings
+        project = Topology.instance().project()
+        if project is not None:
+            project.setShowGrid(self.uiShowGridAction.isChecked())
+            project.update()
+
+    def _snapToGridActionSlot(self):
+        """
+        Called when user click on the snap to grid menu item
+        :return: None
+        """
+        self.snapToGrid(self.uiSnapToGridAction.isChecked())
+
+        # save settings
+        project = Topology.instance().project()
+        if project is not None:
+            project.setSnapToGrid(self.uiSnapToGridAction.isChecked())
+            project.update()
 
     def analyticsClient(self):
         """
@@ -313,6 +344,11 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
         """
         Slot called to create a new project.
         """
+
+        # prevents race condition
+        if self._project_dialog is not None:
+            return
+
         self._project_dialog = ProjectDialog(self)
         self._project_dialog.show()
         create_new_project = self._project_dialog.exec_()
@@ -321,7 +357,8 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
         self.uiNodesDockWidget.setWindowTitle("")
 
         if create_new_project:
-            Topology.instance().createLoadProject(self._project_dialog.getProjectSettings())
+            Topology.instance().createLoadProject(
+                self._project_dialog.getProjectSettings())
 
         self._project_dialog = None
 
@@ -537,6 +574,60 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
         # TODO: quality option
         return image.save(path)
 
+    def showLayers(self, show_layers):
+        """
+        Shows layers in GUI
+        :param show_layers: boolean
+        :return: None
+        """
+        NodeItem.show_layer = show_layers
+        ShapeItem.show_layer = show_layers
+        for item in self.uiGraphicsView.items():
+            item.update()
+
+    def showGrid(self, show_grid):
+        """
+        Shows grid in GUI
+        :param show_grid: boolean
+        :return: None
+        """
+        self.uiGraphicsView.viewport().update()
+
+    def snapToGrid(self, snap_to_grid):
+        """
+        Snap to grid in GUI
+        :param snap_to_grid: boolean
+        :return: None
+        """
+        self.uiGraphicsView.viewport().update()
+
+    def showInterfaceLabels(self, show_interface_labels):
+        """
+        Show interface labels in GUI
+        :param show_interface_labels: boolean
+        :return: None
+        """
+        LinkItem.showPortLabels(show_interface_labels)
+        for item in self.uiGraphicsView.scene().items():
+            if isinstance(item, LinkItem):
+                item.adjust()
+
+    def _updateZoomSettings(self, zoom=None):
+        """
+        Updates zoom settings
+        :param zoom integer optional, when not provided then calculated from current view
+        :return: None
+        """
+
+        if zoom is None:
+            zoom = round(self.uiGraphicsView.transform().m11() * 100)
+
+        # save settings
+        project = Topology.instance().project()
+        if project is not None:
+            project.setZoom(zoom)
+            project.update()
+
     def _screenshotActionSlot(self):
         """
         Slot called to take a screenshot of the scene.
@@ -549,10 +640,11 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
             return
         self._screenshots_dir = os.path.dirname(path)
 
-        # add the extension if missing
-        file_format = "." + selected_filter[:4].lower().strip()
-        if not path.endswith(file_format):
-            path += file_format
+        # add the extension if missing (Mac OS automatically adds an extension already)
+        if not sys.platform.startswith("darwin"):
+            file_format = "." + selected_filter[:4].lower().strip()
+            if not path.endswith(file_format):
+                path += file_format
 
         if not self.createScreenshot(path):
             QtWidgets.QMessageBox.critical(self, "Screenshot", "Could not create screenshot file {}".format(path))
@@ -605,6 +697,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
 
         factor_in = pow(2.0, 120 / 240.0)
         self.uiGraphicsView.scaleView(factor_in)
+        self._updateZoomSettings()
 
     def _zoomOutActionSlot(self):
         """
@@ -613,6 +706,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
 
         factor_out = pow(2.0, -120 / 240.0)
         self.uiGraphicsView.scaleView(factor_out)
+        self._updateZoomSettings()
 
     def _zoomResetActionSlot(self):
         """
@@ -620,6 +714,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
         """
 
         self.uiGraphicsView.resetTransform()
+        self._updateZoomSettings()
 
     def _fitInViewActionSlot(self):
         """
@@ -635,11 +730,13 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
         """
         Slot called to show the layer positions on the scene.
         """
+        self.showLayers(self.uiShowLayersAction.isChecked())
 
-        NodeItem.show_layer = self.uiShowLayersAction.isChecked()
-        ShapeItem.show_layer = self.uiShowLayersAction.isChecked()
-        for item in self.uiGraphicsView.items():
-            item.update()
+        # save settings
+        project = Topology.instance().project()
+        if project is not None:
+            project.setShowLayers(self.uiShowLayersAction.isChecked())
+            project.update()
 
     def _resetPortLabelsActionSlot(self):
         """
@@ -656,10 +753,13 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
         Slot called to show the port names on the scene.
         """
 
-        LinkItem.showPortLabels(self.uiShowPortNamesAction.isChecked())
-        for item in self.uiGraphicsView.scene().items():
-            if isinstance(item, LinkItem):
-                item.adjust()
+        self.showInterfaceLabels(self.uiShowPortNamesAction.isChecked())
+
+        # save settings
+        project = Topology.instance().project()
+        if project is not None:
+            project.setShowInterfaceLabels(self.uiShowPortNamesAction.isChecked())
+            project.update()
 
     def _startAllActionSlot(self):
         """
@@ -716,7 +816,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
         Slot called when connecting to all the nodes using the console.
         """
 
-        self.uiGraphicsView.consoleFromItems(self.uiGraphicsView.scene().items())
+        self.uiGraphicsView.consoleFromAllItems()
 
     def _addNoteActionSlot(self):
         """
@@ -737,7 +837,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
             return
         self._pictures_dir = os.path.dirname(path)
 
-        image = QtGui.QPixmap(path)
+        QtGui.QPixmap(path)
         self.uiGraphicsView.addImage(path)
 
     def _drawRectangleActionSlot(self):
@@ -754,6 +854,13 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
 
         self.uiGraphicsView.addEllipse(self.uiDrawEllipseAction.isChecked())
 
+    def _drawLineActionSlot(self):
+        """
+        Slot called when adding a line on the scene.
+        """
+
+        self.uiGraphicsView.addLine(self.uiDrawLineAction.isChecked())
+
     def _onlineHelpActionSlot(self):
         """
         Slot to launch a browser pointing to the documentation page.
@@ -842,8 +949,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
         else:
             self.uiNodesDockWidget.setWindowTitle(title)
             self.uiNodesDockWidget.setVisible(True)
-            self.uiNodesView.clear()
-            self.uiNodesView.populateNodesView(category)
+            self.uiNodesDockWidget.populateNodesView(category)
 
     def _localConfigChangedSlot(self):
         """
@@ -918,6 +1024,10 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
         """
         Topology.instance().editReadme()
 
+    def resizeEvent(self, event):
+        self._notif_dialog.resize()
+        super().resizeEvent(event)
+
     def keyPressEvent(self, event):
         """
         Handles all key press events for the main window.
@@ -940,6 +1050,13 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
         :param event: QCloseEvent
         """
 
+        if Topology.instance().project():
+            reply = QtWidgets.QMessageBox.question(self, "Confirm Exit", "Are you sure you want to exit GNS3?",
+                                                   QtWidgets.QMessageBox.Yes | QtWidgets.QMessageBox.No)
+            if reply == QtWidgets.QMessageBox.No:
+                event.ignore()
+                return
+
         progress = Progress.instance()
         progress.setAllowCancelQuery(True)
         progress.setCancelButtonText("Force quit")
@@ -1000,9 +1117,28 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
                 sys.exit(1)
                 return
 
+        run_as_root_path = LocalConfig.instance().runAsRootPath()
+
         if not sys.platform.startswith("win") and os.geteuid() == 0:
+            # touches file to know that user has run GNS3 as root and to prevent
+            # from running as user
+            if not os.path.exists(run_as_root_path):
+                try:
+                    open(run_as_root_path, 'a').close()
+                except OSError as e:
+                    log.warning("Cannot write `run_as_root` file due to: {}".format(str(e)))
+
             QtWidgets.QMessageBox.warning(self, "Root", "Running GNS3 as root is not recommended and could be dangerous")
 
+        if not sys.platform.startswith("win") and os.geteuid() != 0 and os.path.exists(run_as_root_path):
+            QtWidgets.QMessageBox.critical(
+                self, "Run as user",
+                "GNS3 has been previously run as root. It is not possible "
+                "to change to another user and GNS3 will be shutdown. Please delete the '{}' file "
+                "and start the program again.".format(run_as_root_path))
+
+            sys.exit(1)
+
         # restore debug level
         if self._settings["debug_level"]:
             root = logging.getLogger()

gns3/modules/builtin/__init__.py

@@ -33,7 +33,6 @@ from .atm_switch import ATMSwitch
 from .settings import (
     BUILTIN_SETTINGS,
     CLOUD_SETTINGS,
-    NAT_SETTINGS,
     ETHERNET_HUB_SETTINGS,
     ETHERNET_SWITCH_SETTINGS
 )
@@ -224,45 +223,9 @@ class Builtin(Module):
         :param project: Project instance
         """
 
-        log.info("instantiating node {}".format(node_class))
         # create an instance of the node class
         return node_class(self, server, project)
 
-    def createNode(self, node, node_name):
-        """
-        Creates a node.
-
-        :param node: Node instance
-        :param node_name: Node name
-        """
-
-        log.info("creating node {}".format(node))
-        if isinstance(node, Cloud):
-            for key, info in self._cloud_nodes.items():
-                if node_name == info["name"]:
-                    default_name_format = info["default_name_format"].replace('{name}', node_name)
-                    node.create(ports=info["ports_mapping"], default_name_format=default_name_format)
-                    return
-        elif isinstance(node, Nat):
-            for key, info in self._nat_nodes.items():
-                if node_name == info["name"]:
-                    default_name_format = info["default_name_format"].replace('{name}', node_name)
-                    node.create(default_name_format=default_name_format)
-                    return
-        elif isinstance(node, EthernetHub):
-            for key, info in self._ethernet_hubs.items():
-                if node_name == info["name"]:
-                    default_name_format = info["default_name_format"].replace('{name}', node_name)
-                    node.create(ports=info["ports_mapping"], default_name_format=default_name_format)
-                    return
-        elif isinstance(node, EthernetSwitch):
-            for key, info in self._ethernet_switches.items():
-                if node_name == info["name"]:
-                    default_name_format = info["default_name_format"].replace('{name}', node_name)
-                    node.create(ports=info["ports_mapping"], default_name_format=default_name_format)
-                    return
-        node.create()
-
     @staticmethod
     def findAlternativeInterface(node, missing_interface):
 
@@ -330,17 +293,6 @@ class Builtin(Module):
         """
 
         nodes = []
-        for node_class in Builtin.classes():
-            nodes.append(
-                {"class": node_class.__name__,
-                 "name": node_class.symbolName(),
-                 "categories": node_class.categories(),
-                 "symbol": node_class.defaultSymbol(),
-                 "builtin": True,
-                 "node_type": node_class.URL_PREFIX
-                 }
-            )
-
         # add custom cloud node templates
         for cloud_node in self._cloud_nodes.values():
             nodes.append(
@@ -371,9 +323,8 @@ class Builtin(Module):
                  "server": switch["server"],
                  "symbol": switch["symbol"],
                  "categories": [switch["category"]]
-                 }
+                }
             )
-
         return nodes
 
     @staticmethod

gns3/modules/builtin/atm_switch.py

@@ -44,20 +44,6 @@ class ATMSwitch(Node):
         self._always_on = True
         self.settings().update({"mappings": {}})
 
-    def create(self, name=None, node_id=None, mappings=None, default_name_format="ATM{0}"):
-        """
-        Creates this ATM switch.
-
-        :param name: optional name for this switch.
-        :param node_id: Node identifier on the server
-        :param mappings: mappings to be automatically added when creating this ATM switch
-        """
-
-        params = {}
-        if mappings:
-            params["mappings"] = mappings
-        self._create(name, node_id, params, default_name_format)
-
     def _createCallback(self, result):
         """
         Callback for create.
@@ -167,28 +153,6 @@ class ATMSwitch(Node):
             atmsw["properties"]["mappings"] = self._settings["mappings"]
         return atmsw
 
-    def load(self, node_info):
-        """
-        Loads an ATM switch representation
-        (from a topology file).
-
-        :param node_info: representation of the node (dictionary)
-        """
-
-        super().load(node_info)
-        properties = node_info["properties"]
-        name = properties.pop("name")
-
-        # ATM switches do not have an UUID before version 2.0
-        node_id = properties.get("node_id", str(uuid.uuid4()))
-
-        mappings = {}
-        if "mappings" in properties:
-            mappings = properties["mappings"]
-
-        log.info("ATM switch {} is loading".format(name))
-        self.create(name, node_id, mappings)
-
     def configPage(self):
         """
         Returns the configuration page widget to be used by the node properties dialog.

gns3/modules/builtin/cloud.py

@@ -46,20 +46,6 @@ class Cloud(Node):
 
         return self._interfaces
 
-    def create(self, name=None, node_id=None, ports=None, default_name_format="Cloud{0}"):
-        """
-        Creates this cloud.
-
-        :param name: optional name for this cloud
-        :param node_id: Node identifier on the server
-        :param ports: ports to be automatically added when creating this cloud
-        """
-
-        params = {}
-        if ports:
-            params["ports_mapping"] = ports
-        self._create(name, node_id, params, default_name_format)
-
     def _createCallback(self, result, error=False, **kwargs):
         """
         Callback for create.
@@ -108,7 +94,9 @@ class Cloud(Node):
 
         info = """Cloud device {name} is always-on
 This is a node for external connections
-""".format(name=self.name())
+Device run on {host}
+""".format(name=self.name(),
+           host=self.compute().name())
 
         port_info = ""
         for port in self._ports:

gns3/modules/builtin/ethernet_hub.py

@@ -39,20 +39,6 @@ class EthernetHub(Node):
         self._always_on = True
         self.settings().update({"ports_mapping": []})
 
-    def create(self, name=None, node_id=None, ports=None, default_name_format="Hub{0}"):
-        """
-        Creates this hub.
-
-        :param name: optional name for this hub
-        :param node_id: node identifier on the server
-        :param ports: ports to automatically be added when creating this hub
-        """
-
-        params = {}
-        if ports:
-            params["ports_mapping"] = ports
-        self._create(name, node_id, params, default_name_format)
-
     def _createCallback(self, result):
         """
         Callback for create.

gns3/modules/builtin/ethernet_switch.py

@@ -38,21 +38,7 @@ class EthernetSwitch(Node):
         # this is an always-on node
         self.setStatus(Node.started)
         self._always_on = True
-        self.settings().update({"ports_mapping": []})
-
-    def create(self, name=None, node_id=None, ports=None, default_name_format="SW{0}"):
-        """
-        Creates this Ethernet switch.
-
-        :param name: optional name for this switch
-        :param node_id: node identifier on the server
-        :param ports: ports to be automatically added when creating this switch
-        """
-
-        params = {}
-        if ports:
-            params["ports_mapping"] = ports
-        self._create(name, node_id, params, default_name_format)
+        self.settings().update({"ports_mapping": [], "console": None, "console_type": "telnet"})
 
     def _createCallback(self, result):
         """
@@ -61,6 +47,10 @@ class EthernetSwitch(Node):
         :param result: server response (dict)
         """
         self.settings()["ports_mapping"] = result["ports_mapping"]
+        self.settings()["console"] = result["console"]
+
+    def console(self):
+        return self.settings()["console"]
 
     def update(self, new_settings):
         """

gns3/modules/builtin/frame_relay_switch.py

@@ -41,20 +41,6 @@ class FrameRelaySwitch(Node):
         self._always_on = True
         self.settings().update({"mappings": {}})
 
-    def create(self, name=None, node_id=None, mappings={}, default_name_format="FR{0}"):
-        """
-        Creates this Frame Relay switch.
-
-        :param name: name for this switch.
-        :param node_id: node identifier on the server
-        :param mappings: mappings to be automatically added when creating this Frame relay switch
-        """
-
-        params = {}
-        if mappings:
-            params["mappings"] = mappings
-        self._create(name, node_id, params, default_name_format)
-
     def _createCallback(self, result):
         """
         Callback for create.
@@ -96,12 +82,11 @@ class FrameRelaySwitch(Node):
   Local node ID is {id}
   Server's Node ID is {node_id}
   Hardware is Dynamips emulated simple Frame relay switch
-  Switch's server runs on {host}:{port}
+  Switch's server runs on {host}
 """.format(name=self.name(),
            id=self.id(),
            node_id=self._node_id,
-           host=self._compute.host(),
-           port=self._compute.port())
+           host=self._compute.name())
 
         port_info = ""
         for port in self._ports:

gns3/modules/builtin/nat.py

@@ -46,17 +46,6 @@ class Nat(Node):
 
         return self._interfaces
 
-    def create(self, name=None, node_id=None, default_name_format="Nat{0}"):
-        """
-        Creates this nat.
-
-        :param name: optional name for this nat
-        :param node_id: Node identifier on the server
-        """
-
-        params = {}
-        self._create(name, node_id, params, default_name_format)
-
     def _createCallback(self, result, error=False, **kwargs):
         """
         Callback for create.
@@ -101,7 +90,9 @@ class Nat(Node):
 
         info = """Nat device {name} is always-on
 This is a node for external connections
-""".format(name=self.name())
+Device run on {host}
+""".format(name=self.name(),
+           host=self.compute().name())
 
         port_info = ""
         for port in self._ports:

gns3/modules/builtin/pages/cloud_configuration_page.py

@@ -19,7 +19,7 @@
 Configuration page for clouds.
 """
 
-from gns3.qt import QtCore, QtWidgets
+from gns3.qt import QtCore, QtGui, QtWidgets
 from gns3.dialogs.symbol_selection_dialog import SymbolSelectionDialog
 from gns3.controller import Controller
 from gns3.node import Node
@@ -68,6 +68,12 @@ class CloudConfigurationPage(QtWidgets.QWidget, Ui_cloudConfigPageWidget):
         self.uiShowSpecialInterfacesCheckBox.stateChanged.connect(self._showSpecialInterfacesSlot)
         self.uiSymbolToolButton.clicked.connect(self._symbolBrowserSlot)
 
+        # add an icon to warning button
+        icon = QtGui.QIcon.fromTheme("dialog-warning")
+        if icon.isNull():
+            icon = QtGui.QIcon(':/icons/dialog-warning.svg')
+        self.uiEthernetWarningPushButton.setIcon(icon)
+
     def _EthernetChangedSlot(self):
         """
         Enables the use of the delete button.

gns3/modules/builtin/settings.py

@@ -25,14 +25,6 @@ BUILTIN_SETTINGS = {
 }
 
 
-NAT_SETTINGS = {
-    "name": "",
-    "default_name_format": "Nat{0}",
-    "symbol": ":/symbols/cloud.svg",
-    "category": Node.end_devices,
-    "ports_mapping": [],
-}
-
 CLOUD_SETTINGS = {
     "name": "",
     "default_name_format": "Cloud{0}",

gns3/modules/builtin/ui/cloud_configuration_page.ui

@@ -82,9 +82,6 @@
          <property name="text">
           <string/>
          </property>
-         <property name="icon">
-          <iconset theme="dialog-warning"/>
-         </property>
         </widget>
        </item>
        <item row="2" column="0" colspan="2">

gns3/modules/builtin/ui/cloud_configuration_page_ui.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/modules/builtin/ui/cloud_configuration_page.ui'
 #
-# Created by: PyQt5 UI code generator 5.5.1
+# Created by: PyQt5 UI code generator 5.9
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -11,7 +11,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_cloudConfigPageWidget(object):
     def setupUi(self, cloudConfigPageWidget):
         cloudConfigPageWidget.setObjectName("cloudConfigPageWidget")
-        cloudConfigPageWidget.resize(758, 299)
+        cloudConfigPageWidget.resize(821, 363)
         self.verticalLayout = QtWidgets.QVBoxLayout(cloudConfigPageWidget)
         self.verticalLayout.setObjectName("verticalLayout")
         self.uiTabWidget = QtWidgets.QTabWidget(cloudConfigPageWidget)
@@ -46,8 +46,6 @@ class Ui_cloudConfigPageWidget(object):
         self.gridLayout_3.addWidget(self.uiEthernetListWidget, 1, 0, 1, 5)
         self.uiEthernetWarningPushButton = QtWidgets.QPushButton(self.EthernetTab)
         self.uiEthernetWarningPushButton.setText("")
-        icon = QtGui.QIcon.fromTheme("dialog-warning")
-        self.uiEthernetWarningPushButton.setIcon(icon)
         self.uiEthernetWarningPushButton.setObjectName("uiEthernetWarningPushButton")
         self.gridLayout_3.addWidget(self.uiEthernetWarningPushButton, 0, 1, 1, 1)
         self.uiShowSpecialInterfacesCheckBox = QtWidgets.QCheckBox(self.EthernetTab)

gns3/modules/builtin/ui/frame_relay_switch_configuration_page.ui

@@ -14,7 +14,7 @@
    <string>Frame Relay Switch</string>
   </property>
   <property name="whatsThis">
-   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is a simple Frame Relay switch. Only serial links can be connected to it. &lt;span style=&quot; font-weight:600;&quot;&gt;Note that only the Frame-Relay LMI AINSI type is supported.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is a simple Frame Relay switch. Only serial links can be connected to it. &lt;span style=&quot; font-weight:600;&quot;&gt;Note that only the Frame-Relay LMI ANSI type is supported.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
    <item row="0" column="0" colspan="2">

gns3/modules/builtin/ui/frame_relay_switch_configuration_page_ui.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/modules/builtin/ui/frame_relay_switch_configuration_page.ui'
+# Form implementation generated from reading ui file '/home/dominik/projects/gns3-gui/gns3/modules/builtin/ui/frame_relay_switch_configuration_page.ui'
 #
-# Created by: PyQt5 UI code generator 5.5.1
+# Created by: PyQt5 UI code generator 5.8.2
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -134,7 +134,7 @@ class Ui_frameRelaySwitchConfigPageWidget(object):
     def retranslateUi(self, frameRelaySwitchConfigPageWidget):
         _translate = QtCore.QCoreApplication.translate
         frameRelaySwitchConfigPageWidget.setWindowTitle(_translate("frameRelaySwitchConfigPageWidget", "Frame Relay Switch"))
-        frameRelaySwitchConfigPageWidget.setWhatsThis(_translate("frameRelaySwitchConfigPageWidget", "<html><head/><body><p>This is a simple Frame Relay switch. Only serial links can be connected to it. <span style=\" font-weight:600;\">Note that only the Frame-Relay LMI AINSI type is supported.</span></p></body></html>"))
+        frameRelaySwitchConfigPageWidget.setWhatsThis(_translate("frameRelaySwitchConfigPageWidget", "<html><head/><body><p>This is a simple Frame Relay switch. Only serial links can be connected to it. <span style=\" font-weight:600;\">Note that only the Frame-Relay LMI ANSI type is supported.</span></p></body></html>"))
         self.uiGeneralGroupBox.setTitle(_translate("frameRelaySwitchConfigPageWidget", "General"))
         self.uiNameLabel.setText(_translate("frameRelaySwitchConfigPageWidget", "Name:"))
         self.uiFrameRelayMappingGroupBox.setTitle(_translate("frameRelaySwitchConfigPageWidget", "Mapping"))

gns3/modules/docker/__init__.py

@@ -137,60 +137,9 @@ class Docker(Module):
         :param node_class: Node object
         :param server: HTTPClient instance
         """
-        log.info("instantiating node {}".format(node_class))
         # create an instance of the node class
         return node_class(self, server, project)
 
-    def createNode(self, node, node_name):
-        """
-        Creates a node.
-
-        :param node: Node instance
-        :param node_name: Node name
-        """
-        log.info("creating node {} with id {}".format(node, node.id()))
-
-        image = None
-        if node_name:
-            for image_key, info in self._docker_containers.items():
-                if node_name == info["name"]:
-                    image = image_key
-        if not image:
-            selected_images = []
-            for image, info in self._docker_containers.items():
-                if info["server"] == node.compute().id():
-                    selected_images.append(image)
-
-            if not selected_images:
-                raise ModuleError("No Docker VM on server {}".format(
-                    node.server().url()))
-            elif len(selected_images) > 1:
-                from gns3.main_window import MainWindow
-                mainwindow = MainWindow.instance()
-
-                (selection, ok) = QtWidgets.QInputDialog.getItem(
-                    mainwindow, "Docker Image", "Please choose an image",
-                    selected_images, 0, False)
-                if ok:
-                    image = selection
-                else:
-                    raise ModuleError("Please select a Docker Image")
-            else:
-                image = selected_images[0]
-
-        image_settings = {}
-        for setting_name, value in self._docker_containers[image].items():
-            if setting_name in node.settings() and value != "" and value is not None:
-                if setting_name not in ['name', 'image']:
-                    image_settings[setting_name] = value
-
-        default_name_format = DOCKER_CONTAINER_SETTINGS["default_name_format"]
-        if self._docker_containers[image]["default_name_format"]:
-            default_name_format = self._docker_containers[image]["default_name_format"]
-
-        image = self._docker_containers[image]["image"]
-        node.create(image, base_name=node_name, additional_settings=image_settings, default_name_format=default_name_format)
-
     def reset(self):
         """Resets the servers."""
         self._nodes.clear()

gns3/modules/docker/docker_vm.py

@@ -38,7 +38,6 @@ class DockerVM(Node):
     def __init__(self, module, server, project):
 
         super().__init__(module, server, project)
-        log.info("Docker VM is being created")
 
         docker_vm_settings = {"image": "",
                               "adapters": DOCKER_CONTAINER_SETTINGS["adapters"],
@@ -54,23 +53,6 @@ class DockerVM(Node):
 
         self.settings().update(docker_vm_settings)
 
-    def create(self, image, name=None, base_name=None, node_id=None, additional_settings={}, default_name_format="{name}-{0}"):
-        """Creates this Docker container.
-
-        :param image: image name
-        :param name: optional name
-        :param additional_settings: additional settings for this VM
-        """
-
-        params = {
-            "image": image,
-            "adapters": self._settings["adapters"]
-        }
-        params.update(additional_settings)
-        if base_name:
-            default_name_format = default_name_format.replace('{name}', base_name)
-        self._create(name=name, node_id=node_id, params=params, default_name_format=default_name_format, timeout=None)
-
     def _createCallback(self, result):
         """
         Callback for Docker container creating.
@@ -106,10 +88,15 @@ class DockerVM(Node):
 
         info = """Docker container {name} is {state}
   Node ID is {id}, server's Docker container ID is {node_id}
+  Docker VM's server run on {host}
+  Console is on port {console} and type is {console_type}
 """.format(name=self.name(),
            id=self.id(),
            node_id=self._node_id,
-           state=state)
+           state=state,
+           host=self.compute().name(),
+           console=self._settings["console"],
+           console_type=self._settings["console_type"])
 
         port_info = ""
         for port in self._ports:

gns3/modules/dynamips/__init__.py

@@ -245,56 +245,9 @@ class Dynamips(Module):
         :param project: Project instance
         """
 
-        log.info("instantiating node {}".format(node_class))
         # create an instance of the node class
         return node_class(self, server, project)
 
-    def createNode(self, node, node_name):
-        """
-        Creates a node.
-
-        :param node: Node instance
-        :param node_name: Node name
-        """
-
-        log.info("creating node {}".format(node))
-
-        if isinstance(node, Router):
-            ios_router = None
-            if node_name:
-                for ios_key, info in self._ios_routers.items():
-                    if node_name == info["name"]:
-                        ios_router = self._ios_routers[ios_key]
-                        break
-
-            if not ios_router:
-                raise ModuleError("No IOS router for platform {}".format(node.settings()["platform"]))
-
-            vm_settings = {}
-            for setting_name, value in ios_router.items():
-                if setting_name in node.settings() and setting_name != "name" and value != "" and value is not None:
-                    vm_settings[setting_name] = value
-
-            default_name_format = IOS_ROUTER_SETTINGS["default_name_format"]
-            if ios_router["default_name_format"]:
-                default_name_format = ios_router["default_name_format"]
-
-            # Older GNS3 versions may have the following invalid settings in the VM template
-            if "console" in vm_settings:
-                del vm_settings["console"]
-            if "sensors" in vm_settings:
-                del vm_settings["sensors"]
-            if "power_supplies" in vm_settings:
-                del vm_settings["power_supplies"]
-
-            ram = vm_settings.pop("ram")
-            image = vm_settings.pop("image", None)
-            if image is None:
-                raise ModuleError("No IOS image has been associated with this IOS router")
-            node.create(image, ram, additional_settings=vm_settings, default_name_format=default_name_format)
-        else:
-            node.create()
-
     def updateImageIdlepc(self, image_path, idlepc):
         """
         Updates the Idle-PC for an IOS image.
@@ -307,7 +260,7 @@ class Dynamips(Module):
             if os.path.basename(ios_router["image"]) == image_path:
                 if ios_router["idlepc"] != idlepc:
                     ios_router["idlepc"] = idlepc
-                    log.info("Idle-PC value {} saved into '{}' template".format(idlepc, ios_router["name"]))
+                    log.debug("Idle-PC value {} saved into '{}' template".format(idlepc, ios_router["name"]))
                     self._saveIOSRouters()
 
     def reset(self):
@@ -317,28 +270,6 @@ class Dynamips(Module):
 
         self._nodes.clear()
 
-    def exportConfigs(self, directory):
-        """
-        Exports all configs for all nodes to a directory.
-
-        :param directory: destination directory path
-        """
-
-        for node in self._nodes:
-            if isinstance(node, Router) and node.initialized():
-                node.exportConfigToDirectory(directory)
-
-    def importConfigs(self, directory):
-        """
-        Imports configs to all nodes from a directory.
-
-        :param directory: source directory path
-        """
-
-        for node in self._nodes:
-            if isinstance(node, Router) and node.initialized():
-                node.importConfigFromDirectory(directory)
-
     def findAlternativeIOSImage(self, image, node):
         """
         Tries to find an alternative IOS image.

gns3/modules/dynamips/dialogs/ios_router_wizard.py

@@ -21,17 +21,13 @@ Wizard for IOS routers.
 
 import os
 import re
-import uuid
 
 
 from gns3.qt import QtCore, QtGui, QtWidgets, qslot
 from gns3.node import Node
-from gns3.topology import Topology
 from gns3.utils.run_in_terminal import RunInTerminal
-from gns3.utils.get_resource import get_resource
-from gns3.utils.get_default_base_config import get_default_base_config
 from gns3.dialogs.vm_with_images_wizard import VMWithImagesWizard
-from gns3.compute_manager import ComputeManager
+from gns3.controller import Controller
 
 from ..ui.ios_router_wizard_ui import Ui_IOSRouterWizard
 from ..settings import PLATFORMS_DEFAULT_RAM, PLATFORMS_DEFAULT_NVRAM, CHASSIS, ADAPTER_MATRIX, WIC_MATRIX
@@ -92,8 +88,8 @@ class IOSRouterWizard(VMWithImagesWizard, Ui_IOSRouterWizard):
         self.uiIdlepcLineEdit.textChanged.emit(self.uiIdlepcLineEdit.text())
 
         # location of the base config templates
-        self._base_startup_config_template = get_resource(os.path.join("configs", "ios_base_startup-config.txt"))
-        self._base_etherswitch_startup_config_template = get_resource(os.path.join("configs", "ios_etherswitch_startup-config.txt"))
+        self._base_startup_config_template = "ios_base_startup-config.txt"
+        self._base_etherswitch_startup_config_template = "ios_etherswitch_startup-config.txt"
 
         # FIXME: hide because of issue on Windows.
         self.uiTestIOSImagePushButton.hide()
@@ -215,36 +211,22 @@ class IOSRouterWizard(VMWithImagesWizard, Ui_IOSRouterWizard):
             self._idle_valid = False
         self.uiIdlepcLineEdit.setStyleSheet('QLineEdit { background-color: %s }' % color)
 
-    def _idlePCFinderSlot(self):
+    def _idlePCFinderSlot(self, ):
         """
         Slot for the idle-PC finder.
         """
-        if Topology.instance().project() is None:
-            project = Topology.instance().createLoadProject({"project_name": str(uuid.uuid4())})
-            project.project_updated_signal.connect(self._projectCreatedSlot)
-        else:
-            self._projectCreatedSlot()
-
-    @qslot
-    def _projectCreatedSlot(self, *args):
-        if Topology.instance().project() is None:
-            return
-        try:
-            Topology.instance().project().project_updated_signal.disconnect(self._projectCreatedSlot)
-            self._project_created = True
-        except TypeError:
-            pass  # If the slot is not connected (project already created)
-
-        module = Dynamips.instance()
+        image = self.uiIOSImageLineEdit.text()
         platform = self.uiPlatformComboBox.currentText()
-        ios_image = self.uiIOSImageLineEdit.text()
         ram = self.uiRamSpinBox.value()
-        router_class = PLATFORM_TO_CLASS[platform]
-
-        self._router = router_class(module, ComputeManager.instance().getCompute(self._compute_id), Topology.instance().project())
-        self._router.create(ios_image, ram, name="AUTOIDLEPC")
-        self._router.created_signal.connect(self.createdSlot)
-        self._router.server_error_signal.connect(self.serverErrorSlot)
+        Controller.instance().postCompute("/auto_idlepc",
+                                          self._compute_id,
+                                          self._computeAutoIdlepcCallback,
+                                          timeout=None,
+                                          body={
+                                              "image": image,
+                                              "platform": platform,
+                                              "ram": ram
+                                          })
         self.uiIdlePCFinderPushButton.setEnabled(False)
 
     def _etherSwitchSlot(self, state):
@@ -261,15 +243,6 @@ class IOSRouterWizard(VMWithImagesWizard, Ui_IOSRouterWizard):
             self.uiNameLineEdit.setText(self.uiPlatformComboBox.currentText())
             # self.uiNameLineEdit.setEnabled(True)
 
-    def createdSlot(self, base_node_id):
-        """
-        The node for the auto Idle-PC has been created.
-
-        :param base_node_id: not used
-        """
-
-        self._router.computeAutoIdlepc(self._computeAutoIdlepcCallback)
-
     def serverErrorSlot(self, base_node_id, message):
         """
         The auto idle-pc node could not be created.
@@ -289,13 +262,6 @@ class IOSRouterWizard(VMWithImagesWizard, Ui_IOSRouterWizard):
         :param error: indicates an error (boolean)
         """
 
-        if self._project_created:
-            Topology.instance().deleteProject()
-            self._project_created = False
-            self._router = None
-        elif self._router:
-            self._router.delete()
-            self._router = None
         if error:
             QtWidgets.QMessageBox.critical(self, "Idle-PC finder", "Error: {}".format(result["message"]))
         else:
@@ -420,7 +386,7 @@ class IOSRouterWizard(VMWithImagesWizard, Ui_IOSRouterWizard):
         settings = {
             "name": self.uiNameLineEdit.text(),
             "image": image,
-            "startup_config": get_default_base_config(self._base_startup_config_template),
+            "startup_config": self._base_startup_config_template,
             "ram": self.uiRamSpinBox.value(),
             "nvram": PLATFORMS_DEFAULT_NVRAM[platform],
             "idlepc": self.uiIdlepcLineEdit.text(),
@@ -431,7 +397,7 @@ class IOSRouterWizard(VMWithImagesWizard, Ui_IOSRouterWizard):
 
         if self.uiEtherSwitchCheckBox.isChecked():
             settings["default_name_format"] = "ESW{0}"
-            settings["startup_config"] = get_default_base_config(self._base_etherswitch_startup_config_template)
+            settings["startup_config"] = self._base_etherswitch_startup_config_template
             settings["symbol"] = ":/symbols/multilayer_switch.svg"
             settings["disk0"] = 1  # adds 1MB disk to store vlan.dat
             settings["category"] = Node.switches

gns3/modules/dynamips/nodes/router.py

@@ -48,7 +48,6 @@ class Router(Node):
     def __init__(self, module, server, project, platform="c7200"):
 
         super().__init__(module, server, project)
-        log.info("Router {} is being created".format(platform))
         self._dynamips_id = None
 
         router_settings = {"platform": platform,
@@ -88,48 +87,6 @@ class Router(Node):
 
         self.settings().update(router_settings)
 
-    def create(self, image, ram, name=None, node_id=None, dynamips_id=None, additional_settings={}, default_name_format="R{0}"):
-        """
-        Creates this router.
-
-        :param image: IOS image path
-        :param ram: amount of RAM
-        :param name: optional name for this router
-        :param node_id: Node identifier on the server
-        :param dynamips_id: Dynamips identifier on the server
-        :param additional_settings: other additional and not mandatory settings
-        """
-
-        platform = self._settings["platform"]
-        self._settings["ram"] = ram
-        self._settings["image"] = image
-
-        # Minimum settings to send to the server in order to create a new router
-        params = {"name": name,
-                  "platform": platform,
-                  "ram": ram,
-                  "image": image}
-
-        if dynamips_id:
-            params["dynamips_id"] = dynamips_id
-
-        # push the startup-config
-        if not node_id and "startup_config" in additional_settings:
-            base_config_content = self._readBaseConfig(additional_settings["startup_config"])
-            if base_config_content is not None:
-                params["startup_config_content"] = base_config_content
-            del additional_settings["startup_config"]
-
-        # push the private-config
-        if not node_id and "private_config" in additional_settings:
-            base_config_content = self._readBaseConfig(additional_settings["private_config"])
-            if base_config_content is not None:
-                params["private_config_content"] = base_config_content
-            del additional_settings["private_config"]
-
-        params.update(additional_settings)
-        self._create(name, node_id, params, default_name_format)
-
     def _createCallback(self, result):
         """
         Callback for create.
@@ -147,18 +104,6 @@ class Router(Node):
         """
 
         params = {}
-        if "startup_config" in new_settings:
-            base_config_content = self._readBaseConfig(new_settings["startup_config"])
-            if base_config_content is not None:
-                params["startup_config_content"] = base_config_content
-            del new_settings["startup_config"]
-
-        if "private_config" in new_settings:
-            if new_settings["private_config"] and os.path.isfile(new_settings["private_config"]):
-                base_config_content = self._readBaseConfig(new_settings["private_config"])
-                if base_config_content is not None:
-                    params["private_config_content"] = base_config_content
-            del new_settings["private_config"]
 
         for name, value in new_settings.items():
             if name in self._settings:
@@ -181,9 +126,9 @@ class Router(Node):
         for name, value in result.items():
             if name in self._settings:
                 if self._settings[name] != value:
-                    log.info("{}: updating {} from '{}' to '{}'".format(self.name(), name, self._settings[name], value))
+                    log.debug("{}: updating {} from '{}' to '{}'".format(self.name(), name, self._settings[name], value))
                     self._settings[name] = value
-            elif name not in ("project_id", "port_name_format", "port_segment_size", "first_port_name", "node_directory", "status", "node_id", "width", "height", "compute_id", "node_type", "startup_config_content", "private_config_content", "dynamips_id", "command_line"):
+            elif name not in ("project_id", "port_name_format", "port_segment_size", "first_port_name", "node_directory", "status", "node_id", "width", "height", "compute_id", "node_type", "dynamips_id", "command_line"):
                 # All key should be known, but we raise error only in debug
                 if logging.getLogger().isEnabledFor(logging.DEBUG):
                     raise ValueError(name)
@@ -357,7 +302,7 @@ class Router(Node):
            specific_info=router_specific_info,
            ram=self._settings["ram"],
            nvram=self._settings["nvram"],
-           host=self.compute().id(),
+           host=self.compute().name(),
            console=self._settings["console"],
            aux=self._settings["aux"],
            image_name=os.path.basename(self._settings["image"]),
@@ -369,50 +314,6 @@ class Router(Node):
         slot_info = self._slot_info()
         return info + slot_info
 
-    def exportConfigToDirectory(self, directory):
-        """
-        Exports the startup-config and private-config to a directory.
-
-        :param directory: destination directory path
-        """
-
-        self.controllerHttpGet("/nodes/{node_id}".format(node_id=self._node_id),
-                               self._exportConfigToDirectoryCallback,
-                               context={"directory": directory})
-
-    def _exportConfigToDirectoryCallback(self, result, error=False, context={}, **kwargs):
-        """
-        Callback for exportConfigToDirectory.
-
-        :param result: server response
-        :param error: indicates an error (boolean)
-        """
-
-        if error:
-            log.error("error while exporting {} configs: {}".format(self.name(), result["message"]))
-            self.server_error_signal.emit(self.id(), result["message"])
-        else:
-            result = result["properties"]
-            directory = context["directory"]
-            if "startup_config_content" in result:
-                config_path = os.path.join(directory, normalize_filename(self.name())) + "_startup-config.cfg"
-                try:
-                    with open(config_path, "wb") as f:
-                        log.info("saving {} startup-config to {}".format(self.name(), config_path))
-                        if result["startup_config_content"]:
-                            f.write(result["startup_config_content"].encode("utf-8"))
-                except OSError as e:
-                    self.error_signal.emit(self.id(), "Could not export startup-config to {}: {}".format(config_path, e))
-            if "private_config_content" in result:
-                config_path = os.path.join(directory, normalize_filename(self.name())) + "_private-config.cfg"
-                try:
-                    with open(config_path, "wb") as f:
-                        log.info("saving {} private-config to {}".format(self.name(), config_path))
-                        if result["private_config_content"]:
-                            f.write(result["private_config_content"].encode("utf-8"))
-                except OSError as e:
-                    self.error_signal.emit(self.id(), "Could not export private-config to {}: {}".format(config_path, e))
-
     def configFiles(self):
         """
         Name of the configuration files
@@ -422,52 +323,6 @@ class Router(Node):
             "configs/i{}_private-config.cfg".format(self._dynamips_id)
         ]
 
-    def importConfig(self, path):
-        """
-        Imports a startup-config.
-
-        :param path: path to the startup-config
-        """
-
-        new_settings = {"startup_config": path}
-        self.update(new_settings)
-
-    def importPrivateConfig(self, path):
-        """
-        Imports a private-config.
-
-        :param path: path to the private-config
-        """
-
-        new_settings = {"private_config": path}
-        self.update(new_settings)
-
-    def importConfigFromDirectory(self, directory):
-        """
-        Imports a startup-config and a private-config from a directory.
-
-        :param directory: source directory path
-        """
-
-        try:
-            contents = os.listdir(directory)
-        except OSError as e:
-            return
-        startup_config = normalize_filename(self.name()) + "_startup-config.cfg"
-        private_config = normalize_filename(self.name()) + "_private-config.cfg"
-        new_settings = {}
-        if startup_config in contents:
-            new_settings["startup_config"] = os.path.join(directory, startup_config)
-
-        if private_config in contents:
-            new_settings["private_config"] = os.path.join(directory, private_config)
-        else:
-            # private-config is optional
-            log.debug("{}: no private-config file could be found, expected file name: {}".format(self.name(), private_config))
-
-        if new_settings:
-            self.update(new_settings)
-
     def console(self):
         """
         Returns the console port for this router.

gns3/modules/dynamips/pages/ios_router_configuration_page.py

@@ -26,6 +26,7 @@ from gns3.qt import QtCore, QtGui, QtWidgets
 from gns3.local_server import LocalServer
 from gns3.dialogs.node_properties_dialog import ConfigurationError
 from gns3.dialogs.symbol_selection_dialog import SymbolSelectionDialog
+from gns3.controller import Controller
 from gns3.node import Node
 from ..ui.ios_router_configuration_page_ui import Ui_iosRouterConfigPageWidget
 from ..settings import CHASSIS, ADAPTER_MATRIX, WIC_MATRIX
@@ -71,6 +72,10 @@ class IOSRouterConfigurationPage(QtWidgets.QWidget, Ui_iosRouterConfigPageWidget
         for name, category in Node.defaultCategories().items():
             self.uiCategoryComboBox.addItem(name, category)
 
+        if Controller.instance().isRemote():
+            self.uiStartupConfigToolButton.hide()
+            self.uiPrivateConfigToolButton.hide()
+
     def _idlePCValidateSlot(self):
         """
         Slot to validate the entered Idle-PC Value

gns3/modules/iou/__init__.py

@@ -24,7 +24,6 @@ import os
 import shutil
 
 from gns3.qt import QtWidgets
-from gns3.local_server_config import LocalServerConfig
 from gns3.local_config import LocalConfig
 
 from ..module import Module
@@ -175,69 +174,9 @@ class IOU(Module):
         :param project: Project instance
         """
 
-        log.info("instantiating node {}".format(node_class))
-
         # create an instance of the node class
         return node_class(self, server, project)
 
-    def createNode(self, node, node_name):
-        """
-        Creates a node.
-
-        :param node: Node instance
-        :param node_name: Node name
-        """
-
-        log.info("creating node {}".format(node))
-
-        iouimage = None
-        if node_name:
-            for iou_key, info in self._iou_devices.items():
-                if node_name == info["name"]:
-                    iouimage = iou_key
-
-        if not iouimage:
-            selected_images = []
-            for image, info in self._iou_devices.items():
-                if info["server"] == node.compute().id():
-                    selected_images.append(image)
-
-            if not selected_images:
-                raise ModuleError("No IOU image found for this device")
-            elif len(selected_images) > 1:
-
-                from gns3.main_window import MainWindow
-                mainwindow = MainWindow.instance()
-
-                (selection, ok) = QtWidgets.QInputDialog.getItem(mainwindow, "IOU image", "Please choose an image", selected_images, 0, False)
-                if ok:
-                    iouimage = selection
-                else:
-                    raise ModuleError("Please select an IOU image")
-
-            else:
-                iouimage = selected_images[0]
-
-        vm_settings = {}
-        for setting_name, value in self._iou_devices[iouimage].items():
-            if setting_name in node.settings() and setting_name != "name" and value != "" and value is not None:
-                vm_settings[setting_name] = value
-
-        default_name_format = IOU_DEVICE_SETTINGS["default_name_format"]
-        if self._iou_devices[iouimage]["default_name_format"]:
-            default_name_format = self._iou_devices[iouimage]["default_name_format"]
-
-        if vm_settings["use_default_iou_values"]:
-            del vm_settings["ram"]
-            del vm_settings["nvram"]
-
-        if "console" in vm_settings:
-            # Older GNS3 versions may have a console setting in the VM template
-            del vm_settings["console"]
-
-        iou_path = vm_settings.pop("path")
-        node.create(iou_path, additional_settings=vm_settings, default_name_format=default_name_format)
-
     def reset(self):
         """
         Resets the servers.
@@ -245,28 +184,6 @@ class IOU(Module):
 
         self._nodes.clear()
 
-    def exportConfigs(self, directory):
-        """
-        Exports all configs for all nodes to a directory.
-
-        :param directory: destination directory path
-        """
-
-        for node in self._nodes:
-            if node.initialized():
-                node.exportConfigToDirectory(directory)
-
-    def importConfigs(self, directory):
-        """
-        Imports configs to all nodes from a directory.
-
-        :param directory: source directory path
-        """
-
-        for node in self._nodes:
-            if node.initialized():
-                node.importConfigFromDirectory(directory)
-
     def findAlternativeIOUImage(self, image):
         """
         Tries to find an alternative IOU image

gns3/modules/iou/dialogs/iou_device_wizard.py

@@ -25,7 +25,6 @@ import sys
 from gns3.qt import QtGui, QtWidgets
 from gns3.node import Node
 from gns3.utils.get_resource import get_resource
-from gns3.utils.get_default_base_config import get_default_base_config
 from gns3.dialogs.vm_with_images_wizard import VMWithImagesWizard
 from gns3.compute_manager import ComputeManager
 
@@ -63,8 +62,8 @@ class IOUDeviceWizard(VMWithImagesWizard, Ui_IOUDeviceWizard):
         self.uiIOUImageLineEdit.textChanged.connect(self._imageLineEditTextChangedSlot)
 
         # location of the base config templates
-        self._base_iou_l2_config_template = get_resource(os.path.join("configs", "iou_l2_base_startup-config.txt"))
-        self._base_iou_l3_config_template = get_resource(os.path.join("configs", "iou_l3_base_startup-config.txt"))
+        self._base_iou_l2_config_template = "iou_l2_base_startup-config.txt"
+        self._base_iou_l3_config_template = "iou_l3_base_startup-config.txt"
 
         from ..pages.iou_device_preferences_page import IOUDevicePreferencesPage
         self.addImageSelector(self.uiExistingImageRadioButton, self.uiIOUImageListComboBox, self.uiIOUImageLineEdit, self.uiIOUImageToolButton, IOUDevicePreferencesPage.getIOUImage)
@@ -113,7 +112,7 @@ class IOUDeviceWizard(VMWithImagesWizard, Ui_IOUDeviceWizard):
         startup_config = ""
         if self.uiTypeComboBox.currentText() == "L2 image":
             # set the default L2 base startup-config
-            default_base_config = get_default_base_config(self._base_iou_l2_config_template)
+            default_base_config = self._base_iou_l2_config_template
             if default_base_config:
                 startup_config = default_base_config
             symbol = ":/symbols/multilayer_switch.svg"
@@ -122,7 +121,7 @@ class IOUDeviceWizard(VMWithImagesWizard, Ui_IOUDeviceWizard):
             serial_adapters = 0
         else:
             # set the default L3 base startup-config
-            default_base_config = get_default_base_config(self._base_iou_l3_config_template)
+            default_base_config = self._base_iou_l3_config_template
             if default_base_config:
                 startup_config = default_base_config
             symbol = ":/symbols/router.svg"
@@ -133,7 +132,6 @@ class IOUDeviceWizard(VMWithImagesWizard, Ui_IOUDeviceWizard):
         settings = {
             "name": self.uiNameLineEdit.text(),
             "path": path,
-            "image": os.path.basename(path),
             "startup_config": startup_config,
             "ethernet_adapters": ethernet_adapters,
             "serial_adapters": serial_adapters,

gns3/modules/iou/iou_device.py

@@ -23,7 +23,6 @@ import os
 import re
 from gns3.node import Node
 from gns3.utils.normalize_filename import normalize_filename
-from gns3.image_manager import ImageManager
 from .settings import IOU_DEVICE_SETTINGS
 
 import logging
@@ -45,8 +44,6 @@ class IOUDevice(Node):
     def __init__(self, module, server, project):
         super().__init__(module, server, project)
 
-        log.info("IOU instance is being created")
-
         iou_device_settings = {"path": "",
                                "md5sum": "",
                                "startup_config": "",
@@ -62,33 +59,6 @@ class IOUDevice(Node):
 
         self.settings().update(iou_device_settings)
 
-    def create(self, iou_path, name=None, node_id=None, additional_settings={}, default_name_format="IOU{0}"):
-        """
-        Creates this IOU device.
-
-        :param iou_path: path to an IOU image
-        :param name: optional name
-        :param console: optional TCP console port
-        """
-
-        params = {"path": iou_path}
-        # push the startup-config
-        if "startup_config" in additional_settings:
-            base_config_content = self._readBaseConfig(additional_settings["startup_config"])
-            if base_config_content is not None:
-                params["startup_config_content"] = base_config_content
-            del additional_settings["startup_config"]
-
-        # push the startup-config
-        if "private_config" in additional_settings:
-            base_config_content = self._readBaseConfig(additional_settings["private_config"])
-            if base_config_content is not None:
-                params["private_config_content"] = base_config_content
-            del additional_settings["private_config"]
-
-        params.update(additional_settings)
-        self._create(name, node_id, params, default_name_format)
-
     def _createCallback(self, result):
         """
         Callback for create.
@@ -106,8 +76,6 @@ class IOUDevice(Node):
             log.debug("{} is already running".format(self.name()))
             return
 
-        params = {}
-
         log.debug("{} is starting".format(self.name()))
         self.controllerHttpPost("/nodes/{node_id}/start".format(node_id=self._node_id), self._startCallback, progressText="{} is starting".format(self.name()))
 
@@ -119,18 +87,6 @@ class IOUDevice(Node):
         """
 
         params = {}
-        if "startup_config" in new_settings:
-            base_config_content = self._readBaseConfig(new_settings["startup_config"])
-            if base_config_content is not None:
-                params["startup_config_content"] = base_config_content
-            del new_settings["startup_config"]
-
-        if "private_config" in new_settings:
-            base_config_content = self._readBaseConfig(new_settings["private_config"])
-            if base_config_content is not None:
-                params["private_config_content"] = base_config_content
-            del new_settings["private_config"]
-
         for name, value in new_settings.items():
             if name in self._settings and self._settings[name] != value:
                 params[name] = value
@@ -189,95 +145,6 @@ class IOUDevice(Node):
         """
         return ["startup-config.cfg", "private-config.cfg"]
 
-    def exportConfigToDirectory(self, directory):
-        """
-        Exports the initial-config to a directory.
-
-        :param directory: destination directory path
-        """
-
-        self.controllerHttpGet("/nodes/{node_id}".format(node_id=self._node_id),
-                               self._exportConfigToDirectoryCallback,
-                               context={"directory": directory})
-
-    def _exportConfigToDirectoryCallback(self, result, error=False, context={}, **kwargs):
-        """
-        Callback for exportConfigToDirectory.
-
-        :param result: server response
-        :param error: indicates an error (boolean)
-        """
-
-        if error:
-            log.error("error while exporting {} IOU configs: {}".format(self.name(), result["message"]))
-            self.server_error_signal.emit(self.id(), result["message"])
-            return
-        export_directory = context["directory"]
-
-        result = result["properties"]
-        if "startup_config_content" in result:
-            startup_config_path = os.path.join(export_directory, normalize_filename(self.name())) + "_startup-config.cfg"
-            try:
-                with open(startup_config_path, "wb") as f:
-                    log.info("saving {} startup-config to {}".format(self.name(), startup_config_path))
-                    if result["startup_config_content"]:
-                        f.write(result["startup_config_content"].encode("utf-8"))
-            except OSError as e:
-                self.error_signal.emit(self.id(), "could not export startup-config to {}: {}".format(startup_config_path, e))
-
-        if "private_config_content" in result and result["private_config_content"] is not None and len(result["private_config_content"]) > 0:
-            private_config_path = os.path.join(export_directory, normalize_filename(self.name())) + "_private-config.cfg"
-            try:
-                with open(private_config_path, "wb") as f:
-                    log.info("saving {} private-config to {}".format(self.name(), private_config_path))
-                    if result["private_config_content"]:
-                        f.write(result["private_config_content"].encode("utf-8"))
-            except OSError as e:
-                self.error_signal.emit(self.id(), "could not export private-config to {}: {}".format(startup_config_path, e))
-
-    def importConfig(self, path):
-        """
-        Imports a startup-config.
-
-        :param path: path to the startup-config
-        """
-
-        new_settings = {"startup_config": path}
-        self.update(new_settings)
-
-    def importPrivateConfig(self, path):
-        """
-        Imports a private-config.
-
-        :param path: path to the private-config
-        """
-
-        new_settings = {"private_config": path}
-        self.update(new_settings)
-
-    def importConfigFromDirectory(self, directory):
-        """
-        Imports IOU configs from a directory.
-
-        :param directory: source directory path
-        """
-
-        contents = os.listdir(directory)
-        startup_config = normalize_filename(self.name()) + "_startup-config.cfg"
-        private_config = normalize_filename(self.name()) + "_private-config.cfg"
-        new_settings = {}
-        if startup_config in contents:
-            new_settings["startup_config"] = os.path.join(directory, startup_config)
-
-        if private_config in contents:
-            new_settings["private_config"] = os.path.join(directory, private_config)
-        else:
-            # private-config is optional
-            log.debug("{}: no private-config file could be found, expected file name: {}".format(self.name(), private_config))
-
-        if new_settings:
-            self.update(new_settings)
-
     def console(self):
         """
         Returns the console port for this IOU device.

gns3/modules/iou/pages/iou_device_configuration_page.py

@@ -26,8 +26,8 @@ from gns3.local_server import LocalServer
 from gns3.dialogs.node_properties_dialog import ConfigurationError
 from gns3.dialogs.symbol_selection_dialog import SymbolSelectionDialog
 from gns3.node import Node
+from gns3.controller import Controller
 from gns3.utils.get_resource import get_resource
-from gns3.utils.get_default_base_config import get_default_base_config
 from ..ui.iou_device_configuration_page_ui import Ui_iouDeviceConfigPageWidget
 
 
@@ -49,6 +49,9 @@ class iouDeviceConfigurationPage(QtWidgets.QWidget, Ui_iouDeviceConfigPageWidget
         self.uiDefaultValuesCheckBox.stateChanged.connect(self._useDefaultValuesSlot)
         self._current_iou_image = ""
         self._compute_id = None
+        if Controller.instance().isRemote():
+            self.uiStartupConfigToolButton.hide()
+            self.uiPrivateConfigToolButton.hide()
 
         # location of the base config templates
         self._base_iou_l2_config_template = get_resource(os.path.join("configs", "iou_l2_base_startup-config.txt"))
@@ -83,16 +86,17 @@ class iouDeviceConfigurationPage(QtWidgets.QWidget, Ui_iouDeviceConfigPageWidget
         self.uiIOUImageLineEdit.clear()
         self.uiIOUImageLineEdit.setText(path)
 
-        if "l2" in path:
-            # set the default L2 base startup-config
-            default_base_config = get_default_base_config(self._base_iou_l2_config_template)
-            if default_base_config:
-                self.uiStartupConfigLineEdit.setText(default_base_config)
-        else:
-            # set the default L3 base startup-config
-            default_base_config = get_default_base_config(self._base_iou_l3_config_template)
-            if default_base_config:
-                self.uiStartupConfigLineEdit.setText(default_base_config)
+        if len(self.uiStartupConfigLineEdit.text().strip()) == 0:
+            if "l2" in path:
+                # set the default L2 base startup-config
+                default_base_config = self._base_iou_l2_config_template
+                if default_base_config:
+                    self.uiStartupConfigLineEdit.setText(default_base_config)
+            else:
+                # set the default L3 base startup-config
+                default_base_config = self._base_iou_l3_config_template
+                if default_base_config:
+                    self.uiStartupConfigLineEdit.setText(default_base_config)
 
     def _startupConfigBrowserSlot(self):
         """

gns3/modules/iou/pages/iou_device_preferences_page.py

@@ -256,9 +256,9 @@ class IOUDevicePreferencesPage(QtWidgets.QWidget, Ui_IOUDevicePreferencesPageWid
             QtWidgets.QMessageBox.critical(parent, "IOU image", "Cannot read ELF magic number: {}".format(e))
             return
 
-        # file must start with the ELF magic number, be 32-bit, little endian and have an ELF version of 1
-        # normal IOS image are big endian!
-        if elf_header_start != b'\x7fELF\x01\x01\x01':
+        # file must start with the ELF magic number, be 32-bit or 64-bit, little endian and have an ELF version of 1
+        # (normal IOS image are big endian!)
+        if elf_header_start != b'\x7fELF\x01\x01\x01' and elf_header_start != b'\x7fELF\x02\x01\x01':
             QtWidgets.QMessageBox.critical(parent, "IOU image", "Sorry, this is not a valid IOU image!")
             return
 

gns3/modules/module.py

@@ -70,3 +70,25 @@ class Module(QtCore.QObject):
         """
 
         raise NotImplementedError()
+
+    def exportConfigs(self, directory):
+        """
+        Exports all configs for all nodes to a directory.
+
+        :param directory: destination directory path
+        """
+
+        for node in self._nodes:
+            if hasattr(node, "initialized") and node.initialized():
+                node.exportConfigToDirectory(directory)
+
+    def importConfigs(self, directory):
+        """
+        Imports configs to all nodes from a directory.
+
+        :param directory: source directory path
+        """
+
+        for node in self._nodes:
+            if hasattr(node, "initialized") and node.initialized():
+                node.importConfigFromDirectory(directory)

gns3/modules/qemu/__init__.py

@@ -75,6 +75,7 @@ class Qemu(Module):
         if sys.platform.startswith("linux"):
             server_settings = {
                 "enable_kvm": self._settings["enable_kvm"],
+                "require_kvm": self._settings["require_kvm"]
             }
 
             LocalServerConfig.instance().saveSettings(self.__class__.__name__, server_settings)
@@ -174,73 +175,9 @@ class Qemu(Module):
         :param server: HTTPClient instance
         """
 
-        log.info("instantiating node {}".format(node_class))
         # create an instance of the node class
         return node_class(self, server, project)
 
-    def createNode(self, node, node_name):
-        """
-        Creates a node.
-
-        :param node: Node instance
-        :param node_name: Node name
-        """
-
-        log.info("creating node {} with id {}".format(node, node.id()))
-
-        vm = None
-        if node_name:
-            for vm_key, info in self._qemu_vms.items():
-                if node_name == info["name"]:
-                    vm = vm_key
-
-        if not vm:
-            selected_vms = []
-            for vm, info in self._qemu_vms.items():
-                if info["server"] == node.compute().id():
-                    selected_vms.append(vm)
-
-            if not selected_vms:
-                raise ModuleError("No QEMU VM on server {}".format(node.server().host()))
-            elif len(selected_vms) > 1:
-
-                from gns3.main_window import MainWindow
-                mainwindow = MainWindow.instance()
-
-                (selection, ok) = QtWidgets.QInputDialog.getItem(mainwindow, "QEMU VM", "Please choose a VM", selected_vms, 0, False)
-                if ok:
-                    vm = selection
-                else:
-                    raise ModuleError("Please select a QEMU VM")
-            else:
-                vm = selected_vms[0]
-
-        vm_settings = {}
-        for setting_name, value in self._qemu_vms[vm].items():
-            if setting_name in node.settings() and value != "" and value is not None:
-                vm_settings[setting_name] = value
-
-        qemu_path = vm_settings.pop("qemu_path")
-        name = vm_settings.pop("name")
-        port_name_format = self._qemu_vms[vm]["port_name_format"]
-        port_segment_size = self._qemu_vms[vm]["port_segment_size"]
-        first_port_name = self._qemu_vms[vm]["first_port_name"]
-
-        default_name_format = QEMU_VM_SETTINGS["default_name_format"]
-        if self._qemu_vms[vm]["default_name_format"]:
-            default_name_format = self._qemu_vms[vm]["default_name_format"]
-        if self._qemu_vms[vm]["linked_base"]:
-            name = default_name_format.replace('{name}', name)
-
-        node.create(qemu_path,
-                    name=name,
-                    port_name_format=port_name_format,
-                    port_segment_size=port_segment_size,
-                    first_port_name=first_port_name,
-                    linked_clone=self._qemu_vms[vm]["linked_base"],
-                    additional_settings=vm_settings,
-                    default_name_format=default_name_format)
-
     def reset(self):
         """
         Resets the servers.

gns3/modules/qemu/pages/qemu_preferences_page.py

@@ -40,11 +40,24 @@ class QemuPreferencesPage(QtWidgets.QWidget, Ui_QemuPreferencesPageWidget):
 
         # connect signals
         self.uiRestoreDefaultsPushButton.clicked.connect(self._restoreDefaultsSlot)
+        self.uiKVMAccelerationCheckBox.stateChanged.connect(self._kvmAccelerationSlot)
 
         if not sys.platform.startswith("linux"):
             # KVM can only run on Linux
             self.uiKVMAccelerationCheckBox.hide()
 
+    def _kvmAccelerationSlot(self, state):
+        """
+        Slot to enable or not the require KVM acceleration check box.
+        """
+
+        if state:
+            self.uiRequireKVMAccelerationCheckBox.setEnabled(True)
+            self.uiRequireKVMAccelerationCheckBox.setChecked(True)
+        else:
+            self.uiRequireKVMAccelerationCheckBox.setEnabled(False)
+            self.uiRequireKVMAccelerationCheckBox.setChecked(False)
+
     def _restoreDefaultsSlot(self):
         """
         Slot to populate the page widgets with the default settings.
@@ -60,6 +73,7 @@ class QemuPreferencesPage(QtWidgets.QWidget, Ui_QemuPreferencesPageWidget):
         """
 
         self.uiKVMAccelerationCheckBox.setChecked(settings["enable_kvm"])
+        self.uiRequireKVMAccelerationCheckBox.setChecked(settings["require_kvm"])
 
     def loadPreferences(self):
         """
@@ -74,5 +88,6 @@ class QemuPreferencesPage(QtWidgets.QWidget, Ui_QemuPreferencesPageWidget):
         Saves QEMU preferences.
         """
 
-        new_settings = {"enable_kvm": self.uiKVMAccelerationCheckBox.isChecked()}
+        new_settings = {"enable_kvm": self.uiKVMAccelerationCheckBox.isChecked(),
+                        "require_kvm": self.uiRequireKVMAccelerationCheckBox.isChecked()}
         Qemu.instance().setSettings(new_settings)

gns3/modules/qemu/pages/qemu_vm_configuration_page.py

@@ -332,8 +332,8 @@ class QemuVMConfigurationPage(QtWidgets.QWidget, Ui_QemuVMConfigPageWidget):
             # set the device name
             self.uiNameLineEdit.setText(settings["name"])
 
-            if "linked_base" in settings:
-                self.uiBaseVMCheckBox.setChecked(settings["linked_base"])
+            if "linked_clone" in settings:
+                self.uiBaseVMCheckBox.setChecked(settings["linked_clone"])
             else:
                 self.uiBaseVMCheckBox.hide()
 
@@ -457,8 +457,8 @@ class QemuVMConfigurationPage(QtWidgets.QWidget, Ui_QemuVMConfigPageWidget):
             else:
                 settings["name"] = name
 
-            if "linked_base" in settings:
-                settings["linked_base"] = self.uiBaseVMCheckBox.isChecked()
+            if "linked_clone" in settings:
+                settings["linked_clone"] = self.uiBaseVMCheckBox.isChecked()
 
             settings["hda_disk_image"] = self.uiHdaDiskImageLineEdit.text().strip()
             settings["hdb_disk_image"] = self.uiHdbDiskImageLineEdit.text().strip()

gns3/modules/qemu/pages/qemu_vm_preferences_page.py

@@ -70,7 +70,7 @@ class QemuVMPreferencesPage(QtWidgets.QWidget, Ui_QemuVMPreferencesPageWidget):
         # fill out the General section
         section_item = self._createSectionItem("General")
         QtWidgets.QTreeWidgetItem(section_item, ["Template name:", qemu_vm["name"]])
-        if qemu_vm["linked_base"]:
+        if qemu_vm["linked_clone"]:
             QtWidgets.QTreeWidgetItem(section_item, ["Default name format:", qemu_vm["default_name_format"]])
         try:
             QtWidgets.QTreeWidgetItem(section_item, ["Server:", ComputeManager.instance().getCompute(qemu_vm["server"]).name()])
@@ -79,7 +79,7 @@ class QemuVMPreferencesPage(QtWidgets.QWidget, Ui_QemuVMPreferencesPageWidget):
         QtWidgets.QTreeWidgetItem(section_item, ["Console type:", qemu_vm["console_type"]])
         QtWidgets.QTreeWidgetItem(section_item, ["CPUs:", str(qemu_vm["cpus"])])
         QtWidgets.QTreeWidgetItem(section_item, ["Memory:", "{} MB".format(qemu_vm["ram"])])
-        QtWidgets.QTreeWidgetItem(section_item, ["Linked base VM:", "{}".format(qemu_vm["linked_base"])])
+        QtWidgets.QTreeWidgetItem(section_item, ["Linked base VM:", "{}".format(qemu_vm["linked_clone"])])
 
         if qemu_vm["qemu_path"]:
             QtWidgets.QTreeWidgetItem(section_item, ["QEMU binary:", os.path.basename(qemu_vm["qemu_path"])])
@@ -199,7 +199,8 @@ class QemuVMPreferencesPage(QtWidgets.QWidget, Ui_QemuVMPreferencesPageWidget):
             dialog.show()
             if dialog.exec_():
                 # update the icon
-                item.setIcon(0, QtGui.QIcon(qemu_vm["symbol"]))
+                Controller.instance().getSymbolIcon(qemu_vm["symbol"], qpartial(self._setItemIcon, item))
+
                 if qemu_vm["name"] != item.text(0):
                     new_key = "{server}:{name}".format(server=qemu_vm["server"], name=qemu_vm["name"])
                     if new_key in self._qemu_vms:

gns3/modules/qemu/qemu_vm.py

@@ -20,7 +20,6 @@ QEMU VM implementation.
 """
 
 from gns3.node import Node
-from gns3.image_manager import ImageManager
 from .settings import QEMU_VM_SETTINGS
 
 
@@ -41,7 +40,6 @@ class QemuVM(Node):
     def __init__(self, module, server, project):
         super().__init__(module, server, project)
 
-        log.info("QEMU VM instance is being created")
         self._linked_clone = True
 
         qemu_vm_settings = {"usage": "",
@@ -88,24 +86,6 @@ class QemuVM(Node):
 
         self.settings().update(qemu_vm_settings)
 
-    def create(self, qemu_path, name=None, node_id=None, port_name_format="Ethernet{0}", port_segment_size=0,
-               first_port_name="", linked_clone=True, additional_settings={}, default_name_format=None):
-        """
-        Creates this QEMU VM.
-
-        :param name: optional name
-        :param node_id: Node identifier
-        """
-
-        self._linked_clone = linked_clone
-        params = {"qemu_path": qemu_path,
-                  "linked_clone": linked_clone,
-                  "port_name_format": port_name_format,
-                  "port_segment_size": port_segment_size,
-                  "first_port_name": first_port_name}
-        params.update(additional_settings)
-        self._create(name, node_id, params, default_name_format)
-
     def _createCallback(self, result):
         """
         Callback for create.

gns3/modules/qemu/settings.py

@@ -23,6 +23,7 @@ from gns3.node import Node
 
 QEMU_SETTINGS = {
     "enable_kvm": True,
+    "require_kvm": True,
 }
 
 QEMU_VM_SETTINGS = {
@@ -61,6 +62,6 @@ QEMU_VM_SETTINGS = {
     "kernel_image": "",
     "initrd": "",
     "kernel_command_line": "",
-    "linked_base": True,
+    "linked_clone": True,
     "server": "local"
 }

gns3/modules/qemu/ui/qemu_preferences_page.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>366</width>
-    <height>183</height>
+    <width>414</width>
+    <height>223</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -37,6 +37,13 @@
          </property>
         </widget>
        </item>
+       <item>
+        <widget class="QCheckBox" name="uiRequireKVMAccelerationCheckBox">
+         <property name="text">
+          <string>Require KVM acceleration</string>
+         </property>
+        </widget>
+       </item>
        <item>
         <spacer name="verticalSpacer">
          <property name="orientation">

gns3/modules/qemu/ui/qemu_preferences_page_ui.py

@@ -2,8 +2,7 @@
 
 # Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/modules/qemu/ui/qemu_preferences_page.ui'
 #
-# Created: Wed Dec  7 21:25:31 2016
-#      by: PyQt5 UI code generator 5.2.1
+# Created by: PyQt5 UI code generator 5.5.1
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,7 +11,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_QemuPreferencesPageWidget(object):
     def setupUi(self, QemuPreferencesPageWidget):
         QemuPreferencesPageWidget.setObjectName("QemuPreferencesPageWidget")
-        QemuPreferencesPageWidget.resize(366, 183)
+        QemuPreferencesPageWidget.resize(414, 223)
         self.verticalLayout = QtWidgets.QVBoxLayout(QemuPreferencesPageWidget)
         self.verticalLayout.setObjectName("verticalLayout")
         self.uiTabWidget = QtWidgets.QTabWidget(QemuPreferencesPageWidget)
@@ -26,6 +25,9 @@ class Ui_QemuPreferencesPageWidget(object):
         self.uiKVMAccelerationCheckBox = QtWidgets.QCheckBox(self.uiServerSettingsTabWidget)
         self.uiKVMAccelerationCheckBox.setObjectName("uiKVMAccelerationCheckBox")
         self.verticalLayout_2.addWidget(self.uiKVMAccelerationCheckBox)
+        self.uiRequireKVMAccelerationCheckBox = QtWidgets.QCheckBox(self.uiServerSettingsTabWidget)
+        self.uiRequireKVMAccelerationCheckBox.setObjectName("uiRequireKVMAccelerationCheckBox")
+        self.verticalLayout_2.addWidget(self.uiRequireKVMAccelerationCheckBox)
         spacerItem = QtWidgets.QSpacerItem(20, 5, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
         self.verticalLayout_2.addItem(spacerItem)
         self.uiTabWidget.addTab(self.uiServerSettingsTabWidget, "")
@@ -47,6 +49,7 @@ class Ui_QemuPreferencesPageWidget(object):
         _translate = QtCore.QCoreApplication.translate
         QemuPreferencesPageWidget.setWindowTitle(_translate("QemuPreferencesPageWidget", "QEMU"))
         self.uiKVMAccelerationCheckBox.setText(_translate("QemuPreferencesPageWidget", "Enable KVM acceleration"))
+        self.uiRequireKVMAccelerationCheckBox.setText(_translate("QemuPreferencesPageWidget", "Require KVM acceleration"))
         self.uiTabWidget.setTabText(self.uiTabWidget.indexOf(self.uiServerSettingsTabWidget), _translate("QemuPreferencesPageWidget", "Local settings"))
         self.uiRestoreDefaultsPushButton.setText(_translate("QemuPreferencesPageWidget", "Restore defaults"))
 

gns3/modules/qemu/ui/qemu_vm_configuration_page.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>594</width>
-    <height>645</height>
+    <width>655</width>
+    <height>696</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -92,6 +92,11 @@
            <string>vnc</string>
           </property>
          </item>
+         <item>
+          <property name="text">
+           <string>spice</string>
+          </property>
+         </item>
         </widget>
        </item>
        <item row="8" column="0">
@@ -551,7 +556,7 @@
           <number>0</number>
          </property>
          <property name="maximum">
-          <number>32</number>
+          <number>275</number>
          </property>
         </widget>
        </item>
@@ -786,7 +791,18 @@
            </widget>
           </item>
           <item row="0" column="1">
-           <widget class="QLineEdit" name="uiQemuOptionsLineEdit"/>
+           <widget class="QLineEdit" name="uiQemuOptionsLineEdit">
+            <property name="toolTip">
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Variable replacements:&lt;/p&gt;
+&lt;ul&gt;
+&lt;li&gt;%vm-name% =VM name&lt;/li&gt;
+&lt;li&gt;%vm-id% =VM ID&lt;/li&gt;
+&lt;li&gt;%project-id% = project ID&lt;/li&gt;
+&lt;li&gt;%project-path% = project path&lt;/li&gt;
+&lt;/ul&gt;
+&lt;/body&gt;&lt;/html&gt;</string>
+            </property>
+           </widget>
           </item>
           <item row="1" column="0" colspan="2">
            <widget class="QCheckBox" name="uiBaseVMCheckBox">

gns3/modules/qemu/ui/qemu_vm_configuration_page_ui.py

@@ -2,8 +2,7 @@
 
 # Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/modules/qemu/ui/qemu_vm_configuration_page.ui'
 #
-# Created: Thu Jan  5 14:49:45 2017
-#      by: PyQt5 UI code generator 5.2.1
+# Created by: PyQt5 UI code generator 5.5.1
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,7 +11,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_QemuVMConfigPageWidget(object):
     def setupUi(self, QemuVMConfigPageWidget):
         QemuVMConfigPageWidget.setObjectName("QemuVMConfigPageWidget")
-        QemuVMConfigPageWidget.resize(594, 645)
+        QemuVMConfigPageWidget.resize(655, 696)
         self.verticalLayout = QtWidgets.QVBoxLayout(QemuVMConfigPageWidget)
         self.verticalLayout.setObjectName("verticalLayout")
         self.uiQemutabWidget = QtWidgets.QTabWidget(QemuVMConfigPageWidget)
@@ -54,6 +53,7 @@ class Ui_QemuVMConfigPageWidget(object):
         self.uiConsoleTypeComboBox.setObjectName("uiConsoleTypeComboBox")
         self.uiConsoleTypeComboBox.addItem("")
         self.uiConsoleTypeComboBox.addItem("")
+        self.uiConsoleTypeComboBox.addItem("")
         self.gridLayout_4.addWidget(self.uiConsoleTypeComboBox, 8, 1, 1, 1)
         self.uiConsoleTypeLabel = QtWidgets.QLabel(self.uiGeneralSettingsTab)
         self.uiConsoleTypeLabel.setObjectName("uiConsoleTypeLabel")
@@ -286,7 +286,7 @@ class Ui_QemuVMConfigPageWidget(object):
         sizePolicy.setHeightForWidth(self.uiAdaptersSpinBox.sizePolicy().hasHeightForWidth())
         self.uiAdaptersSpinBox.setSizePolicy(sizePolicy)
         self.uiAdaptersSpinBox.setMinimum(0)
-        self.uiAdaptersSpinBox.setMaximum(32)
+        self.uiAdaptersSpinBox.setMaximum(275)
         self.uiAdaptersSpinBox.setObjectName("uiAdaptersSpinBox")
         self.gridLayout_5.addWidget(self.uiAdaptersSpinBox, 0, 1, 1, 1)
         self.uiPortNameFormatLineEdit = QtWidgets.QLineEdit(self.uiNetworkTab)
@@ -404,6 +404,10 @@ class Ui_QemuVMConfigPageWidget(object):
         self.uiACPIShutdownCheckBox = QtWidgets.QCheckBox(self.groupBox)
         self.uiACPIShutdownCheckBox.setObjectName("uiACPIShutdownCheckBox")
         self.gridLayout_3.addWidget(self.uiACPIShutdownCheckBox, 2, 0, 1, 2)
+        self.uiQemuOptionsLineEdit.raise_()
+        self.uiQemuOptionsLabel.raise_()
+        self.uiACPIShutdownCheckBox.raise_()
+        self.uiBaseVMCheckBox.raise_()
         self.verticalLayout_2.addWidget(self.groupBox)
         spacerItem4 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
         self.verticalLayout_2.addItem(spacerItem4)
@@ -424,6 +428,7 @@ class Ui_QemuVMConfigPageWidget(object):
         self.uiSymbolLabel.setText(_translate("QemuVMConfigPageWidget", "Symbol:"))
         self.uiConsoleTypeComboBox.setItemText(0, _translate("QemuVMConfigPageWidget", "telnet"))
         self.uiConsoleTypeComboBox.setItemText(1, _translate("QemuVMConfigPageWidget", "vnc"))
+        self.uiConsoleTypeComboBox.setItemText(2, _translate("QemuVMConfigPageWidget", "spice"))
         self.uiConsoleTypeLabel.setText(_translate("QemuVMConfigPageWidget", "Console type:"))
         self.uiBootPriorityLabel.setText(_translate("QemuVMConfigPageWidget", "Boot priority:"))
         self.uiQemuListLabel.setText(_translate("QemuVMConfigPageWidget", "Qemu binary:"))
@@ -488,6 +493,14 @@ class Ui_QemuVMConfigPageWidget(object):
         self.uiProcessPriorityComboBox.setItemText(5, _translate("QemuVMConfigPageWidget", "Very low"))
         self.groupBox.setTitle(_translate("QemuVMConfigPageWidget", "Additional settings"))
         self.uiQemuOptionsLabel.setText(_translate("QemuVMConfigPageWidget", "Options:"))
+        self.uiQemuOptionsLineEdit.setToolTip(_translate("QemuVMConfigPageWidget", "<html><head/><body><p>Variable replacements:</p>\n"
+"<ul>\n"
+"<li>%vm-name% =VM name</li>\n"
+"<li>%vm-id% =VM ID</li>\n"
+"<li>%project-id% = project ID</li>\n"
+"<li>%project-path% = project path</li>\n"
+"</ul>\n"
+"</body></html>"))
         self.uiBaseVMCheckBox.setText(_translate("QemuVMConfigPageWidget", "Use as a linked base VM"))
         self.uiACPIShutdownCheckBox.setText(_translate("QemuVMConfigPageWidget", "Enable ACPI shutdown (experimental)"))
         self.uiQemutabWidget.setTabText(self.uiQemutabWidget.indexOf(self.uiAdvancedSettingsTab), _translate("QemuVMConfigPageWidget", "Advanced settings"))

gns3/modules/qemu/ui/qemu_vm_wizard.ui

@@ -185,6 +185,11 @@
         <string>vnc</string>
        </property>
       </item>
+      <item>
+       <property name="text">
+        <string>spice</string>
+       </property>
+      </item>
      </widget>
     </item>
     <item>

gns3/modules/qemu/ui/qemu_vm_wizard_ui.py

@@ -1,16 +1,14 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file '/Users/noplay/code/gns3/gns3-gui/gns3/modules/qemu/ui/qemu_vm_wizard.ui'
+# Form implementation generated from reading ui file '/home/dominik/projects/gns3-gui/gns3/modules/qemu/ui/qemu_vm_wizard.ui'
 #
-# Created by: PyQt5 UI code generator 5.6
+# Created by: PyQt5 UI code generator 5.8.2
 #
 # WARNING! All changes made in this file will be lost!
 
 from PyQt5 import QtCore, QtGui, QtWidgets
 
-
 class Ui_QemuVMWizard(object):
-
     def setupUi(self, QemuVMWizard):
         QemuVMWizard.setObjectName("QemuVMWizard")
         QemuVMWizard.resize(623, 417)
@@ -99,6 +97,7 @@ class Ui_QemuVMWizard(object):
         self.uiQemuConsoleTypeComboBox.setObjectName("uiQemuConsoleTypeComboBox")
         self.uiQemuConsoleTypeComboBox.addItem("")
         self.uiQemuConsoleTypeComboBox.addItem("")
+        self.uiQemuConsoleTypeComboBox.addItem("")
         self.verticalLayout.addWidget(self.uiQemuConsoleTypeComboBox)
         self.label = QtWidgets.QLabel(self.uiConsoleTypeWizardPage)
         self.label.setObjectName("label")
@@ -234,6 +233,7 @@ class Ui_QemuVMWizard(object):
         self.uiConsoleTypeWizardPage.setSubTitle(_translate("QemuVMWizard", "Please choose the console type. Telnet will connect to the serial console of the machine. VNC will connect to graphical output of the machine."))
         self.uiQemuConsoleTypeComboBox.setItemText(0, _translate("QemuVMWizard", "telnet"))
         self.uiQemuConsoleTypeComboBox.setItemText(1, _translate("QemuVMWizard", "vnc"))
+        self.uiQemuConsoleTypeComboBox.setItemText(2, _translate("QemuVMWizard", "spice"))
         self.label.setText(_translate("QemuVMWizard", "Note: You don\'t need to install anything on the VM itself."))
         self.uiDiskWizardPage.setTitle(_translate("QemuVMWizard", "Disk image"))
         self.uiDiskWizardPage.setSubTitle(_translate("QemuVMWizard", "Please choose a base disk image for your virtual machine."))
@@ -250,3 +250,4 @@ class Ui_QemuVMWizard(object):
         self.uiKernelImageLabel.setText(_translate("QemuVMWizard", "Kernel image (vmlinuz):"))
         self.uiKernelImageToolButton.setText(_translate("QemuVMWizard", "&Browse..."))
         self.uiInitrdLabel.setText(_translate("QemuVMWizard", "Initial RAM disk (initrd):"))
+

gns3/modules/virtualbox/__init__.py

@@ -23,12 +23,10 @@ import os
 import sys
 import shutil
 
-from gns3.qt import QtWidgets
 from gns3.local_server_config import LocalServerConfig
 from gns3.local_config import LocalConfig
 
 from ..module import Module
-from ..module_error import ModuleError
 from .virtualbox_vm import VirtualBoxVM
 from .settings import VBOX_SETTINGS
 from .settings import VBOX_VM_SETTINGS
@@ -78,7 +76,8 @@ class VirtualBox(Module):
             vboxmanage_path_osx = "/Applications/VirtualBox.app/Contents/MacOS/VBoxManage"
             if os.path.exists(vboxmanage_path_osx):
                 vboxmanage_path = vboxmanage_path_osx
-        else:
+
+        if vboxmanage_path is None:
             vboxmanage_path = shutil.which("vboxmanage")
 
         if vboxmanage_path is None:
@@ -216,74 +215,9 @@ class VirtualBox(Module):
         :param project: Project instance
         """
 
-        log.info("instantiating node {}".format(node_class))
         # create an instance of the node class
         return node_class(self, server, project)
 
-    def createNode(self, node, node_name):
-        """
-        Creates a node.
-
-        :param node: Node instance
-        :param node_name: Node name
-        """
-
-        log.info("creating node {} with id {}".format(node, node.id()))
-
-        vm = None
-        if node_name:
-            for vm_key, info in self._virtualbox_vms.items():
-                if node_name == info["name"]:
-                    vm = vm_key
-
-        if not vm:
-            selected_vms = []
-            for vm, info in self._virtualbox_vms.items():
-                if info["server"] == node.compute().id():
-                    selected_vms.append(vm)
-
-            if not selected_vms:
-                raise ModuleError("No VirtualBox VM on server {}".format(node.server().url()))
-            elif len(selected_vms) > 1:
-
-                from gns3.main_window import MainWindow
-                mainwindow = MainWindow.instance()
-
-                (selection, ok) = QtWidgets.QInputDialog.getItem(mainwindow, "VirtualBox VM", "Please choose a VM", selected_vms, 0, False)
-                if ok:
-                    vm = selection
-                else:
-                    raise ModuleError("Please select a VirtualBox VM")
-
-            else:
-                vm = selected_vms[0]
-
-        vm_settings = {}
-        for setting_name, value in self._virtualbox_vms[vm].items():
-            if setting_name != "name" and setting_name in node.settings() and value != "" and value is not None:
-                vm_settings[setting_name] = value
-
-        name = self._virtualbox_vms[vm]["name"]
-        vmname = self._virtualbox_vms[vm]["vmname"]
-        port_name_format = self._virtualbox_vms[vm]["port_name_format"]
-        port_segment_size = self._virtualbox_vms[vm]["port_segment_size"]
-        first_port_name = self._virtualbox_vms[vm]["first_port_name"]
-
-        default_name_format = VBOX_VM_SETTINGS["default_name_format"]
-        if self._virtualbox_vms[vm]["default_name_format"]:
-            default_name_format = self._virtualbox_vms[vm]["default_name_format"]
-        if self._virtualbox_vms[vm]["linked_base"]:
-            name = default_name_format.replace('{name}', name)
-
-        node.create(vmname,
-                    name=name,
-                    port_name_format=port_name_format,
-                    port_segment_size=port_segment_size,
-                    first_port_name=first_port_name,
-                    linked_clone=self._virtualbox_vms[vm]["linked_base"],
-                    additional_settings=vm_settings,
-                    default_name_format=default_name_format)
-
     def reset(self):
         """
         Resets the module.

gns3/modules/virtualbox/dialogs/virtualbox_vm_wizard.py

@@ -100,7 +100,7 @@ class VirtualBoxVMWizard(VMWizard, Ui_VirtualBoxVMWizard):
             "vmname": vmname,
             "server": self._compute_id,
             "ram": vminfo["ram"],
-            "linked_base": self.uiBaseVMCheckBox.isChecked()
+            "linked_clone": self.uiBaseVMCheckBox.isChecked()
         }
 
         return settings

gns3/modules/virtualbox/pages/virtualbox_vm_configuration_page.py

@@ -86,8 +86,8 @@ class VirtualBoxVMConfigurationPage(QtWidgets.QWidget, Ui_virtualBoxVMConfigPage
                 self.uiNameLabel.hide()
                 self.uiNameLineEdit.hide()
 
-            if "linked_base" in settings:
-                self.uiBaseVMCheckBox.setChecked(settings["linked_base"])
+            if "linked_clone" in settings:
+                self.uiBaseVMCheckBox.setChecked(settings["linked_clone"])
             else:
                 self.uiBaseVMCheckBox.hide()
 
@@ -163,8 +163,8 @@ class VirtualBoxVMConfigurationPage(QtWidgets.QWidget, Ui_virtualBoxVMConfigPage
                 else:
                     settings["name"] = name
 
-            if "linked_base" in settings:
-                settings["linked_base"] = self.uiBaseVMCheckBox.isChecked()
+            if "linked_clone" in settings:
+                settings["linked_clone"] = self.uiBaseVMCheckBox.isChecked()
 
         if not node:
             # these are template settings

gns3/modules/virtualbox/pages/virtualbox_vm_preferences_page.py

@@ -70,7 +70,7 @@ class VirtualBoxVMPreferencesPage(QtWidgets.QWidget, Ui_VirtualBoxVMPreferencesP
         section_item = self._createSectionItem("General")
         QtWidgets.QTreeWidgetItem(section_item, ["Template name:", vbox_vm["name"]])
         QtWidgets.QTreeWidgetItem(section_item, ["VirtualBox name:", vbox_vm["vmname"]])
-        if vbox_vm["linked_base"]:
+        if vbox_vm["linked_clone"]:
             QtWidgets.QTreeWidgetItem(section_item, ["Default name format:", vbox_vm["default_name_format"]])
         QtWidgets.QTreeWidgetItem(section_item, ["RAM:", str(vbox_vm["ram"])])
         try:
@@ -79,7 +79,7 @@ class VirtualBoxVMPreferencesPage(QtWidgets.QWidget, Ui_VirtualBoxVMPreferencesP
             pass
         QtWidgets.QTreeWidgetItem(section_item, ["Headless mode enabled:", "{}".format(vbox_vm["headless"])])
         QtWidgets.QTreeWidgetItem(section_item, ["ACPI shutdown enabled:", "{}".format(vbox_vm["acpi_shutdown"])])
-        QtWidgets.QTreeWidgetItem(section_item, ["Linked base VM:", "{}".format(vbox_vm["linked_base"])])
+        QtWidgets.QTreeWidgetItem(section_item, ["Linked base VM:", "{}".format(vbox_vm["linked_clone"])])
 
         # fill out the Network section
         section_item = self._createSectionItem("Network")

gns3/modules/virtualbox/settings.py

@@ -40,6 +40,6 @@ VBOX_VM_SETTINGS = {
     "adapter_type": "Intel PRO/1000 MT Desktop (82540EM)",
     "headless": False,
     "acpi_shutdown": False,
-    "linked_base": False,
+    "linked_clone": False,
     "server": "local"
 }

gns3/modules/virtualbox/virtualbox_vm.py

@@ -19,11 +19,8 @@
 VirtualBox VM implementation.
 """
 
-import sys
-import os
-import tempfile
-
 from gns3.node import Node
+from gns3.utils.bring_to_front import bring_window_to_front_from_process_name
 from .settings import VBOX_VM_SETTINGS
 
 import logging
@@ -45,7 +42,6 @@ class VirtualBoxVM(Node):
     def __init__(self, module, server, project):
 
         super().__init__(module, server, project)
-        log.info("VirtualBox VM instance is being created")
         self._linked_clone = False
 
         virtualbox_vm_settings = {"vmname": "",
@@ -63,30 +59,6 @@ class VirtualBoxVM(Node):
 
         self.settings().update(virtualbox_vm_settings)
 
-    def create(self, vmname, name=None, node_id=None, port_name_format="Ethernet{0}", port_segment_size=0,
-               first_port_name="", linked_clone=False, additional_settings={}, default_name_format=None):
-        """
-        Creates this VirtualBox VM.
-
-        :param vmname: VM name in VirtualBox
-        :param name: optional name
-        :param node_id: Node identifier
-        :param linked_clone: either the VM is a linked clone
-        :param additional_settings: additional settings for this VM
-        """
-
-        if not name:
-            name = vmname
-
-        self._linked_clone = linked_clone
-        params = {"vmname": vmname,
-                  "linked_clone": linked_clone,
-                  "port_name_format": port_name_format,
-                  "port_segment_size": port_segment_size,
-                  "first_port_name": first_port_name}
-        params.update(additional_settings)
-        self._create(name, node_id, params, default_name_format)
-
     def _createCallback(self, result):
         """
         Callback for create.
@@ -155,6 +127,19 @@ class VirtualBoxVM(Node):
         """
         return self._settings["console"]
 
+    def bringToFront(self):
+        """
+        Bring the VM window to front.
+        """
+
+        if self.status() == Node.started:
+            # try 2 different window title formats
+            bring_window_to_front_from_process_name("VirtualBox.exe", title="{} [".format(self._settings["vmname"]))
+            bring_window_to_front_from_process_name("VirtualBox.exe", title="{} (".format(self._settings["vmname"]))
+
+        # bring any console to front
+        return Node.bringToFront(self)
+
     def configPage(self):
         """
         Returns the configuration page widget to be used by the node properties dialog.

gns3/modules/vmware/__init__.py

@@ -23,13 +23,13 @@ import os
 import sys
 import shutil
 import subprocess
+import codecs
 
-from gns3.qt import QtWidgets
 from gns3.local_server_config import LocalServerConfig
 from gns3.local_config import LocalConfig
+from collections import OrderedDict
 
 from gns3.modules.module import Module
-from gns3.modules.module_error import ModuleError
 from gns3.modules.vmware.vmware_vm import VMwareVM
 from gns3.modules.vmware.settings import VMWARE_SETTINGS
 from gns3.modules.vmware.settings import VMWARE_VM_SETTINGS
@@ -147,6 +147,46 @@ class VMware(Module):
         # Workstation is the default
         return "ws"
 
+    @staticmethod
+    def parseVMwareFile(path):
+        """
+        Parses a VMware file (VMX, preferences or inventory).
+
+        :param path: path to the VMware file
+
+        :returns: dict
+        """
+
+        pairs = OrderedDict()
+        encoding = "utf-8"
+        # get the first line to read the .encoding value
+        with open(path, "rb") as f:
+            line = f.readline().decode(encoding, errors="ignore")
+            if line.startswith("#!"):
+                # skip the shebang
+                line = f.readline().decode(encoding, errors="ignore")
+            try:
+                key, value = line.split('=', 1)
+                if key.strip().lower() == ".encoding":
+                    file_encoding = value.strip('" ')
+                    try:
+                        codecs.lookup(file_encoding)
+                        encoding = file_encoding
+                    except LookupError:
+                        log.warning("Invalid file encoding detected in '{}': {}".format(path, file_encoding))
+            except ValueError:
+                log.warning("Couldn't find file encoding in {}, using {}...".format(path, encoding))
+
+        # read the file with the correct encoding
+        with open(path, encoding=encoding, errors="ignore") as f:
+            for line in f.read().splitlines():
+                try:
+                    key, value = line.split('=', 1)
+                    pairs[key.strip().lower()] = value.strip('" ')
+                except ValueError:
+                    continue
+        return pairs
+
     def _loadSettings(self):
         """
         Loads the settings from the server settings file.
@@ -283,75 +323,9 @@ class VMware(Module):
         :param project: Project instance
         """
 
-        log.info("instantiating node {}".format(node_class))
-
         # create an instance of the node class
         return node_class(self, server, project)
 
-    def createNode(self, node, node_name):
-        """
-        Creates a node.
-
-        :param node: Node instance
-        :param node_name: Node name
-        """
-
-        log.info("creating node {} with id {}".format(node, node.id()))
-
-        vm = None
-        if node_name:
-            for vm_key, info in self._vmware_vms.items():
-                if node_name == info["name"]:
-                    vm = vm_key
-
-        if not vm:
-            selected_vms = []
-            for vm, info in self._vmware_vms.items():
-                if info["server"] == node.compute().id():
-                    selected_vms.append(vm)
-
-            if not selected_vms:
-                raise ModuleError("No VMware VM on server {}".format(node.server().url()))
-            elif len(selected_vms) > 1:
-
-                from gns3.main_window import MainWindow
-                mainwindow = MainWindow.instance()
-
-                (selection, ok) = QtWidgets.QInputDialog.getItem(mainwindow, "VMware VM", "Please choose a VM", selected_vms, 0, False)
-                if ok:
-                    vm = selection
-                else:
-                    raise ModuleError("Please select a VMware VM")
-            else:
-                vm = selected_vms[0]
-
-        linked_base = self._vmware_vms[vm]["linked_base"]
-        vm_settings = {}
-        for setting_name, value in self._vmware_vms[vm].items():
-            if setting_name in node.settings():
-                vm_settings[setting_name] = value
-
-        vmx_path = vm_settings.pop("vmx_path")
-        name = vm_settings.pop("name")
-        port_name_format = self._vmware_vms[vm]["port_name_format"]
-        port_segment_size = self._vmware_vms[vm]["port_segment_size"]
-        first_port_name = self._vmware_vms[vm]["first_port_name"]
-
-        default_name_format = VMWARE_VM_SETTINGS["default_name_format"]
-        if self._vmware_vms[vm]["default_name_format"]:
-            default_name_format = self._vmware_vms[vm]["default_name_format"]
-        if linked_base:
-            name = default_name_format.replace('{name}', name)
-
-        node.create(vmx_path,
-                    name=name,
-                    port_name_format=port_name_format,
-                    port_segment_size=port_segment_size,
-                    first_port_name=first_port_name,
-                    linked_clone=linked_base,
-                    additional_settings=vm_settings,
-                    default_name_format=default_name_format)
-
     def reset(self):
         """
         Resets the module.

gns3/modules/vmware/dialogs/vmware_vm_wizard.py

@@ -99,7 +99,7 @@ class VMwareVMWizard(VMWizard, Ui_VMwareVMWizard):
             "name": vmname,
             "server": self._compute_id,
             "vmx_path": vminfo["vmx_path"],
-            "linked_base": self.uiBaseVMCheckBox.isChecked()
+            "linked_clone": self.uiBaseVMCheckBox.isChecked()
         }
 
         return settings

gns3/modules/vmware/pages/vmware_preferences_page.py

@@ -54,8 +54,6 @@ class VMwarePreferencesPage(QtWidgets.QWidget, Ui_VMwarePreferencesPageWidget):
         else:
             # VMnet limit on Linux is 255
             self.uiVMnetEndRangeSpinBox.setMaximum(255)
-            # Block host network traffic is only supported on Windows for now
-            self.uiBlockHostTrafficCheckBox.setEnabled(False)
 
     def _vmrunPathBrowserSlot(self):
         """

gns3/modules/vmware/pages/vmware_vm_configuration_page.py

@@ -84,8 +84,8 @@ class VMwareVMConfigurationPage(QtWidgets.QWidget, Ui_VMwareVMConfigPageWidget):
                 self.uiNameLabel.hide()
                 self.uiNameLineEdit.hide()
 
-            if "linked_base" in settings:
-                self.uiBaseVMCheckBox.setChecked(settings["linked_base"])
+            if "linked_clone" in settings:
+                self.uiBaseVMCheckBox.setChecked(settings["linked_clone"])
             else:
                 self.uiBaseVMCheckBox.hide()
 
@@ -160,8 +160,8 @@ class VMwareVMConfigurationPage(QtWidgets.QWidget, Ui_VMwareVMConfigPageWidget):
                 else:
                     settings["name"] = name
 
-            if "linked_base" in settings:
-                settings["linked_base"] = self.uiBaseVMCheckBox.isChecked()
+            if "linked_clone" in settings:
+                settings["linked_clone"] = self.uiBaseVMCheckBox.isChecked()
 
         if not node:
             # these are template settings

gns3/modules/vmware/pages/vmware_vm_preferences_page.py

@@ -69,7 +69,7 @@ class VMwareVMPreferencesPage(QtWidgets.QWidget, Ui_VMwareVMPreferencesPageWidge
         # fill out the General section
         section_item = self._createSectionItem("General")
         QtWidgets.QTreeWidgetItem(section_item, ["Template name:", vmware_vm["name"]])
-        if vmware_vm["linked_base"]:
+        if vmware_vm["linked_clone"]:
             QtWidgets.QTreeWidgetItem(section_item, ["Default name format:", vmware_vm["default_name_format"]])
         try:
             QtWidgets.QTreeWidgetItem(section_item, ["Server:", ComputeManager.instance().getCompute(vmware_vm["server"]).name()])
@@ -77,7 +77,7 @@ class VMwareVMPreferencesPage(QtWidgets.QWidget, Ui_VMwareVMPreferencesPageWidge
             pass
         QtWidgets.QTreeWidgetItem(section_item, ["Headless mode enabled:", "{}".format(vmware_vm["headless"])])
         QtWidgets.QTreeWidgetItem(section_item, ["ACPI shutdown enabled:", "{}".format(vmware_vm["acpi_shutdown"])])
-        QtWidgets.QTreeWidgetItem(section_item, ["Linked base VM:", "{}".format(vmware_vm["linked_base"])])
+        QtWidgets.QTreeWidgetItem(section_item, ["Linked base VM:", "{}".format(vmware_vm["linked_clone"])])
 
         # fill out the Network section
         section_item = self._createSectionItem("Network")

gns3/modules/vmware/settings.py

@@ -32,7 +32,7 @@ VMWARE_SETTINGS = {
     "host_type": "ws",
     "vmnet_start_range": 2,
     "vmnet_end_range": DEFAULT_VMNET_END_RANGE,
-    "block_host_traffic": True,
+    "block_host_traffic": sys.platform.startswith("win"),  # block host traffic on Windows only (due to winpcap packet duplication issue).
 }
 
 VMWARE_VM_SETTINGS = {
@@ -48,6 +48,6 @@ VMWARE_VM_SETTINGS = {
     "use_any_adapter": False,
     "headless": False,
     "acpi_shutdown": False,
-    "linked_base": False,
+    "linked_clone": False,
     "server": "local"
 }

gns3/modules/vmware/vmware_vm.py

@@ -19,12 +19,9 @@
 VMware VM implementation.
 """
 
-import os
-import sys
-import tempfile
-
 from gns3.qt import QtCore
 from gns3.node import Node
+from gns3.utils.bring_to_front import bring_window_to_front_from_process_name
 from .settings import VMWARE_VM_SETTINGS
 
 import logging
@@ -47,7 +44,6 @@ class VMwareVM(Node):
     def __init__(self, module, server, project):
 
         super().__init__(module, server, project)
-        log.info("VMware VM instance is being created")
         self._linked_clone = False
 
         vmware_vm_settings = {"vmx_path": "",
@@ -64,27 +60,6 @@ class VMwareVM(Node):
 
         self.settings().update(vmware_vm_settings)
 
-    def create(self, vmx_path, name=None, node_id=None, port_name_format="Ethernet{0}", port_segment_size=0,
-               first_port_name="", linked_clone=False, additional_settings={}, default_name_format=None):
-        """
-        Creates this VMware VM.
-
-        :param vmx_path: path to the vmx file
-        :param name: optional name
-        :param node_id: Node identifier
-        :param linked_clone: either the VM is a linked clone
-        :param additional_settings: additional settings for this VM
-        """
-
-        self._linked_clone = linked_clone
-        params = {"vmx_path": vmx_path,
-                  "linked_clone": linked_clone,
-                  "port_name_format": port_name_format,
-                  "port_segment_size": port_segment_size,
-                  "first_port_name": first_port_name}
-        params.update(additional_settings)
-        self._create(name, node_id, params, default_name_format)
-
     def _createCallback(self, result):
         """
         Callback for create.
@@ -175,6 +150,26 @@ class VMwareVM(Node):
 
         return self._settings["console"]
 
+    def bringToFront(self):
+        """
+        Bring the VM window to front.
+        """
+
+        if self.status() == Node.started:
+            try:
+                vmx_pairs = self.module().parseVMwareFile(self.settings()["vmx_path"])
+            except OSError as e:
+                log.debug("Could not read VMX file: {}".format(e))
+                return
+            if "displayname" in vmx_pairs:
+                window_name = "{} -".format(vmx_pairs["displayname"])
+                # try for both VMware Player and Workstation
+                bring_window_to_front_from_process_name("vmplayer.exe", title=window_name)
+                bring_window_to_front_from_process_name("vmware.exe", title=window_name)
+
+        # bring any console to front
+        return Node.bringToFront(self)
+
     def configPage(self):
         """
         Returns the configuration page widget to be used by the node properties dialog.