new optical app changes for karaf 4.2.1 CLI
Change-Id: I2e1a39633f7a07610db90bb89864c6dc6d9b0917
diff --git a/apps/newoptical/BUILD b/apps/newoptical/BUILD
index c4c8d0b..fed6102 100644
--- a/apps/newoptical/BUILD
+++ b/apps/newoptical/BUILD
@@ -8,6 +8,7 @@
]
osgi_jar_with_tests(
+ karaf_command_packages = ["org.onosproject.newoptical.cli"],
test_deps = TEST_DEPS,
deps = COMPILE_DEPS,
)
diff --git a/apps/newoptical/src/main/java/org/onosproject/newoptical/cli/AddOpticalConnectivityCommand.java b/apps/newoptical/src/main/java/org/onosproject/newoptical/cli/AddOpticalConnectivityCommand.java
index 55baec0..dde909d 100644
--- a/apps/newoptical/src/main/java/org/onosproject/newoptical/cli/AddOpticalConnectivityCommand.java
+++ b/apps/newoptical/src/main/java/org/onosproject/newoptical/cli/AddOpticalConnectivityCommand.java
@@ -17,6 +17,7 @@
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.Service;
import org.onlab.util.Bandwidth;
import org.onosproject.cli.AbstractShellCommand;
@@ -41,10 +42,12 @@
@Argument(index = 0, name = "ingress", description = "Ingress connect point",
required = true, multiValued = false)
+ @Completion(ConnectPointCompleter.class)
String ingressStr = null;
@Argument(index = 1, name = "egress", description = "Egress connect point",
required = true, multiValued = false)
+ @Completion(ConnectPointCompleter.class)
String egressStr = null;
@Argument(index = 2, name = "bandwidth", description = "Bandwidth",
diff --git a/apps/newoptical/src/main/java/org/onosproject/newoptical/cli/OpticalConnectivityIdCompleter.java b/apps/newoptical/src/main/java/org/onosproject/newoptical/cli/OpticalConnectivityIdCompleter.java
index 96974db..ba7e0ea 100644
--- a/apps/newoptical/src/main/java/org/onosproject/newoptical/cli/OpticalConnectivityIdCompleter.java
+++ b/apps/newoptical/src/main/java/org/onosproject/newoptical/cli/OpticalConnectivityIdCompleter.java
@@ -18,6 +18,7 @@
import java.util.List;
import java.util.stream.Collectors;
+import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.onlab.util.Identifier;
import org.onosproject.cli.AbstractChoicesCompleter;
import org.onosproject.newoptical.OpticalConnectivity;
@@ -28,6 +29,7 @@
/**
* Completer for OpticalConnectivityId.
*/
+@Service
public class OpticalConnectivityIdCompleter extends AbstractChoicesCompleter {
@Override
diff --git a/apps/newoptical/src/main/java/org/onosproject/newoptical/cli/RemoveOpticalConnectivityCommand.java b/apps/newoptical/src/main/java/org/onosproject/newoptical/cli/RemoveOpticalConnectivityCommand.java
index 52605a6..d8cb254 100644
--- a/apps/newoptical/src/main/java/org/onosproject/newoptical/cli/RemoveOpticalConnectivityCommand.java
+++ b/apps/newoptical/src/main/java/org/onosproject/newoptical/cli/RemoveOpticalConnectivityCommand.java
@@ -17,6 +17,7 @@
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.Service;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.newoptical.api.OpticalConnectivityId;
@@ -28,6 +29,7 @@
public class RemoveOpticalConnectivityCommand extends AbstractShellCommand {
@Argument(index = 0, name = "id", description = "ID of optical connectivity",
required = true, multiValued = false)
+ @Completion(OpticalConnectivityIdCompleter.class)
String idStr = null;
@Override