Possibility to configure a category for nodes (routers, switches, end devices or security devices).

Author: grossmj

gns3/dialogs/symbol_selection_dialog.py

@@ -21,6 +21,7 @@
 
 from ..qt import QtSvg, QtCore, QtGui
 from ..ui.symbol_selection_dialog_ui import Ui_SymbolSelectionDialog
+from ..node import Node
 
 
 class SymbolSelectionDialog(QtGui.QDialog, Ui_SymbolSelectionDialog):
@@ -42,6 +43,19 @@ def __init__(self, parent, items=None):
         if not self._items:
             self.uiButtonBox.button(QtGui.QDialogButtonBox.Apply).hide()
 
+            # current categories
+            categories = {"Routers": Node.routers,
+                          "Switches": Node.switches,
+                          "End devices": Node.end_devices,
+                          "Security devices": Node.security_devices
+                          }
+
+            for name, category in categories.items():
+                self.uiCategoryComboBox.addItem(name, category)
+        else:
+            self.uiCategoryLabel.hide()
+            self.uiCategoryComboBox.hide()
+
         self.uiSymbolListWidget.setIconSize(QtCore.QSize(64, 64))
         symbol_resources = QtCore.QResource(":/symbols")
         for symbol in symbol_resources.children():
@@ -78,6 +92,10 @@ def getSymbols(self):
             selected_symbol = ":/symbols/{}.selected.svg".format(name)
         return normal_symbol, selected_symbol
 
+    def getCategory(self):
+
+        return self.uiCategoryComboBox.itemData(self.uiCategoryComboBox.currentIndex())
+
     def done(self, result):
         """
         Called when the dialog is closed.

gns3/modules/dynamips/__init__.py

@@ -21,8 +21,11 @@
 
 import os
 import glob
+
 from gns3.qt import QtCore, QtGui
 from gns3.servers import Servers
+from gns3.node import Node
+
 from ..module import Module
 from ..module_error import ModuleError
 from .nodes.router import Router
@@ -120,6 +123,7 @@ def _loadIOSRouters(self):
             private_config = settings.value("private_config", "")
             default_symbol = settings.value("default_symbol", ":/symbols/router.normal.svg")
             hover_symbol = settings.value("hover_symbol", ":/symbols/router.selected.svg")
+            category = settings.value("category", Node.routers, type=int)
             platform = settings.value("platform", "")
             chassis = settings.value("chassis", "")
             idlepc = settings.value("idlepc", "")
@@ -141,6 +145,7 @@ def _loadIOSRouters(self):
                                      "image": image,
                                      "default_symbol": default_symbol,
                                      "hover_symbol": hover_symbol,
+                                     "category": category,
                                      "startup_config": startup_config,
                                      "private_config": private_config,
                                      "platform": platform,
@@ -640,9 +645,9 @@ def nodes(self):
                 {"class": node_class.__name__,
                  "name": ios_router["name"],
                  "server": ios_router["server"],
-                 "categories": node_class.categories(),
                  "default_symbol": ios_router["default_symbol"],
-                 "hover_symbol": ios_router["hover_symbol"]}
+                 "hover_symbol": ios_router["hover_symbol"],
+                 "categories": [ios_router["category"]]}
             )
 
         return nodes

gns3/modules/dynamips/pages/ios_router_preferences_page.py

@@ -28,6 +28,7 @@
 import zipfile
 
 from gns3.qt import QtCore, QtGui
+from gns3.node import Node
 from gns3.main_window import MainWindow
 from gns3.utils.progress_dialog import ProgressDialog
 from gns3.dialogs.symbol_selection_dialog import SymbolSelectionDialog
@@ -113,6 +114,7 @@ def _iosRouterNewSlot(self):
                                       "image": ios_settings["image"],
                                       "default_symbol": ":/symbols/router.normal.svg",
                                       "hover_symbol": ":/symbols/router.selected.svg",
+                                      "category": Node.routers,
                                       "startup_config": startup_config,
                                       "private_config": private_config,
                                       "platform": ios_settings["platform"],
@@ -459,13 +461,15 @@ def _changeSymbolSlot(self):
         dialog.show()
         if dialog.exec_():
             normal_symbol, selected_symbol = dialog.getSymbols()
+            category = dialog.getCategory()
             item = self.uiIOSRoutersTreeWidget.currentItem()
             if item:
                 item.setIcon(0, QtGui.QIcon(normal_symbol))
                 key = item.data(0, QtCore.Qt.UserRole)
                 ios_router = self._ios_routers[key]
                 ios_router["default_symbol"] = normal_symbol
                 ios_router["hover_symbol"] = selected_symbol
+                ios_router["category"] = category
 
     def loadPreferences(self):
         """

