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
diff --git a/core/api/src/test/java/org/onosproject/net/newresource/DefaultResourceTest.java b/core/api/src/test/java/org/onosproject/net/newresource/DefaultResourceTest.java
deleted file mode 100644
index b4e3731..0000000
--- a/core/api/src/test/java/org/onosproject/net/newresource/DefaultResourceTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.net.newresource;
-
-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;
-
-public class DefaultResourceTest {
-
- 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);
-
- @Test
- public void testEquals() {
- DefaultResource<LinkKey, VlanId> resource1 =
- new DefaultResource<>(LinkKey.linkKey(CP1_1, CP2_1), VLAN1);
- DefaultResource<LinkKey, VlanId> sameAsResource1 =
- new DefaultResource<>(LinkKey.linkKey(CP1_1, CP2_1), VLAN1);
- DefaultResource<LinkKey, VlanId> resource2 =
- new DefaultResource<>(LinkKey.linkKey(CP2_1, CP1_1), VLAN1);
-
- new EqualsTester()
- .addEqualityGroup(resource1, sameAsResource1)
- .addEqualityGroup(resource2)
- .testEquals();
- }
-}
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 2872046..a84927a 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
@@ -33,15 +33,14 @@
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() {
- DefaultResourceAllocation<LinkKey, VlanId> alloc1 =
- new DefaultResourceAllocation<>(LinkKey.linkKey(CP1_1, CP2_1), VLAN1, IID1);
- DefaultResourceAllocation<LinkKey, VlanId> sameAsAlloc1 =
- new DefaultResourceAllocation<>(LinkKey.linkKey(CP1_1, CP2_1), VLAN1, IID1);
- DefaultResourceAllocation<LinkKey, VlanId> alloc2 =
- new DefaultResourceAllocation<>(LinkKey.linkKey(CP2_1, CP1_1), VLAN1, IID1);
+ ResourceAllocation alloc1 = new ResourceAllocation(new ResourcePath(LK1, VLAN1), IID1);
+ ResourceAllocation sameAsAlloc1 = new ResourceAllocation(new ResourcePath(LK1, VLAN1), IID1);
+ ResourceAllocation alloc2 = new ResourceAllocation(new ResourcePath(LK2, VLAN1), IID1);
new EqualsTester()
.addEqualityGroup(alloc1, sameAsAlloc1)
diff --git a/core/api/src/test/java/org/onosproject/net/newresource/ResourcePathTest.java b/core/api/src/test/java/org/onosproject/net/newresource/ResourcePathTest.java
new file mode 100644
index 0000000..3034048
--- /dev/null
+++ b/core/api/src/test/java/org/onosproject/net/newresource/ResourcePathTest.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2015 Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.net.newresource;
+
+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 java.util.Optional;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+public class ResourcePathTest {
+
+ 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);
+
+ @Test
+ public void testEquals() {
+ ResourcePath resource1 = new ResourcePath(LinkKey.linkKey(CP1_1, CP2_1), VLAN1);
+ ResourcePath sameAsResource1 = new ResourcePath(LinkKey.linkKey(CP1_1, CP2_1), VLAN1);
+ ResourcePath resource2 = new ResourcePath(LinkKey.linkKey(CP2_1, CP1_1), VLAN1);
+
+ new EqualsTester()
+ .addEqualityGroup(resource1, sameAsResource1)
+ .addEqualityGroup(resource2)
+ .testEquals();
+ }
+
+ @Test(expected = IllegalArgumentException.class)
+ public void testCreateWithZeroComponent() {
+ ResourcePath path = new ResourcePath();
+ }
+
+ @Test
+ public void testThereIsParent() {
+ ResourcePath path = new ResourcePath(LinkKey.linkKey(CP1_1, CP2_1), VLAN1);
+ ResourcePath parent = new ResourcePath(LinkKey.linkKey(CP1_1, CP2_1));
+
+ assertThat(path.parent(), is(Optional.of(parent)));
+ }
+
+ @Test
+ public void testNoParent() {
+ ResourcePath path = new ResourcePath(LinkKey.linkKey(CP1_1, CP2_1));
+
+ assertThat(path.parent(), is(Optional.empty()));
+ }
+
+ @Test
+ public void testBase() {
+ LinkKey linkKey = LinkKey.linkKey(CP1_1, CP2_1);
+ ResourcePath path = new ResourcePath(linkKey);
+
+ LinkKey child = (LinkKey) path.lastComponent();
+ assertThat(child, is(linkKey));
+ }
+}