Fixes OpenstackSwitchingDirectPortProvider well even it there's interface added to the device already.
Change-Id: Ie1bdb6a5d65a1b5e964a94921ba919b259e76328
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackDirectPortListCommand.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackDirectPortListCommand.java
index 319a7fa..9466481 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackDirectPortListCommand.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackDirectPortListCommand.java
@@ -43,9 +43,7 @@
OpenstackNetworkService service = AbstractShellCommand.get(OpenstackNetworkService.class);
List<Port> ports = service.ports().stream()
-
.filter(port -> port.getvNicType().equals(DIRECT))
- .filter(port -> port.isAdminStateUp() && !port.getVifType().equals(UNBOUND))
.collect(Collectors.toList());
@@ -56,12 +54,21 @@
.collect(Collectors.toList());
Network osNet = service.network(port.getNetworkId());
- print(FORMAT, port.getId(),
- osNet.getName(),
- port.getMacAddress(),
- fixedIps.isEmpty() ? "" : fixedIps,
- port.getProfile() == null ? "" : port.getProfile().get(PCISLOT).toString(),
- getIntfNameFromPciAddress(port));
+ if (port.getVifType().equals(UNBOUND)) {
+ print(FORMAT, port.getId(),
+ osNet.getName(),
+ port.getMacAddress(),
+ fixedIps.isEmpty() ? "" : fixedIps,
+ UNBOUND, UNBOUND);
+ } else {
+ print(FORMAT, port.getId(),
+ osNet.getName(),
+ port.getMacAddress(),
+ fixedIps.isEmpty() ? "" : fixedIps,
+ port.getProfile().containsKey(PCISLOT) ? port.getProfile().get(PCISLOT).toString() : "",
+ getIntfNameFromPciAddress(port));
+ }
+
}
}
}