Changing org.onlab.onos package to org.onosproject Change-Id: Ic81421faa27acdcff045add47d9e0a715cd4f575

commit: abafb50f58363c90e525873a96a1d14cc2449200 [log] [tgz]
author: Brian O'Connor <bocon@onlab.us> Tue Dec 02 22:26:20 2014 -0800
committer: Brian O'Connor <bocon@onlab.us> Tue Dec 02 22:26:20 2014 -0800
tree: 71bd9a07c79945746e29ae8311ab5f768aa1640b
parent: 03defe793917884eedd233a39b82dafe14ebedd5 [diff]
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;
commit	abafb50f58363c90e525873a96a1d14cc2449200	[log] [tgz]
author	Brian O'Connor <bocon@onlab.us>	Tue Dec 02 22:26:20 2014 -0800
committer	Brian O'Connor <bocon@onlab.us>	Tue Dec 02 22:26:20 2014 -0800
tree	71bd9a07c79945746e29ae8311ab5f768aa1640b
parent	03defe793917884eedd233a39b82dafe14ebedd5 [diff]