commit 72ee30ca50588b116a8a09d1e8e8f33ddc776801
author Toru Furusawa <t.furusawa@ntta.com> Fri Jan 08 13:29:04 2016 -0800
committer Yuta HIGUCHI <y-higuchi@onlab.us> Wed Jan 13 19:27:54 2016 +0000
tree 915f1e955d3cd952de4811d154f71f2247960e5d
parent 3930f6351cffbd28dc9e3001e6de94cb129bb143

[ONOS-3730] Populate portSpeed for ODUCLT and OCH ports.

Also move the enum definition of ODU client port signal type outside of OduCltPort class.

Change-Id: Ibdff21d9707ad3d79587f579ad675f673cf9afeb

providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java

diff --git a/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java b/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java
index fe7f702..346ddb7 100644
--- a/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java
+++ b/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java
@@ -46,13 +46,13 @@
 import org.onosproject.cfg.ComponentConfigService;
 import org.onosproject.net.AnnotationKeys;
 import org.onosproject.net.ChannelSpacing;
+import org.onosproject.net.CltSignalType;
 import org.onosproject.net.DefaultAnnotations;
 import org.onosproject.net.Device;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.GridType;
 import org.onosproject.net.MastershipRole;
 import org.onosproject.net.OchSignal;
-import org.onosproject.net.OduCltPort;
 import org.onosproject.net.OduSignalType;
 import org.onosproject.net.Port;
 import org.onosproject.net.PortNumber;
@@ -537,20 +537,20 @@
             boolean enabled = !port.getState().contains(OFPortState.LINK_DOWN) &&
                               !port.getConfig().contains(OFPortConfig.PORT_DOWN);
             Long portSpeedInMbps = portSpeed(port);
-            OduCltPort.SignalType sigType = null;
+            CltSignalType sigType = null;
 
             switch (portSpeedInMbps.toString()) {
                 case "1000":
-                    sigType = OduCltPort.SignalType.CLT_1GBE;
+                    sigType = CltSignalType.CLT_1GBE;
                     break;
                 case "10000":
-                    sigType = OduCltPort.SignalType.CLT_10GBE;
+                    sigType = CltSignalType.CLT_10GBE;
                     break;
                 case "40000":
-                    sigType = OduCltPort.SignalType.CLT_40GBE;
+                    sigType = CltSignalType.CLT_40GBE;
                     break;
                 case "100000":
-                    sigType = OduCltPort.SignalType.CLT_100GBE;
+                    sigType = CltSignalType.CLT_100GBE;
                     break;
                 default:
                     throw new RuntimeException("Un recognize OduClt speed: " + portSpeedInMbps.toString());