CORD-1304 Set of changes for fabric routing to optimize use of ECMP groups
Also removing some old demo code in the SR app
Adding a couple of CLI commands for debugging
Bug fix in the DistributedGroupStore for group_exists error message
Bug fixes for ofdpa driver:
- synchronized update of flowObjectiveStore when buckets are added to or removed from groups
to avoid one thread from overwriting an update from another thread doing an update at the same time
- addBucketToL2FloodGroup now updates flowObjectiveStore after accounting for changes
- addBucketToHashGroup accounts for all added buckets, not just the first one
Change-Id: I6207c1c3c1b4379986805d73a73bc460fea8fe3f
diff --git a/src/main/java/org/onosproject/segmentrouting/EcmpShortestPathGraph.java b/src/main/java/org/onosproject/segmentrouting/EcmpShortestPathGraph.java
index f5d8ed1..50bab91 100644
--- a/src/main/java/org/onosproject/segmentrouting/EcmpShortestPathGraph.java
+++ b/src/main/java/org/onosproject/segmentrouting/EcmpShortestPathGraph.java
@@ -361,16 +361,19 @@
StringBuilder sBuilder = new StringBuilder();
for (Device device: srManager.deviceService.getDevices()) {
if (device.id() != rootDevice) {
- sBuilder.append("\r\n Paths from " + rootDevice + " to "
- + device.id() + "\r\n");
+ sBuilder.append("\r\n Paths from " + rootDevice + " to "
+ + device.id());
ArrayList<Path> paths = getECMPPaths(device.id());
if (paths != null) {
for (Path path : paths) {
- sBuilder.append("\r\n == "); // equal cost paths delimiter
- for (Link link : path.links()) {
+ sBuilder.append("\r\n == "); // equal cost paths delimiter
+ for (int i = path.links().size() - 1; i >= 0; i--) {
+ Link link = path.links().get(i);
sBuilder.append(" : " + link.src() + " -> " + link.dst());
}
}
+ } else {
+ sBuilder.append("\r\n == no paths");
}
}
}