commit 2786122009a61c58403292ad85a8d403728693e3
author Esin Karaman <esin.karaman@netsia.com> Tue Mar 17 17:09:36 2020 +0000
committer Pier Luigi Ventre <pier@opennetworking.org> Thu Mar 19 10:38:17 2020 +0000
tree eb548d97fb907e54126bfb9b5f3554dccfa17b6e
parent 6341ff8002512520a4a5b5e1ef81033bde78c510

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

Change-Id: I2c3a09485e86dc50ab20b7b32dccbd019330b150

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 8d4591f..841e444 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();