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/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java b/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java
index 2cb7dc5..6f56154 100644
--- a/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java
+++ b/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);