gns3/modules/iou/__init__.py

@@ -21,8 +21,10 @@
 
 import base64
 import os
+
 from gns3.qt import QtCore, QtGui
-from gns3.servers import Servers
+from gns3.node import Node
+
 from ..module import Module
 from ..module_error import ModuleError
 from .iou_device import IOUDevice
@@ -92,6 +94,7 @@ def _loadIOUDevices(self):
             name = settings.value("name", "IOU{}".format(index + 1))
             default_symbol = settings.value("default_symbol", ":/symbols/multilayer_switch.normal.svg")
             hover_symbol = settings.value("hover_symbol", ":/symbols/multilayer_switch.selected.svg")
+            category = settings.value("category", Node.routers, type=int)
             path = settings.value("path", "")
             image = settings.value("image", "")
             initial_config = settings.value("initial_config", "")
@@ -106,6 +109,7 @@ def _loadIOUDevices(self):
                                       "path": path,
                                       "default_symbol": default_symbol,
                                       "hover_symbol": hover_symbol,
+                                      "category": category,
                                       "image": image,
                                       "initial_config": initial_config,
                                       "use_default_iou_values": use_default_iou_values,
@@ -530,9 +534,10 @@ def nodes(self):
                 {"class": IOUDevice.__name__,
                  "name": iou_device["name"],
                  "server": iou_device["server"],
-                 "categories": IOUDevice.categories(),
                  "default_symbol": iou_device["default_symbol"],
-                 "hover_symbol": iou_device["hover_symbol"]}
+                 "hover_symbol": iou_device["hover_symbol"],
+                 "categories": [iou_device["category"]]
+                }
             )
         return nodes
 

gns3/modules/iou/dialogs/iou_device_wizard.py

