Introduce: voltha_enable config to run tests with voltha environment enabled.
This is needed if one is running voltha externally and wants to run cord-tester from another node to test voltha.
(subscriber side pc to talk to olt connected voltha node)
Otherwise it defaults to enabled if voltha_loc is set (running locally with voltha).
Change-Id: I6956b6b20c3452e5acf7a00411ac1ff4a7eaf199
diff --git a/src/test/setup/cord-test.py b/src/test/setup/cord-test.py
index 4b8958c..d414735 100755
--- a/src/test/setup/cord-test.py
+++ b/src/test/setup/cord-test.py
@@ -726,7 +726,7 @@
'HEAD_NODE': head_node if head_node else CORD_TEST_HOST,
'MAAS_API_KEY': maas_api_key,
'KARAF_VERSION' : test_manifest.karaf_version,
- 'VOLTHA_ENABLED' : 1 if voltha_loc else 0
+ 'VOLTHA_ENABLED' : int(test_manifest.voltha_enable)
}
if ssh_key_file:
@@ -1016,7 +1016,7 @@
'HEAD_NODE': head_node if head_node else CORD_TEST_HOST,
'MAAS_API_KEY': maas_api_key,
'KARAF_VERSION' : test_manifest.karaf_version,
- 'VOLTHA_ENABLED' : 1 if voltha_loc else 0
+ 'VOLTHA_ENABLED' : int(test_manifest.voltha_enable)
}
if ssh_key_file:
@@ -1338,7 +1338,8 @@
help='Specify the voltha location in order to start voltha')
parser_run.add_argument('-voltha-intf', '--voltha-intf', default='eth0', type=str,
help='Specify the voltha interface for voltha to listen')
-
+ parser_run.add_argument('-voltha-enable', '--voltha-enable', action='store_true',
+ help='Run the tests with voltha environment enabled')
parser_run.set_defaults(func=runTest)
parser_setup = subparser.add_parser('setup', help='Setup cord tester environment')
@@ -1386,6 +1387,8 @@
help='Specify the voltha location in order to start voltha')
parser_setup.add_argument('-voltha-intf', '--voltha-intf', default='eth0', type=str,
help='Specify the voltha interface for voltha to listen')
+ parser_setup.add_argument('-voltha-enable', '--voltha-enable', action='store_true',
+ help='Run the tests with voltha environment enabled')
parser_setup.set_defaults(func=setupCordTester)
parser_xos = subparser.add_parser('xos', help='Building xos into cord tester environment')