commit a2492c11a0d7603de90d7dcf8924f0c3ec5e9e07
author A R Karthick <kramanar@ciena.com> Fri Dec 16 10:31:51 2016 -0800
committer A R Karthick <kramanar@ciena.com> Fri Dec 16 10:31:51 2016 -0800
tree c3e4d554311f73181d6ec114ad59b7a39ea4455d
parent aa54a1ca0ef45592cf68d0ae03b01f9c8f3cfa8c

Max max instances for cord test cluster, a class attribute of Onos class instead of an object attribute.

Change-Id: I02e859dbb7156c208266372776f8a07724b810da

src/test/setup/cord-test.py

diff --git a/src/test/setup/cord-test.py b/src/test/setup/cord-test.py
index 6cb542c..485295c 100755
--- a/src/test/setup/cord-test.py
+++ b/src/test/setup/cord-test.py
@@ -409,6 +409,7 @@
             radius_ip = None
 
     Container.IMAGE_PREFIX = args.prefix
+    Onos.MAX_INSTANCES = args.onos_instances
     cluster_mode = True if args.onos_instances > 1 else False
     async_mode = cluster_mode and args.async_mode
     existing_list = [ c['Names'][0][1:] for c in Container.dckr.containers() if c['Image'] == args.onos ]
@@ -430,7 +431,7 @@
         data_volume = '{}-data'.format(Onos.NAME) if args.shared_volume else None
         onos = Onos(image = Onos.IMAGE,
                     tag = Onos.TAG, boot_delay = 60, cluster = cluster_mode,
-                    data_volume = data_volume, async = async_mode, max_instances = args.onos_instances)
+                    data_volume = data_volume, async = async_mode)
         if onos.running:
             onos_ip = onos.ipaddr
             onos_ips.append(onos_ip)
@@ -447,7 +448,7 @@
             quagga_config = Onos.get_quagga_config(i)
             onos = Onos(name = name, image = Onos.IMAGE, tag = Onos.TAG, boot_delay = 60, cluster = cluster_mode,
                         data_volume = data_volume, async = async_mode,
-                        quagga_config = quagga_config, max_instances = args.onos_instances)
+                        quagga_config = quagga_config)
             onos_instances.append(onos)
             if onos.running:
                 onos_ips.append(onos.ipaddr)
@@ -664,6 +665,7 @@
     Onos.IMAGE = onos_cnt['image']
     Onos.PREFIX = args.prefix
     Onos.TAG = onos_cnt['tag']
+    Onos.MAX_INSTANCES = args.onos_instances
     cluster_mode = True if args.onos_instances > 1 else False
     async_mode = cluster_mode and args.async_mode
     existing_list = [ c['Names'][0][1:] for c in Container.dckr.containers() if c['Image'] == args.onos ]
@@ -681,7 +683,7 @@
     if onos_ip is None:
         data_volume = '{}-data'.format(Onos.NAME) if args.shared_volume else None
         onos = Onos(image = Onos.IMAGE, tag = Onos.TAG, boot_delay = 60, cluster = cluster_mode,
-                    data_volume = data_volume, async = async_mode, max_instances = args.onos_instances)
+                    data_volume = data_volume, async = async_mode)
         if onos.running:
             onos_ip = onos.ipaddr
             onos_ips.append(onos_ip)
@@ -698,7 +700,7 @@
             quagga_config = Onos.get_quagga_config(i)
             onos = Onos(name = name, image = Onos.IMAGE, tag = Onos.TAG, boot_delay = 60, cluster = cluster_mode,
                         data_volume = data_volume, async = async_mode,
-                        quagga_config = quagga_config, max_instances = args.onos_instances)
+                        quagga_config = quagga_config)
             onos_instances.append(onos)
             if onos.running:
                 onos_ips.append(onos.ipaddr)