commit | ba7eb1afc0e3a71f6cf03fdf263e935feb60613d | [log] [tgz] |
---|---|---|
author | Saurav Das <sauravdas@alumni.stanford.edu> | Wed Dec 13 16:19:35 2017 -0800 |
committer | Saurav Das <sauravdas@alumni.stanford.edu> | Wed Dec 13 16:19:35 2017 -0800 |
tree | e3cd52f9205de17e3e975f6c1b985281ea3cce06 | |
parent | c505f1e241612bfe1779b508edc5863ecb08ec3e [diff] |
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 300f2a2..2c4fb5e 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);