VOL-1224: The ONU Adapter must support deletion of a Service Flow using the Open OMCI MEs
VOL-1389: Support Transparent C-tag handling in OpenOLT and BRCM OpenOMCI adapters
Change-Id: I7a3c89d68180fd94a744db6082ecdf695635c635
diff --git a/voltha/adapters/openolt/openolt_flow_mgr.py b/voltha/adapters/openolt/openolt_flow_mgr.py
index acfcbfd..99d387c 100644
--- a/voltha/adapters/openolt/openolt_flow_mgr.py
+++ b/voltha/adapters/openolt/openolt_flow_mgr.py
@@ -40,6 +40,7 @@
# FIXME - see also BRDCM_DEFAULT_VLAN in broadcom_onu.py
DEFAULT_MGMT_VLAN = 4091
+RESERVED_VLAN = 4095
# Openolt Flow
UPSTREAM = "upstream"
@@ -803,10 +804,12 @@
classifier.eth_type = classifier_info[ETH_TYPE]
if IP_PROTO in classifier_info:
classifier.ip_proto = classifier_info[IP_PROTO]
- if VLAN_VID in classifier_info:
- classifier.o_vid = classifier_info[VLAN_VID]
- if METADATA in classifier_info:
- classifier.i_vid = classifier_info[METADATA]
+ if VLAN_VID in classifier_info and \
+ classifier_info[VLAN_VID] != RESERVED_VLAN:
+ classifier.o_vid = classifier_info[VLAN_VID]
+ if METADATA in classifier_info and \
+ classifier_info[METADATA] != RESERVED_VLAN:
+ classifier.i_vid = classifier_info[METADATA]
if VLAN_PCP in classifier_info:
classifier.o_pbits = classifier_info[VLAN_PCP]
if UDP_SRC in classifier_info: