commit ea45af788f87b195efc6ae9ff3a56ae37b9002ca
author Harsh Awasthi <hawasthi@radisys.com> Mon Aug 26 02:39:00 2019 -0400
committer Harsh Awasthi <hawasthi@radisys.com> Tue Aug 27 05:14:10 2019 -0400
tree f761235e572539c6b82687eefa4d896300a8c74e
parent 7ac621337364cb014aba677331e7c63dd76bff3b

VOL-1879 : Support Transparent C-tag handling in OpenOLT

Change-Id: I500170456764df852e9f80a78d9ddc6514627f0a

adaptercore/openolt_flowmgr.go

diff --git a/adaptercore/openolt_flowmgr.go b/adaptercore/openolt_flowmgr.go
index d47e716..8a8d177 100644
--- a/adaptercore/openolt_flowmgr.go
+++ b/adaptercore/openolt_flowmgr.go
@@ -68,6 +68,9 @@
 
 	//FIXME - see also BRDCM_DEFAULT_VLAN in broadcom_onu.py
 
+	//Transparent Vlan
+	RESERVED_VLAN = 4095
+
 	//DefaultMgmtVlan default vlan value
 	DefaultMgmtVlan = 4091
 
@@ -829,10 +832,16 @@
 		classifier.IpProto = ipProto.(uint32)
 	}
 	if vlanID, ok := classifierInfo[VlanVid]; ok {
-		classifier.OVid = (vlanID.(uint32)) & VlanvIDMask
+		vid := (vlanID.(uint32)) & VlanvIDMask
+		if vid != RESERVED_VLAN {
+			classifier.OVid = vid
+		}
 	}
 	if metadata, ok := classifierInfo[METADATA]; ok {
-		classifier.IVid = uint32(metadata.(uint64))
+		vid := uint32(metadata.(uint64))
+		if vid != RESERVED_VLAN {
+			classifier.IVid = vid
+		}
 	}
 	if vlanPcp, ok := classifierInfo[VlanPcp]; ok {
 		if vlanPcp == 0 {