commit 43c16d928d2f0998996d961f37dbe0876996de81
author Charles Chan <rascov@gmail.com> Thu Feb 02 11:15:22 2017 -0800
committer Charles Chan <rascov@gmail.com> Thu Feb 02 11:15:22 2017 -0800
tree cc5f46fac41564c3c63531051672b7a1dd7109c8
parent 648397e2a19f54ccb0a41295e8ea56c2ca6631a1

Bugfix: OfdpaSetVlanVid is not disabled properly

Change-Id: Ic831a4b8ee15d444c99695de5c73711c8ee95447
(cherry picked from commit c03782de67791dfe6b8acc4738e75bef8985d9ec)

drivers/default/src/main/java/org/onosproject/driver/pipeline/Ofdpa2Pipeline.java

diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/Ofdpa2Pipeline.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/Ofdpa2Pipeline.java
index c0ae6a5..198e10e 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/Ofdpa2Pipeline.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/Ofdpa2Pipeline.java
@@ -519,8 +519,12 @@
             selector.extension(ofdpaMatchVlanVid, deviceId);
 
             if (!assignedVlan.equals(vidCriterion.vlanId())) {
-                OfdpaSetVlanVid ofdpaSetVlanVid = new OfdpaSetVlanVid(assignedVlan);
-                treatment.extension(ofdpaSetVlanVid, deviceId);
+                if (useSetVlanExtension) {
+                    OfdpaSetVlanVid ofdpaSetVlanVid = new OfdpaSetVlanVid(assignedVlan);
+                    treatment.extension(ofdpaSetVlanVid, deviceId);
+                } else {
+                    treatment.setVlanId(assignedVlan);
+                }
             }
         }