commit 60ac58efe977e2d8822657c013e724523cae32ac
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Wed Nov 11 12:16:38 2015 -0800
committer Brian O'Connor <bocon@onlab.us> Fri Nov 20 07:54:39 2015 +0000
tree b3dfc1d447001c3ab5853d3978e6bfb6551cb660
parent 71b3978e3a99d18de235bed0d9b06d233745ad93

Add sub-types to distinguish type of resources

Change-Id: Ia43cbf4a13937c9bd9dbc97221062ef5fa3e578f

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 b2199f7..6f96498 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
@@ -416,6 +416,8 @@
                     BandwidthResourceAllocation.class,
                     LambdaResourceAllocation.class,
                     ResourcePath.class,
+                    ResourcePath.Discrete.class,
+                    ResourcePath.Continuous.class,
                     ResourceAllocation.class,
                     // Constraints
                     LambdaConstraint.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 97ccb83..11a62d4 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
@@ -373,13 +373,13 @@
 
     @Test
     public void testResourcePath() {
-        testSerializedEquals(new ResourcePath(LinkKey.linkKey(CP1, CP2), VLAN1));
+        testSerializedEquals(ResourcePath.discrete(LinkKey.linkKey(CP1, CP2), VLAN1));
     }
 
     @Test
     public void testResourceAllocation() {
         testSerializedEquals(new org.onosproject.net.newresource.ResourceAllocation(
-                new ResourcePath(LinkKey.linkKey(CP1, CP2), VLAN1),
+                ResourcePath.discrete(LinkKey.linkKey(CP1, CP2), VLAN1),
                 IntentId.valueOf(30)));
     }