[VOL-4246] Feature parity with the previous implementation
Change-Id: I3741edb3c1b88b1cf8b5e6d4ff0900132e2e5e6a
diff --git a/impl/src/main/java/org/opencord/olt/cli/OltUniPortCompleter.java b/impl/src/main/java/org/opencord/olt/cli/OltUniPortCompleter.java
index 68ceca6..98301db 100644
--- a/impl/src/main/java/org/opencord/olt/cli/OltUniPortCompleter.java
+++ b/impl/src/main/java/org/opencord/olt/cli/OltUniPortCompleter.java
@@ -19,34 +19,34 @@
import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.onlab.osgi.DefaultServiceDirectory;
import org.onosproject.cli.net.PortNumberCompleter;
-import org.onosproject.net.AnnotationKeys;
+import org.onosproject.net.Device;
import org.onosproject.net.DeviceId;
import org.onosproject.net.device.DeviceService;
+import org.opencord.olt.impl.OltDeviceServiceInterface;
+
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
-import java.util.stream.StreamSupport;
@Service
public class OltUniPortCompleter extends PortNumberCompleter {
- private static final String NNI = "nni-";
public OltUniPortCompleter() {
}
protected List<String> choices() {
+ DeviceService deviceService = DefaultServiceDirectory.getService(DeviceService.class);
DeviceId deviceId = this.lookForDeviceId();
if (deviceId == null) {
return Collections.emptyList();
} else {
- DeviceService deviceService = (DeviceService) DefaultServiceDirectory.getService(DeviceService.class);
- return (List) StreamSupport.stream(deviceService.getPorts(deviceId).spliterator(), false)
- .filter((port) -> {
- return port.isEnabled() && !port.annotations().value(AnnotationKeys.PORT_NAME).startsWith(NNI);
- })
- .map((port) -> {
- return port.number().toString();
- }).collect(Collectors.toList());
+ Device device = deviceService.getDevice(DeviceId.deviceId(deviceId.toString()));
+ OltDeviceServiceInterface oltDeviceService =
+ DefaultServiceDirectory.getService(OltDeviceServiceInterface.class);
+ return deviceService.getPorts(deviceId).stream()
+ .filter((port) -> port.isEnabled() && !oltDeviceService.isNniPort(device, port.number()))
+ .map((port) -> port.number().toString())
+ .collect(Collectors.toList());
}
}
}