VOL-1513: Modified adapter_agent call to core_proxy call
Changed code for init_pm_metrics() called as part of
'enable device' workflow.
Change-Id: Ibe2788ff7da586e46effee5ceec5fc9781080026
diff --git a/pyvoltha/adapters/extensions/kpi/adapter_pm_metrics.py b/pyvoltha/adapters/extensions/kpi/adapter_pm_metrics.py
index 4a92bee..982f11d 100644
--- a/pyvoltha/adapters/extensions/kpi/adapter_pm_metrics.py
+++ b/pyvoltha/adapters/extensions/kpi/adapter_pm_metrics.py
@@ -37,12 +37,12 @@
# for collection.
TIMESTAMP_ATTRIBUTE = 'timestamp'
- def __init__(self, adapter_agent, device_id, logical_device_id,
+ def __init__(self, core_proxy, device_id, logical_device_id,
grouped=False, freq_override=False, **kwargs):
"""
Initializer for shared Device Adapter PM metrics manager
- :param adapter_agent: (AdapterAgent) Adapter agent for the device
+ :param core_proxy: (CoreProxy) Gateway between CORE and an adapter
:param device_id: (str) Device ID
:param logical_device_id: (str) VOLTHA Logical Device ID
:param grouped: (bool) Flag indicating if statistics are managed as a group
@@ -52,10 +52,10 @@
"""
self.log = structlog.get_logger(device_id=device_id)
self.device_id = device_id
- self.adapter_agent = adapter_agent
- self.name = adapter_agent.listening_topic
+ self.core_proxy = core_proxy
+ self.name = core_proxy.listening_topic
self.logical_device_id = logical_device_id
- device = self.adapter_agent.get_device(self.device_id)
+ device = yield self.core_proxy.get_device(self.device_id)
self.serial_number = device.serial_number
self.default_freq = kwargs.get(AdapterPmMetrics.DEFAULT_FREQUENCY_KEY,
diff --git a/pyvoltha/adapters/extensions/kpi/olt/olt_pm_metrics.py b/pyvoltha/adapters/extensions/kpi/olt/olt_pm_metrics.py
index da3a677..4ebaa8d 100644
--- a/pyvoltha/adapters/extensions/kpi/olt/olt_pm_metrics.py
+++ b/pyvoltha/adapters/extensions/kpi/olt/olt_pm_metrics.py
@@ -24,12 +24,12 @@
specific PM (OMCI, PON, UNI) is supported in encapsulated classes accessible
from this object
"""
- def __init__(self, adapter_agent, device_id, logical_device_id,
+ def __init__(self, core_proxy, device_id, logical_device_id,
grouped=False, freq_override=False, **kwargs):
"""
Initializer for shared ONU Device Adapter PM metrics
- :param adapter_agent: (AdapterAgent) Adapter agent for the device
+ :param core_proxy: (CoreProxy) Gateway between CORE and an adapter
:param device_id: (str) Device ID
:param logical_device_id: (str) VOLTHA Logical Device ID
:param grouped: (bool) Flag indicating if statistics are managed as a group
@@ -42,7 +42,7 @@
'nni-ports': List of objects that provide NNI (northbound) port statistics
'pon-ports': List of objects that provide PON port statistics
"""
- super(OltPmMetrics, self).__init__(adapter_agent, device_id, logical_device_id,
+ super(OltPmMetrics, self).__init__(core_proxy, device_id, logical_device_id,
grouped=grouped, freq_override=freq_override,
**kwargs)