commit 3cc7e66059ac9be3cdfbd266563690ec53badc9b
author Pier <pierventre@hotmail.com> Wed Mar 07 11:42:50 2018 +0100
committer Pier <pierventre@hotmail.com> Tue Mar 13 11:14:17 2018 -0700
tree 1440261188aacb23ab77a38b238b02c6f11ef1b9
parent ce5ea129ad5e291d5b07b66ab91b79d9c78d998c

[CORD-2811] Fix VLAN cases in Mcast

Change-Id: I0b051a4502e48b4278723a1b782f49e0d6a2dffa

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

diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/CpqdOfdpa2Pipeline.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/CpqdOfdpa2Pipeline.java
index 9c22b37..9876a0c 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/CpqdOfdpa2Pipeline.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/CpqdOfdpa2Pipeline.java
@@ -176,6 +176,9 @@
         if (vidCriterion.vlanId() == VlanId.NONE) {
             // untagged packets are assigned vlans
             treatment.pushVlan().setVlanId(assignedVlan);
+        } else if (!vidCriterion.vlanId().equals(assignedVlan)) {
+            // Rewrite with assigned vlans
+            treatment.setVlanId(assignedVlan);
         }
 
         // ofdpa cannot match on ALL portnumber, so we need to use separate