commit bb3317d853434ebafbd8c88f771841ae5ea68115
author Matteo Scandolo <matteo.scandolo@gmail.com> Tue Mar 31 10:49:42 2020 -0700
committer Matteo Scandolo <matteo.scandolo@gmail.com> Tue Apr 07 07:42:30 2020 -0700
tree 90cc2b971708bb180d4ccf6f76e25592e394bd46
parent dfd5e80f402f2f5451e82272dc234bfce4f37b27

[VOL-2833]  Reporting total number of instances and current adapter instance during Adapter Registration (needs VOL-2834)

Change-Id: I322065b9e01925a9fd30a38e7f24bf7082ce39a0

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 b7867bb..54161ec 100755
--- a/python/adapters/brcm_openomci_onu/main.py
+++ b/python/adapters/brcm_openomci_onu/main.py
@@ -59,7 +59,7 @@
     container_name_regex=os.environ.get('CONTAINER_NUMBER_EXTRACTOR', '^.*\.(['
                                                                       '0-9]+)\..*$'),
     consul=os.environ.get('CONSUL', 'localhost:8500'),
-    name=os.environ.get('NAME', 'openonu'),
+    name=os.environ.get('NAME', 'brcm_openomci_onu'),
     vendor=os.environ.get('VENDOR', 'Voltha Project'),
     device_type=os.environ.get('DEVICE_TYPE', 'openonu'),
     accept_bulk_flow=os.environ.get('ACCEPT_BULK_FLOW', True),
@@ -76,6 +76,8 @@
     heartbeat_topic=os.environ.get('HEARTBEAT_TOPIC', "adapters.heartbeat"),
     probe=os.environ.get('PROBE', ':8080'),
     log_level=os.environ.get('LOG_LEVEL', 'WARN'),
+    current_replica=1,
+    total_replicas=1,
     component_name=os.environ.get('COMPONENT_NAME', "adapter-open-onu")
 )
 
@@ -107,6 +109,7 @@
                         default=defs['consul'],
                         help=_help)
 
+    # NOTE this is really the adapter type
     _help = 'name of this adapter (default: %s)' % defs['name']
     parser.add_argument('-na', '--name',
                         dest='name',
@@ -248,6 +251,20 @@
         default=defs['probe'],
         help=_help)
 
+    _help = 'Replica number of this particular instance (default: %s)' % defs['current_replica']
+    parser.add_argument(
+        '--currentReplica', dest='current_replica', action='store',
+        default=defs['current_replica'],
+        type=int,
+        help=_help)
+
+    _help = 'Total number of instances for this adapter (default: %s)' % defs['total_replicas']
+    parser.add_argument(
+        '--totalReplicas', dest='total_replicas', action='store',
+        default=defs['total_replicas'],
+        type=int,
+        help=_help)
+
     args = parser.parse_args()
 
     # post-processing
@@ -342,7 +359,8 @@
 
         self.core_topic = str(args.core_topic)
         self.event_topic = str(args.event_topic)
-        self.listening_topic = str(args.name)
+        self.listening_topic = "%s_%s" % (args.name, args.current_replica)
+        self.id = "%s_%s" % (args.name, args.current_replica)
         self.startup_components()
 
         if not args.no_heartbeat:
@@ -400,9 +418,15 @@
                 my_listening_topic=self.listening_topic)
 
             self.adapter = BrcmOpenomciOnuAdapter(
-                core_proxy=self.core_proxy, adapter_proxy=self.adapter_proxy,
+                id=self.id,
+                core_proxy=self.core_proxy,
+                adapter_proxy=self.adapter_proxy,
                 config=config,
-                build_info=self.build_info)
+                build_info=self.build_info,
+                current_replica=self.args.current_replica,
+                total_replicas=self.args.total_replicas,
+                endpoint=self.listening_topic
+            )
 
             self.adapter.start()
 
@@ -415,7 +439,7 @@
                     kafka_host_port=self.args.kafka_adapter,
                     # TODO: Add KV Store object reference
                     kv_store=self.args.backend,
-                    default_topic=self.args.name,
+                    default_topic=self.listening_topic,
                     group_id_prefix=self.args.instance_id,
                     target_cls=openonu_request_handler
                 )