commit 998f2df2cbfb1aec60af4455351f9cb643bc8f6a
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 3b2ce83fabc53f305ba1c5bae518e7738163a9b8
parent 59bd97e11e017af14da4800efb5d97726d691af5

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

app/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java

diff --git a/app/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java b/app/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
index 2c6b208..ca9ba42 100644
--- a/app/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
+++ b/app/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
@@ -1173,7 +1173,7 @@
         fob.withKey(Criteria.matchInPort(portNum))
                 .addCondition(Criteria.matchEthDst(deviceMac))
                 .addCondition(Criteria.matchVlanId(outerVlan))
-                .addCondition(Criteria.matchVlanId(innerVlan))
+                .addCondition(Criteria.matchInnerVlanId(innerVlan))
                 .withPriority(SegmentRoutingService.DEFAULT_PRIORITY);
 
         TrafficTreatment.Builder tBuilder = DefaultTrafficTreatment.builder();