Changing org.onlab.onos package to org.onosproject
Change-Id: Ic81421faa27acdcff045add47d9e0a715cd4f575
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.