optical model app changes for karaf 4.2.1 CLI
Change-Id: Iefcf8cb1624f40250c01596d317f40f60f165a42
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",