[VOL-1698] OMCI PM does not work
Pass ONU's serial number to OnuPmMetrics, fix update_device to device_update
Change-Id: Iccfebdd83384dba18724c3739a921bc5952e1c48
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 ca6c7ef..82b6c90 100644
--- a/python/adapters/brcm_openomci_onu/brcm_openomci_onu_handler.py
+++ b/python/adapters/brcm_openomci_onu/brcm_openomci_onu_handler.py
@@ -240,9 +240,10 @@
'heartbeat': self.heartbeat,
OnuOmciPmMetrics.OMCI_DEV_KEY: self._onu_omci_device
}
+ self.log.debug('create-OnuPmMetrics', serial_number=device.serial_number)
self.pm_metrics = OnuPmMetrics(self.core_proxy, self.device_id,
- self.logical_device_id, grouped=True,
- freq_override=False, **kwargs)
+ self.logical_device_id, device.serial_number,
+ grouped=True, freq_override=False, **kwargs)
pm_config = self.pm_metrics.make_proto()
self._onu_omci_device.set_pm_config(self.pm_metrics.omci_pm.openomci_interval_pm)
self.log.info("initial-pm-config", pm_config=pm_config)
@@ -250,7 +251,8 @@
############################################################################
# Setup Alarm handler
- self.alarms = AdapterAlarms(self.core_proxy, device.id, self.logical_device_id)
+ self.alarms = AdapterAlarms(self.core_proxy, device.id, self.logical_device_id,
+ device.serial_number)
# Note, ONU ID and UNI intf set in add_uni_port method
self._onu_omci_device.alarm_synchronizer.set_alarm_params(mgr=self.alarms,
ani_ports=[self._pon])