Use OfdpaSetVlanVid extension instead of setVlanVid in group buckets
GroupBucketEntryBuilder now shares the same treatment builder as FlowEntryBuilder.
Therefore, we also need to use the extension when building group buckets.
https://gerrit.onosproject.org/#/c/8485/
Change-Id: Ic85dd10d1bfd8c0ca26f5811369f0587dc286761
diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/Ofdpa2GroupHandler.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/Ofdpa2GroupHandler.java
index 30a9c32..dd53080 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/Ofdpa2GroupHandler.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/Ofdpa2GroupHandler.java
@@ -13,6 +13,7 @@
import org.onlab.packet.VlanId;
import org.onosproject.core.ApplicationId;
import org.onosproject.core.DefaultGroupId;
+import org.onosproject.driver.extensions.OfdpaSetVlanVid;
import org.onosproject.net.DeviceId;
import org.onosproject.net.PortNumber;
import org.onosproject.net.behaviour.NextGroup;
@@ -306,7 +307,8 @@
break;
case VLAN_ID:
vlanid = ((L2ModificationInstruction.ModVlanIdInstruction) l2ins).vlanId();
- outerTtb.setVlanId(vlanid);
+ OfdpaSetVlanVid ofdpaSetVlanVid = new OfdpaSetVlanVid(vlanid);
+ outerTtb.extension(ofdpaSetVlanVid, deviceId);
setVlan = true;
break;
case VLAN_POP:
@@ -339,7 +341,8 @@
}
// if vlan is not set, use the vlan in metadata for outerTtb
if (vlanid != null && !setVlan) {
- outerTtb.setVlanId(vlanid);
+ OfdpaSetVlanVid ofdpaSetVlanVid = new OfdpaSetVlanVid(vlanid);
+ outerTtb.extension(ofdpaSetVlanVid, deviceId);
}
}