commit 28e2c92359f97c8c75ea7009d8bc5762c78459f5
author serkant.uluderya <serkant.uluderya@netsia.com> Sat May 30 00:30:12 2020 -0700
committer serkant.uluderya <serkant.uluderya@netsia.com> Thu Jun 04 09:22:20 2020 -0700
tree 7b23aefd16574bf55969de14ccb1ec49b837746f
parent a63eda85fbfcb2f022caf2ba6c1f257f535f85f6

[VOL-3116] Read openolt adapter's topic name from command-line

Change-Id: I62e5989ea774a124424b298e82431ac0d7b4fa36

VERSION

diff --git a/VERSION b/VERSION
index dfb9edc..005119b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.4.1-dev
+2.4.1

python/adapters/brcm_openomci_onu/main.py

diff --git a/python/adapters/brcm_openomci_onu/main.py b/python/adapters/brcm_openomci_onu/main.py
index def8e64..f7b2404 100755
--- a/python/adapters/brcm_openomci_onu/main.py
+++ b/python/adapters/brcm_openomci_onu/main.py
@@ -67,6 +67,7 @@
     accept_incremental_evto_update=os.environ.get('ACCEPT_INCREMENTAL_EVTO_UPDATE', False),
     etcd=os.environ.get('ETCD', 'localhost:2379'),
     core_topic=os.environ.get('CORE_TOPIC', 'rwcore'),
+    adapter_topic=os.environ.get('ADAPTER_TOPIC', 'openolt'),
     event_topic=os.environ.get('EVENT_TOPIC', 'voltha.events'),
     interface=os.environ.get('INTERFACE', get_my_primary_interface()),
     instance_id=os.environ.get('INSTANCE_ID', os.environ.get('HOSTNAME', '1')),
@@ -246,6 +247,13 @@
                         action='store',
                         default=defs['core_topic'],
                         help=_help)
+    
+    _help = 'topic of openolt adapter on the kafka bus'
+    parser.add_argument('-at', '--adapter_topic',
+                        dest='adapter_topic',
+                        action='store',
+                        default=defs['adapter_topic'],
+                        help=_help)
 
     _help = 'topic of events on the kafka bus'
     parser.add_argument('-et', '--event_topic',
@@ -367,6 +375,7 @@
         self.instance_id = self.args.instance_id + '_' + str(current_time)
 
         self.core_topic = str(args.core_topic)
+        self.adapter_topic = str(args.adapter_topic)
         self.event_topic = str(args.event_topic)
         self.listening_topic = "%s_%s" % (args.name, args.current_replica)
         self.id = "%s_%s" % (args.name, args.current_replica)
@@ -423,7 +432,7 @@
 
             self.adapter_proxy = AdapterProxy(
                 kafka_proxy=None,
-                core_topic=self.core_topic,
+                adapter_topic=self.adapter_topic,
                 my_listening_topic=self.listening_topic)
 
             self.adapter = BrcmOpenomciOnuAdapter(

python/requirements.txt

diff --git a/python/requirements.txt b/python/requirements.txt
index 1df4f3e..3811746 100644
--- a/python/requirements.txt
+++ b/python/requirements.txt
@@ -1,2 +1,2 @@
 voltha-protos==3.3.2
-pyvoltha==2.4.3
+pyvoltha==2.4.5