Eliminate blueprint for drop-test-karaf commands

[openflowplugin.git] / drop-test-karaf / src / main / java / org / opendaylight / openflowplugin / droptestkaraf / DropAllPacketsCommandProvider.java

diff --git a/drop-test-karaf/src/main/java/org/opendaylight/openflowplugin/droptestkaraf/DropAllPacketsCommandProvider.java b/drop-test-karaf/src/main/java/org/opendaylight/openflowplugin/droptestkaraf/DropAllPacketsCommandProvider.java
index fd9d1e31dae2e7007d4b41445da31e5380a9af1f..ad0bc044aaa0e7acb1e5cc5a2b85f7b346a9fb85 100644 (file)
--- a/drop-test-karaf/src/main/java/org/opendaylight/openflowplugin/droptestkaraf/DropAllPacketsCommandProvider.java
+++ b/drop-test-karaf/src/main/java/org/opendaylight/openflowplugin/droptestkaraf/DropAllPacketsCommandProvider.java
@@ -7,25 +7,32 @@
  */
 package org.opendaylight.openflowplugin.droptestkaraf;
 
+import org.apache.karaf.shell.api.action.Action;
+import org.apache.karaf.shell.api.action.Argument;
+import org.apache.karaf.shell.api.action.Command;
+import org.apache.karaf.shell.api.action.Completion;
 import org.apache.karaf.shell.api.action.lifecycle.Reference;
-import org.apache.karaf.shell.commands.Argument;
-import org.apache.karaf.shell.commands.Command;
-import org.apache.karaf.shell.console.OsgiCommandSupport;
+import org.apache.karaf.shell.api.action.lifecycle.Service;
+import org.apache.karaf.shell.api.console.Session;
 import org.opendaylight.openflowplugin.testcommon.DropTestCommiter;
 
 @Command(scope = "drop-test", name = "dropAllPackets",
          description = "drop packet responder involving dataStore and FRM")
-public class DropAllPacketsCommandProvider extends OsgiCommandSupport {
+@Service
+public class DropAllPacketsCommandProvider implements Action {
     @Reference
     DropTestCommiter provider;
+    @Reference
+    Session session;
 
     @Argument(index = 0, name = "on-off",
             description = "target state of drop responder",
             required = true, multiValued = false)
+    @Completion(DropAllPacketsCompleter.class)
     String targetStateArg;
 
     @Override
-    protected Object doExecute() {
+    public Object execute() {
         final var out = session.getConsole();
 
         if ("on".equalsIgnoreCase(targetStateArg)) {