VOL-1415 VOL-1345 On onu reboot ensure the same gem and tcont id are used
Check if a tcont already has an alloc id assigned and if so use it,
otherwise check for a free one
Also the dict where gem ports are checked if they exist have an additional key,
use that to determine if exists
Also some logging fixes so certain objects are string represented properly
Change-Id: I24d3a69a1bda5b8f64dde472cb9e1260e19b1508
diff --git a/voltha/adapters/brcm_openomci_onu/brcm_openomci_onu_handler.py b/voltha/adapters/brcm_openomci_onu/brcm_openomci_onu_handler.py
index 9fed3f9..42dd0a9 100644
--- a/voltha/adapters/brcm_openomci_onu/brcm_openomci_onu_handler.py
+++ b/voltha/adapters/brcm_openomci_onu/brcm_openomci_onu_handler.py
@@ -375,7 +375,7 @@
gemdict['weight'] = gem_port['weight']
gemdict['uni_id'] = uni_id
- gem_port = OnuGemPort.create(self, gem_port=gemdict, entity_id=self._pon.next_gem_entity_id)
+ gem_port = OnuGemPort.create(self, gem_port=gemdict)
self._pon.add_gem_port(gem_port)
@@ -615,12 +615,12 @@
assert uni_port is not None
def success(_results):
- self.log.info('vlan-tagging-success', _results=_results)
+ self.log.info('vlan-tagging-success', uni_port=uni_port, vlan=_set_vlan_vid)
device.reason = 'omci-flows-pushed'
self._vlan_filter_task = None
def failure(_reason):
- self.log.warn('vlan-tagging-failure', _reason=_reason)
+ self.log.warn('vlan-tagging-failure', uni_port=uni_port, vlan=_set_vlan_vid)
device.reason = 'omci-flows-failed-retrying'
self._vlan_filter_task = reactor.callLater(_STARTUP_RETRY_WAIT,
self._add_vlan_filter_task, device, uni_port, _set_vlan_vid)