VOL-1452 pep8 cleanup and tab/space fixes
Change-Id: Iad55faad2455bbe0a13178f36efd13bb6f06409c
diff --git a/python/adapters/openolt/main.py b/python/adapters/openolt/main.py
index 0621017..85d3518 100755
--- a/python/adapters/openolt/main.py
+++ b/python/adapters/openolt/main.py
@@ -15,7 +15,7 @@
# limitations under the License.
#
-"""Ponsim OLT Adapter main entry point"""
+"""OpenOLT Adapter main entry point"""
import argparse
import os
@@ -241,14 +241,12 @@
dir = os.path.dirname(os.path.abspath(__file__))
path = os.path.join(dir, path)
path = os.path.abspath(path)
-
+
with open(path) as fd:
config = yaml.load(fd)
return config
-
-
def print_banner(log):
log.info(' ____ _____ ___ _ ___ ___ _ _____ ')
log.info('/ _ \| _ \| __| | / | / _ \| | |_ _| ')
@@ -264,13 +262,14 @@
log.info(' |_| ')
log.info('(to stop: press Ctrl-C)')
+
@implementer(IComponent)
class Main(object):
def __init__(self):
self.args = args = parse_args()
- self.config = load_config(args)
+ self.config = load_config(args)
verbosity_adjust = (args.verbose or 0) - (args.quiet or 0)
self.log = setup_logging(self.config.get('logging', {}),
@@ -278,10 +277,10 @@
verbosity_adjust=verbosity_adjust)
self.log.info('container-number-extractor',
regex=args.container_name_regex)
-
+
self.openolt_adapter_version = self.get_version()
- self.log.info('Open-OLT-Adapter-Version', version=
- self.openolt_adapter_version)
+ self.log.info('Open-OLT-Adapter-Version',
+ version=self.openolt_adapter_version)
if not args.no_banner:
print_banner(self.log)
@@ -362,8 +361,7 @@
self.core_proxy = CoreProxy(
kafka_proxy=None,
core_topic=self.core_topic,
- my_listening_topic=self.listening_topic,
- adapter_name=self.args.name)
+ my_listening_topic=self.listening_topic)
self.adapter_proxy = AdapterProxy(
kafka_proxy=None,
@@ -371,8 +369,8 @@
my_listening_topic=self.listening_topic)
self.adapter = OpenoltAdapter(core_proxy=self.core_proxy,
- adapter_proxy=self.adapter_proxy,
- config=config)
+ adapter_proxy=self.adapter_proxy,
+ config=config)
openolt_request_handler = AdapterRequestFacade(adapter=self.adapter)
@@ -383,7 +381,7 @@
# TODO: Add KV Store object reference
kv_store=self.args.backend,
default_topic=self.args.name,
- group_id_prefix=self.args.instance_id,
+ group_id_prefix=self.args.instance_id,
# Needs to assign a real class
target_cls=openolt_request_handler