VOL-1473: adapter_agent swapped with core_proxy
This was only done places in the code confirmed to work.
Basically any existing references to adapter_agent are
untested and need to be moved to a core_proxy call
or removed. Left as work TODO
Change-Id: I2d2cab7b64687f99e96f42f7f38dad6a4026de73
diff --git a/python/adapters/openolt/openolt.py b/python/adapters/openolt/openolt.py
index abc95c1..5d55e79 100644
--- a/python/adapters/openolt/openolt.py
+++ b/python/adapters/openolt/openolt.py
@@ -96,8 +96,8 @@
# System Init Methods #
def __init__(self, core_proxy, adapter_proxy, config):
+ self.core_proxy = core_proxy
self.adapter_proxy = adapter_proxy
- self.adapter_agent = core_proxy
self.config = config
self.descriptor = Adapter(
id=self.name,
@@ -105,7 +105,7 @@
version='0.1',
config=AdapterConfig(log_level=LogLevel.INFO)
)
- log.debug('openolt.__init__', adapter_agent=adapter_proxy)
+ log.debug('openolt.__init__', core_proxy=core_proxy, adapter_proxy=adapter_proxy)
self.devices = dict() # device_id -> OpenoltDevice()
self.interface = registry('main').get_args().interface
self.logical_device_id_to_root_device_id = dict()
@@ -187,8 +187,8 @@
kwargs = {
'support_classes': OpenOltDefaults['support_classes'],
+ 'core_proxy': self.core_proxy,
'adapter_proxy': self.adapter_proxy,
- 'adapter_agent': self.adapter_agent,
'device': device,
'device_num': self.num_devices + 1
}
@@ -206,7 +206,8 @@
log.info('reconcile-device', device=device)
kwargs = {
'support_classes': OpenOltDefaults['support_classes'],
- 'adapter_agent': self.adapter_agent,
+ 'core_proxy': self.core_proxy,
+ 'adapter_proxy': self.adapter_proxy,
'device': device,
'device_num': self.num_devices + 1,
'reconciliation': True