Backport: option to drop nvram & disk files for IOS routers in order to save disk space.

Author: grossmj

gns3/modules/dynamips/dialogs/ios_router_wizard.py

@@ -484,6 +484,8 @@ def getSettings(self):
             settings["hover_symbol"] = ":/symbols/multilayer_switch.selected.svg"
             settings["disk0"] = 1  # adds 1MB disk to store vlan.dat
             settings["category"] = Node.switches
+        else:
+            settings["auto_delete_disks"] = True
 
         image_file = os.path.basename(image)
         if image_file.lower().startswith("c7200p"):

gns3/modules/dynamips/nodes/router.py

@@ -71,6 +71,7 @@ def __init__(self, module, server, project, platform="c7200"):
                           "exec_area": 64,
                           "disk0": 0,
                           "disk1": 0,
+                          "auto_delete_disks": False,
                           "console": None,
                           "aux": None,
                           "mac_addr": None,

gns3/modules/dynamips/pages/ios_router_configuration_page.py

@@ -338,6 +338,7 @@ def loadSettings(self, settings, node=None, group=False):
         self.uiNvramSpinBox.setValue(settings["nvram"])
         self.uiDisk0SpinBox.setValue(settings["disk0"])
         self.uiDisk1SpinBox.setValue(settings["disk1"])
+        self.uiAutoDeleteCheckBox.setChecked(settings["auto_delete_disks"])
 
         # load all the slots with configured adapters
         self._loadAdapterConfig(platform, chassis, settings)
@@ -533,6 +534,7 @@ def saveSettings(self, settings, node=None, group=False):
         settings["nvram"] = self.uiNvramSpinBox.value()
         settings["disk0"] = self.uiDisk0SpinBox.value()
         settings["disk1"] = self.uiDisk1SpinBox.value()
+        settings["auto_delete_disks"] = self.uiAutoDeleteCheckBox.isChecked()
 
         # save the system ID (processor board ID in IOS) setting
         settings["system_id"] = self.uiSystemIdLineEdit.text()

gns3/modules/dynamips/pages/ios_router_preferences_page.py

@@ -400,6 +400,7 @@ def _refreshInfo(self, ios_router):
             QtGui.QTreeWidgetItem(section_item, ["I/O memory:", "{}%".format(ios_router["iomem"])])
         QtGui.QTreeWidgetItem(section_item, ["PCMCIA disk0:", "{} MiB".format(ios_router["disk0"])])
         QtGui.QTreeWidgetItem(section_item, ["PCMCIA disk1:", "{} MiB".format(ios_router["disk1"])])
+        QtGui.QTreeWidgetItem(section_item, ["Auto delete:", "{}".format(ios_router["auto_delete_disks"])])
 
         # fill out the Adapters section
         section_item = self._createSectionItem("Adapters")

gns3/modules/dynamips/settings.py

@@ -60,6 +60,7 @@
     "mac_addr": "",
     "disk0": 0,
     "disk1": 0,
+    "auto_delete_disks": False,
     "system_id": "FTX0945W0MY",
     "server": "local"
 }
@@ -85,6 +86,7 @@
     "mac_addr": str,
     "disk0": int,
     "disk1": int,
+    "auto_delete_disks": bool,
     "system_id": str,
     "server": str
 }

gns3/modules/dynamips/ui/ios_router_configuration_page.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>449</width>
-    <height>491</height>
+    <height>510</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -388,6 +388,13 @@
          </layout>
         </widget>
        </item>
+       <item>
+        <widget class="QCheckBox" name="uiAutoDeleteCheckBox">
+         <property name="text">
+          <string>Automatically delete NVRAM and disk files</string>
+         </property>
+        </widget>
+       </item>
        <item>
         <spacer>
          <property name="orientation">

gns3/modules/dynamips/ui/ios_router_configuration_page_ui.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/modules/dynamips/ui/ios_router_configuration_page.ui'
 #
-# Created: Sat Mar 14 16:29:27 2015
+# Created: Wed Jul 22 15:59:21 2015
 #      by: PyQt4 UI code generator 4.10.4
 #
 # WARNING! All changes made in this file will be lost!
@@ -26,7 +26,7 @@ def _translate(context, text, disambig):
 class Ui_iosRouterConfigPageWidget(object):
     def setupUi(self, iosRouterConfigPageWidget):
         iosRouterConfigPageWidget.setObjectName(_fromUtf8("iosRouterConfigPageWidget"))
-        iosRouterConfigPageWidget.resize(449, 491)
+        iosRouterConfigPageWidget.resize(449, 510)
         self.vboxlayout = QtGui.QVBoxLayout(iosRouterConfigPageWidget)
         self.vboxlayout.setObjectName(_fromUtf8("vboxlayout"))
         self.uiTabWidget = QtGui.QTabWidget(iosRouterConfigPageWidget)
@@ -220,6 +220,9 @@ def setupUi(self, iosRouterConfigPageWidget):
         self.uiDisk1SpinBox.setObjectName(_fromUtf8("uiDisk1SpinBox"))
         self.gridlayout.addWidget(self.uiDisk1SpinBox, 1, 1, 1, 1)
         self.verticalLayout_2.addWidget(self.uiDisksGroupBox)
+        self.uiAutoDeleteCheckBox = QtGui.QCheckBox(self.uiMemoriesPageWidget)
+        self.uiAutoDeleteCheckBox.setObjectName(_fromUtf8("uiAutoDeleteCheckBox"))
+        self.verticalLayout_2.addWidget(self.uiAutoDeleteCheckBox)
         spacerItem1 = QtGui.QSpacerItem(20, 21, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
         self.verticalLayout_2.addItem(spacerItem1)
         self.uiTabWidget.addTab(self.uiMemoriesPageWidget, _fromUtf8(""))
@@ -577,6 +580,7 @@ def retranslateUi(self, iosRouterConfigPageWidget):
         self.uiDisk0SpinBox.setSuffix(_translate("iosRouterConfigPageWidget", " MiB", None))
         self.uiDisk1Label.setText(_translate("iosRouterConfigPageWidget", "PCMCIA disk1 size:", None))
         self.uiDisk1SpinBox.setSuffix(_translate("iosRouterConfigPageWidget", " MiB", None))
+        self.uiAutoDeleteCheckBox.setText(_translate("iosRouterConfigPageWidget", "Automatically delete NVRAM and disk files", None))
         self.uiTabWidget.setTabText(self.uiTabWidget.indexOf(self.uiMemoriesPageWidget), _translate("iosRouterConfigPageWidget", "Memories and disks", None))
         self.uiAdaptersGroupBox.setTitle(_translate("iosRouterConfigPageWidget", "Adapters", None))
         self.uiSlot0Label.setText(_translate("iosRouterConfigPageWidget", "slot 0:", None))