t3 app changes for karaf 4.2.1 CLI
Change-Id: I44976ac1c70552a8575d62447198a8f97fed57a0
diff --git a/app/BUILD b/app/BUILD
index 4380cd6..81173f6 100644
--- a/app/BUILD
+++ b/app/BUILD
@@ -13,6 +13,7 @@
]
osgi_jar_with_tests(
+ karaf_command_packages = ["org.onosproject.t3.cli"],
test_deps = TEST_DEPS,
deps = COMPILE_DEPS,
)
diff --git a/app/src/main/java/org/onosproject/t3/cli/TroubleshootPingAllCommand.java b/app/src/main/java/org/onosproject/t3/cli/TroubleshootPingAllCommand.java
index 96f540f..64fe2a0 100644
--- a/app/src/main/java/org/onosproject/t3/cli/TroubleshootPingAllCommand.java
+++ b/app/src/main/java/org/onosproject/t3/cli/TroubleshootPingAllCommand.java
@@ -18,10 +18,12 @@
import org.apache.commons.lang.StringUtils;
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.onlab.packet.IpAddress;
import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.cli.net.EthTypeCompleter;
import org.onosproject.net.Host;
import org.onosproject.net.flow.criteria.Criterion;
import org.onosproject.net.flow.criteria.IPCriterion;
@@ -48,6 +50,7 @@
"id=%s, mac=%s, locations=%s, vlan=%s, ip(s)=%s";
@Option(name = "-et", aliases = "--ethType", description = "ETH Type", valueToShowInHelp = "ipv4")
+ @Completion(EthTypeCompleter.class)
String ethType = "ipv4";
@Option(name = "-v", aliases = "--verbose", description = "Outputs trace for each host to host combination")
diff --git a/app/src/main/java/org/onosproject/t3/cli/TroubleshootSimpleTraceCommand.java b/app/src/main/java/org/onosproject/t3/cli/TroubleshootSimpleTraceCommand.java
index fa7f393..7b18913 100644
--- a/app/src/main/java/org/onosproject/t3/cli/TroubleshootSimpleTraceCommand.java
+++ b/app/src/main/java/org/onosproject/t3/cli/TroubleshootSimpleTraceCommand.java
@@ -18,9 +18,11 @@
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.AbstractShellCommand;
+import org.onosproject.cli.net.EthTypeCompleter;
import org.onosproject.cli.net.HostIdCompleter;
import org.onosproject.net.HostId;
import org.onosproject.t3.api.StaticPacketTrace;
@@ -42,10 +44,12 @@
HostIdCompleter completer;
@Argument(index = 0, name = "one", description = "One host ID",
required = true, multiValued = false)
+ @Completion(HostIdCompleter.class)
String srcHost = null;
@Argument(index = 1, name = "two", description = "Another host ID",
required = true, multiValued = false)
+ @Completion(HostIdCompleter.class)
String dstHost = null;
@Option(name = "-v", aliases = "--verbose", description = "Outputs complete path")
@@ -55,6 +59,7 @@
private boolean verbosity2 = false;
@Option(name = "-et", aliases = "--ethType", description = "ETH Type", valueToShowInHelp = "ipv4")
+ @Completion(EthTypeCompleter.class)
String ethType = "ipv4";
@Override