commit 4c0ef6b54af9004262b609d3a42b54e61883ceba
author HIGUCHI Yuta <y-higuchi@ak.jp.nec.com> Mon May 02 19:45:41 2016 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Mon May 09 23:38:47 2016 +0000
tree 7529a89219777106d348619c36f61b1e3467ce59
parent 95d83e80678a76d6fa1476475fcd48a9ecb33c95

ONOS-4416 Remove OduCltPort out of core.

Change-Id: I04324a72e48af84afdbfa32b84c8e57f39411000

cli/src/main/java/org/onosproject/cli/net/AddOpticalIntentCommand.java

diff --git a/cli/src/main/java/org/onosproject/cli/net/AddOpticalIntentCommand.java b/cli/src/main/java/org/onosproject/cli/net/AddOpticalIntentCommand.java
index 001c273..105c53e 100644
--- a/cli/src/main/java/org/onosproject/cli/net/AddOpticalIntentCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/AddOpticalIntentCommand.java
@@ -21,7 +21,6 @@
 import org.onosproject.net.CltSignalType;
 import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.Device;
-import org.onosproject.net.OduCltPort;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.OduSignalType;
 import org.onosproject.net.Port;
@@ -32,6 +31,7 @@
 import org.onosproject.net.intent.OpticalConnectivityIntent;
 import org.onosproject.net.intent.OpticalOduIntent;
 import org.onosproject.net.optical.OchPort;
+import org.onosproject.net.optical.OduCltPort;
 
 import java.util.List;
 

cli/src/main/java/org/onosproject/cli/net/DevicePortsListCommand.java

diff --git a/cli/src/main/java/org/onosproject/cli/net/DevicePortsListCommand.java b/cli/src/main/java/org/onosproject/cli/net/DevicePortsListCommand.java
index 99e8e11..0acfece 100644
--- a/cli/src/main/java/org/onosproject/cli/net/DevicePortsListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/DevicePortsListCommand.java
@@ -25,12 +25,12 @@
 import org.onlab.util.Frequency;
 import org.onosproject.utils.Comparators;
 import org.onosproject.net.Device;
-import org.onosproject.net.OduCltPort;
 import org.onosproject.net.OtuPort;
 import org.onosproject.net.Port;
 import org.onosproject.net.PortNumber;
 import org.onosproject.net.device.DeviceService;
 import org.onosproject.net.optical.OchPort;
+import org.onosproject.net.optical.OduCltPort;
 import org.onosproject.net.optical.OmsPort;
 import org.onosproject.net.optical.OpticalDevice;
 import java.util.ArrayList;
@@ -187,9 +187,22 @@
                     print(FMT, portName, portIsEnabled, portType, port.portSpeed(), annotations);
                     break;
                 case ODUCLT:
-                     print(FMT_ODUCLT_OTU, portName, portIsEnabled, portType,
-                            ((OduCltPort) port).signalType().toString(), annotations);
-                     break;
+                    if (port instanceof org.onosproject.net.OduCltPort) {
+                        // old OduCltPort model
+                        org.onosproject.net.OduCltPort oPort = (org.onosproject.net.OduCltPort) port;
+                        print("WARN: OduCltPort in old model");
+                        print(FMT_ODUCLT_OTU, portName, portIsEnabled, portType,
+                              oPort.signalType().toString(), annotations);
+                        break;
+                    }
+                    if (port instanceof OduCltPort) {
+                        print(FMT_ODUCLT_OTU, portName, portIsEnabled, portType,
+                              ((OduCltPort) port).signalType().toString(), annotations);
+                        break;
+                    }
+                    print("WARN: OduCltPort but not on OpticalDevice or ill-formed");
+                    print(FMT, portName, portIsEnabled, portType, port.portSpeed(), annotations);
+                    break;
                 case OMS:
                     if (port instanceof org.onosproject.net.OmsPort) {
                         org.onosproject.net.OmsPort oms = (org.onosproject.net.OmsPort) port;