From 04f9ffe7bd8fe540f7acdc70869cd1e409bb9304 Mon Sep 17 00:00:00 2001 From: Daniel Park Date: Tue, 26 Jun 2018 12:34:29 +0900 Subject: [PATCH] Adds host routes to OpenstackNetworkListCommanAdds. Change-Id: Ida0d3c697ddda9b0948e0d040155589a1923471a --- .../cli/OpenstackNetworkListCommand.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) 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 9867f9ca47..b383a117ef 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 @@ import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.m 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 @@ public class OpenstackNetworkListCommand extends AbstractShellCommand { return; } - print(FORMAT, "ID", "Name", "Network Mode", "VNI", "Subnets"); + print(FORMAT, "ID", "Name", "Network Mode", "VNI", "Subnets", "HostRoutes"); for (Network net: networks) { - List subnets = service.subnets().stream() + List subnets = service.subnets().stream() .filter(subnet -> subnet.getNetworkId().equals(net.getId())) + .collect(Collectors.toList()); + + List subnetsString = subnets.stream() .map(Subnet::getCidr) .collect(Collectors.toList()); + + List 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); } }