commit 327c572269608283576aa113461b7710a5bc22bd
author Andrea Campanella <andrea@opennetworking.org> Thu Jan 30 11:34:13 2020 +0100
committer Andrea Campanella <andrea@opennetworking.org> Thu Jan 30 14:22:35 2020 +0100
tree 1007a5c44b075d2fdcf66a9cea4b10e779bbea47
parent cbbb795fd5dc505b691aef0adb1f1dfe54afafe3

[VOL-2516] Changes to porperly support vlan ANY for DT workflow

Change-Id: I6107dfe1c6c57f25169b414183143b87f4cbed9c

app/src/main/java/org/opencord/olt/impl/OltFlowService.java

diff --git a/app/src/main/java/org/opencord/olt/impl/OltFlowService.java b/app/src/main/java/org/opencord/olt/impl/OltFlowService.java
index e04255c..00ab474 100644
--- a/app/src/main/java/org/opencord/olt/impl/OltFlowService.java
+++ b/app/src/main/java/org/opencord/olt/impl/OltFlowService.java
@@ -571,9 +571,12 @@
                 .matchVlanId(uniTagInformation.getUniTagMatch())
                 .build();
 
-        TrafficTreatment.Builder treatmentBuilder = DefaultTrafficTreatment.builder()
-                .pushVlan()
-                .setVlanId(uniTagInformation.getPonCTag());
+        TrafficTreatment.Builder treatmentBuilder = DefaultTrafficTreatment.builder();
+        //if the subscriberVlan (cTag) is different than ANY it needs to set.
+        if (uniTagInformation.getPonCTag().toShort() != VlanId.ANY_VALUE) {
+            treatmentBuilder.pushVlan()
+                    .setVlanId(uniTagInformation.getPonCTag());
+        }
 
         if (uniTagInformation.getUsPonCTagPriority() != NO_PCP) {
             treatmentBuilder.setVlanPcp((byte) uniTagInformation.getUsPonCTagPriority());
@@ -602,6 +605,8 @@
                                                          PortNumber subscriberPort,
                                                          MeterId downstreamMeterId,
                                                          UniTagInformation tagInformation) {
+
+        //subscriberVlan can be any valid Vlan here including ANY to make sure the packet is tagged
         TrafficSelector.Builder selectorBuilder = DefaultTrafficSelector.builder()
                 .matchVlanId(tagInformation.getPonSTag())
                 .matchInPort(uplinkPort)
@@ -619,9 +624,15 @@
 
         TrafficTreatment.Builder treatmentBuilder = DefaultTrafficTreatment.builder()
                 .popVlan()
-                .setOutput(subscriberPort)
-                .writeMetadata(createMetadata(tagInformation.getPonCTag(), tagInformation.getTechnologyProfileId(),
-                        subscriberPort), 0);
+                .setOutput(subscriberPort);
+
+        //If the subscriber Vlan (cTag) is different than ANY we should set it
+        if (tagInformation.getPonCTag().toShort() != VlanId.ANY_VALUE) {
+            treatmentBuilder.setVlanId(tagInformation.getPonCTag());
+        }
+        treatmentBuilder.writeMetadata(createMetadata(tagInformation.getPonCTag(),
+                                                      tagInformation.getTechnologyProfileId(),
+                                                      subscriberPort), 0);
 
         // to remark inner vlan header
         if (tagInformation.getUsPonCTagPriority() != NO_PCP) {