diff --git a/gns3/cloud/utils.py b/gns3/cloud/utils.py index 8966379d3..ce896f9a1 100644 --- a/gns3/cloud/utils.py +++ b/gns3/cloud/utils.py @@ -8,35 +8,34 @@ from PyQt4.QtCore import QThread from PyQt4.QtCore import pyqtSignal -import paramiko from .rackspace_ctrl import RackspaceCtrl from ..topology import Topology from ..servers import Servers - log = logging.getLogger(__name__) -class AllowAndForgetPolicy(paramiko.MissingHostKeyPolicy): - """ - Custom policy for server host keys: we simply accept the key - the server sent to us without storing it. - """ - def missing_host_key(self, *args, **kwargs): - """ - According to MissingHostKeyPolicy protocol, to accept - the key, simply return. - """ - return - - @contextmanager def ssh_client(host, key_string): """ Context manager wrapping a SSHClient instance: the client connects on enter and close the connection on exit """ + + import paramiko + class AllowAndForgetPolicy(paramiko.MissingHostKeyPolicy): + """ + Custom policy for server host keys: we simply accept the key + the server sent to us without storing it. + """ + def missing_host_key(self, *args, **kwargs): + """ + According to MissingHostKeyPolicy protocol, to accept + the key, simply return. + """ + return + client = paramiko.SSHClient() try: f_key = io.StringIO(key_string) diff --git a/gns3/dialogs/preferences_dialog.py b/gns3/dialogs/preferences_dialog.py index 9614e2d2d..928dd1ed5 100644 --- a/gns3/dialogs/preferences_dialog.py +++ b/gns3/dialogs/preferences_dialog.py @@ -58,7 +58,7 @@ def _loadPreferencePages(self): GeneralPreferencesPage, ServerPreferencesPage, PacketCapturePreferencesPage, - CloudPreferencesPage, + #CloudPreferencesPage, ] for page in pages: diff --git a/gns3/main_window.py b/gns3/main_window.py index a5e2e7f0b..e80e4b173 100644 --- a/gns3/main_window.py +++ b/gns3/main_window.py @@ -126,7 +126,7 @@ def __init__(self, parent=None): self.setWindowIcon(QtGui.QIcon(":/images/gns3.ico")) #FIXME: hide the cloud dock for beta release - #self.uiCloudInspectorDockWidget.hide() + self.uiCloudInspectorDockWidget.hide() # load initial stuff once the event loop isn't busy QtCore.QTimer.singleShot(0, self.startupLoading) diff --git a/gns3/modules/dynamips/ui/ios_router_wizard.ui b/gns3/modules/dynamips/ui/ios_router_wizard.ui index ae4a135f0..65c7adf2a 100644 --- a/gns3/modules/dynamips/ui/ios_router_wizard.ui +++ b/gns3/modules/dynamips/ui/ios_router_wizard.ui @@ -2,6 +2,9 @@ IOSRouterWizard + + Qt::WindowModal + 0 diff --git a/gns3/modules/dynamips/ui/ios_router_wizard_ui.py b/gns3/modules/dynamips/ui/ios_router_wizard_ui.py index 8d534b3ea..8a981b4df 100644 --- a/gns3/modules/dynamips/ui/ios_router_wizard_ui.py +++ b/gns3/modules/dynamips/ui/ios_router_wizard_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/modules/dynamips/ui/ios_router_wizard.ui' # -# Created: Tue Oct 14 11:57:53 2014 +# Created: Tue Oct 14 17:01:29 2014 # by: PyQt4 UI code generator 4.10.4 # # WARNING! All changes made in this file will be lost! @@ -26,6 +26,7 @@ def _translate(context, text, disambig): class Ui_IOSRouterWizard(object): def setupUi(self, IOSRouterWizard): IOSRouterWizard.setObjectName(_fromUtf8("IOSRouterWizard")) + IOSRouterWizard.setWindowModality(QtCore.Qt.WindowModal) IOSRouterWizard.resize(513, 397) self.uiIOSImageWizardPage = QtGui.QWizardPage() self.uiIOSImageWizardPage.setObjectName(_fromUtf8("uiIOSImageWizardPage")) diff --git a/gns3/modules/iou/ui/iou_device_wizard.ui b/gns3/modules/iou/ui/iou_device_wizard.ui index feed409c4..74a627b53 100644 --- a/gns3/modules/iou/ui/iou_device_wizard.ui +++ b/gns3/modules/iou/ui/iou_device_wizard.ui @@ -2,6 +2,9 @@ IOUDeviceWizard + + Qt::WindowModal + 0 diff --git a/gns3/modules/iou/ui/iou_device_wizard_ui.py b/gns3/modules/iou/ui/iou_device_wizard_ui.py index d8c6b8523..a6e96d599 100644 --- a/gns3/modules/iou/ui/iou_device_wizard_ui.py +++ b/gns3/modules/iou/ui/iou_device_wizard_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/modules/iou/ui/iou_device_wizard.ui' # -# Created: Fri Oct 10 10:43:47 2014 +# Created: Tue Oct 14 17:01:29 2014 # by: PyQt4 UI code generator 4.10.4 # # WARNING! All changes made in this file will be lost! @@ -26,6 +26,7 @@ def _translate(context, text, disambig): class Ui_IOUDeviceWizard(object): def setupUi(self, IOUDeviceWizard): IOUDeviceWizard.setObjectName(_fromUtf8("IOUDeviceWizard")) + IOUDeviceWizard.setWindowModality(QtCore.Qt.WindowModal) IOUDeviceWizard.resize(514, 366) self.uiNameImageWizardPage = QtGui.QWizardPage() self.uiNameImageWizardPage.setObjectName(_fromUtf8("uiNameImageWizardPage")) diff --git a/gns3/modules/qemu/ui/qemu_vm_wizard.ui b/gns3/modules/qemu/ui/qemu_vm_wizard.ui index 49d9c0e62..ee434ac7d 100644 --- a/gns3/modules/qemu/ui/qemu_vm_wizard.ui +++ b/gns3/modules/qemu/ui/qemu_vm_wizard.ui @@ -2,6 +2,9 @@ QemuVMWizard + + Qt::WindowModal + 0 diff --git a/gns3/modules/qemu/ui/qemu_vm_wizard_ui.py b/gns3/modules/qemu/ui/qemu_vm_wizard_ui.py index 934cedfdc..8aabe85b3 100644 --- a/gns3/modules/qemu/ui/qemu_vm_wizard_ui.py +++ b/gns3/modules/qemu/ui/qemu_vm_wizard_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/modules/qemu/ui/qemu_vm_wizard.ui' # -# Created: Fri Oct 10 10:43:48 2014 +# Created: Tue Oct 14 17:01:29 2014 # by: PyQt4 UI code generator 4.10.4 # # WARNING! All changes made in this file will be lost! @@ -26,6 +26,7 @@ def _translate(context, text, disambig): class Ui_QemuVMWizard(object): def setupUi(self, QemuVMWizard): QemuVMWizard.setObjectName(_fromUtf8("QemuVMWizard")) + QemuVMWizard.setWindowModality(QtCore.Qt.WindowModal) QemuVMWizard.resize(514, 367) self.uiNameTypeWizardPage = QtGui.QWizardPage() self.uiNameTypeWizardPage.setObjectName(_fromUtf8("uiNameTypeWizardPage")) diff --git a/gns3/modules/virtualbox/ui/virtualbox_vm_wizard.ui b/gns3/modules/virtualbox/ui/virtualbox_vm_wizard.ui index a7ea5a4ec..d4e86959e 100644 --- a/gns3/modules/virtualbox/ui/virtualbox_vm_wizard.ui +++ b/gns3/modules/virtualbox/ui/virtualbox_vm_wizard.ui @@ -2,6 +2,9 @@ VirtualBoxVMWizard + + Qt::WindowModal + 0 diff --git a/gns3/modules/virtualbox/ui/virtualbox_vm_wizard_ui.py b/gns3/modules/virtualbox/ui/virtualbox_vm_wizard_ui.py index 2814a8ea8..de680a921 100644 --- a/gns3/modules/virtualbox/ui/virtualbox_vm_wizard_ui.py +++ b/gns3/modules/virtualbox/ui/virtualbox_vm_wizard_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/modules/virtualbox/ui/virtualbox_vm_wizard.ui' # -# Created: Tue Oct 7 14:06:50 2014 +# Created: Tue Oct 14 17:01:29 2014 # by: PyQt4 UI code generator 4.10.4 # # WARNING! All changes made in this file will be lost! @@ -26,6 +26,7 @@ def _translate(context, text, disambig): class Ui_VirtualBoxVMWizard(object): def setupUi(self, VirtualBoxVMWizard): VirtualBoxVMWizard.setObjectName(_fromUtf8("VirtualBoxVMWizard")) + VirtualBoxVMWizard.setWindowModality(QtCore.Qt.WindowModal) VirtualBoxVMWizard.resize(514, 367) self.uiVirtualBoxWizardPage = QtGui.QWizardPage() self.uiVirtualBoxWizardPage.setObjectName(_fromUtf8("uiVirtualBoxWizardPage")) diff --git a/gns3/version.py b/gns3/version.py index 5072b3149..94fc3deda 100644 --- a/gns3/version.py +++ b/gns3/version.py @@ -25,5 +25,5 @@ number has been incremented) """ -__version__ = "1.0beta4.dev2" +__version__ = "1.0beta4" __version_info__ = (1, 0, 0, -99)