commit f438bb68840b66dcee4aa4b0cc9c0056b4a544a8
author Charles Chan <rascov@gmail.com> Tue Jan 22 17:50:21 2019 -0800
committer Charles Chan <charles@opennetworking.org> Wed Feb 06 00:02:14 2019 +0000
tree 511ddb42633bd01231506745708426112e473e1a
parent ab591601afc3ee2fa0d0ece583e95cdd3aed6266

Make sure group is added before pushing punt table flow

Change-Id: I5de426f0c3242e73e1da019a3a655668ed36d503

drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/OvsOfdpaPipeline.java

diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/OvsOfdpaPipeline.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/OvsOfdpaPipeline.java
index f192ec9..3245583 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/OvsOfdpaPipeline.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/OvsOfdpaPipeline.java
@@ -1296,7 +1296,7 @@
                 // this can happen outside of the lock but I think it is safer
                 // to include it here.
                 Group group = groupService.getGroup(deviceId, popVlanPuntGroupKey());
-                if (group != null) {
+                if (group != null && group.state() == Group.GroupState.ADDED) {
                     log.debug("PopVlanPuntGroupChecker: Installing {} missing rules at punt table.",
                               flowRuleQueue.size());