[WIP] Upgrade ONOS to karaf version 4.2.1
Change-Id: I7cd40c995bdf1c80f94b1895fb3344e32404c7fa
diff --git a/cli/src/main/java/org/onosproject/cli/net/vnet/VirtualHostRemoveCommand.java b/cli/src/main/java/org/onosproject/cli/net/vnet/VirtualHostRemoveCommand.java
index a496e38..4d3370d 100644
--- a/cli/src/main/java/org/onosproject/cli/net/vnet/VirtualHostRemoveCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/vnet/VirtualHostRemoveCommand.java
@@ -16,8 +16,9 @@
package org.onosproject.cli.net.vnet;
-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.incubator.net.virtual.NetworkId;
import org.onosproject.incubator.net.virtual.VirtualNetworkAdminService;
@@ -28,6 +29,7 @@
* Removes a virtual host.
*/
+@Service
@Command(scope = "onos", name = "vnet-remove-host",
description = "Removes a virtual host.")
public class VirtualHostRemoveCommand extends AbstractShellCommand {
@@ -41,7 +43,7 @@
String id = null;
@Override
- protected void execute() {
+ protected void doExecute() {
VirtualNetworkAdminService service = get(VirtualNetworkAdminService.class);
service.removeVirtualHost(NetworkId.networkId(networkId), HostId.hostId(id));
print("Virtual host successfully removed.");