Changing org.onlab.onos package to org.onosproject
Change-Id: Ic81421faa27acdcff045add47d9e0a715cd4f575
diff --git a/cli/pom.xml b/cli/pom.xml
index 0c8a7ef..038d35c 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.onlab.onos</groupId>
+ <groupId>org.onosproject</groupId>
<artifactId>onos</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
@@ -34,11 +34,11 @@
<dependencies>
<dependency>
- <groupId>org.onlab.onos</groupId>
+ <groupId>org.onosproject</groupId>
<artifactId>onos-api</artifactId>
</dependency>
<dependency>
- <groupId>org.onlab.onos</groupId>
+ <groupId>org.onosproject</groupId>
<artifactId>onlab-osgi</artifactId>
</dependency>
diff --git a/cli/src/main/java/org/onosproject/cli/AbstractShellCommand.java b/cli/src/main/java/org/onosproject/cli/AbstractShellCommand.java
index 122245a..e6a62d0 100644
--- a/cli/src/main/java/org/onosproject/cli/AbstractShellCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/AbstractShellCommand.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli;
+package org.onosproject.cli;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.karaf.shell.commands.Option;
import org.apache.karaf.shell.console.OsgiCommandSupport;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.core.CoreService;
-import org.onlab.onos.net.Annotations;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.core.CoreService;
+import org.onosproject.net.Annotations;
import org.onlab.osgi.DefaultServiceDirectory;
import org.onlab.osgi.ServiceNotFoundException;
@@ -52,7 +52,7 @@
* @return command-line application identifier
*/
protected ApplicationId appId() {
- return get(CoreService.class).registerApplication("org.onlab.onos.cli");
+ return get(CoreService.class).registerApplication("org.onosproject.cli");
}
/**
diff --git a/cli/src/main/java/org/onosproject/cli/ApplicationIdListCommand.java b/cli/src/main/java/org/onosproject/cli/ApplicationIdListCommand.java
index 5a1483a..400ada4 100644
--- a/cli/src/main/java/org/onosproject/cli/ApplicationIdListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/ApplicationIdListCommand.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli;
+package org.onosproject.cli;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.core.CoreService;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.core.CoreService;
import java.util.Collections;
import java.util.List;
diff --git a/cli/src/main/java/org/onosproject/cli/BalanceMastersCommand.java b/cli/src/main/java/org/onosproject/cli/BalanceMastersCommand.java
index 9b31715..9a35ce3 100644
--- a/cli/src/main/java/org/onosproject/cli/BalanceMastersCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/BalanceMastersCommand.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli;
+package org.onosproject.cli;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.mastership.MastershipAdminService;
+import org.onosproject.mastership.MastershipAdminService;
/**
* Forces device mastership rebalancing.
diff --git a/cli/src/main/java/org/onosproject/cli/Comparators.java b/cli/src/main/java/org/onosproject/cli/Comparators.java
index 7466466..764b227 100644
--- a/cli/src/main/java/org/onosproject/cli/Comparators.java
+++ b/cli/src/main/java/org/onosproject/cli/Comparators.java
@@ -13,19 +13,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli;
+package org.onosproject.cli;
import java.util.Comparator;
-import org.onlab.onos.cluster.ControllerNode;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.Element;
-import org.onlab.onos.net.ElementId;
-import org.onlab.onos.net.Port;
-import org.onlab.onos.net.flow.FlowRule;
-import org.onlab.onos.net.host.PortAddresses;
-import org.onlab.onos.net.topology.TopologyCluster;
+import org.onosproject.cluster.ControllerNode;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.Element;
+import org.onosproject.net.ElementId;
+import org.onosproject.net.Port;
+import org.onosproject.net.flow.FlowRule;
+import org.onosproject.net.host.PortAddresses;
+import org.onosproject.net.topology.TopologyCluster;
/**
* Various comparators.
diff --git a/cli/src/main/java/org/onosproject/cli/MastersListCommand.java b/cli/src/main/java/org/onosproject/cli/MastersListCommand.java
index caaf244..8675a3c 100644
--- a/cli/src/main/java/org/onosproject/cli/MastersListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/MastersListCommand.java
@@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli;
+package org.onosproject.cli;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.google.common.collect.Lists;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.cluster.ClusterService;
-import org.onlab.onos.cluster.ControllerNode;
-import org.onlab.onos.mastership.MastershipService;
-import org.onlab.onos.net.DeviceId;
+import org.onosproject.cluster.ClusterService;
+import org.onosproject.cluster.ControllerNode;
+import org.onosproject.mastership.MastershipService;
+import org.onosproject.net.DeviceId;
import java.util.Collections;
import java.util.List;
diff --git a/cli/src/main/java/org/onosproject/cli/MetricsListCommand.java b/cli/src/main/java/org/onosproject/cli/MetricsListCommand.java
index 52b07e3..cb2b365 100644
--- a/cli/src/main/java/org/onosproject/cli/MetricsListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/MetricsListCommand.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.onlab.onos.cli;
+package org.onosproject.cli;
import static java.lang.String.format;
diff --git a/cli/src/main/java/org/onosproject/cli/NodeAddCommand.java b/cli/src/main/java/org/onosproject/cli/NodeAddCommand.java
index 3fa7bca..8c4cdc7 100644
--- a/cli/src/main/java/org/onosproject/cli/NodeAddCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/NodeAddCommand.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli;
+package org.onosproject.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.cluster.ClusterAdminService;
-import org.onlab.onos.cluster.NodeId;
+import org.onosproject.cluster.ClusterAdminService;
+import org.onosproject.cluster.NodeId;
import org.onlab.packet.IpAddress;
/**
diff --git a/cli/src/main/java/org/onosproject/cli/NodeIdCompleter.java b/cli/src/main/java/org/onosproject/cli/NodeIdCompleter.java
index c728b55..8e6db7f 100644
--- a/cli/src/main/java/org/onosproject/cli/NodeIdCompleter.java
+++ b/cli/src/main/java/org/onosproject/cli/NodeIdCompleter.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli;
+package org.onosproject.cli;
import org.apache.karaf.shell.console.Completer;
import org.apache.karaf.shell.console.completer.StringsCompleter;
-import org.onlab.onos.cluster.ClusterService;
-import org.onlab.onos.cluster.ControllerNode;
+import org.onosproject.cluster.ClusterService;
+import org.onosproject.cluster.ControllerNode;
import java.util.Iterator;
import java.util.List;
diff --git a/cli/src/main/java/org/onosproject/cli/NodeRemoveCommand.java b/cli/src/main/java/org/onosproject/cli/NodeRemoveCommand.java
index fa8ff90..c2dbb54 100644
--- a/cli/src/main/java/org/onosproject/cli/NodeRemoveCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/NodeRemoveCommand.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli;
+package org.onosproject.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.cluster.ClusterAdminService;
-import org.onlab.onos.cluster.NodeId;
+import org.onosproject.cluster.ClusterAdminService;
+import org.onosproject.cluster.NodeId;
/**
* Removes a controller cluster node.
diff --git a/cli/src/main/java/org/onosproject/cli/NodesListCommand.java b/cli/src/main/java/org/onosproject/cli/NodesListCommand.java
index 17162a2..ec06b34 100644
--- a/cli/src/main/java/org/onosproject/cli/NodesListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/NodesListCommand.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli;
+package org.onosproject.cli;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.cluster.ClusterService;
-import org.onlab.onos.cluster.ControllerNode;
+import org.onosproject.cluster.ClusterService;
+import org.onosproject.cluster.ControllerNode;
import java.util.Collections;
import java.util.List;
diff --git a/cli/src/main/java/org/onosproject/cli/RolesCommand.java b/cli/src/main/java/org/onosproject/cli/RolesCommand.java
index d5b0504..bc1e910 100644
--- a/cli/src/main/java/org/onosproject/cli/RolesCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/RolesCommand.java
@@ -13,23 +13,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli;
+package org.onosproject.cli;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.cluster.NodeId;
-import org.onlab.onos.cluster.RoleInfo;
-import org.onlab.onos.mastership.MastershipService;
-import org.onlab.onos.net.Device;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.device.DeviceService;
+import org.onosproject.cluster.NodeId;
+import org.onosproject.cluster.RoleInfo;
+import org.onosproject.mastership.MastershipService;
+import org.onosproject.net.Device;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.device.DeviceService;
import java.util.List;
-import static org.onlab.onos.cli.net.DevicesListCommand.getSortedDevices;
+import static org.onosproject.cli.net.DevicesListCommand.getSortedDevices;
/**
* Lists mastership roles of nodes for each device.
diff --git a/cli/src/main/java/org/onosproject/cli/SummaryCommand.java b/cli/src/main/java/org/onosproject/cli/SummaryCommand.java
index ad6d142..5c33e05 100644
--- a/cli/src/main/java/org/onosproject/cli/SummaryCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/SummaryCommand.java
@@ -13,19 +13,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli;
+package org.onosproject.cli;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.core.CoreService;
-import org.onlab.onos.cluster.ClusterService;
-import org.onlab.onos.net.device.DeviceService;
-import org.onlab.onos.net.flow.FlowRuleService;
-import org.onlab.onos.net.host.HostService;
-import org.onlab.onos.net.intent.IntentService;
-import org.onlab.onos.net.link.LinkService;
-import org.onlab.onos.net.topology.Topology;
-import org.onlab.onos.net.topology.TopologyService;
+import org.onosproject.core.CoreService;
+import org.onosproject.cluster.ClusterService;
+import org.onosproject.net.device.DeviceService;
+import org.onosproject.net.flow.FlowRuleService;
+import org.onosproject.net.host.HostService;
+import org.onosproject.net.intent.IntentService;
+import org.onosproject.net.link.LinkService;
+import org.onosproject.net.topology.Topology;
+import org.onosproject.net.topology.TopologyService;
/**
* Provides summary of ONOS model.
diff --git a/cli/src/main/java/org/onosproject/cli/TabletAddCommand.java b/cli/src/main/java/org/onosproject/cli/TabletAddCommand.java
index a7cdff7..9b89802 100644
--- a/cli/src/main/java/org/onosproject/cli/TabletAddCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/TabletAddCommand.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli;
+package org.onosproject.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.cluster.ControllerNode;
-import org.onlab.onos.cluster.DefaultControllerNode;
-import org.onlab.onos.cluster.NodeId;
-import org.onlab.onos.store.service.DatabaseAdminService;
+import org.onosproject.cluster.ControllerNode;
+import org.onosproject.cluster.DefaultControllerNode;
+import org.onosproject.cluster.NodeId;
+import org.onosproject.store.service.DatabaseAdminService;
import org.onlab.packet.IpAddress;
/**
diff --git a/cli/src/main/java/org/onosproject/cli/TabletLeaderCommand.java b/cli/src/main/java/org/onosproject/cli/TabletLeaderCommand.java
index b0aa835..c46c421 100644
--- a/cli/src/main/java/org/onosproject/cli/TabletLeaderCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/TabletLeaderCommand.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli;
+package org.onosproject.cli;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.cluster.ControllerNode;
-import org.onlab.onos.store.service.DatabaseAdminService;
+import org.onosproject.cluster.ControllerNode;
+import org.onosproject.store.service.DatabaseAdminService;
import java.util.Optional;
diff --git a/cli/src/main/java/org/onosproject/cli/TabletMemberCommand.java b/cli/src/main/java/org/onosproject/cli/TabletMemberCommand.java
index da42790..ed5117f 100644
--- a/cli/src/main/java/org/onosproject/cli/TabletMemberCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/TabletMemberCommand.java
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli;
+package org.onosproject.cli;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.cluster.ClusterService;
-import org.onlab.onos.cluster.ControllerNode;
-import org.onlab.onos.store.service.DatabaseAdminService;
+import org.onosproject.cluster.ClusterService;
+import org.onosproject.cluster.ControllerNode;
+import org.onosproject.store.service.DatabaseAdminService;
import java.util.Collections;
import java.util.List;
diff --git a/cli/src/main/java/org/onosproject/cli/TabletRemoveCommand.java b/cli/src/main/java/org/onosproject/cli/TabletRemoveCommand.java
index 19c669d..bc54738 100644
--- a/cli/src/main/java/org/onosproject/cli/TabletRemoveCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/TabletRemoveCommand.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli;
+package org.onosproject.cli;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.cluster.ClusterService;
-import org.onlab.onos.cluster.ControllerNode;
-import org.onlab.onos.cluster.NodeId;
-import org.onlab.onos.store.service.DatabaseAdminService;
+import org.onosproject.cluster.ClusterService;
+import org.onosproject.cluster.ControllerNode;
+import org.onosproject.cluster.NodeId;
+import org.onosproject.store.service.DatabaseAdminService;
/**
* Removes a controller cluster node.
diff --git a/cli/src/main/java/org/onosproject/cli/net/AddFlowsCommand.java b/cli/src/main/java/org/onosproject/cli/net/AddFlowsCommand.java
index e722802..ae91799 100644
--- a/cli/src/main/java/org/onosproject/cli/net/AddFlowsCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/AddFlowsCommand.java
@@ -1,5 +1,5 @@
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
@@ -8,19 +8,19 @@
import com.google.common.collect.Sets;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.cli.AbstractShellCommand;
-import org.onlab.onos.net.Device;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.device.DeviceService;
-import org.onlab.onos.net.flow.CompletedBatchOperation;
-import org.onlab.onos.net.flow.DefaultFlowRule;
-import org.onlab.onos.net.flow.DefaultTrafficSelector;
-import org.onlab.onos.net.flow.DefaultTrafficTreatment;
-import org.onlab.onos.net.flow.FlowRuleBatchEntry;
-import org.onlab.onos.net.flow.FlowRuleBatchOperation;
-import org.onlab.onos.net.flow.FlowRuleService;
-import org.onlab.onos.net.flow.TrafficSelector;
-import org.onlab.onos.net.flow.TrafficTreatment;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.net.Device;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.device.DeviceService;
+import org.onosproject.net.flow.CompletedBatchOperation;
+import org.onosproject.net.flow.DefaultFlowRule;
+import org.onosproject.net.flow.DefaultTrafficSelector;
+import org.onosproject.net.flow.DefaultTrafficTreatment;
+import org.onosproject.net.flow.FlowRuleBatchEntry;
+import org.onosproject.net.flow.FlowRuleBatchOperation;
+import org.onosproject.net.flow.FlowRuleService;
+import org.onosproject.net.flow.TrafficSelector;
+import org.onosproject.net.flow.TrafficTreatment;
import org.onlab.packet.MacAddress;
import java.util.ArrayList;
diff --git a/cli/src/main/java/org/onosproject/cli/net/AddHostToHostIntentCommand.java b/cli/src/main/java/org/onosproject/cli/net/AddHostToHostIntentCommand.java
index c137b9a..b064a54 100644
--- a/cli/src/main/java/org/onosproject/cli/net/AddHostToHostIntentCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/AddHostToHostIntentCommand.java
@@ -13,18 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.net.HostId;
-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.onlab.onos.net.intent.Constraint;
-import org.onlab.onos.net.intent.HostToHostIntent;
-import org.onlab.onos.net.intent.IntentService;
+import org.onosproject.net.HostId;
+import org.onosproject.net.flow.DefaultTrafficSelector;
+import org.onosproject.net.flow.DefaultTrafficTreatment;
+import org.onosproject.net.flow.TrafficSelector;
+import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.net.intent.Constraint;
+import org.onosproject.net.intent.HostToHostIntent;
+import org.onosproject.net.intent.IntentService;
import java.util.List;
diff --git a/cli/src/main/java/org/onosproject/cli/net/AddMultiPointToSinglePointIntentCommand.java b/cli/src/main/java/org/onosproject/cli/net/AddMultiPointToSinglePointIntentCommand.java
index 6a9787f..5f08442 100644
--- a/cli/src/main/java/org/onosproject/cli/net/AddMultiPointToSinglePointIntentCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/AddMultiPointToSinglePointIntentCommand.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
-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;
import java.util.HashSet;
import java.util.List;
@@ -24,15 +24,15 @@
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.flow.TrafficSelector;
-import org.onlab.onos.net.flow.TrafficTreatment;
-import org.onlab.onos.net.intent.Constraint;
-import org.onlab.onos.net.intent.Intent;
-import org.onlab.onos.net.intent.IntentService;
-import org.onlab.onos.net.intent.MultiPointToSinglePointIntent;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.flow.TrafficSelector;
+import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.net.intent.Constraint;
+import org.onosproject.net.intent.Intent;
+import org.onosproject.net.intent.IntentService;
+import org.onosproject.net.intent.MultiPointToSinglePointIntent;
/**
* Installs point-to-point connectivity intents.
diff --git a/cli/src/main/java/org/onosproject/cli/net/AddOpticalIntentCommand.java b/cli/src/main/java/org/onosproject/cli/net/AddOpticalIntentCommand.java
index 1120621..e896da5 100644
--- a/cli/src/main/java/org/onosproject/cli/net/AddOpticalIntentCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/AddOpticalIntentCommand.java
@@ -13,19 +13,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
-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;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.intent.Intent;
-import org.onlab.onos.net.intent.IntentService;
-import org.onlab.onos.net.intent.OpticalConnectivityIntent;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.intent.Intent;
+import org.onosproject.net.intent.IntentService;
+import org.onosproject.net.intent.OpticalConnectivityIntent;
/**
* Installs optical connectivity intents.
diff --git a/cli/src/main/java/org/onosproject/cli/net/AddPointToPointIntentCommand.java b/cli/src/main/java/org/onosproject/cli/net/AddPointToPointIntentCommand.java
index 22379ea..51022fa 100644
--- a/cli/src/main/java/org/onosproject/cli/net/AddPointToPointIntentCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/AddPointToPointIntentCommand.java
@@ -13,24 +13,24 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
-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;
import java.util.List;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.flow.TrafficSelector;
-import org.onlab.onos.net.flow.TrafficTreatment;
-import org.onlab.onos.net.intent.Constraint;
-import org.onlab.onos.net.intent.Intent;
-import org.onlab.onos.net.intent.IntentService;
-import org.onlab.onos.net.intent.PointToPointIntent;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.flow.TrafficSelector;
+import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.net.intent.Constraint;
+import org.onosproject.net.intent.Intent;
+import org.onosproject.net.intent.IntentService;
+import org.onosproject.net.intent.PointToPointIntent;
/**
* Installs point-to-point connectivity intents.
diff --git a/cli/src/main/java/org/onosproject/cli/net/AddSinglePointToMultiPointIntentCommand.java b/cli/src/main/java/org/onosproject/cli/net/AddSinglePointToMultiPointIntentCommand.java
index d9ad30b..f01cf6a 100644
--- a/cli/src/main/java/org/onosproject/cli/net/AddSinglePointToMultiPointIntentCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/AddSinglePointToMultiPointIntentCommand.java
@@ -1,7 +1,7 @@
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
-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;
import java.util.HashSet;
import java.util.List;
@@ -9,15 +9,15 @@
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.flow.DefaultTrafficTreatment;
-import org.onlab.onos.net.flow.TrafficSelector;
-import org.onlab.onos.net.flow.TrafficTreatment;
-import org.onlab.onos.net.intent.Constraint;
-import org.onlab.onos.net.intent.IntentService;
-import org.onlab.onos.net.intent.SinglePointToMultiPointIntent;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.flow.DefaultTrafficTreatment;
+import org.onosproject.net.flow.TrafficSelector;
+import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.net.intent.Constraint;
+import org.onosproject.net.intent.IntentService;
+import org.onosproject.net.intent.SinglePointToMultiPointIntent;
@Command(scope = "onos", name = "add-single-to-multi-intent",
diff --git a/cli/src/main/java/org/onosproject/cli/net/AddressBindingsListCommand.java b/cli/src/main/java/org/onosproject/cli/net/AddressBindingsListCommand.java
index 42b0ccc..3bf0ca7 100644
--- a/cli/src/main/java/org/onosproject/cli/net/AddressBindingsListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/AddressBindingsListCommand.java
@@ -1,15 +1,15 @@
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.cli.AbstractShellCommand;
-import org.onlab.onos.cli.Comparators;
-import org.onlab.onos.net.host.HostService;
-import org.onlab.onos.net.host.InterfaceIpAddress;
-import org.onlab.onos.net.host.PortAddresses;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.cli.Comparators;
+import org.onosproject.net.host.HostService;
+import org.onosproject.net.host.InterfaceIpAddress;
+import org.onosproject.net.host.PortAddresses;
import com.google.common.collect.Lists;
diff --git a/cli/src/main/java/org/onosproject/cli/net/ClusterDevicesCommand.java b/cli/src/main/java/org/onosproject/cli/net/ClusterDevicesCommand.java
index 3d5bbb8..bfd79b2 100644
--- a/cli/src/main/java/org/onosproject/cli/net/ClusterDevicesCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/ClusterDevicesCommand.java
@@ -13,21 +13,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Lists;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.cli.Comparators;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.topology.TopologyCluster;
+import org.onosproject.cli.Comparators;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.topology.TopologyCluster;
import java.util.Collections;
import java.util.List;
-import static org.onlab.onos.cli.MastersListCommand.json;
-import static org.onlab.onos.net.topology.ClusterId.clusterId;
+import static org.onosproject.cli.MastersListCommand.json;
+import static org.onosproject.net.topology.ClusterId.clusterId;
/**
* Lists devices of the specified topology cluster in the current topology.
diff --git a/cli/src/main/java/org/onosproject/cli/net/ClusterIdCompleter.java b/cli/src/main/java/org/onosproject/cli/net/ClusterIdCompleter.java
index 492451c..73e8acb 100644
--- a/cli/src/main/java/org/onosproject/cli/net/ClusterIdCompleter.java
+++ b/cli/src/main/java/org/onosproject/cli/net/ClusterIdCompleter.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import org.apache.karaf.shell.console.Completer;
import org.apache.karaf.shell.console.completer.StringsCompleter;
-import org.onlab.onos.cli.AbstractShellCommand;
-import org.onlab.onos.net.topology.Topology;
-import org.onlab.onos.net.topology.TopologyCluster;
-import org.onlab.onos.net.topology.TopologyService;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.net.topology.Topology;
+import org.onosproject.net.topology.TopologyCluster;
+import org.onosproject.net.topology.TopologyService;
import java.util.List;
import java.util.SortedSet;
diff --git a/cli/src/main/java/org/onosproject/cli/net/ClusterLinksCommand.java b/cli/src/main/java/org/onosproject/cli/net/ClusterLinksCommand.java
index 84fd994..fb0c941 100644
--- a/cli/src/main/java/org/onosproject/cli/net/ClusterLinksCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/ClusterLinksCommand.java
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.topology.TopologyCluster;
+import org.onosproject.net.Link;
+import org.onosproject.net.topology.TopologyCluster;
-import static org.onlab.onos.cli.net.LinksListCommand.json;
-import static org.onlab.onos.cli.net.LinksListCommand.linkString;
-import static org.onlab.onos.net.topology.ClusterId.clusterId;
+import static org.onosproject.cli.net.LinksListCommand.json;
+import static org.onosproject.cli.net.LinksListCommand.linkString;
+import static org.onosproject.net.topology.ClusterId.clusterId;
/**
* Lists links of the specified topology cluster in the current topology.
diff --git a/cli/src/main/java/org/onosproject/cli/net/ClustersListCommand.java b/cli/src/main/java/org/onosproject/cli/net/ClustersListCommand.java
index e4cfaa6..0c2d2f4 100644
--- a/cli/src/main/java/org/onosproject/cli/net/ClustersListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/ClustersListCommand.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.google.common.collect.Lists;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.cli.Comparators;
-import org.onlab.onos.net.topology.TopologyCluster;
+import org.onosproject.cli.Comparators;
+import org.onosproject.net.topology.TopologyCluster;
import java.util.Collections;
import java.util.List;
diff --git a/cli/src/main/java/org/onosproject/cli/net/ConnectPointCompleter.java b/cli/src/main/java/org/onosproject/cli/net/ConnectPointCompleter.java
index 16031cc..5e2727c 100644
--- a/cli/src/main/java/org/onosproject/cli/net/ConnectPointCompleter.java
+++ b/cli/src/main/java/org/onosproject/cli/net/ConnectPointCompleter.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import org.apache.karaf.shell.console.Completer;
import org.apache.karaf.shell.console.completer.StringsCompleter;
-import org.onlab.onos.cli.AbstractShellCommand;
-import org.onlab.onos.net.Device;
-import org.onlab.onos.net.Port;
-import org.onlab.onos.net.device.DeviceService;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.net.Device;
+import org.onosproject.net.Port;
+import org.onosproject.net.device.DeviceService;
import java.util.List;
import java.util.SortedSet;
diff --git a/cli/src/main/java/org/onosproject/cli/net/ConnectivityIntentCommand.java b/cli/src/main/java/org/onosproject/cli/net/ConnectivityIntentCommand.java
index 3b28bb0..1058197 100644
--- a/cli/src/main/java/org/onosproject/cli/net/ConnectivityIntentCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/ConnectivityIntentCommand.java
@@ -13,25 +13,25 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import static com.google.common.base.Strings.isNullOrEmpty;
-import static org.onlab.onos.net.flow.DefaultTrafficTreatment.builder;
+import static org.onosproject.net.flow.DefaultTrafficTreatment.builder;
import java.util.LinkedList;
import java.util.List;
import org.apache.karaf.shell.commands.Option;
-import org.onlab.onos.cli.AbstractShellCommand;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.flow.DefaultTrafficSelector;
-import org.onlab.onos.net.flow.TrafficSelector;
-import org.onlab.onos.net.flow.TrafficTreatment;
-import org.onlab.onos.net.intent.Constraint;
-import org.onlab.onos.net.intent.constraint.BandwidthConstraint;
-import org.onlab.onos.net.intent.constraint.LambdaConstraint;
-import org.onlab.onos.net.intent.constraint.LinkTypeConstraint;
-import org.onlab.onos.net.resource.Bandwidth;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.net.Link;
+import org.onosproject.net.flow.DefaultTrafficSelector;
+import org.onosproject.net.flow.TrafficSelector;
+import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.net.intent.Constraint;
+import org.onosproject.net.intent.constraint.BandwidthConstraint;
+import org.onosproject.net.intent.constraint.LambdaConstraint;
+import org.onosproject.net.intent.constraint.LinkTypeConstraint;
+import org.onosproject.net.resource.Bandwidth;
import org.onlab.packet.IpPrefix;
import org.onlab.packet.MacAddress;
diff --git a/cli/src/main/java/org/onosproject/cli/net/DeviceIdCompleter.java b/cli/src/main/java/org/onosproject/cli/net/DeviceIdCompleter.java
index 94ec2e1..82ef5ed 100644
--- a/cli/src/main/java/org/onosproject/cli/net/DeviceIdCompleter.java
+++ b/cli/src/main/java/org/onosproject/cli/net/DeviceIdCompleter.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import org.apache.karaf.shell.console.Completer;
import org.apache.karaf.shell.console.completer.StringsCompleter;
-import org.onlab.onos.cli.AbstractShellCommand;
-import org.onlab.onos.net.Device;
-import org.onlab.onos.net.device.DeviceService;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.net.Device;
+import org.onosproject.net.device.DeviceService;
import java.util.Iterator;
import java.util.List;
diff --git a/cli/src/main/java/org/onosproject/cli/net/DevicePortsListCommand.java b/cli/src/main/java/org/onosproject/cli/net/DevicePortsListCommand.java
index 29452f7..3e2510c 100644
--- a/cli/src/main/java/org/onosproject/cli/net/DevicePortsListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/DevicePortsListCommand.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -22,17 +22,17 @@
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Option;
-import org.onlab.onos.cli.Comparators;
-import org.onlab.onos.net.Device;
-import org.onlab.onos.net.Port;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.device.DeviceService;
+import org.onosproject.cli.Comparators;
+import org.onosproject.net.Device;
+import org.onosproject.net.Port;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.device.DeviceService;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import static org.onlab.onos.net.DeviceId.deviceId;
+import static org.onosproject.net.DeviceId.deviceId;
/**
* Lists all ports or all ports of a device.
diff --git a/cli/src/main/java/org/onosproject/cli/net/DeviceRemoveCommand.java b/cli/src/main/java/org/onosproject/cli/net/DeviceRemoveCommand.java
index 13a893b..1226e43 100644
--- a/cli/src/main/java/org/onosproject/cli/net/DeviceRemoveCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/DeviceRemoveCommand.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.cli.AbstractShellCommand;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.device.DeviceAdminService;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.device.DeviceAdminService;
/**
* Removes an infrastructure device.
diff --git a/cli/src/main/java/org/onosproject/cli/net/DeviceRoleCommand.java b/cli/src/main/java/org/onosproject/cli/net/DeviceRoleCommand.java
index f7bffe4..46ddd98 100644
--- a/cli/src/main/java/org/onosproject/cli/net/DeviceRoleCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/DeviceRoleCommand.java
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.cli.AbstractShellCommand;
-import org.onlab.onos.cluster.NodeId;
-import org.onlab.onos.mastership.MastershipAdminService;
-import org.onlab.onos.net.MastershipRole;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.cluster.NodeId;
+import org.onosproject.mastership.MastershipAdminService;
+import org.onosproject.net.MastershipRole;
-import static org.onlab.onos.net.DeviceId.deviceId;
+import static org.onosproject.net.DeviceId.deviceId;
/**
* Sets role of the controller node for the given infrastructure device.
diff --git a/cli/src/main/java/org/onosproject/cli/net/DevicesListCommand.java b/cli/src/main/java/org/onosproject/cli/net/DevicesListCommand.java
index f981411..852e5f5 100644
--- a/cli/src/main/java/org/onosproject/cli/net/DevicesListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/DevicesListCommand.java
@@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.cli.AbstractShellCommand;
-import org.onlab.onos.cli.Comparators;
-import org.onlab.onos.net.Device;
-import org.onlab.onos.net.device.DeviceService;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.cli.Comparators;
+import org.onosproject.net.Device;
+import org.onosproject.net.device.DeviceService;
import java.util.Collections;
import java.util.List;
diff --git a/cli/src/main/java/org/onosproject/cli/net/EthType.java b/cli/src/main/java/org/onosproject/cli/net/EthType.java
index 2e46aea..583820e 100644
--- a/cli/src/main/java/org/onosproject/cli/net/EthType.java
+++ b/cli/src/main/java/org/onosproject/cli/net/EthType.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import org.onlab.packet.Ethernet;
diff --git a/cli/src/main/java/org/onosproject/cli/net/EthTypeCompleter.java b/cli/src/main/java/org/onosproject/cli/net/EthTypeCompleter.java
index a0b8c2b..b6a2285 100644
--- a/cli/src/main/java/org/onosproject/cli/net/EthTypeCompleter.java
+++ b/cli/src/main/java/org/onosproject/cli/net/EthTypeCompleter.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import java.util.List;
import java.util.SortedSet;
diff --git a/cli/src/main/java/org/onosproject/cli/net/FlowRuleStatusCompleter.java b/cli/src/main/java/org/onosproject/cli/net/FlowRuleStatusCompleter.java
index 73ea6ce..38a8485 100644
--- a/cli/src/main/java/org/onosproject/cli/net/FlowRuleStatusCompleter.java
+++ b/cli/src/main/java/org/onosproject/cli/net/FlowRuleStatusCompleter.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import java.util.List;
import java.util.SortedSet;
import org.apache.karaf.shell.console.Completer;
import org.apache.karaf.shell.console.completer.StringsCompleter;
-import org.onlab.onos.net.flow.FlowEntry.FlowEntryState;
+import org.onosproject.net.flow.FlowEntry.FlowEntryState;
/**
* Device ID completer.
diff --git a/cli/src/main/java/org/onosproject/cli/net/FlowsListCommand.java b/cli/src/main/java/org/onosproject/cli/net/FlowsListCommand.java
index 0bc7c61..8cea446 100644
--- a/cli/src/main/java/org/onosproject/cli/net/FlowsListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/FlowsListCommand.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -22,24 +22,24 @@
import com.google.common.collect.Maps;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.core.CoreService;
-import org.onlab.onos.cli.AbstractShellCommand;
-import org.onlab.onos.cli.Comparators;
-import org.onlab.onos.net.Device;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.device.DeviceService;
-import org.onlab.onos.net.flow.FlowEntry;
-import org.onlab.onos.net.flow.FlowEntry.FlowEntryState;
-import org.onlab.onos.net.flow.FlowRuleService;
-import org.onlab.onos.net.flow.criteria.Criterion;
-import org.onlab.onos.net.flow.instructions.Instruction;
+import org.onosproject.core.CoreService;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.cli.Comparators;
+import org.onosproject.net.Device;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.device.DeviceService;
+import org.onosproject.net.flow.FlowEntry;
+import org.onosproject.net.flow.FlowEntry.FlowEntryState;
+import org.onosproject.net.flow.FlowRuleService;
+import org.onosproject.net.flow.criteria.Criterion;
+import org.onosproject.net.flow.instructions.Instruction;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import static com.google.common.collect.Lists.newArrayList;
-import static org.onlab.onos.cli.net.DevicesListCommand.getSortedDevices;
+import static org.onosproject.cli.net.DevicesListCommand.getSortedDevices;
/**
* Lists all currently-known hosts.
diff --git a/cli/src/main/java/org/onosproject/cli/net/GetStatistics.java b/cli/src/main/java/org/onosproject/cli/net/GetStatistics.java
index 3413c96..911e03c 100644
--- a/cli/src/main/java/org/onosproject/cli/net/GetStatistics.java
+++ b/cli/src/main/java/org/onosproject/cli/net/GetStatistics.java
@@ -13,21 +13,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.cli.AbstractShellCommand;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.PortNumber;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.PortNumber;
-import org.onlab.onos.net.statistic.Load;
-import org.onlab.onos.net.statistic.StatisticService;
+import org.onosproject.net.statistic.Load;
+import org.onosproject.net.statistic.StatisticService;
-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;
/**
* Fetches statistics.
diff --git a/cli/src/main/java/org/onosproject/cli/net/HostIdCompleter.java b/cli/src/main/java/org/onosproject/cli/net/HostIdCompleter.java
index eb4d4a5..3ce16d2 100644
--- a/cli/src/main/java/org/onosproject/cli/net/HostIdCompleter.java
+++ b/cli/src/main/java/org/onosproject/cli/net/HostIdCompleter.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import java.util.Iterator;
import java.util.List;
@@ -21,9 +21,9 @@
import org.apache.karaf.shell.console.Completer;
import org.apache.karaf.shell.console.completer.StringsCompleter;
-import org.onlab.onos.cli.AbstractShellCommand;
-import org.onlab.onos.net.Host;
-import org.onlab.onos.net.host.HostService;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.net.Host;
+import org.onosproject.net.host.HostService;
public class HostIdCompleter implements Completer {
diff --git a/cli/src/main/java/org/onosproject/cli/net/HostRemoveCommand.java b/cli/src/main/java/org/onosproject/cli/net/HostRemoveCommand.java
index 5837a5e..c0db07d 100644
--- a/cli/src/main/java/org/onosproject/cli/net/HostRemoveCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/HostRemoveCommand.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.cli.AbstractShellCommand;
-import org.onlab.onos.net.HostId;
-import org.onlab.onos.net.host.HostAdminService;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.net.HostId;
+import org.onosproject.net.host.HostAdminService;
/**
* Removes an end-station host.
diff --git a/cli/src/main/java/org/onosproject/cli/net/HostsListCommand.java b/cli/src/main/java/org/onosproject/cli/net/HostsListCommand.java
index 6f07b9d..10d015f 100644
--- a/cli/src/main/java/org/onosproject/cli/net/HostsListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/HostsListCommand.java
@@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.cli.AbstractShellCommand;
-import org.onlab.onos.cli.Comparators;
-import org.onlab.onos.net.Host;
-import org.onlab.onos.net.host.HostService;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.cli.Comparators;
+import org.onosproject.net.Host;
+import org.onosproject.net.host.HostService;
import org.onlab.packet.IpAddress;
import java.util.Collections;
diff --git a/cli/src/main/java/org/onosproject/cli/net/IntentIdCompleter.java b/cli/src/main/java/org/onosproject/cli/net/IntentIdCompleter.java
index c4a2134..7c5a480 100644
--- a/cli/src/main/java/org/onosproject/cli/net/IntentIdCompleter.java
+++ b/cli/src/main/java/org/onosproject/cli/net/IntentIdCompleter.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import org.apache.karaf.shell.console.Completer;
import org.apache.karaf.shell.console.completer.StringsCompleter;
-import org.onlab.onos.cli.AbstractShellCommand;
-import org.onlab.onos.net.intent.Intent;
-import org.onlab.onos.net.intent.IntentService;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.net.intent.Intent;
+import org.onosproject.net.intent.IntentService;
import java.util.Iterator;
import java.util.List;
diff --git a/cli/src/main/java/org/onosproject/cli/net/IntentPushTestCommand.java b/cli/src/main/java/org/onosproject/cli/net/IntentPushTestCommand.java
index 6f140f2..3a08d23 100644
--- a/cli/src/main/java/org/onosproject/cli/net/IntentPushTestCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/IntentPushTestCommand.java
@@ -13,30 +13,30 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Lists;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Option;
-import org.onlab.onos.cli.AbstractShellCommand;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.core.CoreService;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.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.onlab.onos.net.intent.Intent;
-import org.onlab.onos.net.intent.IntentEvent;
-import org.onlab.onos.net.intent.IntentEvent.Type;
-import org.onlab.onos.net.intent.IntentListener;
-import org.onlab.onos.net.intent.IntentOperations;
-import org.onlab.onos.net.intent.IntentService;
-import org.onlab.onos.net.intent.PointToPointIntent;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.core.CoreService;
+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;
+import org.onosproject.net.intent.Intent;
+import org.onosproject.net.intent.IntentEvent;
+import org.onosproject.net.intent.IntentEvent.Type;
+import org.onosproject.net.intent.IntentListener;
+import org.onosproject.net.intent.IntentOperations;
+import org.onosproject.net.intent.IntentService;
+import org.onosproject.net.intent.PointToPointIntent;
import org.onlab.packet.Ethernet;
import org.onlab.packet.MacAddress;
@@ -45,8 +45,8 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-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;
/**
* Installs point-to-point connectivity intents.
@@ -204,7 +204,7 @@
* @return command-line application identifier
*/
protected ApplicationId appId(Integer id) {
- return get(CoreService.class).registerApplication("org.onlab.onos.cli-"
+ return get(CoreService.class).registerApplication("org.onosproject.cli-"
+ (id + appIdBase));
}
diff --git a/cli/src/main/java/org/onosproject/cli/net/IntentRemoveCommand.java b/cli/src/main/java/org/onosproject/cli/net/IntentRemoveCommand.java
index 73ba59a..2350f05 100644
--- a/cli/src/main/java/org/onosproject/cli/net/IntentRemoveCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/IntentRemoveCommand.java
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.cli.AbstractShellCommand;
-import org.onlab.onos.net.intent.Intent;
-import org.onlab.onos.net.intent.IntentId;
-import org.onlab.onos.net.intent.IntentService;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.net.intent.Intent;
+import org.onosproject.net.intent.IntentId;
+import org.onosproject.net.intent.IntentService;
import java.math.BigInteger;
diff --git a/cli/src/main/java/org/onosproject/cli/net/IntentsListCommand.java b/cli/src/main/java/org/onosproject/cli/net/IntentsListCommand.java
index bc9f001..5e5ce12 100644
--- a/cli/src/main/java/org/onosproject/cli/net/IntentsListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/IntentsListCommand.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -21,19 +21,19 @@
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Option;
-import org.onlab.onos.cli.AbstractShellCommand;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.NetworkResource;
-import org.onlab.onos.net.intent.ConnectivityIntent;
-import org.onlab.onos.net.intent.Intent;
-import org.onlab.onos.net.intent.IntentService;
-import org.onlab.onos.net.intent.IntentState;
-import org.onlab.onos.net.intent.LinkCollectionIntent;
-import org.onlab.onos.net.intent.MultiPointToSinglePointIntent;
-import org.onlab.onos.net.intent.PathIntent;
-import org.onlab.onos.net.intent.PointToPointIntent;
-import org.onlab.onos.net.intent.SinglePointToMultiPointIntent;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.Link;
+import org.onosproject.net.NetworkResource;
+import org.onosproject.net.intent.ConnectivityIntent;
+import org.onosproject.net.intent.Intent;
+import org.onosproject.net.intent.IntentService;
+import org.onosproject.net.intent.IntentState;
+import org.onosproject.net.intent.LinkCollectionIntent;
+import org.onosproject.net.intent.MultiPointToSinglePointIntent;
+import org.onosproject.net.intent.PathIntent;
+import org.onosproject.net.intent.PointToPointIntent;
+import org.onosproject.net.intent.SinglePointToMultiPointIntent;
import java.util.List;
import java.util.Set;
diff --git a/cli/src/main/java/org/onosproject/cli/net/IpProtocol.java b/cli/src/main/java/org/onosproject/cli/net/IpProtocol.java
index 4be169b..d197df9 100644
--- a/cli/src/main/java/org/onosproject/cli/net/IpProtocol.java
+++ b/cli/src/main/java/org/onosproject/cli/net/IpProtocol.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import org.onlab.packet.IPv4;
diff --git a/cli/src/main/java/org/onosproject/cli/net/IpProtocolCompleter.java b/cli/src/main/java/org/onosproject/cli/net/IpProtocolCompleter.java
index 0915168..ec02b1d 100644
--- a/cli/src/main/java/org/onosproject/cli/net/IpProtocolCompleter.java
+++ b/cli/src/main/java/org/onosproject/cli/net/IpProtocolCompleter.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import java.util.List;
import java.util.SortedSet;
diff --git a/cli/src/main/java/org/onosproject/cli/net/LeaderCommand.java b/cli/src/main/java/org/onosproject/cli/net/LeaderCommand.java
index ec99614..a6e44a7 100644
--- a/cli/src/main/java/org/onosproject/cli/net/LeaderCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/LeaderCommand.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.cli.AbstractShellCommand;
-import org.onlab.onos.cluster.Leadership;
-import org.onlab.onos.cluster.LeadershipService;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.cluster.Leadership;
+import org.onosproject.cluster.LeadershipService;
import java.util.Map;
diff --git a/cli/src/main/java/org/onosproject/cli/net/LinksListCommand.java b/cli/src/main/java/org/onosproject/cli/net/LinksListCommand.java
index 7c32129..d33f733 100644
--- a/cli/src/main/java/org/onosproject/cli/net/LinksListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/LinksListCommand.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -21,12 +21,12 @@
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.cli.AbstractShellCommand;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.link.LinkService;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.Link;
+import org.onosproject.net.link.LinkService;
-import static org.onlab.onos.net.DeviceId.deviceId;
+import static org.onosproject.net.DeviceId.deviceId;
/**
* Lists all infrastructure links.
diff --git a/cli/src/main/java/org/onosproject/cli/net/PathListCommand.java b/cli/src/main/java/org/onosproject/cli/net/PathListCommand.java
index 57167ea..a76a878 100644
--- a/cli/src/main/java/org/onosproject/cli/net/PathListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/PathListCommand.java
@@ -13,20 +13,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.Path;
+import org.onosproject.net.Link;
+import org.onosproject.net.Path;
import java.util.Set;
-import static org.onlab.onos.cli.net.LinksListCommand.compactLinkString;
-import static org.onlab.onos.net.DeviceId.deviceId;
+import static org.onosproject.cli.net.LinksListCommand.compactLinkString;
+import static org.onosproject.net.DeviceId.deviceId;
/**
* Lists all shortest-paths paths between the specified source and
diff --git a/cli/src/main/java/org/onosproject/cli/net/RandomIntentCommand.java b/cli/src/main/java/org/onosproject/cli/net/RandomIntentCommand.java
index 2a8a6ac..f71e6ac 100644
--- a/cli/src/main/java/org/onosproject/cli/net/RandomIntentCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/RandomIntentCommand.java
@@ -13,24 +13,24 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import com.google.common.collect.Lists;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.cli.AbstractShellCommand;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.core.CoreService;
-import org.onlab.onos.net.Host;
-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.onlab.onos.net.host.HostService;
-import org.onlab.onos.net.intent.HostToHostIntent;
-import org.onlab.onos.net.intent.Intent;
-import org.onlab.onos.net.intent.IntentOperations;
-import org.onlab.onos.net.intent.IntentService;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.core.CoreService;
+import org.onosproject.net.Host;
+import org.onosproject.net.flow.DefaultTrafficSelector;
+import org.onosproject.net.flow.DefaultTrafficTreatment;
+import org.onosproject.net.flow.TrafficSelector;
+import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.net.host.HostService;
+import org.onosproject.net.intent.HostToHostIntent;
+import org.onosproject.net.intent.Intent;
+import org.onosproject.net.intent.IntentOperations;
+import org.onosproject.net.intent.IntentService;
import java.util.Collection;
import java.util.Collections;
@@ -107,6 +107,6 @@
@Override
protected ApplicationId appId() {
- return get(CoreService.class).registerApplication("org.onlab.onos.cli-random");
+ return get(CoreService.class).registerApplication("org.onosproject.cli-random");
}
}
diff --git a/cli/src/main/java/org/onosproject/cli/net/ResourceAllocationsCommand.java b/cli/src/main/java/org/onosproject/cli/net/ResourceAllocationsCommand.java
index b91ed3e..d125399 100644
--- a/cli/src/main/java/org/onosproject/cli/net/ResourceAllocationsCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/ResourceAllocationsCommand.java
@@ -13,23 +13,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.cli.AbstractShellCommand;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.link.LinkService;
-import org.onlab.onos.net.resource.LinkResourceAllocations;
-import org.onlab.onos.net.resource.LinkResourceService;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Link;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.link.LinkService;
+import org.onosproject.net.resource.LinkResourceAllocations;
+import org.onosproject.net.resource.LinkResourceService;
-import static org.onlab.onos.cli.net.AddPointToPointIntentCommand.getDeviceId;
-import static org.onlab.onos.cli.net.AddPointToPointIntentCommand.getPortNumber;
-import static org.onlab.onos.net.DeviceId.deviceId;
-import static org.onlab.onos.net.PortNumber.portNumber;
+import static org.onosproject.cli.net.AddPointToPointIntentCommand.getDeviceId;
+import static org.onosproject.cli.net.AddPointToPointIntentCommand.getPortNumber;
+import static org.onosproject.net.DeviceId.deviceId;
+import static org.onosproject.net.PortNumber.portNumber;
/**
* Lists allocations by link.
diff --git a/cli/src/main/java/org/onosproject/cli/net/ResourceAvailableCommand.java b/cli/src/main/java/org/onosproject/cli/net/ResourceAvailableCommand.java
index 4803e57..65416b2 100644
--- a/cli/src/main/java/org/onosproject/cli/net/ResourceAvailableCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/ResourceAvailableCommand.java
@@ -13,23 +13,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.cli.AbstractShellCommand;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.PortNumber;
-import org.onlab.onos.net.link.LinkService;
-import org.onlab.onos.net.resource.LinkResourceService;
-import org.onlab.onos.net.resource.ResourceRequest;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Link;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.link.LinkService;
+import org.onosproject.net.resource.LinkResourceService;
+import org.onosproject.net.resource.ResourceRequest;
-import static org.onlab.onos.cli.net.AddPointToPointIntentCommand.getDeviceId;
-import static org.onlab.onos.cli.net.AddPointToPointIntentCommand.getPortNumber;
-import static org.onlab.onos.net.DeviceId.deviceId;
-import static org.onlab.onos.net.PortNumber.portNumber;
+import static org.onosproject.cli.net.AddPointToPointIntentCommand.getDeviceId;
+import static org.onosproject.cli.net.AddPointToPointIntentCommand.getPortNumber;
+import static org.onosproject.net.DeviceId.deviceId;
+import static org.onosproject.net.PortNumber.portNumber;
/**
* Lists allocations by link.
diff --git a/cli/src/main/java/org/onosproject/cli/net/RoleCompleter.java b/cli/src/main/java/org/onosproject/cli/net/RoleCompleter.java
index 6092acd..0b4fc97 100644
--- a/cli/src/main/java/org/onosproject/cli/net/RoleCompleter.java
+++ b/cli/src/main/java/org/onosproject/cli/net/RoleCompleter.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import org.apache.karaf.shell.console.Completer;
import org.apache.karaf.shell.console.completer.StringsCompleter;
-import org.onlab.onos.net.MastershipRole;
+import org.onosproject.net.MastershipRole;
import java.util.List;
import java.util.SortedSet;
diff --git a/cli/src/main/java/org/onosproject/cli/net/TopologyCommand.java b/cli/src/main/java/org/onosproject/cli/net/TopologyCommand.java
index ed732c5..5754438 100644
--- a/cli/src/main/java/org/onosproject/cli/net/TopologyCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/TopologyCommand.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Option;
-import org.onlab.onos.cli.AbstractShellCommand;
-import org.onlab.onos.net.topology.Topology;
-import org.onlab.onos.net.topology.TopologyProvider;
-import org.onlab.onos.net.topology.TopologyService;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.net.topology.Topology;
+import org.onosproject.net.topology.TopologyProvider;
+import org.onosproject.net.topology.TopologyService;
/**
* Lists summary of the current topology.
diff --git a/cli/src/main/java/org/onosproject/cli/net/WipeOutCommand.java b/cli/src/main/java/org/onosproject/cli/net/WipeOutCommand.java
index 6aebc27..3262fb9 100644
--- a/cli/src/main/java/org/onosproject/cli/net/WipeOutCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/WipeOutCommand.java
@@ -13,19 +13,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.net.Device;
-import org.onlab.onos.net.Host;
-import org.onlab.onos.net.device.DeviceAdminService;
-import org.onlab.onos.net.device.DeviceService;
-import org.onlab.onos.net.host.HostAdminService;
-import org.onlab.onos.net.host.HostService;
-import org.onlab.onos.net.intent.Intent;
-import org.onlab.onos.net.intent.IntentService;
-import org.onlab.onos.net.intent.IntentState;
+import org.onosproject.net.Device;
+import org.onosproject.net.Host;
+import org.onosproject.net.device.DeviceAdminService;
+import org.onosproject.net.device.DeviceService;
+import org.onosproject.net.host.HostAdminService;
+import org.onosproject.net.host.HostService;
+import org.onosproject.net.intent.Intent;
+import org.onosproject.net.intent.IntentService;
+import org.onosproject.net.intent.IntentState;
/**
* Wipes-out the entire network information base, i.e. devices, links, hosts, intents.
diff --git a/cli/src/main/java/org/onosproject/cli/net/package-info.java b/cli/src/main/java/org/onosproject/cli/net/package-info.java
index 057e741..fb4ba01 100644
--- a/cli/src/main/java/org/onosproject/cli/net/package-info.java
+++ b/cli/src/main/java/org/onosproject/cli/net/package-info.java
@@ -18,4 +18,4 @@
* Administrative console command-line extensions for interacting with the
* network model & services.
*/
-package org.onlab.onos.cli.net;
+package org.onosproject.cli.net;
diff --git a/cli/src/main/java/org/onosproject/cli/package-info.java b/cli/src/main/java/org/onosproject/cli/package-info.java
index 589c273..4d9d369 100644
--- a/cli/src/main/java/org/onosproject/cli/package-info.java
+++ b/cli/src/main/java/org/onosproject/cli/package-info.java
@@ -17,4 +17,4 @@
/**
* Administrative console command-line extensions.
*/
-package org.onlab.onos.cli;
+package org.onosproject.cli;
diff --git a/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
index e435bfe..1350a4a 100644
--- a/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -17,24 +17,24 @@
<command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
<command>
- <action class="org.onlab.onos.cli.SummaryCommand"/>
+ <action class="org.onosproject.cli.SummaryCommand"/>
</command>
<command>
- <action class="org.onlab.onos.cli.MetricsListCommand"/>
+ <action class="org.onosproject.cli.MetricsListCommand"/>
</command>
<command>
- <action class="org.onlab.onos.cli.TabletMemberCommand"/>
+ <action class="org.onosproject.cli.TabletMemberCommand"/>
</command>
<command>
- <action class="org.onlab.onos.cli.TabletLeaderCommand"/>
+ <action class="org.onosproject.cli.TabletLeaderCommand"/>
</command>
<!--
<command>
- <action class="org.onlab.onos.cli.TabletAddCommand"/>
+ <action class="org.onosproject.cli.TabletAddCommand"/>
<completers>
<ref component-id="nodeIdCompleter"/>
<null/>
@@ -42,7 +42,7 @@
</completers>
</command>
<command>
- <action class="org.onlab.onos.cli.TabletRemoveCommand"/>
+ <action class="org.onosproject.cli.TabletRemoveCommand"/>
<completers>
<ref component-id="nodeIdCompleter"/>
<null/>
@@ -52,49 +52,49 @@
-->
<command>
- <action class="org.onlab.onos.cli.NodesListCommand"/>
+ <action class="org.onosproject.cli.NodesListCommand"/>
</command>
<!--
<command>
- <action class="org.onlab.onos.cli.NodeAddCommand"/>
+ <action class="org.onosproject.cli.NodeAddCommand"/>
</command>
<command>
- <action class="org.onlab.onos.cli.NodeRemoveCommand"/>
+ <action class="org.onosproject.cli.NodeRemoveCommand"/>
</command>
-->
<command>
- <action class="org.onlab.onos.cli.RolesCommand"/>
+ <action class="org.onosproject.cli.RolesCommand"/>
</command>
<command>
- <action class="org.onlab.onos.cli.MastersListCommand"/>
+ <action class="org.onosproject.cli.MastersListCommand"/>
</command>
<command>
- <action class="org.onlab.onos.cli.BalanceMastersCommand"/>
+ <action class="org.onosproject.cli.BalanceMastersCommand"/>
</command>
<command>
- <action class="org.onlab.onos.cli.ApplicationIdListCommand"/>
+ <action class="org.onosproject.cli.ApplicationIdListCommand"/>
</command>
<command>
- <action class="org.onlab.onos.cli.net.DevicesListCommand"/>
+ <action class="org.onosproject.cli.net.DevicesListCommand"/>
</command>
<command>
- <action class="org.onlab.onos.cli.net.DevicePortsListCommand"/>
+ <action class="org.onosproject.cli.net.DevicePortsListCommand"/>
<completers>
<ref component-id="deviceIdCompleter"/>
<null/>
</completers>
</command>
<command>
- <action class="org.onlab.onos.cli.net.DeviceRemoveCommand"/>
+ <action class="org.onosproject.cli.net.DeviceRemoveCommand"/>
<completers>
<ref component-id="deviceIdCompleter"/>
<null/>
</completers>
</command>
<command>
- <action class="org.onlab.onos.cli.net.DeviceRoleCommand"/>
+ <action class="org.onosproject.cli.net.DeviceRoleCommand"/>
<completers>
<ref component-id="deviceIdCompleter"/>
<ref component-id="nodeIdCompleter"/>
@@ -104,7 +104,7 @@
</command>
<command>
- <action class="org.onlab.onos.cli.net.LinksListCommand"/>
+ <action class="org.onosproject.cli.net.LinksListCommand"/>
<completers>
<ref component-id="deviceIdCompleter"/>
<null/>
@@ -112,10 +112,10 @@
</command>
<command>
- <action class="org.onlab.onos.cli.net.TopologyCommand"/>
+ <action class="org.onosproject.cli.net.TopologyCommand"/>
</command>
<command>
- <action class="org.onlab.onos.cli.net.PathListCommand"/>
+ <action class="org.onosproject.cli.net.PathListCommand"/>
<completers>
<ref component-id="deviceIdCompleter"/>
<ref component-id="deviceIdCompleter"/>
@@ -124,17 +124,17 @@
</command>
<command>
- <action class="org.onlab.onos.cli.net.IntentsListCommand"/>
+ <action class="org.onosproject.cli.net.IntentsListCommand"/>
</command>
<command>
- <action class="org.onlab.onos.cli.net.IntentRemoveCommand"/>
+ <action class="org.onosproject.cli.net.IntentRemoveCommand"/>
<completers>
<ref component-id="intentIdCompleter"/>
<null/>
</completers>
</command>
<command>
- <action class="org.onlab.onos.cli.net.AddHostToHostIntentCommand"/>
+ <action class="org.onosproject.cli.net.AddHostToHostIntentCommand"/>
<completers>
<ref component-id="hostIdCompleter"/>
<ref component-id="hostIdCompleter"/>
@@ -142,7 +142,7 @@
</completers>
</command>
<command>
- <action class="org.onlab.onos.cli.net.AddPointToPointIntentCommand"/>
+ <action class="org.onosproject.cli.net.AddPointToPointIntentCommand"/>
<completers>
<ref component-id="connectPointCompleter"/>
<ref component-id="connectPointCompleter"/>
@@ -154,7 +154,7 @@
</optional-completers>
</command>
<command>
- <action class="org.onlab.onos.cli.net.AddOpticalIntentCommand"/>
+ <action class="org.onosproject.cli.net.AddOpticalIntentCommand"/>
<completers>
<ref component-id="connectPointCompleter"/>
<ref component-id="connectPointCompleter"/>
@@ -162,13 +162,13 @@
</completers>
</command>
<command>
- <action class="org.onlab.onos.cli.net.GetStatistics"/>
+ <action class="org.onosproject.cli.net.GetStatistics"/>
<completers>
<ref component-id="connectPointCompleter"/>
</completers>
</command>
<command>
- <action class="org.onlab.onos.cli.net.AddMultiPointToSinglePointIntentCommand"/>
+ <action class="org.onosproject.cli.net.AddMultiPointToSinglePointIntentCommand"/>
<completers>
<ref component-id="connectPointCompleter"/>
</completers>
@@ -178,7 +178,7 @@
</optional-completers>
</command>
<command>
- <action class="org.onlab.onos.cli.net.AddSinglePointToMultiPointIntentCommand"/>
+ <action class="org.onosproject.cli.net.AddSinglePointToMultiPointIntentCommand"/>
<completers>
<ref component-id="connectPointCompleter"/>
</completers>
@@ -187,7 +187,7 @@
</optional-completers>
</command>
<command>
- <action class="org.onlab.onos.cli.net.IntentPushTestCommand"/>
+ <action class="org.onosproject.cli.net.IntentPushTestCommand"/>
<completers>
<ref component-id="connectPointCompleter"/>
<ref component-id="connectPointCompleter"/>
@@ -196,14 +196,14 @@
</completers>
</command>
<command>
- <action class="org.onlab.onos.cli.net.RandomIntentCommand"/>
+ <action class="org.onosproject.cli.net.RandomIntentCommand"/>
<completers>
<ref component-id="nullCompleter"/>
<null/>
</completers>
</command>
<command>
- <action class="org.onlab.onos.cli.net.ResourceAllocationsCommand"/>
+ <action class="org.onosproject.cli.net.ResourceAllocationsCommand"/>
<completers>
<ref component-id="connectPointCompleter"/>
<ref component-id="connectPointCompleter"/>
@@ -211,7 +211,7 @@
</completers>
</command>
<command>
- <action class="org.onlab.onos.cli.net.ResourceAvailableCommand"/>
+ <action class="org.onosproject.cli.net.ResourceAvailableCommand"/>
<completers>
<ref component-id="connectPointCompleter"/>
<ref component-id="connectPointCompleter"/>
@@ -219,17 +219,17 @@
</completers>
</command>
<command>
- <action class="org.onlab.onos.cli.net.ClustersListCommand"/>
+ <action class="org.onosproject.cli.net.ClustersListCommand"/>
</command>
<command>
- <action class="org.onlab.onos.cli.net.ClusterDevicesCommand"/>
+ <action class="org.onosproject.cli.net.ClusterDevicesCommand"/>
<completers>
<ref component-id="clusterIdCompleter"/>
<null/>
</completers>
</command>
<command>
- <action class="org.onlab.onos.cli.net.ClusterLinksCommand"/>
+ <action class="org.onosproject.cli.net.ClusterLinksCommand"/>
<completers>
<ref component-id="clusterIdCompleter"/>
<null/>
@@ -237,21 +237,21 @@
</command>
<command>
- <action class="org.onlab.onos.cli.net.HostsListCommand"/>
+ <action class="org.onosproject.cli.net.HostsListCommand"/>
</command>
<command>
- <action class="org.onlab.onos.cli.net.HostRemoveCommand"/>
+ <action class="org.onosproject.cli.net.HostRemoveCommand"/>
<completers>
<ref component-id="hostIdCompleter"/>
<null/>
</completers>
</command>
<command>
- <action class="org.onlab.onos.cli.net.AddressBindingsListCommand"/>
+ <action class="org.onosproject.cli.net.AddressBindingsListCommand"/>
</command>
<command>
- <action class="org.onlab.onos.cli.net.FlowsListCommand"/>
+ <action class="org.onosproject.cli.net.FlowsListCommand"/>
<completers>
<ref component-id="flowRuleStatusCompleter"/>
<ref component-id="deviceIdCompleter"/>
@@ -260,27 +260,27 @@
</command>
<command>
- <action class="org.onlab.onos.cli.net.AddFlowsCommand"/>
+ <action class="org.onosproject.cli.net.AddFlowsCommand"/>
</command>
<command>
- <action class="org.onlab.onos.cli.net.LeaderCommand"/>
+ <action class="org.onosproject.cli.net.LeaderCommand"/>
</command>
<command>
- <action class="org.onlab.onos.cli.net.WipeOutCommand"/>
+ <action class="org.onosproject.cli.net.WipeOutCommand"/>
</command>
</command-bundle>
- <bean id="nodeIdCompleter" class="org.onlab.onos.cli.NodeIdCompleter"/>
- <bean id="deviceIdCompleter" class="org.onlab.onos.cli.net.DeviceIdCompleter"/>
- <bean id="clusterIdCompleter" class="org.onlab.onos.cli.net.ClusterIdCompleter"/>
- <bean id="roleCompleter" class="org.onlab.onos.cli.net.RoleCompleter"/>
- <bean id="hostIdCompleter" class="org.onlab.onos.cli.net.HostIdCompleter"/>
- <bean id="intentIdCompleter" class="org.onlab.onos.cli.net.IntentIdCompleter"/>
- <bean id="flowRuleStatusCompleter" class="org.onlab.onos.cli.net.FlowRuleStatusCompleter"/>
- <bean id="connectPointCompleter" class="org.onlab.onos.cli.net.ConnectPointCompleter"/>
+ <bean id="nodeIdCompleter" class="org.onosproject.cli.NodeIdCompleter"/>
+ <bean id="deviceIdCompleter" class="org.onosproject.cli.net.DeviceIdCompleter"/>
+ <bean id="clusterIdCompleter" class="org.onosproject.cli.net.ClusterIdCompleter"/>
+ <bean id="roleCompleter" class="org.onosproject.cli.net.RoleCompleter"/>
+ <bean id="hostIdCompleter" class="org.onosproject.cli.net.HostIdCompleter"/>
+ <bean id="intentIdCompleter" class="org.onosproject.cli.net.IntentIdCompleter"/>
+ <bean id="flowRuleStatusCompleter" class="org.onosproject.cli.net.FlowRuleStatusCompleter"/>
+ <bean id="connectPointCompleter" class="org.onosproject.cli.net.ConnectPointCompleter"/>
<bean id="nullCompleter" class="org.apache.karaf.shell.console.completer.NullCompleter"/>
- <bean id="ethTypeCompleter" class="org.onlab.onos.cli.net.EthTypeCompleter"/>
- <bean id="ipProtocolCompleter" class="org.onlab.onos.cli.net.IpProtocolCompleter"/>
+ <bean id="ethTypeCompleter" class="org.onosproject.cli.net.EthTypeCompleter"/>
+ <bean id="ipProtocolCompleter" class="org.onosproject.cli.net.IpProtocolCompleter"/>
</blueprint>