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/TopologyCommand.java

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 0b4b4b3..ad1db11 100644
--- a/cli/src/main/java/org/onosproject/cli/net/TopologyCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/TopologyCommand.java
@@ -20,8 +20,9 @@
 import java.util.Calendar;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.karaf.shell.commands.Command;
-import org.apache.karaf.shell.commands.Option;
+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.topology.Topology;
 import org.onosproject.net.topology.TopologyProvider;
@@ -30,6 +31,7 @@
 /**
  * Lists summary of the current topology.
  */
+@Service
 @Command(scope = "onos", name = "topology",
 description = "Lists summary of the current topology")
 public class TopologyCommand extends AbstractShellCommand {
@@ -53,7 +55,7 @@
     }
 
     @Override
-    protected void execute() {
+    protected void doExecute() {
         init();
         long topologyUptime =
                 Math.max(0, (System.currentTimeMillis() - topology.creationTime()));