Support to specify karaf_version in manifest and cord-test command line options for run and setup subcommands.
Fix cord-tester cluster bootup ONOS device connectivity and flow test verification specifically for the cluster instantiate.
Fix prerequisites to delay before verification of docker install.
Change-Id: Ide02adae4fd8224cf4d1e200f1153be901e794d6
diff --git a/src/test/utils/TestManifest.py b/src/test/utils/TestManifest.py
index b5ec2d4..143727c 100644
--- a/src/test/utils/TestManifest.py
+++ b/src/test/utils/TestManifest.py
@@ -48,6 +48,7 @@
self.iterations = None
self.server = args.server
self.jvm_heap_size = args.jvm_heap_size if args.jvm_heap_size else None
+ self.karaf_version = args.karaf
else:
with open(self.manifest, 'r') as fd:
data = json.load(fd)
@@ -72,3 +73,4 @@
self.server = data.get('test_server', '{}:{}'.format(CORD_TEST_HOST, CORD_TEST_PORT))
self.iterations = data.get('iterations', None)
self.jvm_heap_size = data.get('jvm_heap_size', None)
+ self.karaf_version = data.get('karaf_version', '3.0.5')