VOL-2373: fix eid for mac bridge and reset alloc id in using spec value
Change-Id: I6efa6380865bff9e6c8777cd88df69c2c01faad4
diff --git a/python/adapters/brcm_openomci_onu/omci/brcm_vlan_filter_task.py b/python/adapters/brcm_openomci_onu/omci/brcm_vlan_filter_task.py
index 2589247..3e08584 100644
--- a/python/adapters/brcm_openomci_onu/omci/brcm_vlan_filter_task.py
+++ b/python/adapters/brcm_openomci_onu/omci/brcm_vlan_filter_task.py
@@ -114,7 +114,8 @@
# Delete bridge ani side vlan filter
# TODO: check if its in our local mib first before blindly deleting
- msg = VlanTaggingFilterDataFrame(self._mac_bridge_port_ani_entity_id + self._uni_port.mac_bridge_port_num)
+ eid = self._mac_bridge_port_ani_entity_id + self._uni_port.entity_id # Entity ID
+ msg = VlanTaggingFilterDataFrame(eid)
frame = msg.delete()
self.log.debug('openomci-msg', omci_msg=msg)
self.strobe_watchdog()
@@ -129,7 +130,7 @@
forward_operation = 0x00 # no investigation, ONU transparent
msg = VlanTaggingFilterDataFrame(
- self._mac_bridge_port_ani_entity_id + self._uni_port.mac_bridge_port_num, # Entity ID
+ eid,
vlan_tcis=[self._set_vlan_id], # VLAN IDs
forward_operation=forward_operation
)