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

@@ -13,6 +13,7 @@ import org.onlab.packet.MplsLabel;
 import org.onlab.packet.VlanId;
 import org.onlab.packet.VlanId;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.core.DefaultGroupId;
 import org.onosproject.core.DefaultGroupId;
+import org.onosproject.driver.extensions.OfdpaSetVlanVid;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.PortNumber;
 import org.onosproject.net.PortNumber;
 import org.onosproject.net.behaviour.NextGroup;
 import org.onosproject.net.behaviour.NextGroup;
@@ -306,7 +307,8 @@ public class Ofdpa2GroupHandler {
                         break;
                         break;
                     case VLAN_ID:
                     case VLAN_ID:
                         vlanid = ((L2ModificationInstruction.ModVlanIdInstruction) l2ins).vlanId();
                         vlanid = ((L2ModificationInstruction.ModVlanIdInstruction) l2ins).vlanId();
-                        outerTtb.setVlanId(vlanid);
+                        OfdpaSetVlanVid ofdpaSetVlanVid = new OfdpaSetVlanVid(vlanid);
+                        outerTtb.extension(ofdpaSetVlanVid, deviceId);
                         setVlan = true;
                         setVlan = true;
                         break;
                         break;
                     case VLAN_POP:
                     case VLAN_POP:
@@ -339,7 +341,8 @@ public class Ofdpa2GroupHandler {
             }
             }
             // if vlan is not set, use the vlan in metadata for outerTtb
             // if vlan is not set, use the vlan in metadata for outerTtb
             if (vlanid != null && !setVlan) {
             if (vlanid != null && !setVlan) {
-                outerTtb.setVlanId(vlanid);
+                OfdpaSetVlanVid ofdpaSetVlanVid = new OfdpaSetVlanVid(vlanid);
+                outerTtb.extension(ofdpaSetVlanVid, deviceId);
             }
             }
         }
         }