Changing org.onlab.onos package to org.onosproject
Change-Id: Ic81421faa27acdcff045add47d9e0a715cd4f575
diff --git a/core/api/pom.xml b/core/api/pom.xml
index ff94f1a..62e640c 100644
--- a/core/api/pom.xml
+++ b/core/api/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.onlab.onos</groupId>
+ <groupId>org.onosproject</groupId>
<artifactId>onos-core</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
diff --git a/core/api/src/main/java/org/onosproject/cluster/ClusterAdminService.java b/core/api/src/main/java/org/onosproject/cluster/ClusterAdminService.java
index 5c244b1..e567540 100644
--- a/core/api/src/main/java/org/onosproject/cluster/ClusterAdminService.java
+++ b/core/api/src/main/java/org/onosproject/cluster/ClusterAdminService.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cluster;
+package org.onosproject.cluster;
import org.onlab.packet.IpAddress;
diff --git a/core/api/src/main/java/org/onosproject/cluster/ClusterEvent.java b/core/api/src/main/java/org/onosproject/cluster/ClusterEvent.java
index 0f95e30..7bdc1d7 100644
--- a/core/api/src/main/java/org/onosproject/cluster/ClusterEvent.java
+++ b/core/api/src/main/java/org/onosproject/cluster/ClusterEvent.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cluster;
+package org.onosproject.cluster;
-import org.onlab.onos.event.AbstractEvent;
+import org.onosproject.event.AbstractEvent;
/**
* Describes cluster-related event.
diff --git a/core/api/src/main/java/org/onosproject/cluster/ClusterEventListener.java b/core/api/src/main/java/org/onosproject/cluster/ClusterEventListener.java
index 14554ef..79ff06e 100644
--- a/core/api/src/main/java/org/onosproject/cluster/ClusterEventListener.java
+++ b/core/api/src/main/java/org/onosproject/cluster/ClusterEventListener.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cluster;
+package org.onosproject.cluster;
-import org.onlab.onos.event.EventListener;
+import org.onosproject.event.EventListener;
/**
* Entity capable of receiving device cluster-related events.
diff --git a/core/api/src/main/java/org/onosproject/cluster/ClusterService.java b/core/api/src/main/java/org/onosproject/cluster/ClusterService.java
index 6d2a455..1d21de7 100644
--- a/core/api/src/main/java/org/onosproject/cluster/ClusterService.java
+++ b/core/api/src/main/java/org/onosproject/cluster/ClusterService.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cluster;
+package org.onosproject.cluster;
import java.util.Set;
diff --git a/core/api/src/main/java/org/onosproject/cluster/ClusterStore.java b/core/api/src/main/java/org/onosproject/cluster/ClusterStore.java
index 0a4ac58..bb0c91c 100644
--- a/core/api/src/main/java/org/onosproject/cluster/ClusterStore.java
+++ b/core/api/src/main/java/org/onosproject/cluster/ClusterStore.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cluster;
+package org.onosproject.cluster;
-import org.onlab.onos.store.Store;
+import org.onosproject.store.Store;
import org.onlab.packet.IpAddress;
import java.util.Set;
diff --git a/core/api/src/main/java/org/onosproject/cluster/ClusterStoreDelegate.java b/core/api/src/main/java/org/onosproject/cluster/ClusterStoreDelegate.java
index 6fed1ee..50d4430 100644
--- a/core/api/src/main/java/org/onosproject/cluster/ClusterStoreDelegate.java
+++ b/core/api/src/main/java/org/onosproject/cluster/ClusterStoreDelegate.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cluster;
+package org.onosproject.cluster;
-import org.onlab.onos.store.StoreDelegate;
+import org.onosproject.store.StoreDelegate;
/**
* Cluster store delegate abstraction.
diff --git a/core/api/src/main/java/org/onosproject/cluster/ControllerNode.java b/core/api/src/main/java/org/onosproject/cluster/ControllerNode.java
index 29f5cf4..3cfc936 100644
--- a/core/api/src/main/java/org/onosproject/cluster/ControllerNode.java
+++ b/core/api/src/main/java/org/onosproject/cluster/ControllerNode.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cluster;
+package org.onosproject.cluster;
import org.onlab.packet.IpAddress;
diff --git a/core/api/src/main/java/org/onosproject/cluster/ControllerNodeToNodeId.java b/core/api/src/main/java/org/onosproject/cluster/ControllerNodeToNodeId.java
index 78f211c..4cde8b2 100644
--- a/core/api/src/main/java/org/onosproject/cluster/ControllerNodeToNodeId.java
+++ b/core/api/src/main/java/org/onosproject/cluster/ControllerNodeToNodeId.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cluster;
+package org.onosproject.cluster;
import com.google.common.base.Function;
diff --git a/core/api/src/main/java/org/onosproject/cluster/DefaultControllerNode.java b/core/api/src/main/java/org/onosproject/cluster/DefaultControllerNode.java
index 4ed972f..31185dd 100644
--- a/core/api/src/main/java/org/onosproject/cluster/DefaultControllerNode.java
+++ b/core/api/src/main/java/org/onosproject/cluster/DefaultControllerNode.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cluster;
+package org.onosproject.cluster;
import org.onlab.packet.IpAddress;
diff --git a/core/api/src/main/java/org/onosproject/cluster/Leadership.java b/core/api/src/main/java/org/onosproject/cluster/Leadership.java
index 6be7c9b..4a1e897 100644
--- a/core/api/src/main/java/org/onosproject/cluster/Leadership.java
+++ b/core/api/src/main/java/org/onosproject/cluster/Leadership.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.cluster;
+package org.onosproject.cluster;
import java.util.Objects;
diff --git a/core/api/src/main/java/org/onosproject/cluster/LeadershipEvent.java b/core/api/src/main/java/org/onosproject/cluster/LeadershipEvent.java
index bf20270..4eaf686 100644
--- a/core/api/src/main/java/org/onosproject/cluster/LeadershipEvent.java
+++ b/core/api/src/main/java/org/onosproject/cluster/LeadershipEvent.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cluster;
+package org.onosproject.cluster;
import java.util.Objects;
-import org.onlab.onos.event.AbstractEvent;
+import org.onosproject.event.AbstractEvent;
import com.google.common.base.MoreObjects;
diff --git a/core/api/src/main/java/org/onosproject/cluster/LeadershipEventListener.java b/core/api/src/main/java/org/onosproject/cluster/LeadershipEventListener.java
index 8dbd162..20f2c24 100644
--- a/core/api/src/main/java/org/onosproject/cluster/LeadershipEventListener.java
+++ b/core/api/src/main/java/org/onosproject/cluster/LeadershipEventListener.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cluster;
+package org.onosproject.cluster;
-import org.onlab.onos.event.EventListener;
+import org.onosproject.event.EventListener;
/**
* Entity capable of receiving device leadership-related events.
*/
public interface LeadershipEventListener extends EventListener<LeadershipEvent> {
-}
\ No newline at end of file
+}
diff --git a/core/api/src/main/java/org/onosproject/cluster/LeadershipService.java b/core/api/src/main/java/org/onosproject/cluster/LeadershipService.java
index 2709b7f..75cf90f 100644
--- a/core/api/src/main/java/org/onosproject/cluster/LeadershipService.java
+++ b/core/api/src/main/java/org/onosproject/cluster/LeadershipService.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cluster;
+package org.onosproject.cluster;
import java.util.Map;
@@ -58,4 +58,4 @@
* @param listener listener to be removed.
*/
void removeListener(LeadershipEventListener listener);
-}
\ No newline at end of file
+}
diff --git a/core/api/src/main/java/org/onosproject/cluster/NodeId.java b/core/api/src/main/java/org/onosproject/cluster/NodeId.java
index 50cdda4..68b490f 100644
--- a/core/api/src/main/java/org/onosproject/cluster/NodeId.java
+++ b/core/api/src/main/java/org/onosproject/cluster/NodeId.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cluster;
+package org.onosproject.cluster;
import java.util.Objects;
diff --git a/core/api/src/main/java/org/onosproject/cluster/RoleInfo.java b/core/api/src/main/java/org/onosproject/cluster/RoleInfo.java
index 3e2905e..a02cda9 100644
--- a/core/api/src/main/java/org/onosproject/cluster/RoleInfo.java
+++ b/core/api/src/main/java/org/onosproject/cluster/RoleInfo.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cluster;
+package org.onosproject.cluster;
import java.util.List;
import java.util.Objects;
diff --git a/core/api/src/main/java/org/onosproject/cluster/package-info.java b/core/api/src/main/java/org/onosproject/cluster/package-info.java
index 509fbdc..d5ae40c 100644
--- a/core/api/src/main/java/org/onosproject/cluster/package-info.java
+++ b/core/api/src/main/java/org/onosproject/cluster/package-info.java
@@ -17,4 +17,4 @@
/**
* Set of abstractions for dealing with controller cluster related topics.
*/
-package org.onlab.onos.cluster;
+package org.onosproject.cluster;
diff --git a/core/api/src/main/java/org/onosproject/codec/CodecContext.java b/core/api/src/main/java/org/onosproject/codec/CodecContext.java
index 6c8493e..ee00fa9 100644
--- a/core/api/src/main/java/org/onosproject/codec/CodecContext.java
+++ b/core/api/src/main/java/org/onosproject/codec/CodecContext.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.codec;
+package org.onosproject.codec;
import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/core/api/src/main/java/org/onosproject/codec/CodecService.java b/core/api/src/main/java/org/onosproject/codec/CodecService.java
index 5f456f8..2705569 100644
--- a/core/api/src/main/java/org/onosproject/codec/CodecService.java
+++ b/core/api/src/main/java/org/onosproject/codec/CodecService.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.codec;
+package org.onosproject.codec;
import java.util.Set;
diff --git a/core/api/src/main/java/org/onosproject/codec/JsonCodec.java b/core/api/src/main/java/org/onosproject/codec/JsonCodec.java
index 8a8f426..815f1e4 100644
--- a/core/api/src/main/java/org/onosproject/codec/JsonCodec.java
+++ b/core/api/src/main/java/org/onosproject/codec/JsonCodec.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.codec;
+package org.onosproject.codec;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ArrayNode;
diff --git a/core/api/src/main/java/org/onosproject/codec/package-info.java b/core/api/src/main/java/org/onosproject/codec/package-info.java
index ce58d91..0aa063f 100644
--- a/core/api/src/main/java/org/onosproject/codec/package-info.java
+++ b/core/api/src/main/java/org/onosproject/codec/package-info.java
@@ -17,4 +17,4 @@
/**
* Base JSON codec abstraction and a service for tracking various JSON codecs.
*/
-package org.onlab.onos.codec;
\ No newline at end of file
+package org.onosproject.codec;
diff --git a/core/api/src/main/java/org/onosproject/core/ApplicationId.java b/core/api/src/main/java/org/onosproject/core/ApplicationId.java
index 8e639c4..25bc8ce 100644
--- a/core/api/src/main/java/org/onosproject/core/ApplicationId.java
+++ b/core/api/src/main/java/org/onosproject/core/ApplicationId.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.core;
+package org.onosproject.core;
/**
diff --git a/core/api/src/main/java/org/onosproject/core/ApplicationIdStore.java b/core/api/src/main/java/org/onosproject/core/ApplicationIdStore.java
index 2819e87..cef3f15 100644
--- a/core/api/src/main/java/org/onosproject/core/ApplicationIdStore.java
+++ b/core/api/src/main/java/org/onosproject/core/ApplicationIdStore.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.core;
+package org.onosproject.core;
import java.util.Set;
diff --git a/core/api/src/main/java/org/onosproject/core/CoreService.java b/core/api/src/main/java/org/onosproject/core/CoreService.java
index c1499f7b..4b13c38 100644
--- a/core/api/src/main/java/org/onosproject/core/CoreService.java
+++ b/core/api/src/main/java/org/onosproject/core/CoreService.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.core;
+package org.onosproject.core;
-import org.onlab.onos.net.provider.ProviderId;
+import org.onosproject.net.provider.ProviderId;
import java.util.Set;
@@ -25,7 +25,7 @@
public interface CoreService {
public static final ProviderId CORE_PROVIDER_ID =
- new ProviderId("core", "org.onlab.onos.core");
+ new ProviderId("core", "org.onosproject.core");
/**
* Returns the product version.
diff --git a/core/api/src/main/java/org/onosproject/core/DefaultApplicationId.java b/core/api/src/main/java/org/onosproject/core/DefaultApplicationId.java
index f99123d..e6f448e 100644
--- a/core/api/src/main/java/org/onosproject/core/DefaultApplicationId.java
+++ b/core/api/src/main/java/org/onosproject/core/DefaultApplicationId.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.core;
+package org.onosproject.core;
import java.util.Objects;
diff --git a/core/api/src/main/java/org/onosproject/core/DefaultGroupId.java b/core/api/src/main/java/org/onosproject/core/DefaultGroupId.java
index 7e51114..11ca73c 100644
--- a/core/api/src/main/java/org/onosproject/core/DefaultGroupId.java
+++ b/core/api/src/main/java/org/onosproject/core/DefaultGroupId.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.core;
+package org.onosproject.core;
import com.google.common.base.MoreObjects;
diff --git a/core/api/src/main/java/org/onosproject/core/GroupId.java b/core/api/src/main/java/org/onosproject/core/GroupId.java
index 6757fcd..367e4e3 100644
--- a/core/api/src/main/java/org/onosproject/core/GroupId.java
+++ b/core/api/src/main/java/org/onosproject/core/GroupId.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.core;
+package org.onosproject.core;
/**
* Group identifier.
diff --git a/core/api/src/main/java/org/onosproject/core/IdBlock.java b/core/api/src/main/java/org/onosproject/core/IdBlock.java
index c811e88..4be86ae 100644
--- a/core/api/src/main/java/org/onosproject/core/IdBlock.java
+++ b/core/api/src/main/java/org/onosproject/core/IdBlock.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.core;
+package org.onosproject.core;
import com.google.common.base.MoreObjects;
diff --git a/core/api/src/main/java/org/onosproject/core/IdBlockStore.java b/core/api/src/main/java/org/onosproject/core/IdBlockStore.java
index e67a2fe..8ed58ae 100644
--- a/core/api/src/main/java/org/onosproject/core/IdBlockStore.java
+++ b/core/api/src/main/java/org/onosproject/core/IdBlockStore.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.core;
+package org.onosproject.core;
/**
* Manages id blocks.
diff --git a/core/api/src/main/java/org/onosproject/core/IdGenerator.java b/core/api/src/main/java/org/onosproject/core/IdGenerator.java
index fb8953b..437455c 100644
--- a/core/api/src/main/java/org/onosproject/core/IdGenerator.java
+++ b/core/api/src/main/java/org/onosproject/core/IdGenerator.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.core;
+package org.onosproject.core;
/**
* A generalized interface for ID generation
diff --git a/core/api/src/main/java/org/onosproject/core/MetricsHelper.java b/core/api/src/main/java/org/onosproject/core/MetricsHelper.java
index 7c9a715..b5be094 100644
--- a/core/api/src/main/java/org/onosproject/core/MetricsHelper.java
+++ b/core/api/src/main/java/org/onosproject/core/MetricsHelper.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.onlab.onos.core;
+package org.onosproject.core;
import org.onlab.metrics.MetricsComponent;
import org.onlab.metrics.MetricsFeature;
diff --git a/core/api/src/main/java/org/onosproject/core/UnavailableIdException.java b/core/api/src/main/java/org/onosproject/core/UnavailableIdException.java
index 14c8496..7382d66 100644
--- a/core/api/src/main/java/org/onosproject/core/UnavailableIdException.java
+++ b/core/api/src/main/java/org/onosproject/core/UnavailableIdException.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.core;
+package org.onosproject.core;
/**
* Represents that there is no available IDs.
diff --git a/core/api/src/main/java/org/onosproject/core/Version.java b/core/api/src/main/java/org/onosproject/core/Version.java
index 12f1db5..5641a54 100644
--- a/core/api/src/main/java/org/onosproject/core/Version.java
+++ b/core/api/src/main/java/org/onosproject/core/Version.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.core;
+package org.onosproject.core;
import java.util.Objects;
diff --git a/core/api/src/main/java/org/onosproject/core/package-info.java b/core/api/src/main/java/org/onosproject/core/package-info.java
index 96c7b8b..3766d49 100644
--- a/core/api/src/main/java/org/onosproject/core/package-info.java
+++ b/core/api/src/main/java/org/onosproject/core/package-info.java
@@ -17,4 +17,4 @@
/**
* ONOS Core API definitions.
*/
-package org.onlab.onos.core;
+package org.onosproject.core;
diff --git a/core/api/src/main/java/org/onosproject/event/AbstractEvent.java b/core/api/src/main/java/org/onosproject/event/AbstractEvent.java
index e0717f1..51d1caa 100644
--- a/core/api/src/main/java/org/onosproject/event/AbstractEvent.java
+++ b/core/api/src/main/java/org/onosproject/event/AbstractEvent.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.event;
+package org.onosproject.event;
import static com.google.common.base.MoreObjects.toStringHelper;
diff --git a/core/api/src/main/java/org/onosproject/event/AbstractEventAccumulator.java b/core/api/src/main/java/org/onosproject/event/AbstractEventAccumulator.java
index 39c1103..3e0372f 100644
--- a/core/api/src/main/java/org/onosproject/event/AbstractEventAccumulator.java
+++ b/core/api/src/main/java/org/onosproject/event/AbstractEventAccumulator.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.event;
+package org.onosproject.event;
import com.google.common.collect.Lists;
import org.slf4j.Logger;
diff --git a/core/api/src/main/java/org/onosproject/event/AbstractListenerRegistry.java b/core/api/src/main/java/org/onosproject/event/AbstractListenerRegistry.java
index d9e6484..71b8ec7 100644
--- a/core/api/src/main/java/org/onosproject/event/AbstractListenerRegistry.java
+++ b/core/api/src/main/java/org/onosproject/event/AbstractListenerRegistry.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.event;
+package org.onosproject.event;
import org.slf4j.Logger;
diff --git a/core/api/src/main/java/org/onosproject/event/DefaultEventSinkRegistry.java b/core/api/src/main/java/org/onosproject/event/DefaultEventSinkRegistry.java
index 7f99e7a..755c92b 100644
--- a/core/api/src/main/java/org/onosproject/event/DefaultEventSinkRegistry.java
+++ b/core/api/src/main/java/org/onosproject/event/DefaultEventSinkRegistry.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.event;
+package org.onosproject.event;
import com.google.common.collect.ImmutableSet;
diff --git a/core/api/src/main/java/org/onosproject/event/Event.java b/core/api/src/main/java/org/onosproject/event/Event.java
index fe1f2bf..f04ae61 100644
--- a/core/api/src/main/java/org/onosproject/event/Event.java
+++ b/core/api/src/main/java/org/onosproject/event/Event.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.event;
+package org.onosproject.event;
/**
* Abstraction of an of a time-stamped event pertaining to an arbitrary subject.
diff --git a/core/api/src/main/java/org/onosproject/event/EventAccumulator.java b/core/api/src/main/java/org/onosproject/event/EventAccumulator.java
index 2d4384e..52928ae 100644
--- a/core/api/src/main/java/org/onosproject/event/EventAccumulator.java
+++ b/core/api/src/main/java/org/onosproject/event/EventAccumulator.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.event;
+package org.onosproject.event;
import java.util.List;
diff --git a/core/api/src/main/java/org/onosproject/event/EventDeliveryService.java b/core/api/src/main/java/org/onosproject/event/EventDeliveryService.java
index 2e5b8ed..2d9d38ce 100644
--- a/core/api/src/main/java/org/onosproject/event/EventDeliveryService.java
+++ b/core/api/src/main/java/org/onosproject/event/EventDeliveryService.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.event;
+package org.onosproject.event;
/**
* Abstraction of an entity capable of accepting events to be posted and
diff --git a/core/api/src/main/java/org/onosproject/event/EventDispatcher.java b/core/api/src/main/java/org/onosproject/event/EventDispatcher.java
index c1155d3..daebd8b 100644
--- a/core/api/src/main/java/org/onosproject/event/EventDispatcher.java
+++ b/core/api/src/main/java/org/onosproject/event/EventDispatcher.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.event;
+package org.onosproject.event;
/**
* Abstraction of a mechanism capable of accepting and dispatching events to
diff --git a/core/api/src/main/java/org/onosproject/event/EventListener.java b/core/api/src/main/java/org/onosproject/event/EventListener.java
index 0504b29..e4d6937 100644
--- a/core/api/src/main/java/org/onosproject/event/EventListener.java
+++ b/core/api/src/main/java/org/onosproject/event/EventListener.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.event;
+package org.onosproject.event;
/**
* Entity capable of receiving events.
diff --git a/core/api/src/main/java/org/onosproject/event/EventSink.java b/core/api/src/main/java/org/onosproject/event/EventSink.java
index 5f2f50e..c6e5ac9 100644
--- a/core/api/src/main/java/org/onosproject/event/EventSink.java
+++ b/core/api/src/main/java/org/onosproject/event/EventSink.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.event;
+package org.onosproject.event;
/**
* Abstraction of an event sink capable of processing the specified event types.
diff --git a/core/api/src/main/java/org/onosproject/event/EventSinkRegistry.java b/core/api/src/main/java/org/onosproject/event/EventSinkRegistry.java
index 40c720a..bb054a3 100644
--- a/core/api/src/main/java/org/onosproject/event/EventSinkRegistry.java
+++ b/core/api/src/main/java/org/onosproject/event/EventSinkRegistry.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.event;
+package org.onosproject.event;
import java.util.Set;
diff --git a/core/api/src/main/java/org/onosproject/event/package-info.java b/core/api/src/main/java/org/onosproject/event/package-info.java
index 8f6fd67..6b10bcf 100644
--- a/core/api/src/main/java/org/onosproject/event/package-info.java
+++ b/core/api/src/main/java/org/onosproject/event/package-info.java
@@ -17,4 +17,4 @@
/**
* Local event delivery subsystem interfaces & supporting abstractions.
*/
-package org.onlab.onos.event;
+package org.onosproject.event;
diff --git a/core/api/src/main/java/org/onosproject/mastership/MastershipAdminService.java b/core/api/src/main/java/org/onosproject/mastership/MastershipAdminService.java
index cb3869d..6c41fb2 100644
--- a/core/api/src/main/java/org/onosproject/mastership/MastershipAdminService.java
+++ b/core/api/src/main/java/org/onosproject/mastership/MastershipAdminService.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.mastership;
+package org.onosproject.mastership;
-import org.onlab.onos.cluster.NodeId;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.MastershipRole;
+import org.onosproject.cluster.NodeId;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.MastershipRole;
/**
* Service for administering the inventory of device masterships.
diff --git a/core/api/src/main/java/org/onosproject/mastership/MastershipEvent.java b/core/api/src/main/java/org/onosproject/mastership/MastershipEvent.java
index 5447545..35c32e7 100644
--- a/core/api/src/main/java/org/onosproject/mastership/MastershipEvent.java
+++ b/core/api/src/main/java/org/onosproject/mastership/MastershipEvent.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.mastership;
+package org.onosproject.mastership;
import org.joda.time.LocalDateTime;
-import org.onlab.onos.cluster.RoleInfo;
-import org.onlab.onos.event.AbstractEvent;
-import org.onlab.onos.net.DeviceId;
+import org.onosproject.cluster.RoleInfo;
+import org.onosproject.event.AbstractEvent;
+import org.onosproject.net.DeviceId;
import com.google.common.base.MoreObjects;
diff --git a/core/api/src/main/java/org/onosproject/mastership/MastershipListener.java b/core/api/src/main/java/org/onosproject/mastership/MastershipListener.java
index 4ed235f..9c5690e 100644
--- a/core/api/src/main/java/org/onosproject/mastership/MastershipListener.java
+++ b/core/api/src/main/java/org/onosproject/mastership/MastershipListener.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.mastership;
+package org.onosproject.mastership;
-import org.onlab.onos.event.EventListener;
+import org.onosproject.event.EventListener;
/**
* Entity capable of receiving device mastership-related events.
diff --git a/core/api/src/main/java/org/onosproject/mastership/MastershipService.java b/core/api/src/main/java/org/onosproject/mastership/MastershipService.java
index 6a6244b..f03f6c8 100644
--- a/core/api/src/main/java/org/onosproject/mastership/MastershipService.java
+++ b/core/api/src/main/java/org/onosproject/mastership/MastershipService.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.mastership;
+package org.onosproject.mastership;
import java.util.Set;
-import org.onlab.onos.cluster.NodeId;
-import org.onlab.onos.cluster.RoleInfo;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.MastershipRole;
+import org.onosproject.cluster.NodeId;
+import org.onosproject.cluster.RoleInfo;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.MastershipRole;
/**
* Service responsible for determining the controller instance mastership of
diff --git a/core/api/src/main/java/org/onosproject/mastership/MastershipStore.java b/core/api/src/main/java/org/onosproject/mastership/MastershipStore.java
index 5706a8b..2112029 100644
--- a/core/api/src/main/java/org/onosproject/mastership/MastershipStore.java
+++ b/core/api/src/main/java/org/onosproject/mastership/MastershipStore.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.mastership;
+package org.onosproject.mastership;
import java.util.Set;
-import org.onlab.onos.cluster.NodeId;
-import org.onlab.onos.cluster.RoleInfo;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.MastershipRole;
-import org.onlab.onos.store.Store;
+import org.onosproject.cluster.NodeId;
+import org.onosproject.cluster.RoleInfo;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.MastershipRole;
+import org.onosproject.store.Store;
/**
* Manages inventory of mastership roles for devices, across controller
diff --git a/core/api/src/main/java/org/onosproject/mastership/MastershipStoreDelegate.java b/core/api/src/main/java/org/onosproject/mastership/MastershipStoreDelegate.java
index 78a8dc8..c71f4ed 100644
--- a/core/api/src/main/java/org/onosproject/mastership/MastershipStoreDelegate.java
+++ b/core/api/src/main/java/org/onosproject/mastership/MastershipStoreDelegate.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.mastership;
+package org.onosproject.mastership;
-import org.onlab.onos.store.StoreDelegate;
+import org.onosproject.store.StoreDelegate;
/**
* Mastership store delegate abstraction.
diff --git a/core/api/src/main/java/org/onosproject/mastership/MastershipTerm.java b/core/api/src/main/java/org/onosproject/mastership/MastershipTerm.java
index e1731ef..b2c0e41 100644
--- a/core/api/src/main/java/org/onosproject/mastership/MastershipTerm.java
+++ b/core/api/src/main/java/org/onosproject/mastership/MastershipTerm.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.mastership;
+package org.onosproject.mastership;
import java.util.Objects;
-import org.onlab.onos.cluster.NodeId;
+import org.onosproject.cluster.NodeId;
import com.google.common.base.MoreObjects;
diff --git a/core/api/src/main/java/org/onosproject/mastership/MastershipTermService.java b/core/api/src/main/java/org/onosproject/mastership/MastershipTermService.java
index f23fcf7..1725ee0 100644
--- a/core/api/src/main/java/org/onosproject/mastership/MastershipTermService.java
+++ b/core/api/src/main/java/org/onosproject/mastership/MastershipTermService.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.mastership;
+package org.onosproject.mastership;
-import org.onlab.onos.net.DeviceId;
+import org.onosproject.net.DeviceId;
// TODO give me a better name
/**
diff --git a/core/api/src/main/java/org/onosproject/mastership/package-info.java b/core/api/src/main/java/org/onosproject/mastership/package-info.java
index 60f41e5..0040680 100644
--- a/core/api/src/main/java/org/onosproject/mastership/package-info.java
+++ b/core/api/src/main/java/org/onosproject/mastership/package-info.java
@@ -17,4 +17,4 @@
/**
* Set of abstractions for dealing with controller mastership related topics.
*/
-package org.onlab.onos.mastership;
+package org.onosproject.mastership;
diff --git a/core/api/src/main/java/org/onosproject/net/AbstractAnnotated.java b/core/api/src/main/java/org/onosproject/net/AbstractAnnotated.java
index a4778d8..d90c9da 100644
--- a/core/api/src/main/java/org/onosproject/net/AbstractAnnotated.java
+++ b/core/api/src/main/java/org/onosproject/net/AbstractAnnotated.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
import static com.google.common.base.Preconditions.checkArgument;
diff --git a/core/api/src/main/java/org/onosproject/net/AbstractDescription.java b/core/api/src/main/java/org/onosproject/net/AbstractDescription.java
index 8368ff4..d81b83c 100644
--- a/core/api/src/main/java/org/onosproject/net/AbstractDescription.java
+++ b/core/api/src/main/java/org/onosproject/net/AbstractDescription.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
import static com.google.common.base.Preconditions.checkArgument;
diff --git a/core/api/src/main/java/org/onosproject/net/AbstractElement.java b/core/api/src/main/java/org/onosproject/net/AbstractElement.java
index ff6917d..595e7b9 100644
--- a/core/api/src/main/java/org/onosproject/net/AbstractElement.java
+++ b/core/api/src/main/java/org/onosproject/net/AbstractElement.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
-import org.onlab.onos.net.provider.ProviderId;
+import org.onosproject.net.provider.ProviderId;
/**
* Base implementation of network elements, i.e. devices or hosts.
diff --git a/core/api/src/main/java/org/onosproject/net/AbstractModel.java b/core/api/src/main/java/org/onosproject/net/AbstractModel.java
index 41bcabd..f3cd5ef 100644
--- a/core/api/src/main/java/org/onosproject/net/AbstractModel.java
+++ b/core/api/src/main/java/org/onosproject/net/AbstractModel.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
-import org.onlab.onos.net.provider.ProviderId;
+import org.onosproject.net.provider.ProviderId;
/**
* Base implementation of a network model entity.
diff --git a/core/api/src/main/java/org/onosproject/net/Annotated.java b/core/api/src/main/java/org/onosproject/net/Annotated.java
index 7ec378b..ac4545a 100644
--- a/core/api/src/main/java/org/onosproject/net/Annotated.java
+++ b/core/api/src/main/java/org/onosproject/net/Annotated.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
/**
* Represents an entity that carries arbitrary annotations.
diff --git a/core/api/src/main/java/org/onosproject/net/AnnotationKeys.java b/core/api/src/main/java/org/onosproject/net/AnnotationKeys.java
index 3871b3f..6ccb519 100644
--- a/core/api/src/main/java/org/onosproject/net/AnnotationKeys.java
+++ b/core/api/src/main/java/org/onosproject/net/AnnotationKeys.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
/**
* Collection of keys for annotation.
diff --git a/core/api/src/main/java/org/onosproject/net/Annotations.java b/core/api/src/main/java/org/onosproject/net/Annotations.java
index cb3ffb4..db16143 100644
--- a/core/api/src/main/java/org/onosproject/net/Annotations.java
+++ b/core/api/src/main/java/org/onosproject/net/Annotations.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
import java.util.Set;
diff --git a/core/api/src/main/java/org/onosproject/net/AnnotationsUtil.java b/core/api/src/main/java/org/onosproject/net/AnnotationsUtil.java
index f76e66a..d43a304 100644
--- a/core/api/src/main/java/org/onosproject/net/AnnotationsUtil.java
+++ b/core/api/src/main/java/org/onosproject/net/AnnotationsUtil.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
/**
* Utility for processing annotations.
diff --git a/core/api/src/main/java/org/onosproject/net/ConnectPoint.java b/core/api/src/main/java/org/onosproject/net/ConnectPoint.java
index 42c424a..621cb2d 100644
--- a/core/api/src/main/java/org/onosproject/net/ConnectPoint.java
+++ b/core/api/src/main/java/org/onosproject/net/ConnectPoint.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
import java.util.Objects;
diff --git a/core/api/src/main/java/org/onosproject/net/DefaultAnnotations.java b/core/api/src/main/java/org/onosproject/net/DefaultAnnotations.java
index a37748d..514152e 100644
--- a/core/api/src/main/java/org/onosproject/net/DefaultAnnotations.java
+++ b/core/api/src/main/java/org/onosproject/net/DefaultAnnotations.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
import java.util.Collections;
import java.util.HashMap;
diff --git a/core/api/src/main/java/org/onosproject/net/DefaultDevice.java b/core/api/src/main/java/org/onosproject/net/DefaultDevice.java
index 1207427..8197f44 100644
--- a/core/api/src/main/java/org/onosproject/net/DefaultDevice.java
+++ b/core/api/src/main/java/org/onosproject/net/DefaultDevice.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
-import org.onlab.onos.net.provider.ProviderId;
+import org.onosproject.net.provider.ProviderId;
import org.onlab.packet.ChassisId;
import java.util.Objects;
diff --git a/core/api/src/main/java/org/onosproject/net/DefaultEdgeLink.java b/core/api/src/main/java/org/onosproject/net/DefaultEdgeLink.java
index 21cb0ed..e38c45d 100644
--- a/core/api/src/main/java/org/onosproject/net/DefaultEdgeLink.java
+++ b/core/api/src/main/java/org/onosproject/net/DefaultEdgeLink.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
-import org.onlab.onos.net.provider.ProviderId;
+import org.onosproject.net.provider.ProviderId;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
diff --git a/core/api/src/main/java/org/onosproject/net/DefaultHost.java b/core/api/src/main/java/org/onosproject/net/DefaultHost.java
index 61d5dd2..2877701 100644
--- a/core/api/src/main/java/org/onosproject/net/DefaultHost.java
+++ b/core/api/src/main/java/org/onosproject/net/DefaultHost.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
-import org.onlab.onos.net.provider.ProviderId;
+import org.onosproject.net.provider.ProviderId;
import org.onlab.packet.IpAddress;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
diff --git a/core/api/src/main/java/org/onosproject/net/DefaultLink.java b/core/api/src/main/java/org/onosproject/net/DefaultLink.java
index 6ebd52d..4d1ca6d 100644
--- a/core/api/src/main/java/org/onosproject/net/DefaultLink.java
+++ b/core/api/src/main/java/org/onosproject/net/DefaultLink.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
-import org.onlab.onos.net.provider.ProviderId;
+import org.onosproject.net.provider.ProviderId;
import java.util.Objects;
import static com.google.common.base.MoreObjects.toStringHelper;
-import static org.onlab.onos.net.Link.State.ACTIVE;
+import static org.onosproject.net.Link.State.ACTIVE;
/**
* Default infrastructure link model implementation.
diff --git a/core/api/src/main/java/org/onosproject/net/DefaultPath.java b/core/api/src/main/java/org/onosproject/net/DefaultPath.java
index 016bb69..fabb6e5 100644
--- a/core/api/src/main/java/org/onosproject/net/DefaultPath.java
+++ b/core/api/src/main/java/org/onosproject/net/DefaultPath.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
import com.google.common.collect.ImmutableList;
-import org.onlab.onos.net.provider.ProviderId;
+import org.onosproject.net.provider.ProviderId;
import java.util.List;
import java.util.Objects;
diff --git a/core/api/src/main/java/org/onosproject/net/DefaultPort.java b/core/api/src/main/java/org/onosproject/net/DefaultPort.java
index d9cd764..35c02d3 100644
--- a/core/api/src/main/java/org/onosproject/net/DefaultPort.java
+++ b/core/api/src/main/java/org/onosproject/net/DefaultPort.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
import java.util.Objects;
diff --git a/core/api/src/main/java/org/onosproject/net/Description.java b/core/api/src/main/java/org/onosproject/net/Description.java
index 6f44c43..c01af54 100644
--- a/core/api/src/main/java/org/onosproject/net/Description.java
+++ b/core/api/src/main/java/org/onosproject/net/Description.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
/**
* Base abstraction of a piece of information about network elements.
diff --git a/core/api/src/main/java/org/onosproject/net/Device.java b/core/api/src/main/java/org/onosproject/net/Device.java
index cbd261f..599c06b 100644
--- a/core/api/src/main/java/org/onosproject/net/Device.java
+++ b/core/api/src/main/java/org/onosproject/net/Device.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
import org.onlab.packet.ChassisId;
diff --git a/core/api/src/main/java/org/onosproject/net/DeviceId.java b/core/api/src/main/java/org/onosproject/net/DeviceId.java
index f76b6b8..5331342 100644
--- a/core/api/src/main/java/org/onosproject/net/DeviceId.java
+++ b/core/api/src/main/java/org/onosproject/net/DeviceId.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
import java.net.URI;
import java.util.Objects;
diff --git a/core/api/src/main/java/org/onosproject/net/EdgeLink.java b/core/api/src/main/java/org/onosproject/net/EdgeLink.java
index 9956bbc..73b916b 100644
--- a/core/api/src/main/java/org/onosproject/net/EdgeLink.java
+++ b/core/api/src/main/java/org/onosproject/net/EdgeLink.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
/**
* Abstraction of a link between an end-station host and the network
diff --git a/core/api/src/main/java/org/onosproject/net/Element.java b/core/api/src/main/java/org/onosproject/net/Element.java
index 0749278..6cdab9e 100644
--- a/core/api/src/main/java/org/onosproject/net/Element.java
+++ b/core/api/src/main/java/org/onosproject/net/Element.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
/**
* Base abstraction of a network element, i.e. an infrastructure device or an end-station host.
diff --git a/core/api/src/main/java/org/onosproject/net/ElementId.java b/core/api/src/main/java/org/onosproject/net/ElementId.java
index 099cf56..49e110b 100644
--- a/core/api/src/main/java/org/onosproject/net/ElementId.java
+++ b/core/api/src/main/java/org/onosproject/net/ElementId.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
/**
* Immutable representation of a network element identity.
diff --git a/core/api/src/main/java/org/onosproject/net/Host.java b/core/api/src/main/java/org/onosproject/net/Host.java
index 7c063a4..646f228 100644
--- a/core/api/src/main/java/org/onosproject/net/Host.java
+++ b/core/api/src/main/java/org/onosproject/net/Host.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
import org.onlab.packet.IpAddress;
import org.onlab.packet.MacAddress;
diff --git a/core/api/src/main/java/org/onosproject/net/HostId.java b/core/api/src/main/java/org/onosproject/net/HostId.java
index 5242d7f..519945d 100644
--- a/core/api/src/main/java/org/onosproject/net/HostId.java
+++ b/core/api/src/main/java/org/onosproject/net/HostId.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
diff --git a/core/api/src/main/java/org/onosproject/net/HostLocation.java b/core/api/src/main/java/org/onosproject/net/HostLocation.java
index 29e28fd..b0553a2 100644
--- a/core/api/src/main/java/org/onosproject/net/HostLocation.java
+++ b/core/api/src/main/java/org/onosproject/net/HostLocation.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
-import static org.onlab.onos.net.PortNumber.P0;
+import static org.onosproject.net.PortNumber.P0;
/**
* Representation of a network edge location where an end-station host is
diff --git a/core/api/src/main/java/org/onosproject/net/Link.java b/core/api/src/main/java/org/onosproject/net/Link.java
index f091dc4..1593e75 100644
--- a/core/api/src/main/java/org/onosproject/net/Link.java
+++ b/core/api/src/main/java/org/onosproject/net/Link.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
/**
* Abstraction of a network infrastructure link.
diff --git a/core/api/src/main/java/org/onosproject/net/LinkKey.java b/core/api/src/main/java/org/onosproject/net/LinkKey.java
index c4e461d..9cb6649 100644
--- a/core/api/src/main/java/org/onosproject/net/LinkKey.java
+++ b/core/api/src/main/java/org/onosproject/net/LinkKey.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
import static com.google.common.base.Preconditions.checkNotNull;
diff --git a/core/api/src/main/java/org/onosproject/net/MastershipRole.java b/core/api/src/main/java/org/onosproject/net/MastershipRole.java
index ef216d1..78f6586 100644
--- a/core/api/src/main/java/org/onosproject/net/MastershipRole.java
+++ b/core/api/src/main/java/org/onosproject/net/MastershipRole.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
/**
* Representation of a relationship role of a controller instance to a device
diff --git a/core/api/src/main/java/org/onosproject/net/NetworkResource.java b/core/api/src/main/java/org/onosproject/net/NetworkResource.java
index faf3241..502208a 100644
--- a/core/api/src/main/java/org/onosproject/net/NetworkResource.java
+++ b/core/api/src/main/java/org/onosproject/net/NetworkResource.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
/**
* Representation of a network resource, e.g. a link, lambda, MPLS tag.
diff --git a/core/api/src/main/java/org/onosproject/net/Path.java b/core/api/src/main/java/org/onosproject/net/Path.java
index ae68844..c9c20c4 100644
--- a/core/api/src/main/java/org/onosproject/net/Path.java
+++ b/core/api/src/main/java/org/onosproject/net/Path.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
import java.util.List;
diff --git a/core/api/src/main/java/org/onosproject/net/Port.java b/core/api/src/main/java/org/onosproject/net/Port.java
index 2153593..d1e83fa 100644
--- a/core/api/src/main/java/org/onosproject/net/Port.java
+++ b/core/api/src/main/java/org/onosproject/net/Port.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
/**
diff --git a/core/api/src/main/java/org/onosproject/net/PortNumber.java b/core/api/src/main/java/org/onosproject/net/PortNumber.java
index 5883871..e2db835 100644
--- a/core/api/src/main/java/org/onosproject/net/PortNumber.java
+++ b/core/api/src/main/java/org/onosproject/net/PortNumber.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
import java.util.Objects;
diff --git a/core/api/src/main/java/org/onosproject/net/Provided.java b/core/api/src/main/java/org/onosproject/net/Provided.java
index 75301eb..daf85e7 100644
--- a/core/api/src/main/java/org/onosproject/net/Provided.java
+++ b/core/api/src/main/java/org/onosproject/net/Provided.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
-import org.onlab.onos.net.provider.ProviderId;
+import org.onosproject.net.provider.ProviderId;
/**
* Abstraction of an entity supplied by a provider.
diff --git a/core/api/src/main/java/org/onosproject/net/SparseAnnotations.java b/core/api/src/main/java/org/onosproject/net/SparseAnnotations.java
index 6487d96..a615456 100644
--- a/core/api/src/main/java/org/onosproject/net/SparseAnnotations.java
+++ b/core/api/src/main/java/org/onosproject/net/SparseAnnotations.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
import java.util.Set;
diff --git a/core/api/src/main/java/org/onosproject/net/Tunnel.java b/core/api/src/main/java/org/onosproject/net/Tunnel.java
index d5fad6c..c3a2cee 100644
--- a/core/api/src/main/java/org/onosproject/net/Tunnel.java
+++ b/core/api/src/main/java/org/onosproject/net/Tunnel.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
/**
* Abstraction of a generalized network tunnel.
diff --git a/core/api/src/main/java/org/onosproject/net/device/DefaultDeviceDescription.java b/core/api/src/main/java/org/onosproject/net/device/DefaultDeviceDescription.java
index e3aa2ed..5315994 100644
--- a/core/api/src/main/java/org/onosproject/net/device/DefaultDeviceDescription.java
+++ b/core/api/src/main/java/org/onosproject/net/device/DefaultDeviceDescription.java
@@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.device;
+package org.onosproject.net.device;
-import org.onlab.onos.net.AbstractDescription;
-import org.onlab.onos.net.SparseAnnotations;
+import org.onosproject.net.AbstractDescription;
+import org.onosproject.net.SparseAnnotations;
import org.onlab.packet.ChassisId;
import java.net.URI;
import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
-import static org.onlab.onos.net.Device.Type;
+import static org.onosproject.net.Device.Type;
/**
* Default implementation of immutable device description entity.
diff --git a/core/api/src/main/java/org/onosproject/net/device/DefaultPortDescription.java b/core/api/src/main/java/org/onosproject/net/device/DefaultPortDescription.java
index 9688827..572d201 100644
--- a/core/api/src/main/java/org/onosproject/net/device/DefaultPortDescription.java
+++ b/core/api/src/main/java/org/onosproject/net/device/DefaultPortDescription.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.device;
+package org.onosproject.net.device;
import com.google.common.base.MoreObjects;
-import org.onlab.onos.net.AbstractDescription;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.SparseAnnotations;
+import org.onosproject.net.AbstractDescription;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.SparseAnnotations;
-import static org.onlab.onos.net.Port.Type;
+import static org.onosproject.net.Port.Type;
/**
* Default implementation of immutable port description.
diff --git a/core/api/src/main/java/org/onosproject/net/device/DeviceAdminService.java b/core/api/src/main/java/org/onosproject/net/device/DeviceAdminService.java
index 33be512..e84727c 100644
--- a/core/api/src/main/java/org/onosproject/net/device/DeviceAdminService.java
+++ b/core/api/src/main/java/org/onosproject/net/device/DeviceAdminService.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.device;
+package org.onosproject.net.device;
-import org.onlab.onos.net.DeviceId;
+import org.onosproject.net.DeviceId;
/**
* Service for administering the inventory of infrastructure devices.
diff --git a/core/api/src/main/java/org/onosproject/net/device/DeviceClockProviderService.java b/core/api/src/main/java/org/onosproject/net/device/DeviceClockProviderService.java
index 011f2a8..58f0f6b1 100644
--- a/core/api/src/main/java/org/onosproject/net/device/DeviceClockProviderService.java
+++ b/core/api/src/main/java/org/onosproject/net/device/DeviceClockProviderService.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.device;
+package org.onosproject.net.device;
-import org.onlab.onos.mastership.MastershipTerm;
-import org.onlab.onos.net.DeviceId;
+import org.onosproject.mastership.MastershipTerm;
+import org.onosproject.net.DeviceId;
/**
* Interface for feeding term information to a logical clock service
diff --git a/core/api/src/main/java/org/onosproject/net/device/DeviceClockService.java b/core/api/src/main/java/org/onosproject/net/device/DeviceClockService.java
index 2214cfd..70b3715 100644
--- a/core/api/src/main/java/org/onosproject/net/device/DeviceClockService.java
+++ b/core/api/src/main/java/org/onosproject/net/device/DeviceClockService.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.device;
+package org.onosproject.net.device;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.store.Timestamp;
+import org.onosproject.net.DeviceId;
+import org.onosproject.store.Timestamp;
/**
* Interface for a logical clock service that vends per device timestamps.
diff --git a/core/api/src/main/java/org/onosproject/net/device/DeviceDescription.java b/core/api/src/main/java/org/onosproject/net/device/DeviceDescription.java
index c9c3676..07fac79 100644
--- a/core/api/src/main/java/org/onosproject/net/device/DeviceDescription.java
+++ b/core/api/src/main/java/org/onosproject/net/device/DeviceDescription.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.device;
+package org.onosproject.net.device;
-import org.onlab.onos.net.Description;
-import org.onlab.onos.net.Device;
+import org.onosproject.net.Description;
+import org.onosproject.net.Device;
import org.onlab.packet.ChassisId;
import java.net.URI;
diff --git a/core/api/src/main/java/org/onosproject/net/device/DeviceEvent.java b/core/api/src/main/java/org/onosproject/net/device/DeviceEvent.java
index 63baeb4..395c0eb 100644
--- a/core/api/src/main/java/org/onosproject/net/device/DeviceEvent.java
+++ b/core/api/src/main/java/org/onosproject/net/device/DeviceEvent.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.device;
+package org.onosproject.net.device;
import org.joda.time.LocalDateTime;
-import org.onlab.onos.event.AbstractEvent;
-import org.onlab.onos.net.Device;
-import org.onlab.onos.net.Port;
+import org.onosproject.event.AbstractEvent;
+import org.onosproject.net.Device;
+import org.onosproject.net.Port;
import static com.google.common.base.MoreObjects.toStringHelper;
diff --git a/core/api/src/main/java/org/onosproject/net/device/DeviceListener.java b/core/api/src/main/java/org/onosproject/net/device/DeviceListener.java
index 62f4bc0..c9809b8 100644
--- a/core/api/src/main/java/org/onosproject/net/device/DeviceListener.java
+++ b/core/api/src/main/java/org/onosproject/net/device/DeviceListener.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.device;
+package org.onosproject.net.device;
-import org.onlab.onos.event.EventListener;
+import org.onosproject.event.EventListener;
/**
* Entity capable of receiving infrastructure device related events.
diff --git a/core/api/src/main/java/org/onosproject/net/device/DeviceProvider.java b/core/api/src/main/java/org/onosproject/net/device/DeviceProvider.java
index 7280faf..d8adbb0 100644
--- a/core/api/src/main/java/org/onosproject/net/device/DeviceProvider.java
+++ b/core/api/src/main/java/org/onosproject/net/device/DeviceProvider.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.device;
+package org.onosproject.net.device;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.MastershipRole;
-import org.onlab.onos.net.provider.Provider;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.MastershipRole;
+import org.onosproject.net.provider.Provider;
/**
* Abstraction of a device information provider.
@@ -30,8 +30,8 @@
* Triggers an asynchronous probe of the specified device, intended to
* determine whether the device is present or not. An indirect result of this
* should be invocation of
- * {@link org.onlab.onos.net.device.DeviceProviderService#deviceConnected} )} or
- * {@link org.onlab.onos.net.device.DeviceProviderService#deviceDisconnected}
+ * {@link org.onosproject.net.device.DeviceProviderService#deviceConnected} )} or
+ * {@link org.onosproject.net.device.DeviceProviderService#deviceDisconnected}
* at some later point in time.
*
* @param deviceId ID of device to be probed
diff --git a/core/api/src/main/java/org/onosproject/net/device/DeviceProviderRegistry.java b/core/api/src/main/java/org/onosproject/net/device/DeviceProviderRegistry.java
index f1c69ba..a7ab7e3 100644
--- a/core/api/src/main/java/org/onosproject/net/device/DeviceProviderRegistry.java
+++ b/core/api/src/main/java/org/onosproject/net/device/DeviceProviderRegistry.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.device;
+package org.onosproject.net.device;
-import org.onlab.onos.net.provider.ProviderRegistry;
+import org.onosproject.net.provider.ProviderRegistry;
/**
* Abstraction of a device provider registry.
diff --git a/core/api/src/main/java/org/onosproject/net/device/DeviceProviderService.java b/core/api/src/main/java/org/onosproject/net/device/DeviceProviderService.java
index d156b28..f48543c 100644
--- a/core/api/src/main/java/org/onosproject/net/device/DeviceProviderService.java
+++ b/core/api/src/main/java/org/onosproject/net/device/DeviceProviderService.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.device;
+package org.onosproject.net.device;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.MastershipRole;
-import org.onlab.onos.net.provider.ProviderService;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.MastershipRole;
+import org.onosproject.net.provider.ProviderService;
import java.util.List;
diff --git a/core/api/src/main/java/org/onosproject/net/device/DeviceService.java b/core/api/src/main/java/org/onosproject/net/device/DeviceService.java
index 7d2a0dd..20b8a0b 100644
--- a/core/api/src/main/java/org/onosproject/net/device/DeviceService.java
+++ b/core/api/src/main/java/org/onosproject/net/device/DeviceService.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.device;
+package org.onosproject.net.device;
-import org.onlab.onos.net.Device;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.MastershipRole;
-import org.onlab.onos.net.Port;
-import org.onlab.onos.net.PortNumber;
+import org.onosproject.net.Device;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.MastershipRole;
+import org.onosproject.net.Port;
+import org.onosproject.net.PortNumber;
import java.util.List;
diff --git a/core/api/src/main/java/org/onosproject/net/device/DeviceStore.java b/core/api/src/main/java/org/onosproject/net/device/DeviceStore.java
index ed86881..4835504 100644
--- a/core/api/src/main/java/org/onosproject/net/device/DeviceStore.java
+++ b/core/api/src/main/java/org/onosproject/net/device/DeviceStore.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.device;
+package org.onosproject.net.device;
-import org.onlab.onos.net.Device;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.Port;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.onos.store.Store;
+import org.onosproject.net.Device;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Port;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.provider.ProviderId;
+import org.onosproject.store.Store;
import java.util.List;
diff --git a/core/api/src/main/java/org/onosproject/net/device/DeviceStoreDelegate.java b/core/api/src/main/java/org/onosproject/net/device/DeviceStoreDelegate.java
index 054d4cf..1a4fc67 100644
--- a/core/api/src/main/java/org/onosproject/net/device/DeviceStoreDelegate.java
+++ b/core/api/src/main/java/org/onosproject/net/device/DeviceStoreDelegate.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.device;
+package org.onosproject.net.device;
-import org.onlab.onos.store.StoreDelegate;
+import org.onosproject.store.StoreDelegate;
/**
* Infrastructure device store delegate abstraction.
diff --git a/core/api/src/main/java/org/onosproject/net/device/PortDescription.java b/core/api/src/main/java/org/onosproject/net/device/PortDescription.java
index b134d83..3ed3efc 100644
--- a/core/api/src/main/java/org/onosproject/net/device/PortDescription.java
+++ b/core/api/src/main/java/org/onosproject/net/device/PortDescription.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.device;
+package org.onosproject.net.device;
-import org.onlab.onos.net.Description;
-import org.onlab.onos.net.PortNumber;
+import org.onosproject.net.Description;
+import org.onosproject.net.PortNumber;
-import static org.onlab.onos.net.Port.Type;
+import static org.onosproject.net.Port.Type;
/**
* Information about a port.
diff --git a/core/api/src/main/java/org/onosproject/net/device/package-info.java b/core/api/src/main/java/org/onosproject/net/device/package-info.java
index bf9efc0..4ee64dc 100644
--- a/core/api/src/main/java/org/onosproject/net/device/package-info.java
+++ b/core/api/src/main/java/org/onosproject/net/device/package-info.java
@@ -17,4 +17,4 @@
/**
* Infrastructure device model & related services API definitions.
*/
-package org.onlab.onos.net.device;
+package org.onosproject.net.device;
diff --git a/core/api/src/main/java/org/onosproject/net/flow/BatchOperation.java b/core/api/src/main/java/org/onosproject/net/flow/BatchOperation.java
index 6fd16b9..09e34d8 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/BatchOperation.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/BatchOperation.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
import java.util.Collection;
import java.util.Collections;
diff --git a/core/api/src/main/java/org/onosproject/net/flow/BatchOperationEntry.java b/core/api/src/main/java/org/onosproject/net/flow/BatchOperationEntry.java
index d67ed74..37a1716 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/BatchOperationEntry.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/BatchOperationEntry.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
import java.util.Objects;
diff --git a/core/api/src/main/java/org/onosproject/net/flow/BatchOperationResult.java b/core/api/src/main/java/org/onosproject/net/flow/BatchOperationResult.java
index 4762872..684a869 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/BatchOperationResult.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/BatchOperationResult.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
import java.util.Set;
diff --git a/core/api/src/main/java/org/onosproject/net/flow/BatchOperationTarget.java b/core/api/src/main/java/org/onosproject/net/flow/BatchOperationTarget.java
index b9d6283..c9b20ef 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/BatchOperationTarget.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/BatchOperationTarget.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
/**
* An interface of the class which is assigned to BatchOperation.
diff --git a/core/api/src/main/java/org/onosproject/net/flow/CompletedBatchOperation.java b/core/api/src/main/java/org/onosproject/net/flow/CompletedBatchOperation.java
index 597c9cd..a17f7a3 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/CompletedBatchOperation.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/CompletedBatchOperation.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
import java.util.Collections;
diff --git a/core/api/src/main/java/org/onosproject/net/flow/DefaultFlowEntry.java b/core/api/src/main/java/org/onosproject/net/flow/DefaultFlowEntry.java
index c6cb361..e46e3df 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/DefaultFlowEntry.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/DefaultFlowEntry.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
import static com.google.common.base.MoreObjects.toStringHelper;
import static org.slf4j.LoggerFactory.getLogger;
-import org.onlab.onos.net.DeviceId;
+import org.onosproject.net.DeviceId;
import org.slf4j.Logger;
public class DefaultFlowEntry extends DefaultFlowRule
diff --git a/core/api/src/main/java/org/onosproject/net/flow/DefaultFlowRule.java b/core/api/src/main/java/org/onosproject/net/flow/DefaultFlowRule.java
index 168f044..fce7fc9 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/DefaultFlowRule.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/DefaultFlowRule.java
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
import static com.google.common.base.MoreObjects.toStringHelper;
import java.util.Objects;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.core.DefaultGroupId;
-import org.onlab.onos.core.GroupId;
-import org.onlab.onos.net.DeviceId;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.core.DefaultGroupId;
+import org.onosproject.core.GroupId;
+import org.onosproject.net.DeviceId;
public class DefaultFlowRule implements FlowRule {
diff --git a/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficSelector.java b/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficSelector.java
index 2730c14..1caed8e 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficSelector.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficSelector.java
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.flow.criteria.Criteria;
-import org.onlab.onos.net.flow.criteria.Criterion;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.flow.criteria.Criteria;
+import org.onosproject.net.flow.criteria.Criterion;
import org.onlab.packet.IpPrefix;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
diff --git a/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficTreatment.java b/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficTreatment.java
index 54c0972..d3dcca0 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficTreatment.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficTreatment.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
import java.util.LinkedList;
import java.util.List;
import java.util.Objects;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.flow.instructions.Instruction;
-import org.onlab.onos.net.flow.instructions.Instructions;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.flow.instructions.Instruction;
+import org.onosproject.net.flow.instructions.Instructions;
import org.onlab.packet.IpAddress;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
diff --git a/core/api/src/main/java/org/onosproject/net/flow/FlowEntry.java b/core/api/src/main/java/org/onosproject/net/flow/FlowEntry.java
index a8b9ea0..401ef0e 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/FlowEntry.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/FlowEntry.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
/**
diff --git a/core/api/src/main/java/org/onosproject/net/flow/FlowId.java b/core/api/src/main/java/org/onosproject/net/flow/FlowId.java
index 397e690..52500f5 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/FlowId.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/FlowId.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
import com.google.common.base.Objects;
diff --git a/core/api/src/main/java/org/onosproject/net/flow/FlowRule.java b/core/api/src/main/java/org/onosproject/net/flow/FlowRule.java
index 2124768..2c3185e 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/FlowRule.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/FlowRule.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
-import org.onlab.onos.core.GroupId;
-import org.onlab.onos.net.DeviceId;
+import org.onosproject.core.GroupId;
+import org.onosproject.net.DeviceId;
/**
* Represents a generalized match & action pair to be applied to
diff --git a/core/api/src/main/java/org/onosproject/net/flow/FlowRuleBatchEntry.java b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleBatchEntry.java
index 7a635e7..a82d60e 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/FlowRuleBatchEntry.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleBatchEntry.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
-import org.onlab.onos.net.flow.FlowRuleBatchEntry.FlowRuleOperation;
+import org.onosproject.net.flow.FlowRuleBatchEntry.FlowRuleOperation;
public class FlowRuleBatchEntry
diff --git a/core/api/src/main/java/org/onosproject/net/flow/FlowRuleBatchEvent.java b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleBatchEvent.java
index 1dbf8bd..ab72d8b 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/FlowRuleBatchEvent.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleBatchEvent.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
-import org.onlab.onos.event.AbstractEvent;
+import org.onosproject.event.AbstractEvent;
/**
* Describes flow rule batch event.
diff --git a/core/api/src/main/java/org/onosproject/net/flow/FlowRuleBatchOperation.java b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleBatchOperation.java
index 8d99f80..f9bc632 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/FlowRuleBatchOperation.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleBatchOperation.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
import java.util.Collection;
diff --git a/core/api/src/main/java/org/onosproject/net/flow/FlowRuleBatchRequest.java b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleBatchRequest.java
index 09698a4..a0be81c 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/FlowRuleBatchRequest.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleBatchRequest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
import java.util.Collections;
import java.util.List;
diff --git a/core/api/src/main/java/org/onosproject/net/flow/FlowRuleEvent.java b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleEvent.java
index 550685a..41ef1c8 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/FlowRuleEvent.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleEvent.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
-import org.onlab.onos.event.AbstractEvent;
+import org.onosproject.event.AbstractEvent;
/**
* Describes flow rule event.
diff --git a/core/api/src/main/java/org/onosproject/net/flow/FlowRuleListener.java b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleListener.java
index 76359c0..1a6ef7d 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/FlowRuleListener.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleListener.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
-import org.onlab.onos.event.EventListener;
+import org.onosproject.event.EventListener;
/**
* Entity capable of receiving flow rule related events.
diff --git a/core/api/src/main/java/org/onosproject/net/flow/FlowRuleProvider.java b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleProvider.java
index ccd9774..92814c5 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/FlowRuleProvider.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleProvider.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.net.provider.Provider;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.net.provider.Provider;
import java.util.concurrent.Future;
diff --git a/core/api/src/main/java/org/onosproject/net/flow/FlowRuleProviderRegistry.java b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleProviderRegistry.java
index eba227f..7e317c0 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/FlowRuleProviderRegistry.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleProviderRegistry.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
-import org.onlab.onos.net.provider.ProviderRegistry;
+import org.onosproject.net.provider.ProviderRegistry;
/**
* Abstraction for a flow rule provider registry.
diff --git a/core/api/src/main/java/org/onosproject/net/flow/FlowRuleProviderService.java b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleProviderService.java
index 4c0d98d..9456719 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/FlowRuleProviderService.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleProviderService.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.provider.ProviderService;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.provider.ProviderService;
/**
* Service through which flow rule providers can inject information into
diff --git a/core/api/src/main/java/org/onosproject/net/flow/FlowRuleService.java b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleService.java
index 8561f8a..78772c2 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/FlowRuleService.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleService.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
import java.util.concurrent.Future;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.net.DeviceId;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.net.DeviceId;
/**
* Service for injecting flow rules into the environment and for obtaining
diff --git a/core/api/src/main/java/org/onosproject/net/flow/FlowRuleStore.java b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleStore.java
index bba5a3c..6fca2c3 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/FlowRuleStore.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleStore.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
import java.util.concurrent.Future;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.store.Store;
+import org.onosproject.net.DeviceId;
+import org.onosproject.store.Store;
/**
* Manages inventory of flow rules; not intended for direct use.
diff --git a/core/api/src/main/java/org/onosproject/net/flow/FlowRuleStoreDelegate.java b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleStoreDelegate.java
index f7a123d..c4ddb12 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/FlowRuleStoreDelegate.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleStoreDelegate.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
-import org.onlab.onos.store.StoreDelegate;
+import org.onosproject.store.StoreDelegate;
/**
* Flow rule store delegate abstraction.
diff --git a/core/api/src/main/java/org/onosproject/net/flow/StoredFlowEntry.java b/core/api/src/main/java/org/onosproject/net/flow/StoredFlowEntry.java
index de15732..dc0c339 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/StoredFlowEntry.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/StoredFlowEntry.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
public interface StoredFlowEntry extends FlowEntry {
diff --git a/core/api/src/main/java/org/onosproject/net/flow/TrafficSelector.java b/core/api/src/main/java/org/onosproject/net/flow/TrafficSelector.java
index daf5268..d9b91f6 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/TrafficSelector.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/TrafficSelector.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
import java.util.Set;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.flow.criteria.Criterion;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.flow.criteria.Criterion;
import org.onlab.packet.IpPrefix;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
diff --git a/core/api/src/main/java/org/onosproject/net/flow/TrafficTreatment.java b/core/api/src/main/java/org/onosproject/net/flow/TrafficTreatment.java
index 3ac2c44..281dc86 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/TrafficTreatment.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/TrafficTreatment.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
import java.util.List;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.flow.instructions.Instruction;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.flow.instructions.Instruction;
import org.onlab.packet.IpAddress;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
diff --git a/core/api/src/main/java/org/onosproject/net/flow/Treatment.java b/core/api/src/main/java/org/onosproject/net/flow/Treatment.java
index 26f78dd..a77079c 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/Treatment.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/Treatment.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
-import org.onlab.onos.net.PortNumber;
+import org.onosproject.net.PortNumber;
/**
* Abstraction of different kinds of treatment that can be applied to an
diff --git a/core/api/src/main/java/org/onosproject/net/flow/criteria/Criteria.java b/core/api/src/main/java/org/onosproject/net/flow/criteria/Criteria.java
index 684c5ab..a41b238 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/criteria/Criteria.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/criteria/Criteria.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow.criteria;
+package org.onosproject.net.flow.criteria;
import static com.google.common.base.MoreObjects.toStringHelper;
import java.util.Objects;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.flow.criteria.Criterion.Type;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.flow.criteria.Criterion.Type;
import org.onlab.packet.IpPrefix;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
diff --git a/core/api/src/main/java/org/onosproject/net/flow/criteria/Criterion.java b/core/api/src/main/java/org/onosproject/net/flow/criteria/Criterion.java
index 718534d..5ce86a7 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/criteria/Criterion.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/criteria/Criterion.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow.criteria;
+package org.onosproject.net.flow.criteria;
/**
diff --git a/core/api/src/main/java/org/onosproject/net/flow/criteria/package-info.java b/core/api/src/main/java/org/onosproject/net/flow/criteria/package-info.java
index 3205356..1f09192 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/criteria/package-info.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/criteria/package-info.java
@@ -17,4 +17,4 @@
/**
* Traffic selection criteria model.
*/
-package org.onlab.onos.net.flow.criteria;
+package org.onosproject.net.flow.criteria;
diff --git a/core/api/src/main/java/org/onosproject/net/flow/instructions/Instruction.java b/core/api/src/main/java/org/onosproject/net/flow/instructions/Instruction.java
index ea92134..6f2162f 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/instructions/Instruction.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/instructions/Instruction.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow.instructions;
+package org.onosproject.net.flow.instructions;
/**
* Abstraction of a single traffic treatment step.
diff --git a/core/api/src/main/java/org/onosproject/net/flow/instructions/Instructions.java b/core/api/src/main/java/org/onosproject/net/flow/instructions/Instructions.java
index c0fe386..4dd2c48 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/instructions/Instructions.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/instructions/Instructions.java
@@ -13,21 +13,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow.instructions;
+package org.onosproject.net.flow.instructions;
import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
-import static org.onlab.onos.net.flow.instructions.L2ModificationInstruction.*;
+import static org.onosproject.net.flow.instructions.L2ModificationInstruction.*;
import java.util.Objects;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.flow.instructions.L0ModificationInstruction.L0SubType;
-import org.onlab.onos.net.flow.instructions.L0ModificationInstruction.ModLambdaInstruction;
-import org.onlab.onos.net.flow.instructions.L2ModificationInstruction.L2SubType;
-import org.onlab.onos.net.flow.instructions.L2ModificationInstruction.ModEtherInstruction;
-import org.onlab.onos.net.flow.instructions.L3ModificationInstruction.L3SubType;
-import org.onlab.onos.net.flow.instructions.L3ModificationInstruction.ModIPInstruction;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.flow.instructions.L0ModificationInstruction.L0SubType;
+import org.onosproject.net.flow.instructions.L0ModificationInstruction.ModLambdaInstruction;
+import org.onosproject.net.flow.instructions.L2ModificationInstruction.L2SubType;
+import org.onosproject.net.flow.instructions.L2ModificationInstruction.ModEtherInstruction;
+import org.onosproject.net.flow.instructions.L3ModificationInstruction.L3SubType;
+import org.onosproject.net.flow.instructions.L3ModificationInstruction.ModIPInstruction;
import org.onlab.packet.Ethernet;
import org.onlab.packet.IpAddress;
diff --git a/core/api/src/main/java/org/onosproject/net/flow/instructions/L0ModificationInstruction.java b/core/api/src/main/java/org/onosproject/net/flow/instructions/L0ModificationInstruction.java
index 25fe79f..69d6938 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/instructions/L0ModificationInstruction.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/instructions/L0ModificationInstruction.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow.instructions;
+package org.onosproject.net.flow.instructions;
import static com.google.common.base.MoreObjects.toStringHelper;
diff --git a/core/api/src/main/java/org/onosproject/net/flow/instructions/L2ModificationInstruction.java b/core/api/src/main/java/org/onosproject/net/flow/instructions/L2ModificationInstruction.java
index 9b027d5..6baeceb 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/instructions/L2ModificationInstruction.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/instructions/L2ModificationInstruction.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow.instructions;
+package org.onosproject.net.flow.instructions;
import static com.google.common.base.MoreObjects.toStringHelper;
diff --git a/core/api/src/main/java/org/onosproject/net/flow/instructions/L3ModificationInstruction.java b/core/api/src/main/java/org/onosproject/net/flow/instructions/L3ModificationInstruction.java
index e8b72e7..fb80557 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/instructions/L3ModificationInstruction.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/instructions/L3ModificationInstruction.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow.instructions;
+package org.onosproject.net.flow.instructions;
import static com.google.common.base.MoreObjects.toStringHelper;
diff --git a/core/api/src/main/java/org/onosproject/net/flow/instructions/package-info.java b/core/api/src/main/java/org/onosproject/net/flow/instructions/package-info.java
index 0331743..65f58a4 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/instructions/package-info.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/instructions/package-info.java
@@ -17,4 +17,4 @@
/**
* Traffic treatment model.
*/
-package org.onlab.onos.net.flow.instructions;
+package org.onosproject.net.flow.instructions;
diff --git a/core/api/src/main/java/org/onosproject/net/flow/package-info.java b/core/api/src/main/java/org/onosproject/net/flow/package-info.java
index 1b2e61b..4264ee9 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/package-info.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/package-info.java
@@ -17,4 +17,4 @@
/**
* Flow rule model & related services API definitions.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
diff --git a/core/api/src/main/java/org/onosproject/net/host/DefaultHostDescription.java b/core/api/src/main/java/org/onosproject/net/host/DefaultHostDescription.java
index c41a77c..1f05197 100644
--- a/core/api/src/main/java/org/onosproject/net/host/DefaultHostDescription.java
+++ b/core/api/src/main/java/org/onosproject/net/host/DefaultHostDescription.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.host;
+package org.onosproject.net.host;
import java.util.Collections;
import java.util.Set;
-import org.onlab.onos.net.AbstractDescription;
-import org.onlab.onos.net.HostLocation;
-import org.onlab.onos.net.SparseAnnotations;
+import org.onosproject.net.AbstractDescription;
+import org.onosproject.net.HostLocation;
+import org.onosproject.net.SparseAnnotations;
import org.onlab.packet.IpAddress;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
diff --git a/core/api/src/main/java/org/onosproject/net/host/HostAdminService.java b/core/api/src/main/java/org/onosproject/net/host/HostAdminService.java
index c51a847..2b20313 100644
--- a/core/api/src/main/java/org/onosproject/net/host/HostAdminService.java
+++ b/core/api/src/main/java/org/onosproject/net/host/HostAdminService.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.host;
+package org.onosproject.net.host;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.HostId;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.HostId;
/**
* Service for administering the inventory of end-station hosts.
diff --git a/core/api/src/main/java/org/onosproject/net/host/HostClockService.java b/core/api/src/main/java/org/onosproject/net/host/HostClockService.java
index 1020cbe..29cac80 100644
--- a/core/api/src/main/java/org/onosproject/net/host/HostClockService.java
+++ b/core/api/src/main/java/org/onosproject/net/host/HostClockService.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.host;
+package org.onosproject.net.host;
-import org.onlab.onos.net.HostId;
-import org.onlab.onos.store.Timestamp;
+import org.onosproject.net.HostId;
+import org.onosproject.store.Timestamp;
/**
* Interface for a logical clock service that issues per host timestamps.
diff --git a/core/api/src/main/java/org/onosproject/net/host/HostDescription.java b/core/api/src/main/java/org/onosproject/net/host/HostDescription.java
index 0b0244f..14c6f7a 100644
--- a/core/api/src/main/java/org/onosproject/net/host/HostDescription.java
+++ b/core/api/src/main/java/org/onosproject/net/host/HostDescription.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.host;
+package org.onosproject.net.host;
import java.util.Set;
-import org.onlab.onos.net.Description;
-import org.onlab.onos.net.HostLocation;
+import org.onosproject.net.Description;
+import org.onosproject.net.HostLocation;
import org.onlab.packet.IpAddress;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
diff --git a/core/api/src/main/java/org/onosproject/net/host/HostEvent.java b/core/api/src/main/java/org/onosproject/net/host/HostEvent.java
index 76dd8e7..98329df 100644
--- a/core/api/src/main/java/org/onosproject/net/host/HostEvent.java
+++ b/core/api/src/main/java/org/onosproject/net/host/HostEvent.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.host;
+package org.onosproject.net.host;
-import org.onlab.onos.event.AbstractEvent;
-import org.onlab.onos.net.Host;
+import org.onosproject.event.AbstractEvent;
+import org.onosproject.net.Host;
/**
* Describes end-station host event.
diff --git a/core/api/src/main/java/org/onosproject/net/host/HostListener.java b/core/api/src/main/java/org/onosproject/net/host/HostListener.java
index f5e8d9a..2eef759 100644
--- a/core/api/src/main/java/org/onosproject/net/host/HostListener.java
+++ b/core/api/src/main/java/org/onosproject/net/host/HostListener.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.host;
+package org.onosproject.net.host;
-import org.onlab.onos.event.EventListener;
+import org.onosproject.event.EventListener;
/**
* Entity capable of receiving end-station host related events.
diff --git a/core/api/src/main/java/org/onosproject/net/host/HostProvider.java b/core/api/src/main/java/org/onosproject/net/host/HostProvider.java
index 9f53bee..0270996 100644
--- a/core/api/src/main/java/org/onosproject/net/host/HostProvider.java
+++ b/core/api/src/main/java/org/onosproject/net/host/HostProvider.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.host;
+package org.onosproject.net.host;
-import org.onlab.onos.net.Host;
-import org.onlab.onos.net.provider.Provider;
+import org.onosproject.net.Host;
+import org.onosproject.net.provider.Provider;
/**
* Provider of information about hosts and their location on the network.
@@ -26,8 +26,8 @@
/**
* Triggers an asynchronous probe of the specified host, intended to
* determine whether the host is present or not. An indirect result of this
- * should be invocation of {@link org.onlab.onos.net.host.HostProviderService#hostDetected}
- * or {@link org.onlab.onos.net.host.HostProviderService#hostVanished}
+ * should be invocation of {@link org.onosproject.net.host.HostProviderService#hostDetected}
+ * or {@link org.onosproject.net.host.HostProviderService#hostVanished}
* at some later point in time.
*
* @param host host to probe
diff --git a/core/api/src/main/java/org/onosproject/net/host/HostProviderRegistry.java b/core/api/src/main/java/org/onosproject/net/host/HostProviderRegistry.java
index bef7029..8ab600c 100644
--- a/core/api/src/main/java/org/onosproject/net/host/HostProviderRegistry.java
+++ b/core/api/src/main/java/org/onosproject/net/host/HostProviderRegistry.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.host;
+package org.onosproject.net.host;
-import org.onlab.onos.net.provider.ProviderRegistry;
+import org.onosproject.net.provider.ProviderRegistry;
/**
* Abstraction of a host provider registry.
diff --git a/core/api/src/main/java/org/onosproject/net/host/HostProviderService.java b/core/api/src/main/java/org/onosproject/net/host/HostProviderService.java
index c704413..27b8c83 100644
--- a/core/api/src/main/java/org/onosproject/net/host/HostProviderService.java
+++ b/core/api/src/main/java/org/onosproject/net/host/HostProviderService.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.host;
+package org.onosproject.net.host;
-import org.onlab.onos.net.HostId;
-import org.onlab.onos.net.provider.ProviderService;
+import org.onosproject.net.HostId;
+import org.onosproject.net.provider.ProviderService;
/**
* Means of conveying host information to the core.
diff --git a/core/api/src/main/java/org/onosproject/net/host/HostService.java b/core/api/src/main/java/org/onosproject/net/host/HostService.java
index 7f7be50..183fe0b 100644
--- a/core/api/src/main/java/org/onosproject/net/host/HostService.java
+++ b/core/api/src/main/java/org/onosproject/net/host/HostService.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.host;
+package org.onosproject.net.host;
import java.util.Set;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.Host;
-import org.onlab.onos.net.HostId;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Host;
+import org.onosproject.net.HostId;
import org.onlab.packet.IpAddress;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
diff --git a/core/api/src/main/java/org/onosproject/net/host/HostStore.java b/core/api/src/main/java/org/onosproject/net/host/HostStore.java
index 0316dcf..4d3b707 100644
--- a/core/api/src/main/java/org/onosproject/net/host/HostStore.java
+++ b/core/api/src/main/java/org/onosproject/net/host/HostStore.java
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.host;
+package org.onosproject.net.host;
import java.util.Set;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.Host;
-import org.onlab.onos.net.HostId;
-import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.onos.store.Store;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Host;
+import org.onosproject.net.HostId;
+import org.onosproject.net.provider.ProviderId;
+import org.onosproject.store.Store;
import org.onlab.packet.IpAddress;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
diff --git a/core/api/src/main/java/org/onosproject/net/host/HostStoreDelegate.java b/core/api/src/main/java/org/onosproject/net/host/HostStoreDelegate.java
index de0d69a..efc8423 100644
--- a/core/api/src/main/java/org/onosproject/net/host/HostStoreDelegate.java
+++ b/core/api/src/main/java/org/onosproject/net/host/HostStoreDelegate.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.host;
+package org.onosproject.net.host;
-import org.onlab.onos.store.StoreDelegate;
+import org.onosproject.store.StoreDelegate;
/**
* Infrastructure link store delegate abstraction.
diff --git a/core/api/src/main/java/org/onosproject/net/host/InterfaceIpAddress.java b/core/api/src/main/java/org/onosproject/net/host/InterfaceIpAddress.java
index 0cd9b5c..6885e23 100644
--- a/core/api/src/main/java/org/onosproject/net/host/InterfaceIpAddress.java
+++ b/core/api/src/main/java/org/onosproject/net/host/InterfaceIpAddress.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.host;
+package org.onosproject.net.host;
import java.util.Objects;
import org.onlab.packet.IpAddress;
diff --git a/core/api/src/main/java/org/onosproject/net/host/PortAddresses.java b/core/api/src/main/java/org/onosproject/net/host/PortAddresses.java
index 5e17e6c..543b1f4 100644
--- a/core/api/src/main/java/org/onosproject/net/host/PortAddresses.java
+++ b/core/api/src/main/java/org/onosproject/net/host/PortAddresses.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.host;
+package org.onosproject.net.host;
import java.util.Collections;
import java.util.HashSet;
import java.util.Objects;
import java.util.Set;
-import org.onlab.onos.net.ConnectPoint;
+import org.onosproject.net.ConnectPoint;
import org.onlab.packet.MacAddress;
import com.google.common.base.MoreObjects;
diff --git a/core/api/src/main/java/org/onosproject/net/host/package-info.java b/core/api/src/main/java/org/onosproject/net/host/package-info.java
index 2609174..4f2bc7c 100644
--- a/core/api/src/main/java/org/onosproject/net/host/package-info.java
+++ b/core/api/src/main/java/org/onosproject/net/host/package-info.java
@@ -17,4 +17,4 @@
/**
* End-station host model & related services API definitions.
*/
-package org.onlab.onos.net.host;
+package org.onosproject.net.host;
diff --git a/core/api/src/main/java/org/onosproject/net/intent/ConnectivityIntent.java b/core/api/src/main/java/org/onosproject/net/intent/ConnectivityIntent.java
index 9059522..b82fe56 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/ConnectivityIntent.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/ConnectivityIntent.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
import com.google.common.collect.ImmutableSet;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.NetworkResource;
-import org.onlab.onos.net.flow.TrafficSelector;
-import org.onlab.onos.net.flow.TrafficTreatment;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.net.Link;
+import org.onosproject.net.NetworkResource;
+import org.onosproject.net.flow.TrafficSelector;
+import org.onosproject.net.flow.TrafficTreatment;
import java.util.Collection;
import java.util.Collections;
diff --git a/core/api/src/main/java/org/onosproject/net/intent/Constraint.java b/core/api/src/main/java/org/onosproject/net/intent/Constraint.java
index 9004aa6..ca2acdc 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/Constraint.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/Constraint.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.Path;
-import org.onlab.onos.net.resource.LinkResourceService;
+import org.onosproject.net.Link;
+import org.onosproject.net.Path;
+import org.onosproject.net.resource.LinkResourceService;
/**
* Representation of a connectivity constraint capable of evaluating a link
diff --git a/core/api/src/main/java/org/onosproject/net/intent/HostToHostIntent.java b/core/api/src/main/java/org/onosproject/net/intent/HostToHostIntent.java
index c65d19c..1a6c50a 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/HostToHostIntent.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/HostToHostIntent.java
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
import com.google.common.base.MoreObjects;
import com.google.common.collect.ImmutableList;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.net.HostId;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.flow.TrafficSelector;
-import org.onlab.onos.net.flow.TrafficTreatment;
-import org.onlab.onos.net.intent.constraint.LinkTypeConstraint;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.net.HostId;
+import org.onosproject.net.Link;
+import org.onosproject.net.flow.TrafficSelector;
+import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.net.intent.constraint.LinkTypeConstraint;
import java.util.List;
diff --git a/core/api/src/main/java/org/onosproject/net/intent/Intent.java b/core/api/src/main/java/org/onosproject/net/intent/Intent.java
index 9fbab1a..0d0955f 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/Intent.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/Intent.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.core.IdGenerator;
-import org.onlab.onos.net.NetworkResource;
-import org.onlab.onos.net.flow.BatchOperationTarget;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.core.IdGenerator;
+import org.onosproject.net.NetworkResource;
+import org.onosproject.net.flow.BatchOperationTarget;
import java.util.Collection;
import java.util.Objects;
diff --git a/core/api/src/main/java/org/onosproject/net/intent/IntentBatchDelegate.java b/core/api/src/main/java/org/onosproject/net/intent/IntentBatchDelegate.java
index 248d82e..a2eceb6 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/IntentBatchDelegate.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/IntentBatchDelegate.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
/**
* Facade for receiving notifications from the intent batch service.
diff --git a/core/api/src/main/java/org/onosproject/net/intent/IntentBatchLeaderEvent.java b/core/api/src/main/java/org/onosproject/net/intent/IntentBatchLeaderEvent.java
index cd5297f..b434218 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/IntentBatchLeaderEvent.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/IntentBatchLeaderEvent.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.event.AbstractEvent;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.event.AbstractEvent;
/**
* A class to represent an intent related event.
diff --git a/core/api/src/main/java/org/onosproject/net/intent/IntentBatchListener.java b/core/api/src/main/java/org/onosproject/net/intent/IntentBatchListener.java
index fb5c600..c4a4637 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/IntentBatchListener.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/IntentBatchListener.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
-import org.onlab.onos.event.EventListener;
+import org.onosproject.event.EventListener;
/**
- * Listener for {@link org.onlab.onos.net.intent.IntentEvent intent events}.
+ * Listener for {@link org.onosproject.net.intent.IntentEvent intent events}.
*/
public interface IntentBatchListener extends EventListener<IntentBatchLeaderEvent> {
}
diff --git a/core/api/src/main/java/org/onosproject/net/intent/IntentBatchService.java b/core/api/src/main/java/org/onosproject/net/intent/IntentBatchService.java
index 246ece8..bf8e4fd 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/IntentBatchService.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/IntentBatchService.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
-import org.onlab.onos.core.ApplicationId;
+import org.onosproject.core.ApplicationId;
import java.util.Set;
diff --git a/core/api/src/main/java/org/onosproject/net/intent/IntentCompiler.java b/core/api/src/main/java/org/onosproject/net/intent/IntentCompiler.java
index 2d6d94b..4f0a55d 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/IntentCompiler.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/IntentCompiler.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
-import org.onlab.onos.net.resource.LinkResourceAllocations;
+import org.onosproject.net.resource.LinkResourceAllocations;
import java.util.List;
import java.util.Set;
diff --git a/core/api/src/main/java/org/onosproject/net/intent/IntentEvent.java b/core/api/src/main/java/org/onosproject/net/intent/IntentEvent.java
index 37261e9..e3a0522 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/IntentEvent.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/IntentEvent.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
-import org.onlab.onos.event.AbstractEvent;
+import org.onosproject.event.AbstractEvent;
/**
* A class to represent an intent related event.
diff --git a/core/api/src/main/java/org/onosproject/net/intent/IntentException.java b/core/api/src/main/java/org/onosproject/net/intent/IntentException.java
index 7bdfa10..d2675c7 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/IntentException.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/IntentException.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
/**
* Represents an intent related error.
diff --git a/core/api/src/main/java/org/onosproject/net/intent/IntentExtensionService.java b/core/api/src/main/java/org/onosproject/net/intent/IntentExtensionService.java
index 2b578ff..cefcb90 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/IntentExtensionService.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/IntentExtensionService.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
import java.util.Map;
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 2718e6e..0805f1f 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
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
-import org.onlab.onos.net.flow.BatchOperationTarget;
+import org.onosproject.net.flow.BatchOperationTarget;
/**
* Intent identifier suitable as an external key.
diff --git a/core/api/src/main/java/org/onosproject/net/intent/IntentInstaller.java b/core/api/src/main/java/org/onosproject/net/intent/IntentInstaller.java
index 5ef717f..6b9e35d 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/IntentInstaller.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/IntentInstaller.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
-import org.onlab.onos.net.flow.FlowRuleBatchOperation;
+import org.onosproject.net.flow.FlowRuleBatchOperation;
import java.util.List;
diff --git a/core/api/src/main/java/org/onosproject/net/intent/IntentListener.java b/core/api/src/main/java/org/onosproject/net/intent/IntentListener.java
index 442d1df..c4a8367 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/IntentListener.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/IntentListener.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
-import org.onlab.onos.event.EventListener;
+import org.onosproject.event.EventListener;
/**
* Listener for {@link IntentEvent intent events}.
diff --git a/core/api/src/main/java/org/onosproject/net/intent/IntentOperation.java b/core/api/src/main/java/org/onosproject/net/intent/IntentOperation.java
index e0cf677..c9fefc2 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/IntentOperation.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/IntentOperation.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
import java.util.Objects;
diff --git a/core/api/src/main/java/org/onosproject/net/intent/IntentOperations.java b/core/api/src/main/java/org/onosproject/net/intent/IntentOperations.java
index c282a01..b668fcf 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/IntentOperations.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/IntentOperations.java
@@ -13,20 +13,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
import java.util.List;
import java.util.Objects;
import com.google.common.collect.ImmutableList;
-import org.onlab.onos.core.ApplicationId;
+import org.onosproject.core.ApplicationId;
import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
-import static org.onlab.onos.net.intent.IntentOperation.Type.REPLACE;
-import static org.onlab.onos.net.intent.IntentOperation.Type.SUBMIT;
-import static org.onlab.onos.net.intent.IntentOperation.Type.UPDATE;
-import static org.onlab.onos.net.intent.IntentOperation.Type.WITHDRAW;
+import static org.onosproject.net.intent.IntentOperation.Type.REPLACE;
+import static org.onosproject.net.intent.IntentOperation.Type.SUBMIT;
+import static org.onosproject.net.intent.IntentOperation.Type.UPDATE;
+import static org.onosproject.net.intent.IntentOperation.Type.WITHDRAW;
/**
* Batch of intent submit/withdraw/replace operations.
diff --git a/core/api/src/main/java/org/onosproject/net/intent/IntentService.java b/core/api/src/main/java/org/onosproject/net/intent/IntentService.java
index 9abb584..2b92bf8 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/IntentService.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/IntentService.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
import java.util.List;
diff --git a/core/api/src/main/java/org/onosproject/net/intent/IntentState.java b/core/api/src/main/java/org/onosproject/net/intent/IntentState.java
index 4a534c1..0deabad 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/IntentState.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/IntentState.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
/**
* Representation of the phases an intent may attain during its lifecycle.
diff --git a/core/api/src/main/java/org/onosproject/net/intent/IntentStore.java b/core/api/src/main/java/org/onosproject/net/intent/IntentStore.java
index 442a247..0199845 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/IntentStore.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/IntentStore.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
import static com.google.common.base.Preconditions.checkNotNull;
-import org.onlab.onos.net.intent.IntentStore.BatchWrite.Operation;
-import org.onlab.onos.store.Store;
+import org.onosproject.net.intent.IntentStore.BatchWrite.Operation;
+import org.onosproject.store.Store;
import com.google.common.base.MoreObjects;
import com.google.common.collect.ImmutableList;
diff --git a/core/api/src/main/java/org/onosproject/net/intent/IntentStoreDelegate.java b/core/api/src/main/java/org/onosproject/net/intent/IntentStoreDelegate.java
index 6d491e4..bd2e6f5 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/IntentStoreDelegate.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/IntentStoreDelegate.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
-import org.onlab.onos.store.StoreDelegate;
+import org.onosproject.store.StoreDelegate;
/**
* Intent store delegate abstraction.
diff --git a/core/api/src/main/java/org/onosproject/net/intent/LinkCollectionIntent.java b/core/api/src/main/java/org/onosproject/net/intent/LinkCollectionIntent.java
index 3f87b7e..4fedcec 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/LinkCollectionIntent.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/LinkCollectionIntent.java
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
import com.google.common.base.MoreObjects;
import com.google.common.collect.ImmutableSet;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.flow.TrafficSelector;
-import org.onlab.onos.net.flow.TrafficTreatment;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.Link;
+import org.onosproject.net.flow.TrafficSelector;
+import org.onosproject.net.flow.TrafficTreatment;
import java.util.Collections;
import java.util.List;
diff --git a/core/api/src/main/java/org/onosproject/net/intent/MultiPointToSinglePointIntent.java b/core/api/src/main/java/org/onosproject/net/intent/MultiPointToSinglePointIntent.java
index 416768b..1c751b9 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/MultiPointToSinglePointIntent.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/MultiPointToSinglePointIntent.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
import com.google.common.base.MoreObjects;
import com.google.common.collect.Sets;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.flow.TrafficSelector;
-import org.onlab.onos.net.flow.TrafficTreatment;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.flow.TrafficSelector;
+import org.onosproject.net.flow.TrafficTreatment;
import java.util.Collections;
import java.util.List;
diff --git a/core/api/src/main/java/org/onosproject/net/intent/OpticalConnectivityIntent.java b/core/api/src/main/java/org/onosproject/net/intent/OpticalConnectivityIntent.java
index 205fde6..9e12510 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/OpticalConnectivityIntent.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/OpticalConnectivityIntent.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.net.ConnectPoint;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.net.ConnectPoint;
/**
* An optical layer intent for connectivity from one transponder port to another
diff --git a/core/api/src/main/java/org/onosproject/net/intent/OpticalPathIntent.java b/core/api/src/main/java/org/onosproject/net/intent/OpticalPathIntent.java
index e12e339..7006b68 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/OpticalPathIntent.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/OpticalPathIntent.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
import java.util.Collection;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.NetworkResource;
-import org.onlab.onos.net.Path;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.Link;
+import org.onosproject.net.NetworkResource;
+import org.onosproject.net.Path;
import com.google.common.base.MoreObjects;
import com.google.common.collect.ImmutableSet;
diff --git a/core/api/src/main/java/org/onosproject/net/intent/PathIntent.java b/core/api/src/main/java/org/onosproject/net/intent/PathIntent.java
index a21509d..d84778a 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/PathIntent.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/PathIntent.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
import java.util.Collections;
import java.util.List;
@@ -21,11 +21,11 @@
import com.google.common.base.MoreObjects;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.Path;
-import org.onlab.onos.net.flow.TrafficSelector;
-import org.onlab.onos.net.flow.TrafficTreatment;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.net.Link;
+import org.onosproject.net.Path;
+import org.onosproject.net.flow.TrafficSelector;
+import org.onosproject.net.flow.TrafficTreatment;
import static com.google.common.base.Preconditions.checkArgument;
diff --git a/core/api/src/main/java/org/onosproject/net/intent/PointToPointIntent.java b/core/api/src/main/java/org/onosproject/net/intent/PointToPointIntent.java
index 28af4c7..4a725f6 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/PointToPointIntent.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/PointToPointIntent.java
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
import com.google.common.base.MoreObjects;
import com.google.common.collect.ImmutableList;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.flow.TrafficSelector;
-import org.onlab.onos.net.flow.TrafficTreatment;
-import org.onlab.onos.net.intent.constraint.LinkTypeConstraint;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.Link;
+import org.onosproject.net.flow.TrafficSelector;
+import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.net.intent.constraint.LinkTypeConstraint;
import java.util.List;
diff --git a/core/api/src/main/java/org/onosproject/net/intent/SinglePointToMultiPointIntent.java b/core/api/src/main/java/org/onosproject/net/intent/SinglePointToMultiPointIntent.java
index 8c806bd..8752c4a 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/SinglePointToMultiPointIntent.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/SinglePointToMultiPointIntent.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
import com.google.common.base.MoreObjects;
import com.google.common.collect.Sets;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.flow.TrafficSelector;
-import org.onlab.onos.net.flow.TrafficTreatment;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.flow.TrafficSelector;
+import org.onosproject.net.flow.TrafficTreatment;
import java.util.Collections;
import java.util.Set;
diff --git a/core/api/src/main/java/org/onosproject/net/intent/constraint/AnnotationConstraint.java b/core/api/src/main/java/org/onosproject/net/intent/constraint/AnnotationConstraint.java
index 1767a41..6733296 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/constraint/AnnotationConstraint.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/constraint/AnnotationConstraint.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent.constraint;
+package org.onosproject.net.intent.constraint;
import com.google.common.base.MoreObjects;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.resource.LinkResourceService;
+import org.onosproject.net.Link;
+import org.onosproject.net.resource.LinkResourceService;
import java.util.Objects;
-import static org.onlab.onos.net.AnnotationKeys.getAnnotatedValue;
+import static org.onosproject.net.AnnotationKeys.getAnnotatedValue;
/**
* Constraint that evaluates an arbitrary link annotated value is under the specified threshold.
diff --git a/core/api/src/main/java/org/onosproject/net/intent/constraint/AsymmetricPathConstraint.java b/core/api/src/main/java/org/onosproject/net/intent/constraint/AsymmetricPathConstraint.java
index cfeb8f7..26ba61b 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/constraint/AsymmetricPathConstraint.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/constraint/AsymmetricPathConstraint.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent.constraint;
+package org.onosproject.net.intent.constraint;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.Path;
-import org.onlab.onos.net.intent.Constraint;
-import org.onlab.onos.net.resource.LinkResourceService;
+import org.onosproject.net.Link;
+import org.onosproject.net.Path;
+import org.onosproject.net.intent.Constraint;
+import org.onosproject.net.resource.LinkResourceService;
import java.util.Objects;
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 fc08214..1e8e9d3 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
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent.constraint;
+package org.onosproject.net.intent.constraint;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.resource.Bandwidth;
-import org.onlab.onos.net.resource.BandwidthResourceRequest;
-import org.onlab.onos.net.resource.LinkResourceService;
-import org.onlab.onos.net.resource.ResourceRequest;
-import org.onlab.onos.net.resource.ResourceType;
+import org.onosproject.net.Link;
+import org.onosproject.net.resource.Bandwidth;
+import org.onosproject.net.resource.BandwidthResourceRequest;
+import org.onosproject.net.resource.LinkResourceService;
+import org.onosproject.net.resource.ResourceRequest;
+import org.onosproject.net.resource.ResourceType;
import java.util.Objects;
diff --git a/core/api/src/main/java/org/onosproject/net/intent/constraint/BooleanConstraint.java b/core/api/src/main/java/org/onosproject/net/intent/constraint/BooleanConstraint.java
index 4e9fc9a..1a46754 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/constraint/BooleanConstraint.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/constraint/BooleanConstraint.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent.constraint;
+package org.onosproject.net.intent.constraint;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.Path;
-import org.onlab.onos.net.intent.Constraint;
-import org.onlab.onos.net.resource.LinkResourceService;
+import org.onosproject.net.Link;
+import org.onosproject.net.Path;
+import org.onosproject.net.intent.Constraint;
+import org.onosproject.net.resource.LinkResourceService;
/**
* Abstract base class for various constraints that evaluate link viability
diff --git a/core/api/src/main/java/org/onosproject/net/intent/constraint/LambdaConstraint.java b/core/api/src/main/java/org/onosproject/net/intent/constraint/LambdaConstraint.java
index ab88c92..dfca98b 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/constraint/LambdaConstraint.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/constraint/LambdaConstraint.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent.constraint;
+package org.onosproject.net.intent.constraint;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.resource.Lambda;
-import org.onlab.onos.net.resource.LinkResourceService;
-import org.onlab.onos.net.resource.ResourceRequest;
-import org.onlab.onos.net.resource.ResourceType;
+import org.onosproject.net.Link;
+import org.onosproject.net.resource.Lambda;
+import org.onosproject.net.resource.LinkResourceService;
+import org.onosproject.net.resource.ResourceRequest;
+import org.onosproject.net.resource.ResourceType;
import java.util.Objects;
diff --git a/core/api/src/main/java/org/onosproject/net/intent/constraint/LatencyConstraint.java b/core/api/src/main/java/org/onosproject/net/intent/constraint/LatencyConstraint.java
index e4b4432..c3f5488 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/constraint/LatencyConstraint.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/constraint/LatencyConstraint.java
@@ -13,20 +13,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent.constraint;
+package org.onosproject.net.intent.constraint;
import com.google.common.base.MoreObjects;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.Path;
-import org.onlab.onos.net.intent.Constraint;
-import org.onlab.onos.net.resource.LinkResourceService;
+import org.onosproject.net.Link;
+import org.onosproject.net.Path;
+import org.onosproject.net.intent.Constraint;
+import org.onosproject.net.resource.LinkResourceService;
import java.time.Duration;
import java.time.temporal.ChronoUnit;
import java.util.Objects;
-import static org.onlab.onos.net.AnnotationKeys.LATENCY;
-import static org.onlab.onos.net.AnnotationKeys.getAnnotatedValue;
+import static org.onosproject.net.AnnotationKeys.LATENCY;
+import static org.onosproject.net.AnnotationKeys.getAnnotatedValue;
/**
* Constraint that evaluates the latency through a path.
diff --git a/core/api/src/main/java/org/onosproject/net/intent/constraint/LinkTypeConstraint.java b/core/api/src/main/java/org/onosproject/net/intent/constraint/LinkTypeConstraint.java
index 7d44b4d..21048cf 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/constraint/LinkTypeConstraint.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/constraint/LinkTypeConstraint.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent.constraint;
+package org.onosproject.net.intent.constraint;
import com.google.common.collect.ImmutableSet;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.resource.LinkResourceService;
+import org.onosproject.net.Link;
+import org.onosproject.net.resource.LinkResourceService;
import java.util.Objects;
import java.util.Set;
diff --git a/core/api/src/main/java/org/onosproject/net/intent/constraint/ObstacleConstraint.java b/core/api/src/main/java/org/onosproject/net/intent/constraint/ObstacleConstraint.java
index 8472f3c..b6aceba 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/constraint/ObstacleConstraint.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/constraint/ObstacleConstraint.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent.constraint;
+package org.onosproject.net.intent.constraint;
import com.google.common.base.MoreObjects;
import com.google.common.collect.ImmutableSet;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.resource.LinkResourceService;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Link;
+import org.onosproject.net.resource.LinkResourceService;
import java.util.Collections;
import java.util.Objects;
diff --git a/core/api/src/main/java/org/onosproject/net/intent/constraint/WaypointConstraint.java b/core/api/src/main/java/org/onosproject/net/intent/constraint/WaypointConstraint.java
index 9e3cc20..49a52ec 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/constraint/WaypointConstraint.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/constraint/WaypointConstraint.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent.constraint;
+package org.onosproject.net.intent.constraint;
import com.google.common.base.MoreObjects;
import com.google.common.collect.ImmutableList;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.Path;
-import org.onlab.onos.net.intent.Constraint;
-import org.onlab.onos.net.resource.LinkResourceService;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Link;
+import org.onosproject.net.Path;
+import org.onosproject.net.intent.Constraint;
+import org.onosproject.net.resource.LinkResourceService;
import java.util.Collections;
import java.util.LinkedList;
diff --git a/core/api/src/main/java/org/onosproject/net/intent/constraint/package-info.java b/core/api/src/main/java/org/onosproject/net/intent/constraint/package-info.java
index 762d6d1..60d8df1 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/constraint/package-info.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/constraint/package-info.java
@@ -17,4 +17,4 @@
/**
* Definitions of constraints used to refine intent specifications.
*/
-package org.onlab.onos.net.intent.constraint;
+package org.onosproject.net.intent.constraint;
diff --git a/core/api/src/main/java/org/onosproject/net/intent/package-info.java b/core/api/src/main/java/org/onosproject/net/intent/package-info.java
index 03d4807..4bfbbea 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/package-info.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/package-info.java
@@ -75,4 +75,4 @@
* performs global recomputation/optimization across all prior intents.
* </p>
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
diff --git a/core/api/src/main/java/org/onosproject/net/link/DefaultLinkDescription.java b/core/api/src/main/java/org/onosproject/net/link/DefaultLinkDescription.java
index 986eb0a..891eb65 100644
--- a/core/api/src/main/java/org/onosproject/net/link/DefaultLinkDescription.java
+++ b/core/api/src/main/java/org/onosproject/net/link/DefaultLinkDescription.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.link;
+package org.onosproject.net.link;
import com.google.common.base.MoreObjects;
-import org.onlab.onos.net.AbstractDescription;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.SparseAnnotations;
+import org.onosproject.net.AbstractDescription;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.Link;
+import org.onosproject.net.SparseAnnotations;
/**
* Default implementation of immutable link description entity.
diff --git a/core/api/src/main/java/org/onosproject/net/link/LinkAdminService.java b/core/api/src/main/java/org/onosproject/net/link/LinkAdminService.java
index 8517470..8ad8a07 100644
--- a/core/api/src/main/java/org/onosproject/net/link/LinkAdminService.java
+++ b/core/api/src/main/java/org/onosproject/net/link/LinkAdminService.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.link;
+package org.onosproject.net.link;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.DeviceId;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DeviceId;
/**
* Service for administering the inventory of infrastructure links.
diff --git a/core/api/src/main/java/org/onosproject/net/link/LinkDescription.java b/core/api/src/main/java/org/onosproject/net/link/LinkDescription.java
index 3078243..f85718b 100644
--- a/core/api/src/main/java/org/onosproject/net/link/LinkDescription.java
+++ b/core/api/src/main/java/org/onosproject/net/link/LinkDescription.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.link;
+package org.onosproject.net.link;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.Description;
-import org.onlab.onos.net.Link;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.Description;
+import org.onosproject.net.Link;
/**
* Describes an infrastructure link.
diff --git a/core/api/src/main/java/org/onosproject/net/link/LinkEvent.java b/core/api/src/main/java/org/onosproject/net/link/LinkEvent.java
index 763e95e..d87bce0 100644
--- a/core/api/src/main/java/org/onosproject/net/link/LinkEvent.java
+++ b/core/api/src/main/java/org/onosproject/net/link/LinkEvent.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.link;
+package org.onosproject.net.link;
-import org.onlab.onos.event.AbstractEvent;
-import org.onlab.onos.net.Link;
+import org.onosproject.event.AbstractEvent;
+import org.onosproject.net.Link;
/**
* Describes infrastructure link event.
diff --git a/core/api/src/main/java/org/onosproject/net/link/LinkListener.java b/core/api/src/main/java/org/onosproject/net/link/LinkListener.java
index 35d701b..82f6bdb 100644
--- a/core/api/src/main/java/org/onosproject/net/link/LinkListener.java
+++ b/core/api/src/main/java/org/onosproject/net/link/LinkListener.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.link;
+package org.onosproject.net.link;
-import org.onlab.onos.event.EventListener;
+import org.onosproject.event.EventListener;
/**
* Entity capable of receiving infrastructure link related events.
diff --git a/core/api/src/main/java/org/onosproject/net/link/LinkProvider.java b/core/api/src/main/java/org/onosproject/net/link/LinkProvider.java
index 7982089..ed4348c 100644
--- a/core/api/src/main/java/org/onosproject/net/link/LinkProvider.java
+++ b/core/api/src/main/java/org/onosproject/net/link/LinkProvider.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.link;
+package org.onosproject.net.link;
-import org.onlab.onos.net.provider.Provider;
+import org.onosproject.net.provider.Provider;
/**
* Abstraction of an entity providing information about infrastructure links
diff --git a/core/api/src/main/java/org/onosproject/net/link/LinkProviderRegistry.java b/core/api/src/main/java/org/onosproject/net/link/LinkProviderRegistry.java
index 069433c..57a05d9 100644
--- a/core/api/src/main/java/org/onosproject/net/link/LinkProviderRegistry.java
+++ b/core/api/src/main/java/org/onosproject/net/link/LinkProviderRegistry.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.link;
+package org.onosproject.net.link;
-import org.onlab.onos.net.provider.ProviderRegistry;
+import org.onosproject.net.provider.ProviderRegistry;
/**
* Abstraction of an infrastructure link provider registry.
diff --git a/core/api/src/main/java/org/onosproject/net/link/LinkProviderService.java b/core/api/src/main/java/org/onosproject/net/link/LinkProviderService.java
index a512dd1..f5ef52a 100644
--- a/core/api/src/main/java/org/onosproject/net/link/LinkProviderService.java
+++ b/core/api/src/main/java/org/onosproject/net/link/LinkProviderService.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.link;
+package org.onosproject.net.link;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.provider.ProviderService;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.provider.ProviderService;
/**
* Means for injecting link information into the core.
diff --git a/core/api/src/main/java/org/onosproject/net/link/LinkService.java b/core/api/src/main/java/org/onosproject/net/link/LinkService.java
index 58b01bf..5cae77b 100644
--- a/core/api/src/main/java/org/onosproject/net/link/LinkService.java
+++ b/core/api/src/main/java/org/onosproject/net/link/LinkService.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.link;
+package org.onosproject.net.link;
import java.util.Set;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.Link;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Link;
/**
* Service for interacting with the inventory of infrastructure links.
diff --git a/core/api/src/main/java/org/onosproject/net/link/LinkStore.java b/core/api/src/main/java/org/onosproject/net/link/LinkStore.java
index 3af4f9f..6955024 100644
--- a/core/api/src/main/java/org/onosproject/net/link/LinkStore.java
+++ b/core/api/src/main/java/org/onosproject/net/link/LinkStore.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.link;
+package org.onosproject.net.link;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.onos.store.Store;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Link;
+import org.onosproject.net.provider.ProviderId;
+import org.onosproject.store.Store;
import java.util.Set;
diff --git a/core/api/src/main/java/org/onosproject/net/link/LinkStoreDelegate.java b/core/api/src/main/java/org/onosproject/net/link/LinkStoreDelegate.java
index 6b3ca33..1f66dd4 100644
--- a/core/api/src/main/java/org/onosproject/net/link/LinkStoreDelegate.java
+++ b/core/api/src/main/java/org/onosproject/net/link/LinkStoreDelegate.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.link;
+package org.onosproject.net.link;
-import org.onlab.onos.store.StoreDelegate;
+import org.onosproject.store.StoreDelegate;
/**
* Infrastructure link store delegate abstraction.
diff --git a/core/api/src/main/java/org/onosproject/net/link/package-info.java b/core/api/src/main/java/org/onosproject/net/link/package-info.java
index 5465383..57aa5fa 100644
--- a/core/api/src/main/java/org/onosproject/net/link/package-info.java
+++ b/core/api/src/main/java/org/onosproject/net/link/package-info.java
@@ -17,4 +17,4 @@
/**
* Infrastructure link model & related services API definitions.
*/
-package org.onlab.onos.net.link;
+package org.onosproject.net.link;
diff --git a/core/api/src/main/java/org/onosproject/net/package-info.java b/core/api/src/main/java/org/onosproject/net/package-info.java
index 28c6aa3..34b4de2 100644
--- a/core/api/src/main/java/org/onosproject/net/package-info.java
+++ b/core/api/src/main/java/org/onosproject/net/package-info.java
@@ -17,4 +17,4 @@
/**
* Network model entities & service API definitions.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
diff --git a/core/api/src/main/java/org/onosproject/net/packet/DefaultInboundPacket.java b/core/api/src/main/java/org/onosproject/net/packet/DefaultInboundPacket.java
index 68e08ad..96f872f 100644
--- a/core/api/src/main/java/org/onosproject/net/packet/DefaultInboundPacket.java
+++ b/core/api/src/main/java/org/onosproject/net/packet/DefaultInboundPacket.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.packet;
+package org.onosproject.net.packet;
-import org.onlab.onos.net.ConnectPoint;
+import org.onosproject.net.ConnectPoint;
import org.onlab.packet.Ethernet;
import java.nio.ByteBuffer;
diff --git a/core/api/src/main/java/org/onosproject/net/packet/DefaultOutboundPacket.java b/core/api/src/main/java/org/onosproject/net/packet/DefaultOutboundPacket.java
index 624f0d8..5bd4c98 100644
--- a/core/api/src/main/java/org/onosproject/net/packet/DefaultOutboundPacket.java
+++ b/core/api/src/main/java/org/onosproject/net/packet/DefaultOutboundPacket.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.packet;
+package org.onosproject.net.packet;
import java.nio.ByteBuffer;
import java.util.Objects;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.flow.TrafficTreatment;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.flow.TrafficTreatment;
import com.google.common.base.MoreObjects;
diff --git a/core/api/src/main/java/org/onosproject/net/packet/DefaultPacketContext.java b/core/api/src/main/java/org/onosproject/net/packet/DefaultPacketContext.java
index 9a0eac3..eba8e8e 100644
--- a/core/api/src/main/java/org/onosproject/net/packet/DefaultPacketContext.java
+++ b/core/api/src/main/java/org/onosproject/net/packet/DefaultPacketContext.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.packet;
+package org.onosproject.net.packet;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.onlab.onos.net.flow.DefaultTrafficTreatment;
-import org.onlab.onos.net.flow.TrafficTreatment;
-import org.onlab.onos.net.flow.TrafficTreatment.Builder;
+import org.onosproject.net.flow.DefaultTrafficTreatment;
+import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.net.flow.TrafficTreatment.Builder;
public abstract class DefaultPacketContext implements PacketContext {
diff --git a/core/api/src/main/java/org/onosproject/net/packet/InboundPacket.java b/core/api/src/main/java/org/onosproject/net/packet/InboundPacket.java
index b0a2fdb..3fd5814 100644
--- a/core/api/src/main/java/org/onosproject/net/packet/InboundPacket.java
+++ b/core/api/src/main/java/org/onosproject/net/packet/InboundPacket.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.packet;
+package org.onosproject.net.packet;
-import org.onlab.onos.net.ConnectPoint;
+import org.onosproject.net.ConnectPoint;
import org.onlab.packet.Ethernet;
import java.nio.ByteBuffer;
diff --git a/core/api/src/main/java/org/onosproject/net/packet/OutboundPacket.java b/core/api/src/main/java/org/onosproject/net/packet/OutboundPacket.java
index 00224c9..9e9329f 100644
--- a/core/api/src/main/java/org/onosproject/net/packet/OutboundPacket.java
+++ b/core/api/src/main/java/org/onosproject/net/packet/OutboundPacket.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.packet;
+package org.onosproject.net.packet;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.flow.TrafficTreatment;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.flow.TrafficTreatment;
import java.nio.ByteBuffer;
diff --git a/core/api/src/main/java/org/onosproject/net/packet/PacketContext.java b/core/api/src/main/java/org/onosproject/net/packet/PacketContext.java
index 3e1b3c7..004adc87 100644
--- a/core/api/src/main/java/org/onosproject/net/packet/PacketContext.java
+++ b/core/api/src/main/java/org/onosproject/net/packet/PacketContext.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.packet;
+package org.onosproject.net.packet;
-import org.onlab.onos.net.flow.TrafficTreatment;
+import org.onosproject.net.flow.TrafficTreatment;
/**
* Represents context for processing an inbound packet, and (optionally)
diff --git a/core/api/src/main/java/org/onosproject/net/packet/PacketEvent.java b/core/api/src/main/java/org/onosproject/net/packet/PacketEvent.java
index e604e53..7b0a5ed 100644
--- a/core/api/src/main/java/org/onosproject/net/packet/PacketEvent.java
+++ b/core/api/src/main/java/org/onosproject/net/packet/PacketEvent.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.packet;
+package org.onosproject.net.packet;
-import org.onlab.onos.event.AbstractEvent;
+import org.onosproject.event.AbstractEvent;
/**
* Describes a packet event.
diff --git a/core/api/src/main/java/org/onosproject/net/packet/PacketProcessor.java b/core/api/src/main/java/org/onosproject/net/packet/PacketProcessor.java
index 9735c33..a0516be 100644
--- a/core/api/src/main/java/org/onosproject/net/packet/PacketProcessor.java
+++ b/core/api/src/main/java/org/onosproject/net/packet/PacketProcessor.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.packet;
+package org.onosproject.net.packet;
diff --git a/core/api/src/main/java/org/onosproject/net/packet/PacketProvider.java b/core/api/src/main/java/org/onosproject/net/packet/PacketProvider.java
index 4c8aac9..8d55f0d 100644
--- a/core/api/src/main/java/org/onosproject/net/packet/PacketProvider.java
+++ b/core/api/src/main/java/org/onosproject/net/packet/PacketProvider.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.packet;
+package org.onosproject.net.packet;
-import org.onlab.onos.net.provider.Provider;
+import org.onosproject.net.provider.Provider;
/**
* Abstraction of a packet provider capable of emitting packets.
diff --git a/core/api/src/main/java/org/onosproject/net/packet/PacketProviderRegistry.java b/core/api/src/main/java/org/onosproject/net/packet/PacketProviderRegistry.java
index 9efc9d7..6e73253 100644
--- a/core/api/src/main/java/org/onosproject/net/packet/PacketProviderRegistry.java
+++ b/core/api/src/main/java/org/onosproject/net/packet/PacketProviderRegistry.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.packet;
+package org.onosproject.net.packet;
-import org.onlab.onos.net.provider.ProviderRegistry;
+import org.onosproject.net.provider.ProviderRegistry;
/**
* Abstraction of an infrastructure packet provider registry.
diff --git a/core/api/src/main/java/org/onosproject/net/packet/PacketProviderService.java b/core/api/src/main/java/org/onosproject/net/packet/PacketProviderService.java
index 1fb2f14..1aaee65 100644
--- a/core/api/src/main/java/org/onosproject/net/packet/PacketProviderService.java
+++ b/core/api/src/main/java/org/onosproject/net/packet/PacketProviderService.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.packet;
+package org.onosproject.net.packet;
-import org.onlab.onos.net.provider.ProviderService;
+import org.onosproject.net.provider.ProviderService;
/**
* Entity capable of processing inbound packets.
diff --git a/core/api/src/main/java/org/onosproject/net/packet/PacketService.java b/core/api/src/main/java/org/onosproject/net/packet/PacketService.java
index 721cb46..d4780e1 100644
--- a/core/api/src/main/java/org/onosproject/net/packet/PacketService.java
+++ b/core/api/src/main/java/org/onosproject/net/packet/PacketService.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.packet;
+package org.onosproject.net.packet;
/**
* Service for intercepting data plane packets and for emitting synthetic
diff --git a/core/api/src/main/java/org/onosproject/net/packet/PacketStore.java b/core/api/src/main/java/org/onosproject/net/packet/PacketStore.java
index 6d00d65..c38605d 100644
--- a/core/api/src/main/java/org/onosproject/net/packet/PacketStore.java
+++ b/core/api/src/main/java/org/onosproject/net/packet/PacketStore.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.packet;
+package org.onosproject.net.packet;
-import org.onlab.onos.store.Store;
+import org.onosproject.store.Store;
/**
* Manages routing of outbound packets.
diff --git a/core/api/src/main/java/org/onosproject/net/packet/PacketStoreDelegate.java b/core/api/src/main/java/org/onosproject/net/packet/PacketStoreDelegate.java
index 6e19ad2..bf5c3cc 100644
--- a/core/api/src/main/java/org/onosproject/net/packet/PacketStoreDelegate.java
+++ b/core/api/src/main/java/org/onosproject/net/packet/PacketStoreDelegate.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.packet;
+package org.onosproject.net.packet;
-import org.onlab.onos.store.StoreDelegate;
+import org.onosproject.store.StoreDelegate;
/**
* Packet store delegate abstraction.
diff --git a/core/api/src/main/java/org/onosproject/net/packet/package-info.java b/core/api/src/main/java/org/onosproject/net/packet/package-info.java
index f2b760e..0b9ea37 100644
--- a/core/api/src/main/java/org/onosproject/net/packet/package-info.java
+++ b/core/api/src/main/java/org/onosproject/net/packet/package-info.java
@@ -18,4 +18,4 @@
* Mechanism for processing inbound packets intercepted from the data plane and
* for emitting outbound packets onto the data plane.
*/
-package org.onlab.onos.net.packet;
+package org.onosproject.net.packet;
diff --git a/core/api/src/main/java/org/onosproject/net/provider/AbstractProvider.java b/core/api/src/main/java/org/onosproject/net/provider/AbstractProvider.java
index acf9f3e..a4926dd 100644
--- a/core/api/src/main/java/org/onosproject/net/provider/AbstractProvider.java
+++ b/core/api/src/main/java/org/onosproject/net/provider/AbstractProvider.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.provider;
+package org.onosproject.net.provider;
/**
* Base provider implementation.
diff --git a/core/api/src/main/java/org/onosproject/net/provider/AbstractProviderRegistry.java b/core/api/src/main/java/org/onosproject/net/provider/AbstractProviderRegistry.java
index c4a3234..bcf5fae 100644
--- a/core/api/src/main/java/org/onosproject/net/provider/AbstractProviderRegistry.java
+++ b/core/api/src/main/java/org/onosproject/net/provider/AbstractProviderRegistry.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.provider;
+package org.onosproject.net.provider;
import com.google.common.collect.ImmutableSet;
-import org.onlab.onos.net.DeviceId;
+import org.onosproject.net.DeviceId;
import java.util.HashMap;
import java.util.Map;
diff --git a/core/api/src/main/java/org/onosproject/net/provider/AbstractProviderService.java b/core/api/src/main/java/org/onosproject/net/provider/AbstractProviderService.java
index 88932f4..6c926d8 100644
--- a/core/api/src/main/java/org/onosproject/net/provider/AbstractProviderService.java
+++ b/core/api/src/main/java/org/onosproject/net/provider/AbstractProviderService.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.provider;
+package org.onosproject.net.provider;
import static com.google.common.base.Preconditions.checkState;
diff --git a/core/api/src/main/java/org/onosproject/net/provider/Provider.java b/core/api/src/main/java/org/onosproject/net/provider/Provider.java
index 8b6e187..84465ab 100644
--- a/core/api/src/main/java/org/onosproject/net/provider/Provider.java
+++ b/core/api/src/main/java/org/onosproject/net/provider/Provider.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.provider;
+package org.onosproject.net.provider;
/**
* Abstraction of a provider of information about network environment.
diff --git a/core/api/src/main/java/org/onosproject/net/provider/ProviderId.java b/core/api/src/main/java/org/onosproject/net/provider/ProviderId.java
index 62207d9..2c959af 100644
--- a/core/api/src/main/java/org/onosproject/net/provider/ProviderId.java
+++ b/core/api/src/main/java/org/onosproject/net/provider/ProviderId.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.provider;
+package org.onosproject.net.provider;
import java.util.Objects;
@@ -21,7 +21,7 @@
import static com.google.common.base.Preconditions.checkNotNull;
/**
- * External identity of a {@link org.onlab.onos.net.provider.Provider} family.
+ * External identity of a {@link org.onosproject.net.provider.Provider} family.
* It also carriers two designations of external characteristics, the URI
* scheme and primary/ancillary indicator.
* <p>
@@ -30,7 +30,7 @@
* a provider as a primary or ancillary.
* </p>
* <p>
- * A {@link org.onlab.onos.net.provider.ProviderRegistry} uses this designation
+ * A {@link org.onosproject.net.provider.ProviderRegistry} uses this designation
* to permit only one primary provider per device URI scheme. Multiple
* ancillary providers can register with the same device URI scheme however.
* </p>
@@ -56,7 +56,7 @@
/**
* Creates a new primary provider identifier from the specified string.
* The providers are expected to follow the reverse DNS convention, e.g.
- * {@code org.onlab.onos.provider.of.device}
+ * {@code org.onosproject.provider.of.device}
*
* @param scheme device URI scheme to which this provider is bound, e.g. "of", "snmp"
* @param id string identifier
@@ -68,7 +68,7 @@
/**
* Creates a new provider identifier from the specified string.
* The providers are expected to follow the reverse DNS convention, e.g.
- * {@code org.onlab.onos.provider.of.device}
+ * {@code org.onosproject.provider.of.device}
*
* @param scheme device URI scheme to which this provider is bound, e.g. "of", "snmp"
* @param id string identifier
diff --git a/core/api/src/main/java/org/onosproject/net/provider/ProviderRegistry.java b/core/api/src/main/java/org/onosproject/net/provider/ProviderRegistry.java
index 8cab8a8..3c2009a 100644
--- a/core/api/src/main/java/org/onosproject/net/provider/ProviderRegistry.java
+++ b/core/api/src/main/java/org/onosproject/net/provider/ProviderRegistry.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.provider;
+package org.onosproject.net.provider;
import java.util.Set;
diff --git a/core/api/src/main/java/org/onosproject/net/provider/ProviderService.java b/core/api/src/main/java/org/onosproject/net/provider/ProviderService.java
index 709f1c1..5c46927 100644
--- a/core/api/src/main/java/org/onosproject/net/provider/ProviderService.java
+++ b/core/api/src/main/java/org/onosproject/net/provider/ProviderService.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.provider;
+package org.onosproject.net.provider;
/**
* Abstraction of a service through which providers can inject information
diff --git a/core/api/src/main/java/org/onosproject/net/provider/package-info.java b/core/api/src/main/java/org/onosproject/net/provider/package-info.java
index 4406cee..d279f56 100644
--- a/core/api/src/main/java/org/onosproject/net/provider/package-info.java
+++ b/core/api/src/main/java/org/onosproject/net/provider/package-info.java
@@ -17,4 +17,4 @@
/**
* Base abstractions related to network entity providers and their brokers.
*/
-package org.onlab.onos.net.provider;
+package org.onosproject.net.provider;
diff --git a/core/api/src/main/java/org/onosproject/net/proxyarp/ProxyArpService.java b/core/api/src/main/java/org/onosproject/net/proxyarp/ProxyArpService.java
index 509c6ac..8ed4a61 100644
--- a/core/api/src/main/java/org/onosproject/net/proxyarp/ProxyArpService.java
+++ b/core/api/src/main/java/org/onosproject/net/proxyarp/ProxyArpService.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.proxyarp;
+package org.onosproject.net.proxyarp;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.packet.PacketContext;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.packet.PacketContext;
import org.onlab.packet.Ethernet;
import org.onlab.packet.Ip4Address;
diff --git a/core/api/src/main/java/org/onosproject/net/proxyarp/package-info.java b/core/api/src/main/java/org/onosproject/net/proxyarp/package-info.java
index 95ad6f5..6ddd492 100644
--- a/core/api/src/main/java/org/onosproject/net/proxyarp/package-info.java
+++ b/core/api/src/main/java/org/onosproject/net/proxyarp/package-info.java
@@ -17,4 +17,4 @@
/**
* Base abstractions related to the proxy arp service.
*/
-package org.onlab.onos.net.proxyarp;
+package org.onosproject.net.proxyarp;
diff --git a/core/api/src/main/java/org/onosproject/net/resource/Bandwidth.java b/core/api/src/main/java/org/onosproject/net/resource/Bandwidth.java
index 8b84059..19ceff4 100644
--- a/core/api/src/main/java/org/onosproject/net/resource/Bandwidth.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/Bandwidth.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.resource;
+package org.onosproject.net.resource;
import java.util.Objects;
diff --git a/core/api/src/main/java/org/onosproject/net/resource/BandwidthResourceAllocation.java b/core/api/src/main/java/org/onosproject/net/resource/BandwidthResourceAllocation.java
index 62051ad..b2628aa 100644
--- a/core/api/src/main/java/org/onosproject/net/resource/BandwidthResourceAllocation.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/BandwidthResourceAllocation.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.resource;
+package org.onosproject.net.resource;
import com.google.common.base.MoreObjects;
diff --git a/core/api/src/main/java/org/onosproject/net/resource/BandwidthResourceRequest.java b/core/api/src/main/java/org/onosproject/net/resource/BandwidthResourceRequest.java
index 52b4112..9acd200 100644
--- a/core/api/src/main/java/org/onosproject/net/resource/BandwidthResourceRequest.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/BandwidthResourceRequest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.resource;
+package org.onosproject.net.resource;
import com.google.common.base.MoreObjects;
diff --git a/core/api/src/main/java/org/onosproject/net/resource/DefaultLinkResourceAllocations.java b/core/api/src/main/java/org/onosproject/net/resource/DefaultLinkResourceAllocations.java
index 51515e7..b2c8fa1 100644
--- a/core/api/src/main/java/org/onosproject/net/resource/DefaultLinkResourceAllocations.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/DefaultLinkResourceAllocations.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.resource;
+package org.onosproject.net.resource;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -21,8 +21,8 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.intent.IntentId;
+import org.onosproject.net.Link;
+import org.onosproject.net.intent.IntentId;
import java.util.Collection;
import java.util.Collections;
diff --git a/core/api/src/main/java/org/onosproject/net/resource/DefaultLinkResourceRequest.java b/core/api/src/main/java/org/onosproject/net/resource/DefaultLinkResourceRequest.java
index c3f5c28..f4169de 100644
--- a/core/api/src/main/java/org/onosproject/net/resource/DefaultLinkResourceRequest.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/DefaultLinkResourceRequest.java
@@ -13,19 +13,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.resource;
+package org.onosproject.net.resource;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.intent.Constraint;
-import org.onlab.onos.net.intent.IntentId;
+import org.onosproject.net.Link;
+import org.onosproject.net.intent.Constraint;
+import org.onosproject.net.intent.IntentId;
import com.google.common.collect.ImmutableSet;
-import org.onlab.onos.net.intent.constraint.BandwidthConstraint;
-import org.onlab.onos.net.intent.constraint.LambdaConstraint;
+import org.onosproject.net.intent.constraint.BandwidthConstraint;
+import org.onosproject.net.intent.constraint.LambdaConstraint;
/**
* Implementation of {@link LinkResourceRequest}.
diff --git a/core/api/src/main/java/org/onosproject/net/resource/Lambda.java b/core/api/src/main/java/org/onosproject/net/resource/Lambda.java
index d179d64..be03254 100644
--- a/core/api/src/main/java/org/onosproject/net/resource/Lambda.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/Lambda.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.resource;
+package org.onosproject.net.resource;
import java.util.Objects;
diff --git a/core/api/src/main/java/org/onosproject/net/resource/LambdaResourceAllocation.java b/core/api/src/main/java/org/onosproject/net/resource/LambdaResourceAllocation.java
index 9032cc4..e564059 100644
--- a/core/api/src/main/java/org/onosproject/net/resource/LambdaResourceAllocation.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/LambdaResourceAllocation.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.resource;
+package org.onosproject.net.resource;
import com.google.common.base.MoreObjects;
diff --git a/core/api/src/main/java/org/onosproject/net/resource/LambdaResourceRequest.java b/core/api/src/main/java/org/onosproject/net/resource/LambdaResourceRequest.java
index dab8793..de64a17 100644
--- a/core/api/src/main/java/org/onosproject/net/resource/LambdaResourceRequest.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/LambdaResourceRequest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.resource;
+package org.onosproject.net.resource;
import com.google.common.base.MoreObjects;
diff --git a/core/api/src/main/java/org/onosproject/net/resource/LinkResource.java b/core/api/src/main/java/org/onosproject/net/resource/LinkResource.java
index 58935a4..2c83dab 100644
--- a/core/api/src/main/java/org/onosproject/net/resource/LinkResource.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/LinkResource.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.resource;
+package org.onosproject.net.resource;
/**
* Abstraction of link resource.
diff --git a/core/api/src/main/java/org/onosproject/net/resource/LinkResourceAllocations.java b/core/api/src/main/java/org/onosproject/net/resource/LinkResourceAllocations.java
index 7bd8a02..ebca82a 100644
--- a/core/api/src/main/java/org/onosproject/net/resource/LinkResourceAllocations.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/LinkResourceAllocations.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.resource;
+package org.onosproject.net.resource;
import java.util.Set;
-import org.onlab.onos.net.Link;
+import org.onosproject.net.Link;
/**
* Representation of allocated link resources.
diff --git a/core/api/src/main/java/org/onosproject/net/resource/LinkResourceEvent.java b/core/api/src/main/java/org/onosproject/net/resource/LinkResourceEvent.java
index 0428864..d98e9c4 100644
--- a/core/api/src/main/java/org/onosproject/net/resource/LinkResourceEvent.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/LinkResourceEvent.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.resource;
+package org.onosproject.net.resource;
import java.util.Collection;
-import org.onlab.onos.event.AbstractEvent;
+import org.onosproject.event.AbstractEvent;
import com.google.common.collect.ImmutableList;
diff --git a/core/api/src/main/java/org/onosproject/net/resource/LinkResourceListener.java b/core/api/src/main/java/org/onosproject/net/resource/LinkResourceListener.java
index 11aacc1..80545b4 100644
--- a/core/api/src/main/java/org/onosproject/net/resource/LinkResourceListener.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/LinkResourceListener.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.resource;
+package org.onosproject.net.resource;
-import org.onlab.onos.event.EventListener;
+import org.onosproject.event.EventListener;
/**
* Entity for receiving link resource events.
diff --git a/core/api/src/main/java/org/onosproject/net/resource/LinkResourceRequest.java b/core/api/src/main/java/org/onosproject/net/resource/LinkResourceRequest.java
index 23a0c30..1172401 100644
--- a/core/api/src/main/java/org/onosproject/net/resource/LinkResourceRequest.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/LinkResourceRequest.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.resource;
+package org.onosproject.net.resource;
import java.util.Collection;
import java.util.Set;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.intent.Constraint;
-import org.onlab.onos.net.intent.IntentId;
+import org.onosproject.net.Link;
+import org.onosproject.net.intent.Constraint;
+import org.onosproject.net.intent.IntentId;
/**
* Representation of a request for link resource.
diff --git a/core/api/src/main/java/org/onosproject/net/resource/LinkResourceService.java b/core/api/src/main/java/org/onosproject/net/resource/LinkResourceService.java
index b4dfa62..1d1e697 100644
--- a/core/api/src/main/java/org/onosproject/net/resource/LinkResourceService.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/LinkResourceService.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.resource;
+package org.onosproject.net.resource;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.intent.IntentId;
+import org.onosproject.net.Link;
+import org.onosproject.net.intent.IntentId;
/**
* Service for providing link resource allocation.
diff --git a/core/api/src/main/java/org/onosproject/net/resource/LinkResourceStore.java b/core/api/src/main/java/org/onosproject/net/resource/LinkResourceStore.java
index 79f7a3e..0ddf38e 100644
--- a/core/api/src/main/java/org/onosproject/net/resource/LinkResourceStore.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/LinkResourceStore.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.resource;
+package org.onosproject.net.resource;
import java.util.Set;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.intent.IntentId;
+import org.onosproject.net.Link;
+import org.onosproject.net.intent.IntentId;
/**
* Manages link resources.
diff --git a/core/api/src/main/java/org/onosproject/net/resource/LinkResourceStoreDelegate.java b/core/api/src/main/java/org/onosproject/net/resource/LinkResourceStoreDelegate.java
index be12e04..e108349 100644
--- a/core/api/src/main/java/org/onosproject/net/resource/LinkResourceStoreDelegate.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/LinkResourceStoreDelegate.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.resource;
+package org.onosproject.net.resource;
-import org.onlab.onos.store.StoreDelegate;
+import org.onosproject.store.StoreDelegate;
/**
* Link resource store delegate abstraction.
diff --git a/core/api/src/main/java/org/onosproject/net/resource/LinkResources.java b/core/api/src/main/java/org/onosproject/net/resource/LinkResources.java
index e305cea..7352afa 100644
--- a/core/api/src/main/java/org/onosproject/net/resource/LinkResources.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/LinkResources.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.resource;
+package org.onosproject.net.resource;
import java.util.Set;
diff --git a/core/api/src/main/java/org/onosproject/net/resource/ResourceAllocation.java b/core/api/src/main/java/org/onosproject/net/resource/ResourceAllocation.java
index ea3ce99..c1f3372 100644
--- a/core/api/src/main/java/org/onosproject/net/resource/ResourceAllocation.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/ResourceAllocation.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.resource;
+package org.onosproject.net.resource;
/**
* Abstraction of allocated resource.
diff --git a/core/api/src/main/java/org/onosproject/net/resource/ResourceId.java b/core/api/src/main/java/org/onosproject/net/resource/ResourceId.java
index 28a502e..3fbe1d7 100644
--- a/core/api/src/main/java/org/onosproject/net/resource/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.onlab.onos.net.resource;
+package org.onosproject.net.resource;
/**
* Representation of ID for allocated resource.
diff --git a/core/api/src/main/java/org/onosproject/net/resource/ResourceRequest.java b/core/api/src/main/java/org/onosproject/net/resource/ResourceRequest.java
index 75b983d..0d9e61e 100644
--- a/core/api/src/main/java/org/onosproject/net/resource/ResourceRequest.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/ResourceRequest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.resource;
+package org.onosproject.net.resource;
/**
* Abstraction of resource request.
diff --git a/core/api/src/main/java/org/onosproject/net/resource/ResourceType.java b/core/api/src/main/java/org/onosproject/net/resource/ResourceType.java
index 98d9b84..1ad0dde 100644
--- a/core/api/src/main/java/org/onosproject/net/resource/ResourceType.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/ResourceType.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.resource;
+package org.onosproject.net.resource;
/**
* Represents types for link resources.
diff --git a/core/api/src/main/java/org/onosproject/net/resource/package-info.java b/core/api/src/main/java/org/onosproject/net/resource/package-info.java
index 98ffbc6..a9b6035 100644
--- a/core/api/src/main/java/org/onosproject/net/resource/package-info.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/package-info.java
@@ -17,4 +17,4 @@
/**
* Services for reserving network resources, e.g. bandwidth, lambdas.
*/
-package org.onlab.onos.net.resource;
+package org.onosproject.net.resource;
diff --git a/core/api/src/main/java/org/onosproject/net/statistic/DefaultLoad.java b/core/api/src/main/java/org/onosproject/net/statistic/DefaultLoad.java
index b2771ac..908e7eb 100644
--- a/core/api/src/main/java/org/onosproject/net/statistic/DefaultLoad.java
+++ b/core/api/src/main/java/org/onosproject/net/statistic/DefaultLoad.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.statistic;
+package org.onosproject.net.statistic;
import com.google.common.base.MoreObjects;
-import org.onlab.onos.net.flow.FlowRuleProvider;
+import org.onosproject.net.flow.FlowRuleProvider;
/**
* Implementation of a load.
diff --git a/core/api/src/main/java/org/onosproject/net/statistic/Load.java b/core/api/src/main/java/org/onosproject/net/statistic/Load.java
index 6422cb3..38fed04 100644
--- a/core/api/src/main/java/org/onosproject/net/statistic/Load.java
+++ b/core/api/src/main/java/org/onosproject/net/statistic/Load.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.statistic;
+package org.onosproject.net.statistic;
/**
* Simple data repository for link load information.
diff --git a/core/api/src/main/java/org/onosproject/net/statistic/StatisticService.java b/core/api/src/main/java/org/onosproject/net/statistic/StatisticService.java
index de59886..b9f7cc9 100644
--- a/core/api/src/main/java/org/onosproject/net/statistic/StatisticService.java
+++ b/core/api/src/main/java/org/onosproject/net/statistic/StatisticService.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.statistic;
+package org.onosproject.net.statistic;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.core.GroupId;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.Path;
-import org.onlab.onos.net.flow.FlowRule;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.core.GroupId;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.Link;
+import org.onosproject.net.Path;
+import org.onosproject.net.flow.FlowRule;
import java.util.Optional;
@@ -35,7 +35,7 @@
* Obtain the load for a the ingress to the given link.
*
* @param link the link to query.
- * @return a {@link org.onlab.onos.net.statistic.Load Load}
+ * @return a {@link org.onosproject.net.statistic.Load Load}
*/
Load load(Link link);
@@ -43,7 +43,7 @@
* Obtain the load for the given port.
*
* @param connectPoint the port to query
- * @return a {@link org.onlab.onos.net.statistic.Load}
+ * @return a {@link org.onosproject.net.statistic.Load}
*/
Load load(ConnectPoint connectPoint);
@@ -51,7 +51,7 @@
* Find the most loaded link along a path.
*
* @param path the path to search in
- * @return the most loaded {@link org.onlab.onos.net.Link}.
+ * @return the most loaded {@link org.onosproject.net.Link}.
*/
Link max(Path path);
@@ -59,7 +59,7 @@
* Find the least loaded link along a path.
*
* @param path the path to search in
- * @return the least loaded {@link org.onlab.onos.net.Link}.
+ * @return the least loaded {@link org.onosproject.net.Link}.
*/
Link min(Path path);
diff --git a/core/api/src/main/java/org/onosproject/net/statistic/StatisticStore.java b/core/api/src/main/java/org/onosproject/net/statistic/StatisticStore.java
index 6eefdbe..8566ef5 100644
--- a/core/api/src/main/java/org/onosproject/net/statistic/StatisticStore.java
+++ b/core/api/src/main/java/org/onosproject/net/statistic/StatisticStore.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.statistic;
+package org.onosproject.net.statistic;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.flow.FlowEntry;
-import org.onlab.onos.net.flow.FlowRule;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.flow.FlowEntry;
+import org.onosproject.net.flow.FlowRule;
import java.util.Set;
@@ -29,21 +29,21 @@
/**
* Lay the foundation for receiving flow stats for this rule.
*
- * @param rule a {@link org.onlab.onos.net.flow.FlowRule}
+ * @param rule a {@link org.onosproject.net.flow.FlowRule}
*/
void prepareForStatistics(FlowRule rule);
/**
* Remove entries associated with this rule.
*
- * @param rule {@link org.onlab.onos.net.flow.FlowRule}
+ * @param rule {@link org.onosproject.net.flow.FlowRule}
*/
void removeFromStatistics(FlowRule rule);
/**
* Adds a stats observation for a flow rule.
*
- * @param rule a {@link org.onlab.onos.net.flow.FlowEntry}
+ * @param rule a {@link org.onosproject.net.flow.FlowEntry}
*/
void addOrUpdateStatistic(FlowEntry rule);
diff --git a/core/api/src/main/java/org/onosproject/net/statistic/package-info.java b/core/api/src/main/java/org/onosproject/net/statistic/package-info.java
index 26b6ad9..37889f3 100644
--- a/core/api/src/main/java/org/onosproject/net/statistic/package-info.java
+++ b/core/api/src/main/java/org/onosproject/net/statistic/package-info.java
@@ -17,4 +17,4 @@
/**
* Service for looking up statistics on links.
*/
-package org.onlab.onos.net.statistic;
\ No newline at end of file
+package org.onosproject.net.statistic;
diff --git a/core/api/src/main/java/org/onosproject/net/topology/ClusterId.java b/core/api/src/main/java/org/onosproject/net/topology/ClusterId.java
index 0a52062..676f006 100644
--- a/core/api/src/main/java/org/onosproject/net/topology/ClusterId.java
+++ b/core/api/src/main/java/org/onosproject/net/topology/ClusterId.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.topology;
+package org.onosproject.net.topology;
import java.util.Objects;
diff --git a/core/api/src/main/java/org/onosproject/net/topology/DefaultGraphDescription.java b/core/api/src/main/java/org/onosproject/net/topology/DefaultGraphDescription.java
index 5e4d050..0be8ae4 100644
--- a/core/api/src/main/java/org/onosproject/net/topology/DefaultGraphDescription.java
+++ b/core/api/src/main/java/org/onosproject/net/topology/DefaultGraphDescription.java
@@ -13,19 +13,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.topology;
+package org.onosproject.net.topology;
import static org.slf4j.LoggerFactory.getLogger;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
-import org.onlab.onos.net.AbstractDescription;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.Device;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.SparseAnnotations;
+import org.onosproject.net.AbstractDescription;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.Device;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Link;
+import org.onosproject.net.SparseAnnotations;
import org.slf4j.Logger;
import java.util.Map;
diff --git a/core/api/src/main/java/org/onosproject/net/topology/DefaultTopologyCluster.java b/core/api/src/main/java/org/onosproject/net/topology/DefaultTopologyCluster.java
index 190a392..9eadec1 100644
--- a/core/api/src/main/java/org/onosproject/net/topology/DefaultTopologyCluster.java
+++ b/core/api/src/main/java/org/onosproject/net/topology/DefaultTopologyCluster.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.topology;
+package org.onosproject.net.topology;
-import org.onlab.onos.net.DeviceId;
+import org.onosproject.net.DeviceId;
import java.util.Objects;
diff --git a/core/api/src/main/java/org/onosproject/net/topology/DefaultTopologyEdge.java b/core/api/src/main/java/org/onosproject/net/topology/DefaultTopologyEdge.java
index f6de3fe..dacb5fd 100644
--- a/core/api/src/main/java/org/onosproject/net/topology/DefaultTopologyEdge.java
+++ b/core/api/src/main/java/org/onosproject/net/topology/DefaultTopologyEdge.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.topology;
+package org.onosproject.net.topology;
-import org.onlab.onos.net.Link;
+import org.onosproject.net.Link;
import java.util.Objects;
diff --git a/core/api/src/main/java/org/onosproject/net/topology/DefaultTopologyVertex.java b/core/api/src/main/java/org/onosproject/net/topology/DefaultTopologyVertex.java
index c261fb0..07a09cb 100644
--- a/core/api/src/main/java/org/onosproject/net/topology/DefaultTopologyVertex.java
+++ b/core/api/src/main/java/org/onosproject/net/topology/DefaultTopologyVertex.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.topology;
+package org.onosproject.net.topology;
-import org.onlab.onos.net.DeviceId;
+import org.onosproject.net.DeviceId;
import java.util.Objects;
diff --git a/core/api/src/main/java/org/onosproject/net/topology/GraphDescription.java b/core/api/src/main/java/org/onosproject/net/topology/GraphDescription.java
index fcbe975..3a243df 100644
--- a/core/api/src/main/java/org/onosproject/net/topology/GraphDescription.java
+++ b/core/api/src/main/java/org/onosproject/net/topology/GraphDescription.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.topology;
+package org.onosproject.net.topology;
import com.google.common.collect.ImmutableSet;
-import org.onlab.onos.net.Description;
+import org.onosproject.net.Description;
/**
* Describes attribute(s) of a network graph.
diff --git a/core/api/src/main/java/org/onosproject/net/topology/LinkWeight.java b/core/api/src/main/java/org/onosproject/net/topology/LinkWeight.java
index 5f3becd..a19abd4 100644
--- a/core/api/src/main/java/org/onosproject/net/topology/LinkWeight.java
+++ b/core/api/src/main/java/org/onosproject/net/topology/LinkWeight.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.topology;
+package org.onosproject.net.topology;
import org.onlab.graph.EdgeWeight;
diff --git a/core/api/src/main/java/org/onosproject/net/topology/PathService.java b/core/api/src/main/java/org/onosproject/net/topology/PathService.java
index 1719285..be8c7cf 100644
--- a/core/api/src/main/java/org/onosproject/net/topology/PathService.java
+++ b/core/api/src/main/java/org/onosproject/net/topology/PathService.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.topology;
+package org.onosproject.net.topology;
-import org.onlab.onos.net.ElementId;
-import org.onlab.onos.net.Path;
+import org.onosproject.net.ElementId;
+import org.onosproject.net.Path;
import java.util.Set;
diff --git a/core/api/src/main/java/org/onosproject/net/topology/Topology.java b/core/api/src/main/java/org/onosproject/net/topology/Topology.java
index 182db10..d64f0b6 100644
--- a/core/api/src/main/java/org/onosproject/net/topology/Topology.java
+++ b/core/api/src/main/java/org/onosproject/net/topology/Topology.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.topology;
+package org.onosproject.net.topology;
-import org.onlab.onos.net.Provided;
+import org.onosproject.net.Provided;
/**
* Represents a network topology computation snapshot.
diff --git a/core/api/src/main/java/org/onosproject/net/topology/TopologyCluster.java b/core/api/src/main/java/org/onosproject/net/topology/TopologyCluster.java
index 05668b4..fe93c91 100644
--- a/core/api/src/main/java/org/onosproject/net/topology/TopologyCluster.java
+++ b/core/api/src/main/java/org/onosproject/net/topology/TopologyCluster.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.topology;
+package org.onosproject.net.topology;
-import org.onlab.onos.net.DeviceId;
+import org.onosproject.net.DeviceId;
/**
* Representation of an SCC (strongly-connected component) in a network topology.
diff --git a/core/api/src/main/java/org/onosproject/net/topology/TopologyEdge.java b/core/api/src/main/java/org/onosproject/net/topology/TopologyEdge.java
index 15ad81b..008c8c4 100644
--- a/core/api/src/main/java/org/onosproject/net/topology/TopologyEdge.java
+++ b/core/api/src/main/java/org/onosproject/net/topology/TopologyEdge.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.topology;
+package org.onosproject.net.topology;
import org.onlab.graph.Edge;
-import org.onlab.onos.net.Link;
+import org.onosproject.net.Link;
/**
* Represents an edge in the topology graph.
diff --git a/core/api/src/main/java/org/onosproject/net/topology/TopologyEvent.java b/core/api/src/main/java/org/onosproject/net/topology/TopologyEvent.java
index 38b9c13..10c8dfc 100644
--- a/core/api/src/main/java/org/onosproject/net/topology/TopologyEvent.java
+++ b/core/api/src/main/java/org/onosproject/net/topology/TopologyEvent.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.topology;
+package org.onosproject.net.topology;
-import org.onlab.onos.event.AbstractEvent;
-import org.onlab.onos.event.Event;
+import org.onosproject.event.AbstractEvent;
+import org.onosproject.event.Event;
import java.util.List;
diff --git a/core/api/src/main/java/org/onosproject/net/topology/TopologyGraph.java b/core/api/src/main/java/org/onosproject/net/topology/TopologyGraph.java
index c47bcc2..f3565fa 100644
--- a/core/api/src/main/java/org/onosproject/net/topology/TopologyGraph.java
+++ b/core/api/src/main/java/org/onosproject/net/topology/TopologyGraph.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.topology;
+package org.onosproject.net.topology;
import org.onlab.graph.Graph;
diff --git a/core/api/src/main/java/org/onosproject/net/topology/TopologyListener.java b/core/api/src/main/java/org/onosproject/net/topology/TopologyListener.java
index 39e7626..625587b 100644
--- a/core/api/src/main/java/org/onosproject/net/topology/TopologyListener.java
+++ b/core/api/src/main/java/org/onosproject/net/topology/TopologyListener.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.topology;
+package org.onosproject.net.topology;
-import org.onlab.onos.event.EventListener;
+import org.onosproject.event.EventListener;
/**
* Entity capable of receiving network topology related events.
diff --git a/core/api/src/main/java/org/onosproject/net/topology/TopologyProvider.java b/core/api/src/main/java/org/onosproject/net/topology/TopologyProvider.java
index c96ce58..f52b798 100644
--- a/core/api/src/main/java/org/onosproject/net/topology/TopologyProvider.java
+++ b/core/api/src/main/java/org/onosproject/net/topology/TopologyProvider.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.topology;
+package org.onosproject.net.topology;
-import org.onlab.onos.net.provider.Provider;
+import org.onosproject.net.provider.Provider;
/**
* Means for injecting topology information into the core.
diff --git a/core/api/src/main/java/org/onosproject/net/topology/TopologyProviderRegistry.java b/core/api/src/main/java/org/onosproject/net/topology/TopologyProviderRegistry.java
index 7c59bce..15eeed4 100644
--- a/core/api/src/main/java/org/onosproject/net/topology/TopologyProviderRegistry.java
+++ b/core/api/src/main/java/org/onosproject/net/topology/TopologyProviderRegistry.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.topology;
+package org.onosproject.net.topology;
-import org.onlab.onos.net.provider.ProviderRegistry;
+import org.onosproject.net.provider.ProviderRegistry;
/**
* Abstraction of a network topology provider registry.
diff --git a/core/api/src/main/java/org/onosproject/net/topology/TopologyProviderService.java b/core/api/src/main/java/org/onosproject/net/topology/TopologyProviderService.java
index 985a0cb..742110a 100644
--- a/core/api/src/main/java/org/onosproject/net/topology/TopologyProviderService.java
+++ b/core/api/src/main/java/org/onosproject/net/topology/TopologyProviderService.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.topology;
+package org.onosproject.net.topology;
-import org.onlab.onos.event.Event;
-import org.onlab.onos.net.provider.ProviderService;
+import org.onosproject.event.Event;
+import org.onosproject.net.provider.ProviderService;
import java.util.List;
diff --git a/core/api/src/main/java/org/onosproject/net/topology/TopologyService.java b/core/api/src/main/java/org/onosproject/net/topology/TopologyService.java
index 5d8bbdf..b17deb3 100644
--- a/core/api/src/main/java/org/onosproject/net/topology/TopologyService.java
+++ b/core/api/src/main/java/org/onosproject/net/topology/TopologyService.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.topology;
+package org.onosproject.net.topology;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.Path;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Link;
+import org.onosproject.net.Path;
import java.util.Set;
diff --git a/core/api/src/main/java/org/onosproject/net/topology/TopologyStore.java b/core/api/src/main/java/org/onosproject/net/topology/TopologyStore.java
index bdce044..983e616 100644
--- a/core/api/src/main/java/org/onosproject/net/topology/TopologyStore.java
+++ b/core/api/src/main/java/org/onosproject/net/topology/TopologyStore.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.topology;
+package org.onosproject.net.topology;
-import org.onlab.onos.event.Event;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.Path;
-import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.onos.store.Store;
+import org.onosproject.event.Event;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Link;
+import org.onosproject.net.Path;
+import org.onosproject.net.provider.ProviderId;
+import org.onosproject.store.Store;
import java.util.List;
import java.util.Set;
diff --git a/core/api/src/main/java/org/onosproject/net/topology/TopologyStoreDelegate.java b/core/api/src/main/java/org/onosproject/net/topology/TopologyStoreDelegate.java
index 25bbdca..c425970 100644
--- a/core/api/src/main/java/org/onosproject/net/topology/TopologyStoreDelegate.java
+++ b/core/api/src/main/java/org/onosproject/net/topology/TopologyStoreDelegate.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.topology;
+package org.onosproject.net.topology;
-import org.onlab.onos.store.StoreDelegate;
+import org.onosproject.store.StoreDelegate;
/**
* Topology store delegate abstraction.
diff --git a/core/api/src/main/java/org/onosproject/net/topology/TopologyVertex.java b/core/api/src/main/java/org/onosproject/net/topology/TopologyVertex.java
index f858953..9f37dcb 100644
--- a/core/api/src/main/java/org/onosproject/net/topology/TopologyVertex.java
+++ b/core/api/src/main/java/org/onosproject/net/topology/TopologyVertex.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.topology;
+package org.onosproject.net.topology;
import org.onlab.graph.Vertex;
-import org.onlab.onos.net.DeviceId;
+import org.onosproject.net.DeviceId;
/**
* Represents a vertex in the topology graph.
diff --git a/core/api/src/main/java/org/onosproject/net/topology/package-info.java b/core/api/src/main/java/org/onosproject/net/topology/package-info.java
index 02d3db3..3cd6ceb 100644
--- a/core/api/src/main/java/org/onosproject/net/topology/package-info.java
+++ b/core/api/src/main/java/org/onosproject/net/topology/package-info.java
@@ -17,4 +17,4 @@
/**
* Network topology model & related services API definitions.
*/
-package org.onlab.onos.net.topology;
+package org.onosproject.net.topology;
diff --git a/core/api/src/main/java/org/onosproject/store/AbstractStore.java b/core/api/src/main/java/org/onosproject/store/AbstractStore.java
index 7d95fbe..a3005e4 100644
--- a/core/api/src/main/java/org/onosproject/store/AbstractStore.java
+++ b/core/api/src/main/java/org/onosproject/store/AbstractStore.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store;
+package org.onosproject.store;
import java.util.List;
-import org.onlab.onos.event.Event;
+import org.onosproject.event.Event;
import static com.google.common.base.Preconditions.checkState;
diff --git a/core/api/src/main/java/org/onosproject/store/Store.java b/core/api/src/main/java/org/onosproject/store/Store.java
index 6118ea5..8d5b53c 100644
--- a/core/api/src/main/java/org/onosproject/store/Store.java
+++ b/core/api/src/main/java/org/onosproject/store/Store.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store;
+package org.onosproject.store;
-import org.onlab.onos.event.Event;
+import org.onosproject.event.Event;
/**
* Abstraction of a entity capable of storing and/or distributing information
diff --git a/core/api/src/main/java/org/onosproject/store/StoreDelegate.java b/core/api/src/main/java/org/onosproject/store/StoreDelegate.java
index 0bcd814..71ca8cc 100644
--- a/core/api/src/main/java/org/onosproject/store/StoreDelegate.java
+++ b/core/api/src/main/java/org/onosproject/store/StoreDelegate.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store;
+package org.onosproject.store;
-import org.onlab.onos.event.Event;
+import org.onosproject.event.Event;
/**
* Entity associated with a store and capable of receiving notifications of
diff --git a/core/api/src/main/java/org/onosproject/store/Timestamp.java b/core/api/src/main/java/org/onosproject/store/Timestamp.java
index ab3e3cb..67c01b1 100644
--- a/core/api/src/main/java/org/onosproject/store/Timestamp.java
+++ b/core/api/src/main/java/org/onosproject/store/Timestamp.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store;
+package org.onosproject.store;
/**
* Opaque version structure.
diff --git a/core/api/src/main/java/org/onosproject/store/cluster/messaging/ClusterCommunicationService.java b/core/api/src/main/java/org/onosproject/store/cluster/messaging/ClusterCommunicationService.java
index 2763eff..6db5abf 100644
--- a/core/api/src/main/java/org/onosproject/store/cluster/messaging/ClusterCommunicationService.java
+++ b/core/api/src/main/java/org/onosproject/store/cluster/messaging/ClusterCommunicationService.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.cluster.messaging;
+package org.onosproject.store.cluster.messaging;
import java.io.IOException;
import java.util.Set;
-import org.onlab.onos.cluster.NodeId;
+import org.onosproject.cluster.NodeId;
import com.google.common.util.concurrent.ListenableFuture;
diff --git a/core/api/src/main/java/org/onosproject/store/cluster/messaging/ClusterMessage.java b/core/api/src/main/java/org/onosproject/store/cluster/messaging/ClusterMessage.java
index 3aa30dc..5b60e4d 100644
--- a/core/api/src/main/java/org/onosproject/store/cluster/messaging/ClusterMessage.java
+++ b/core/api/src/main/java/org/onosproject/store/cluster/messaging/ClusterMessage.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.cluster.messaging;
+package org.onosproject.store.cluster.messaging;
import java.io.IOException;
-import org.onlab.onos.cluster.NodeId;
+import org.onosproject.cluster.NodeId;
import org.onlab.util.ByteArraySizeHashPrinter;
import com.google.common.base.MoreObjects;
diff --git a/core/api/src/main/java/org/onosproject/store/cluster/messaging/ClusterMessageHandler.java b/core/api/src/main/java/org/onosproject/store/cluster/messaging/ClusterMessageHandler.java
index 7bc0cb1..19c7dda 100644
--- a/core/api/src/main/java/org/onosproject/store/cluster/messaging/ClusterMessageHandler.java
+++ b/core/api/src/main/java/org/onosproject/store/cluster/messaging/ClusterMessageHandler.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.cluster.messaging;
+package org.onosproject.store.cluster.messaging;
/**
* Interface for handling cluster messages.
diff --git a/core/api/src/main/java/org/onosproject/store/cluster/messaging/MessageSubject.java b/core/api/src/main/java/org/onosproject/store/cluster/messaging/MessageSubject.java
index 77afd22..d81e6f1 100644
--- a/core/api/src/main/java/org/onosproject/store/cluster/messaging/MessageSubject.java
+++ b/core/api/src/main/java/org/onosproject/store/cluster/messaging/MessageSubject.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.cluster.messaging;
+package org.onosproject.store.cluster.messaging;
import static com.google.common.base.Preconditions.checkNotNull;
diff --git a/core/api/src/main/java/org/onosproject/store/cluster/messaging/package-info.java b/core/api/src/main/java/org/onosproject/store/cluster/messaging/package-info.java
index 59e8cd0..582c50e 100644
--- a/core/api/src/main/java/org/onosproject/store/cluster/messaging/package-info.java
+++ b/core/api/src/main/java/org/onosproject/store/cluster/messaging/package-info.java
@@ -17,4 +17,4 @@
/**
* Cluster messaging APIs for the use by the various distributed stores.
*/
-package org.onlab.onos.store.cluster.messaging;
+package org.onosproject.store.cluster.messaging;
diff --git a/core/api/src/main/java/org/onosproject/store/package-info.java b/core/api/src/main/java/org/onosproject/store/package-info.java
index 9d96863..b6269ea 100644
--- a/core/api/src/main/java/org/onosproject/store/package-info.java
+++ b/core/api/src/main/java/org/onosproject/store/package-info.java
@@ -17,4 +17,4 @@
/**
* Abstractions for creating and interacting with distributed stores.
*/
-package org.onlab.onos.store;
+package org.onosproject.store;
diff --git a/core/api/src/main/java/org/onosproject/store/service/BatchReadRequest.java b/core/api/src/main/java/org/onosproject/store/service/BatchReadRequest.java
index 7cab847..ce08640 100644
--- a/core/api/src/main/java/org/onosproject/store/service/BatchReadRequest.java
+++ b/core/api/src/main/java/org/onosproject/store/service/BatchReadRequest.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
import java.util.List;
diff --git a/core/api/src/main/java/org/onosproject/store/service/BatchReadResult.java b/core/api/src/main/java/org/onosproject/store/service/BatchReadResult.java
index b12aa16..2b8da75 100644
--- a/core/api/src/main/java/org/onosproject/store/service/BatchReadResult.java
+++ b/core/api/src/main/java/org/onosproject/store/service/BatchReadResult.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
import java.util.List;
diff --git a/core/api/src/main/java/org/onosproject/store/service/BatchWriteRequest.java b/core/api/src/main/java/org/onosproject/store/service/BatchWriteRequest.java
index e6ff26e..7686c7c 100644
--- a/core/api/src/main/java/org/onosproject/store/service/BatchWriteRequest.java
+++ b/core/api/src/main/java/org/onosproject/store/service/BatchWriteRequest.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
import java.util.List;
diff --git a/core/api/src/main/java/org/onosproject/store/service/BatchWriteResult.java b/core/api/src/main/java/org/onosproject/store/service/BatchWriteResult.java
index fa2e7c4..805c8fc 100644
--- a/core/api/src/main/java/org/onosproject/store/service/BatchWriteResult.java
+++ b/core/api/src/main/java/org/onosproject/store/service/BatchWriteResult.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
import java.util.List;
diff --git a/core/api/src/main/java/org/onosproject/store/service/DatabaseAdminService.java b/core/api/src/main/java/org/onosproject/store/service/DatabaseAdminService.java
index ef7ea67..8a00fe4 100644
--- a/core/api/src/main/java/org/onosproject/store/service/DatabaseAdminService.java
+++ b/core/api/src/main/java/org/onosproject/store/service/DatabaseAdminService.java
@@ -1,10 +1,10 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
import java.util.Collection;
import java.util.Optional;
import java.util.Set;
-import org.onlab.onos.cluster.ControllerNode;
+import org.onosproject.cluster.ControllerNode;
/**
* Service interface for running administrative tasks on a Database.
diff --git a/core/api/src/main/java/org/onosproject/store/service/DatabaseException.java b/core/api/src/main/java/org/onosproject/store/service/DatabaseException.java
index 1468d1b..26a28b0 100644
--- a/core/api/src/main/java/org/onosproject/store/service/DatabaseException.java
+++ b/core/api/src/main/java/org/onosproject/store/service/DatabaseException.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
/**
* Base exception type for database failures.
@@ -33,4 +33,4 @@
super(t);
}
}
-}
\ No newline at end of file
+}
diff --git a/core/api/src/main/java/org/onosproject/store/service/DatabaseService.java b/core/api/src/main/java/org/onosproject/store/service/DatabaseService.java
index b5a56a1..2dec72d 100644
--- a/core/api/src/main/java/org/onosproject/store/service/DatabaseService.java
+++ b/core/api/src/main/java/org/onosproject/store/service/DatabaseService.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
import java.util.Map;
diff --git a/core/api/src/main/java/org/onosproject/store/service/Lock.java b/core/api/src/main/java/org/onosproject/store/service/Lock.java
index 7558ae2..6b9ea8e 100644
--- a/core/api/src/main/java/org/onosproject/store/service/Lock.java
+++ b/core/api/src/main/java/org/onosproject/store/service/Lock.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
import java.util.concurrent.CompletableFuture;
diff --git a/core/api/src/main/java/org/onosproject/store/service/LockEventListener.java b/core/api/src/main/java/org/onosproject/store/service/LockEventListener.java
index 73f78fe..4929dde 100644
--- a/core/api/src/main/java/org/onosproject/store/service/LockEventListener.java
+++ b/core/api/src/main/java/org/onosproject/store/service/LockEventListener.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
/**
* Listener for lock events.
diff --git a/core/api/src/main/java/org/onosproject/store/service/LockService.java b/core/api/src/main/java/org/onosproject/store/service/LockService.java
index a4ac30b..c123273 100644
--- a/core/api/src/main/java/org/onosproject/store/service/LockService.java
+++ b/core/api/src/main/java/org/onosproject/store/service/LockService.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
/**
* Service interface for mutual exclusion primitives.
@@ -25,4 +25,4 @@
* @param listener listener to be removed.
*/
void removeListener(LockEventListener listener);
-}
\ No newline at end of file
+}
diff --git a/core/api/src/main/java/org/onosproject/store/service/NoSuchTableException.java b/core/api/src/main/java/org/onosproject/store/service/NoSuchTableException.java
index 6e02252..785685f 100644
--- a/core/api/src/main/java/org/onosproject/store/service/NoSuchTableException.java
+++ b/core/api/src/main/java/org/onosproject/store/service/NoSuchTableException.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
/**
@@ -7,4 +7,4 @@
*/
@SuppressWarnings("serial")
public class NoSuchTableException extends DatabaseException {
-}
\ No newline at end of file
+}
diff --git a/core/api/src/main/java/org/onosproject/store/service/OptionalResult.java b/core/api/src/main/java/org/onosproject/store/service/OptionalResult.java
index a9341cb..88ba273 100644
--- a/core/api/src/main/java/org/onosproject/store/service/OptionalResult.java
+++ b/core/api/src/main/java/org/onosproject/store/service/OptionalResult.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
/**
* A container object which either has a result or an exception.
diff --git a/core/api/src/main/java/org/onosproject/store/service/ReadRequest.java b/core/api/src/main/java/org/onosproject/store/service/ReadRequest.java
index f30529e..b1ec06f 100644
--- a/core/api/src/main/java/org/onosproject/store/service/ReadRequest.java
+++ b/core/api/src/main/java/org/onosproject/store/service/ReadRequest.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -75,4 +75,4 @@
return Objects.equals(this.key, other.key) &&
Objects.equals(this.tableName, other.tableName);
}
-}
\ No newline at end of file
+}
diff --git a/core/api/src/main/java/org/onosproject/store/service/ReadResult.java b/core/api/src/main/java/org/onosproject/store/service/ReadResult.java
index 868dda5..3e13b0b 100644
--- a/core/api/src/main/java/org/onosproject/store/service/ReadResult.java
+++ b/core/api/src/main/java/org/onosproject/store/service/ReadResult.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
import com.google.common.base.MoreObjects;
diff --git a/core/api/src/main/java/org/onosproject/store/service/ReadStatus.java b/core/api/src/main/java/org/onosproject/store/service/ReadStatus.java
index 67d8a57..128ce09 100644
--- a/core/api/src/main/java/org/onosproject/store/service/ReadStatus.java
+++ b/core/api/src/main/java/org/onosproject/store/service/ReadStatus.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
/**
* Status of completed read request.
diff --git a/core/api/src/main/java/org/onosproject/store/service/VersionedValue.java b/core/api/src/main/java/org/onosproject/store/service/VersionedValue.java
index 9a78252..d224309 100644
--- a/core/api/src/main/java/org/onosproject/store/service/VersionedValue.java
+++ b/core/api/src/main/java/org/onosproject/store/service/VersionedValue.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
import java.util.Arrays;
diff --git a/core/api/src/main/java/org/onosproject/store/service/WriteRequest.java b/core/api/src/main/java/org/onosproject/store/service/WriteRequest.java
index d687fa5..123b5c8 100644
--- a/core/api/src/main/java/org/onosproject/store/service/WriteRequest.java
+++ b/core/api/src/main/java/org/onosproject/store/service/WriteRequest.java
@@ -1,8 +1,8 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
-import static org.onlab.onos.store.service.WriteRequest.Type.*;
+import static org.onosproject.store.service.WriteRequest.Type.*;
import java.util.Objects;
diff --git a/core/api/src/main/java/org/onosproject/store/service/WriteResult.java b/core/api/src/main/java/org/onosproject/store/service/WriteResult.java
index 3f61061..4a2b8bc 100644
--- a/core/api/src/main/java/org/onosproject/store/service/WriteResult.java
+++ b/core/api/src/main/java/org/onosproject/store/service/WriteResult.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
import com.google.common.base.MoreObjects;
diff --git a/core/api/src/main/java/org/onosproject/store/service/WriteStatus.java b/core/api/src/main/java/org/onosproject/store/service/WriteStatus.java
index 9f3e999..9d584c2 100644
--- a/core/api/src/main/java/org/onosproject/store/service/WriteStatus.java
+++ b/core/api/src/main/java/org/onosproject/store/service/WriteStatus.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
/**
* Status of completed write request.
diff --git a/core/api/src/main/java/org/onosproject/store/service/package-info.java b/core/api/src/main/java/org/onosproject/store/service/package-info.java
index 5f65452..3d86e35 100644
--- a/core/api/src/main/java/org/onosproject/store/service/package-info.java
+++ b/core/api/src/main/java/org/onosproject/store/service/package-info.java
@@ -17,5 +17,5 @@
/**
* Distributed core state management services.
*/
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
diff --git a/core/api/src/test/java/org/onosproject/TestApplicationId.java b/core/api/src/test/java/org/onosproject/TestApplicationId.java
index 0de5788..a57d5e8 100644
--- a/core/api/src/test/java/org/onosproject/TestApplicationId.java
+++ b/core/api/src/test/java/org/onosproject/TestApplicationId.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos;
+package org.onosproject;
-import org.onlab.onos.core.ApplicationId;
+import org.onosproject.core.ApplicationId;
import java.util.Objects;
diff --git a/core/api/src/test/java/org/onosproject/VersionTest.java b/core/api/src/test/java/org/onosproject/VersionTest.java
index 1711ea8..61e44b7 100644
--- a/core/api/src/test/java/org/onosproject/VersionTest.java
+++ b/core/api/src/test/java/org/onosproject/VersionTest.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos;
+package org.onosproject;
import com.google.common.testing.EqualsTester;
import org.junit.Test;
-import org.onlab.onos.core.Version;
+import org.onosproject.core.Version;
import static org.junit.Assert.*;
-import static org.onlab.onos.core.Version.version;
+import static org.onosproject.core.Version.version;
/**
* Tests of the version descriptor.
@@ -63,4 +63,4 @@
.addEqualityGroup(version("1.2.3.x"), version(1, 2, 3, "x"))
.testEquals();
}
-}
\ No newline at end of file
+}
diff --git a/core/api/src/test/java/org/onosproject/cluster/ClusterServiceAdapter.java b/core/api/src/test/java/org/onosproject/cluster/ClusterServiceAdapter.java
index 2433dc6..35b5a6d 100644
--- a/core/api/src/test/java/org/onosproject/cluster/ClusterServiceAdapter.java
+++ b/core/api/src/test/java/org/onosproject/cluster/ClusterServiceAdapter.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cluster;
+package org.onosproject.cluster;
import java.util.Set;
diff --git a/core/api/src/test/java/org/onosproject/cluster/ControllerNodeToNodeIdTest.java b/core/api/src/test/java/org/onosproject/cluster/ControllerNodeToNodeIdTest.java
index 7604321..0b4d1ef 100644
--- a/core/api/src/test/java/org/onosproject/cluster/ControllerNodeToNodeIdTest.java
+++ b/core/api/src/test/java/org/onosproject/cluster/ControllerNodeToNodeIdTest.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cluster;
+package org.onosproject.cluster;
import static com.google.common.base.Predicates.notNull;
import static org.junit.Assert.*;
-import static org.onlab.onos.cluster.ControllerNodeToNodeId.toNodeId;
+import static org.onosproject.cluster.ControllerNodeToNodeId.toNodeId;
import java.util.Arrays;
import java.util.List;
diff --git a/core/api/src/test/java/org/onosproject/cluster/RoleInfoTest.java b/core/api/src/test/java/org/onosproject/cluster/RoleInfoTest.java
index c692b87..172b6f5 100644
--- a/core/api/src/test/java/org/onosproject/cluster/RoleInfoTest.java
+++ b/core/api/src/test/java/org/onosproject/cluster/RoleInfoTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cluster;
+package org.onosproject.cluster;
import java.util.List;
diff --git a/core/api/src/test/java/org/onosproject/codec/JsonCodecTest.java b/core/api/src/test/java/org/onosproject/codec/JsonCodecTest.java
index 05460fb..ebe5f8e 100644
--- a/core/api/src/test/java/org/onosproject/codec/JsonCodecTest.java
+++ b/core/api/src/test/java/org/onosproject/codec/JsonCodecTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.codec;
+package org.onosproject.codec;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
@@ -96,4 +96,4 @@
return null;
}
}
-}
\ No newline at end of file
+}
diff --git a/core/api/src/test/java/org/onosproject/core/DefaultGroupIdTest.java b/core/api/src/test/java/org/onosproject/core/DefaultGroupIdTest.java
index 53b3d2c..21dea86 100644
--- a/core/api/src/test/java/org/onosproject/core/DefaultGroupIdTest.java
+++ b/core/api/src/test/java/org/onosproject/core/DefaultGroupIdTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.core;
+package org.onosproject.core;
import com.google.common.testing.EqualsTester;
import org.junit.Test;
diff --git a/core/api/src/test/java/org/onosproject/event/AbstractEventAccumulatorTest.java b/core/api/src/test/java/org/onosproject/event/AbstractEventAccumulatorTest.java
index 55ed7bf..2580d5c 100644
--- a/core/api/src/test/java/org/onosproject/event/AbstractEventAccumulatorTest.java
+++ b/core/api/src/test/java/org/onosproject/event/AbstractEventAccumulatorTest.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.event;
+package org.onosproject.event;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.onlab.junit.TestTools.delay;
-import static org.onlab.onos.event.TestEvent.Type.FOO;
+import static org.onosproject.event.TestEvent.Type.FOO;
import java.util.List;
import java.util.Timer;
diff --git a/core/api/src/test/java/org/onosproject/event/AbstractEventTest.java b/core/api/src/test/java/org/onosproject/event/AbstractEventTest.java
index 6b1268f..c66c4b8 100644
--- a/core/api/src/test/java/org/onosproject/event/AbstractEventTest.java
+++ b/core/api/src/test/java/org/onosproject/event/AbstractEventTest.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.event;
+package org.onosproject.event;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import static org.onlab.onos.event.TestEvent.Type.FOO;
+import static org.onosproject.event.TestEvent.Type.FOO;
/**
* Tests of the base event abstraction.
diff --git a/core/api/src/test/java/org/onosproject/event/AbstractListenerRegistryTest.java b/core/api/src/test/java/org/onosproject/event/AbstractListenerRegistryTest.java
index 13fe5d8..96613f2 100644
--- a/core/api/src/test/java/org/onosproject/event/AbstractListenerRegistryTest.java
+++ b/core/api/src/test/java/org/onosproject/event/AbstractListenerRegistryTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.event;
+package org.onosproject.event;
import org.junit.Test;
diff --git a/core/api/src/test/java/org/onosproject/event/BrokenListener.java b/core/api/src/test/java/org/onosproject/event/BrokenListener.java
index 29921a7..1a013ad 100644
--- a/core/api/src/test/java/org/onosproject/event/BrokenListener.java
+++ b/core/api/src/test/java/org/onosproject/event/BrokenListener.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.event;
+package org.onosproject.event;
/**
* Test event listener fixture.
diff --git a/core/api/src/test/java/org/onosproject/event/DefaultEventSinkRegistryTest.java b/core/api/src/test/java/org/onosproject/event/DefaultEventSinkRegistryTest.java
index cde9314..2e24228 100644
--- a/core/api/src/test/java/org/onosproject/event/DefaultEventSinkRegistryTest.java
+++ b/core/api/src/test/java/org/onosproject/event/DefaultEventSinkRegistryTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.event;
+package org.onosproject.event;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/api/src/test/java/org/onosproject/event/TestEvent.java b/core/api/src/test/java/org/onosproject/event/TestEvent.java
index 9d41971..c94c8f5 100644
--- a/core/api/src/test/java/org/onosproject/event/TestEvent.java
+++ b/core/api/src/test/java/org/onosproject/event/TestEvent.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.event;
+package org.onosproject.event;
/**
* Test event fixture.
diff --git a/core/api/src/test/java/org/onosproject/event/TestListener.java b/core/api/src/test/java/org/onosproject/event/TestListener.java
index 275f019..213f8c5 100644
--- a/core/api/src/test/java/org/onosproject/event/TestListener.java
+++ b/core/api/src/test/java/org/onosproject/event/TestListener.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.event;
+package org.onosproject.event;
import java.util.ArrayList;
import java.util.List;
diff --git a/core/api/src/test/java/org/onosproject/event/TestListenerRegistry.java b/core/api/src/test/java/org/onosproject/event/TestListenerRegistry.java
index 235783a..0b9770e 100644
--- a/core/api/src/test/java/org/onosproject/event/TestListenerRegistry.java
+++ b/core/api/src/test/java/org/onosproject/event/TestListenerRegistry.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.event;
+package org.onosproject.event;
import java.util.ArrayList;
import java.util.List;
diff --git a/core/api/src/test/java/org/onosproject/mastership/MastershipServiceAdapter.java b/core/api/src/test/java/org/onosproject/mastership/MastershipServiceAdapter.java
index 860e7e7..be1f4b9 100644
--- a/core/api/src/test/java/org/onosproject/mastership/MastershipServiceAdapter.java
+++ b/core/api/src/test/java/org/onosproject/mastership/MastershipServiceAdapter.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.mastership;
+package org.onosproject.mastership;
-import org.onlab.onos.cluster.NodeId;
-import org.onlab.onos.cluster.RoleInfo;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.MastershipRole;
+import org.onosproject.cluster.NodeId;
+import org.onosproject.cluster.RoleInfo;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.MastershipRole;
import java.util.Set;
diff --git a/core/api/src/test/java/org/onosproject/mastership/MastershipTermTest.java b/core/api/src/test/java/org/onosproject/mastership/MastershipTermTest.java
index be2f84a..d38f3e9 100644
--- a/core/api/src/test/java/org/onosproject/mastership/MastershipTermTest.java
+++ b/core/api/src/test/java/org/onosproject/mastership/MastershipTermTest.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.mastership;
+package org.onosproject.mastership;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import org.onlab.onos.cluster.NodeId;
+import org.onosproject.cluster.NodeId;
import com.google.common.testing.EqualsTester;
diff --git a/core/api/src/test/java/org/onosproject/net/ConnectPointTest.java b/core/api/src/test/java/org/onosproject/net/ConnectPointTest.java
index 972311e..9580481 100644
--- a/core/api/src/test/java/org/onosproject/net/ConnectPointTest.java
+++ b/core/api/src/test/java/org/onosproject/net/ConnectPointTest.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
import com.google.common.testing.EqualsTester;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
-import static org.onlab.onos.net.DeviceId.deviceId;
-import static org.onlab.onos.net.PortNumber.portNumber;
+import static org.onosproject.net.DeviceId.deviceId;
+import static org.onosproject.net.PortNumber.portNumber;
/**
* Test of the connetion point entity.
diff --git a/core/api/src/test/java/org/onosproject/net/DefaultAnnotationsTest.java b/core/api/src/test/java/org/onosproject/net/DefaultAnnotationsTest.java
index fcca8df..1bac285 100644
--- a/core/api/src/test/java/org/onosproject/net/DefaultAnnotationsTest.java
+++ b/core/api/src/test/java/org/onosproject/net/DefaultAnnotationsTest.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
import org.junit.Test;
import static com.google.common.collect.ImmutableSet.of;
import static org.junit.Assert.*;
-import static org.onlab.onos.net.DefaultAnnotations.builder;
+import static org.onosproject.net.DefaultAnnotations.builder;
/**
* Tests of the default annotations.
diff --git a/core/api/src/test/java/org/onosproject/net/DefaultDeviceTest.java b/core/api/src/test/java/org/onosproject/net/DefaultDeviceTest.java
index 6d8b2755..1b0319a 100644
--- a/core/api/src/test/java/org/onosproject/net/DefaultDeviceTest.java
+++ b/core/api/src/test/java/org/onosproject/net/DefaultDeviceTest.java
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
import com.google.common.testing.EqualsTester;
import org.junit.Test;
-import org.onlab.onos.net.provider.ProviderId;
+import org.onosproject.net.provider.ProviderId;
import org.onlab.packet.ChassisId;
import static org.junit.Assert.assertEquals;
-import static org.onlab.onos.net.Device.Type.SWITCH;
-import static org.onlab.onos.net.DeviceId.deviceId;
+import static org.onosproject.net.Device.Type.SWITCH;
+import static org.onosproject.net.DeviceId.deviceId;
/**
* Test of the default device model entity.
diff --git a/core/api/src/test/java/org/onosproject/net/DefaultEdgeLinkTest.java b/core/api/src/test/java/org/onosproject/net/DefaultEdgeLinkTest.java
index 355f49e..ee5b0e3 100644
--- a/core/api/src/test/java/org/onosproject/net/DefaultEdgeLinkTest.java
+++ b/core/api/src/test/java/org/onosproject/net/DefaultEdgeLinkTest.java
@@ -13,18 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
import com.google.common.testing.EqualsTester;
import org.junit.Test;
-import org.onlab.onos.net.provider.ProviderId;
+import org.onosproject.net.provider.ProviderId;
import static org.junit.Assert.assertEquals;
-import static org.onlab.onos.net.DefaultEdgeLink.createEdgeLink;
-import static org.onlab.onos.net.DefaultLinkTest.cp;
-import static org.onlab.onos.net.DeviceId.deviceId;
-import static org.onlab.onos.net.HostId.hostId;
-import static org.onlab.onos.net.PortNumber.portNumber;
+import static org.onosproject.net.DefaultEdgeLink.createEdgeLink;
+import static org.onosproject.net.DefaultLinkTest.cp;
+import static org.onosproject.net.DeviceId.deviceId;
+import static org.onosproject.net.HostId.hostId;
+import static org.onosproject.net.PortNumber.portNumber;
/**
* Test of the default edge link model entity.
diff --git a/core/api/src/test/java/org/onosproject/net/DefaultHostTest.java b/core/api/src/test/java/org/onosproject/net/DefaultHostTest.java
index b079392..1fb6da5 100644
--- a/core/api/src/test/java/org/onosproject/net/DefaultHostTest.java
+++ b/core/api/src/test/java/org/onosproject/net/DefaultHostTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
import static org.junit.Assert.assertEquals;
diff --git a/core/api/src/test/java/org/onosproject/net/DefaultLinkTest.java b/core/api/src/test/java/org/onosproject/net/DefaultLinkTest.java
index 52b5a7e..bd5821b 100644
--- a/core/api/src/test/java/org/onosproject/net/DefaultLinkTest.java
+++ b/core/api/src/test/java/org/onosproject/net/DefaultLinkTest.java
@@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
import com.google.common.testing.EqualsTester;
import org.junit.Test;
-import org.onlab.onos.net.provider.ProviderId;
+import org.onosproject.net.provider.ProviderId;
import static org.junit.Assert.assertEquals;
-import static org.onlab.onos.net.DeviceId.deviceId;
-import static org.onlab.onos.net.Link.Type.DIRECT;
-import static org.onlab.onos.net.Link.Type.INDIRECT;
-import static org.onlab.onos.net.PortNumber.portNumber;
+import static org.onosproject.net.DeviceId.deviceId;
+import static org.onosproject.net.Link.Type.DIRECT;
+import static org.onosproject.net.Link.Type.INDIRECT;
+import static org.onosproject.net.PortNumber.portNumber;
/**
* Test of the default link model entity.
diff --git a/core/api/src/test/java/org/onosproject/net/DefaultPortTest.java b/core/api/src/test/java/org/onosproject/net/DefaultPortTest.java
index ebc3107..592115d 100644
--- a/core/api/src/test/java/org/onosproject/net/DefaultPortTest.java
+++ b/core/api/src/test/java/org/onosproject/net/DefaultPortTest.java
@@ -13,19 +13,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
import com.google.common.testing.EqualsTester;
import org.junit.Test;
-import org.onlab.onos.net.provider.ProviderId;
+import org.onosproject.net.provider.ProviderId;
import org.onlab.packet.ChassisId;
import static org.junit.Assert.assertEquals;
-import static org.onlab.onos.net.Device.Type.SWITCH;
-import static org.onlab.onos.net.DeviceId.deviceId;
-import static org.onlab.onos.net.Port.Type.COPPER;
-import static org.onlab.onos.net.Port.Type.FIBER;
-import static org.onlab.onos.net.PortNumber.portNumber;
+import static org.onosproject.net.Device.Type.SWITCH;
+import static org.onosproject.net.DeviceId.deviceId;
+import static org.onosproject.net.Port.Type.COPPER;
+import static org.onosproject.net.Port.Type.FIBER;
+import static org.onosproject.net.PortNumber.portNumber;
/**
* Test of the default port model entity.
diff --git a/core/api/src/test/java/org/onosproject/net/DeviceIdTest.java b/core/api/src/test/java/org/onosproject/net/DeviceIdTest.java
index 53f8d1e..ab5373f 100644
--- a/core/api/src/test/java/org/onosproject/net/DeviceIdTest.java
+++ b/core/api/src/test/java/org/onosproject/net/DeviceIdTest.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
import com.google.common.testing.EqualsTester;
import org.junit.Test;
-import static org.onlab.onos.net.DeviceId.deviceId;
+import static org.onosproject.net.DeviceId.deviceId;
/**
* Test of the device identifier.
diff --git a/core/api/src/test/java/org/onosproject/net/HostIdTest.java b/core/api/src/test/java/org/onosproject/net/HostIdTest.java
index cb711b5..43425e2 100644
--- a/core/api/src/test/java/org/onosproject/net/HostIdTest.java
+++ b/core/api/src/test/java/org/onosproject/net/HostIdTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
import com.google.common.testing.EqualsTester;
@@ -21,7 +21,7 @@
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
-import static org.onlab.onos.net.HostId.hostId;
+import static org.onosproject.net.HostId.hostId;
/**
* Test for the host identifier.
diff --git a/core/api/src/test/java/org/onosproject/net/LinkKeyTest.java b/core/api/src/test/java/org/onosproject/net/LinkKeyTest.java
index f15c0a1..4dfc139 100644
--- a/core/api/src/test/java/org/onosproject/net/LinkKeyTest.java
+++ b/core/api/src/test/java/org/onosproject/net/LinkKeyTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
import org.junit.Test;
@@ -24,8 +24,8 @@
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
-import static org.onlab.onos.net.DeviceId.deviceId;
-import static org.onlab.onos.net.PortNumber.portNumber;
+import static org.onosproject.net.DeviceId.deviceId;
+import static org.onosproject.net.PortNumber.portNumber;
/**
* Unit tests for the LinkKey class.
diff --git a/core/api/src/test/java/org/onosproject/net/NetTestTools.java b/core/api/src/test/java/org/onosproject/net/NetTestTools.java
index 5f8920b..333723f 100644
--- a/core/api/src/test/java/org/onosproject/net/NetTestTools.java
+++ b/core/api/src/test/java/org/onosproject/net/NetTestTools.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
-import org.onlab.onos.TestApplicationId;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.net.provider.ProviderId;
+import org.onosproject.TestApplicationId;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.net.provider.ProviderId;
import org.onlab.packet.ChassisId;
import org.onlab.packet.IpAddress;
@@ -26,9 +26,9 @@
import java.util.List;
import static org.junit.Assert.assertEquals;
-import static org.onlab.onos.net.DeviceId.deviceId;
-import static org.onlab.onos.net.HostId.hostId;
-import static org.onlab.onos.net.PortNumber.portNumber;
+import static org.onosproject.net.DeviceId.deviceId;
+import static org.onosproject.net.HostId.hostId;
+import static org.onosproject.net.PortNumber.portNumber;
import static org.onlab.packet.MacAddress.valueOf;
import static org.onlab.packet.VlanId.vlanId;
diff --git a/core/api/src/test/java/org/onosproject/net/PortNumberTest.java b/core/api/src/test/java/org/onosproject/net/PortNumberTest.java
index a537dc8..142f516 100644
--- a/core/api/src/test/java/org/onosproject/net/PortNumberTest.java
+++ b/core/api/src/test/java/org/onosproject/net/PortNumberTest.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
import static org.junit.Assert.assertEquals;
-import static org.onlab.onos.net.PortNumber.portNumber;
+import static org.onosproject.net.PortNumber.portNumber;
import org.junit.Test;
diff --git a/core/api/src/test/java/org/onosproject/net/TestDeviceParams.java b/core/api/src/test/java/org/onosproject/net/TestDeviceParams.java
index 1856220..2d8aae3 100644
--- a/core/api/src/test/java/org/onosproject/net/TestDeviceParams.java
+++ b/core/api/src/test/java/org/onosproject/net/TestDeviceParams.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net;
+package org.onosproject.net;
-import static org.onlab.onos.net.DeviceId.deviceId;
+import static org.onosproject.net.DeviceId.deviceId;
import java.util.Set;
-import org.onlab.onos.net.provider.ProviderId;
+import org.onosproject.net.provider.ProviderId;
import org.onlab.packet.IpAddress;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
diff --git a/core/api/src/test/java/org/onosproject/net/device/DefaultDeviceDescriptionTest.java b/core/api/src/test/java/org/onosproject/net/device/DefaultDeviceDescriptionTest.java
index da64523..3dcdc22 100644
--- a/core/api/src/test/java/org/onosproject/net/device/DefaultDeviceDescriptionTest.java
+++ b/core/api/src/test/java/org/onosproject/net/device/DefaultDeviceDescriptionTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.device;
+package org.onosproject.net.device;
import org.junit.Test;
import org.onlab.packet.ChassisId;
@@ -22,7 +22,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import static org.onlab.onos.net.Device.Type.SWITCH;
+import static org.onosproject.net.Device.Type.SWITCH;
/**
* Test of the default device description.
diff --git a/core/api/src/test/java/org/onosproject/net/device/DeviceEventTest.java b/core/api/src/test/java/org/onosproject/net/device/DeviceEventTest.java
index 3994763..a0fb935 100644
--- a/core/api/src/test/java/org/onosproject/net/device/DeviceEventTest.java
+++ b/core/api/src/test/java/org/onosproject/net/device/DeviceEventTest.java
@@ -13,19 +13,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.device;
+package org.onosproject.net.device;
import static org.junit.Assert.assertEquals;
-import static org.onlab.onos.net.DeviceId.deviceId;
+import static org.onosproject.net.DeviceId.deviceId;
import org.junit.Test;
-import org.onlab.onos.event.AbstractEventTest;
-import org.onlab.onos.net.DefaultDevice;
-import org.onlab.onos.net.DefaultPort;
-import org.onlab.onos.net.Device;
-import org.onlab.onos.net.Port;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.provider.ProviderId;
+import org.onosproject.event.AbstractEventTest;
+import org.onosproject.net.DefaultDevice;
+import org.onosproject.net.DefaultPort;
+import org.onosproject.net.Device;
+import org.onosproject.net.Port;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.provider.ProviderId;
import org.onlab.packet.ChassisId;
/**
diff --git a/core/api/src/test/java/org/onosproject/net/device/DeviceServiceAdapter.java b/core/api/src/test/java/org/onosproject/net/device/DeviceServiceAdapter.java
index 3d2d74f..b05f17d 100644
--- a/core/api/src/test/java/org/onosproject/net/device/DeviceServiceAdapter.java
+++ b/core/api/src/test/java/org/onosproject/net/device/DeviceServiceAdapter.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.device;
+package org.onosproject.net.device;
-import org.onlab.onos.net.Device;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.MastershipRole;
-import org.onlab.onos.net.Port;
-import org.onlab.onos.net.PortNumber;
+import org.onosproject.net.Device;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.MastershipRole;
+import org.onosproject.net.Port;
+import org.onosproject.net.PortNumber;
import com.google.common.base.Predicate;
import com.google.common.collect.FluentIterable;
diff --git a/core/api/src/test/java/org/onosproject/net/flow/BatchOperationTest.java b/core/api/src/test/java/org/onosproject/net/flow/BatchOperationTest.java
index 7cdb1be..b767027 100644
--- a/core/api/src/test/java/org/onosproject/net/flow/BatchOperationTest.java
+++ b/core/api/src/test/java/org/onosproject/net/flow/BatchOperationTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
import java.util.Collection;
import java.util.LinkedList;
diff --git a/core/api/src/test/java/org/onosproject/net/flow/DefaultFlowEntryTest.java b/core/api/src/test/java/org/onosproject/net/flow/DefaultFlowEntryTest.java
index b8d7799..f8dc27a 100644
--- a/core/api/src/test/java/org/onosproject/net/flow/DefaultFlowEntryTest.java
+++ b/core/api/src/test/java/org/onosproject/net/flow/DefaultFlowEntryTest.java
@@ -13,19 +13,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
import java.util.concurrent.TimeUnit;
import org.junit.Test;
-import org.onlab.onos.net.intent.IntentTestsMocks;
+import org.onosproject.net.intent.IntentTestsMocks;
import com.google.common.testing.EqualsTester;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.is;
-import static org.onlab.onos.net.NetTestTools.did;
+import static org.onosproject.net.NetTestTools.did;
/**
* Unit tests for the DefaultFlowEntry class.
diff --git a/core/api/src/test/java/org/onosproject/net/flow/DefaultFlowRuleTest.java b/core/api/src/test/java/org/onosproject/net/flow/DefaultFlowRuleTest.java
index f2c418f..78c1645 100644
--- a/core/api/src/test/java/org/onosproject/net/flow/DefaultFlowRuleTest.java
+++ b/core/api/src/test/java/org/onosproject/net/flow/DefaultFlowRuleTest.java
@@ -14,18 +14,18 @@
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
import org.junit.Test;
-import org.onlab.onos.net.intent.IntentTestsMocks;
+import org.onosproject.net.intent.IntentTestsMocks;
import com.google.common.testing.EqualsTester;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutableBaseClass;
-import static org.onlab.onos.net.NetTestTools.APP_ID;
-import static org.onlab.onos.net.NetTestTools.did;
+import static org.onosproject.net.NetTestTools.APP_ID;
+import static org.onosproject.net.NetTestTools.did;
/**
* Unit tests for the default flow rule class.
diff --git a/core/api/src/test/java/org/onosproject/net/flow/DefaultTrafficSelectorTest.java b/core/api/src/test/java/org/onosproject/net/flow/DefaultTrafficSelectorTest.java
index 527030f..a1ce3d9 100644
--- a/core/api/src/test/java/org/onosproject/net/flow/DefaultTrafficSelectorTest.java
+++ b/core/api/src/test/java/org/onosproject/net/flow/DefaultTrafficSelectorTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
import java.util.Set;
@@ -22,9 +22,9 @@
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
import org.junit.Test;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.flow.criteria.Criteria;
-import org.onlab.onos.net.flow.criteria.Criterion;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.flow.criteria.Criteria;
+import org.onosproject.net.flow.criteria.Criterion;
import org.onlab.packet.IpPrefix;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
@@ -35,7 +35,7 @@
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.notNullValue;
import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
-import static org.onlab.onos.net.flow.criteria.Criterion.Type;
+import static org.onosproject.net.flow.criteria.Criterion.Type;
/**
* Unit tests for default traffic selector class.
diff --git a/core/api/src/test/java/org/onosproject/net/flow/DefaultTrafficTreatmentTest.java b/core/api/src/test/java/org/onosproject/net/flow/DefaultTrafficTreatmentTest.java
index 56056af..ed0f1f4 100644
--- a/core/api/src/test/java/org/onosproject/net/flow/DefaultTrafficTreatmentTest.java
+++ b/core/api/src/test/java/org/onosproject/net/flow/DefaultTrafficTreatmentTest.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
import java.util.List;
import org.junit.Test;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.flow.instructions.Instruction;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.flow.instructions.Instruction;
import org.onlab.packet.IpAddress;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
@@ -30,8 +30,8 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
-import static org.onlab.onos.net.flow.instructions.L0ModificationInstruction.L0SubType;
-import static org.onlab.onos.net.flow.instructions.L0ModificationInstruction.ModLambdaInstruction;
+import static org.onosproject.net.flow.instructions.L0ModificationInstruction.L0SubType;
+import static org.onosproject.net.flow.instructions.L0ModificationInstruction.ModLambdaInstruction;
/**
* Unit tests for the DefaultTrafficTreatment class.
diff --git a/core/api/src/test/java/org/onosproject/net/flow/FlowIdTest.java b/core/api/src/test/java/org/onosproject/net/flow/FlowIdTest.java
index 36b2362..263d403 100644
--- a/core/api/src/test/java/org/onosproject/net/flow/FlowIdTest.java
+++ b/core/api/src/test/java/org/onosproject/net/flow/FlowIdTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
import org.junit.Test;
diff --git a/core/api/src/test/java/org/onosproject/net/flow/FlowRuleBatchOperationTest.java b/core/api/src/test/java/org/onosproject/net/flow/FlowRuleBatchOperationTest.java
index 2b8908b..07b60fa 100644
--- a/core/api/src/test/java/org/onosproject/net/flow/FlowRuleBatchOperationTest.java
+++ b/core/api/src/test/java/org/onosproject/net/flow/FlowRuleBatchOperationTest.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
import java.util.LinkedList;
import org.junit.Test;
-import org.onlab.onos.net.intent.IntentTestsMocks;
+import org.onosproject.net.intent.IntentTestsMocks;
import com.google.common.testing.EqualsTester;
diff --git a/core/api/src/test/java/org/onosproject/net/flow/FlowRuleBatchRequestTest.java b/core/api/src/test/java/org/onosproject/net/flow/FlowRuleBatchRequestTest.java
index 6710f18..d7ad903 100644
--- a/core/api/src/test/java/org/onosproject/net/flow/FlowRuleBatchRequestTest.java
+++ b/core/api/src/test/java/org/onosproject/net/flow/FlowRuleBatchRequestTest.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
import java.util.LinkedList;
import java.util.List;
import org.junit.Test;
-import org.onlab.onos.net.intent.IntentTestsMocks;
+import org.onosproject.net.intent.IntentTestsMocks;
-import static org.onlab.onos.net.flow.FlowRuleBatchEntry.FlowRuleOperation.*;
+import static org.onosproject.net.flow.FlowRuleBatchEntry.FlowRuleOperation.*;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.hasSize;
diff --git a/core/api/src/test/java/org/onosproject/net/flow/FlowRuleEventTest.java b/core/api/src/test/java/org/onosproject/net/flow/FlowRuleEventTest.java
index 2fc1ff8..2d79c89 100644
--- a/core/api/src/test/java/org/onosproject/net/flow/FlowRuleEventTest.java
+++ b/core/api/src/test/java/org/onosproject/net/flow/FlowRuleEventTest.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow;
+package org.onosproject.net.flow;
import java.util.concurrent.TimeUnit;
import org.junit.Test;
-import org.onlab.onos.event.AbstractEventTest;
-import org.onlab.onos.net.intent.IntentTestsMocks;
+import org.onosproject.event.AbstractEventTest;
+import org.onosproject.net.intent.IntentTestsMocks;
import com.google.common.testing.EqualsTester;
diff --git a/core/api/src/test/java/org/onosproject/net/flow/criteria/CriteriaTest.java b/core/api/src/test/java/org/onosproject/net/flow/criteria/CriteriaTest.java
index e553e66..0fc5d30 100644
--- a/core/api/src/test/java/org/onosproject/net/flow/criteria/CriteriaTest.java
+++ b/core/api/src/test/java/org/onosproject/net/flow/criteria/CriteriaTest.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow.criteria;
+package org.onosproject.net.flow.criteria;
import org.junit.Test;
-import org.onlab.onos.net.PortNumber;
+import org.onosproject.net.PortNumber;
import org.onlab.packet.IpPrefix;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
@@ -30,7 +30,7 @@
import static org.hamcrest.Matchers.notNullValue;
import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
import static org.onlab.junit.UtilityClassChecker.assertThatClassIsUtility;
-import static org.onlab.onos.net.PortNumber.portNumber;
+import static org.onosproject.net.PortNumber.portNumber;
/**
* Unit tests for the Criteria class and its subclasses.
diff --git a/core/api/src/test/java/org/onosproject/net/flow/instructions/InstructionsTest.java b/core/api/src/test/java/org/onosproject/net/flow/instructions/InstructionsTest.java
index 437dcf6..8470654 100644
--- a/core/api/src/test/java/org/onosproject/net/flow/instructions/InstructionsTest.java
+++ b/core/api/src/test/java/org/onosproject/net/flow/instructions/InstructionsTest.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow.instructions;
+package org.onosproject.net.flow.instructions;
import org.junit.Test;
-import org.onlab.onos.net.PortNumber;
+import org.onosproject.net.PortNumber;
import org.onlab.packet.IpAddress;
import org.onlab.packet.IpPrefix;
import org.onlab.packet.MacAddress;
@@ -32,7 +32,7 @@
import static org.hamcrest.Matchers.notNullValue;
import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
import static org.onlab.junit.UtilityClassChecker.assertThatClassIsUtility;
-import static org.onlab.onos.net.PortNumber.portNumber;
+import static org.onosproject.net.PortNumber.portNumber;
/**
* Unit tests for the Instructions class.
diff --git a/core/api/src/test/java/org/onosproject/net/host/DefaultHostDecriptionTest.java b/core/api/src/test/java/org/onosproject/net/host/DefaultHostDecriptionTest.java
index 3d57d22..496269b 100644
--- a/core/api/src/test/java/org/onosproject/net/host/DefaultHostDecriptionTest.java
+++ b/core/api/src/test/java/org/onosproject/net/host/DefaultHostDecriptionTest.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.host;
+package org.onosproject.net.host;
import org.junit.Test;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.HostLocation;
-import org.onlab.onos.net.PortNumber;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.HostLocation;
+import org.onosproject.net.PortNumber;
import org.onlab.packet.IpAddress;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
diff --git a/core/api/src/test/java/org/onosproject/net/host/HostEventTest.java b/core/api/src/test/java/org/onosproject/net/host/HostEventTest.java
index 62a9ba0..4a55d63 100644
--- a/core/api/src/test/java/org/onosproject/net/host/HostEventTest.java
+++ b/core/api/src/test/java/org/onosproject/net/host/HostEventTest.java
@@ -13,19 +13,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.host;
+package org.onosproject.net.host;
import java.util.Set;
import org.junit.Test;
-import org.onlab.onos.event.AbstractEventTest;
-import org.onlab.onos.net.DefaultHost;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.Host;
-import org.onlab.onos.net.HostId;
-import org.onlab.onos.net.HostLocation;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.provider.ProviderId;
+import org.onosproject.event.AbstractEventTest;
+import org.onosproject.net.DefaultHost;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Host;
+import org.onosproject.net.HostId;
+import org.onosproject.net.HostLocation;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.provider.ProviderId;
import org.onlab.packet.IpAddress;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
diff --git a/core/api/src/test/java/org/onosproject/net/host/HostServiceAdapter.java b/core/api/src/test/java/org/onosproject/net/host/HostServiceAdapter.java
index 03a8a43..226dad0 100644
--- a/core/api/src/test/java/org/onosproject/net/host/HostServiceAdapter.java
+++ b/core/api/src/test/java/org/onosproject/net/host/HostServiceAdapter.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.host;
+package org.onosproject.net.host;
import java.util.Set;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.Host;
-import org.onlab.onos.net.HostId;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Host;
+import org.onosproject.net.HostId;
import org.onlab.packet.IpAddress;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
diff --git a/core/api/src/test/java/org/onosproject/net/host/InterfaceIpAddressTest.java b/core/api/src/test/java/org/onosproject/net/host/InterfaceIpAddressTest.java
index c18fe06..b82da45 100644
--- a/core/api/src/test/java/org/onosproject/net/host/InterfaceIpAddressTest.java
+++ b/core/api/src/test/java/org/onosproject/net/host/InterfaceIpAddressTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.host;
+package org.onosproject.net.host;
import org.junit.Test;
import org.onlab.packet.IpAddress;
diff --git a/core/api/src/test/java/org/onosproject/net/intent/AbstractIntentTest.java b/core/api/src/test/java/org/onosproject/net/intent/AbstractIntentTest.java
index 0062468..b8300ea 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/AbstractIntentTest.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/AbstractIntentTest.java
@@ -1,8 +1,8 @@
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
import org.junit.After;
import org.junit.Before;
-import org.onlab.onos.core.IdGenerator;
+import org.onosproject.core.IdGenerator;
public abstract class AbstractIntentTest {
diff --git a/core/api/src/test/java/org/onosproject/net/intent/ConnectivityIntentTest.java b/core/api/src/test/java/org/onosproject/net/intent/ConnectivityIntentTest.java
index 2e9ef7e..8628b30 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/ConnectivityIntentTest.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/ConnectivityIntentTest.java
@@ -13,19 +13,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
import java.util.Set;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.TestApplicationId;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.flow.DefaultTrafficSelector;
-import org.onlab.onos.net.flow.DefaultTrafficTreatment;
-import org.onlab.onos.net.flow.TrafficSelector;
-import org.onlab.onos.net.flow.TrafficTreatment;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.TestApplicationId;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.flow.DefaultTrafficSelector;
+import org.onosproject.net.flow.DefaultTrafficTreatment;
+import org.onosproject.net.flow.TrafficSelector;
+import org.onosproject.net.flow.TrafficTreatment;
/**
* Base facilities to test various connectivity tests.
diff --git a/core/api/src/test/java/org/onosproject/net/intent/FakeIntentManager.java b/core/api/src/test/java/org/onosproject/net/intent/FakeIntentManager.java
index 7074a5c..ae9bcf5 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/FakeIntentManager.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/FakeIntentManager.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/core/api/src/test/java/org/onosproject/net/intent/HostToHostIntentTest.java b/core/api/src/test/java/org/onosproject/net/intent/HostToHostIntentTest.java
index d1405b9..c476144 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/HostToHostIntentTest.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/HostToHostIntentTest.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
import org.junit.Test;
-import org.onlab.onos.TestApplicationId;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.net.HostId;
-import org.onlab.onos.net.flow.TrafficSelector;
+import org.onosproject.TestApplicationId;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.net.HostId;
+import org.onosproject.net.flow.TrafficSelector;
import com.google.common.testing.EqualsTester;
@@ -27,8 +27,8 @@
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
-import static org.onlab.onos.net.NetTestTools.APP_ID;
-import static org.onlab.onos.net.NetTestTools.hid;
+import static org.onosproject.net.NetTestTools.APP_ID;
+import static org.onosproject.net.NetTestTools.hid;
/**
* Unit tests for the HostToHostIntent class.
diff --git a/core/api/src/test/java/org/onosproject/net/intent/IntentExceptionTest.java b/core/api/src/test/java/org/onosproject/net/intent/IntentExceptionTest.java
index 72add7f..f26ee63 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/IntentExceptionTest.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/IntentExceptionTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
import org.junit.Test;
diff --git a/core/api/src/test/java/org/onosproject/net/intent/IntentIdTest.java b/core/api/src/test/java/org/onosproject/net/intent/IntentIdTest.java
index 543fbad..e2987b5 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/IntentIdTest.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/IntentIdTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
import org.junit.Test;
diff --git a/core/api/src/test/java/org/onosproject/net/intent/IntentOperationsTest.java b/core/api/src/test/java/org/onosproject/net/intent/IntentOperationsTest.java
index 2c31102..3fb2ac0 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/IntentOperationsTest.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/IntentOperationsTest.java
@@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
import java.util.List;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.onlab.onos.core.IdGenerator;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.NetTestTools;
-import org.onlab.onos.net.flow.TrafficSelector;
+import org.onosproject.core.IdGenerator;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.NetTestTools;
+import org.onosproject.net.flow.TrafficSelector;
import com.google.common.testing.EqualsTester;
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 acbfb3d..9dce4f1 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
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
-import static org.onlab.onos.net.intent.IntentEvent.Type.FAILED;
-import static org.onlab.onos.net.intent.IntentEvent.Type.INSTALLED;
-import static org.onlab.onos.net.intent.IntentEvent.Type.INSTALL_REQ;
-import static org.onlab.onos.net.intent.IntentEvent.Type.WITHDRAWN;
+import static org.onosproject.net.intent.IntentEvent.Type.FAILED;
+import static org.onosproject.net.intent.IntentEvent.Type.INSTALLED;
+import static org.onosproject.net.intent.IntentEvent.Type.INSTALL_REQ;
+import static org.onosproject.net.intent.IntentEvent.Type.WITHDRAWN;
import java.util.ArrayList;
import java.util.Arrays;
@@ -34,9 +34,9 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.onlab.onos.core.IdGenerator;
-import org.onlab.onos.net.flow.FlowRuleBatchOperation;
-import org.onlab.onos.net.resource.LinkResourceAllocations;
+import org.onosproject.core.IdGenerator;
+import org.onosproject.net.flow.FlowRuleBatchOperation;
+import org.onosproject.net.resource.LinkResourceAllocations;
/**
* Suite of tests for the intent service contract.
diff --git a/core/api/src/test/java/org/onosproject/net/intent/IntentTest.java b/core/api/src/test/java/org/onosproject/net/intent/IntentTest.java
index 2f675b7..d713b8a 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/IntentTest.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/IntentTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
import java.util.Arrays;
import java.util.HashSet;
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 4e44c2d..6a5e73f 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
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
-import static org.onlab.onos.net.NetTestTools.createPath;
-import static org.onlab.onos.net.NetTestTools.did;
-import static org.onlab.onos.net.NetTestTools.link;
+import static org.onosproject.net.NetTestTools.createPath;
+import static org.onosproject.net.NetTestTools.did;
+import static org.onosproject.net.NetTestTools.link;
import java.util.ArrayList;
import java.util.Arrays;
@@ -29,33 +29,33 @@
import java.util.Objects;
import java.util.Set;
-import org.onlab.onos.core.DefaultGroupId;
-import org.onlab.onos.core.GroupId;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.ElementId;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.Path;
-import org.onlab.onos.net.flow.FlowId;
-import org.onlab.onos.net.flow.FlowRule;
-import org.onlab.onos.net.flow.TrafficSelector;
-import org.onlab.onos.net.flow.TrafficTreatment;
-import org.onlab.onos.net.flow.criteria.Criterion;
-import org.onlab.onos.net.flow.criteria.Criterion.Type;
-import org.onlab.onos.net.flow.instructions.Instruction;
-import org.onlab.onos.net.resource.BandwidthResourceRequest;
-import org.onlab.onos.net.resource.LambdaResourceRequest;
-import org.onlab.onos.net.resource.LinkResourceAllocations;
-import org.onlab.onos.net.resource.LinkResourceListener;
-import org.onlab.onos.net.resource.LinkResourceRequest;
-import org.onlab.onos.net.resource.LinkResourceService;
-import org.onlab.onos.net.resource.ResourceAllocation;
-import org.onlab.onos.net.resource.ResourceRequest;
-import org.onlab.onos.net.resource.ResourceType;
-import org.onlab.onos.net.topology.DefaultTopologyEdge;
-import org.onlab.onos.net.topology.DefaultTopologyVertex;
-import org.onlab.onos.net.topology.LinkWeight;
-import org.onlab.onos.net.topology.PathService;
-import org.onlab.onos.net.topology.TopologyVertex;
+import org.onosproject.core.DefaultGroupId;
+import org.onosproject.core.GroupId;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.ElementId;
+import org.onosproject.net.Link;
+import org.onosproject.net.Path;
+import org.onosproject.net.flow.FlowId;
+import org.onosproject.net.flow.FlowRule;
+import org.onosproject.net.flow.TrafficSelector;
+import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.net.flow.criteria.Criterion;
+import org.onosproject.net.flow.criteria.Criterion.Type;
+import org.onosproject.net.flow.instructions.Instruction;
+import org.onosproject.net.resource.BandwidthResourceRequest;
+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.ResourceAllocation;
+import org.onosproject.net.resource.ResourceRequest;
+import org.onosproject.net.resource.ResourceType;
+import org.onosproject.net.topology.DefaultTopologyEdge;
+import org.onosproject.net.topology.DefaultTopologyVertex;
+import org.onosproject.net.topology.LinkWeight;
+import org.onosproject.net.topology.PathService;
+import org.onosproject.net.topology.TopologyVertex;
/**
* Common mocks used by the intent framework tests.
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 f785196..9282f0f 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
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
import java.util.HashSet;
import java.util.LinkedList;
@@ -21,12 +21,12 @@
import java.util.Set;
import org.junit.Test;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.NetTestTools;
-import org.onlab.onos.net.flow.TrafficSelector;
-import org.onlab.onos.net.intent.constraint.LambdaConstraint;
-import org.onlab.onos.net.resource.Lambda;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.Link;
+import org.onosproject.net.NetTestTools;
+import org.onosproject.net.flow.TrafficSelector;
+import org.onosproject.net.intent.constraint.LambdaConstraint;
+import org.onosproject.net.resource.Lambda;
import com.google.common.collect.ImmutableSet;
import com.google.common.testing.EqualsTester;
@@ -37,8 +37,8 @@
import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.Matchers.startsWith;
import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
-import static org.onlab.onos.net.NetTestTools.APP_ID;
-import static org.onlab.onos.net.NetTestTools.link;
+import static org.onosproject.net.NetTestTools.APP_ID;
+import static org.onosproject.net.NetTestTools.link;
/**
* Unit tests for the LinkCollectionIntent class.
diff --git a/core/api/src/test/java/org/onosproject/net/intent/MockIdGenerator.java b/core/api/src/test/java/org/onosproject/net/intent/MockIdGenerator.java
index 96ecac9..f30df4c 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/MockIdGenerator.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/MockIdGenerator.java
@@ -1,6 +1,6 @@
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
-import org.onlab.onos.core.IdGenerator;
+import org.onosproject.core.IdGenerator;
import java.util.concurrent.atomic.AtomicLong;
diff --git a/core/api/src/test/java/org/onosproject/net/intent/MultiPointToSinglePointIntentTest.java b/core/api/src/test/java/org/onosproject/net/intent/MultiPointToSinglePointIntentTest.java
index fd751ec..cab6a8d 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/MultiPointToSinglePointIntentTest.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/MultiPointToSinglePointIntentTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
import org.junit.Test;
diff --git a/core/api/src/test/java/org/onosproject/net/intent/PathIntentTest.java b/core/api/src/test/java/org/onosproject/net/intent/PathIntentTest.java
index 4451e66..6db1a35 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/PathIntentTest.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/PathIntentTest.java
@@ -13,24 +13,24 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
import org.junit.Test;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.DefaultLink;
-import org.onlab.onos.net.DefaultPath;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.NetTestTools;
-import org.onlab.onos.net.Path;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.provider.ProviderId;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DefaultLink;
+import org.onosproject.net.DefaultPath;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.NetTestTools;
+import org.onosproject.net.Path;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.provider.ProviderId;
import java.util.Arrays;
import static org.junit.Assert.assertEquals;
-import static org.onlab.onos.net.DeviceId.deviceId;
-import static org.onlab.onos.net.Link.Type.DIRECT;
-import static org.onlab.onos.net.PortNumber.portNumber;
+import static org.onosproject.net.DeviceId.deviceId;
+import static org.onosproject.net.Link.Type.DIRECT;
+import static org.onosproject.net.PortNumber.portNumber;
public class PathIntentTest extends ConnectivityIntentTest {
// 111:11 --> 222:22
diff --git a/core/api/src/test/java/org/onosproject/net/intent/PointToPointIntentTest.java b/core/api/src/test/java/org/onosproject/net/intent/PointToPointIntentTest.java
index 3fbd2b3..fc18242 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/PointToPointIntentTest.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/PointToPointIntentTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
import org.junit.Test;
diff --git a/core/api/src/test/java/org/onosproject/net/intent/SinglePointToMultiPointIntentTest.java b/core/api/src/test/java/org/onosproject/net/intent/SinglePointToMultiPointIntentTest.java
index eebd3d8..d997de8 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/SinglePointToMultiPointIntentTest.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/SinglePointToMultiPointIntentTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
import org.junit.Test;
diff --git a/core/api/src/test/java/org/onosproject/net/intent/TestInstallableIntent.java b/core/api/src/test/java/org/onosproject/net/intent/TestInstallableIntent.java
index eb4e0f9..4c69bf3 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/TestInstallableIntent.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/TestInstallableIntent.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
-import org.onlab.onos.TestApplicationId;
+import org.onosproject.TestApplicationId;
/**
* An installable intent used in the unit test.
diff --git a/core/api/src/test/java/org/onosproject/net/intent/TestIntent.java b/core/api/src/test/java/org/onosproject/net/intent/TestIntent.java
index dd1a02f..5cdc187 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/TestIntent.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/TestIntent.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
-import org.onlab.onos.TestApplicationId;
+import org.onosproject.TestApplicationId;
/**
* An intent used in the unit test.
diff --git a/core/api/src/test/java/org/onosproject/net/intent/TestSubclassInstallableIntent.java b/core/api/src/test/java/org/onosproject/net/intent/TestSubclassInstallableIntent.java
index ee84c4f..82c1484 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/TestSubclassInstallableIntent.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/TestSubclassInstallableIntent.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
/**
* An intent used in the unit test.
diff --git a/core/api/src/test/java/org/onosproject/net/intent/TestSubclassIntent.java b/core/api/src/test/java/org/onosproject/net/intent/TestSubclassIntent.java
index d50db86..44c8118 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/TestSubclassIntent.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/TestSubclassIntent.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
/**
* An intent used in the unit test.
diff --git a/core/api/src/test/java/org/onosproject/net/intent/TestTools.java b/core/api/src/test/java/org/onosproject/net/intent/TestTools.java
index 68c6f95..80ae180 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/TestTools.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/TestTools.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
import static org.junit.Assert.fail;
diff --git a/core/api/src/test/java/org/onosproject/net/intent/TestableIntentService.java b/core/api/src/test/java/org/onosproject/net/intent/TestableIntentService.java
index a12b565..792c0ff 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/TestableIntentService.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/TestableIntentService.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
import java.util.List;
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 5d7ec37..c4f3a36 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
@@ -13,28 +13,28 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent.constraint;
+package org.onosproject.net.intent.constraint;
import com.google.common.testing.EqualsTester;
import org.junit.Before;
import org.junit.Test;
-import org.onlab.onos.net.DefaultAnnotations;
-import org.onlab.onos.net.DefaultLink;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.onos.net.resource.LinkResourceService;
+import org.onosproject.net.DefaultAnnotations;
+import org.onosproject.net.DefaultLink;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Link;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.provider.ProviderId;
+import org.onosproject.net.resource.LinkResourceService;
import static org.easymock.EasyMock.createMock;
import static org.hamcrest.Matchers.closeTo;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.lessThan;
import static org.junit.Assert.assertThat;
-import static org.onlab.onos.net.DefaultLinkTest.cp;
-import static org.onlab.onos.net.DeviceId.deviceId;
-import static org.onlab.onos.net.Link.Type.DIRECT;
-import static org.onlab.onos.net.PortNumber.portNumber;
+import static org.onosproject.net.DefaultLinkTest.cp;
+import static org.onosproject.net.DeviceId.deviceId;
+import static org.onosproject.net.Link.Type.DIRECT;
+import static org.onosproject.net.PortNumber.portNumber;
/**
* Test for link annotated value threshold.
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 e3531a4..cc7f2dc 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
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent.constraint;
+package org.onosproject.net.intent.constraint;
import org.junit.Test;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.resource.Bandwidth;
-import org.onlab.onos.net.resource.Lambda;
+import org.onosproject.net.Link;
+import org.onosproject.net.resource.Bandwidth;
+import org.onosproject.net.resource.Lambda;
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 d1a280c..3d9429e 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
@@ -13,21 +13,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent.constraint;
+package org.onosproject.net.intent.constraint;
import com.google.common.testing.EqualsTester;
import org.junit.Before;
import org.junit.Test;
-import org.onlab.onos.net.Annotations;
-import org.onlab.onos.net.DefaultAnnotations;
-import org.onlab.onos.net.DefaultLink;
-import org.onlab.onos.net.DefaultPath;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.Path;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.onos.net.resource.LinkResourceService;
+import org.onosproject.net.Annotations;
+import org.onosproject.net.DefaultAnnotations;
+import org.onosproject.net.DefaultLink;
+import org.onosproject.net.DefaultPath;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Link;
+import org.onosproject.net.Path;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.provider.ProviderId;
+import org.onosproject.net.resource.LinkResourceService;
import java.time.Duration;
import java.time.temporal.ChronoUnit;
@@ -37,10 +37,10 @@
import static org.hamcrest.Matchers.closeTo;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
-import static org.onlab.onos.net.AnnotationKeys.LATENCY;
-import static org.onlab.onos.net.DefaultLinkTest.cp;
-import static org.onlab.onos.net.DeviceId.deviceId;
-import static org.onlab.onos.net.Link.Type.DIRECT;
+import static org.onosproject.net.AnnotationKeys.LATENCY;
+import static org.onosproject.net.DefaultLinkTest.cp;
+import static org.onosproject.net.DeviceId.deviceId;
+import static org.onosproject.net.Link.Type.DIRECT;
public class LatencyConstraintTest {
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 65b525b..291610a 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
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent.constraint;
+package org.onosproject.net.intent.constraint;
/**
* Test for constraint of intermediate nodes not passed.
@@ -21,22 +21,22 @@
import com.google.common.testing.EqualsTester;
import org.junit.Before;
import org.junit.Test;
-import org.onlab.onos.net.DefaultLink;
-import org.onlab.onos.net.DefaultPath;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.Path;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.onos.net.resource.LinkResourceService;
+import org.onosproject.net.DefaultLink;
+import org.onosproject.net.DefaultPath;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Path;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.provider.ProviderId;
+import org.onosproject.net.resource.LinkResourceService;
import java.util.Arrays;
import static org.easymock.EasyMock.createMock;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.*;
-import static org.onlab.onos.net.DefaultLinkTest.cp;
-import static org.onlab.onos.net.DeviceId.deviceId;
-import static org.onlab.onos.net.Link.Type.DIRECT;
+import static org.onosproject.net.DefaultLinkTest.cp;
+import static org.onosproject.net.DeviceId.deviceId;
+import static org.onosproject.net.Link.Type.DIRECT;
public class ObstacleConstraintTest {
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 0e8689c..8e15711 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
@@ -13,28 +13,28 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent.constraint;
+package org.onosproject.net.intent.constraint;
import com.google.common.testing.EqualsTester;
import org.junit.Before;
import org.junit.Test;
-import org.onlab.onos.net.DefaultLink;
-import org.onlab.onos.net.DefaultPath;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.Path;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.intent.Constraint;
-import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.onos.net.resource.LinkResourceService;
+import org.onosproject.net.DefaultLink;
+import org.onosproject.net.DefaultPath;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Path;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.intent.Constraint;
+import org.onosproject.net.provider.ProviderId;
+import org.onosproject.net.resource.LinkResourceService;
import java.util.Arrays;
import static org.easymock.EasyMock.createMock;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
-import static org.onlab.onos.net.DefaultLinkTest.cp;
-import static org.onlab.onos.net.DeviceId.deviceId;
-import static org.onlab.onos.net.Link.Type.DIRECT;
+import static org.onosproject.net.DefaultLinkTest.cp;
+import static org.onosproject.net.DeviceId.deviceId;
+import static org.onosproject.net.Link.Type.DIRECT;
/**
* Test for constraint of intermediate elements.
diff --git a/core/api/src/test/java/org/onosproject/net/link/DefaultLinkDescriptionTest.java b/core/api/src/test/java/org/onosproject/net/link/DefaultLinkDescriptionTest.java
index b353bd8..3b98c5b 100644
--- a/core/api/src/test/java/org/onosproject/net/link/DefaultLinkDescriptionTest.java
+++ b/core/api/src/test/java/org/onosproject/net/link/DefaultLinkDescriptionTest.java
@@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.link;
+package org.onosproject.net.link;
import org.junit.Test;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.PortNumber;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.PortNumber;
import static org.junit.Assert.assertEquals;
-import static org.onlab.onos.net.DefaultLinkTest.cp;
-import static org.onlab.onos.net.DeviceId.deviceId;
-import static org.onlab.onos.net.Link.Type.DIRECT;
-import static org.onlab.onos.net.PortNumber.portNumber;
+import static org.onosproject.net.DefaultLinkTest.cp;
+import static org.onosproject.net.DeviceId.deviceId;
+import static org.onosproject.net.Link.Type.DIRECT;
+import static org.onosproject.net.PortNumber.portNumber;
/**
* Test of the default link description.
diff --git a/core/api/src/test/java/org/onosproject/net/link/LinkEventTest.java b/core/api/src/test/java/org/onosproject/net/link/LinkEventTest.java
index 5523c19..307fa69 100644
--- a/core/api/src/test/java/org/onosproject/net/link/LinkEventTest.java
+++ b/core/api/src/test/java/org/onosproject/net/link/LinkEventTest.java
@@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.link;
+package org.onosproject.net.link;
import org.junit.Test;
-import org.onlab.onos.event.AbstractEventTest;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.DefaultLink;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.provider.ProviderId;
+import org.onosproject.event.AbstractEventTest;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DefaultLink;
+import org.onosproject.net.Link;
+import org.onosproject.net.provider.ProviderId;
-import static org.onlab.onos.net.DeviceId.deviceId;
-import static org.onlab.onos.net.PortNumber.portNumber;
+import static org.onosproject.net.DeviceId.deviceId;
+import static org.onosproject.net.PortNumber.portNumber;
/**
* Tests of the device event.
diff --git a/core/api/src/test/java/org/onosproject/net/link/LinkServiceAdapter.java b/core/api/src/test/java/org/onosproject/net/link/LinkServiceAdapter.java
index b22f0a5..5cb84b3 100644
--- a/core/api/src/test/java/org/onosproject/net/link/LinkServiceAdapter.java
+++ b/core/api/src/test/java/org/onosproject/net/link/LinkServiceAdapter.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.link;
+package org.onosproject.net.link;
import java.util.Set;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.Link.State;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Link;
+import org.onosproject.net.Link.State;
import com.google.common.base.Predicate;
import com.google.common.collect.FluentIterable;
diff --git a/core/api/src/test/java/org/onosproject/net/packet/DefaultInboundPacketTest.java b/core/api/src/test/java/org/onosproject/net/packet/DefaultInboundPacketTest.java
index f4884e9..eda6824 100644
--- a/core/api/src/test/java/org/onosproject/net/packet/DefaultInboundPacketTest.java
+++ b/core/api/src/test/java/org/onosproject/net/packet/DefaultInboundPacketTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.packet;
+package org.onosproject.net.packet;
import java.nio.ByteBuffer;
@@ -27,7 +27,7 @@
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.notNullValue;
import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
-import static org.onlab.onos.net.NetTestTools.connectPoint;
+import static org.onosproject.net.NetTestTools.connectPoint;
/**
* Unit tests for the DefaultInboundPacket class.
diff --git a/core/api/src/test/java/org/onosproject/net/packet/DefaultOutboundPacketTest.java b/core/api/src/test/java/org/onosproject/net/packet/DefaultOutboundPacketTest.java
index 1a34473..21f997d 100644
--- a/core/api/src/test/java/org/onosproject/net/packet/DefaultOutboundPacketTest.java
+++ b/core/api/src/test/java/org/onosproject/net/packet/DefaultOutboundPacketTest.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.packet;
+package org.onosproject.net.packet;
import java.nio.ByteBuffer;
import org.junit.Test;
-import org.onlab.onos.net.flow.TrafficTreatment;
-import org.onlab.onos.net.intent.IntentTestsMocks;
+import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.net.intent.IntentTestsMocks;
import org.onlab.packet.Ethernet;
import org.onlab.packet.MacAddress;
@@ -28,7 +28,7 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
-import static org.onlab.onos.net.NetTestTools.did;
+import static org.onosproject.net.NetTestTools.did;
/**
* Unit tests for the DefaultOutboundPacketTest class.
diff --git a/core/api/src/test/java/org/onosproject/net/packet/DefaultPacketContextTest.java b/core/api/src/test/java/org/onosproject/net/packet/DefaultPacketContextTest.java
index 238bcce..ee7ae7e 100644
--- a/core/api/src/test/java/org/onosproject/net/packet/DefaultPacketContextTest.java
+++ b/core/api/src/test/java/org/onosproject/net/packet/DefaultPacketContextTest.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.packet;
+package org.onosproject.net.packet;
import java.nio.ByteBuffer;
import org.junit.Test;
-import org.onlab.onos.net.flow.TrafficTreatment;
-import org.onlab.onos.net.intent.IntentTestsMocks;
+import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.net.intent.IntentTestsMocks;
import org.onlab.packet.Ethernet;
import org.onlab.packet.MacAddress;
@@ -29,8 +29,8 @@
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutableBaseClass;
-import static org.onlab.onos.net.NetTestTools.connectPoint;
-import static org.onlab.onos.net.NetTestTools.did;
+import static org.onosproject.net.NetTestTools.connectPoint;
+import static org.onosproject.net.NetTestTools.did;
/**
* Unit tests for the DefaultPacketContextTest.
diff --git a/core/api/src/test/java/org/onosproject/net/provider/AbstractProviderRegistryTest.java b/core/api/src/test/java/org/onosproject/net/provider/AbstractProviderRegistryTest.java
index adfbdc7..f08d93b 100644
--- a/core/api/src/test/java/org/onosproject/net/provider/AbstractProviderRegistryTest.java
+++ b/core/api/src/test/java/org/onosproject/net/provider/AbstractProviderRegistryTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.provider;
+package org.onosproject.net.provider;
import org.junit.Test;
diff --git a/core/api/src/test/java/org/onosproject/net/provider/AbstractProviderTest.java b/core/api/src/test/java/org/onosproject/net/provider/AbstractProviderTest.java
index b75748a..e9e06c7 100644
--- a/core/api/src/test/java/org/onosproject/net/provider/AbstractProviderTest.java
+++ b/core/api/src/test/java/org/onosproject/net/provider/AbstractProviderTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.provider;
+package org.onosproject.net.provider;
import org.junit.Test;
diff --git a/core/api/src/test/java/org/onosproject/net/provider/ProviderIdTest.java b/core/api/src/test/java/org/onosproject/net/provider/ProviderIdTest.java
index 1f2108e..7e97399 100644
--- a/core/api/src/test/java/org/onosproject/net/provider/ProviderIdTest.java
+++ b/core/api/src/test/java/org/onosproject/net/provider/ProviderIdTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.provider;
+package org.onosproject.net.provider;
import com.google.common.testing.EqualsTester;
import org.junit.Test;
diff --git a/core/api/src/test/java/org/onosproject/net/provider/TestProvider.java b/core/api/src/test/java/org/onosproject/net/provider/TestProvider.java
index 40c5599..2f521bb 100644
--- a/core/api/src/test/java/org/onosproject/net/provider/TestProvider.java
+++ b/core/api/src/test/java/org/onosproject/net/provider/TestProvider.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.provider;
+package org.onosproject.net.provider;
/**
* Test provider fixture.
diff --git a/core/api/src/test/java/org/onosproject/net/topology/ClusterIdTest.java b/core/api/src/test/java/org/onosproject/net/topology/ClusterIdTest.java
index 3fb51e5..1eb6331 100644
--- a/core/api/src/test/java/org/onosproject/net/topology/ClusterIdTest.java
+++ b/core/api/src/test/java/org/onosproject/net/topology/ClusterIdTest.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.topology;
+package org.onosproject.net.topology;
import com.google.common.testing.EqualsTester;
import org.junit.Test;
import static org.junit.Assert.*;
-import static org.onlab.onos.net.topology.ClusterId.clusterId;
+import static org.onosproject.net.topology.ClusterId.clusterId;
/**
* Test of the cluster ID.
diff --git a/core/api/src/test/java/org/onosproject/net/topology/DefaultGraphDescriptionTest.java b/core/api/src/test/java/org/onosproject/net/topology/DefaultGraphDescriptionTest.java
index 5ff93671..8b0f8f0 100644
--- a/core/api/src/test/java/org/onosproject/net/topology/DefaultGraphDescriptionTest.java
+++ b/core/api/src/test/java/org/onosproject/net/topology/DefaultGraphDescriptionTest.java
@@ -13,19 +13,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.topology;
+package org.onosproject.net.topology;
import com.google.common.collect.ImmutableSet;
import org.junit.Test;
-import org.onlab.onos.net.DefaultDevice;
-import org.onlab.onos.net.Device;
-import org.onlab.onos.net.DeviceId;
+import org.onosproject.net.DefaultDevice;
+import org.onosproject.net.Device;
+import org.onosproject.net.DeviceId;
import static org.junit.Assert.assertEquals;
-import static org.onlab.onos.net.Device.Type.SWITCH;
-import static org.onlab.onos.net.DeviceId.deviceId;
-import static org.onlab.onos.net.topology.DefaultTopologyEdgeTest.*;
+import static org.onosproject.net.Device.Type.SWITCH;
+import static org.onosproject.net.DeviceId.deviceId;
+import static org.onosproject.net.topology.DefaultTopologyEdgeTest.*;
public class DefaultGraphDescriptionTest {
diff --git a/core/api/src/test/java/org/onosproject/net/topology/DefaultTopologyClusterTest.java b/core/api/src/test/java/org/onosproject/net/topology/DefaultTopologyClusterTest.java
index 223cce0..199b773 100644
--- a/core/api/src/test/java/org/onosproject/net/topology/DefaultTopologyClusterTest.java
+++ b/core/api/src/test/java/org/onosproject/net/topology/DefaultTopologyClusterTest.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.topology;
+package org.onosproject.net.topology;
import com.google.common.testing.EqualsTester;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
-import static org.onlab.onos.net.DeviceId.deviceId;
-import static org.onlab.onos.net.topology.ClusterId.clusterId;
+import static org.onosproject.net.DeviceId.deviceId;
+import static org.onosproject.net.topology.ClusterId.clusterId;
/**
* Test of the default topology cluster implementation.
diff --git a/core/api/src/test/java/org/onosproject/net/topology/DefaultTopologyEdgeTest.java b/core/api/src/test/java/org/onosproject/net/topology/DefaultTopologyEdgeTest.java
index 9984315..830e9b9f 100644
--- a/core/api/src/test/java/org/onosproject/net/topology/DefaultTopologyEdgeTest.java
+++ b/core/api/src/test/java/org/onosproject/net/topology/DefaultTopologyEdgeTest.java
@@ -13,20 +13,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.topology;
+package org.onosproject.net.topology;
import com.google.common.testing.EqualsTester;
import org.junit.Test;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.DefaultLink;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.provider.ProviderId;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DefaultLink;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Link;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.provider.ProviderId;
import static org.junit.Assert.assertEquals;
-import static org.onlab.onos.net.DeviceId.deviceId;
-import static org.onlab.onos.net.PortNumber.portNumber;
+import static org.onosproject.net.DeviceId.deviceId;
+import static org.onosproject.net.PortNumber.portNumber;
/**
* Tests of the topology graph edge.
diff --git a/core/api/src/test/java/org/onosproject/net/topology/DefaultTopologyVertexTest.java b/core/api/src/test/java/org/onosproject/net/topology/DefaultTopologyVertexTest.java
index ac7974b..aa01d26 100644
--- a/core/api/src/test/java/org/onosproject/net/topology/DefaultTopologyVertexTest.java
+++ b/core/api/src/test/java/org/onosproject/net/topology/DefaultTopologyVertexTest.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.topology;
+package org.onosproject.net.topology;
import com.google.common.testing.EqualsTester;
import org.junit.Test;
-import org.onlab.onos.net.DeviceId;
+import org.onosproject.net.DeviceId;
import static org.junit.Assert.*;
-import static org.onlab.onos.net.DeviceId.deviceId;
+import static org.onosproject.net.DeviceId.deviceId;
/**
* Tests of the topology graph vertex.
diff --git a/core/api/src/test/java/org/onosproject/net/topology/TopologyServiceAdapter.java b/core/api/src/test/java/org/onosproject/net/topology/TopologyServiceAdapter.java
index 7d1d43e..07e6784 100644
--- a/core/api/src/test/java/org/onosproject/net/topology/TopologyServiceAdapter.java
+++ b/core/api/src/test/java/org/onosproject/net/topology/TopologyServiceAdapter.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.topology;
+package org.onosproject.net.topology;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.Path;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Link;
+import org.onosproject.net.Path;
import java.util.Set;
diff --git a/core/json/pom.xml b/core/json/pom.xml
index a425b0d..b93b89a 100644
--- a/core/json/pom.xml
+++ b/core/json/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.onlab.onos</groupId>
+ <groupId>org.onosproject</groupId>
<artifactId>onos-core</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
@@ -33,18 +33,18 @@
<dependencies>
<dependency>
- <groupId>org.onlab.onos</groupId>
+ <groupId>org.onosproject</groupId>
<artifactId>onos-api</artifactId>
</dependency>
<dependency>
- <groupId>org.onlab.onos</groupId>
+ <groupId>org.onosproject</groupId>
<artifactId>onos-api</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.onlab.onos</groupId>
+ <groupId>org.onosproject</groupId>
<artifactId>onos-core-trivial</artifactId>
<version>${project.version}</version>
<scope>test</scope>
diff --git a/core/json/src/main/java/org/onosproject/json/impl/DeleteMe.java b/core/json/src/main/java/org/onosproject/json/impl/DeleteMe.java
index b46510c..e39533c 100644
--- a/core/json/src/main/java/org/onosproject/json/impl/DeleteMe.java
+++ b/core/json/src/main/java/org/onosproject/json/impl/DeleteMe.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.json.impl;
+package org.onosproject.json.impl;
/**
* Created by tom on 10/16/14.
diff --git a/core/json/src/main/java/org/onosproject/json/impl/package-info.java b/core/json/src/main/java/org/onosproject/json/impl/package-info.java
index 9ff299d..11fa30d 100644
--- a/core/json/src/main/java/org/onosproject/json/impl/package-info.java
+++ b/core/json/src/main/java/org/onosproject/json/impl/package-info.java
@@ -17,4 +17,4 @@
/**
* Implementation of JSON codec factory and of the builtin codecs.
*/
-package org.onlab.onos.json.impl;
\ No newline at end of file
+package org.onosproject.json.impl;
diff --git a/core/net/pom.xml b/core/net/pom.xml
index 3a2d052..c1cc9c3 100644
--- a/core/net/pom.xml
+++ b/core/net/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.onlab.onos</groupId>
+ <groupId>org.onosproject</groupId>
<artifactId>onos-core</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
@@ -33,19 +33,19 @@
<dependencies>
<dependency>
- <groupId>org.onlab.onos</groupId>
+ <groupId>org.onosproject</groupId>
<artifactId>onos-api</artifactId>
</dependency>
<dependency>
- <groupId>org.onlab.onos</groupId>
+ <groupId>org.onosproject</groupId>
<artifactId>onos-api</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.onlab.onos</groupId>
+ <groupId>org.onosproject</groupId>
<artifactId>onos-core-trivial</artifactId>
<version>${project.version}</version>
<scope>test</scope>
diff --git a/core/net/src/main/java/org/onosproject/cluster/impl/ClusterManager.java b/core/net/src/main/java/org/onosproject/cluster/impl/ClusterManager.java
index b7259b8..a7c3902 100644
--- a/core/net/src/main/java/org/onosproject/cluster/impl/ClusterManager.java
+++ b/core/net/src/main/java/org/onosproject/cluster/impl/ClusterManager.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cluster.impl;
+package org.onosproject.cluster.impl;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
@@ -21,16 +21,16 @@
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
-import org.onlab.onos.cluster.ClusterAdminService;
-import org.onlab.onos.cluster.ClusterEvent;
-import org.onlab.onos.cluster.ClusterEventListener;
-import org.onlab.onos.cluster.ClusterService;
-import org.onlab.onos.cluster.ClusterStore;
-import org.onlab.onos.cluster.ClusterStoreDelegate;
-import org.onlab.onos.cluster.ControllerNode;
-import org.onlab.onos.cluster.NodeId;
-import org.onlab.onos.event.AbstractListenerRegistry;
-import org.onlab.onos.event.EventDeliveryService;
+import org.onosproject.cluster.ClusterAdminService;
+import org.onosproject.cluster.ClusterEvent;
+import org.onosproject.cluster.ClusterEventListener;
+import org.onosproject.cluster.ClusterService;
+import org.onosproject.cluster.ClusterStore;
+import org.onosproject.cluster.ClusterStoreDelegate;
+import org.onosproject.cluster.ControllerNode;
+import org.onosproject.cluster.NodeId;
+import org.onosproject.event.AbstractListenerRegistry;
+import org.onosproject.event.EventDeliveryService;
import org.onlab.packet.IpAddress;
import org.slf4j.Logger;
diff --git a/core/net/src/main/java/org/onosproject/cluster/impl/MastershipManager.java b/core/net/src/main/java/org/onosproject/cluster/impl/MastershipManager.java
index b316986..1aa86c7 100644
--- a/core/net/src/main/java/org/onosproject/cluster/impl/MastershipManager.java
+++ b/core/net/src/main/java/org/onosproject/cluster/impl/MastershipManager.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cluster.impl;
+package org.onosproject.cluster.impl;
import com.codahale.metrics.Timer;
import com.codahale.metrics.Timer.Context;
@@ -24,25 +24,25 @@
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.metrics.MetricsService;
-import org.onlab.onos.cluster.ClusterEvent;
-import org.onlab.onos.cluster.ClusterEventListener;
-import org.onlab.onos.cluster.ClusterService;
-import org.onlab.onos.cluster.ControllerNode;
-import org.onlab.onos.cluster.NodeId;
-import org.onlab.onos.cluster.RoleInfo;
-import org.onlab.onos.core.MetricsHelper;
-import org.onlab.onos.event.AbstractListenerRegistry;
-import org.onlab.onos.event.EventDeliveryService;
-import org.onlab.onos.mastership.MastershipAdminService;
-import org.onlab.onos.mastership.MastershipEvent;
-import org.onlab.onos.mastership.MastershipListener;
-import org.onlab.onos.mastership.MastershipService;
-import org.onlab.onos.mastership.MastershipStore;
-import org.onlab.onos.mastership.MastershipStoreDelegate;
-import org.onlab.onos.mastership.MastershipTerm;
-import org.onlab.onos.mastership.MastershipTermService;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.MastershipRole;
+import org.onosproject.cluster.ClusterEvent;
+import org.onosproject.cluster.ClusterEventListener;
+import org.onosproject.cluster.ClusterService;
+import org.onosproject.cluster.ControllerNode;
+import org.onosproject.cluster.NodeId;
+import org.onosproject.cluster.RoleInfo;
+import org.onosproject.core.MetricsHelper;
+import org.onosproject.event.AbstractListenerRegistry;
+import org.onosproject.event.EventDeliveryService;
+import org.onosproject.mastership.MastershipAdminService;
+import org.onosproject.mastership.MastershipEvent;
+import org.onosproject.mastership.MastershipListener;
+import org.onosproject.mastership.MastershipService;
+import org.onosproject.mastership.MastershipStore;
+import org.onosproject.mastership.MastershipStoreDelegate;
+import org.onosproject.mastership.MastershipTerm;
+import org.onosproject.mastership.MastershipTermService;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.MastershipRole;
import org.slf4j.Logger;
import java.util.Collection;
@@ -58,8 +58,8 @@
import static com.google.common.collect.Lists.newArrayList;
import static org.onlab.metrics.MetricsUtil.startTimer;
import static org.onlab.metrics.MetricsUtil.stopTimer;
-import static org.onlab.onos.cluster.ControllerNode.State.ACTIVE;
-import static org.onlab.onos.net.MastershipRole.MASTER;
+import static org.onosproject.cluster.ControllerNode.State.ACTIVE;
+import static org.onosproject.net.MastershipRole.MASTER;
import static org.slf4j.LoggerFactory.getLogger;
@Component(immediate = true)
diff --git a/core/net/src/main/java/org/onosproject/cluster/impl/package-info.java b/core/net/src/main/java/org/onosproject/cluster/impl/package-info.java
index 3be5054..653edaa 100644
--- a/core/net/src/main/java/org/onosproject/cluster/impl/package-info.java
+++ b/core/net/src/main/java/org/onosproject/cluster/impl/package-info.java
@@ -17,4 +17,4 @@
/**
* Subsystem for tracking controller cluster nodes.
*/
-package org.onlab.onos.cluster.impl;
+package org.onosproject.cluster.impl;
diff --git a/core/net/src/main/java/org/onosproject/core/impl/BlockAllocatorBasedIdGenerator.java b/core/net/src/main/java/org/onosproject/core/impl/BlockAllocatorBasedIdGenerator.java
index f37e854..ae64559 100644
--- a/core/net/src/main/java/org/onosproject/core/impl/BlockAllocatorBasedIdGenerator.java
+++ b/core/net/src/main/java/org/onosproject/core/impl/BlockAllocatorBasedIdGenerator.java
@@ -1,8 +1,8 @@
-package org.onlab.onos.core.impl;
+package org.onosproject.core.impl;
-import org.onlab.onos.core.IdBlock;
-import org.onlab.onos.core.IdGenerator;
-import org.onlab.onos.core.UnavailableIdException;
+import org.onosproject.core.IdBlock;
+import org.onosproject.core.IdGenerator;
+import org.onosproject.core.UnavailableIdException;
/**
* Base class of {@link IdGenerator} implementations which use {@link IdBlockAllocator} as
diff --git a/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java b/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
index a2611ed..7879062 100644
--- a/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
+++ b/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
@@ -13,19 +13,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.core.impl;
+package org.onosproject.core.impl;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.core.ApplicationIdStore;
-import org.onlab.onos.core.CoreService;
-import org.onlab.onos.core.IdBlockStore;
-import org.onlab.onos.core.IdGenerator;
-import org.onlab.onos.core.Version;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.core.ApplicationIdStore;
+import org.onosproject.core.CoreService;
+import org.onosproject.core.IdBlockStore;
+import org.onosproject.core.IdGenerator;
+import org.onosproject.core.Version;
import org.onlab.util.Tools;
import java.io.File;
diff --git a/core/net/src/main/java/org/onosproject/core/impl/IdBlockAllocator.java b/core/net/src/main/java/org/onosproject/core/impl/IdBlockAllocator.java
index 4e59862..38ac5ed 100644
--- a/core/net/src/main/java/org/onosproject/core/impl/IdBlockAllocator.java
+++ b/core/net/src/main/java/org/onosproject/core/impl/IdBlockAllocator.java
@@ -1,6 +1,6 @@
-package org.onlab.onos.core.impl;
+package org.onosproject.core.impl;
-import org.onlab.onos.core.IdBlock;
+import org.onosproject.core.IdBlock;
/**
* An interface that gives unique ID spaces.
diff --git a/core/net/src/main/java/org/onosproject/core/impl/MetricsManagerComponent.java b/core/net/src/main/java/org/onosproject/core/impl/MetricsManagerComponent.java
index a624cc1..5a3f08d 100644
--- a/core/net/src/main/java/org/onosproject/core/impl/MetricsManagerComponent.java
+++ b/core/net/src/main/java/org/onosproject/core/impl/MetricsManagerComponent.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.core.impl;
+package org.onosproject.core.impl;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
diff --git a/core/net/src/main/java/org/onosproject/core/impl/StoreBasedIdBlockAllocator.java b/core/net/src/main/java/org/onosproject/core/impl/StoreBasedIdBlockAllocator.java
index 11ceccc..67d33ed 100644
--- a/core/net/src/main/java/org/onosproject/core/impl/StoreBasedIdBlockAllocator.java
+++ b/core/net/src/main/java/org/onosproject/core/impl/StoreBasedIdBlockAllocator.java
@@ -1,7 +1,7 @@
-package org.onlab.onos.core.impl;
+package org.onosproject.core.impl;
-import org.onlab.onos.core.IdBlock;
-import org.onlab.onos.core.IdBlockStore;
+import org.onosproject.core.IdBlock;
+import org.onosproject.core.IdBlockStore;
public class StoreBasedIdBlockAllocator implements IdBlockAllocator {
private final IdBlockStore store;
diff --git a/core/net/src/main/java/org/onosproject/core/impl/package-info.java b/core/net/src/main/java/org/onosproject/core/impl/package-info.java
index 0596df2..f8c3e67 100644
--- a/core/net/src/main/java/org/onosproject/core/impl/package-info.java
+++ b/core/net/src/main/java/org/onosproject/core/impl/package-info.java
@@ -17,4 +17,4 @@
/**
* Miscellaneous core system implementations.
*/
-package org.onlab.onos.core.impl;
\ No newline at end of file
+package org.onosproject.core.impl;
diff --git a/core/net/src/main/java/org/onosproject/event/impl/CoreEventDispatcher.java b/core/net/src/main/java/org/onosproject/event/impl/CoreEventDispatcher.java
index 7df0b3c..8cb09aa 100644
--- a/core/net/src/main/java/org/onosproject/event/impl/CoreEventDispatcher.java
+++ b/core/net/src/main/java/org/onosproject/event/impl/CoreEventDispatcher.java
@@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.event.impl;
+package org.onosproject.event.impl;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Service;
-import org.onlab.onos.event.AbstractEvent;
-import org.onlab.onos.event.DefaultEventSinkRegistry;
-import org.onlab.onos.event.Event;
-import org.onlab.onos.event.EventDeliveryService;
-import org.onlab.onos.event.EventSink;
+import org.onosproject.event.AbstractEvent;
+import org.onosproject.event.DefaultEventSinkRegistry;
+import org.onosproject.event.Event;
+import org.onosproject.event.EventDeliveryService;
+import org.onosproject.event.EventSink;
import org.slf4j.Logger;
import java.util.concurrent.BlockingQueue;
diff --git a/core/net/src/main/java/org/onosproject/event/impl/package-info.java b/core/net/src/main/java/org/onosproject/event/impl/package-info.java
index 8d20e75..f0882f3 100644
--- a/core/net/src/main/java/org/onosproject/event/impl/package-info.java
+++ b/core/net/src/main/java/org/onosproject/event/impl/package-info.java
@@ -17,4 +17,4 @@
/**
* Local event dispatching mechanism.
*/
-package org.onlab.onos.event.impl;
+package org.onosproject.event.impl;
diff --git a/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java b/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
index 6c117b8..28dd3dc 100644
--- a/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
+++ b/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.device.impl;
+package org.onosproject.net.device.impl;
import static com.google.common.base.Preconditions.checkNotNull;
-import static org.onlab.onos.net.MastershipRole.*;
+import static org.onosproject.net.MastershipRole.*;
import static org.onlab.util.Tools.namedThreads;
import static org.slf4j.LoggerFactory.getLogger;
@@ -33,36 +33,36 @@
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
-import org.onlab.onos.cluster.ClusterService;
-import org.onlab.onos.cluster.NodeId;
-import org.onlab.onos.event.AbstractListenerRegistry;
-import org.onlab.onos.event.EventDeliveryService;
-import org.onlab.onos.mastership.MastershipEvent;
-import org.onlab.onos.mastership.MastershipListener;
-import org.onlab.onos.mastership.MastershipService;
-import org.onlab.onos.mastership.MastershipTerm;
-import org.onlab.onos.mastership.MastershipTermService;
-import org.onlab.onos.net.Device;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.MastershipRole;
-import org.onlab.onos.net.Port;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.device.DefaultDeviceDescription;
-import org.onlab.onos.net.device.DefaultPortDescription;
-import org.onlab.onos.net.device.DeviceAdminService;
-import org.onlab.onos.net.device.DeviceClockProviderService;
-import org.onlab.onos.net.device.DeviceDescription;
-import org.onlab.onos.net.device.DeviceEvent;
-import org.onlab.onos.net.device.DeviceListener;
-import org.onlab.onos.net.device.DeviceProvider;
-import org.onlab.onos.net.device.DeviceProviderRegistry;
-import org.onlab.onos.net.device.DeviceProviderService;
-import org.onlab.onos.net.device.DeviceService;
-import org.onlab.onos.net.device.DeviceStore;
-import org.onlab.onos.net.device.DeviceStoreDelegate;
-import org.onlab.onos.net.device.PortDescription;
-import org.onlab.onos.net.provider.AbstractProviderRegistry;
-import org.onlab.onos.net.provider.AbstractProviderService;
+import org.onosproject.cluster.ClusterService;
+import org.onosproject.cluster.NodeId;
+import org.onosproject.event.AbstractListenerRegistry;
+import org.onosproject.event.EventDeliveryService;
+import org.onosproject.mastership.MastershipEvent;
+import org.onosproject.mastership.MastershipListener;
+import org.onosproject.mastership.MastershipService;
+import org.onosproject.mastership.MastershipTerm;
+import org.onosproject.mastership.MastershipTermService;
+import org.onosproject.net.Device;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.MastershipRole;
+import org.onosproject.net.Port;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.device.DefaultDeviceDescription;
+import org.onosproject.net.device.DefaultPortDescription;
+import org.onosproject.net.device.DeviceAdminService;
+import org.onosproject.net.device.DeviceClockProviderService;
+import org.onosproject.net.device.DeviceDescription;
+import org.onosproject.net.device.DeviceEvent;
+import org.onosproject.net.device.DeviceListener;
+import org.onosproject.net.device.DeviceProvider;
+import org.onosproject.net.device.DeviceProviderRegistry;
+import org.onosproject.net.device.DeviceProviderService;
+import org.onosproject.net.device.DeviceService;
+import org.onosproject.net.device.DeviceStore;
+import org.onosproject.net.device.DeviceStoreDelegate;
+import org.onosproject.net.device.PortDescription;
+import org.onosproject.net.provider.AbstractProviderRegistry;
+import org.onosproject.net.provider.AbstractProviderService;
import org.slf4j.Logger;
/**
diff --git a/core/net/src/main/java/org/onosproject/net/device/impl/package-info.java b/core/net/src/main/java/org/onosproject/net/device/impl/package-info.java
index fa1cd69..23c2137 100644
--- a/core/net/src/main/java/org/onosproject/net/device/impl/package-info.java
+++ b/core/net/src/main/java/org/onosproject/net/device/impl/package-info.java
@@ -17,4 +17,4 @@
/**
* Core subsystem for tracking global inventory of infrastructure devices.
*/
-package org.onlab.onos.net.device.impl;
+package org.onosproject.net.device.impl;
diff --git a/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java b/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
index 3f37c29..2611a6d 100644
--- a/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
+++ b/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow.impl;
+package org.onosproject.net.flow.impl;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Iterables;
@@ -28,31 +28,31 @@
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.event.AbstractListenerRegistry;
-import org.onlab.onos.event.EventDeliveryService;
-import org.onlab.onos.net.Device;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.device.DeviceService;
-import org.onlab.onos.net.flow.CompletedBatchOperation;
-import org.onlab.onos.net.flow.DefaultFlowEntry;
-import org.onlab.onos.net.flow.FlowEntry;
-import org.onlab.onos.net.flow.FlowRule;
-import org.onlab.onos.net.flow.FlowRuleBatchEntry;
-import org.onlab.onos.net.flow.FlowRuleBatchEntry.FlowRuleOperation;
-import org.onlab.onos.net.flow.FlowRuleBatchEvent;
-import org.onlab.onos.net.flow.FlowRuleBatchOperation;
-import org.onlab.onos.net.flow.FlowRuleBatchRequest;
-import org.onlab.onos.net.flow.FlowRuleEvent;
-import org.onlab.onos.net.flow.FlowRuleListener;
-import org.onlab.onos.net.flow.FlowRuleProvider;
-import org.onlab.onos.net.flow.FlowRuleProviderRegistry;
-import org.onlab.onos.net.flow.FlowRuleProviderService;
-import org.onlab.onos.net.flow.FlowRuleService;
-import org.onlab.onos.net.flow.FlowRuleStore;
-import org.onlab.onos.net.flow.FlowRuleStoreDelegate;
-import org.onlab.onos.net.provider.AbstractProviderRegistry;
-import org.onlab.onos.net.provider.AbstractProviderService;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.event.AbstractListenerRegistry;
+import org.onosproject.event.EventDeliveryService;
+import org.onosproject.net.Device;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.device.DeviceService;
+import org.onosproject.net.flow.CompletedBatchOperation;
+import org.onosproject.net.flow.DefaultFlowEntry;
+import org.onosproject.net.flow.FlowEntry;
+import org.onosproject.net.flow.FlowRule;
+import org.onosproject.net.flow.FlowRuleBatchEntry;
+import org.onosproject.net.flow.FlowRuleBatchEntry.FlowRuleOperation;
+import org.onosproject.net.flow.FlowRuleBatchEvent;
+import org.onosproject.net.flow.FlowRuleBatchOperation;
+import org.onosproject.net.flow.FlowRuleBatchRequest;
+import org.onosproject.net.flow.FlowRuleEvent;
+import org.onosproject.net.flow.FlowRuleListener;
+import org.onosproject.net.flow.FlowRuleProvider;
+import org.onosproject.net.flow.FlowRuleProviderRegistry;
+import org.onosproject.net.flow.FlowRuleProviderService;
+import org.onosproject.net.flow.FlowRuleService;
+import org.onosproject.net.flow.FlowRuleStore;
+import org.onosproject.net.flow.FlowRuleStoreDelegate;
+import org.onosproject.net.provider.AbstractProviderRegistry;
+import org.onosproject.net.provider.AbstractProviderService;
import org.slf4j.Logger;
import java.util.HashSet;
diff --git a/core/net/src/main/java/org/onosproject/net/flow/impl/package-info.java b/core/net/src/main/java/org/onosproject/net/flow/impl/package-info.java
index 109ed37..69934b6 100644
--- a/core/net/src/main/java/org/onosproject/net/flow/impl/package-info.java
+++ b/core/net/src/main/java/org/onosproject/net/flow/impl/package-info.java
@@ -17,4 +17,4 @@
/**
* Core subsystem for tracking and manipulating global flow state.
*/
-package org.onlab.onos.net.flow.impl;
+package org.onosproject.net.flow.impl;
diff --git a/core/net/src/main/java/org/onosproject/net/host/impl/HostManager.java b/core/net/src/main/java/org/onosproject/net/host/impl/HostManager.java
index 5b5e5b7..68aff5e 100644
--- a/core/net/src/main/java/org/onosproject/net/host/impl/HostManager.java
+++ b/core/net/src/main/java/org/onosproject/net/host/impl/HostManager.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.host.impl;
+package org.onosproject.net.host.impl;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.slf4j.LoggerFactory.getLogger;
@@ -26,27 +26,27 @@
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
-import org.onlab.onos.event.AbstractListenerRegistry;
-import org.onlab.onos.event.EventDeliveryService;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.Host;
-import org.onlab.onos.net.HostId;
-import org.onlab.onos.net.device.DeviceService;
-import org.onlab.onos.net.host.HostAdminService;
-import org.onlab.onos.net.host.HostDescription;
-import org.onlab.onos.net.host.HostEvent;
-import org.onlab.onos.net.host.HostListener;
-import org.onlab.onos.net.host.HostProvider;
-import org.onlab.onos.net.host.HostProviderRegistry;
-import org.onlab.onos.net.host.HostProviderService;
-import org.onlab.onos.net.host.HostService;
-import org.onlab.onos.net.host.HostStore;
-import org.onlab.onos.net.host.HostStoreDelegate;
-import org.onlab.onos.net.host.PortAddresses;
-import org.onlab.onos.net.packet.PacketService;
-import org.onlab.onos.net.provider.AbstractProviderRegistry;
-import org.onlab.onos.net.provider.AbstractProviderService;
+import org.onosproject.event.AbstractListenerRegistry;
+import org.onosproject.event.EventDeliveryService;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Host;
+import org.onosproject.net.HostId;
+import org.onosproject.net.device.DeviceService;
+import org.onosproject.net.host.HostAdminService;
+import org.onosproject.net.host.HostDescription;
+import org.onosproject.net.host.HostEvent;
+import org.onosproject.net.host.HostListener;
+import org.onosproject.net.host.HostProvider;
+import org.onosproject.net.host.HostProviderRegistry;
+import org.onosproject.net.host.HostProviderService;
+import org.onosproject.net.host.HostService;
+import org.onosproject.net.host.HostStore;
+import org.onosproject.net.host.HostStoreDelegate;
+import org.onosproject.net.host.PortAddresses;
+import org.onosproject.net.packet.PacketService;
+import org.onosproject.net.provider.AbstractProviderRegistry;
+import org.onosproject.net.provider.AbstractProviderService;
import org.onlab.packet.IpAddress;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
diff --git a/core/net/src/main/java/org/onosproject/net/host/impl/HostMonitor.java b/core/net/src/main/java/org/onosproject/net/host/impl/HostMonitor.java
index d7299e8..bea69f3 100644
--- a/core/net/src/main/java/org/onosproject/net/host/impl/HostMonitor.java
+++ b/core/net/src/main/java/org/onosproject/net/host/impl/HostMonitor.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.host.impl;
+package org.onosproject.net.host.impl;
import java.nio.ByteBuffer;
import java.util.ArrayList;
@@ -26,23 +26,23 @@
import org.jboss.netty.util.Timeout;
import org.jboss.netty.util.TimerTask;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.Device;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.Host;
-import org.onlab.onos.net.Port;
-import org.onlab.onos.net.device.DeviceService;
-import org.onlab.onos.net.flow.DefaultTrafficTreatment;
-import org.onlab.onos.net.flow.TrafficTreatment;
-import org.onlab.onos.net.flow.instructions.Instruction;
-import org.onlab.onos.net.flow.instructions.Instructions;
-import org.onlab.onos.net.host.HostProvider;
-import org.onlab.onos.net.host.InterfaceIpAddress;
-import org.onlab.onos.net.host.PortAddresses;
-import org.onlab.onos.net.packet.DefaultOutboundPacket;
-import org.onlab.onos.net.packet.OutboundPacket;
-import org.onlab.onos.net.packet.PacketService;
-import org.onlab.onos.net.provider.ProviderId;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.Device;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Host;
+import org.onosproject.net.Port;
+import org.onosproject.net.device.DeviceService;
+import org.onosproject.net.flow.DefaultTrafficTreatment;
+import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.net.flow.instructions.Instruction;
+import org.onosproject.net.flow.instructions.Instructions;
+import org.onosproject.net.host.HostProvider;
+import org.onosproject.net.host.InterfaceIpAddress;
+import org.onosproject.net.host.PortAddresses;
+import org.onosproject.net.packet.DefaultOutboundPacket;
+import org.onosproject.net.packet.OutboundPacket;
+import org.onosproject.net.packet.PacketService;
+import org.onosproject.net.provider.ProviderId;
import org.onlab.packet.ARP;
import org.onlab.packet.Ethernet;
import org.onlab.packet.IpAddress;
diff --git a/core/net/src/main/java/org/onosproject/net/host/impl/package-info.java b/core/net/src/main/java/org/onosproject/net/host/impl/package-info.java
index 32ce565..1f7d588 100644
--- a/core/net/src/main/java/org/onosproject/net/host/impl/package-info.java
+++ b/core/net/src/main/java/org/onosproject/net/host/impl/package-info.java
@@ -17,4 +17,4 @@
/**
* Core subsystem for tracking global inventory of end-station hosts.
*/
-package org.onlab.onos.net.host.impl;
+package org.onosproject.net.host.impl;
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/ConnectivityIntentCompiler.java b/core/net/src/main/java/org/onosproject/net/intent/impl/ConnectivityIntentCompiler.java
index a34f920..e029c78 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/ConnectivityIntentCompiler.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/ConnectivityIntentCompiler.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent.impl;
+package org.onosproject.net.intent.impl;
import com.google.common.base.Predicate;
import com.google.common.collect.FluentIterable;
@@ -21,17 +21,17 @@
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
-import org.onlab.onos.net.ElementId;
-import org.onlab.onos.net.Path;
-import org.onlab.onos.net.intent.ConnectivityIntent;
-import org.onlab.onos.net.intent.Constraint;
-import org.onlab.onos.net.intent.IntentCompiler;
-import org.onlab.onos.net.intent.IntentExtensionService;
-import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.onos.net.resource.LinkResourceService;
-import org.onlab.onos.net.topology.LinkWeight;
-import org.onlab.onos.net.topology.PathService;
-import org.onlab.onos.net.topology.TopologyEdge;
+import org.onosproject.net.ElementId;
+import org.onosproject.net.Path;
+import org.onosproject.net.intent.ConnectivityIntent;
+import org.onosproject.net.intent.Constraint;
+import org.onosproject.net.intent.IntentCompiler;
+import org.onosproject.net.intent.IntentExtensionService;
+import org.onosproject.net.provider.ProviderId;
+import org.onosproject.net.resource.LinkResourceService;
+import org.onosproject.net.topology.LinkWeight;
+import org.onosproject.net.topology.PathService;
+import org.onosproject.net.topology.TopologyEdge;
import java.util.Collections;
import java.util.Iterator;
@@ -40,13 +40,13 @@
/**
* Base class for compilers of various
- * {@link org.onlab.onos.net.intent.ConnectivityIntent connectivity intents}.
+ * {@link org.onosproject.net.intent.ConnectivityIntent connectivity intents}.
*/
@Component(immediate = true)
public abstract class ConnectivityIntentCompiler<T extends ConnectivityIntent>
implements IntentCompiler<T> {
- private static final ProviderId PID = new ProviderId("core", "org.onlab.onos.core", true);
+ private static final ProviderId PID = new ProviderId("core", "org.onosproject.core", true);
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected IntentExtensionService intentManager;
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/HostToHostIntentCompiler.java b/core/net/src/main/java/org/onosproject/net/intent/impl/HostToHostIntentCompiler.java
index 89c4aba..dfd5d22 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/HostToHostIntentCompiler.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/HostToHostIntentCompiler.java
@@ -13,32 +13,32 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent.impl;
+package org.onosproject.net.intent.impl;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
-import org.onlab.onos.net.DefaultLink;
-import org.onlab.onos.net.DefaultPath;
-import org.onlab.onos.net.Host;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.Path;
-import org.onlab.onos.net.flow.TrafficSelector;
-import org.onlab.onos.net.host.HostService;
-import org.onlab.onos.net.intent.HostToHostIntent;
-import org.onlab.onos.net.intent.Intent;
-import org.onlab.onos.net.intent.PathIntent;
-import org.onlab.onos.net.intent.constraint.AsymmetricPathConstraint;
-import org.onlab.onos.net.resource.LinkResourceAllocations;
+import org.onosproject.net.DefaultLink;
+import org.onosproject.net.DefaultPath;
+import org.onosproject.net.Host;
+import org.onosproject.net.Link;
+import org.onosproject.net.Path;
+import org.onosproject.net.flow.TrafficSelector;
+import org.onosproject.net.host.HostService;
+import org.onosproject.net.intent.HostToHostIntent;
+import org.onosproject.net.intent.Intent;
+import org.onosproject.net.intent.PathIntent;
+import org.onosproject.net.intent.constraint.AsymmetricPathConstraint;
+import org.onosproject.net.resource.LinkResourceAllocations;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
-import static org.onlab.onos.net.flow.DefaultTrafficSelector.builder;
+import static org.onosproject.net.flow.DefaultTrafficSelector.builder;
/**
* A intent compiler for {@link HostToHostIntent}.
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentCompilationException.java b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentCompilationException.java
index 2f8e692..ae93336 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentCompilationException.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentCompilationException.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent.impl;
+package org.onosproject.net.intent.impl;
-import org.onlab.onos.net.intent.IntentException;
+import org.onosproject.net.intent.IntentException;
/**
* An exception thrown when a intent compilation fails.
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentInstallationException.java b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentInstallationException.java
index c98468f..db21fe4 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentInstallationException.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentInstallationException.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent.impl;
+package org.onosproject.net.intent.impl;
-import org.onlab.onos.net.intent.IntentException;
+import org.onosproject.net.intent.IntentException;
/**
* An exception thrown when intent installation fails.
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
index 56ea650..e771584 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent.impl;
+package org.onosproject.net.intent.impl;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
@@ -25,31 +25,31 @@
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.core.CoreService;
-import org.onlab.onos.core.IdGenerator;
-import org.onlab.onos.event.AbstractListenerRegistry;
-import org.onlab.onos.event.EventDeliveryService;
-import org.onlab.onos.net.flow.CompletedBatchOperation;
-import org.onlab.onos.net.flow.FlowRuleBatchOperation;
-import org.onlab.onos.net.flow.FlowRuleService;
-import org.onlab.onos.net.intent.Intent;
-import org.onlab.onos.net.intent.IntentBatchDelegate;
-import org.onlab.onos.net.intent.IntentBatchService;
-import org.onlab.onos.net.intent.IntentCompiler;
-import org.onlab.onos.net.intent.IntentEvent;
-import org.onlab.onos.net.intent.IntentException;
-import org.onlab.onos.net.intent.IntentExtensionService;
-import org.onlab.onos.net.intent.IntentId;
-import org.onlab.onos.net.intent.IntentInstaller;
-import org.onlab.onos.net.intent.IntentListener;
-import org.onlab.onos.net.intent.IntentOperation;
-import org.onlab.onos.net.intent.IntentOperations;
-import org.onlab.onos.net.intent.IntentService;
-import org.onlab.onos.net.intent.IntentState;
-import org.onlab.onos.net.intent.IntentStore;
-import org.onlab.onos.net.intent.IntentStore.BatchWrite;
-import org.onlab.onos.net.intent.IntentStoreDelegate;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.core.CoreService;
+import org.onosproject.core.IdGenerator;
+import org.onosproject.event.AbstractListenerRegistry;
+import org.onosproject.event.EventDeliveryService;
+import org.onosproject.net.flow.CompletedBatchOperation;
+import org.onosproject.net.flow.FlowRuleBatchOperation;
+import org.onosproject.net.flow.FlowRuleService;
+import org.onosproject.net.intent.Intent;
+import org.onosproject.net.intent.IntentBatchDelegate;
+import org.onosproject.net.intent.IntentBatchService;
+import org.onosproject.net.intent.IntentCompiler;
+import org.onosproject.net.intent.IntentEvent;
+import org.onosproject.net.intent.IntentException;
+import org.onosproject.net.intent.IntentExtensionService;
+import org.onosproject.net.intent.IntentId;
+import org.onosproject.net.intent.IntentInstaller;
+import org.onosproject.net.intent.IntentListener;
+import org.onosproject.net.intent.IntentOperation;
+import org.onosproject.net.intent.IntentOperations;
+import org.onosproject.net.intent.IntentService;
+import org.onosproject.net.intent.IntentState;
+import org.onosproject.net.intent.IntentStore;
+import org.onosproject.net.intent.IntentStore.BatchWrite;
+import org.onosproject.net.intent.IntentStoreDelegate;
import org.slf4j.Logger;
import java.util.ArrayList;
@@ -68,7 +68,7 @@
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static java.util.concurrent.Executors.newFixedThreadPool;
-import static org.onlab.onos.net.intent.IntentState.*;
+import static org.onosproject.net.intent.IntentState.*;
import static org.onlab.util.Tools.namedThreads;
import static org.slf4j.LoggerFactory.getLogger;
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentRemovalException.java b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentRemovalException.java
index ec0586a..20530c0 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentRemovalException.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentRemovalException.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent.impl;
+package org.onosproject.net.intent.impl;
-import org.onlab.onos.net.intent.IntentException;
+import org.onosproject.net.intent.IntentException;
/**
* An exception thrown when intent removal failed.
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/LinkCollectionIntentInstaller.java b/core/net/src/main/java/org/onosproject/net/intent/impl/LinkCollectionIntentInstaller.java
index 66e5fb1..9d350b5 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/LinkCollectionIntentInstaller.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/LinkCollectionIntentInstaller.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent.impl;
+package org.onosproject.net.intent.impl;
import java.util.HashMap;
import java.util.HashSet;
@@ -27,30 +27,30 @@
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.core.CoreService;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.flow.DefaultFlowRule;
-import org.onlab.onos.net.flow.DefaultTrafficSelector;
-import org.onlab.onos.net.flow.DefaultTrafficTreatment;
-import org.onlab.onos.net.flow.FlowRule;
-import org.onlab.onos.net.flow.FlowRuleBatchEntry;
-import org.onlab.onos.net.flow.FlowRuleBatchEntry.FlowRuleOperation;
-import org.onlab.onos.net.flow.FlowRuleBatchOperation;
-import org.onlab.onos.net.flow.TrafficSelector;
-import org.onlab.onos.net.flow.TrafficTreatment;
-import org.onlab.onos.net.intent.IntentExtensionService;
-import org.onlab.onos.net.intent.IntentInstaller;
-import org.onlab.onos.net.intent.LinkCollectionIntent;
-import org.onlab.onos.net.intent.PathIntent;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.core.CoreService;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Link;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.flow.DefaultFlowRule;
+import org.onosproject.net.flow.DefaultTrafficSelector;
+import org.onosproject.net.flow.DefaultTrafficTreatment;
+import org.onosproject.net.flow.FlowRule;
+import org.onosproject.net.flow.FlowRuleBatchEntry;
+import org.onosproject.net.flow.FlowRuleBatchEntry.FlowRuleOperation;
+import org.onosproject.net.flow.FlowRuleBatchOperation;
+import org.onosproject.net.flow.TrafficSelector;
+import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.net.intent.IntentExtensionService;
+import org.onosproject.net.intent.IntentInstaller;
+import org.onosproject.net.intent.LinkCollectionIntent;
+import org.onosproject.net.intent.PathIntent;
import com.google.common.collect.Lists;
/**
- * Installer for {@link org.onlab.onos.net.intent.LinkCollectionIntent} path
+ * Installer for {@link org.onosproject.net.intent.LinkCollectionIntent} path
* segment intents.
*/
@Component(immediate = true)
@@ -67,7 +67,7 @@
@Activate
public void activate() {
- appId = coreService.registerApplication("org.onlab.onos.net.intent");
+ appId = coreService.registerApplication("org.onosproject.net.intent");
intentManager.registerInstaller(LinkCollectionIntent.class, this);
}
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/MultiPointToSinglePointIntentCompiler.java b/core/net/src/main/java/org/onosproject/net/intent/impl/MultiPointToSinglePointIntentCompiler.java
index 047ace2..6fb94c9 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/MultiPointToSinglePointIntentCompiler.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/MultiPointToSinglePointIntentCompiler.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent.impl;
+package org.onosproject.net.intent.impl;
import java.util.Arrays;
import java.util.HashMap;
@@ -26,24 +26,24 @@
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.Path;
-import org.onlab.onos.net.intent.Intent;
-import org.onlab.onos.net.intent.IntentCompiler;
-import org.onlab.onos.net.intent.IntentExtensionService;
-import org.onlab.onos.net.intent.LinkCollectionIntent;
-import org.onlab.onos.net.intent.MultiPointToSinglePointIntent;
-import org.onlab.onos.net.intent.PointToPointIntent;
-import org.onlab.onos.net.resource.LinkResourceAllocations;
-import org.onlab.onos.net.topology.PathService;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Link;
+import org.onosproject.net.Path;
+import org.onosproject.net.intent.Intent;
+import org.onosproject.net.intent.IntentCompiler;
+import org.onosproject.net.intent.IntentExtensionService;
+import org.onosproject.net.intent.LinkCollectionIntent;
+import org.onosproject.net.intent.MultiPointToSinglePointIntent;
+import org.onosproject.net.intent.PointToPointIntent;
+import org.onosproject.net.resource.LinkResourceAllocations;
+import org.onosproject.net.topology.PathService;
import com.google.common.collect.Sets;
/**
* An intent compiler for
- * {@link org.onlab.onos.net.intent.MultiPointToSinglePointIntent}.
+ * {@link org.onosproject.net.intent.MultiPointToSinglePointIntent}.
*/
@Component(immediate = true)
public class MultiPointToSinglePointIntentCompiler
@@ -96,7 +96,7 @@
* @param one start of the path
* @param two end of the path
* @return Path between the two
- * @throws org.onlab.onos.net.intent.impl.PathNotFoundException if a path cannot be found
+ * @throws org.onosproject.net.intent.impl.PathNotFoundException if a path cannot be found
*/
private Path getPath(ConnectPoint one, ConnectPoint two) {
Set<Path> paths = pathService.getPaths(one.deviceId(), two.deviceId());
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/ObjectiveTracker.java b/core/net/src/main/java/org/onosproject/net/intent/impl/ObjectiveTracker.java
index ec22bd2..fc010ae 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/ObjectiveTracker.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/ObjectiveTracker.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent.impl;
+package org.onosproject.net.intent.impl;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Lists;
@@ -24,23 +24,23 @@
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.event.Event;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.LinkKey;
-import org.onlab.onos.net.NetworkResource;
-import org.onlab.onos.net.intent.IntentBatchLeaderEvent;
-import org.onlab.onos.net.intent.IntentBatchListener;
-import org.onlab.onos.net.intent.IntentBatchService;
-import org.onlab.onos.net.intent.IntentId;
-import org.onlab.onos.net.intent.IntentService;
-import org.onlab.onos.net.link.LinkEvent;
-import org.onlab.onos.net.resource.LinkResourceEvent;
-import org.onlab.onos.net.resource.LinkResourceListener;
-import org.onlab.onos.net.resource.LinkResourceService;
-import org.onlab.onos.net.topology.TopologyEvent;
-import org.onlab.onos.net.topology.TopologyListener;
-import org.onlab.onos.net.topology.TopologyService;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.event.Event;
+import org.onosproject.net.Link;
+import org.onosproject.net.LinkKey;
+import org.onosproject.net.NetworkResource;
+import org.onosproject.net.intent.IntentBatchLeaderEvent;
+import org.onosproject.net.intent.IntentBatchListener;
+import org.onosproject.net.intent.IntentBatchService;
+import org.onosproject.net.intent.IntentId;
+import org.onosproject.net.intent.IntentService;
+import org.onosproject.net.link.LinkEvent;
+import org.onosproject.net.resource.LinkResourceEvent;
+import org.onosproject.net.resource.LinkResourceListener;
+import org.onosproject.net.resource.LinkResourceService;
+import org.onosproject.net.topology.TopologyEvent;
+import org.onosproject.net.topology.TopologyListener;
+import org.onosproject.net.topology.TopologyService;
import org.slf4j.Logger;
import java.util.Collection;
@@ -52,9 +52,9 @@
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.Multimaps.synchronizedSetMultimap;
import static java.util.concurrent.Executors.newSingleThreadExecutor;
-import static org.onlab.onos.net.LinkKey.linkKey;
-import static org.onlab.onos.net.link.LinkEvent.Type.LINK_REMOVED;
-import static org.onlab.onos.net.link.LinkEvent.Type.LINK_UPDATED;
+import static org.onosproject.net.LinkKey.linkKey;
+import static org.onosproject.net.link.LinkEvent.Type.LINK_REMOVED;
+import static org.onosproject.net.link.LinkEvent.Type.LINK_UPDATED;
import static org.onlab.util.Tools.namedThreads;
import static org.slf4j.LoggerFactory.getLogger;
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/ObjectiveTrackerService.java b/core/net/src/main/java/org/onosproject/net/intent/impl/ObjectiveTrackerService.java
index 4dafcba..404af9b 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/ObjectiveTrackerService.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/ObjectiveTrackerService.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent.impl;
+package org.onosproject.net.intent.impl;
-import org.onlab.onos.net.NetworkResource;
-import org.onlab.onos.net.intent.IntentId;
+import org.onosproject.net.NetworkResource;
+import org.onosproject.net.intent.IntentId;
import java.util.Collection;
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/OpticalConnectivityIntentCompiler.java b/core/net/src/main/java/org/onosproject/net/intent/impl/OpticalConnectivityIntentCompiler.java
index 85c9f29..4eb78a0 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/OpticalConnectivityIntentCompiler.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/OpticalConnectivityIntentCompiler.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent.impl;
+package org.onosproject.net.intent.impl;
import com.google.common.collect.ImmutableList;
import org.apache.felix.scr.annotations.Activate;
@@ -21,25 +21,25 @@
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.Path;
-import org.onlab.onos.net.intent.Intent;
-import org.onlab.onos.net.intent.IntentCompiler;
-import org.onlab.onos.net.intent.IntentExtensionService;
-import org.onlab.onos.net.intent.OpticalConnectivityIntent;
-import org.onlab.onos.net.intent.OpticalPathIntent;
-import org.onlab.onos.net.resource.LinkResourceAllocations;
-import org.onlab.onos.net.topology.LinkWeight;
-import org.onlab.onos.net.topology.Topology;
-import org.onlab.onos.net.topology.TopologyEdge;
-import org.onlab.onos.net.topology.TopologyService;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.Link;
+import org.onosproject.net.Path;
+import org.onosproject.net.intent.Intent;
+import org.onosproject.net.intent.IntentCompiler;
+import org.onosproject.net.intent.IntentExtensionService;
+import org.onosproject.net.intent.OpticalConnectivityIntent;
+import org.onosproject.net.intent.OpticalPathIntent;
+import org.onosproject.net.resource.LinkResourceAllocations;
+import org.onosproject.net.topology.LinkWeight;
+import org.onosproject.net.topology.Topology;
+import org.onosproject.net.topology.TopologyEdge;
+import org.onosproject.net.topology.TopologyService;
import java.util.List;
import java.util.Set;
/**
- * An intent compiler for {@link org.onlab.onos.net.intent.OpticalConnectivityIntent}.
+ * An intent compiler for {@link org.onosproject.net.intent.OpticalConnectivityIntent}.
*/
@Component(immediate = true)
public class OpticalConnectivityIntentCompiler implements IntentCompiler<OpticalConnectivityIntent> {
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/OpticalPathIntentInstaller.java b/core/net/src/main/java/org/onosproject/net/intent/impl/OpticalPathIntentInstaller.java
index 0321064..e37140d 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/OpticalPathIntentInstaller.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/OpticalPathIntentInstaller.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent.impl;
+package org.onosproject.net.intent.impl;
import com.google.common.collect.Lists;
import org.apache.felix.scr.annotations.Activate;
@@ -21,41 +21,41 @@
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.core.CoreService;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.flow.DefaultFlowRule;
-import org.onlab.onos.net.flow.DefaultTrafficSelector;
-import org.onlab.onos.net.flow.DefaultTrafficTreatment;
-import org.onlab.onos.net.flow.FlowRule;
-import org.onlab.onos.net.flow.FlowRuleBatchEntry;
-import org.onlab.onos.net.flow.FlowRuleBatchEntry.FlowRuleOperation;
-import org.onlab.onos.net.flow.FlowRuleBatchOperation;
-import org.onlab.onos.net.flow.FlowRuleService;
-import org.onlab.onos.net.flow.TrafficSelector;
-import org.onlab.onos.net.flow.TrafficTreatment;
-import org.onlab.onos.net.intent.IntentExtensionService;
-import org.onlab.onos.net.intent.IntentInstaller;
-import org.onlab.onos.net.intent.OpticalPathIntent;
-import org.onlab.onos.net.resource.DefaultLinkResourceRequest;
-import org.onlab.onos.net.resource.Lambda;
-import org.onlab.onos.net.resource.LambdaResourceAllocation;
-import org.onlab.onos.net.resource.LinkResourceAllocations;
-import org.onlab.onos.net.resource.LinkResourceRequest;
-import org.onlab.onos.net.resource.LinkResourceService;
-import org.onlab.onos.net.resource.ResourceAllocation;
-import org.onlab.onos.net.resource.ResourceType;
-import org.onlab.onos.net.topology.TopologyService;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.core.CoreService;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.Link;
+import org.onosproject.net.flow.DefaultFlowRule;
+import org.onosproject.net.flow.DefaultTrafficSelector;
+import org.onosproject.net.flow.DefaultTrafficTreatment;
+import org.onosproject.net.flow.FlowRule;
+import org.onosproject.net.flow.FlowRuleBatchEntry;
+import org.onosproject.net.flow.FlowRuleBatchEntry.FlowRuleOperation;
+import org.onosproject.net.flow.FlowRuleBatchOperation;
+import org.onosproject.net.flow.FlowRuleService;
+import org.onosproject.net.flow.TrafficSelector;
+import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.net.intent.IntentExtensionService;
+import org.onosproject.net.intent.IntentInstaller;
+import org.onosproject.net.intent.OpticalPathIntent;
+import org.onosproject.net.resource.DefaultLinkResourceRequest;
+import org.onosproject.net.resource.Lambda;
+import org.onosproject.net.resource.LambdaResourceAllocation;
+import org.onosproject.net.resource.LinkResourceAllocations;
+import org.onosproject.net.resource.LinkResourceRequest;
+import org.onosproject.net.resource.LinkResourceService;
+import org.onosproject.net.resource.ResourceAllocation;
+import org.onosproject.net.resource.ResourceType;
+import org.onosproject.net.topology.TopologyService;
import org.slf4j.Logger;
import java.util.List;
-import static org.onlab.onos.net.flow.DefaultTrafficTreatment.builder;
+import static org.onosproject.net.flow.DefaultTrafficTreatment.builder;
import static org.slf4j.LoggerFactory.getLogger;
/**
- * Installer for {@link org.onlab.onos.net.intent.OpticalPathIntent optical path connectivity intents}.
+ * Installer for {@link org.onosproject.net.intent.OpticalPathIntent optical path connectivity intents}.
*/
@Component(immediate = true)
public class OpticalPathIntentInstaller implements IntentInstaller<OpticalPathIntent> {
@@ -83,7 +83,7 @@
@Activate
public void activate() {
- appId = coreService.registerApplication("org.onlab.onos.net.intent");
+ appId = coreService.registerApplication("org.onosproject.net.intent");
intentManager.registerInstaller(OpticalPathIntent.class, this);
}
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/PathIntentInstaller.java b/core/net/src/main/java/org/onosproject/net/intent/impl/PathIntentInstaller.java
index d655cbe..2c21af6 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/PathIntentInstaller.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/PathIntentInstaller.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent.impl;
+package org.onosproject.net.intent.impl;
import java.util.Iterator;
import java.util.List;
@@ -23,31 +23,31 @@
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.core.CoreService;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.flow.DefaultFlowRule;
-import org.onlab.onos.net.flow.DefaultTrafficSelector;
-import org.onlab.onos.net.flow.FlowRule;
-import org.onlab.onos.net.flow.FlowRuleBatchEntry;
-import org.onlab.onos.net.flow.FlowRuleBatchEntry.FlowRuleOperation;
-import org.onlab.onos.net.flow.FlowRuleBatchOperation;
-import org.onlab.onos.net.flow.TrafficSelector;
-import org.onlab.onos.net.flow.TrafficTreatment;
-import org.onlab.onos.net.intent.Constraint;
-import org.onlab.onos.net.intent.IntentExtensionService;
-import org.onlab.onos.net.intent.IntentInstaller;
-import org.onlab.onos.net.intent.PathIntent;
-import org.onlab.onos.net.resource.DefaultLinkResourceRequest;
-import org.onlab.onos.net.resource.LinkResourceAllocations;
-import org.onlab.onos.net.resource.LinkResourceRequest;
-import org.onlab.onos.net.resource.LinkResourceService;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.core.CoreService;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.Link;
+import org.onosproject.net.flow.DefaultFlowRule;
+import org.onosproject.net.flow.DefaultTrafficSelector;
+import org.onosproject.net.flow.FlowRule;
+import org.onosproject.net.flow.FlowRuleBatchEntry;
+import org.onosproject.net.flow.FlowRuleBatchEntry.FlowRuleOperation;
+import org.onosproject.net.flow.FlowRuleBatchOperation;
+import org.onosproject.net.flow.TrafficSelector;
+import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.net.intent.Constraint;
+import org.onosproject.net.intent.IntentExtensionService;
+import org.onosproject.net.intent.IntentInstaller;
+import org.onosproject.net.intent.PathIntent;
+import org.onosproject.net.resource.DefaultLinkResourceRequest;
+import org.onosproject.net.resource.LinkResourceAllocations;
+import org.onosproject.net.resource.LinkResourceRequest;
+import org.onosproject.net.resource.LinkResourceService;
import org.slf4j.Logger;
import com.google.common.collect.Lists;
-import static org.onlab.onos.net.flow.DefaultTrafficTreatment.builder;
+import static org.onosproject.net.flow.DefaultTrafficTreatment.builder;
import static org.slf4j.LoggerFactory.getLogger;
/**
@@ -71,7 +71,7 @@
@Activate
public void activate() {
- appId = coreService.registerApplication("org.onlab.onos.net.intent");
+ appId = coreService.registerApplication("org.onosproject.net.intent");
intentManager.registerInstaller(PathIntent.class, this);
}
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/PathNotFoundException.java b/core/net/src/main/java/org/onosproject/net/intent/impl/PathNotFoundException.java
index 536b7e0..32f1e35 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/PathNotFoundException.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/PathNotFoundException.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent.impl;
+package org.onosproject.net.intent.impl;
-import org.onlab.onos.net.intent.IntentException;
+import org.onosproject.net.intent.IntentException;
/**
* An exception thrown when a path is not found.
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/PointToPointIntentCompiler.java b/core/net/src/main/java/org/onosproject/net/intent/impl/PointToPointIntentCompiler.java
index b124602..cd5ab4b 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/PointToPointIntentCompiler.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/PointToPointIntentCompiler.java
@@ -13,30 +13,30 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent.impl;
+package org.onosproject.net.intent.impl;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.DefaultPath;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.Path;
-import org.onlab.onos.net.intent.Intent;
-import org.onlab.onos.net.intent.PathIntent;
-import org.onlab.onos.net.intent.PointToPointIntent;
-import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.onos.net.resource.LinkResourceAllocations;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DefaultPath;
+import org.onosproject.net.Link;
+import org.onosproject.net.Path;
+import org.onosproject.net.intent.Intent;
+import org.onosproject.net.intent.PathIntent;
+import org.onosproject.net.intent.PointToPointIntent;
+import org.onosproject.net.provider.ProviderId;
+import org.onosproject.net.resource.LinkResourceAllocations;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import static java.util.Arrays.asList;
-import static org.onlab.onos.net.DefaultEdgeLink.createEdgeLink;
+import static org.onosproject.net.DefaultEdgeLink.createEdgeLink;
/**
- * An intent compiler for {@link org.onlab.onos.net.intent.PointToPointIntent}.
+ * An intent compiler for {@link org.onosproject.net.intent.PointToPointIntent}.
*/
@Component(immediate = true)
public class PointToPointIntentCompiler
@@ -44,7 +44,7 @@
// TODO: use off-the-shell core provider ID
private static final ProviderId PID =
- new ProviderId("core", "org.onlab.onos.core", true);
+ new ProviderId("core", "org.onosproject.core", true);
// TODO: consider whether the default cost is appropriate or not
public static final int DEFAULT_COST = 1;
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/SinglePointToMultiPointIntentCompiler.java b/core/net/src/main/java/org/onosproject/net/intent/impl/SinglePointToMultiPointIntentCompiler.java
index 46689ec..8586201 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/SinglePointToMultiPointIntentCompiler.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/SinglePointToMultiPointIntentCompiler.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.net.intent.impl;
+package org.onosproject.net.intent.impl;
import java.util.Arrays;
import java.util.HashSet;
@@ -8,14 +8,14 @@
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.Path;
-import org.onlab.onos.net.intent.Intent;
-import org.onlab.onos.net.intent.LinkCollectionIntent;
-import org.onlab.onos.net.intent.SinglePointToMultiPointIntent;
-import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.onos.net.resource.LinkResourceAllocations;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.Link;
+import org.onosproject.net.Path;
+import org.onosproject.net.intent.Intent;
+import org.onosproject.net.intent.LinkCollectionIntent;
+import org.onosproject.net.intent.SinglePointToMultiPointIntent;
+import org.onosproject.net.provider.ProviderId;
+import org.onosproject.net.resource.LinkResourceAllocations;
@Component(immediate = true)
public class SinglePointToMultiPointIntentCompiler
@@ -23,7 +23,7 @@
// TODO: use off-the-shell core provider ID
private static final ProviderId PID =
- new ProviderId("core", "org.onlab.onos.core", true);
+ new ProviderId("core", "org.onosproject.core", true);
@Activate
public void activate() {
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/TopologyChangeDelegate.java b/core/net/src/main/java/org/onosproject/net/intent/impl/TopologyChangeDelegate.java
index 325b790..5eeb7c2 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/TopologyChangeDelegate.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/TopologyChangeDelegate.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent.impl;
+package org.onosproject.net.intent.impl;
-import org.onlab.onos.net.intent.IntentId;
+import org.onosproject.net.intent.IntentId;
/**
* Auxiliary delegate for integration of intent manager and flow trackerService.
@@ -25,7 +25,7 @@
/**
* Notifies that topology has changed in such a way that the specified
* intents should be recompiled. If the {@code compileAllFailed} parameter
- * is true, then all intents in {@link org.onlab.onos.net.intent.IntentState#FAILED}
+ * is true, then all intents in {@link org.onosproject.net.intent.IntentState#FAILED}
* state should be compiled as well.
*
* @param intentIds intents that should be recompiled
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/package-info.java b/core/net/src/main/java/org/onosproject/net/intent/impl/package-info.java
index af9a8d7..8c516c6 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/package-info.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/package-info.java
@@ -18,4 +18,4 @@
* Core subsystem for tracking high-level intents for treatment of selected
* network traffic.
*/
-package org.onlab.onos.net.intent.impl;
\ No newline at end of file
+package org.onosproject.net.intent.impl;
diff --git a/core/net/src/main/java/org/onosproject/net/link/impl/LinkManager.java b/core/net/src/main/java/org/onosproject/net/link/impl/LinkManager.java
index 52b56c5..be15bfc 100644
--- a/core/net/src/main/java/org/onosproject/net/link/impl/LinkManager.java
+++ b/core/net/src/main/java/org/onosproject/net/link/impl/LinkManager.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.link.impl;
+package org.onosproject.net.link.impl;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.slf4j.LoggerFactory.getLogger;
@@ -26,28 +26,28 @@
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
-import org.onlab.onos.event.AbstractListenerRegistry;
-import org.onlab.onos.event.EventDeliveryService;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.Link.State;
-import org.onlab.onos.net.MastershipRole;
-import org.onlab.onos.net.device.DeviceEvent;
-import org.onlab.onos.net.device.DeviceListener;
-import org.onlab.onos.net.device.DeviceService;
-import org.onlab.onos.net.link.LinkAdminService;
-import org.onlab.onos.net.link.LinkDescription;
-import org.onlab.onos.net.link.LinkEvent;
-import org.onlab.onos.net.link.LinkListener;
-import org.onlab.onos.net.link.LinkProvider;
-import org.onlab.onos.net.link.LinkProviderRegistry;
-import org.onlab.onos.net.link.LinkProviderService;
-import org.onlab.onos.net.link.LinkService;
-import org.onlab.onos.net.link.LinkStore;
-import org.onlab.onos.net.link.LinkStoreDelegate;
-import org.onlab.onos.net.provider.AbstractProviderRegistry;
-import org.onlab.onos.net.provider.AbstractProviderService;
+import org.onosproject.event.AbstractListenerRegistry;
+import org.onosproject.event.EventDeliveryService;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Link;
+import org.onosproject.net.Link.State;
+import org.onosproject.net.MastershipRole;
+import org.onosproject.net.device.DeviceEvent;
+import org.onosproject.net.device.DeviceListener;
+import org.onosproject.net.device.DeviceService;
+import org.onosproject.net.link.LinkAdminService;
+import org.onosproject.net.link.LinkDescription;
+import org.onosproject.net.link.LinkEvent;
+import org.onosproject.net.link.LinkListener;
+import org.onosproject.net.link.LinkProvider;
+import org.onosproject.net.link.LinkProviderRegistry;
+import org.onosproject.net.link.LinkProviderService;
+import org.onosproject.net.link.LinkService;
+import org.onosproject.net.link.LinkStore;
+import org.onosproject.net.link.LinkStoreDelegate;
+import org.onosproject.net.provider.AbstractProviderRegistry;
+import org.onosproject.net.provider.AbstractProviderService;
import org.slf4j.Logger;
import com.google.common.base.Predicate;
diff --git a/core/net/src/main/java/org/onosproject/net/link/impl/package-info.java b/core/net/src/main/java/org/onosproject/net/link/impl/package-info.java
index 1dc7602..4c32c3f 100644
--- a/core/net/src/main/java/org/onosproject/net/link/impl/package-info.java
+++ b/core/net/src/main/java/org/onosproject/net/link/impl/package-info.java
@@ -17,4 +17,4 @@
/**
* Core subsystem for tracking global inventory of infrastructure links.
*/
-package org.onlab.onos.net.link.impl;
+package org.onosproject.net.link.impl;
diff --git a/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java b/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java
index b6546cf..a8195e4 100644
--- a/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java
+++ b/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.packet.impl;
+package org.onosproject.net.packet.impl;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.slf4j.LoggerFactory.getLogger;
@@ -27,20 +27,20 @@
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
-import org.onlab.onos.net.Device;
-import org.onlab.onos.net.device.DeviceService;
-import org.onlab.onos.net.packet.OutboundPacket;
-import org.onlab.onos.net.packet.PacketContext;
-import org.onlab.onos.net.packet.PacketEvent;
-import org.onlab.onos.net.packet.PacketProcessor;
-import org.onlab.onos.net.packet.PacketProvider;
-import org.onlab.onos.net.packet.PacketProviderRegistry;
-import org.onlab.onos.net.packet.PacketProviderService;
-import org.onlab.onos.net.packet.PacketService;
-import org.onlab.onos.net.packet.PacketStore;
-import org.onlab.onos.net.packet.PacketStoreDelegate;
-import org.onlab.onos.net.provider.AbstractProviderRegistry;
-import org.onlab.onos.net.provider.AbstractProviderService;
+import org.onosproject.net.Device;
+import org.onosproject.net.device.DeviceService;
+import org.onosproject.net.packet.OutboundPacket;
+import org.onosproject.net.packet.PacketContext;
+import org.onosproject.net.packet.PacketEvent;
+import org.onosproject.net.packet.PacketProcessor;
+import org.onosproject.net.packet.PacketProvider;
+import org.onosproject.net.packet.PacketProviderRegistry;
+import org.onosproject.net.packet.PacketProviderService;
+import org.onosproject.net.packet.PacketService;
+import org.onosproject.net.packet.PacketStore;
+import org.onosproject.net.packet.PacketStoreDelegate;
+import org.onosproject.net.provider.AbstractProviderRegistry;
+import org.onosproject.net.provider.AbstractProviderService;
import org.slf4j.Logger;
/**
diff --git a/core/net/src/main/java/org/onosproject/net/packet/impl/package-info.java b/core/net/src/main/java/org/onosproject/net/packet/impl/package-info.java
index 2c5a48c..f3af485 100644
--- a/core/net/src/main/java/org/onosproject/net/packet/impl/package-info.java
+++ b/core/net/src/main/java/org/onosproject/net/packet/impl/package-info.java
@@ -19,4 +19,4 @@
* Processing of inbound packets is always in the local context only, but
* emitting outbound packets allows for cluster-wide operation.
*/
-package org.onlab.onos.net.packet.impl;
+package org.onosproject.net.packet.impl;
diff --git a/core/net/src/main/java/org/onosproject/net/proxyarp/impl/ProxyArpManager.java b/core/net/src/main/java/org/onosproject/net/proxyarp/impl/ProxyArpManager.java
index 283a096..51aedd7 100644
--- a/core/net/src/main/java/org/onosproject/net/proxyarp/impl/ProxyArpManager.java
+++ b/core/net/src/main/java/org/onosproject/net/proxyarp/impl/ProxyArpManager.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.proxyarp.impl;
+package org.onosproject.net.proxyarp.impl;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -31,29 +31,29 @@
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.Device;
-import org.onlab.onos.net.Host;
-import org.onlab.onos.net.HostId;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.Port;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.device.DeviceEvent;
-import org.onlab.onos.net.device.DeviceListener;
-import org.onlab.onos.net.device.DeviceService;
-import org.onlab.onos.net.flow.DefaultTrafficTreatment;
-import org.onlab.onos.net.flow.TrafficTreatment;
-import org.onlab.onos.net.host.HostService;
-import org.onlab.onos.net.host.InterfaceIpAddress;
-import org.onlab.onos.net.host.PortAddresses;
-import org.onlab.onos.net.link.LinkEvent;
-import org.onlab.onos.net.link.LinkListener;
-import org.onlab.onos.net.link.LinkService;
-import org.onlab.onos.net.packet.DefaultOutboundPacket;
-import org.onlab.onos.net.packet.InboundPacket;
-import org.onlab.onos.net.packet.PacketContext;
-import org.onlab.onos.net.packet.PacketService;
-import org.onlab.onos.net.proxyarp.ProxyArpService;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.Device;
+import org.onosproject.net.Host;
+import org.onosproject.net.HostId;
+import org.onosproject.net.Link;
+import org.onosproject.net.Port;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.device.DeviceEvent;
+import org.onosproject.net.device.DeviceListener;
+import org.onosproject.net.device.DeviceService;
+import org.onosproject.net.flow.DefaultTrafficTreatment;
+import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.net.host.HostService;
+import org.onosproject.net.host.InterfaceIpAddress;
+import org.onosproject.net.host.PortAddresses;
+import org.onosproject.net.link.LinkEvent;
+import org.onosproject.net.link.LinkListener;
+import org.onosproject.net.link.LinkService;
+import org.onosproject.net.packet.DefaultOutboundPacket;
+import org.onosproject.net.packet.InboundPacket;
+import org.onosproject.net.packet.PacketContext;
+import org.onosproject.net.packet.PacketService;
+import org.onosproject.net.proxyarp.ProxyArpService;
import org.onlab.packet.ARP;
import org.onlab.packet.Ethernet;
import org.onlab.packet.Ip4Address;
diff --git a/core/net/src/main/java/org/onosproject/net/proxyarp/impl/package-info.java b/core/net/src/main/java/org/onosproject/net/proxyarp/impl/package-info.java
index 1eb14f9..9ce268f 100644
--- a/core/net/src/main/java/org/onosproject/net/proxyarp/impl/package-info.java
+++ b/core/net/src/main/java/org/onosproject/net/proxyarp/impl/package-info.java
@@ -17,4 +17,4 @@
/**
* Core subsystem for responding to arp requests.
*/
-package org.onlab.onos.net.proxyarp.impl;
+package org.onosproject.net.proxyarp.impl;
diff --git a/core/net/src/main/java/org/onosproject/net/resource/impl/LinkResourceManager.java b/core/net/src/main/java/org/onosproject/net/resource/impl/LinkResourceManager.java
index 9f5d763..f583ebd 100644
--- a/core/net/src/main/java/org/onosproject/net/resource/impl/LinkResourceManager.java
+++ b/core/net/src/main/java/org/onosproject/net/resource/impl/LinkResourceManager.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.resource.impl;
+package org.onosproject.net.resource.impl;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -32,26 +32,26 @@
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
-import org.onlab.onos.event.AbstractListenerRegistry;
-import org.onlab.onos.event.EventDeliveryService;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.intent.IntentId;
-import org.onlab.onos.net.resource.BandwidthResourceAllocation;
-import org.onlab.onos.net.resource.BandwidthResourceRequest;
-import org.onlab.onos.net.resource.DefaultLinkResourceAllocations;
-import org.onlab.onos.net.resource.Lambda;
-import org.onlab.onos.net.resource.LambdaResourceAllocation;
-import org.onlab.onos.net.resource.LambdaResourceRequest;
-import org.onlab.onos.net.resource.LinkResourceAllocations;
-import org.onlab.onos.net.resource.LinkResourceEvent;
-import org.onlab.onos.net.resource.LinkResourceListener;
-import org.onlab.onos.net.resource.LinkResourceRequest;
-import org.onlab.onos.net.resource.LinkResourceService;
-import org.onlab.onos.net.resource.LinkResourceStore;
-import org.onlab.onos.net.resource.LinkResourceStoreDelegate;
-import org.onlab.onos.net.resource.ResourceAllocation;
-import org.onlab.onos.net.resource.ResourceRequest;
-import org.onlab.onos.net.resource.ResourceType;
+import org.onosproject.event.AbstractListenerRegistry;
+import org.onosproject.event.EventDeliveryService;
+import org.onosproject.net.Link;
+import org.onosproject.net.intent.IntentId;
+import org.onosproject.net.resource.BandwidthResourceAllocation;
+import org.onosproject.net.resource.BandwidthResourceRequest;
+import org.onosproject.net.resource.DefaultLinkResourceAllocations;
+import org.onosproject.net.resource.Lambda;
+import org.onosproject.net.resource.LambdaResourceAllocation;
+import org.onosproject.net.resource.LambdaResourceRequest;
+import org.onosproject.net.resource.LinkResourceAllocations;
+import org.onosproject.net.resource.LinkResourceEvent;
+import org.onosproject.net.resource.LinkResourceListener;
+import org.onosproject.net.resource.LinkResourceRequest;
+import org.onosproject.net.resource.LinkResourceService;
+import org.onosproject.net.resource.LinkResourceStore;
+import org.onosproject.net.resource.LinkResourceStoreDelegate;
+import org.onosproject.net.resource.ResourceAllocation;
+import org.onosproject.net.resource.ResourceRequest;
+import org.onosproject.net.resource.ResourceType;
import org.slf4j.Logger;
/**
diff --git a/core/net/src/main/java/org/onosproject/net/resource/impl/package-info.java b/core/net/src/main/java/org/onosproject/net/resource/impl/package-info.java
index 6efdaba..fd0bbde 100644
--- a/core/net/src/main/java/org/onosproject/net/resource/impl/package-info.java
+++ b/core/net/src/main/java/org/onosproject/net/resource/impl/package-info.java
@@ -17,4 +17,4 @@
/**
* Services for reserving network resources, e.g. bandwidth, lambdas.
*/
-package org.onlab.onos.net.resource.impl;
+package org.onosproject.net.resource.impl;
diff --git a/core/net/src/main/java/org/onosproject/net/statistic/impl/StatisticManager.java b/core/net/src/main/java/org/onosproject/net/statistic/impl/StatisticManager.java
index 7ba03b8..8d4f004 100644
--- a/core/net/src/main/java/org/onosproject/net/statistic/impl/StatisticManager.java
+++ b/core/net/src/main/java/org/onosproject/net/statistic/impl/StatisticManager.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.statistic.impl;
+package org.onosproject.net.statistic.impl;
import com.google.common.base.MoreObjects;
import com.google.common.base.Predicate;
@@ -25,21 +25,21 @@
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.core.GroupId;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.Path;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.core.GroupId;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.Link;
+import org.onosproject.net.Path;
-import org.onlab.onos.net.flow.FlowEntry;
-import org.onlab.onos.net.flow.FlowRule;
-import org.onlab.onos.net.flow.FlowRuleEvent;
-import org.onlab.onos.net.flow.FlowRuleListener;
-import org.onlab.onos.net.flow.FlowRuleService;
-import org.onlab.onos.net.statistic.DefaultLoad;
-import org.onlab.onos.net.statistic.Load;
-import org.onlab.onos.net.statistic.StatisticService;
-import org.onlab.onos.net.statistic.StatisticStore;
+import org.onosproject.net.flow.FlowEntry;
+import org.onosproject.net.flow.FlowRule;
+import org.onosproject.net.flow.FlowRuleEvent;
+import org.onosproject.net.flow.FlowRuleListener;
+import org.onosproject.net.flow.FlowRuleService;
+import org.onosproject.net.statistic.DefaultLoad;
+import org.onosproject.net.statistic.Load;
+import org.onosproject.net.statistic.StatisticService;
+import org.onosproject.net.statistic.StatisticStore;
import org.slf4j.Logger;
import java.util.Collections;
diff --git a/core/net/src/main/java/org/onosproject/net/statistic/impl/package-info.java b/core/net/src/main/java/org/onosproject/net/statistic/impl/package-info.java
index 114d612..b1c9170 100644
--- a/core/net/src/main/java/org/onosproject/net/statistic/impl/package-info.java
+++ b/core/net/src/main/java/org/onosproject/net/statistic/impl/package-info.java
@@ -17,4 +17,4 @@
/**
* Core subsystem for responding to statistical inquiries.
*/
-package org.onlab.onos.net.statistic.impl;
\ No newline at end of file
+package org.onosproject.net.statistic.impl;
diff --git a/core/net/src/main/java/org/onosproject/net/topology/impl/DefaultTopologyProvider.java b/core/net/src/main/java/org/onosproject/net/topology/impl/DefaultTopologyProvider.java
index 3b1a4a3..cb24851 100644
--- a/core/net/src/main/java/org/onosproject/net/topology/impl/DefaultTopologyProvider.java
+++ b/core/net/src/main/java/org/onosproject/net/topology/impl/DefaultTopologyProvider.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.topology.impl;
+package org.onosproject.net.topology.impl;
import com.google.common.collect.ImmutableList;
@@ -25,21 +25,21 @@
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
-import org.onlab.onos.event.AbstractEventAccumulator;
-import org.onlab.onos.event.Event;
-import org.onlab.onos.event.EventAccumulator;
-import org.onlab.onos.net.device.DeviceEvent;
-import org.onlab.onos.net.device.DeviceListener;
-import org.onlab.onos.net.device.DeviceService;
-import org.onlab.onos.net.link.LinkEvent;
-import org.onlab.onos.net.link.LinkListener;
-import org.onlab.onos.net.link.LinkService;
-import org.onlab.onos.net.provider.AbstractProvider;
-import org.onlab.onos.net.topology.DefaultGraphDescription;
-import org.onlab.onos.net.topology.GraphDescription;
-import org.onlab.onos.net.topology.TopologyProvider;
-import org.onlab.onos.net.topology.TopologyProviderRegistry;
-import org.onlab.onos.net.topology.TopologyProviderService;
+import org.onosproject.event.AbstractEventAccumulator;
+import org.onosproject.event.Event;
+import org.onosproject.event.EventAccumulator;
+import org.onosproject.net.device.DeviceEvent;
+import org.onosproject.net.device.DeviceListener;
+import org.onosproject.net.device.DeviceService;
+import org.onosproject.net.link.LinkEvent;
+import org.onosproject.net.link.LinkListener;
+import org.onosproject.net.link.LinkService;
+import org.onosproject.net.provider.AbstractProvider;
+import org.onosproject.net.topology.DefaultGraphDescription;
+import org.onosproject.net.topology.GraphDescription;
+import org.onosproject.net.topology.TopologyProvider;
+import org.onosproject.net.topology.TopologyProviderRegistry;
+import org.onosproject.net.topology.TopologyProviderService;
import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
@@ -51,8 +51,8 @@
import static com.google.common.base.Strings.isNullOrEmpty;
import static java.util.concurrent.Executors.newFixedThreadPool;
-import static org.onlab.onos.core.CoreService.CORE_PROVIDER_ID;
-import static org.onlab.onos.net.device.DeviceEvent.Type.*;
+import static org.onosproject.core.CoreService.CORE_PROVIDER_ID;
+import static org.onosproject.net.device.DeviceEvent.Type.*;
import static org.onlab.util.Tools.namedThreads;
import static org.slf4j.LoggerFactory.getLogger;
diff --git a/core/net/src/main/java/org/onosproject/net/topology/impl/PathManager.java b/core/net/src/main/java/org/onosproject/net/topology/impl/PathManager.java
index 433cdcd..749a722 100644
--- a/core/net/src/main/java/org/onosproject/net/topology/impl/PathManager.java
+++ b/core/net/src/main/java/org/onosproject/net/topology/impl/PathManager.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.topology.impl;
+package org.onosproject.net.topology.impl;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
@@ -24,24 +24,24 @@
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.DefaultEdgeLink;
-import org.onlab.onos.net.DefaultPath;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.EdgeLink;
-import org.onlab.onos.net.ElementId;
-import org.onlab.onos.net.Host;
-import org.onlab.onos.net.HostId;
-import org.onlab.onos.net.HostLocation;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.Path;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.host.HostService;
-import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.onos.net.topology.LinkWeight;
-import org.onlab.onos.net.topology.PathService;
-import org.onlab.onos.net.topology.Topology;
-import org.onlab.onos.net.topology.TopologyService;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DefaultEdgeLink;
+import org.onosproject.net.DefaultPath;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.EdgeLink;
+import org.onosproject.net.ElementId;
+import org.onosproject.net.Host;
+import org.onosproject.net.HostId;
+import org.onosproject.net.HostLocation;
+import org.onosproject.net.Link;
+import org.onosproject.net.Path;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.host.HostService;
+import org.onosproject.net.provider.ProviderId;
+import org.onosproject.net.topology.LinkWeight;
+import org.onosproject.net.topology.PathService;
+import org.onosproject.net.topology.Topology;
+import org.onosproject.net.topology.TopologyService;
import org.slf4j.Logger;
import java.util.List;
@@ -60,7 +60,7 @@
private static final String ELEMENT_ID_NULL = "Element ID cannot be null";
- private static final ProviderId PID = new ProviderId("core", "org.onlab.onos.core");
+ private static final ProviderId PID = new ProviderId("core", "org.onosproject.core");
private static final PortNumber P0 = PortNumber.portNumber(0);
private static final EdgeLink NOT_HOST = new NotHost();
diff --git a/core/net/src/main/java/org/onosproject/net/topology/impl/TopologyManager.java b/core/net/src/main/java/org/onosproject/net/topology/impl/TopologyManager.java
index de72c52..109f11f 100644
--- a/core/net/src/main/java/org/onosproject/net/topology/impl/TopologyManager.java
+++ b/core/net/src/main/java/org/onosproject/net/topology/impl/TopologyManager.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.topology.impl;
+package org.onosproject.net.topology.impl;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
@@ -21,29 +21,29 @@
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
-import org.onlab.onos.event.AbstractListenerRegistry;
-import org.onlab.onos.event.Event;
-import org.onlab.onos.event.EventDeliveryService;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.Path;
-import org.onlab.onos.net.provider.AbstractProviderRegistry;
-import org.onlab.onos.net.provider.AbstractProviderService;
-import org.onlab.onos.net.topology.ClusterId;
-import org.onlab.onos.net.topology.GraphDescription;
-import org.onlab.onos.net.topology.LinkWeight;
-import org.onlab.onos.net.topology.Topology;
-import org.onlab.onos.net.topology.TopologyCluster;
-import org.onlab.onos.net.topology.TopologyEvent;
-import org.onlab.onos.net.topology.TopologyGraph;
-import org.onlab.onos.net.topology.TopologyListener;
-import org.onlab.onos.net.topology.TopologyProvider;
-import org.onlab.onos.net.topology.TopologyProviderRegistry;
-import org.onlab.onos.net.topology.TopologyProviderService;
-import org.onlab.onos.net.topology.TopologyService;
-import org.onlab.onos.net.topology.TopologyStore;
-import org.onlab.onos.net.topology.TopologyStoreDelegate;
+import org.onosproject.event.AbstractListenerRegistry;
+import org.onosproject.event.Event;
+import org.onosproject.event.EventDeliveryService;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Link;
+import org.onosproject.net.Path;
+import org.onosproject.net.provider.AbstractProviderRegistry;
+import org.onosproject.net.provider.AbstractProviderService;
+import org.onosproject.net.topology.ClusterId;
+import org.onosproject.net.topology.GraphDescription;
+import org.onosproject.net.topology.LinkWeight;
+import org.onosproject.net.topology.Topology;
+import org.onosproject.net.topology.TopologyCluster;
+import org.onosproject.net.topology.TopologyEvent;
+import org.onosproject.net.topology.TopologyGraph;
+import org.onosproject.net.topology.TopologyListener;
+import org.onosproject.net.topology.TopologyProvider;
+import org.onosproject.net.topology.TopologyProviderRegistry;
+import org.onosproject.net.topology.TopologyProviderService;
+import org.onosproject.net.topology.TopologyService;
+import org.onosproject.net.topology.TopologyStore;
+import org.onosproject.net.topology.TopologyStoreDelegate;
import org.slf4j.Logger;
import java.util.List;
diff --git a/core/net/src/main/java/org/onosproject/net/topology/impl/package-info.java b/core/net/src/main/java/org/onosproject/net/topology/impl/package-info.java
index c76dcef..586bbf3 100644
--- a/core/net/src/main/java/org/onosproject/net/topology/impl/package-info.java
+++ b/core/net/src/main/java/org/onosproject/net/topology/impl/package-info.java
@@ -17,4 +17,4 @@
/**
* Core subsystem for tracking global & consistent topology graph views.
*/
-package org.onlab.onos.net.topology.impl;
+package org.onosproject.net.topology.impl;
diff --git a/core/net/src/test/java/org/onosproject/cluster/impl/MastershipManagerTest.java b/core/net/src/test/java/org/onosproject/cluster/impl/MastershipManagerTest.java
index 2c781d0..dfde09f 100644
--- a/core/net/src/test/java/org/onosproject/cluster/impl/MastershipManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/cluster/impl/MastershipManagerTest.java
@@ -13,32 +13,32 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cluster.impl;
+package org.onosproject.cluster.impl;
import java.util.Set;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.onlab.onos.cluster.ClusterEventListener;
-import org.onlab.onos.cluster.ClusterService;
-import org.onlab.onos.cluster.ControllerNode;
-import org.onlab.onos.cluster.ControllerNode.State;
-import org.onlab.onos.cluster.DefaultControllerNode;
-import org.onlab.onos.cluster.NodeId;
-import org.onlab.onos.event.impl.TestEventDispatcher;
-import org.onlab.onos.mastership.MastershipService;
-import org.onlab.onos.mastership.MastershipStore;
-import org.onlab.onos.mastership.MastershipTermService;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.store.trivial.impl.SimpleMastershipStore;
+import org.onosproject.cluster.ClusterEventListener;
+import org.onosproject.cluster.ClusterService;
+import org.onosproject.cluster.ControllerNode;
+import org.onosproject.cluster.ControllerNode.State;
+import org.onosproject.cluster.DefaultControllerNode;
+import org.onosproject.cluster.NodeId;
+import org.onosproject.event.impl.TestEventDispatcher;
+import org.onosproject.mastership.MastershipService;
+import org.onosproject.mastership.MastershipStore;
+import org.onosproject.mastership.MastershipTermService;
+import org.onosproject.net.DeviceId;
+import org.onosproject.store.trivial.impl.SimpleMastershipStore;
import org.onlab.packet.IpAddress;
import com.google.common.collect.Sets;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
-import static org.onlab.onos.net.MastershipRole.*;
+import static org.onosproject.net.MastershipRole.*;
/**
* Test codifying the mastership service contracts.
diff --git a/core/net/src/test/java/org/onosproject/core/impl/DummyIdBlockAllocator.java b/core/net/src/test/java/org/onosproject/core/impl/DummyIdBlockAllocator.java
index d4c0e64..3872b97 100644
--- a/core/net/src/test/java/org/onosproject/core/impl/DummyIdBlockAllocator.java
+++ b/core/net/src/test/java/org/onosproject/core/impl/DummyIdBlockAllocator.java
@@ -1,6 +1,6 @@
-package org.onlab.onos.core.impl;
+package org.onosproject.core.impl;
-import org.onlab.onos.core.IdBlock;
+import org.onosproject.core.IdBlock;
public class DummyIdBlockAllocator implements IdBlockAllocator {
private long blockTop;
diff --git a/core/net/src/test/java/org/onosproject/core/impl/IdBlockAllocatorBasedIdGeneratorTest.java b/core/net/src/test/java/org/onosproject/core/impl/IdBlockAllocatorBasedIdGeneratorTest.java
index 07d30ca..f0fdcbf 100644
--- a/core/net/src/test/java/org/onosproject/core/impl/IdBlockAllocatorBasedIdGeneratorTest.java
+++ b/core/net/src/test/java/org/onosproject/core/impl/IdBlockAllocatorBasedIdGeneratorTest.java
@@ -1,14 +1,14 @@
-package org.onlab.onos.core.impl;
+package org.onosproject.core.impl;
import org.easymock.EasyMock;
import org.hamcrest.Matchers;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.onlab.onos.core.IdBlock;
+import org.onosproject.core.IdBlock;
/**
- * Suites of test of {@link org.onlab.onos.core.impl.BlockAllocatorBasedIdGenerator}.
+ * Suites of test of {@link org.onosproject.core.impl.BlockAllocatorBasedIdGenerator}.
*/
public class IdBlockAllocatorBasedIdGeneratorTest {
private IdBlockAllocator allocator;
@@ -21,7 +21,7 @@
}
/**
- * Tests generated IntentId sequences using two {@link org.onlab.onos.core.IdBlock blocks}.
+ * Tests generated IntentId sequences using two {@link org.onosproject.core.IdBlock blocks}.
*/
@Test
public void testIds() {
diff --git a/core/net/src/test/java/org/onosproject/core/impl/TestCoreManager.java b/core/net/src/test/java/org/onosproject/core/impl/TestCoreManager.java
index 7b5fbb2..846696e 100644
--- a/core/net/src/test/java/org/onosproject/core/impl/TestCoreManager.java
+++ b/core/net/src/test/java/org/onosproject/core/impl/TestCoreManager.java
@@ -1,9 +1,9 @@
-package org.onlab.onos.core.impl;
+package org.onosproject.core.impl;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.core.CoreService;
-import org.onlab.onos.core.IdGenerator;
-import org.onlab.onos.core.Version;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.core.CoreService;
+import org.onosproject.core.IdGenerator;
+import org.onosproject.core.Version;
import java.util.Set;
diff --git a/core/net/src/test/java/org/onosproject/event/impl/CoreEventDispatcherTest.java b/core/net/src/test/java/org/onosproject/event/impl/CoreEventDispatcherTest.java
index 209b33a..2a6b296 100644
--- a/core/net/src/test/java/org/onosproject/event/impl/CoreEventDispatcherTest.java
+++ b/core/net/src/test/java/org/onosproject/event/impl/CoreEventDispatcherTest.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.event.impl;
+package org.onosproject.event.impl;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.onlab.onos.event.AbstractEvent;
-import org.onlab.onos.event.EventSink;
+import org.onosproject.event.AbstractEvent;
+import org.onosproject.event.EventSink;
import java.util.ArrayList;
import java.util.List;
diff --git a/core/net/src/test/java/org/onosproject/event/impl/TestEventDispatcher.java b/core/net/src/test/java/org/onosproject/event/impl/TestEventDispatcher.java
index 8917027..c3f9ba0 100644
--- a/core/net/src/test/java/org/onosproject/event/impl/TestEventDispatcher.java
+++ b/core/net/src/test/java/org/onosproject/event/impl/TestEventDispatcher.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.event.impl;
+package org.onosproject.event.impl;
-import org.onlab.onos.event.DefaultEventSinkRegistry;
-import org.onlab.onos.event.Event;
-import org.onlab.onos.event.EventDeliveryService;
-import org.onlab.onos.event.EventSink;
+import org.onosproject.event.DefaultEventSinkRegistry;
+import org.onosproject.event.Event;
+import org.onosproject.event.EventDeliveryService;
+import org.onosproject.event.EventSink;
import static com.google.common.base.Preconditions.checkState;
diff --git a/core/net/src/test/java/org/onosproject/net/device/impl/DeviceManagerTest.java b/core/net/src/test/java/org/onosproject/net/device/impl/DeviceManagerTest.java
index 693a90f..0956fd6 100644
--- a/core/net/src/test/java/org/onosproject/net/device/impl/DeviceManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/device/impl/DeviceManagerTest.java
@@ -13,44 +13,44 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.device.impl;
+package org.onosproject.net.device.impl;
import com.google.common.collect.Sets;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.onlab.onos.cluster.ClusterEventListener;
-import org.onlab.onos.cluster.ClusterService;
-import org.onlab.onos.cluster.ControllerNode;
-import org.onlab.onos.cluster.DefaultControllerNode;
-import org.onlab.onos.cluster.NodeId;
-import org.onlab.onos.cluster.ControllerNode.State;
-import org.onlab.onos.event.Event;
-import org.onlab.onos.event.impl.TestEventDispatcher;
-import org.onlab.onos.mastership.MastershipServiceAdapter;
-import org.onlab.onos.mastership.MastershipTerm;
-import org.onlab.onos.mastership.MastershipTermService;
-import org.onlab.onos.net.Device;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.MastershipRole;
-import org.onlab.onos.net.Port;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.device.DefaultDeviceDescription;
-import org.onlab.onos.net.device.DefaultPortDescription;
-import org.onlab.onos.net.device.DeviceAdminService;
-import org.onlab.onos.net.device.DeviceClockProviderService;
-import org.onlab.onos.net.device.DeviceDescription;
-import org.onlab.onos.net.device.DeviceEvent;
-import org.onlab.onos.net.device.DeviceListener;
-import org.onlab.onos.net.device.DeviceProvider;
-import org.onlab.onos.net.device.DeviceProviderRegistry;
-import org.onlab.onos.net.device.DeviceProviderService;
-import org.onlab.onos.net.device.DeviceService;
-import org.onlab.onos.net.device.PortDescription;
-import org.onlab.onos.net.provider.AbstractProvider;
-import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.onos.store.trivial.impl.SimpleDeviceStore;
+import org.onosproject.cluster.ClusterEventListener;
+import org.onosproject.cluster.ClusterService;
+import org.onosproject.cluster.ControllerNode;
+import org.onosproject.cluster.DefaultControllerNode;
+import org.onosproject.cluster.NodeId;
+import org.onosproject.cluster.ControllerNode.State;
+import org.onosproject.event.Event;
+import org.onosproject.event.impl.TestEventDispatcher;
+import org.onosproject.mastership.MastershipServiceAdapter;
+import org.onosproject.mastership.MastershipTerm;
+import org.onosproject.mastership.MastershipTermService;
+import org.onosproject.net.Device;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.MastershipRole;
+import org.onosproject.net.Port;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.device.DefaultDeviceDescription;
+import org.onosproject.net.device.DefaultPortDescription;
+import org.onosproject.net.device.DeviceAdminService;
+import org.onosproject.net.device.DeviceClockProviderService;
+import org.onosproject.net.device.DeviceDescription;
+import org.onosproject.net.device.DeviceEvent;
+import org.onosproject.net.device.DeviceListener;
+import org.onosproject.net.device.DeviceProvider;
+import org.onosproject.net.device.DeviceProviderRegistry;
+import org.onosproject.net.device.DeviceProviderService;
+import org.onosproject.net.device.DeviceService;
+import org.onosproject.net.device.PortDescription;
+import org.onosproject.net.provider.AbstractProvider;
+import org.onosproject.net.provider.ProviderId;
+import org.onosproject.store.trivial.impl.SimpleDeviceStore;
import org.onlab.packet.ChassisId;
import org.onlab.packet.IpAddress;
@@ -60,9 +60,9 @@
import java.util.Set;
import static org.junit.Assert.*;
-import static org.onlab.onos.net.Device.Type.SWITCH;
-import static org.onlab.onos.net.DeviceId.deviceId;
-import static org.onlab.onos.net.device.DeviceEvent.Type.*;
+import static org.onosproject.net.Device.Type.SWITCH;
+import static org.onosproject.net.DeviceId.deviceId;
+import static org.onosproject.net.device.DeviceEvent.Type.*;
/**
* Test codifying the device service & device provider service contracts.
diff --git a/core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java b/core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java
index 175a299..974af66 100644
--- a/core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.flow.impl;
+package org.onosproject.net.flow.impl;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
@@ -24,41 +24,41 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.core.DefaultApplicationId;
-import org.onlab.onos.event.impl.TestEventDispatcher;
-import org.onlab.onos.net.DefaultDevice;
-import org.onlab.onos.net.Device;
-import org.onlab.onos.net.Device.Type;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.MastershipRole;
-import org.onlab.onos.net.Port;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.device.DeviceListener;
-import org.onlab.onos.net.device.DeviceServiceAdapter;
-import org.onlab.onos.net.flow.BatchOperation;
-import org.onlab.onos.net.flow.CompletedBatchOperation;
-import org.onlab.onos.net.flow.DefaultFlowEntry;
-import org.onlab.onos.net.flow.DefaultFlowRule;
-import org.onlab.onos.net.flow.FlowEntry;
-import org.onlab.onos.net.flow.FlowEntry.FlowEntryState;
-import org.onlab.onos.net.flow.FlowRule;
-import org.onlab.onos.net.flow.FlowRuleBatchEntry;
-import org.onlab.onos.net.flow.FlowRuleBatchOperation;
-import org.onlab.onos.net.flow.FlowRuleEvent;
-import org.onlab.onos.net.flow.FlowRuleListener;
-import org.onlab.onos.net.flow.FlowRuleProvider;
-import org.onlab.onos.net.flow.FlowRuleProviderRegistry;
-import org.onlab.onos.net.flow.FlowRuleProviderService;
-import org.onlab.onos.net.flow.FlowRuleService;
-import org.onlab.onos.net.flow.StoredFlowEntry;
-import org.onlab.onos.net.flow.TrafficSelector;
-import org.onlab.onos.net.flow.TrafficTreatment;
-import org.onlab.onos.net.flow.criteria.Criterion;
-import org.onlab.onos.net.flow.instructions.Instruction;
-import org.onlab.onos.net.provider.AbstractProvider;
-import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.onos.store.trivial.impl.SimpleFlowRuleStore;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.core.DefaultApplicationId;
+import org.onosproject.event.impl.TestEventDispatcher;
+import org.onosproject.net.DefaultDevice;
+import org.onosproject.net.Device;
+import org.onosproject.net.Device.Type;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.MastershipRole;
+import org.onosproject.net.Port;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.device.DeviceListener;
+import org.onosproject.net.device.DeviceServiceAdapter;
+import org.onosproject.net.flow.BatchOperation;
+import org.onosproject.net.flow.CompletedBatchOperation;
+import org.onosproject.net.flow.DefaultFlowEntry;
+import org.onosproject.net.flow.DefaultFlowRule;
+import org.onosproject.net.flow.FlowEntry;
+import org.onosproject.net.flow.FlowEntry.FlowEntryState;
+import org.onosproject.net.flow.FlowRule;
+import org.onosproject.net.flow.FlowRuleBatchEntry;
+import org.onosproject.net.flow.FlowRuleBatchOperation;
+import org.onosproject.net.flow.FlowRuleEvent;
+import org.onosproject.net.flow.FlowRuleListener;
+import org.onosproject.net.flow.FlowRuleProvider;
+import org.onosproject.net.flow.FlowRuleProviderRegistry;
+import org.onosproject.net.flow.FlowRuleProviderService;
+import org.onosproject.net.flow.FlowRuleService;
+import org.onosproject.net.flow.StoredFlowEntry;
+import org.onosproject.net.flow.TrafficSelector;
+import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.net.flow.criteria.Criterion;
+import org.onosproject.net.flow.instructions.Instruction;
+import org.onosproject.net.provider.AbstractProvider;
+import org.onosproject.net.provider.ProviderId;
+import org.onosproject.store.trivial.impl.SimpleFlowRuleStore;
import java.util.ArrayList;
import java.util.Arrays;
@@ -74,7 +74,7 @@
import java.util.concurrent.TimeoutException;
import static org.junit.Assert.*;
-import static org.onlab.onos.net.flow.FlowRuleEvent.Type.*;
+import static org.onosproject.net.flow.FlowRuleEvent.Type.*;
/**
* Test codifying the flow rule service & flow rule provider service contracts.
@@ -590,7 +590,7 @@
@Override
public Criterion getCriterion(
- org.onlab.onos.net.flow.criteria.Criterion.Type type) {
+ org.onosproject.net.flow.criteria.Criterion.Type type) {
return null;
}
diff --git a/core/net/src/test/java/org/onosproject/net/host/impl/HostManagerTest.java b/core/net/src/test/java/org/onosproject/net/host/impl/HostManagerTest.java
index 6a058ab..ce7de7e 100644
--- a/core/net/src/test/java/org/onosproject/net/host/impl/HostManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/host/impl/HostManagerTest.java
@@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.host.impl;
+package org.onosproject.net.host.impl;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import static org.onlab.onos.net.host.HostEvent.Type.HOST_ADDED;
-import static org.onlab.onos.net.host.HostEvent.Type.HOST_MOVED;
-import static org.onlab.onos.net.host.HostEvent.Type.HOST_REMOVED;
-import static org.onlab.onos.net.host.HostEvent.Type.HOST_UPDATED;
+import static org.onosproject.net.host.HostEvent.Type.HOST_ADDED;
+import static org.onosproject.net.host.HostEvent.Type.HOST_MOVED;
+import static org.onosproject.net.host.HostEvent.Type.HOST_REMOVED;
+import static org.onosproject.net.host.HostEvent.Type.HOST_UPDATED;
import java.util.List;
import java.util.Set;
@@ -31,26 +31,26 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.onlab.onos.event.Event;
-import org.onlab.onos.event.impl.TestEventDispatcher;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.Host;
-import org.onlab.onos.net.HostId;
-import org.onlab.onos.net.HostLocation;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.host.DefaultHostDescription;
-import org.onlab.onos.net.host.HostDescription;
-import org.onlab.onos.net.host.HostEvent;
-import org.onlab.onos.net.host.HostListener;
-import org.onlab.onos.net.host.HostProvider;
-import org.onlab.onos.net.host.HostProviderRegistry;
-import org.onlab.onos.net.host.HostProviderService;
-import org.onlab.onos.net.host.InterfaceIpAddress;
-import org.onlab.onos.net.host.PortAddresses;
-import org.onlab.onos.net.provider.AbstractProvider;
-import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.onos.store.trivial.impl.SimpleHostStore;
+import org.onosproject.event.Event;
+import org.onosproject.event.impl.TestEventDispatcher;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Host;
+import org.onosproject.net.HostId;
+import org.onosproject.net.HostLocation;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.host.DefaultHostDescription;
+import org.onosproject.net.host.HostDescription;
+import org.onosproject.net.host.HostEvent;
+import org.onosproject.net.host.HostListener;
+import org.onosproject.net.host.HostProvider;
+import org.onosproject.net.host.HostProviderRegistry;
+import org.onosproject.net.host.HostProviderService;
+import org.onosproject.net.host.InterfaceIpAddress;
+import org.onosproject.net.host.PortAddresses;
+import org.onosproject.net.provider.AbstractProvider;
+import org.onosproject.net.provider.ProviderId;
+import org.onosproject.store.trivial.impl.SimpleHostStore;
import org.onlab.packet.IpAddress;
import org.onlab.packet.IpPrefix;
import org.onlab.packet.MacAddress;
diff --git a/core/net/src/test/java/org/onosproject/net/host/impl/HostMonitorTest.java b/core/net/src/test/java/org/onosproject/net/host/impl/HostMonitorTest.java
index e397d16..eb60979 100644
--- a/core/net/src/test/java/org/onosproject/net/host/impl/HostMonitorTest.java
+++ b/core/net/src/test/java/org/onosproject/net/host/impl/HostMonitorTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.host.impl;
+package org.onosproject.net.host.impl;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
@@ -31,24 +31,24 @@
import org.junit.After;
import org.junit.Test;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.Device;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.Host;
-import org.onlab.onos.net.MastershipRole;
-import org.onlab.onos.net.Port;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.device.DeviceListener;
-import org.onlab.onos.net.device.DeviceServiceAdapter;
-import org.onlab.onos.net.flow.instructions.Instruction;
-import org.onlab.onos.net.flow.instructions.Instructions.OutputInstruction;
-import org.onlab.onos.net.host.HostProvider;
-import org.onlab.onos.net.host.InterfaceIpAddress;
-import org.onlab.onos.net.host.PortAddresses;
-import org.onlab.onos.net.packet.OutboundPacket;
-import org.onlab.onos.net.packet.PacketProcessor;
-import org.onlab.onos.net.packet.PacketService;
-import org.onlab.onos.net.provider.ProviderId;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.Device;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Host;
+import org.onosproject.net.MastershipRole;
+import org.onosproject.net.Port;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.device.DeviceListener;
+import org.onosproject.net.device.DeviceServiceAdapter;
+import org.onosproject.net.flow.instructions.Instruction;
+import org.onosproject.net.flow.instructions.Instructions.OutputInstruction;
+import org.onosproject.net.host.HostProvider;
+import org.onosproject.net.host.InterfaceIpAddress;
+import org.onosproject.net.host.PortAddresses;
+import org.onosproject.net.packet.OutboundPacket;
+import org.onosproject.net.packet.PacketProcessor;
+import org.onosproject.net.packet.PacketService;
+import org.onosproject.net.provider.ProviderId;
import org.onlab.packet.ARP;
import org.onlab.packet.Ethernet;
import org.onlab.packet.IpAddress;
diff --git a/core/net/src/test/java/org/onosproject/net/intent/LinksHaveEntryWithSourceDestinationPairMatcher.java b/core/net/src/test/java/org/onosproject/net/intent/LinksHaveEntryWithSourceDestinationPairMatcher.java
index a1b4cf7..48a86c4 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/LinksHaveEntryWithSourceDestinationPairMatcher.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/LinksHaveEntryWithSourceDestinationPairMatcher.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent;
+package org.onosproject.net.intent;
import java.util.Collection;
import org.hamcrest.Description;
import org.hamcrest.TypeSafeMatcher;
-import org.onlab.onos.net.Link;
+import org.onosproject.net.Link;
/**
* Matcher to determine if a Collection of Links contains a path between a source
diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/HostToHostIntentCompilerTest.java b/core/net/src/test/java/org/onosproject/net/intent/impl/HostToHostIntentCompilerTest.java
index 07cf731..5cdcf1c 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/HostToHostIntentCompilerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/HostToHostIntentCompilerTest.java
@@ -13,23 +13,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent.impl;
+package org.onosproject.net.intent.impl;
import org.hamcrest.Matchers;
import org.junit.Before;
import org.junit.Test;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.TestApplicationId;
-import org.onlab.onos.net.Host;
-import org.onlab.onos.net.HostId;
-import org.onlab.onos.net.flow.TrafficSelector;
-import org.onlab.onos.net.flow.TrafficTreatment;
-import org.onlab.onos.net.host.HostService;
-import org.onlab.onos.net.intent.AbstractIntentTest;
-import org.onlab.onos.net.intent.HostToHostIntent;
-import org.onlab.onos.net.intent.Intent;
-import org.onlab.onos.net.intent.IntentTestsMocks;
-import org.onlab.onos.net.intent.PathIntent;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.TestApplicationId;
+import org.onosproject.net.Host;
+import org.onosproject.net.HostId;
+import org.onosproject.net.flow.TrafficSelector;
+import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.net.host.HostService;
+import org.onosproject.net.intent.AbstractIntentTest;
+import org.onosproject.net.intent.HostToHostIntent;
+import org.onosproject.net.intent.Intent;
+import org.onosproject.net.intent.IntentTestsMocks;
+import org.onosproject.net.intent.PathIntent;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
@@ -40,8 +40,8 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
-import static org.onlab.onos.net.NetTestTools.hid;
-import static org.onlab.onos.net.intent.LinksHaveEntryWithSourceDestinationPairMatcher.linksHasPath;
+import static org.onosproject.net.NetTestTools.hid;
+import static org.onosproject.net.intent.LinksHaveEntryWithSourceDestinationPairMatcher.linksHasPath;
/**
* Unit tests for the HostToHost intent compiler.
diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/IntentManagerTest.java b/core/net/src/test/java/org/onosproject/net/intent/impl/IntentManagerTest.java
index 8709295..cc9073b 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/IntentManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/IntentManagerTest.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.net.intent.impl;
+package org.onosproject.net.intent.impl;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Lists;
@@ -12,29 +12,29 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.onlab.onos.TestApplicationId;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.core.impl.TestCoreManager;
-import org.onlab.onos.event.impl.TestEventDispatcher;
-import org.onlab.onos.net.NetworkResource;
-import org.onlab.onos.net.flow.FlowRule;
-import org.onlab.onos.net.flow.FlowRuleBatchEntry;
-import org.onlab.onos.net.flow.FlowRuleBatchEntry.FlowRuleOperation;
-import org.onlab.onos.net.flow.FlowRuleBatchOperation;
-import org.onlab.onos.net.intent.Intent;
-import org.onlab.onos.net.intent.IntentCompiler;
-import org.onlab.onos.net.intent.IntentEvent;
-import org.onlab.onos.net.intent.IntentEvent.Type;
-import org.onlab.onos.net.intent.IntentExtensionService;
-import org.onlab.onos.net.intent.IntentId;
-import org.onlab.onos.net.intent.IntentInstaller;
-import org.onlab.onos.net.intent.IntentListener;
-import org.onlab.onos.net.intent.IntentService;
-import org.onlab.onos.net.intent.IntentState;
-import org.onlab.onos.net.intent.IntentTestsMocks;
-import org.onlab.onos.net.resource.LinkResourceAllocations;
-import org.onlab.onos.store.trivial.impl.SimpleIntentBatchQueue;
-import org.onlab.onos.store.trivial.impl.SimpleIntentStore;
+import org.onosproject.TestApplicationId;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.core.impl.TestCoreManager;
+import org.onosproject.event.impl.TestEventDispatcher;
+import org.onosproject.net.NetworkResource;
+import org.onosproject.net.flow.FlowRule;
+import org.onosproject.net.flow.FlowRuleBatchEntry;
+import org.onosproject.net.flow.FlowRuleBatchEntry.FlowRuleOperation;
+import org.onosproject.net.flow.FlowRuleBatchOperation;
+import org.onosproject.net.intent.Intent;
+import org.onosproject.net.intent.IntentCompiler;
+import org.onosproject.net.intent.IntentEvent;
+import org.onosproject.net.intent.IntentEvent.Type;
+import org.onosproject.net.intent.IntentExtensionService;
+import org.onosproject.net.intent.IntentId;
+import org.onosproject.net.intent.IntentInstaller;
+import org.onosproject.net.intent.IntentListener;
+import org.onosproject.net.intent.IntentService;
+import org.onosproject.net.intent.IntentState;
+import org.onosproject.net.intent.IntentTestsMocks;
+import org.onosproject.net.resource.LinkResourceAllocations;
+import org.onosproject.store.trivial.impl.SimpleIntentBatchQueue;
+import org.onosproject.store.trivial.impl.SimpleIntentStore;
import java.util.Collection;
import java.util.List;
@@ -48,7 +48,7 @@
import static org.hamcrest.Matchers.hasItem;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import static org.onlab.onos.net.intent.IntentState.*;
+import static org.onosproject.net.intent.IntentState.*;
import static org.onlab.util.Tools.delay;
/**
diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/MockFlowRuleService.java b/core/net/src/test/java/org/onosproject/net/intent/impl/MockFlowRuleService.java
index ba74e31..050704d 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/MockFlowRuleService.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/MockFlowRuleService.java
@@ -1,18 +1,18 @@
-package org.onlab.onos.net.intent.impl;
+package org.onosproject.net.intent.impl;
import java.util.Collections;
import java.util.Set;
import java.util.concurrent.Future;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.flow.CompletedBatchOperation;
-import org.onlab.onos.net.flow.FlowEntry;
-import org.onlab.onos.net.flow.FlowRule;
-import org.onlab.onos.net.flow.FlowRuleBatchEntry;
-import org.onlab.onos.net.flow.FlowRuleBatchOperation;
-import org.onlab.onos.net.flow.FlowRuleListener;
-import org.onlab.onos.net.flow.FlowRuleService;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.flow.CompletedBatchOperation;
+import org.onosproject.net.flow.FlowEntry;
+import org.onosproject.net.flow.FlowRule;
+import org.onosproject.net.flow.FlowRuleBatchEntry;
+import org.onosproject.net.flow.FlowRuleBatchOperation;
+import org.onosproject.net.flow.FlowRuleListener;
+import org.onosproject.net.flow.FlowRuleService;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/MultiPointToSinglePointIntentCompilerTest.java b/core/net/src/test/java/org/onosproject/net/intent/impl/MultiPointToSinglePointIntentCompilerTest.java
index 3727572..8e5c168 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/MultiPointToSinglePointIntentCompilerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/MultiPointToSinglePointIntentCompilerTest.java
@@ -13,24 +13,24 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent.impl;
+package org.onosproject.net.intent.impl;
import org.hamcrest.Matchers;
import org.junit.Test;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.TestApplicationId;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.ElementId;
-import org.onlab.onos.net.Path;
-import org.onlab.onos.net.flow.TrafficSelector;
-import org.onlab.onos.net.flow.TrafficTreatment;
-import org.onlab.onos.net.intent.AbstractIntentTest;
-import org.onlab.onos.net.intent.Intent;
-import org.onlab.onos.net.intent.IntentTestsMocks;
-import org.onlab.onos.net.intent.LinkCollectionIntent;
-import org.onlab.onos.net.intent.MultiPointToSinglePointIntent;
-import org.onlab.onos.net.topology.LinkWeight;
-import org.onlab.onos.net.topology.PathService;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.TestApplicationId;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.ElementId;
+import org.onosproject.net.Path;
+import org.onosproject.net.flow.TrafficSelector;
+import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.net.intent.AbstractIntentTest;
+import org.onosproject.net.intent.Intent;
+import org.onosproject.net.intent.IntentTestsMocks;
+import org.onosproject.net.intent.LinkCollectionIntent;
+import org.onosproject.net.intent.MultiPointToSinglePointIntent;
+import org.onosproject.net.topology.LinkWeight;
+import org.onosproject.net.topology.PathService;
import java.util.HashSet;
import java.util.List;
@@ -40,9 +40,9 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
-import static org.onlab.onos.net.NetTestTools.connectPoint;
-import static org.onlab.onos.net.NetTestTools.createPath;
-import static org.onlab.onos.net.intent.LinksHaveEntryWithSourceDestinationPairMatcher.linksHasPath;
+import static org.onosproject.net.NetTestTools.connectPoint;
+import static org.onosproject.net.NetTestTools.createPath;
+import static org.onosproject.net.intent.LinksHaveEntryWithSourceDestinationPairMatcher.linksHasPath;
/**
* Unit tests for the MultiPointToSinglePoint intent compiler.
diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/PathConstraintCalculationTest.java b/core/net/src/test/java/org/onosproject/net/intent/impl/PathConstraintCalculationTest.java
index a9705d7..cb654c3 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/PathConstraintCalculationTest.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/PathConstraintCalculationTest.java
@@ -13,26 +13,26 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent.impl;
+package org.onosproject.net.intent.impl;
import java.util.LinkedList;
import java.util.List;
import org.junit.Test;
-import org.onlab.onos.net.flow.FlowRuleBatchOperation;
-import org.onlab.onos.net.flow.TrafficSelector;
-import org.onlab.onos.net.flow.TrafficTreatment;
-import org.onlab.onos.net.intent.AbstractIntentTest;
-import org.onlab.onos.net.intent.Constraint;
-import org.onlab.onos.net.intent.Intent;
-import org.onlab.onos.net.intent.IntentTestsMocks;
-import org.onlab.onos.net.intent.PathIntent;
-import org.onlab.onos.net.intent.PointToPointIntent;
-import org.onlab.onos.net.intent.constraint.BandwidthConstraint;
-import org.onlab.onos.net.intent.constraint.LambdaConstraint;
-import org.onlab.onos.net.resource.Bandwidth;
-import org.onlab.onos.net.resource.Lambda;
-import org.onlab.onos.net.resource.LinkResourceService;
+import org.onosproject.net.flow.FlowRuleBatchOperation;
+import org.onosproject.net.flow.TrafficSelector;
+import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.net.intent.AbstractIntentTest;
+import org.onosproject.net.intent.Constraint;
+import org.onosproject.net.intent.Intent;
+import org.onosproject.net.intent.IntentTestsMocks;
+import org.onosproject.net.intent.PathIntent;
+import org.onosproject.net.intent.PointToPointIntent;
+import org.onosproject.net.intent.constraint.BandwidthConstraint;
+import org.onosproject.net.intent.constraint.LambdaConstraint;
+import org.onosproject.net.resource.Bandwidth;
+import org.onosproject.net.resource.Lambda;
+import org.onosproject.net.resource.LinkResourceService;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
@@ -40,8 +40,8 @@
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.notNullValue;
import static org.junit.Assert.fail;
-import static org.onlab.onos.net.NetTestTools.APP_ID;
-import static org.onlab.onos.net.NetTestTools.connectPoint;
+import static org.onosproject.net.NetTestTools.APP_ID;
+import static org.onosproject.net.NetTestTools.connectPoint;
/**
* Unit tests for calculating paths for intents with constraints.
diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/PointToPointIntentCompilerTest.java b/core/net/src/test/java/org/onosproject/net/intent/impl/PointToPointIntentCompilerTest.java
index 6d76820..9922ba5 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/PointToPointIntentCompilerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/PointToPointIntentCompilerTest.java
@@ -13,22 +13,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.intent.impl;
+package org.onosproject.net.intent.impl;
import org.hamcrest.Matchers;
import org.junit.Test;
-import org.onlab.onos.TestApplicationId;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.Path;
-import org.onlab.onos.net.flow.TrafficSelector;
-import org.onlab.onos.net.flow.TrafficTreatment;
-import org.onlab.onos.net.intent.AbstractIntentTest;
-import org.onlab.onos.net.intent.Intent;
-import org.onlab.onos.net.intent.IntentTestsMocks;
-import org.onlab.onos.net.intent.PathIntent;
-import org.onlab.onos.net.intent.PointToPointIntent;
+import org.onosproject.TestApplicationId;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.Link;
+import org.onosproject.net.Path;
+import org.onosproject.net.flow.TrafficSelector;
+import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.net.intent.AbstractIntentTest;
+import org.onosproject.net.intent.Intent;
+import org.onosproject.net.intent.IntentTestsMocks;
+import org.onosproject.net.intent.PathIntent;
+import org.onosproject.net.intent.PointToPointIntent;
import java.util.List;
@@ -37,12 +37,12 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
-import static org.onlab.onos.net.DefaultEdgeLink.createEdgeLink;
-import static org.onlab.onos.net.DeviceId.deviceId;
-import static org.onlab.onos.net.NetTestTools.APP_ID;
-import static org.onlab.onos.net.NetTestTools.connectPoint;
-import static org.onlab.onos.net.PortNumber.portNumber;
-import static org.onlab.onos.net.intent.LinksHaveEntryWithSourceDestinationPairMatcher.linksHasPath;
+import static org.onosproject.net.DefaultEdgeLink.createEdgeLink;
+import static org.onosproject.net.DeviceId.deviceId;
+import static org.onosproject.net.NetTestTools.APP_ID;
+import static org.onosproject.net.NetTestTools.connectPoint;
+import static org.onosproject.net.PortNumber.portNumber;
+import static org.onosproject.net.intent.LinksHaveEntryWithSourceDestinationPairMatcher.linksHasPath;
/**
* Unit tests for the HostToHost intent compiler.
diff --git a/core/net/src/test/java/org/onosproject/net/link/impl/LinkManagerTest.java b/core/net/src/test/java/org/onosproject/net/link/impl/LinkManagerTest.java
index 665a550..ac6d1eb 100644
--- a/core/net/src/test/java/org/onosproject/net/link/impl/LinkManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/link/impl/LinkManagerTest.java
@@ -13,33 +13,33 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.link.impl;
+package org.onosproject.net.link.impl;
import com.google.common.collect.ImmutableSet;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.onlab.onos.event.Event;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.DefaultDevice;
-import org.onlab.onos.net.Device;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.MastershipRole;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.link.DefaultLinkDescription;
-import org.onlab.onos.net.link.LinkAdminService;
-import org.onlab.onos.net.link.LinkEvent;
-import org.onlab.onos.net.link.LinkListener;
-import org.onlab.onos.net.link.LinkProvider;
-import org.onlab.onos.net.link.LinkProviderRegistry;
-import org.onlab.onos.net.link.LinkProviderService;
-import org.onlab.onos.net.link.LinkService;
-import org.onlab.onos.net.provider.AbstractProvider;
-import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.onos.event.impl.TestEventDispatcher;
-import org.onlab.onos.net.device.impl.DeviceManager;
-import org.onlab.onos.store.trivial.impl.SimpleLinkStore;
+import org.onosproject.event.Event;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DefaultDevice;
+import org.onosproject.net.Device;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Link;
+import org.onosproject.net.MastershipRole;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.link.DefaultLinkDescription;
+import org.onosproject.net.link.LinkAdminService;
+import org.onosproject.net.link.LinkEvent;
+import org.onosproject.net.link.LinkListener;
+import org.onosproject.net.link.LinkProvider;
+import org.onosproject.net.link.LinkProviderRegistry;
+import org.onosproject.net.link.LinkProviderService;
+import org.onosproject.net.link.LinkService;
+import org.onosproject.net.provider.AbstractProvider;
+import org.onosproject.net.provider.ProviderId;
+import org.onosproject.event.impl.TestEventDispatcher;
+import org.onosproject.net.device.impl.DeviceManager;
+import org.onosproject.store.trivial.impl.SimpleLinkStore;
import java.util.ArrayList;
import java.util.HashMap;
@@ -49,10 +49,10 @@
import java.util.Set;
import static org.junit.Assert.*;
-import static org.onlab.onos.net.DeviceId.deviceId;
-import static org.onlab.onos.net.Link.Type.DIRECT;
-import static org.onlab.onos.net.Link.Type.INDIRECT;
-import static org.onlab.onos.net.link.LinkEvent.Type.*;
+import static org.onosproject.net.DeviceId.deviceId;
+import static org.onosproject.net.Link.Type.DIRECT;
+import static org.onosproject.net.Link.Type.INDIRECT;
+import static org.onosproject.net.link.LinkEvent.Type.*;
/**
* Test codifying the link service & link provider service contracts.
diff --git a/core/net/src/test/java/org/onosproject/net/proxyarp/impl/ProxyArpManagerTest.java b/core/net/src/test/java/org/onosproject/net/proxyarp/impl/ProxyArpManagerTest.java
index bfb659e..7ece2e8 100644
--- a/core/net/src/test/java/org/onosproject/net/proxyarp/impl/ProxyArpManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/proxyarp/impl/ProxyArpManagerTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.proxyarp.impl;
+package org.onosproject.net.proxyarp.impl;
import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.createMock;
@@ -32,29 +32,29 @@
import org.junit.Before;
import org.junit.Test;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.DefaultHost;
-import org.onlab.onos.net.Device;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.Host;
-import org.onlab.onos.net.HostId;
-import org.onlab.onos.net.HostLocation;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.Port;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.device.DeviceListener;
-import org.onlab.onos.net.device.DeviceService;
-import org.onlab.onos.net.flow.instructions.Instruction;
-import org.onlab.onos.net.flow.instructions.Instructions.OutputInstruction;
-import org.onlab.onos.net.host.HostService;
-import org.onlab.onos.net.host.InterfaceIpAddress;
-import org.onlab.onos.net.host.PortAddresses;
-import org.onlab.onos.net.link.LinkListener;
-import org.onlab.onos.net.link.LinkService;
-import org.onlab.onos.net.packet.OutboundPacket;
-import org.onlab.onos.net.packet.PacketProcessor;
-import org.onlab.onos.net.packet.PacketService;
-import org.onlab.onos.net.provider.ProviderId;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DefaultHost;
+import org.onosproject.net.Device;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Host;
+import org.onosproject.net.HostId;
+import org.onosproject.net.HostLocation;
+import org.onosproject.net.Link;
+import org.onosproject.net.Port;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.device.DeviceListener;
+import org.onosproject.net.device.DeviceService;
+import org.onosproject.net.flow.instructions.Instruction;
+import org.onosproject.net.flow.instructions.Instructions.OutputInstruction;
+import org.onosproject.net.host.HostService;
+import org.onosproject.net.host.InterfaceIpAddress;
+import org.onosproject.net.host.PortAddresses;
+import org.onosproject.net.link.LinkListener;
+import org.onosproject.net.link.LinkService;
+import org.onosproject.net.packet.OutboundPacket;
+import org.onosproject.net.packet.PacketProcessor;
+import org.onosproject.net.packet.PacketService;
+import org.onosproject.net.provider.ProviderId;
import org.onlab.packet.ARP;
import org.onlab.packet.Ethernet;
import org.onlab.packet.Ip4Address;
diff --git a/core/net/src/test/java/org/onosproject/net/topology/impl/DefaultTopologyProviderTest.java b/core/net/src/test/java/org/onosproject/net/topology/impl/DefaultTopologyProviderTest.java
index 7e67c6d..290ee55 100644
--- a/core/net/src/test/java/org/onosproject/net/topology/impl/DefaultTopologyProviderTest.java
+++ b/core/net/src/test/java/org/onosproject/net/topology/impl/DefaultTopologyProviderTest.java
@@ -13,27 +13,27 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.topology.impl;
+package org.onosproject.net.topology.impl;
import com.google.common.collect.ImmutableSet;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.onlab.onos.event.Event;
-import org.onlab.onos.event.impl.TestEventDispatcher;
-import org.onlab.onos.net.Device;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.device.DeviceEvent;
-import org.onlab.onos.net.device.impl.DeviceManager;
-import org.onlab.onos.net.link.LinkEvent;
-import org.onlab.onos.net.link.impl.LinkManager;
-import org.onlab.onos.net.provider.AbstractProviderService;
-import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.onos.net.topology.GraphDescription;
-import org.onlab.onos.net.topology.TopologyProvider;
-import org.onlab.onos.net.topology.TopologyProviderRegistry;
-import org.onlab.onos.net.topology.TopologyProviderService;
+import org.onosproject.event.Event;
+import org.onosproject.event.impl.TestEventDispatcher;
+import org.onosproject.net.Device;
+import org.onosproject.net.Link;
+import org.onosproject.net.device.DeviceEvent;
+import org.onosproject.net.device.impl.DeviceManager;
+import org.onosproject.net.link.LinkEvent;
+import org.onosproject.net.link.impl.LinkManager;
+import org.onosproject.net.provider.AbstractProviderService;
+import org.onosproject.net.provider.ProviderId;
+import org.onosproject.net.topology.GraphDescription;
+import org.onosproject.net.topology.TopologyProvider;
+import org.onosproject.net.topology.TopologyProviderRegistry;
+import org.onosproject.net.topology.TopologyProviderService;
import java.util.List;
import java.util.Set;
@@ -43,10 +43,10 @@
import static org.junit.Assert.*;
import static org.hamcrest.Matchers.*;
-import static org.onlab.onos.net.NetTestTools.device;
-import static org.onlab.onos.net.NetTestTools.link;
-import static org.onlab.onos.net.device.DeviceEvent.Type.DEVICE_ADDED;
-import static org.onlab.onos.net.link.LinkEvent.Type.LINK_ADDED;
+import static org.onosproject.net.NetTestTools.device;
+import static org.onosproject.net.NetTestTools.link;
+import static org.onosproject.net.device.DeviceEvent.Type.DEVICE_ADDED;
+import static org.onosproject.net.link.LinkEvent.Type.LINK_ADDED;
/**
* Test of the default topology provider implementation.
diff --git a/core/net/src/test/java/org/onosproject/net/topology/impl/PathManagerTest.java b/core/net/src/test/java/org/onosproject/net/topology/impl/PathManagerTest.java
index 6779c5e..2a2d0b5 100644
--- a/core/net/src/test/java/org/onosproject/net/topology/impl/PathManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/topology/impl/PathManagerTest.java
@@ -13,24 +13,24 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.topology.impl;
+package org.onosproject.net.topology.impl;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.ElementId;
-import org.onlab.onos.net.Host;
-import org.onlab.onos.net.HostId;
-import org.onlab.onos.net.Path;
-import org.onlab.onos.net.host.HostService;
-import org.onlab.onos.net.host.HostServiceAdapter;
-import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.onos.net.topology.LinkWeight;
-import org.onlab.onos.net.topology.PathService;
-import org.onlab.onos.net.topology.Topology;
-import org.onlab.onos.net.topology.TopologyService;
-import org.onlab.onos.net.topology.TopologyServiceAdapter;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.ElementId;
+import org.onosproject.net.Host;
+import org.onosproject.net.HostId;
+import org.onosproject.net.Path;
+import org.onosproject.net.host.HostService;
+import org.onosproject.net.host.HostServiceAdapter;
+import org.onosproject.net.provider.ProviderId;
+import org.onosproject.net.topology.LinkWeight;
+import org.onosproject.net.topology.PathService;
+import org.onosproject.net.topology.Topology;
+import org.onosproject.net.topology.TopologyService;
+import org.onosproject.net.topology.TopologyServiceAdapter;
import java.util.HashMap;
import java.util.HashSet;
@@ -39,7 +39,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import static org.onlab.onos.net.NetTestTools.*;
+import static org.onosproject.net.NetTestTools.*;
/**
* Test of the path selection subsystem.
diff --git a/core/net/src/test/java/org/onosproject/net/topology/impl/TopologyManagerTest.java b/core/net/src/test/java/org/onosproject/net/topology/impl/TopologyManagerTest.java
index 7fa2ff5..6eb6c70 100644
--- a/core/net/src/test/java/org/onosproject/net/topology/impl/TopologyManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/topology/impl/TopologyManagerTest.java
@@ -13,33 +13,33 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.net.topology.impl;
+package org.onosproject.net.topology.impl;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.onlab.onos.event.Event;
-import org.onlab.onos.event.impl.TestEventDispatcher;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.Device;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.Path;
-import org.onlab.onos.net.provider.AbstractProvider;
-import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.onos.net.topology.DefaultGraphDescription;
-import org.onlab.onos.net.topology.GraphDescription;
-import org.onlab.onos.net.topology.LinkWeight;
-import org.onlab.onos.net.topology.Topology;
-import org.onlab.onos.net.topology.TopologyCluster;
-import org.onlab.onos.net.topology.TopologyEdge;
-import org.onlab.onos.net.topology.TopologyEvent;
-import org.onlab.onos.net.topology.TopologyGraph;
-import org.onlab.onos.net.topology.TopologyListener;
-import org.onlab.onos.net.topology.TopologyProvider;
-import org.onlab.onos.net.topology.TopologyProviderRegistry;
-import org.onlab.onos.net.topology.TopologyProviderService;
-import org.onlab.onos.net.topology.TopologyService;
-import org.onlab.onos.store.trivial.impl.SimpleTopologyStore;
+import org.onosproject.event.Event;
+import org.onosproject.event.impl.TestEventDispatcher;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.Device;
+import org.onosproject.net.Link;
+import org.onosproject.net.Path;
+import org.onosproject.net.provider.AbstractProvider;
+import org.onosproject.net.provider.ProviderId;
+import org.onosproject.net.topology.DefaultGraphDescription;
+import org.onosproject.net.topology.GraphDescription;
+import org.onosproject.net.topology.LinkWeight;
+import org.onosproject.net.topology.Topology;
+import org.onosproject.net.topology.TopologyCluster;
+import org.onosproject.net.topology.TopologyEdge;
+import org.onosproject.net.topology.TopologyEvent;
+import org.onosproject.net.topology.TopologyGraph;
+import org.onosproject.net.topology.TopologyListener;
+import org.onosproject.net.topology.TopologyProvider;
+import org.onosproject.net.topology.TopologyProviderRegistry;
+import org.onosproject.net.topology.TopologyProviderService;
+import org.onosproject.net.topology.TopologyService;
+import org.onosproject.store.trivial.impl.SimpleTopologyStore;
import java.util.ArrayList;
import java.util.List;
@@ -47,10 +47,10 @@
import static com.google.common.collect.ImmutableSet.of;
import static org.junit.Assert.*;
-import static org.onlab.onos.net.NetTestTools.*;
-import static org.onlab.onos.net.PortNumber.portNumber;
-import static org.onlab.onos.net.topology.ClusterId.clusterId;
-import static org.onlab.onos.net.topology.TopologyEvent.Type.TOPOLOGY_CHANGED;
+import static org.onosproject.net.NetTestTools.*;
+import static org.onosproject.net.PortNumber.portNumber;
+import static org.onosproject.net.topology.ClusterId.clusterId;
+import static org.onosproject.net.topology.TopologyEvent.Type.TOPOLOGY_CHANGED;
/**
* Test of the topology subsystem.
diff --git a/core/pom.xml b/core/pom.xml
index 322bac8..e4f22a9 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.onlab.onos</groupId>
+ <groupId>org.onosproject</groupId>
<artifactId>onos</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
@@ -44,11 +44,11 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>org.onlab.onos</groupId>
+ <groupId>org.onosproject</groupId>
<artifactId>onlab-misc</artifactId>
</dependency>
<dependency>
- <groupId>org.onlab.onos</groupId>
+ <groupId>org.onosproject</groupId>
<artifactId>onlab-junit</artifactId>
<scope>test</scope>
</dependency>
diff --git a/core/store/dist/pom.xml b/core/store/dist/pom.xml
index f0f37c7..d0a419c 100644
--- a/core/store/dist/pom.xml
+++ b/core/store/dist/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.onlab.onos</groupId>
+ <groupId>org.onosproject</groupId>
<artifactId>onos-core-store</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
@@ -33,13 +33,13 @@
<dependencies>
<dependency>
- <groupId>org.onlab.onos</groupId>
+ <groupId>org.onosproject</groupId>
<artifactId>onos-core-serializers</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.onlab.onos</groupId>
+ <groupId>org.onosproject</groupId>
<artifactId>onlab-netty</artifactId>
<version>${project.version}</version>
</dependency>
@@ -93,7 +93,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.onlab.onos</groupId>
+ <groupId>org.onosproject</groupId>
<artifactId>onos-api</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
@@ -105,7 +105,7 @@
<!-- for shaded copycat -->
<dependency>
- <groupId>org.onlab.onos</groupId>
+ <groupId>org.onosproject</groupId>
<artifactId>onlab-thirdparty</artifactId>
</dependency>
</dependencies>
diff --git a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/ClusterDefinitionStore.java b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/ClusterDefinitionStore.java
index 19b6485..4d0aca4 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/ClusterDefinitionStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/ClusterDefinitionStore.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.cluster.impl;
+package org.onosproject.store.cluster.impl;
import com.fasterxml.jackson.core.JsonEncoding;
import com.fasterxml.jackson.core.JsonFactory;
@@ -21,8 +21,8 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.onlab.onos.cluster.DefaultControllerNode;
-import org.onlab.onos.cluster.NodeId;
+import org.onosproject.cluster.DefaultControllerNode;
+import org.onosproject.cluster.NodeId;
import org.onlab.packet.IpAddress;
import java.io.File;
diff --git a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/ClusterManagementMessageSubjects.java b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/ClusterManagementMessageSubjects.java
index 0fa40db..918f792 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/ClusterManagementMessageSubjects.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/ClusterManagementMessageSubjects.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.cluster.impl;
+package org.onosproject.store.cluster.impl;
-import org.onlab.onos.store.cluster.messaging.MessageSubject;
+import org.onosproject.store.cluster.messaging.MessageSubject;
//Not used right now
public final class ClusterManagementMessageSubjects {
diff --git a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/ClusterMembershipEvent.java b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/ClusterMembershipEvent.java
index 30b5939..c642873 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/ClusterMembershipEvent.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/ClusterMembershipEvent.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.cluster.impl;
+package org.onosproject.store.cluster.impl;
-import org.onlab.onos.cluster.ControllerNode;
+import org.onosproject.cluster.ControllerNode;
//Not used right now
/**
diff --git a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/ClusterMembershipEventType.java b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/ClusterMembershipEventType.java
index 6ed93b4..a7f09c7 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/ClusterMembershipEventType.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/ClusterMembershipEventType.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.cluster.impl;
+package org.onosproject.store.cluster.impl;
//Not used right now
public enum ClusterMembershipEventType {
diff --git a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/ClusterNodesDelegate.java b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/ClusterNodesDelegate.java
index a909534..7aeca72 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/ClusterNodesDelegate.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/ClusterNodesDelegate.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.cluster.impl;
+package org.onosproject.store.cluster.impl;
-import org.onlab.onos.cluster.DefaultControllerNode;
-import org.onlab.onos.cluster.NodeId;
+import org.onosproject.cluster.DefaultControllerNode;
+import org.onosproject.cluster.NodeId;
import org.onlab.packet.IpAddress;
// Not used right now
diff --git a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedClusterStore.java b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedClusterStore.java
index 4188cba..4da1b46 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedClusterStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedClusterStore.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.cluster.impl;
+package org.onosproject.store.cluster.impl;
import com.google.common.base.Optional;
import com.google.common.cache.LoadingCache;
@@ -28,15 +28,15 @@
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Service;
-import org.onlab.onos.cluster.ClusterEvent;
-import org.onlab.onos.cluster.ClusterStore;
-import org.onlab.onos.cluster.ClusterStoreDelegate;
-import org.onlab.onos.cluster.ControllerNode;
-import org.onlab.onos.cluster.DefaultControllerNode;
-import org.onlab.onos.cluster.NodeId;
-import org.onlab.onos.store.hz.AbsentInvalidatingLoadingCache;
-import org.onlab.onos.store.hz.AbstractHazelcastStore;
-import org.onlab.onos.store.hz.OptionalCacheLoader;
+import org.onosproject.cluster.ClusterEvent;
+import org.onosproject.cluster.ClusterStore;
+import org.onosproject.cluster.ClusterStoreDelegate;
+import org.onosproject.cluster.ControllerNode;
+import org.onosproject.cluster.DefaultControllerNode;
+import org.onosproject.cluster.NodeId;
+import org.onosproject.store.hz.AbsentInvalidatingLoadingCache;
+import org.onosproject.store.hz.AbstractHazelcastStore;
+import org.onosproject.store.hz.OptionalCacheLoader;
import org.onlab.packet.IpAddress;
import java.util.Map;
@@ -44,9 +44,9 @@
import java.util.concurrent.ConcurrentHashMap;
import static com.google.common.cache.CacheBuilder.newBuilder;
-import static org.onlab.onos.cluster.ClusterEvent.Type.INSTANCE_ACTIVATED;
-import static org.onlab.onos.cluster.ClusterEvent.Type.INSTANCE_DEACTIVATED;
-import static org.onlab.onos.cluster.ControllerNode.State;
+import static org.onosproject.cluster.ClusterEvent.Type.INSTANCE_ACTIVATED;
+import static org.onosproject.cluster.ClusterEvent.Type.INSTANCE_DEACTIVATED;
+import static org.onosproject.cluster.ControllerNode.State;
/**
* Distributed implementation of the cluster nodes store.
diff --git a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/HazelcastLeadershipService.java b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/HazelcastLeadershipService.java
index b3cd370..b130c13 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/HazelcastLeadershipService.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/HazelcastLeadershipService.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.cluster.impl;
+package org.onosproject.store.cluster.impl;
import static com.google.common.base.Preconditions.checkArgument;
import static org.onlab.util.Tools.namedThreads;
@@ -31,17 +31,17 @@
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
-import org.onlab.onos.cluster.ClusterService;
-import org.onlab.onos.cluster.Leadership;
-import org.onlab.onos.cluster.LeadershipEvent;
-import org.onlab.onos.cluster.LeadershipEventListener;
-import org.onlab.onos.cluster.LeadershipService;
-import org.onlab.onos.cluster.NodeId;
-import org.onlab.onos.event.AbstractListenerRegistry;
-import org.onlab.onos.event.EventDeliveryService;
-import org.onlab.onos.store.hz.StoreService;
-import org.onlab.onos.store.serializers.KryoNamespaces;
-import org.onlab.onos.store.serializers.KryoSerializer;
+import org.onosproject.cluster.ClusterService;
+import org.onosproject.cluster.Leadership;
+import org.onosproject.cluster.LeadershipEvent;
+import org.onosproject.cluster.LeadershipEventListener;
+import org.onosproject.cluster.LeadershipService;
+import org.onosproject.cluster.NodeId;
+import org.onosproject.event.AbstractListenerRegistry;
+import org.onosproject.event.EventDeliveryService;
+import org.onosproject.store.hz.StoreService;
+import org.onosproject.store.serializers.KryoNamespaces;
+import org.onosproject.store.serializers.KryoSerializer;
import org.onlab.util.KryoNamespace;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/LeadershipManager.java b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/LeadershipManager.java
index ee447fd..f3c5877 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/LeadershipManager.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/LeadershipManager.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.store.cluster.impl;
+package org.onosproject.store.cluster.impl;
import static com.google.common.base.Preconditions.checkArgument;
import static org.onlab.util.Tools.namedThreads;
@@ -17,21 +17,21 @@
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
-import org.onlab.onos.cluster.ClusterService;
-import org.onlab.onos.cluster.Leadership;
-import org.onlab.onos.cluster.LeadershipEvent;
-import org.onlab.onos.cluster.LeadershipEventListener;
-import org.onlab.onos.cluster.LeadershipService;
-import org.onlab.onos.cluster.NodeId;
-import org.onlab.onos.store.cluster.messaging.ClusterCommunicationService;
-import org.onlab.onos.store.cluster.messaging.ClusterMessage;
-import org.onlab.onos.store.cluster.messaging.ClusterMessageHandler;
-import org.onlab.onos.store.cluster.messaging.MessageSubject;
-import org.onlab.onos.store.serializers.KryoNamespaces;
-import org.onlab.onos.store.serializers.KryoSerializer;
-import org.onlab.onos.store.service.Lock;
-import org.onlab.onos.store.service.LockService;
-import org.onlab.onos.store.service.impl.DistributedLockManager;
+import org.onosproject.cluster.ClusterService;
+import org.onosproject.cluster.Leadership;
+import org.onosproject.cluster.LeadershipEvent;
+import org.onosproject.cluster.LeadershipEventListener;
+import org.onosproject.cluster.LeadershipService;
+import org.onosproject.cluster.NodeId;
+import org.onosproject.store.cluster.messaging.ClusterCommunicationService;
+import org.onosproject.store.cluster.messaging.ClusterMessage;
+import org.onosproject.store.cluster.messaging.ClusterMessageHandler;
+import org.onosproject.store.cluster.messaging.MessageSubject;
+import org.onosproject.store.serializers.KryoNamespaces;
+import org.onosproject.store.serializers.KryoSerializer;
+import org.onosproject.store.service.Lock;
+import org.onosproject.store.service.LockService;
+import org.onosproject.store.service.impl.DistributedLockManager;
import org.onlab.util.KryoNamespace;
import org.slf4j.Logger;
@@ -317,4 +317,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/package-info.java b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/package-info.java
index 64b4e20..9e2db67 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/package-info.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/package-info.java
@@ -17,4 +17,4 @@
/**
* Implementation of a distributed cluster node store using Hazelcast.
*/
-package org.onlab.onos.store.cluster.impl;
+package org.onosproject.store.cluster.impl;
diff --git a/core/store/dist/src/main/java/org/onosproject/store/cluster/messaging/impl/ClusterCommunicationManager.java b/core/store/dist/src/main/java/org/onosproject/store/cluster/messaging/impl/ClusterCommunicationManager.java
index 8ff3392..d293eed 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/cluster/messaging/impl/ClusterCommunicationManager.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/cluster/messaging/impl/ClusterCommunicationManager.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.cluster.messaging.impl;
+package org.onosproject.store.cluster.messaging.impl;
import static com.google.common.base.Preconditions.checkArgument;
@@ -31,17 +31,17 @@
import org.onlab.netty.MessageHandler;
import org.onlab.netty.MessagingService;
import org.onlab.netty.NettyMessagingService;
-import org.onlab.onos.cluster.ClusterService;
-import org.onlab.onos.cluster.ControllerNode;
-import org.onlab.onos.cluster.NodeId;
-import org.onlab.onos.store.cluster.messaging.ClusterCommunicationService;
-import org.onlab.onos.store.cluster.messaging.ClusterMessage;
-import org.onlab.onos.store.cluster.messaging.ClusterMessageHandler;
-import org.onlab.onos.store.cluster.messaging.MessageSubject;
-import org.onlab.onos.store.serializers.KryoNamespaces;
-import org.onlab.onos.store.serializers.KryoSerializer;
-import org.onlab.onos.store.serializers.impl.ClusterMessageSerializer;
-import org.onlab.onos.store.serializers.impl.MessageSubjectSerializer;
+import org.onosproject.cluster.ClusterService;
+import org.onosproject.cluster.ControllerNode;
+import org.onosproject.cluster.NodeId;
+import org.onosproject.store.cluster.messaging.ClusterCommunicationService;
+import org.onosproject.store.cluster.messaging.ClusterMessage;
+import org.onosproject.store.cluster.messaging.ClusterMessageHandler;
+import org.onosproject.store.cluster.messaging.MessageSubject;
+import org.onosproject.store.serializers.KryoNamespaces;
+import org.onosproject.store.serializers.KryoSerializer;
+import org.onosproject.store.serializers.impl.ClusterMessageSerializer;
+import org.onosproject.store.serializers.impl.MessageSubjectSerializer;
import org.onlab.util.KryoNamespace;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/core/store/dist/src/main/java/org/onosproject/store/cluster/messaging/impl/package-info.java b/core/store/dist/src/main/java/org/onosproject/store/cluster/messaging/impl/package-info.java
index efb89a4..7157277e 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/cluster/messaging/impl/package-info.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/cluster/messaging/impl/package-info.java
@@ -17,4 +17,4 @@
/**
* Implementation of the cluster messaging mechanism.
*/
-package org.onlab.onos.store.cluster.messaging.impl;
+package org.onosproject.store.cluster.messaging.impl;
diff --git a/core/store/dist/src/main/java/org/onosproject/store/core/impl/AppIdEvent.java b/core/store/dist/src/main/java/org/onosproject/store/core/impl/AppIdEvent.java
index 8c33201..9f021b1 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/core/impl/AppIdEvent.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/core/impl/AppIdEvent.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.core.impl;
+package org.onosproject.store.core.impl;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.event.AbstractEvent;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.event.AbstractEvent;
/**
* Application ID event.
diff --git a/core/store/dist/src/main/java/org/onosproject/store/core/impl/AppIdStoreDelegate.java b/core/store/dist/src/main/java/org/onosproject/store/core/impl/AppIdStoreDelegate.java
index e71dbb7..6240a31 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/core/impl/AppIdStoreDelegate.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/core/impl/AppIdStoreDelegate.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.core.impl;
+package org.onosproject.store.core.impl;
-import org.onlab.onos.store.StoreDelegate;
+import org.onosproject.store.StoreDelegate;
/**
* Application ID store delegate.
diff --git a/core/store/dist/src/main/java/org/onosproject/store/core/impl/DistributedApplicationIdStore.java b/core/store/dist/src/main/java/org/onosproject/store/core/impl/DistributedApplicationIdStore.java
index 4c3aa7a..f55ea54 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/core/impl/DistributedApplicationIdStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/core/impl/DistributedApplicationIdStore.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.core.impl;
+package org.onosproject.store.core.impl;
import static org.apache.commons.lang3.concurrent.ConcurrentUtils.putIfAbsent;
@@ -27,13 +27,13 @@
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Service;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.core.ApplicationIdStore;
-import org.onlab.onos.core.DefaultApplicationId;
-import org.onlab.onos.store.hz.AbstractHazelcastStore;
-import org.onlab.onos.store.hz.SMap;
-import org.onlab.onos.store.serializers.KryoNamespaces;
-import org.onlab.onos.store.serializers.KryoSerializer;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.core.ApplicationIdStore;
+import org.onosproject.core.DefaultApplicationId;
+import org.onosproject.store.hz.AbstractHazelcastStore;
+import org.onosproject.store.hz.SMap;
+import org.onosproject.store.serializers.KryoNamespaces;
+import org.onosproject.store.serializers.KryoSerializer;
import org.onlab.util.KryoNamespace;
import java.util.Map;
diff --git a/core/store/dist/src/main/java/org/onosproject/store/core/impl/DistributedIdBlockStore.java b/core/store/dist/src/main/java/org/onosproject/store/core/impl/DistributedIdBlockStore.java
index fd13860..d383118 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/core/impl/DistributedIdBlockStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/core/impl/DistributedIdBlockStore.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.core.impl;
+package org.onosproject.store.core.impl;
import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.core.IAtomicLong;
@@ -22,9 +22,9 @@
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
-import org.onlab.onos.core.IdBlock;
-import org.onlab.onos.core.IdBlockStore;
-import org.onlab.onos.store.hz.StoreService;
+import org.onosproject.core.IdBlock;
+import org.onosproject.core.IdBlockStore;
+import org.onosproject.store.hz.StoreService;
import java.util.Map;
diff --git a/core/store/dist/src/main/java/org/onosproject/store/core/impl/package-info.java b/core/store/dist/src/main/java/org/onosproject/store/core/impl/package-info.java
index a03d551..bb758b1 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/core/impl/package-info.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/core/impl/package-info.java
@@ -17,4 +17,4 @@
/**
* Implementation of a distributed application ID registry store using Hazelcast.
*/
-package org.onlab.onos.store.core.impl;
+package org.onosproject.store.core.impl;
diff --git a/core/store/dist/src/main/java/org/onosproject/store/device/impl/DeviceAntiEntropyAdvertisement.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/DeviceAntiEntropyAdvertisement.java
index 403032a..491d133 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/device/impl/DeviceAntiEntropyAdvertisement.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/device/impl/DeviceAntiEntropyAdvertisement.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.device.impl;
+package org.onosproject.store.device.impl;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Map;
-import org.onlab.onos.cluster.NodeId;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.store.Timestamp;
+import org.onosproject.cluster.NodeId;
+import org.onosproject.net.DeviceId;
+import org.onosproject.store.Timestamp;
/**
diff --git a/core/store/dist/src/main/java/org/onosproject/store/device/impl/DeviceAntiEntropyRequest.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/DeviceAntiEntropyRequest.java
index 923453a..a719a77 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/device/impl/DeviceAntiEntropyRequest.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/device/impl/DeviceAntiEntropyRequest.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.device.impl;
+package org.onosproject.store.device.impl;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Collection;
-import org.onlab.onos.cluster.NodeId;
+import org.onosproject.cluster.NodeId;
/**
* Message to request for other peers information.
diff --git a/core/store/dist/src/main/java/org/onosproject/store/device/impl/DeviceClockManager.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/DeviceClockManager.java
index 486d41e..f99e826 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/device/impl/DeviceClockManager.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/device/impl/DeviceClockManager.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.device.impl;
+package org.onosproject.store.device.impl;
import static org.slf4j.LoggerFactory.getLogger;
@@ -25,12 +25,12 @@
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Service;
-import org.onlab.onos.mastership.MastershipTerm;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.device.DeviceClockProviderService;
-import org.onlab.onos.net.device.DeviceClockService;
-import org.onlab.onos.store.Timestamp;
-import org.onlab.onos.store.impl.MastershipBasedTimestamp;
+import org.onosproject.mastership.MastershipTerm;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.device.DeviceClockProviderService;
+import org.onosproject.net.device.DeviceClockService;
+import org.onosproject.store.Timestamp;
+import org.onosproject.store.impl.MastershipBasedTimestamp;
import org.slf4j.Logger;
/**
diff --git a/core/store/dist/src/main/java/org/onosproject/store/device/impl/DeviceDescriptions.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/DeviceDescriptions.java
index b51377f..24c21d0 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/device/impl/DeviceDescriptions.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/device/impl/DeviceDescriptions.java
@@ -13,24 +13,24 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.device.impl;
+package org.onosproject.store.device.impl;
import static com.google.common.base.Preconditions.checkNotNull;
-import static org.onlab.onos.net.DefaultAnnotations.union;
+import static org.onosproject.net.DefaultAnnotations.union;
import java.util.Collections;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.SparseAnnotations;
-import org.onlab.onos.net.device.DefaultDeviceDescription;
-import org.onlab.onos.net.device.DefaultPortDescription;
-import org.onlab.onos.net.device.DeviceDescription;
-import org.onlab.onos.net.device.PortDescription;
-import org.onlab.onos.store.Timestamp;
-import org.onlab.onos.store.impl.Timestamped;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.SparseAnnotations;
+import org.onosproject.net.device.DefaultDeviceDescription;
+import org.onosproject.net.device.DefaultPortDescription;
+import org.onosproject.net.device.DeviceDescription;
+import org.onosproject.net.device.PortDescription;
+import org.onosproject.store.Timestamp;
+import org.onosproject.store.impl.Timestamped;
/*
* Collection of Description of a Device and Ports, given from a Provider.
diff --git a/core/store/dist/src/main/java/org/onosproject/store/device/impl/DeviceFragmentId.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/DeviceFragmentId.java
index 67616f2..214f4c2 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/device/impl/DeviceFragmentId.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/device/impl/DeviceFragmentId.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.device.impl;
+package org.onosproject.store.device.impl;
import java.util.Objects;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.provider.ProviderId;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.provider.ProviderId;
import com.google.common.base.MoreObjects;
diff --git a/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
index 03c0cb6..a376b93 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.device.impl;
+package org.onosproject.store.device.impl;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
@@ -29,38 +29,38 @@
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
-import org.onlab.onos.cluster.ClusterService;
-import org.onlab.onos.cluster.ControllerNode;
-import org.onlab.onos.cluster.NodeId;
-import org.onlab.onos.mastership.MastershipService;
-import org.onlab.onos.mastership.MastershipTerm;
-import org.onlab.onos.mastership.MastershipTermService;
-import org.onlab.onos.net.AnnotationsUtil;
-import org.onlab.onos.net.DefaultAnnotations;
-import org.onlab.onos.net.DefaultDevice;
-import org.onlab.onos.net.DefaultPort;
-import org.onlab.onos.net.Device;
-import org.onlab.onos.net.Device.Type;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.MastershipRole;
-import org.onlab.onos.net.Port;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.device.DeviceClockService;
-import org.onlab.onos.net.device.DeviceDescription;
-import org.onlab.onos.net.device.DeviceEvent;
-import org.onlab.onos.net.device.DeviceStore;
-import org.onlab.onos.net.device.DeviceStoreDelegate;
-import org.onlab.onos.net.device.PortDescription;
-import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.onos.store.AbstractStore;
-import org.onlab.onos.store.Timestamp;
-import org.onlab.onos.store.cluster.messaging.ClusterCommunicationService;
-import org.onlab.onos.store.cluster.messaging.ClusterMessage;
-import org.onlab.onos.store.cluster.messaging.ClusterMessageHandler;
-import org.onlab.onos.store.cluster.messaging.MessageSubject;
-import org.onlab.onos.store.impl.Timestamped;
-import org.onlab.onos.store.serializers.KryoSerializer;
-import org.onlab.onos.store.serializers.impl.DistributedStoreSerializers;
+import org.onosproject.cluster.ClusterService;
+import org.onosproject.cluster.ControllerNode;
+import org.onosproject.cluster.NodeId;
+import org.onosproject.mastership.MastershipService;
+import org.onosproject.mastership.MastershipTerm;
+import org.onosproject.mastership.MastershipTermService;
+import org.onosproject.net.AnnotationsUtil;
+import org.onosproject.net.DefaultAnnotations;
+import org.onosproject.net.DefaultDevice;
+import org.onosproject.net.DefaultPort;
+import org.onosproject.net.Device;
+import org.onosproject.net.Device.Type;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.MastershipRole;
+import org.onosproject.net.Port;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.device.DeviceClockService;
+import org.onosproject.net.device.DeviceDescription;
+import org.onosproject.net.device.DeviceEvent;
+import org.onosproject.net.device.DeviceStore;
+import org.onosproject.net.device.DeviceStoreDelegate;
+import org.onosproject.net.device.PortDescription;
+import org.onosproject.net.provider.ProviderId;
+import org.onosproject.store.AbstractStore;
+import org.onosproject.store.Timestamp;
+import org.onosproject.store.cluster.messaging.ClusterCommunicationService;
+import org.onosproject.store.cluster.messaging.ClusterMessage;
+import org.onosproject.store.cluster.messaging.ClusterMessageHandler;
+import org.onosproject.store.cluster.messaging.MessageSubject;
+import org.onosproject.store.impl.Timestamped;
+import org.onosproject.store.serializers.KryoSerializer;
+import org.onosproject.store.serializers.impl.DistributedStoreSerializers;
import org.onlab.packet.ChassisId;
import org.onlab.util.KryoNamespace;
import org.onlab.util.NewConcurrentHashMap;
@@ -86,17 +86,17 @@
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Predicates.notNull;
-import static org.onlab.onos.cluster.ControllerNodeToNodeId.toNodeId;
-import static org.onlab.onos.net.device.DeviceEvent.Type.*;
+import static org.onosproject.cluster.ControllerNodeToNodeId.toNodeId;
+import static org.onosproject.net.device.DeviceEvent.Type.*;
import static org.slf4j.LoggerFactory.getLogger;
import static org.apache.commons.lang3.concurrent.ConcurrentUtils.createIfAbsentUnchecked;
-import static org.onlab.onos.net.DefaultAnnotations.merge;
+import static org.onosproject.net.DefaultAnnotations.merge;
import static com.google.common.base.Verify.verify;
import static org.onlab.util.Tools.minPriority;
import static org.onlab.util.Tools.namedThreads;
import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
-import static org.onlab.onos.store.device.impl.GossipDeviceStoreMessageSubjects.DEVICE_ADVERTISE;
-import static org.onlab.onos.store.device.impl.GossipDeviceStoreMessageSubjects.DEVICE_REMOVE_REQ;
+import static org.onosproject.store.device.impl.GossipDeviceStoreMessageSubjects.DEVICE_ADVERTISE;
+import static org.onosproject.store.device.impl.GossipDeviceStoreMessageSubjects.DEVICE_REMOVE_REQ;
// TODO: give me a better name
/**
diff --git a/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStoreMessageSubjects.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStoreMessageSubjects.java
index 4c9e48c..652603f 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStoreMessageSubjects.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStoreMessageSubjects.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.device.impl;
+package org.onosproject.store.device.impl;
-import org.onlab.onos.store.cluster.messaging.MessageSubject;
+import org.onosproject.store.cluster.messaging.MessageSubject;
// TODO: add prefix to assure uniqueness.
/**
diff --git a/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalDeviceEvent.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalDeviceEvent.java
index 051602b..6916a3e 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalDeviceEvent.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalDeviceEvent.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.device.impl;
+package org.onosproject.store.device.impl;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.device.DeviceDescription;
-import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.onos.store.impl.Timestamped;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.device.DeviceDescription;
+import org.onosproject.net.provider.ProviderId;
+import org.onosproject.store.impl.Timestamped;
import com.google.common.base.MoreObjects;
diff --git a/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalDeviceEventSerializer.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalDeviceEventSerializer.java
index b0a577c..d5fbde7 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalDeviceEventSerializer.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalDeviceEventSerializer.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.device.impl;
+package org.onosproject.store.device.impl;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.device.DeviceDescription;
-import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.onos.store.impl.Timestamped;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.device.DeviceDescription;
+import org.onosproject.net.provider.ProviderId;
+import org.onosproject.store.impl.Timestamped;
import com.esotericsoftware.kryo.Kryo;
import com.esotericsoftware.kryo.Serializer;
diff --git a/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalDeviceOfflineEvent.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalDeviceOfflineEvent.java
index 4037981..0546c13 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalDeviceOfflineEvent.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalDeviceOfflineEvent.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.device.impl;
+package org.onosproject.store.device.impl;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.store.Timestamp;
+import org.onosproject.net.DeviceId;
+import org.onosproject.store.Timestamp;
import com.google.common.base.MoreObjects;
diff --git a/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalDeviceOfflineEventSerializer.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalDeviceOfflineEventSerializer.java
index f5f8814..7f3c7bc 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalDeviceOfflineEventSerializer.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalDeviceOfflineEventSerializer.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.device.impl;
+package org.onosproject.store.device.impl;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.store.Timestamp;
+import org.onosproject.net.DeviceId;
+import org.onosproject.store.Timestamp;
import com.esotericsoftware.kryo.Kryo;
import com.esotericsoftware.kryo.Serializer;
diff --git a/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalDeviceRemovedEvent.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalDeviceRemovedEvent.java
index ac7793d..e9f4f06 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalDeviceRemovedEvent.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalDeviceRemovedEvent.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.device.impl;
+package org.onosproject.store.device.impl;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.store.Timestamp;
+import org.onosproject.net.DeviceId;
+import org.onosproject.store.Timestamp;
import com.google.common.base.MoreObjects;
diff --git a/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalPortEvent.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalPortEvent.java
index f394905..f92fb11 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalPortEvent.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalPortEvent.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.device.impl;
+package org.onosproject.store.device.impl;
import java.util.List;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.device.PortDescription;
-import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.onos.store.impl.Timestamped;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.device.PortDescription;
+import org.onosproject.net.provider.ProviderId;
+import org.onosproject.store.impl.Timestamped;
import com.google.common.base.MoreObjects;
diff --git a/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalPortEventSerializer.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalPortEventSerializer.java
index 99514ab..0acd703 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalPortEventSerializer.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalPortEventSerializer.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.device.impl;
+package org.onosproject.store.device.impl;
import java.util.List;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.device.PortDescription;
-import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.onos.store.impl.Timestamped;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.device.PortDescription;
+import org.onosproject.net.provider.ProviderId;
+import org.onosproject.store.impl.Timestamped;
import com.esotericsoftware.kryo.Kryo;
import com.esotericsoftware.kryo.Serializer;
diff --git a/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalPortStatusEvent.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalPortStatusEvent.java
index 12a8a19..f178169 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalPortStatusEvent.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalPortStatusEvent.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.device.impl;
+package org.onosproject.store.device.impl;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.device.PortDescription;
-import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.onos.store.impl.Timestamped;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.device.PortDescription;
+import org.onosproject.net.provider.ProviderId;
+import org.onosproject.store.impl.Timestamped;
import com.google.common.base.MoreObjects;
diff --git a/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalPortStatusEventSerializer.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalPortStatusEventSerializer.java
index 24a9f25..32ee391 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalPortStatusEventSerializer.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalPortStatusEventSerializer.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.device.impl;
+package org.onosproject.store.device.impl;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.device.PortDescription;
-import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.onos.store.impl.Timestamped;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.device.PortDescription;
+import org.onosproject.net.provider.ProviderId;
+import org.onosproject.store.impl.Timestamped;
import com.esotericsoftware.kryo.Kryo;
import com.esotericsoftware.kryo.Serializer;
diff --git