commit c1e69e8335b4c055cb3408b0f0631a8fb2179e99
author Ray Milkey <ray@opennetworking.org> Tue Oct 09 15:59:22 2018 -0700
committer Ray Milkey <ray@opennetworking.org> Wed Oct 10 16:54:58 2018 +0000
tree 524f3316de7ab0c3f4caf945f9c77009f4512470
parent 05be20b3317f6ea3a1342a588f10866850fdadd3

optical model app changes for karaf 4.2.1 CLI

Change-Id: Iefcf8cb1624f40250c01596d317f40f60f165a42

apps/optical-model/BUILD

diff --git a/apps/optical-model/BUILD b/apps/optical-model/BUILD
index 61a839b..9ba6cda 100644
--- a/apps/optical-model/BUILD
+++ b/apps/optical-model/BUILD
@@ -5,6 +5,7 @@
 ]
 
 osgi_jar_with_tests(
+    karaf_command_packages = ["org.onosproject.net.optical.cli"],
     test_deps = TEST_ADAPTERS,
     deps = COMPILE_DEPS,
 )

apps/optical-model/src/main/java/org/onosproject/net/optical/cli/AddOpticalIntentCommand.java

diff --git a/apps/optical-model/src/main/java/org/onosproject/net/optical/cli/AddOpticalIntentCommand.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/cli/AddOpticalIntentCommand.java
index 79433c3..833b20d 100644
--- a/apps/optical-model/src/main/java/org/onosproject/net/optical/cli/AddOpticalIntentCommand.java
+++ b/apps/optical-model/src/main/java/org/onosproject/net/optical/cli/AddOpticalIntentCommand.java
@@ -18,9 +18,9 @@
 import com.google.common.collect.ImmutableMap;
 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.Option;
 import org.apache.karaf.shell.api.action.lifecycle.Service;
-import org.onosproject.cli.app.AllApplicationNamesCompleter;
 import org.onosproject.cli.net.ConnectPointCompleter;
 import org.onosproject.cli.net.ConnectivityIntentCommand;
 import org.onosproject.net.ChannelSpacing;
@@ -65,22 +65,16 @@
             .put(CH_100, ChannelSpacing.CHL_100GHZ)
             .build();
 
-    // OSGi workaround
-    @SuppressWarnings("unused")
-    private ConnectPointCompleter cpCompleter;
-
-    // OSGi workaround
-    @SuppressWarnings("unused")
-    private AllApplicationNamesCompleter appCompleter;
-
     @Argument(index = 0, name = "ingress",
             description = "Ingress Device/Port Description",
             required = true, multiValued = false)
+    @Completion(ConnectPointCompleter.class)
     String ingressString = "";
 
     @Argument(index = 1, name = "egress",
             description = "Egress Device/Port Description",
             required = true, multiValued = false)
+    @Completion(ConnectPointCompleter.class)
     String egressString = "";
 
     @Option(name = "-b", aliases = "--bidirectional",

cli/src/main/java/org/onosproject/cli/net/DevicePortsListCommand.java

diff --git a/cli/src/main/java/org/onosproject/cli/net/DevicePortsListCommand.java b/cli/src/main/java/org/onosproject/cli/net/DevicePortsListCommand.java
index b32146c..e05a675 100644
--- a/cli/src/main/java/org/onosproject/cli/net/DevicePortsListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/DevicePortsListCommand.java
@@ -21,6 +21,7 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 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.apache.karaf.shell.api.action.Option;
 import org.onosproject.utils.Comparators;
@@ -53,6 +54,7 @@
 
     @Argument(index = 0, name = "uri", description = "Device ID",
               required = false, multiValued = false)
+    @Completion(DeviceIdCompleter.class)
     protected String uri = null;
 
     @Override