@@ -20,11 +20,11 @@
 """
 
 import os
-import re
 import sys
 import pkg_resources
 
 from gns3.qt import QtGui
+from gns3.node import Node
 from gns3.servers import Servers
 
 from ..ui.iou_device_wizard_ui import Ui_IOUDeviceWizard
@@ -154,6 +154,7 @@ def getSettings(self):
                 initial_config = os.path.normpath(iou_base_config_path)
             default_symbol = ":/symbols/multilayer_switch.normal.svg"
             hover_symbol = ":/symbols/multilayer_switch.selected.svg"
+            category = Node.switches
         else:
             # set the default L3 base initial-config
             resource_name = "configs/iou_l3_base_initial-config.txt"
@@ -164,6 +165,7 @@ def getSettings(self):
                 initial_config = os.path.normpath(iou_base_config_path)
             default_symbol = ":/symbols/router.normal.svg"
             hover_symbol = ":/symbols/router.selected.svg"
+            category = Node.routers
 
         if IOU.instance().settings()["use_local_server"] or self.uiLoadBalanceCheckBox.isChecked():
             server = "local"
@@ -182,6 +184,7 @@ def getSettings(self):
             "image": os.path.basename(path),
             "initial_config": initial_config,
             "default_symbol": default_symbol,
+            "category": category,
             "hover_symbol": hover_symbol,
             "server": server,
         }

gns3/modules/iou/pages/iou_device_preferences_page.py

@@ -85,23 +85,24 @@ def _iouDeviceNewSlot(self):
         wizard.show()
         if wizard.exec_():
 
-            new_vm_settings = wizard.getSettings()
-
-            key = "{server}:{name}".format(server=new_vm_settings["server"], name=new_vm_settings["name"])
-            self._iou_devices[key] = {"name": new_vm_settings["name"],
-                                      "path": new_vm_settings["path"],
-                                      "default_symbol": new_vm_settings["default_symbol"],
-                                      "hover_symbol": new_vm_settings["hover_symbol"],
-                                      "image": os.path.basename(new_vm_settings["path"]),
-                                      "initial_config": new_vm_settings["initial_config"],
+            new_device_settings = wizard.getSettings()
+
+            key = "{server}:{name}".format(server=new_device_settings["server"], name=new_device_settings["name"])
+            self._iou_devices[key] = {"name": new_device_settings["name"],
+                                      "path": new_device_settings["path"],
+                                      "default_symbol": new_device_settings["default_symbol"],
+                                      "hover_symbol": new_device_settings["hover_symbol"],
+                                      "category": new_device_settings["category"],
+                                      "image": os.path.basename(new_device_settings["path"]),
+                                      "initial_config": new_device_settings["initial_config"],
                                       "use_default_iou_values": True,
                                       "ram": 256,
                                       "nvram": 128,
                                       "ethernet_adapters": 2,
                                       "serial_adapters": 2,
-                                      "server": new_vm_settings["server"]}
+                                      "server": new_device_settings["server"]}
 
-            self._iou_devices[key].update(new_vm_settings)
+            self._iou_devices[key].update(new_device_settings)
             item = QtGui.QTreeWidgetItem(self.uiIOUDevicesTreeWidget)
             item.setText(0, self._iou_devices[key]["name"])
             item.setIcon(0, QtGui.QIcon(self._iou_devices[key]["default_symbol"]))
@@ -324,13 +325,15 @@ def _changeSymbolSlot(self):
         dialog.show()
         if dialog.exec_():
             normal_symbol, selected_symbol = dialog.getSymbols()
+            category = dialog.getCategory()
             item = self.uiIOUDevicesTreeWidget.currentItem()
             if item:
                 item.setIcon(0, QtGui.QIcon(normal_symbol))
                 key = item.data(0, QtCore.Qt.UserRole)
                 iou_device = self._iou_devices[key]
                 iou_device["default_symbol"] = normal_symbol
                 iou_device["hover_symbol"] = selected_symbol
+                iou_device["category"] = category
 
     def loadPreferences(self):
         """

gns3/modules/iou/pages/iou_preferences_page.py

@@ -21,8 +21,10 @@
 
 import os
 import sys
+
 from gns3.qt import QtCore, QtGui
 from gns3.servers import Servers
+
 from .. import IOU
 from ..ui.iou_preferences_page_ui import Ui_IOUPreferencesPageWidget
 from ..settings import IOU_SETTINGS

gns3/modules/qemu/__init__.py

