commit d84f89ba3d18fb8e9c44fa0bab004d24c56b0a81
author Ray Milkey <ray@opennetworking.org> Fri Aug 17 14:54:17 2018 -0700
committer Ray Milkey <ray@opennetworking.org> Fri Sep 28 11:20:57 2018 -0700
tree 687aacc51f41941321d07f3a4ded68b68d7d813d
parent 10216e4129e46816826c7288287230d3236de03a

[WIP] Upgrade ONOS to karaf version 4.2.1

Change-Id: I7cd40c995bdf1c80f94b1895fb3344e32404c7fa

cli/src/main/java/org/onosproject/cli/net/AnnotateLinkCommand.java

diff --git a/cli/src/main/java/org/onosproject/cli/net/AnnotateLinkCommand.java b/cli/src/main/java/org/onosproject/cli/net/AnnotateLinkCommand.java
index 382f354..b20546f 100644
--- a/cli/src/main/java/org/onosproject/cli/net/AnnotateLinkCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/AnnotateLinkCommand.java
@@ -18,9 +18,10 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 import static org.onosproject.net.ConnectPoint.deviceConnectPoint;
 
-import org.apache.karaf.shell.commands.Argument;
-import org.apache.karaf.shell.commands.Command;
-import org.apache.karaf.shell.commands.Option;
+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.apache.karaf.shell.api.action.Option;
 import org.onosproject.cli.AbstractShellCommand;
 import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.DefaultAnnotations;
@@ -36,6 +37,7 @@
 /**
  * Annotates network link model.
  */
+@Service
 @Command(scope = "onos", name = "annotate-link",
          description = "Annotates network model entities")
 public class AnnotateLinkCommand extends AbstractShellCommand {
@@ -67,7 +69,7 @@
 
 
     @Override
-    protected void execute() {
+    protected void doExecute() {
         LinkService service = get(LinkService.class);
         ConnectPoint src = deviceConnectPoint(srcCp);
         ConnectPoint dst = deviceConnectPoint(dstCp);