Move files under newresource package to resource package
Change-Id: Ifedb99be4671ada97fafe3ecfd196939207baa86
diff --git a/core/api/src/main/java/org/onosproject/net/intent/IntentId.java b/core/api/src/main/java/org/onosproject/net/intent/IntentId.java
index 4494eea..567af95 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/IntentId.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/IntentId.java
@@ -17,7 +17,7 @@
import com.google.common.annotations.Beta;
import org.onlab.util.Identifier;
-import org.onosproject.net.newresource.ResourceConsumer;
+import org.onosproject.net.resource.ResourceConsumer;
/**
* Intent identifier suitable as an external key.
diff --git a/core/api/src/main/java/org/onosproject/net/intent/ResourceContext.java b/core/api/src/main/java/org/onosproject/net/intent/ResourceContext.java
index 0193c61..e4f108c 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/ResourceContext.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/ResourceContext.java
@@ -16,7 +16,7 @@
package org.onosproject.net.intent;
import com.google.common.annotations.Beta;
-import org.onosproject.net.newresource.Resource;
+import org.onosproject.net.resource.Resource;
/**
* Class providing resource information to constraints.
diff --git a/core/api/src/main/java/org/onosproject/net/intent/constraint/BandwidthConstraint.java b/core/api/src/main/java/org/onosproject/net/intent/constraint/BandwidthConstraint.java
index 9ef0243..ee2ecee 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/constraint/BandwidthConstraint.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/constraint/BandwidthConstraint.java
@@ -21,7 +21,7 @@
import org.onlab.util.DataRateUnit;
import org.onosproject.net.Link;
import org.onosproject.net.intent.ResourceContext;
-import org.onosproject.net.newresource.Resources;
+import org.onosproject.net.resource.Resources;
import java.util.Objects;
import java.util.stream.Stream;
diff --git a/core/api/src/main/java/org/onosproject/net/newresource/BandwidthCapacity.java b/core/api/src/main/java/org/onosproject/net/resource/BandwidthCapacity.java
similarity index 98%
rename from core/api/src/main/java/org/onosproject/net/newresource/BandwidthCapacity.java
rename to core/api/src/main/java/org/onosproject/net/resource/BandwidthCapacity.java
index 5121181..81c04d9 100644
--- a/core/api/src/main/java/org/onosproject/net/newresource/BandwidthCapacity.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/BandwidthCapacity.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.net.newresource;
+package org.onosproject.net.resource;
import static com.google.common.base.Preconditions.checkNotNull;
diff --git a/core/api/src/main/java/org/onosproject/net/newresource/ContinuousFactory.java b/core/api/src/main/java/org/onosproject/net/resource/ContinuousFactory.java
similarity index 97%
rename from core/api/src/main/java/org/onosproject/net/newresource/ContinuousFactory.java
rename to core/api/src/main/java/org/onosproject/net/resource/ContinuousFactory.java
index 2acd726..891ef41 100644
--- a/core/api/src/main/java/org/onosproject/net/newresource/ContinuousFactory.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/ContinuousFactory.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.net.newresource;
+package org.onosproject.net.resource;
import com.google.common.annotations.Beta;
diff --git a/core/api/src/main/java/org/onosproject/net/newresource/ContinuousResource.java b/core/api/src/main/java/org/onosproject/net/resource/ContinuousResource.java
similarity index 98%
rename from core/api/src/main/java/org/onosproject/net/newresource/ContinuousResource.java
rename to core/api/src/main/java/org/onosproject/net/resource/ContinuousResource.java
index 3625ce0..1d405a8 100644
--- a/core/api/src/main/java/org/onosproject/net/newresource/ContinuousResource.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/ContinuousResource.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.net.newresource;
+package org.onosproject.net.resource;
import com.google.common.annotations.Beta;
import com.google.common.base.MoreObjects;
diff --git a/core/api/src/main/java/org/onosproject/net/newresource/ContinuousResourceId.java b/core/api/src/main/java/org/onosproject/net/resource/ContinuousResourceId.java
similarity index 98%
rename from core/api/src/main/java/org/onosproject/net/newresource/ContinuousResourceId.java
rename to core/api/src/main/java/org/onosproject/net/resource/ContinuousResourceId.java
index f372c59..e09567a 100644
--- a/core/api/src/main/java/org/onosproject/net/newresource/ContinuousResourceId.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/ContinuousResourceId.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.net.newresource;
+package org.onosproject.net.resource;
import com.google.common.annotations.Beta;
import com.google.common.collect.ImmutableList;
diff --git a/core/api/src/main/java/org/onosproject/net/newresource/DiscreteFactory.java b/core/api/src/main/java/org/onosproject/net/resource/DiscreteFactory.java
similarity index 97%
rename from core/api/src/main/java/org/onosproject/net/newresource/DiscreteFactory.java
rename to core/api/src/main/java/org/onosproject/net/resource/DiscreteFactory.java
index a26c7d5..05d3f06 100644
--- a/core/api/src/main/java/org/onosproject/net/newresource/DiscreteFactory.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/DiscreteFactory.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.net.newresource;
+package org.onosproject.net.resource;
import com.google.common.annotations.Beta;
diff --git a/core/api/src/main/java/org/onosproject/net/newresource/DiscreteResource.java b/core/api/src/main/java/org/onosproject/net/resource/DiscreteResource.java
similarity index 98%
rename from core/api/src/main/java/org/onosproject/net/newresource/DiscreteResource.java
rename to core/api/src/main/java/org/onosproject/net/resource/DiscreteResource.java
index 8bf0e0a..bf4c389 100644
--- a/core/api/src/main/java/org/onosproject/net/newresource/DiscreteResource.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/DiscreteResource.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.net.newresource;
+package org.onosproject.net.resource;
import com.google.common.annotations.Beta;
import com.google.common.base.MoreObjects;
diff --git a/core/api/src/main/java/org/onosproject/net/newresource/DiscreteResourceId.java b/core/api/src/main/java/org/onosproject/net/resource/DiscreteResourceId.java
similarity index 98%
rename from core/api/src/main/java/org/onosproject/net/newresource/DiscreteResourceId.java
rename to core/api/src/main/java/org/onosproject/net/resource/DiscreteResourceId.java
index 2f52471..619a9fa 100644
--- a/core/api/src/main/java/org/onosproject/net/newresource/DiscreteResourceId.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/DiscreteResourceId.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.net.newresource;
+package org.onosproject.net.resource;
import com.google.common.annotations.Beta;
import com.google.common.collect.ImmutableList;
diff --git a/core/api/src/main/java/org/onosproject/net/newresource/Resource.java b/core/api/src/main/java/org/onosproject/net/resource/Resource.java
similarity index 98%
rename from core/api/src/main/java/org/onosproject/net/newresource/Resource.java
rename to core/api/src/main/java/org/onosproject/net/resource/Resource.java
index 1548717..8c59108 100644
--- a/core/api/src/main/java/org/onosproject/net/newresource/Resource.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/Resource.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.net.newresource;
+package org.onosproject.net.resource;
import com.google.common.annotations.Beta;
diff --git a/core/api/src/main/java/org/onosproject/net/newresource/ResourceAdminService.java b/core/api/src/main/java/org/onosproject/net/resource/ResourceAdminService.java
similarity index 95%
rename from core/api/src/main/java/org/onosproject/net/newresource/ResourceAdminService.java
rename to core/api/src/main/java/org/onosproject/net/resource/ResourceAdminService.java
index d394e1c..ae25a37 100644
--- a/core/api/src/main/java/org/onosproject/net/newresource/ResourceAdminService.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/ResourceAdminService.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015-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.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.net.newresource;
+package org.onosproject.net.resource;
import com.google.common.annotations.Beta;
import com.google.common.collect.ImmutableList;
diff --git a/core/api/src/main/java/org/onosproject/net/newresource/ResourceAllocation.java b/core/api/src/main/java/org/onosproject/net/resource/ResourceAllocation.java
similarity index 96%
rename from core/api/src/main/java/org/onosproject/net/newresource/ResourceAllocation.java
rename to core/api/src/main/java/org/onosproject/net/resource/ResourceAllocation.java
index 07976a9..1fc9249 100644
--- a/core/api/src/main/java/org/onosproject/net/newresource/ResourceAllocation.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/ResourceAllocation.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015-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.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.net.newresource;
+package org.onosproject.net.resource;
import com.google.common.annotations.Beta;
import com.google.common.base.MoreObjects;
diff --git a/core/api/src/main/java/org/onosproject/net/newresource/ResourceConsumer.java b/core/api/src/main/java/org/onosproject/net/resource/ResourceConsumer.java
similarity index 88%
rename from core/api/src/main/java/org/onosproject/net/newresource/ResourceConsumer.java
rename to core/api/src/main/java/org/onosproject/net/resource/ResourceConsumer.java
index 1f67e20..29dd343 100644
--- a/core/api/src/main/java/org/onosproject/net/newresource/ResourceConsumer.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/ResourceConsumer.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015-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.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.net.newresource;
+package org.onosproject.net.resource;
import com.google.common.annotations.Beta;
diff --git a/core/api/src/main/java/org/onosproject/net/newresource/ResourceEvent.java b/core/api/src/main/java/org/onosproject/net/resource/ResourceEvent.java
similarity index 94%
rename from core/api/src/main/java/org/onosproject/net/newresource/ResourceEvent.java
rename to core/api/src/main/java/org/onosproject/net/resource/ResourceEvent.java
index c54b505..4322196 100644
--- a/core/api/src/main/java/org/onosproject/net/newresource/ResourceEvent.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/ResourceEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015-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.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.net.newresource;
+package org.onosproject.net.resource;
import com.google.common.annotations.Beta;
import org.onosproject.event.AbstractEvent;
diff --git a/core/api/src/main/java/org/onosproject/net/newresource/ResourceId.java b/core/api/src/main/java/org/onosproject/net/resource/ResourceId.java
similarity index 97%
rename from core/api/src/main/java/org/onosproject/net/newresource/ResourceId.java
rename to core/api/src/main/java/org/onosproject/net/resource/ResourceId.java
index c4df116..00722c0 100644
--- a/core/api/src/main/java/org/onosproject/net/newresource/ResourceId.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/ResourceId.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.net.newresource;
+package org.onosproject.net.resource;
import com.google.common.annotations.Beta;
import com.google.common.collect.ImmutableList;
diff --git a/core/api/src/main/java/org/onosproject/net/newresource/ResourceListener.java b/core/api/src/main/java/org/onosproject/net/resource/ResourceListener.java
similarity index 89%
rename from core/api/src/main/java/org/onosproject/net/newresource/ResourceListener.java
rename to core/api/src/main/java/org/onosproject/net/resource/ResourceListener.java
index 3f87190..45c32f2 100644
--- a/core/api/src/main/java/org/onosproject/net/newresource/ResourceListener.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/ResourceListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015-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.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.net.newresource;
+package org.onosproject.net.resource;
import com.google.common.annotations.Beta;
import org.onosproject.event.EventListener;
diff --git a/core/api/src/main/java/org/onosproject/net/newresource/ResourceService.java b/core/api/src/main/java/org/onosproject/net/resource/ResourceService.java
similarity index 98%
rename from core/api/src/main/java/org/onosproject/net/newresource/ResourceService.java
rename to core/api/src/main/java/org/onosproject/net/resource/ResourceService.java
index 99733cd..ad0c29b 100644
--- a/core/api/src/main/java/org/onosproject/net/newresource/ResourceService.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/ResourceService.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015-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.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.net.newresource;
+package org.onosproject.net.resource;
import com.google.common.annotations.Beta;
import com.google.common.collect.ImmutableList;
diff --git a/core/api/src/main/java/org/onosproject/net/newresource/ResourceStore.java b/core/api/src/main/java/org/onosproject/net/resource/ResourceStore.java
similarity index 98%
rename from core/api/src/main/java/org/onosproject/net/newresource/ResourceStore.java
rename to core/api/src/main/java/org/onosproject/net/resource/ResourceStore.java
index 29eeb24..295aa72 100644
--- a/core/api/src/main/java/org/onosproject/net/newresource/ResourceStore.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/ResourceStore.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.net.newresource;
+package org.onosproject.net.resource;
import com.google.common.annotations.Beta;
import org.onosproject.store.Store;
diff --git a/core/api/src/main/java/org/onosproject/net/newresource/ResourceStoreDelegate.java b/core/api/src/main/java/org/onosproject/net/resource/ResourceStoreDelegate.java
similarity index 89%
rename from core/api/src/main/java/org/onosproject/net/newresource/ResourceStoreDelegate.java
rename to core/api/src/main/java/org/onosproject/net/resource/ResourceStoreDelegate.java
index a0b9bb2..df368f1 100644
--- a/core/api/src/main/java/org/onosproject/net/newresource/ResourceStoreDelegate.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/ResourceStoreDelegate.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015-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.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.net.newresource;
+package org.onosproject.net.resource;
import org.onosproject.store.StoreDelegate;
diff --git a/core/api/src/main/java/org/onosproject/net/newresource/Resources.java b/core/api/src/main/java/org/onosproject/net/resource/Resources.java
similarity index 99%
rename from core/api/src/main/java/org/onosproject/net/newresource/Resources.java
rename to core/api/src/main/java/org/onosproject/net/resource/Resources.java
index d0f543f..057259c 100644
--- a/core/api/src/main/java/org/onosproject/net/newresource/Resources.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/Resources.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.net.newresource;
+package org.onosproject.net.resource;
import com.google.common.annotations.Beta;
import com.google.common.collect.ImmutableList;
diff --git a/core/api/src/main/java/org/onosproject/net/newresource/package-info.java b/core/api/src/main/java/org/onosproject/net/resource/package-info.java
similarity index 88%
rename from core/api/src/main/java/org/onosproject/net/newresource/package-info.java
rename to core/api/src/main/java/org/onosproject/net/resource/package-info.java
index 52bb858..2335437 100644
--- a/core/api/src/main/java/org/onosproject/net/newresource/package-info.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015-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.
@@ -18,4 +18,4 @@
* Generic network resource model and services for resource allocation and
* resource tracking.
*/
-package org.onosproject.net.newresource;
\ No newline at end of file
+package org.onosproject.net.resource;
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 f92be7b..4fe5343 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
@@ -35,13 +35,13 @@
import org.onosproject.net.flow.instructions.Instruction;
import org.onosproject.net.flow.instructions.Instructions;
import org.onosproject.net.flow.instructions.Instructions.MetadataInstruction;
-import org.onosproject.net.newresource.DiscreteResourceId;
-import org.onosproject.net.newresource.Resource;
-import org.onosproject.net.newresource.ResourceAllocation;
-import org.onosproject.net.newresource.ResourceConsumer;
-import org.onosproject.net.newresource.ResourceId;
-import org.onosproject.net.newresource.ResourceListener;
-import org.onosproject.net.newresource.ResourceService;
+import org.onosproject.net.resource.DiscreteResourceId;
+import org.onosproject.net.resource.Resource;
+import org.onosproject.net.resource.ResourceAllocation;
+import org.onosproject.net.resource.ResourceConsumer;
+import org.onosproject.net.resource.ResourceId;
+import org.onosproject.net.resource.ResourceListener;
+import org.onosproject.net.resource.ResourceService;
import org.onosproject.net.topology.DefaultTopologyEdge;
import org.onosproject.net.topology.DefaultTopologyVertex;
import org.onosproject.net.topology.LinkWeight;
diff --git a/core/api/src/test/java/org/onosproject/net/newresource/ContinuousResourceIdTest.java b/core/api/src/test/java/org/onosproject/net/resource/ContinuousResourceIdTest.java
similarity index 97%
rename from core/api/src/test/java/org/onosproject/net/newresource/ContinuousResourceIdTest.java
rename to core/api/src/test/java/org/onosproject/net/resource/ContinuousResourceIdTest.java
index 1e79f81..8b91bbd 100644
--- a/core/api/src/test/java/org/onosproject/net/newresource/ContinuousResourceIdTest.java
+++ b/core/api/src/test/java/org/onosproject/net/resource/ContinuousResourceIdTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.net.newresource;
+package org.onosproject.net.resource;
import com.google.common.testing.EqualsTester;
import org.junit.Test;
diff --git a/core/api/src/test/java/org/onosproject/net/newresource/ContinuousResourceTest.java b/core/api/src/test/java/org/onosproject/net/resource/ContinuousResourceTest.java
similarity index 98%
rename from core/api/src/test/java/org/onosproject/net/newresource/ContinuousResourceTest.java
rename to core/api/src/test/java/org/onosproject/net/resource/ContinuousResourceTest.java
index 29f5350..88f0a1c 100644
--- a/core/api/src/test/java/org/onosproject/net/newresource/ContinuousResourceTest.java
+++ b/core/api/src/test/java/org/onosproject/net/resource/ContinuousResourceTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.net.newresource;
+package org.onosproject.net.resource;
import com.google.common.testing.EqualsTester;
import org.junit.Test;
diff --git a/core/api/src/test/java/org/onosproject/net/newresource/DiscreteResourceIdTest.java b/core/api/src/test/java/org/onosproject/net/resource/DiscreteResourceIdTest.java
similarity index 97%
rename from core/api/src/test/java/org/onosproject/net/newresource/DiscreteResourceIdTest.java
rename to core/api/src/test/java/org/onosproject/net/resource/DiscreteResourceIdTest.java
index aeb950d..7dfcb9f 100644
--- a/core/api/src/test/java/org/onosproject/net/newresource/DiscreteResourceIdTest.java
+++ b/core/api/src/test/java/org/onosproject/net/resource/DiscreteResourceIdTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.net.newresource;
+package org.onosproject.net.resource;
import com.google.common.testing.EqualsTester;
import org.junit.Test;
diff --git a/core/api/src/test/java/org/onosproject/net/newresource/DiscreteResourceTest.java b/core/api/src/test/java/org/onosproject/net/resource/DiscreteResourceTest.java
similarity index 98%
rename from core/api/src/test/java/org/onosproject/net/newresource/DiscreteResourceTest.java
rename to core/api/src/test/java/org/onosproject/net/resource/DiscreteResourceTest.java
index 612ef1a..bb019a7 100644
--- a/core/api/src/test/java/org/onosproject/net/newresource/DiscreteResourceTest.java
+++ b/core/api/src/test/java/org/onosproject/net/resource/DiscreteResourceTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.net.newresource;
+package org.onosproject.net.resource;
import com.google.common.testing.EqualsTester;
import org.junit.Test;
diff --git a/core/api/src/test/java/org/onosproject/net/newresource/ResourceAllocationTest.java b/core/api/src/test/java/org/onosproject/net/resource/ResourceAllocationTest.java
similarity index 94%
rename from core/api/src/test/java/org/onosproject/net/newresource/ResourceAllocationTest.java
rename to core/api/src/test/java/org/onosproject/net/resource/ResourceAllocationTest.java
index 4a5a450..4e3afce 100644
--- a/core/api/src/test/java/org/onosproject/net/newresource/ResourceAllocationTest.java
+++ b/core/api/src/test/java/org/onosproject/net/resource/ResourceAllocationTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Open Networking Laboratory
+ * Copyright 2015-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.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.net.newresource;
+package org.onosproject.net.resource;
import com.google.common.testing.EqualsTester;
import org.junit.Test;
diff --git a/core/api/src/test/java/org/onosproject/net/newresource/ResourceIdTest.java b/core/api/src/test/java/org/onosproject/net/resource/ResourceIdTest.java
similarity index 97%
rename from core/api/src/test/java/org/onosproject/net/newresource/ResourceIdTest.java
rename to core/api/src/test/java/org/onosproject/net/resource/ResourceIdTest.java
index aa97892..2a0818a 100644
--- a/core/api/src/test/java/org/onosproject/net/newresource/ResourceIdTest.java
+++ b/core/api/src/test/java/org/onosproject/net/resource/ResourceIdTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.net.newresource;
+package org.onosproject.net.resource;
import org.junit.Test;
import org.onlab.util.Bandwidth;