commit f45552d34a73122114ce2d31bd2be61c134033bf
author Charles Chan <rascov@gmail.com> Fri Jul 13 18:08:33 2018 -0700
committer Charles Chan <charles@opennetworking.org> Wed Jul 25 21:52:22 2018 +0000
tree b3e21dab579ccc4fd18b817735771dac40f6aa56
parent 9547fc198dd6d6e512b27271ab7b16a1faae4601

Block pseudo wire VLAN translation

- Dune doesn't support VLAN translation in table 10. Need to revisit this with egress table
- Remove redundant setVlan action
- Implement partial unit test for PwaasUtil

Change-Id: Iabed388f6c68d8ddfc64a3302e6084c2e2aeeb44

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

diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa3Pipeline.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa3Pipeline.java
index 13fe2b1..7168f6d 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa3Pipeline.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa3Pipeline.java
@@ -568,8 +568,9 @@
                     .matchVlanId(innerVlanIdCriterion.vlanId());
 
             TrafficTreatment.Builder singleVlanTreatment = DefaultTrafficTreatment.builder()
-                    // .pushVlan()
-                    .setVlanId(egressVlan)
+                    // FIXME PW VLAN translation is not supported on Dune
+                    //       Need to explore doing that in egress table later if there is a requirement
+                    // .setVlanId(egressVlan)
                     .extension(new Ofdpa3SetMplsType(VPWS), deviceId)
                     .extension(new Ofdpa3SetMplsL2Port(mplsLogicalPort), deviceId)
                     .setTunnelId(tunnelId)