Changes to ONOS cluster tests.
Wait for sometime before ONOS restart.
Handle leaders command exception in the cluster restart test before failing the test.
Change-Id: If8afbef1e09657619e7230ddadd818a7598442d7
diff --git a/src/test/utils/CordTestServer.py b/src/test/utils/CordTestServer.py
index 4f097b0..e529219 100644
--- a/src/test/utils/CordTestServer.py
+++ b/src/test/utils/CordTestServer.py
@@ -35,7 +35,7 @@
onos_cord = None
- def __restart_onos(self, node = None, config = None):
+ def __restart_onos(self, node = None, config = None, timeout = 10):
if self.onos_cord:
onos_config = '{}/network-cfg.json'.format(OnosCord.onos_config_dir)
else:
@@ -49,7 +49,7 @@
if self.onos_cord:
self.onos_cord.start(restart = True, network_cfg = config)
else:
- Onos.restart_node(node = node, network_cfg = config)
+ Onos.restart_node(node = node, network_cfg = config, timeout = timeout)
return 'DONE'
def restart_onos(self, kwargs):
@@ -194,9 +194,9 @@
return rpc_server_instance().restart_onos(kwargs)
@nottest
-def cord_test_onos_restart(node = None, config = None):
+def cord_test_onos_restart(node = None, config = None, timeout = 10):
'''Send ONOS restart to server'''
- data = __cord_test_onos_restart(node = node, config = config)
+ data = __cord_test_onos_restart(node = node, config = config, timeout = timeout)
if data == 'DONE':
return True
return False