Add cluster test config file.
One can modify the test iterations directly here.
Allow for minimum heap size configuration with 'M' or megabyte suffix for onos jvm heap.
Change-Id: I9da9c3a3799c4543512a9cf3ea3f309496df7e80
diff --git a/src/test/cluster/clusterTest.json b/src/test/cluster/clusterTest.json
new file mode 100644
index 0000000..4780b62
--- /dev/null
+++ b/src/test/cluster/clusterTest.json
@@ -0,0 +1,5 @@
+{
+ "V_INF1" : "veth0",
+ "TLS_TIMEOUT" : 100,
+ "ITERATIONS" : 10
+}
diff --git a/src/test/cluster/clusterTest.py b/src/test/cluster/clusterTest.py
index af05873..6d27955 100644
--- a/src/test/cluster/clusterTest.py
+++ b/src/test/cluster/clusterTest.py
@@ -34,6 +34,7 @@
from ACL import ACLTest
from OnosLog import OnosLog
from CordLogger import CordLogger
+from CordTestConfig import setup_module
import os
import json
import random
@@ -63,7 +64,7 @@
subscriber = cluster_subscriber()
testcaseLoggers = ('test_cluster_controller_restarts', 'test_cluster_graceful_controller_restarts',
'test_cluster_single_controller_restarts', 'test_cluster_restarts')
- iterations = int(os.getenv('ITERATIONS', 10))
+ ITERATIONS = int(os.getenv('ITERATIONS', 10))
def setUp(self):
if self._testMethodName not in self.testcaseLoggers:
@@ -402,7 +403,7 @@
return controller
next_controller = None
- tries = self.iterations
+ tries = self.ITERATIONS
for num in range(tries):
index = num % ctlr_len
#index = random.randrange(0, ctlr_len)
@@ -491,7 +492,7 @@
return controller
- tries = self.iterations
+ tries = self.ITERATIONS
#chose a random controller for shutdown/restarts
controller = controllers[random.randrange(0, ctlr_len)]
controller_name = onos_map[controller]
@@ -570,7 +571,7 @@
iteration = 'FAILED')
assert_equal(len(ips), len(controllers))
- tries = self.iterations
+ tries = self.ITERATIONS
for num in range(tries):
log.info('ITERATION: %d. Restarting cluster with controllers at %s' %(num+1, controllers))
try: