VOL-3212: Ignore IGMP Trap flow to workaround the issue of invalid
vlan tagging operation for TT workflow
Change-Id: I5870bf7edd1b33ac719b6bd57273cde7c78afab3
diff --git a/VERSION b/VERSION
index 35cee72..a71cbf4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.4.3
+2.4.4-dev
diff --git a/python/adapters/brcm_openomci_onu/brcm_openomci_onu_handler.py b/python/adapters/brcm_openomci_onu/brcm_openomci_onu_handler.py
index 9e3f6c1..1eecd7a 100644
--- a/python/adapters/brcm_openomci_onu/brcm_openomci_onu_handler.py
+++ b/python/adapters/brcm_openomci_onu/brcm_openomci_onu_handler.py
@@ -945,6 +945,7 @@
_set_vlan_vid = None
_set_vlan_pcp = None
_tunnel_id = None
+ _proto = -1
self.log.debug("add-flow", device_id=device.id, flow=flow)
try:
@@ -976,6 +977,10 @@
elif field.type == fd.IP_PROTO:
_proto = field.ip_proto
+ if _proto == 2:
+ # Workaround for TT workflow - avoids installing invalid EVTO rule
+ self.log.debug("igmp-trap-flow")
+ break
self.log.debug('field-type-ip-proto',
ip_proto=_proto)
@@ -1028,6 +1033,11 @@
raise NotImplementedError('field.type={}'.format(
field.type))
+ if _proto == 2:
+ # Workaround for TT workflow - avoids installing invalid EVTO rule
+ self.log.warn("skipping-igmp-trap-flow")
+ continue
+
for action in fd.get_actions(flow):
if action.type == fd.OUTPUT: