Release v2.2.12

CHANGELOG

@@ -1,5 +1,12 @@
 # Change Log
 
+## 2.2.12 07/08/2020
+
+* Downgrade psutil to version 5.6.7
+* Fix log shows the GUI command line without spaces between its arguments. Fixes #3026
+* Use server host is console host is equal to "0:0:0:0:0:0:0:0"
+* Remove VMware promotion.
+
 ## 2.2.11 09/07/2020
 
 * Try to fix "Recent project" selection not working. Ref #3007

gns3/crash_report.py

@@ -51,7 +51,7 @@ class CrashReport:
     Report crash to a third party service
     """
 
-    DSN = "https://2bd594d79ae248d38422b43a914abc4f:cd35061ce69c4fc99c4dc9e195087512@o19455.ingest.sentry.io/38506"
+    DSN = "https://19d5ca7c4cfe447b92ea140f78b01c35:fd234a69afcc490bb7ca37bbb3eefefd@o19455.ingest.sentry.io/38506"
     _instance = None
 
     def __init__(self):

gns3/dialogs/setup_wizard.py

@@ -67,7 +67,6 @@ class SetupWizard(QtWidgets.QWizard, Ui_SetupWizard):
         self.uiRefreshPushButton.clicked.connect(self._refreshVMListSlot)
         self.uiVmwareRadioButton.clicked.connect(self._listVMwareVMsSlot)
         self.uiVirtualBoxRadioButton.clicked.connect(self._listVirtualBoxVMsSlot)
-        self.uiVMwareBannerButton.clicked.connect(self._VMwareBannerButtonClickedSlot)
         settings = parent.settings()
         self.uiShowCheckBox.setChecked(settings["hide_setup_wizard"])
 
@@ -94,11 +93,6 @@ class SetupWizard(QtWidgets.QWizard, Ui_SetupWizard):
         self.uiLocalServerHostComboBox.addItem("::", "::")  # all IPv6 addresses
         self.uiLocalServerHostComboBox.addItem("0.0.0.0", "0.0.0.0")  # all IPv4 addresses
 
-        if sys.platform.startswith("darwin"):
-            self.uiVMwareBannerButton.setIcon(QtGui.QIcon(":/images/vmware_fusion_banner.png"))
-        else:
-            self.uiVMwareBannerButton.setIcon(QtGui.QIcon(":/images/vmware_workstation_banner.png"))
-
         if sys.platform.startswith("linux"):
             self.uiLocalRadioButton.setChecked(True)
             self.uiLocalLabel.setText("Dependencies like Dynamips and Qemu must be manually installed")
@@ -121,13 +115,6 @@ class SetupWizard(QtWidgets.QWizard, Ui_SetupWizard):
 
         self.uiLocalServerPathLineEdit.setText(path)
 
-    def _VMwareBannerButtonClickedSlot(self):
-        if sys.platform.startswith("darwin"):
-            url = "http://send.onenetworkdirect.net/z/621395/CD225091/"
-        else:
-            url = "http://send.onenetworkdirect.net/z/616207/CD225091/"
-        QtGui.QDesktopServices.openUrl(QtCore.QUrl(url))
-
     def _listVMwareVMsSlot(self):
         """
         Slot to refresh the VMware VMs list.

gns3/main.py

@@ -255,8 +255,7 @@ def main():
     current_year = datetime.date.today().year
     log.info("GNS3 GUI version {}".format(__version__))
     log.info("Copyright (c) 2007-{} GNS3 Technologies Inc.".format(current_year))
-
-    log.info("Application started with {}".format("".join(sys.argv)))
+    log.info("Application started with {}".format(" ".join(sys.argv)))
 
     # update the exception file path to have it in the same directory as the settings file.
     exception_file_path = os.path.join(LocalConfig.instance().configDirectory(), exception_file_path)

gns3/node.py

