VOL-1344:
1) Place all of resource manager and tech profile KV store data under /service/voltha
2) Ensure flow_ids are released on the KV store when device is deleted
3) Ensure pon resources are re-used on voltha restart
4) Few other code re-organization and bug fixes
Change-Id: Ia7bc8062d88b7a8eec5d4b87209536d81b115575
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 fde2591..45bc45e 100644
--- a/voltha/adapters/brcm_openomci_onu/brcm_openomci_onu_handler.py
+++ b/voltha/adapters/brcm_openomci_onu/brcm_openomci_onu_handler.py
@@ -664,8 +664,10 @@
reactor.callLater(0, self._onu_omci_device.stop)
# Let TP download happen again
- for i in self._tp_service_specific_task: i.clear()
- for i in self._tech_profile_download_done: i.clear()
+ for uni_id in self._tp_service_specific_task:
+ self._tp_service_specific_task[uni_id].clear()
+ for uni_id in self._tech_profile_download_done:
+ self._tech_profile_download_done[uni_id].clear()
self.disable_ports(onu_device)
onu_device.reason = "stopping-openomci"
@@ -685,8 +687,10 @@
reactor.callLater(0, self._onu_omci_device.stop)
# Let TP download happen again
- for i in self._tp_service_specific_task: i.clear()
- for i in self._tech_profile_download_done: i.clear()
+ for uni_id in self._tp_service_specific_task:
+ self._tp_service_specific_task[uni_id].clear()
+ for uni_id in self._tech_profile_download_done:
+ self._tech_profile_download_done[uni_id].clear()
self.disable_ports(onu_device)
onu_device.reason = "stopping-openomci"
@@ -731,8 +735,10 @@
reactor.callLater(0, self._onu_omci_device.stop)
# Let TP download happen again
- for i in self._tp_service_specific_task: i.clear()
- for i in self._tech_profile_download_done: i.clear()
+ for uni_id in self._tp_service_specific_task:
+ self._tp_service_specific_task[uni_id].clear()
+ for uni_id in self._tech_profile_download_done:
+ self._tech_profile_download_done[uni_id].clear()
self.disable_ports(device)
device.oper_status = OperStatus.UNKNOWN
@@ -1035,4 +1041,4 @@
self._pon._port = pon_port
self.adapter_agent.add_port_reference_to_parent(self.device_id,
- pon_port)
\ No newline at end of file
+ pon_port)