commit e2e5f2b9fdd254f7d8f82c5949b03b4f7145a03e
author Devmalya Paul <Devmalya.Paul@radisys.com> Sun Mar 08 18:50:33 2020 -0400
committer Scott Baker <smbaker@gmail.com> Wed Mar 11 08:47:37 2020 -0700
tree b54390d8dcfc7b90e03863e5bf27f961a897aa90
parent 2ca384f7994b3759dce6a2eb0dad47649e89d52b

VOL-888 Onu Disabled Alarm

        Support for generating ONU disabled event.

Change-Id: Ia531c6fec58ac13100af87b535545f58399bed6e

python/adapters/brcm_openomci_onu/brcm_openomci_onu_handler.py

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 acfafe2..0b135ba 100644
--- a/python/adapters/brcm_openomci_onu/brcm_openomci_onu_handler.py
+++ b/python/adapters/brcm_openomci_onu/brcm_openomci_onu_handler.py
@@ -32,6 +32,7 @@
 
 from heartbeat import HeartBeat
 from pyvoltha.adapters.extensions.events.device_events.onu.onu_active_event import OnuActiveEvent
+from pyvoltha.adapters.extensions.events.device_events.onu.onu_disabled_event import OnuDisabledEvent
 from pyvoltha.adapters.extensions.events.kpi.onu.onu_pm_metrics import OnuPmMetrics
 from pyvoltha.adapters.extensions.events.kpi.onu.onu_omci_pm import OnuOmciPmMetrics
 from pyvoltha.adapters.extensions.events.adapter_events import AdapterEvents
@@ -1366,10 +1367,9 @@
     def disable(self, device):
         self.log.info('disable', device_id=device.id, serial_number=device.serial_number)
         try:
-            yield self.disable_ports(lock_ports=True)
+            yield self.disable_ports(lock_ports=True, device_disabled=True)
             yield self.core_proxy.device_reason_update(self.device_id, "omci-admin-lock")
             yield self.core_proxy.device_state_update(self.device_id, oper_status=OperStatus.UNKNOWN)
-
         except Exception as e:
             self.log.exception('exception-in-onu-disable', exception=e)
 
@@ -1405,7 +1405,7 @@
         self._deferred.addCallbacks(success, failure)
 
     @inlineCallbacks
-    def disable_ports(self, lock_ports=True):
+    def disable_ports(self, lock_ports=True, device_disabled=False):
         self.log.info('disable-ports', device_id=self.device_id)
 
         # TODO: for now only support the first UNI given no requirement for multiple uni yet. Also needed to reduce flow
@@ -1418,7 +1418,7 @@
                                                         port.operstatus)
 
         if lock_ports is True:
-            self.lock_ports(lock=True)
+            self.lock_ports(lock=True, device_disabled=device_disabled)
 
     @inlineCallbacks
     def enable_ports(self):
@@ -1719,10 +1719,41 @@
             self.log.exception('onu-activated-event-error',
                                errmsg=active_event_error.message)
 
-    def lock_ports(self, lock=True):
+    @inlineCallbacks
+    def onu_disabled_event(self):
+        self.log.debug('onu-disabled-event')
+        try:
+            device = yield self.core_proxy.get_device(self.device_id)
+            parent_device = yield self.core_proxy.get_device(self.parent_id)
+            olt_serial_number = parent_device.serial_number
+            raised_ts = arrow.utcnow().timestamp
+
+            self.log.debug("onu-indication-context-data",
+                           pon_id=self._onu_indication.intf_id,
+                           onu_id=self._onu_indication.onu_id,
+                           registration_id=self.device_id,
+                           device_id=self.device_id,
+                           onu_serial_number=device.serial_number,
+                           olt_serial_number=olt_serial_number,
+                           raised_ts=raised_ts)
+
+            self.log.debug("Trying-to-raise-onu-disabled-event")
+            OnuDisabledEvent(self.events, self.device_id,
+                           self._onu_indication.intf_id,
+                           device.serial_number,
+                           str(self.device_id),
+                           olt_serial_number, raised_ts,
+                           onu_id=self._onu_indication.onu_id).send(True)
+        except Exception as active_event_error:
+            self.log.exception('onu-disabled-event-error',
+                               errmsg=active_event_error.message)
+
+    def lock_ports(self, lock=True, device_disabled=False):
 
         def success(response):
             self.log.debug('set-onu-ports-state', lock=lock, response=response)
+            if device_disabled:
+                self.onu_disabled_event()
 
         def failure(response):
             self.log.error('cannot-set-onu-ports-state', lock=lock, response=response)

python/requirements.txt

diff --git a/python/requirements.txt b/python/requirements.txt
index 3cab263..c82e1a4 100644
--- a/python/requirements.txt
+++ b/python/requirements.txt
@@ -1,2 +1,2 @@
-voltha-protos==3.2.6
-pyvoltha==2.3.21
+voltha-protos==3.2.7
+pyvoltha==2.3.22