Moving LabelResourceManager to incubator
Breaking apart resource package into {device, link, label}
Refactored cluster serializers so they are visible
Change-Id: I71051bcd5e790ae6abeb154bf58286e584c32858
diff --git a/core/api/src/test/java/org/onosproject/net/intent/IntentServiceTest.java b/core/api/src/test/java/org/onosproject/net/intent/IntentServiceTest.java
index 6e03412..60857ca 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/IntentServiceTest.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/IntentServiceTest.java
@@ -19,7 +19,7 @@
import org.junit.Before;
import org.junit.Test;
import org.onosproject.core.IdGenerator;
-import org.onosproject.net.resource.LinkResourceAllocations;
+import org.onosproject.net.resource.link.LinkResourceAllocations;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/core/api/src/test/java/org/onosproject/net/intent/IntentTestsMocks.java b/core/api/src/test/java/org/onosproject/net/intent/IntentTestsMocks.java
index 47faf4a..6c7fe13 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/IntentTestsMocks.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/IntentTestsMocks.java
@@ -36,17 +36,17 @@
import org.onosproject.net.flow.criteria.Criterion.Type;
import org.onosproject.net.flow.instructions.Instruction;
import org.onosproject.net.flow.instructions.Instructions;
-import org.onosproject.net.resource.BandwidthResource;
-import org.onosproject.net.resource.BandwidthResourceRequest;
-import org.onosproject.net.resource.LambdaResource;
-import org.onosproject.net.resource.LambdaResourceAllocation;
-import org.onosproject.net.resource.LambdaResourceRequest;
-import org.onosproject.net.resource.LinkResourceAllocations;
-import org.onosproject.net.resource.LinkResourceListener;
-import org.onosproject.net.resource.LinkResourceRequest;
-import org.onosproject.net.resource.LinkResourceService;
-import org.onosproject.net.resource.MplsLabel;
-import org.onosproject.net.resource.MplsLabelResourceAllocation;
+import org.onosproject.net.resource.link.BandwidthResource;
+import org.onosproject.net.resource.link.BandwidthResourceRequest;
+import org.onosproject.net.resource.link.LambdaResource;
+import org.onosproject.net.resource.link.LambdaResourceAllocation;
+import org.onosproject.net.resource.link.LambdaResourceRequest;
+import org.onosproject.net.resource.link.LinkResourceAllocations;
+import org.onosproject.net.resource.link.LinkResourceListener;
+import org.onosproject.net.resource.link.LinkResourceRequest;
+import org.onosproject.net.resource.link.LinkResourceService;
+import org.onosproject.net.resource.link.MplsLabel;
+import org.onosproject.net.resource.link.MplsLabelResourceAllocation;
import org.onosproject.net.resource.ResourceAllocation;
import org.onosproject.net.resource.ResourceRequest;
import org.onosproject.net.resource.ResourceType;
diff --git a/core/api/src/test/java/org/onosproject/net/intent/LinkCollectionIntentTest.java b/core/api/src/test/java/org/onosproject/net/intent/LinkCollectionIntentTest.java
index 988b0b4..88fa7f4 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/LinkCollectionIntentTest.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/LinkCollectionIntentTest.java
@@ -26,7 +26,7 @@
import org.onosproject.net.NetTestTools;
import org.onosproject.net.flow.TrafficSelector;
import org.onosproject.net.intent.constraint.LambdaConstraint;
-import org.onosproject.net.resource.LambdaResource;
+import org.onosproject.net.resource.link.LambdaResource;
import com.google.common.collect.ImmutableSet;
import com.google.common.testing.EqualsTester;
diff --git a/core/api/src/test/java/org/onosproject/net/intent/constraint/AnnotationConstraintTest.java b/core/api/src/test/java/org/onosproject/net/intent/constraint/AnnotationConstraintTest.java
index c4f3a36..b87dc12 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/constraint/AnnotationConstraintTest.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/constraint/AnnotationConstraintTest.java
@@ -24,7 +24,7 @@
import org.onosproject.net.Link;
import org.onosproject.net.PortNumber;
import org.onosproject.net.provider.ProviderId;
-import org.onosproject.net.resource.LinkResourceService;
+import org.onosproject.net.resource.link.LinkResourceService;
import static org.easymock.EasyMock.createMock;
import static org.hamcrest.Matchers.closeTo;
diff --git a/core/api/src/test/java/org/onosproject/net/intent/constraint/ConstraintObjectsTest.java b/core/api/src/test/java/org/onosproject/net/intent/constraint/ConstraintObjectsTest.java
index cc29a25..743fc252 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/constraint/ConstraintObjectsTest.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/constraint/ConstraintObjectsTest.java
@@ -18,8 +18,8 @@
import org.junit.Test;
import org.onlab.util.Bandwidth;
import org.onosproject.net.Link;
-import org.onosproject.net.resource.BandwidthResource;
-import org.onosproject.net.resource.LambdaResource;
+import org.onosproject.net.resource.link.BandwidthResource;
+import org.onosproject.net.resource.link.LambdaResource;
import com.google.common.testing.EqualsTester;
diff --git a/core/api/src/test/java/org/onosproject/net/intent/constraint/LatencyConstraintTest.java b/core/api/src/test/java/org/onosproject/net/intent/constraint/LatencyConstraintTest.java
index 3d9429e..bab1749 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/constraint/LatencyConstraintTest.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/constraint/LatencyConstraintTest.java
@@ -27,7 +27,7 @@
import org.onosproject.net.Path;
import org.onosproject.net.PortNumber;
import org.onosproject.net.provider.ProviderId;
-import org.onosproject.net.resource.LinkResourceService;
+import org.onosproject.net.resource.link.LinkResourceService;
import java.time.Duration;
import java.time.temporal.ChronoUnit;
diff --git a/core/api/src/test/java/org/onosproject/net/intent/constraint/ObstacleConstraintTest.java b/core/api/src/test/java/org/onosproject/net/intent/constraint/ObstacleConstraintTest.java
index 291610a..f02787f 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/constraint/ObstacleConstraintTest.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/constraint/ObstacleConstraintTest.java
@@ -27,7 +27,7 @@
import org.onosproject.net.Path;
import org.onosproject.net.PortNumber;
import org.onosproject.net.provider.ProviderId;
-import org.onosproject.net.resource.LinkResourceService;
+import org.onosproject.net.resource.link.LinkResourceService;
import java.util.Arrays;
diff --git a/core/api/src/test/java/org/onosproject/net/intent/constraint/WaypointConstraintTest.java b/core/api/src/test/java/org/onosproject/net/intent/constraint/WaypointConstraintTest.java
index 8e15711..f7e212a 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/constraint/WaypointConstraintTest.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/constraint/WaypointConstraintTest.java
@@ -25,7 +25,7 @@
import org.onosproject.net.PortNumber;
import org.onosproject.net.intent.Constraint;
import org.onosproject.net.provider.ProviderId;
-import org.onosproject.net.resource.LinkResourceService;
+import org.onosproject.net.resource.link.LinkResourceService;
import java.util.Arrays;
diff --git a/core/api/src/test/java/org/onosproject/net/resource/DefaultLabelResourceTest.java b/core/api/src/test/java/org/onosproject/net/resource/DefaultLabelResourceTest.java
deleted file mode 100644
index 0e5ec27..0000000
--- a/core/api/src/test/java/org/onosproject/net/resource/DefaultLabelResourceTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.onosproject.net.resource;
-
-import org.junit.Test;
-import org.onosproject.event.AbstractEventTest;
-
-import com.google.common.testing.EqualsTester;
-
-/**
- * Tests of default label resource.
- */
-public class DefaultLabelResourceTest extends AbstractEventTest {
-
- @Test
- public void testEquality() {
- String deviceId1 = "of:001";
- String deviceId2 = "of:002";
- long labelResourceId1 = 100;
- long labelResourceId2 = 200;
- DefaultLabelResource h1 = new DefaultLabelResource(deviceId1,
- labelResourceId1);
- DefaultLabelResource h2 = new DefaultLabelResource(deviceId1,
- labelResourceId1);
- DefaultLabelResource h3 = new DefaultLabelResource(deviceId2,
- labelResourceId2);
- DefaultLabelResource h4 = new DefaultLabelResource(deviceId2,
- labelResourceId2);
-
- new EqualsTester().addEqualityGroup(h1, h2).addEqualityGroup(h3, h4)
- .testEquals();
- }
-}
diff --git a/core/api/src/test/java/org/onosproject/net/resource/LabelResourcePoolTest.java b/core/api/src/test/java/org/onosproject/net/resource/LabelResourcePoolTest.java
deleted file mode 100644
index f4d91c1..0000000
--- a/core/api/src/test/java/org/onosproject/net/resource/LabelResourcePoolTest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.onosproject.net.resource;
-
-import org.junit.Test;
-import org.onosproject.event.AbstractEventTest;
-
-import com.google.common.testing.EqualsTester;
-
-/**
- * Tests of the label resource pool.
- */
-public class LabelResourcePoolTest extends AbstractEventTest {
-
- @Test
- public void testEquality() {
- LabelResourcePool h1 = new LabelResourcePool("of:001", 0, 100);
- LabelResourcePool h2 = new LabelResourcePool("of:001", 0, 100);
- LabelResourcePool h3 = new LabelResourcePool("of:002", 0, 100);
- LabelResourcePool h4 = new LabelResourcePool("of:002", 0, 100);
- new EqualsTester().addEqualityGroup(h1, h2).addEqualityGroup(h3, h4)
- .testEquals();
- }
-
-}
diff --git a/core/api/src/test/java/org/onosproject/net/resource/LabelResourceRequestTest.java b/core/api/src/test/java/org/onosproject/net/resource/LabelResourceRequestTest.java
deleted file mode 100644
index bc538b2..0000000
--- a/core/api/src/test/java/org/onosproject/net/resource/LabelResourceRequestTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.onosproject.net.resource;
-
-import java.util.Collections;
-
-import org.junit.Test;
-import org.onosproject.event.AbstractEventTest;
-import org.onosproject.net.DeviceId;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.testing.EqualsTester;
-
-/**
- * Tests of the label resource request.
- */
-public class LabelResourceRequestTest extends AbstractEventTest {
-
- @Test
- public void testEquality() {
- DeviceId deviceId1 = DeviceId.deviceId("of:0001");
- DeviceId deviceId2 = DeviceId.deviceId("of:0002");
- long apply = 2;
- ImmutableSet<LabelResource> releaseCollection = ImmutableSet
- .copyOf(Collections.emptySet());
- LabelResourceRequest h1 = new LabelResourceRequest(
- deviceId1,
- LabelResourceRequest.Type.APPLY,
- apply, null);
- LabelResourceRequest h2 = new LabelResourceRequest(
- deviceId1,
- LabelResourceRequest.Type.APPLY,
- apply, null);
- LabelResourceRequest h3 = new LabelResourceRequest(
- deviceId2,
- LabelResourceRequest.Type.RELEASE,
- 0, releaseCollection);
- LabelResourceRequest h4 = new LabelResourceRequest(
- deviceId2,
- LabelResourceRequest.Type.RELEASE,
- 0, releaseCollection);
-
- new EqualsTester().addEqualityGroup(h1, h2).addEqualityGroup(h3, h4)
- .testEquals();
- }
-}
diff --git a/core/api/src/test/java/org/onosproject/net/resource/MplsObjectsTest.java b/core/api/src/test/java/org/onosproject/net/resource/MplsObjectsTest.java
index 42ee5f4..56f7a47 100644
--- a/core/api/src/test/java/org/onosproject/net/resource/MplsObjectsTest.java
+++ b/core/api/src/test/java/org/onosproject/net/resource/MplsObjectsTest.java
@@ -18,6 +18,8 @@
import org.junit.Test;
import com.google.common.testing.EqualsTester;
+import org.onosproject.net.resource.link.MplsLabel;
+import org.onosproject.net.resource.link.MplsLabelResourceAllocation;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;