commit 6e9b6f5035d92efff14b9e8f3aa6adc096f064d4
author Yi Tseng <yi@opennetworking.org> Tue Feb 27 10:40:51 2018 +0100
committer Carmelo Cascone <carmelo@opennetworking.org> Tue Mar 20 02:28:54 2018 +0000
tree 8d845e58927765fff43f5d15aab927e21ee3ac41
parent 8069fddf16c4c2697c68e35f344ae2d6ad77f411

[ONOS-7504] Skip adding or removing flows when operation is ADD_TO_EXIST or REMOVE_FROM_EXIST

Change-Id: Ia45ae50ceb94423df19cc1916dd794e736b9af1b

pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricNextPipeliner.java

diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricNextPipeliner.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricNextPipeliner.java
index 0047bd6..ed10839 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricNextPipeliner.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricNextPipeliner.java
@@ -28,6 +28,7 @@
 import org.onosproject.net.flow.instructions.Instructions.OutputInstruction;
 import org.onosproject.net.flowobjective.DefaultNextObjective;
 import org.onosproject.net.flowobjective.NextObjective;
+import org.onosproject.net.flowobjective.Objective;
 import org.onosproject.net.flowobjective.ObjectiveError;
 import org.onosproject.net.group.DefaultGroupBucket;
 import org.onosproject.net.group.DefaultGroupDescription;
@@ -169,6 +170,12 @@
                                                            nextObjective.appId()));
 
         // flow
+        // If operation is ADD_TO_EXIST or REMOVE_FROM_EXIST, means we modify
+        // group buckets only, no changes for flow rule
+        if (nextObjective.op() == Objective.Operation.ADD_TO_EXISTING ||
+                nextObjective.op() == Objective.Operation.REMOVE_FROM_EXISTING) {
+            return;
+        }
         TrafficSelector selector = buildNextIdSelector(nextObjective.id());
         TrafficTreatment treatment = DefaultTrafficTreatment.builder()
                 .piTableAction(PiActionGroupId.of(nextObjective.id()))