commit 1f5e591196b0c0a92d4f9f650374fc68827ec9e7
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Mon Aug 10 17:00:00 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Mon Aug 17 23:17:05 2015 +0000
tree 8e878e3330020141271132dbc077926b83b087da
parent a29c677596749ff0f97a2e51e609a2a18955a950

Resource API changes as preparation for hierarchy support (ONOS-2446)

The changes:
- Introduce ResourcePath to point a resource
- Remove Resource interface
- Make ResourceAllocation concrete class and remove DefaultResourceAllocation
- Remove DefaultResource
- Changes in interfaces due to the above changes

Change-Id: I0f3f846be67b0f7917117943aac31e3099c851ec

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 49b75f0..97ccb83 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
@@ -60,8 +60,7 @@
 import org.onosproject.net.flow.FlowRule;
 import org.onosproject.net.flow.FlowRuleBatchEntry;
 import org.onosproject.net.intent.IntentId;
-import org.onosproject.net.newresource.DefaultResource;
-import org.onosproject.net.newresource.DefaultResourceAllocation;
+import org.onosproject.net.newresource.ResourcePath;
 import org.onosproject.net.provider.ProviderId;
 import org.onosproject.net.resource.link.BandwidthResource;
 import org.onosproject.net.resource.link.BandwidthResourceAllocation;
@@ -373,15 +372,14 @@
     }
 
     @Test
-    public void testDefaultResouce() {
-        testSerializedEquals(new DefaultResource<>(LinkKey.linkKey(CP1, CP2), VLAN1));
+    public void testResourcePath() {
+        testSerializedEquals(new ResourcePath(LinkKey.linkKey(CP1, CP2), VLAN1));
     }
 
     @Test
-    public void testDefaultResourceAllocation() {
-        testSerializedEquals(new DefaultResourceAllocation<>(
-                LinkKey.linkKey(CP1, CP2),
-                VLAN1,
+    public void testResourceAllocation() {
+        testSerializedEquals(new org.onosproject.net.newresource.ResourceAllocation(
+                new ResourcePath(LinkKey.linkKey(CP1, CP2), VLAN1),
                 IntentId.valueOf(30)));
     }