Introduce two specific types of ResourceId for Discrete and Continuous
Change-Id: I4a29beaabe32ba78fb03336192095edadc63e3c9
diff --git a/core/api/src/test/java/org/onosproject/net/newresource/ResourceIdTest.java b/core/api/src/test/java/org/onosproject/net/newresource/ResourceIdTest.java
new file mode 100644
index 0000000..7a37d30
--- /dev/null
+++ b/core/api/src/test/java/org/onosproject/net/newresource/ResourceIdTest.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2016 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 org.junit.Test;
+import org.onlab.util.Bandwidth;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.PortNumber;
+
+import java.util.Arrays;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+public class ResourceIdTest {
+ private static final DeviceId D1 = DeviceId.deviceId("a");
+ private static final PortNumber P1 = PortNumber.portNumber(1);
+ private static final Bandwidth BW1 = Bandwidth.gbps(1);
+
+ @Test
+ public void testDiscreteToString() {
+ ResourceId resource = ResourceId.discrete(D1, P1);
+
+ assertThat(resource.toString(), is(Arrays.asList(D1, P1).toString()));
+ }
+
+ @Test
+ public void testContinuousToString() {
+ ResourceId resource = ResourceId.continuous(D1, P1, Bandwidth.class);
+
+ assertThat(resource.toString(), is(Arrays.asList(D1, P1, Bandwidth.class.getSimpleName()).toString()));
+ }
+
+ @Test(expected = IllegalArgumentException.class)
+ public void testInitWithNonClassInstance() {
+ ResourceId.continuous(D1, P1, BW1);
+ }
+}
diff --git a/core/api/src/test/java/org/onosproject/net/newresource/ResourceTest.java b/core/api/src/test/java/org/onosproject/net/newresource/ResourceTest.java
index dd4432d..f7c165e 100644
--- a/core/api/src/test/java/org/onosproject/net/newresource/ResourceTest.java
+++ b/core/api/src/test/java/org/onosproject/net/newresource/ResourceTest.java
@@ -42,8 +42,8 @@
Resource resource1 = Resource.discrete(D1, P1, VLAN1);
Resource sameAsResource1 = Resource.discrete(D1, P1, VLAN1);
Resource resource2 = Resource.discrete(D2, P1, VLAN1);
- Resource resource3 = Resource.continuous(BW1.bps(), D1, P1, BW1);
- Resource sameAsResource3 = Resource.continuous(BW1.bps(), D1, P1, BW1);
+ Resource resource3 = Resource.continuous(BW1.bps(), D1, P1, Bandwidth.class);
+ Resource sameAsResource3 = Resource.continuous(BW1.bps(), D1, P1, Bandwidth.class);
new EqualsTester()
.addEqualityGroup(resource1, sameAsResource1)
@@ -64,9 +64,9 @@
ResourceId id1 = Resource.discrete(D1, P1, VLAN1).id();
ResourceId sameAsId1 = Resource.discrete(D1, P1, VLAN1).id();
ResourceId id2 = Resource.discrete(D2, P1, VLAN1).id();
- ResourceId id3 = Resource.continuous(BW1.bps(), D1, P1, BW1).id();
+ ResourceId id3 = Resource.continuous(BW1.bps(), D1, P1, Bandwidth.class).id();
// intentionally set a different value
- ResourceId sameAsId3 = Resource.continuous(BW2.bps(), D1, P1, BW1).id();
+ ResourceId sameAsId3 = Resource.continuous(BW2.bps(), D1, P1, Bandwidth.class).id();
new EqualsTester()
.addEqualityGroup(id1, sameAsId1)
@@ -104,4 +104,20 @@
DeviceId child = (DeviceId) resource.last();
assertThat(child, is(D1));
}
+
+ @Test
+ public void testVolumeOfDiscrete() {
+ Resource resource = Resource.discrete(D1);
+
+ DeviceId volume = resource.volume();
+ assertThat(volume, is(D1));
+ }
+
+ @Test
+ public void testVolumeOfContinuous() {
+ Resource resource = Resource.continuous(BW1.bps(), D1, P1, Bandwidth.class);
+
+ double volume = resource.volume();
+ assertThat(volume, is(BW1.bps()));
+ }
}