Robot test case for cluster controller restart tests.
Also increase polling retries for the lldp flows during onos boot.
Change-Id: Icf16f935addc394f43dd8fe2b223543ca3043e80
diff --git a/src/test/setup/cord-test.py b/src/test/setup/cord-test.py
index 252216d..4f76d43 100755
--- a/src/test/setup/cord-test.py
+++ b/src/test/setup/cord-test.py
@@ -117,7 +117,7 @@
status = 1
## Wait for the LLDP flows to be added to the switch
tries = 0
- while status != 0 and tries < 200:
+ while status != 0 and tries < 500:
cmd = 'sudo ovs-ofctl dump-flows {0} | grep \"type=0x8942\"'.format(self.switch)
status = self.execute_switch(cmd, shell = True)
tries += 1
@@ -628,6 +628,8 @@
Onos.PREFIX = args.prefix
Onos.TAG = onos_cnt['tag']
cluster_mode = True if args.onos_instances > 1 else False
+ existing_list = [ c['Names'][0][1:] for c in Container.dckr.containers() if c['Image'] == args.onos ]
+ setup_cluster = False if len(existing_list) == args.onos_instances else True
onos = None
if onos_ip is None:
data_volume = '{}-data'.format(Onos.NAME) if args.shared_volume else None
@@ -647,7 +649,8 @@
data_volume = data_volume)
onos_instances.append(onos)
onos_ips.append(onos.ipaddr)
- Onos.setup_cluster(onos_instances)
+ if setup_cluster is True:
+ Onos.setup_cluster(onos_instances)
ctlr_addr = ','.join(onos_ips)
print('Onos IP %s' %ctlr_addr)