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/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java

diff --git a/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
index de72fd2..7223d57 100644
--- a/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
+++ b/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
@@ -49,6 +49,7 @@
 import org.onosproject.mastership.MastershipTerm;
 import org.onosproject.net.Annotations;
 import org.onosproject.net.ChannelSpacing;
+import org.onosproject.net.CltSignalType;
 import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.DefaultAnnotations;
 import org.onosproject.net.DefaultDevice;
@@ -483,7 +484,7 @@
             .register(GridType.class)
             .register(ChannelSpacing.class)
             .register(OduCltPort.class)
-            .register(OduCltPort.SignalType.class)
+            .register(CltSignalType.class)
             .register(IndexedLambda.class)
             .register(OchSignal.class)
             .register(OduSignalId.class)

core/store/serializers/src/test/java/org/onosproject/store/serializers/KryoSerializerTest.java

diff --git a/core/store/serializers/src/test/java/org/onosproject/store/serializers/KryoSerializerTest.java b/core/store/serializers/src/test/java/org/onosproject/store/serializers/KryoSerializerTest.java
index a318068..aca0acc 100644
--- a/core/store/serializers/src/test/java/org/onosproject/store/serializers/KryoSerializerTest.java
+++ b/core/store/serializers/src/test/java/org/onosproject/store/serializers/KryoSerializerTest.java
@@ -34,6 +34,7 @@
 import org.onosproject.mastership.MastershipTerm;
 import org.onosproject.net.Annotations;
 import org.onosproject.net.ChannelSpacing;
+import org.onosproject.net.CltSignalType;
 import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.DefaultAnnotations;
 import org.onosproject.net.DefaultDevice;
@@ -208,8 +209,8 @@
 
     @Test
     public void testOduCltPort() {
-        testSerializedEquals(new OduCltPort(DEV1, P1, true, OduCltPort.SignalType.CLT_10GBE));
-        testSerializedEquals(new OduCltPort(DEV1, P1, true, OduCltPort.SignalType.CLT_10GBE, A1_2));
+        testSerializedEquals(new OduCltPort(DEV1, P1, true, CltSignalType.CLT_10GBE));
+        testSerializedEquals(new OduCltPort(DEV1, P1, true, CltSignalType.CLT_10GBE, A1_2));
     }
 
     @Test