mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2026-05-05 04:06:49 +02:00
Code Issues Projects Releases Wiki Activity

Adds host routes to OpenstackNetworkListCommanAdds.

Browse Source 
Change-Id: Ida0d3c697ddda9b0948e0d040155589a1923471a
This commit is contained in:
Daniel Park 2018-06-26 12:34:29 +09:00 committed by Jian Li
parent de4ef40fe4
commit 04f9ffe7bd
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackNetworkListCommand.java
View File

@ -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<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);
}
}