@@ -654,7 +654,7 @@ class Node(BaseNode):
         """
 
         host = self.settings()["console_host"]
-        if host is None or host == "::" or host == "0.0.0.0":
+        if host is None or host == "::" or host == "0.0.0.0" or host == "0:0:0:0:0:0:0:0":
             host = Controller.instance().host()
         return host
 

gns3/ui/setup_wizard.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1081</width>
-    <height>534</height>
+    <width>1104</width>
+    <height>665</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -234,33 +234,6 @@
     <string>In order to run the GNS3 VM you must first have VMware or VirtualBox installed and the GNS3 VM.ova imported with one of these software.</string>
    </property>
    <layout class="QGridLayout" name="gridLayout_3">
-    <item row="0" column="0">
-     <widget class="QLabel" name="uiVirtualizationSoftwarLabel">
-      <property name="text">
-       <string>Virtualization software:</string>
-      </property>
-     </widget>
-    </item>
-    <item row="0" column="2" rowspan="4">
-     <widget class="QPushButton" name="uiVMwareBannerButton">
-      <property name="text">
-       <string/>
-      </property>
-      <property name="icon">
-       <iconset resource="../../resources/resources.qrc">
-        <normaloff>:/images/vmware_fusion_banner.png</normaloff>:/images/vmware_fusion_banner.png</iconset>
-      </property>
-      <property name="iconSize">
-       <size>
-        <width>300</width>
-        <height>150</height>
-       </size>
-      </property>
-      <property name="flat">
-       <bool>true</bool>
-      </property>
-     </widget>
-    </item>
     <item row="1" column="0">
      <widget class="QRadioButton" name="uiVmwareRadioButton">
       <property name="toolTip">
@@ -274,18 +247,12 @@
       </property>
      </widget>
     </item>
-    <item row="1" column="1">
-     <spacer name="horizontalSpacer">
-      <property name="orientation">
-       <enum>Qt::Horizontal</enum>
+    <item row="0" column="0">
+     <widget class="QLabel" name="uiVirtualizationSoftwarLabel">
+      <property name="text">
+       <string>Virtualization software:</string>
       </property>
-      <property name="sizeHint" stdset="0">
-       <size>
-        <width>317</width>
-        <height>20</height>
-       </size>
-      </property>
-     </spacer>
+     </widget>
     </item>
     <item row="2" column="0">
      <widget class="QRadioButton" name="uiVirtualBoxRadioButton">
@@ -328,7 +295,7 @@
       </property>
      </widget>
     </item>
-    <item row="6" column="0" colspan="3">
+    <item row="6" column="0" colspan="2">
      <layout class="QHBoxLayout" name="horizontalLayout">
       <item>
        <widget class="QComboBox" name="uiVMListComboBox">
@@ -349,7 +316,7 @@
       </item>
      </layout>
     </item>
-    <item row="8" column="0" colspan="3">
+    <item row="8" column="0" colspan="2">
      <widget class="QSpinBox" name="uiCPUSpinBox">
       <property name="minimum">
        <number>1</number>
@@ -362,7 +329,7 @@
       </property>
      </widget>
     </item>
-    <item row="10" column="0" colspan="3">
+    <item row="10" column="0" colspan="2">
      <widget class="QSpinBox" name="uiRAMSpinBox">
       <property name="enabled">
        <bool>true</bool>

gns3/ui/setup_wizard_ui.py

@@ -2,9 +2,10 @@
 
 # Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/ui/setup_wizard.ui'
 #
-# Created by: PyQt5 UI code generator 5.13.0
+# Created by: PyQt5 UI code generator 5.15.0
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+# run again.  Do not edit this file unless you know what you are doing.
 
 
 from PyQt5 import QtCore, QtGui, QtWidgets
@@ -13,7 +14,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_SetupWizard(object):
     def setupUi(self, SetupWizard):
         SetupWizard.setObjectName("SetupWizard")
-        SetupWizard.resize(1081, 534)
+        SetupWizard.resize(1104, 665)
         SetupWizard.setModal(True)
         SetupWizard.setWizardStyle(QtWidgets.QWizard.ModernStyle)
         SetupWizard.setOptions(QtWidgets.QWizard.NoBackButtonOnStartPage)
@@ -114,24 +115,13 @@ class Ui_SetupWizard(object):
         self.uiVMWizardPage.setObjectName("uiVMWizardPage")
         self.gridLayout_3 = QtWidgets.QGridLayout(self.uiVMWizardPage)
         self.gridLayout_3.setObjectName("gridLayout_3")
-        self.uiVirtualizationSoftwarLabel = QtWidgets.QLabel(self.uiVMWizardPage)
-        self.uiVirtualizationSoftwarLabel.setObjectName("uiVirtualizationSoftwarLabel")
-        self.gridLayout_3.addWidget(self.uiVirtualizationSoftwarLabel, 0, 0, 1, 1)
-        self.uiVMwareBannerButton = QtWidgets.QPushButton(self.uiVMWizardPage)
-        self.uiVMwareBannerButton.setText("")
-        icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap(":/images/vmware_fusion_banner.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.uiVMwareBannerButton.setIcon(icon)
-        self.uiVMwareBannerButton.setIconSize(QtCore.QSize(300, 150))
-        self.uiVMwareBannerButton.setFlat(True)
-        self.uiVMwareBannerButton.setObjectName("uiVMwareBannerButton")
-        self.gridLayout_3.addWidget(self.uiVMwareBannerButton, 0, 2, 4, 1)
         self.uiVmwareRadioButton = QtWidgets.QRadioButton(self.uiVMWizardPage)
         self.uiVmwareRadioButton.setChecked(True)
         self.uiVmwareRadioButton.setObjectName("uiVmwareRadioButton")
         self.gridLayout_3.addWidget(self.uiVmwareRadioButton, 1, 0, 1, 1)
-        spacerItem1 = QtWidgets.QSpacerItem(317, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.gridLayout_3.addItem(spacerItem1, 1, 1, 1, 1)
+        self.uiVirtualizationSoftwarLabel = QtWidgets.QLabel(self.uiVMWizardPage)
+        self.uiVirtualizationSoftwarLabel.setObjectName("uiVirtualizationSoftwarLabel")
+        self.gridLayout_3.addWidget(self.uiVirtualizationSoftwarLabel, 0, 0, 1, 1)
         self.uiVirtualBoxRadioButton = QtWidgets.QRadioButton(self.uiVMWizardPage)
         self.uiVirtualBoxRadioButton.setObjectName("uiVirtualBoxRadioButton")
         self.gridLayout_3.addWidget(self.uiVirtualBoxRadioButton, 2, 0, 1, 1)
@@ -161,13 +151,13 @@ class Ui_SetupWizard(object):
         self.uiRefreshPushButton = QtWidgets.QPushButton(self.uiVMWizardPage)
         self.uiRefreshPushButton.setObjectName("uiRefreshPushButton")
         self.horizontalLayout.addWidget(self.uiRefreshPushButton)
-        self.gridLayout_3.addLayout(self.horizontalLayout, 6, 0, 1, 3)
+        self.gridLayout_3.addLayout(self.horizontalLayout, 6, 0, 1, 2)
         self.uiCPUSpinBox = QtWidgets.QSpinBox(self.uiVMWizardPage)
         self.uiCPUSpinBox.setMinimum(1)
         self.uiCPUSpinBox.setMaximum(128)
         self.uiCPUSpinBox.setProperty("value", 1)
         self.uiCPUSpinBox.setObjectName("uiCPUSpinBox")
-        self.gridLayout_3.addWidget(self.uiCPUSpinBox, 8, 0, 1, 3)
+        self.gridLayout_3.addWidget(self.uiCPUSpinBox, 8, 0, 1, 2)
         self.uiRAMSpinBox = QtWidgets.QSpinBox(self.uiVMWizardPage)
         self.uiRAMSpinBox.setEnabled(True)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed)
@@ -180,7 +170,7 @@ class Ui_SetupWizard(object):
         self.uiRAMSpinBox.setSingleStep(512)
         self.uiRAMSpinBox.setProperty("value", 2048)
         self.uiRAMSpinBox.setObjectName("uiRAMSpinBox")
-        self.gridLayout_3.addWidget(self.uiRAMSpinBox, 10, 0, 1, 3)
+        self.gridLayout_3.addWidget(self.uiRAMSpinBox, 10, 0, 1, 2)
         SetupWizard.addPage(self.uiVMWizardPage)
         self.uiRemoteControllerWizardPage = QtWidgets.QWizardPage()
         self.uiRemoteControllerWizardPage.setObjectName("uiRemoteControllerWizardPage")
@@ -260,9 +250,9 @@ class Ui_SetupWizard(object):
         self.uiLocalServerStatusWizardPage.setSubTitle(_translate("SetupWizard", "Validation of the configuration for the local server"))
         self.uiVMWizardPage.setTitle(_translate("SetupWizard", "GNS3 VM"))
         self.uiVMWizardPage.setSubTitle(_translate("SetupWizard", "In order to run the GNS3 VM you must first have VMware or VirtualBox installed and the GNS3 VM.ova imported with one of these software."))
-        self.uiVirtualizationSoftwarLabel.setText(_translate("SetupWizard", "Virtualization software:"))
         self.uiVmwareRadioButton.setToolTip(_translate("SetupWizard", "VMware is recommended to run Qemu based appliances (required for KVM)."))
         self.uiVmwareRadioButton.setText(_translate("SetupWizard", "VMware (recommended)"))
+        self.uiVirtualizationSoftwarLabel.setText(_translate("SetupWizard", "Virtualization software:"))
         self.uiVirtualBoxRadioButton.setToolTip(_translate("SetupWizard", "Use VirtualBox if you intend to only use Dynamips, IOU or VPCS."))
         self.uiVirtualBoxRadioButton.setText(_translate("SetupWizard", "VirtualBox"))
         self.uiVMNameLabel.setText(_translate("SetupWizard", "VM name:"))

gns3/version.py

@@ -23,9 +23,8 @@
 # or negative for a release candidate or beta (after the base version
 # number has been incremented)
 
-__version__ = "2.2.11"
-__version_info__ = (2, 2, 11, 0)
-
+__version__ = "2.2.12"
+__version_info__ = (2, 2, 12, 0)
 # If it's a git checkout try to add the commit
 if "dev" in __version__:
     try:

requirements.txt

@@ -1,4 +1,4 @@
 jsonschema==3.2.0
 sentry-sdk>=0.14.4
-psutil==5.7.0
+psutil==5.6.7
 distro>=1.3.0

resources/resources.qrc

@@ -326,8 +326,6 @@
         <file>charcoal_icons/filter-hover.svg</file>
         <file>charcoal_icons/filter-reset.svg</file>
         <file>charcoal_icons/filter-reset-hover.svg</file>
-        <file>images/vmware_fusion_banner.png</file>
-        <file>images/vmware_workstation_banner.png</file>
         <file>styles/charcoal.css</file>
     </qresource>
 </RCC>