commit 44f3761e4cc4304d5d56b7611cc6c1f69e5b2032
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Wed Nov 25 16:23:22 2015 -0800
committer Sho Shimizu <sho.shimizu@gmail.com> Wed Dec 02 17:41:04 2015 +0000
tree cfc042b5554a815c585d545d2aa5d9e8ed6e9748
parent e3af26514753915decfd0e5afb3e7ba347f03e9c

Abondon the concept of resources under a link

Resources under a link are tied to resources under both ends of the link,
and resources under a port are thought to be first-class objects compared
to concept of link resources. We will deal with only device related
resources from now on.

Change-Id: I6aa418d1bf64b28374f325db0bc7e393f770dcdd

core/api/src/test/java/org/onosproject/net/newresource/ResourceAllocationTest.java

diff --git a/core/api/src/test/java/org/onosproject/net/newresource/ResourceAllocationTest.java b/core/api/src/test/java/org/onosproject/net/newresource/ResourceAllocationTest.java
index 5f44822..d21c4b1 100644
--- a/core/api/src/test/java/org/onosproject/net/newresource/ResourceAllocationTest.java
+++ b/core/api/src/test/java/org/onosproject/net/newresource/ResourceAllocationTest.java
@@ -18,9 +18,7 @@
 import com.google.common.testing.EqualsTester;
 import org.junit.Test;
 import org.onlab.packet.VlanId;
-import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.DeviceId;
-import org.onosproject.net.LinkKey;
 import org.onosproject.net.PortNumber;
 import org.onosproject.net.intent.IntentId;
 
@@ -29,18 +27,14 @@
     private static final DeviceId D1 = DeviceId.deviceId("of:001");
     private static final DeviceId D2 = DeviceId.deviceId("of:002");
     private static final PortNumber P1 = PortNumber.portNumber(1);
-    private static final ConnectPoint CP1_1 = new ConnectPoint(D1, P1);
-    private static final ConnectPoint CP2_1 = new ConnectPoint(D2, P1);
     private static final VlanId VLAN1 = VlanId.vlanId((short) 100);
     private static final IntentId IID1 = IntentId.valueOf(30);
-    private static final LinkKey LK1 = LinkKey.linkKey(CP1_1, CP2_1);
-    private static final LinkKey LK2 = LinkKey.linkKey(CP2_1, CP1_1);
 
     @Test
     public void testEquals() {
-        ResourceAllocation alloc1 = new ResourceAllocation(ResourcePath.discrete(LK1, VLAN1), IID1);
-        ResourceAllocation sameAsAlloc1 = new ResourceAllocation(ResourcePath.discrete(LK1, VLAN1), IID1);
-        ResourceAllocation alloc2 = new ResourceAllocation(ResourcePath.discrete(LK2, VLAN1), IID1);
+        ResourceAllocation alloc1 = new ResourceAllocation(ResourcePath.discrete(D1, P1, VLAN1), IID1);
+        ResourceAllocation sameAsAlloc1 = new ResourceAllocation(ResourcePath.discrete(D1, P1, VLAN1), IID1);
+        ResourceAllocation alloc2 = new ResourceAllocation(ResourcePath.discrete(D2, P1, VLAN1), IID1);
 
         new EqualsTester()
                 .addEqualityGroup(alloc1, sameAsAlloc1)