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

core/api/src/main/java/org/onosproject/net/device/OduCltPortDescription.java

diff --git a/core/api/src/main/java/org/onosproject/net/device/OduCltPortDescription.java b/core/api/src/main/java/org/onosproject/net/device/OduCltPortDescription.java
index eee7de2..3991e64 100644
--- a/core/api/src/main/java/org/onosproject/net/device/OduCltPortDescription.java
+++ b/core/api/src/main/java/org/onosproject/net/device/OduCltPortDescription.java
@@ -16,7 +16,7 @@
 package org.onosproject.net.device;
 
 import com.google.common.base.MoreObjects;
-import org.onosproject.net.OduCltPort;
+import org.onosproject.net.CltSignalType;
 import org.onosproject.net.Port;
 import org.onosproject.net.PortNumber;
 import org.onosproject.net.SparseAnnotations;
@@ -26,7 +26,7 @@
  */
 public class OduCltPortDescription extends DefaultPortDescription {
 
-    private final OduCltPort.SignalType signalType;
+    private final CltSignalType signalType;
 
     /**
      * Creates ODU client port description based on the supplied information.
@@ -36,7 +36,7 @@
      * @param signalType    ODU client signal type
      * @param annotations   optional key/value annotations map
      */
-    public OduCltPortDescription(PortNumber number, boolean isEnabled, OduCltPort.SignalType signalType,
+    public OduCltPortDescription(PortNumber number, boolean isEnabled, CltSignalType signalType,
                                  SparseAnnotations... annotations) {
         super(number, isEnabled, Port.Type.ODUCLT, 0, annotations);
         this.signalType = signalType;
@@ -49,7 +49,7 @@
      * @param signalType    ODU client signal type
      * @param annotations   optional key/value annotations map
      */
-    public OduCltPortDescription(PortDescription base, OduCltPort.SignalType signalType,
+    public OduCltPortDescription(PortDescription base, CltSignalType signalType,
                                  SparseAnnotations annotations) {
         super(base, annotations);
         this.signalType = signalType;
@@ -60,7 +60,7 @@
      *
      * @return ODU client signal type
      */
-    public OduCltPort.SignalType signalType() {
+    public CltSignalType signalType() {
         return signalType;
     }