commit 067ee4d1abce2c45ec6021961dc1e3b9624014b8
author Maria Carmela Cascino <m.cascino@reply.it> Tue Nov 02 13:14:43 2021 +0100
committer Andrea Campanella <andrea@opennetworking.org> Mon Nov 29 12:15:34 2021 -0800
tree f2cafba7f6c959d339f352a834de124a9da058b9
parent 49c4205a095c0afd50dbed45d1d52c5db51b8c4b

TIM WorkFlow

Change-Id: I63a1c5b1ce287186479e22979c37baa1fb7145d5

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

diff --git a/impl/src/main/java/org/opencord/olt/impl/OltFlowService.java b/impl/src/main/java/org/opencord/olt/impl/OltFlowService.java
index cbc538a..f4e859f 100644
--- a/impl/src/main/java/org/opencord/olt/impl/OltFlowService.java
+++ b/impl/src/main/java/org/opencord/olt/impl/OltFlowService.java
@@ -1227,9 +1227,13 @@
             treatmentBuilder.pushVlan()
                     .setVlanId(uti.getPonCTag());
         }
+        if (uti.getPonSTag().toShort() == VlanId.ANY_VALUE) {
+            treatmentBuilder.popVlan();
+        }
 
         if (uti.getUsPonCTagPriority() != -1) {
             treatmentBuilder.setVlanPcp((byte) uti.getUsPonCTagPriority());
+
         }
 
         treatmentBuilder.pushVlan()