| commit | b805f1af2be91009156b8104bf9dca631040b328 | [log] [tgz] |
|---|---|---|
| author | Saurav Das <sauravdas@alumni.stanford.edu> | Wed Dec 13 16:19:35 2017 -0800 |
| committer | Charles Chan <rascov@gmail.com> | Thu Dec 14 11:24:39 2017 -0800 |
| tree | 8726c44ef5666c637628782fcb764b69373cd790 | |
| parent | 71d50ebc63203b791fa8fcadb69da3d2c4496e46 [diff] [blame] |
Bug fix for IgnoreDhcp rules after switch restart. Also fixed NPE in group handler, and made recognizing ofdpa software more generic to handle premium versions on accton switches. Change-Id: Ie1f40dd934c2a1adb75174c90c2d6f1b71f98d3a
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java index 2cb7dc5..6f56154 100644 --- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java +++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java
@@ -449,6 +449,14 @@ int edgeLabel = dskey.destinationSet().getEdgeLabel(destSw); Integer nextId = nhops.nextId(); + if (currNeighbors == null || nextHops == null) { + log.warn("fixing hash groups but found currNeighbors:{} or nextHops:{}" + + " in targetSw:{} for dstSw:{}", currNeighbors, nextHops, + targetSw, destSw); + success &= false; + continue; + } + Set<DeviceId> diff; if (revoke) { diff = Sets.difference(currNeighbors, nextHops);