commit b50ba1fa35b75888361648e77e5a0bcf542d0bab
author Esin Karaman <esin.karaman@netsia.com> Wed Mar 18 14:34:52 2020 +0000
committer Pier Luigi Ventre <pier@opennetworking.org> Thu Mar 19 10:38:25 2020 +0000
tree 08fa9b4aed1e48bfd6f2f7224dc459f87d724793
parent 38d495b006617e16847991c45b77657fb3862b39

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

Change-Id: I96945c2c3e966adfdae7febbd482dc569cbb890d

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();