commit fa382c248a069e0477855c45d94510675bf2fca8
author Daniele Moro <daniele@opennetworking.org> Fri Jul 12 17:58:54 2019 -0700
committer Carmelo Cascone <carmelo@opennetworking.org> Fri Jul 19 00:36:54 2019 +0000
tree 59d21cf7fb0a4b121629fcc8a210ff09edce02ba
parent 6ad77723753b8091f2bd4977f88e5892e211ccc7

Double tagged filtering objective with inner vlan criteria

- when double tagged filtering objective an inner vlan criteria is submitted
- update to ofdpa and ovsofdpa drivers to evaluate the inner vlan criteria correctly

Change-Id: I33170c9b83482a5f26f13f7098a9b24a92da9544

drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/OvsOfdpaPipeline.java

diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/OvsOfdpaPipeline.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/OvsOfdpaPipeline.java
index cc6e100..a9c15d8 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/OvsOfdpaPipeline.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/OvsOfdpaPipeline.java
@@ -251,12 +251,10 @@
                     ethCriterion = (EthCriterion) criterion;
                     break;
                 case VLAN_VID:
-                    if (innervidCriterion == null) {
-                        innervidCriterion = (VlanIdCriterion) criterion;
-                    } else {
-                        outerVidCriterion = innervidCriterion;
-                        innervidCriterion = (VlanIdCriterion) criterion;
-                    }
+                    outerVidCriterion = (VlanIdCriterion) criterion;
+                    break;
+                case INNER_VLAN_VID:
+                    innervidCriterion = (VlanIdCriterion) criterion;
                     break;
                 default:
                     log.warn("Unsupported filter {}", criterion);