diff --git a/gns3/modules/iou/ui/iou_device_configuration_page.ui b/gns3/modules/iou/ui/iou_device_configuration_page.ui index 96541d897..42478b36c 100755 --- a/gns3/modules/iou/ui/iou_device_configuration_page.ui +++ b/gns3/modules/iou/ui/iou_device_configuration_page.ui @@ -92,8 +92,11 @@ + + true + - Enable layer 1 keepalive messages + Enable layer 1 keepalive messages (testing only) false diff --git a/gns3/modules/iou/ui/iou_device_configuration_page_ui.py b/gns3/modules/iou/ui/iou_device_configuration_page_ui.py index a0df94078..fb664af5c 100644 --- a/gns3/modules/iou/ui/iou_device_configuration_page_ui.py +++ b/gns3/modules/iou/ui/iou_device_configuration_page_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file '/home/grossmj/workspace/git/gns3-gui/gns3/modules/iou/ui/iou_device_configuration_page.ui' # -# Created: Tue May 20 11:19:36 2014 +# Created: Wed May 21 19:12:10 2014 # by: PyQt4 UI code generator 4.10 # # WARNING! All changes made in this file will be lost! @@ -72,6 +72,7 @@ def setupUi(self, iouDeviceConfigPageWidget): self.gridLayout_2 = QtGui.QGridLayout(self.uiAdvancedGroupBox) self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2")) self.uiL1KeepalivesCheckBox = QtGui.QCheckBox(self.uiAdvancedGroupBox) + self.uiL1KeepalivesCheckBox.setEnabled(True) self.uiL1KeepalivesCheckBox.setChecked(False) self.uiL1KeepalivesCheckBox.setObjectName(_fromUtf8("uiL1KeepalivesCheckBox")) self.gridLayout_2.addWidget(self.uiL1KeepalivesCheckBox, 0, 0, 1, 2) @@ -156,7 +157,7 @@ def retranslateUi(self, iouDeviceConfigPageWidget): self.uiStartupConfigToolButton.setText(_translate("iouDeviceConfigPageWidget", "...", None)) self.uiConsolePortLabel.setText(_translate("iouDeviceConfigPageWidget", "Console port:", None)) self.uiAdvancedGroupBox.setTitle(_translate("iouDeviceConfigPageWidget", "Advanced", None)) - self.uiL1KeepalivesCheckBox.setText(_translate("iouDeviceConfigPageWidget", "Enable layer 1 keepalive messages", None)) + self.uiL1KeepalivesCheckBox.setText(_translate("iouDeviceConfigPageWidget", "Enable layer 1 keepalive messages (testing only)", None)) self.uiDefaultValuesCheckBox.setText(_translate("iouDeviceConfigPageWidget", "Use default IOU values for memories", None)) self.uiRamLabel.setText(_translate("iouDeviceConfigPageWidget", "RAM size:", None)) self.uiRamSpinBox.setSuffix(_translate("iouDeviceConfigPageWidget", " MB", None)) diff --git a/gns3/modules/vpcs/settings.py b/gns3/modules/vpcs/settings.py index 008d3ad2e..81d097dbb 100644 --- a/gns3/modules/vpcs/settings.py +++ b/gns3/modules/vpcs/settings.py @@ -24,7 +24,7 @@ # default path to Dynamips executable if sys.platform.startswith("win"): - DEFAULT_VPCS_PATH = "vpcs\vpcs.exe" + DEFAULT_VPCS_PATH = r"vpcs\vpcs.exe" elif sys.platform.startswith('darwin') and hasattr(sys, "frozen"): DEFAULT_VPCS_PATH = os.path.join(os.getcwd(), "../Resources/vpcs") else: diff --git a/gns3/modules/vpcs/vpcs_device.py b/gns3/modules/vpcs/vpcs_device.py index 06f019912..c05cf67d6 100644 --- a/gns3/modules/vpcs/vpcs_device.py +++ b/gns3/modules/vpcs/vpcs_device.py @@ -332,7 +332,6 @@ def addNIO(self, port, nio): """ params = {"id": self._vpcs_id, - "slot": port.slotNumber(), "port": port.portNumber(), "port_id": port.id()} @@ -363,8 +362,7 @@ def deleteNIO(self, port): """ params = {"id": self._vpcs_id, - "port": port.portNumber(), - "slot": port.slotNumber()} + "port": port.portNumber()} log.debug("{} is deleting an NIO: {}".format(self.name(), params)) self._server.send_message("vpcs.delete_nio", params, self._deleteNIOCallback)