Fixing a defect where logical port numbers are listed as part of CLI arg completion.
Fixing a defect where devices imported with device id in uppercase are considered as different from those discovered in lowercase.
Fixed javadocs error from a rebase.
Change-Id: I76741022fb95d10a9a16fc9ce6d6443b166822ab
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/ConnectPointCompleter.java b/cli/src/main/java/org/onlab/onos/cli/net/ConnectPointCompleter.java
index 777ace5..16031cc 100644
--- a/cli/src/main/java/org/onlab/onos/cli/net/ConnectPointCompleter.java
+++ b/cli/src/main/java/org/onlab/onos/cli/net/ConnectPointCompleter.java
@@ -15,9 +15,6 @@
*/
package org.onlab.onos.cli.net;
-import java.util.List;
-import java.util.SortedSet;
-
import org.apache.karaf.shell.console.Completer;
import org.apache.karaf.shell.console.completer.StringsCompleter;
import org.onlab.onos.cli.AbstractShellCommand;
@@ -25,6 +22,9 @@
import org.onlab.onos.net.Port;
import org.onlab.onos.net.device.DeviceService;
+import java.util.List;
+import java.util.SortedSet;
+
/**
* ConnectPoint completer.
*/
@@ -40,9 +40,10 @@
// Generate the device ID/port number identifiers
for (Device device : service.getDevices()) {
SortedSet<String> strings = delegate.getStrings();
-
for (Port port : service.getPorts(device.id())) {
- strings.add(device.id().toString() + "/" + port.number());
+ if (!port.number().isLogical()) {
+ strings.add(device.id().toString() + "/" + port.number());
+ }
}
}