VOL-2623 adding update_flows_incrementally support to onu-adapter
With this task queuing of vlan_filter task is done per tp_id and
the signature of the constructor of vlan_filter task is changed to include default_vlan and vlan_pcp.
Change-Id: Ib83f0362cb5923f88d98f25c02241dd3d2019e0c
diff --git a/python/adapters/brcm_openomci_onu/brcm_openomci_onu_adapter.py b/python/adapters/brcm_openomci_onu/brcm_openomci_onu_adapter.py
index 0ce8389..2eb1533 100644
--- a/python/adapters/brcm_openomci_onu/brcm_openomci_onu_adapter.py
+++ b/python/adapters/brcm_openomci_onu/brcm_openomci_onu_adapter.py
@@ -51,7 +51,7 @@
supported_device_types = [
DeviceType(
id=name,
- vendor_ids=['OPEN', 'ALCL', 'BRCM', 'TWSH', 'ALPH', 'ISKT', 'SFAA', 'BBSM', 'SCOM'],
+ vendor_ids=['OPEN', 'ALCL', 'BRCM', 'TWSH', 'ALPH', 'ISKT', 'SFAA', 'BBSM', 'SCOM', 'ARPX', 'DACM', 'ERSN', 'HWTC', 'CIGG'],
adapter=name,
accepts_bulk_flow_update=True
)
@@ -215,7 +215,20 @@
return handler.update_flow_table(device, flows.items)
def update_flows_incrementally(self, device, flow_changes, group_changes):
- raise NotImplementedError()
+ self.log.info('incremental-flow-update', device_id=device.id,
+ flows=flow_changes, groups=group_changes)
+ # For now, there is no support for group changes
+ assert len(group_changes.to_add.items) == 0
+ assert len(group_changes.to_remove.items) == 0
+
+ handler = self.devices_handlers[device.id]
+ # Remove flows
+ if len(flow_changes.to_remove.items) != 0:
+ handler.remove_onu_flows(device, flow_changes.to_remove.items)
+
+ # Add flows
+ if len(flow_changes.to_add.items) != 0:
+ handler.add_onu_flows(device, flow_changes.to_add.items)
def send_proxied_message(self, proxy_address, msg):
self.log.debug('send-proxied-message', proxy_address=proxy_address, msg=msg)