commit c03782de67791dfe6b8acc4738e75bef8985d9ec
author Charles Chan <rascov@gmail.com> Tue Jan 31 13:57:55 2017 -0800
committer Jonathan Hart <jono@onlab.us> Tue Jan 31 22:51:27 2017 +0000
tree 2780e9829170211546fe395b15a0fb994886c44a
parent fce514764d35f7dc69716c7649f6fd9e5f3f9e67

Bugfix: OfdpaSetVlanVid is not disabled properly

Change-Id: Ic831a4b8ee15d444c99695de5c73711c8ee95447

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 20c2b3d..03811e2 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
@@ -527,8 +527,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);
+                }
             }
         }