Adds host routes to OpenstackNetworkListCommanAdds.
Change-Id: Ida0d3c697ddda9b0948e0d040155589a1923471a
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackNetworkListCommand.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackNetworkListCommand.java
index 9867f9c..b383a11 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackNetworkListCommand.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackNetworkListCommand.java
@@ -40,7 +40,7 @@
description = "Lists all OpenStack networks")
public class OpenstackNetworkListCommand extends AbstractShellCommand {
- private static final String FORMAT = "%-40s%-20s%-20s%-20s%-8s";
+ private static final String FORMAT = "%-40s%-20s%-20s%-20s%-16s%-8s";
@Override
protected void execute() {
@@ -57,17 +57,28 @@
return;
}
- print(FORMAT, "ID", "Name", "Network Mode", "VNI", "Subnets");
+ print(FORMAT, "ID", "Name", "Network Mode", "VNI", "Subnets", "HostRoutes");
for (Network net: networks) {
- List<String> subnets = service.subnets().stream()
+ List<Subnet> subnets = service.subnets().stream()
.filter(subnet -> subnet.getNetworkId().equals(net.getId()))
+ .collect(Collectors.toList());
+
+ List<String> subnetsString = subnets.stream()
.map(Subnet::getCidr)
.collect(Collectors.toList());
+
+ List<String> hostRoutes = Lists.newArrayList();
+
+ subnets.forEach(subnet -> {
+ subnet.getHostRoutes().forEach(h -> hostRoutes.add(h.toString()));
+ });
+
print(FORMAT, net.getId(),
net.getName(),
net.getNetworkType().toString(),
net.getProviderSegID(),
- subnets.isEmpty() ? "" : subnets);
+ subnets.isEmpty() ? "" : subnetsString,
+ hostRoutes.isEmpty() ? "" : hostRoutes);
}
}