| commit | 559a5801044cd12533050d65b8cb69ca5633a8c1 | [log] [tgz] |
|---|---|---|
| author | Charles Chan <rascov@gmail.com> | Fri Aug 31 20:19:33 2018 -0700 |
| committer | Carmelo Cascone <carmelo@opennetworking.org> | Wed Sep 05 07:06:19 2018 +0000 |
| tree | fa398e8ddd0cfd1eb69a440d0f1a4f0f5a5e94c3 | |
| parent | 8586c6478888cebf56c8069d76e6e184baca7668 [diff] |
Do not change vlan_meta flow if we are only editing the buckets There may be some other buckets in the hash group relying on the vlan_meta flow Change-Id: Ie208328df0e8b43c5dd836f0d9c43785bc74c908
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 e5207eb..479b1d4 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
@@ -74,7 +74,10 @@ public PipelinerTranslationResult next(NextObjective nextObjective) { PipelinerTranslationResult.Builder resultBuilder = PipelinerTranslationResult.builder(); - processNextVlanMeta(nextObjective, resultBuilder); + if (nextObjective.op() != Objective.Operation.ADD_TO_EXISTING && + nextObjective.op() != Objective.Operation.REMOVE_FROM_EXISTING) { + processNextVlanMeta(nextObjective, resultBuilder); + } switch (nextObjective.type()) { case SIMPLE: