commit 5be3e820cfeedd763b874e6581161f7e1a0e4850
author HIGUCHI Yuta <y-higuchi@ak.jp.nec.com> Tue May 03 13:51:42 2016 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Mon May 09 23:39:00 2016 +0000
tree d7836aa8772e8470ee0b16a20798bd48539a86ac
parent 4c0ef6b54af9004262b609d3a42b54e61883ceba

ONOS-4417 Remove OtuPort out of core.

Change-Id: Ibc72ee617b238005585f0bcd873b9123e48ee7fc

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 0acfece..5c994d1 100644
--- a/cli/src/main/java/org/onosproject/cli/net/DevicePortsListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/DevicePortsListCommand.java
@@ -25,7 +25,6 @@
 import org.onlab.util.Frequency;
 import org.onosproject.utils.Comparators;
 import org.onosproject.net.Device;
-import org.onosproject.net.OtuPort;
 import org.onosproject.net.Port;
 import org.onosproject.net.PortNumber;
 import org.onosproject.net.device.DeviceService;
@@ -33,6 +32,8 @@
 import org.onosproject.net.optical.OduCltPort;
 import org.onosproject.net.optical.OmsPort;
 import org.onosproject.net.optical.OpticalDevice;
+import org.onosproject.net.optical.OtuPort;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -227,8 +228,20 @@
                     print(FMT, portName, portIsEnabled, portType, port.portSpeed(), annotations);
                     break;
                 case OTU:
-                    print(FMT_ODUCLT_OTU, portName, portIsEnabled, portType,
-                                ((OtuPort) port).signalType().toString(), annotations);
+                    if (port instanceof org.onosproject.net.OtuPort) {
+                        org.onosproject.net.OtuPort otu = (org.onosproject.net.OtuPort) port;
+                        print("WARN: OtuPort in old model");
+                        print(FMT_ODUCLT_OTU, portName, portIsEnabled, portType,
+                              otu.signalType().toString(), annotations);
+                        break;
+                    }
+                    if (port instanceof OtuPort) {
+                        print(FMT_ODUCLT_OTU, portName, portIsEnabled, portType,
+                              ((OtuPort) port).signalType().toString(), annotations);
+                        break;
+                    }
+                    print("WARN: OtuPort but not on OpticalDevice or ill-formed");
+                    print(FMT, portName, portIsEnabled, portType, port.portSpeed(), annotations);
                     break;
                 default:
                      print(FMT, portName, portIsEnabled, portType, port.portSpeed(), annotations);