lldp provider changes for karaf 4.2.1 CLI
Change-Id: Ib8417888ff0cc06b924ed672db965f9245b640cd
diff --git a/providers/lldp/BUILD b/providers/lldp/BUILD
index 764a221..ea8287f 100644
--- a/providers/lldp/BUILD
+++ b/providers/lldp/BUILD
@@ -8,6 +8,7 @@
]
osgi_jar_with_tests(
+ karaf_command_packages = ["org.onosproject.provider.lldp.cli"],
test_deps = TEST_ADAPTERS,
deps = COMPILE_DEPS,
)
diff --git a/providers/lldp/src/main/java/org/onosproject/provider/lldp/cli/ConfigLinkDiscoveryCommand.java b/providers/lldp/src/main/java/org/onosproject/provider/lldp/cli/ConfigLinkDiscoveryCommand.java
index 394a4c9..834f101 100644
--- a/providers/lldp/src/main/java/org/onosproject/provider/lldp/cli/ConfigLinkDiscoveryCommand.java
+++ b/providers/lldp/src/main/java/org/onosproject/provider/lldp/cli/ConfigLinkDiscoveryCommand.java
@@ -19,6 +19,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.Option;
import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.onosproject.cli.AbstractShellCommand;
@@ -40,19 +41,16 @@
description = "Adds configuration to disable LLDP link discovery")
public class ConfigLinkDiscoveryCommand extends AbstractShellCommand {
- // OSGi workaround to introduce package dependency
- DeviceIdCompleter deviceIdCompleter;
@Argument(index = 0, name = "device",
description = "DeviceID",
required = true)
+ @Completion(DeviceIdCompleter.class)
String device = null;
-
- // OSGi workaround to introduce package dependency
- PortNumberCompleter portNumberCompleter;
@Argument(index = 1, name = "port",
description = "Port number",
required = false)
+ @Completion(PortNumberCompleter.class)
String port = null;
@Option(name = "--remove", aliases = "-r",