@@ -20,8 +20,10 @@
 """
 
 import os
+
 from gns3.qt import QtCore, QtGui
-from gns3.servers import Servers
+from gns3.node import Node
+
 from ..module import Module
 from ..module_error import ModuleError
 from .qemu_vm import QemuVM
@@ -91,6 +93,7 @@ def _loadQemuVMs(self):
             name = settings.value("name", "")
             default_symbol = settings.value("default_symbol", ":/symbols/qemu_guest.normal.svg")
             hover_symbol = settings.value("hover_symbol", ":/symbols/qemu_guest.selected.svg")
+            category = settings.value("category", Node.end_devices, type=int)
             qemu_path = settings.value("qemu_path", "")
             hda_disk_image = settings.value("hda_disk_image", "")
             hdb_disk_image = settings.value("hdb_disk_image", "")
@@ -108,6 +111,7 @@ def _loadQemuVMs(self):
             self._qemu_vms[key] = {"name": name,
                                    "default_symbol": default_symbol,
                                    "hover_symbol": hover_symbol,
+                                   "category": category,
                                    "qemu_path": qemu_path,
                                    "hda_disk_image": hda_disk_image,
                                    "hdb_disk_image": hdb_disk_image,
@@ -511,9 +515,10 @@ def nodes(self):
                 {"class": QemuVM.__name__,
                  "name": qemu_vm["name"],
                  "server": qemu_vm["server"],
-                 "categories": QemuVM.categories(),
                  "default_symbol": qemu_vm["default_symbol"],
-                 "hover_symbol": qemu_vm["hover_symbol"]}
+                 "hover_symbol": qemu_vm["hover_symbol"],
+                 "categories": [qemu_vm["category"]]
+                }
         )
         return nodes
 

gns3/modules/qemu/dialogs/qemu_vm_wizard.py

@@ -24,6 +24,7 @@
 
 from gns3.qt import QtCore, QtGui
 from gns3.servers import Servers
+from gns3.node import Node
 from gns3.main_window import MainWindow
 from gns3.modules.module_error import ModuleError
 from gns3.utils.connect_to_server import ConnectToServer
@@ -266,15 +267,18 @@ def getSettings(self):
             settings["options"] = "-nographic -cpu coreduo -icount auto -hdachs 980,16,32"
             settings["default_symbol"] = ":/symbols/asa.normal.svg"
             settings["hover_symbol"] = ":/symbols/asa.selected.svg"
+            settings["category"] = Node.security_devices
         elif self.uiTypeComboBox.currentText() == "IDS":
             settings["adapters"] = 3
             settings["hda_disk_image"] = self.uiHdaDiskImageLineEdit.text()
             settings["hdb_disk_image"] = self.uiHdbDiskImageLineEdit.text()
             settings["options"] = "-smbios type=1,product=IDS-4215"
             settings["default_symbol"] = ":/symbols/ids.normal.svg"
             settings["hover_symbol"] = ":/symbols/ids.selected.svg"
+            settings["category"] = Node.security_devices
         else:
             settings["hda_disk_image"] = self.uiHdaDiskImageLineEdit.text()
+            settings["category"] = Node.end_devices
 
         return settings
 

gns3/modules/qemu/pages/qemu_vm_preferences_page.py

@@ -23,9 +23,8 @@
 import copy
 
 from gns3.qt import QtCore, QtGui
-from gns3.servers import Servers
+from gns3.node import Node
 from gns3.main_window import MainWindow
-from gns3.modules.module_error import ModuleError
 from gns3.dialogs.symbol_selection_dialog import SymbolSelectionDialog
 from gns3.dialogs.configuration_dialog import ConfigurationDialog
 
@@ -143,6 +142,7 @@ def _qemuVMNewSlot(self):
             self._qemu_vms[key] = {"name": "",
                                    "default_symbol": ":/symbols/qemu_guest.normal.svg",
                                    "hover_symbol": ":/symbols/qemu_guest.selected.svg",
+                                   "category": Node.end_devices,
                                    "qemu_path": "default",
                                    "hda_disk_image": "",
                                    "hdb_disk_image": "",
@@ -223,13 +223,15 @@ def _changeSymbolSlot(self):
         dialog.show()
         if dialog.exec_():
             normal_symbol, selected_symbol = dialog.getSymbols()
+            category = dialog.getCategory()
             item = self.uiQemuVMsTreeWidget.currentItem()
             if item:
                 item.setIcon(0, QtGui.QIcon(normal_symbol))
                 key = item.data(0, QtCore.Qt.UserRole)
                 qemu_vm = self._qemu_vms[key]
                 qemu_vm["default_symbol"] = normal_symbol
                 qemu_vm["hover_symbol"] = selected_symbol
+                qemu_vm["category"] = category
 
     def loadPreferences(self):
         """