commit fa0f6cc7003b4a40369c7dacbef7beaff610c0a5
author Andrea Campanella <andrea@opennetworking.org> Tue Dec 18 15:17:53 2018 +0100
committer Thomas Vachuska <tom@opennetworking.org> Wed Dec 19 16:26:38 2018 +0000
tree 74d962503f5c58478b7d191e70f978dcb6f4eb8f
parent 8b17e0eec5332f6db915af95ee8ff271848642b7

Adding OLS device Type for ODTN project

Change-Id: Ia3472b47ea12d2f2f44de9cb88f20774881530ee

web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandler.java

diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandler.java b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandler.java
index 1c16a44..021e4e1 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandler.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandler.java
@@ -775,13 +775,14 @@
         // Send optical first, others later for layered rendering
         for (Device device : services.device().getDevices()) {
             if ((device.type() == Device.Type.ROADM) ||
-                    (device.type() == Device.Type.OTN)) {
+                    (device.type() == Device.Type.OTN) || (device.type() == Device.Type.OLS)) {
                 sendMessage(deviceMessage(new DeviceEvent(DEVICE_ADDED, device)));
             }
         }
         for (Device device : services.device().getDevices()) {
             if ((device.type() != Device.Type.ROADM) &&
-                    (device.type() != Device.Type.OTN) && device.type() != Device.Type.CONTROLLER) {
+                    (device.type() != Device.Type.OTN) && (device.type() != Device.Type.OLS) &&
+                    (device.type() != Device.Type.CONTROLLER)) {
                 sendMessage(deviceMessage(new DeviceEvent(DEVICE_ADDED, device)));
             }
         }

web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java

diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java
index 5f153f0..6f370b8 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java
@@ -140,6 +140,7 @@
         DEVICE_GLYPHS.put(Device.Type.SWITCH, "m_switch");
         DEVICE_GLYPHS.put(Device.Type.ROUTER, "m_router");
         DEVICE_GLYPHS.put(Device.Type.ROADM, "m_roadm");
+        DEVICE_GLYPHS.put(Device.Type.OLS, "m_roadm");
         DEVICE_GLYPHS.put(Device.Type.OTN, "m_otn");
         DEVICE_GLYPHS.put(Device.Type.ROADM_OTN, "m_roadm_otn");
         DEVICE_GLYPHS.put(Device.Type.BALANCER, "m_balancer");