[WIP] Upgrade ONOS to karaf version 4.2.1
Change-Id: I7cd40c995bdf1c80f94b1895fb3344e32404c7fa
diff --git a/cli/src/main/java/org/onosproject/cli/net/MeterAddCommand.java b/cli/src/main/java/org/onosproject/cli/net/MeterAddCommand.java
index 0b23f88..a892b17 100644
--- a/cli/src/main/java/org/onosproject/cli/net/MeterAddCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/MeterAddCommand.java
@@ -15,9 +15,10 @@
*/
package org.onosproject.cli.net;
-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.core.CoreService;
import org.onosproject.net.DeviceId;
@@ -36,6 +37,7 @@
/**
* Add a meter to a device.
*/
+@Service
@Command(scope = "onos", name = "meter-add",
description = "Adds a meter to a device (currently for testing)")
public class MeterAddCommand extends AbstractShellCommand {
@@ -139,7 +141,7 @@
}
@Override
- protected void execute() {
+ protected void doExecute() {
MeterService service = get(MeterService.class);
CoreService coreService = get(CoreService.class);