VOL-2648 Change default behavior to incremental flow insertion.
Change-Id: I699b1eb1b0a992d5bed8d826d7562247a68030cd
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 2eb1533..be4e3ce 100644
--- a/python/adapters/brcm_openomci_onu/brcm_openomci_onu_adapter.py
+++ b/python/adapters/brcm_openomci_onu/brcm_openomci_onu_adapter.py
@@ -53,7 +53,8 @@
id=name,
vendor_ids=['OPEN', 'ALCL', 'BRCM', 'TWSH', 'ALPH', 'ISKT', 'SFAA', 'BBSM', 'SCOM', 'ARPX', 'DACM', 'ERSN', 'HWTC', 'CIGG'],
adapter=name,
- accepts_bulk_flow_update=True
+ accepts_bulk_flow_update=False,
+ accepts_add_remove_flow_updates=True
)
]
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 4da58d8..bf6767e 100644
--- a/python/adapters/brcm_openomci_onu/brcm_openomci_onu_handler.py
+++ b/python/adapters/brcm_openomci_onu/brcm_openomci_onu_handler.py
@@ -873,9 +873,7 @@
self.log.error('unsupported-action-type',
action_type=action.type, in_port=_in_port)
- if type is not None and _vlan_vid is None:
- self.log.warn('ignoring-flow-with-ethType', ethType=_type)
- elif _set_vlan_vid is None or _set_vlan_vid == 0:
+ if _set_vlan_vid is None or _set_vlan_vid == 0:
self.log.warn('ignorning-flow-that-does-not-set-vlanid')
else:
self.log.info('set-vlanid', uni_id=uni_id, uni_port=uni_port, set_vlan_vid=_set_vlan_vid, vlan_vid=_vlan_vid,tp_id=tp_id)