commit ec25a0a91f053867206257eabd0b92b8f42438f5
author Esin Karaman <esin.karaman@netsia.com> Wed Mar 18 14:29:29 2020 +0000
committer Pier Luigi Ventre <pier@opennetworking.org> Thu Mar 19 10:38:31 2020 +0000
tree 68ba6e38b92db34feb493c9ff42949a08f6c617f
parent 1b7dd121a4748a6200ef4a35f66fd6bee6e90130

VOL-2734 Double-tagged multicast flow support by OltPipeline.
The full path of the task:
https://jira.opencord.org/browse/VOL-2734

Change-Id: I85eba35a2498ff161af94a1d1a866bcd91c1b967

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

diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/OltPipeline.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/OltPipeline.java
index 2d8ce83..aea1442 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/OltPipeline.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/OltPipeline.java
@@ -406,6 +406,12 @@
             builderToUpdate.matchVlanId(assignedVlan);
         }
 
+        Optional<Criterion> innerVlanIdCriterion = readFromSelector(fwd.meta(), Criterion.Type.INNER_VLAN_VID);
+        if (innerVlanIdCriterion.isPresent()) {
+            VlanId assignedInnerVlan = ((VlanIdCriterion) innerVlanIdCriterion.get()).vlanId();
+            builderToUpdate.matchMetadata(assignedInnerVlan.toShort());
+        }
+
         Optional<Criterion> ethTypeCriterion = readFromSelector(fwd.selector(), Criterion.Type.ETH_TYPE);
         if (ethTypeCriterion.isPresent()) {
             EthType ethType = ((EthTypeCriterion) ethTypeCriterion.get()).ethType();