Added basic optical placeholders:

WebUI:
- added icons for optical roadm and optical transponder

Common:
- added missing device types

Device:
- added missing emulated device driver mappings

src/common/DeviceTypes.py

@@ -15,16 +15,20 @@
 from enum import Enum
 
 class DeviceTypeEnum(Enum):
-    EMULATED_DATACENTER       = 'emu-datacenter'
-    EMULATED_OPEN_LINE_SYSTEM = 'emu-open-line-system'
-    EMULATED_PACKET_ROUTER    = 'emu-packet-router'
-    EMULATED_PACKET_SWITCH    = 'emu-packet-switch'
+    EMULATED_DATACENTER             = 'emu-datacenter'
+    EMULATED_MICROVAWE_RADIO_SYSTEM = 'emu-microwave-radio-system'
+    EMULATED_OPEN_LINE_SYSTEM       = 'emu-open-line-system'
+    EMULATED_OPTICAL_ROADM          = 'emu-optical-roadm'
+    EMULATED_OPTICAL_TRANSPONDER    = 'emu-optical-transponder'
+    EMULATED_P4_SWITCH              = 'emu-p4-switch'
+    EMULATED_PACKET_ROUTER          = 'emu-packet-router'
+    EMULATED_PACKET_SWITCH          = 'emu-packet-switch'
 
-    DATACENTER                = 'datacenter'
-    MICROVAWE_RADIO_SYSTEM    = 'microwave-radio-system'
-    OPTICAL_ROADM             = 'optical-roadm'
-    OPTICAL_TRANSPONDER       = 'optical-transponder'
-    OPEN_LINE_SYSTEM          = 'open-line-system'
-    PACKET_ROUTER             = 'packet-router'
-    PACKET_SWITCH             = 'packet-switch'
-    P4_SWITCH                 = 'p4-switch'
+    DATACENTER                      = 'datacenter'
+    MICROVAWE_RADIO_SYSTEM          = 'microwave-radio-system'
+    OPEN_LINE_SYSTEM                = 'open-line-system'
+    OPTICAL_ROADM                   = 'optical-roadm'
+    OPTICAL_TRANSPONDER             = 'optical-transponder'
+    P4_SWITCH                       = 'p4-switch'
+    PACKET_ROUTER                   = 'packet-router'
+    PACKET_SWITCH                   = 'packet-switch'

src/device/service/drivers/__init__.py

@@ -26,19 +26,49 @@ from .emulated.EmulatedDriver import EmulatedDriver # pylint: disable=wrong-impo
 DRIVERS.append(
     (EmulatedDriver, [
         {
-            # Driver==unspecified & no device type specified => use Emulated
-            FilterFieldEnum.DRIVER: ORM_DeviceDriverEnum.UNDEFINED,
+            # Driver==EMULATED, all device types => use Emulated
+            FilterFieldEnum.DEVICE_TYPE: [
+                DeviceTypeEnum.EMULATED_DATACENTER,
+                DeviceTypeEnum.EMULATED_MICROVAWE_RADIO_SYSTEM,
+                DeviceTypeEnum.EMULATED_OPEN_LINE_SYSTEM,
+                DeviceTypeEnum.EMULATED_OPTICAL_ROADM,
+                DeviceTypeEnum.EMULATED_OPTICAL_TRANSPONDER,
+                DeviceTypeEnum.EMULATED_P4_SWITCH,
+                DeviceTypeEnum.EMULATED_PACKET_ROUTER,
+                DeviceTypeEnum.EMULATED_PACKET_SWITCH,
+
+                DeviceTypeEnum.DATACENTER,
+                DeviceTypeEnum.MICROVAWE_RADIO_SYSTEM,
+                DeviceTypeEnum.OPEN_LINE_SYSTEM,
+                DeviceTypeEnum.OPTICAL_ROADM,
+                DeviceTypeEnum.OPTICAL_TRANSPONDER,
+                DeviceTypeEnum.P4_SWITCH,
+                DeviceTypeEnum.PACKET_ROUTER,
+                DeviceTypeEnum.PACKET_SWITCH,
+            ],
+            FilterFieldEnum.DRIVER: [
+                ORM_DeviceDriverEnum.UNDEFINED,
+            ],
         },
         {
-            # Emulated OLS/Packet Router, specifying Undefined/OpenConfig/TAPI Driver => use EmulatedDriver
+            # Emulated devices, all drivers => use Emulated
             FilterFieldEnum.DEVICE_TYPE: [
+                DeviceTypeEnum.EMULATED_DATACENTER,
+                DeviceTypeEnum.EMULATED_MICROVAWE_RADIO_SYSTEM,
                 DeviceTypeEnum.EMULATED_OPEN_LINE_SYSTEM,
+                DeviceTypeEnum.EMULATED_OPTICAL_ROADM,
+                DeviceTypeEnum.EMULATED_OPTICAL_TRANSPONDER,
+                DeviceTypeEnum.EMULATED_P4_SWITCH,
                 DeviceTypeEnum.EMULATED_PACKET_ROUTER,
+                DeviceTypeEnum.EMULATED_PACKET_SWITCH,
             ],
-            FilterFieldEnum.DRIVER     : [
+            FilterFieldEnum.DRIVER: [
                 ORM_DeviceDriverEnum.UNDEFINED,
                 ORM_DeviceDriverEnum.OPENCONFIG,
-                ORM_DeviceDriverEnum.TRANSPORT_API
+                ORM_DeviceDriverEnum.TRANSPORT_API,
+                ORM_DeviceDriverEnum.P4,
+                ORM_DeviceDriverEnum.IETF_NETWORK_TOPOLOGY,
+                ORM_DeviceDriverEnum.ONF_TR_352,
             ],
         }
     ]))

src/webui/service/static/topology_icons/Acknowledgements.txt

@@ -13,3 +13,9 @@ https://symbols.getvecta.com/stencil_241/281_virtual-layer-switch.29420aff2f.png
 
 https://symbols.getvecta.com/stencil_240/102_ibm-tower.2cc133f3d0.png => datacenter.png
 https://symbols.getvecta.com/stencil_241/133_ibm-tower.995c44696c.png => emu-datacenter.png
+
+https://symbols.getvecta.com/stencil_240/193_programmable-switch.6d97768882.png => optical-roadm.png
+https://symbols.getvecta.com/stencil_241/213_programmable-sw.32d3794d56.png => emu-optical-roadm.png
+
+https://symbols.getvecta.com/stencil_240/275_wae.c06b769cd7.png => optical-transponder.png
+https://symbols.getvecta.com/stencil_241/289_wae.216d930c17.png => emu-optical-transponder.png