[WIP] Upgrade ONOS to karaf version 4.2.1
Change-Id: I7cd40c995bdf1c80f94b1895fb3344e32404c7fa
diff --git a/cli/src/main/java/org/onosproject/cli/net/RegionAddPeerLocCommand.java b/cli/src/main/java/org/onosproject/cli/net/RegionAddPeerLocCommand.java
index 3c503c9..146fdda 100644
--- a/cli/src/main/java/org/onosproject/cli/net/RegionAddPeerLocCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/RegionAddPeerLocCommand.java
@@ -15,8 +15,9 @@
*/
package org.onosproject.cli.net;
-import org.apache.karaf.shell.commands.Argument;
-import org.apache.karaf.shell.commands.Command;
+import org.apache.karaf.shell.api.action.Argument;
+import org.apache.karaf.shell.api.action.Command;
+import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.net.config.NetworkConfigService;
import org.onosproject.net.config.basics.BasicRegionConfig;
@@ -38,6 +39,7 @@
* at grid-Y 100 and grid-X 200.
*
*/
+@Service
@Command(scope = "onos", name = "region-add-peer-loc",
description = "Adds a peer location annotation to a region.")
public class RegionAddPeerLocCommand extends AbstractShellCommand {
@@ -68,7 +70,7 @@
String locType = GEO;
@Override
- protected void execute() {
+ protected void doExecute() {
RegionId regionId = RegionId.regionId(id);
NetworkConfigService cfgService = get(NetworkConfigService.class);