[WIP] Upgrade ONOS to karaf version 4.2.1
Change-Id: I7cd40c995bdf1c80f94b1895fb3344e32404c7fa
diff --git a/cli/src/main/java/org/onosproject/cli/net/ConfigureLinkCommand.java b/cli/src/main/java/org/onosproject/cli/net/ConfigureLinkCommand.java
index 1607ab3..6af7a26 100644
--- a/cli/src/main/java/org/onosproject/cli/net/ConfigureLinkCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/ConfigureLinkCommand.java
@@ -19,9 +19,10 @@
import java.util.Optional;
-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.Link;
@@ -33,6 +34,7 @@
/**
* Add Link configuration.
*/
+@Service
@Command(scope = "onos", name = "config-link",
description = "Configure link.")
public class ConfigureLinkCommand extends AbstractShellCommand {
@@ -71,7 +73,7 @@
@Override
- protected void execute() {
+ protected void doExecute() {
DeviceService deviceService = get(DeviceService.class);
NetworkConfigService netCfgService = get(NetworkConfigService.class);