commit 5968e0d836887f5dfcaa01c2d838ca97c4292bbd
author A.R Karthick <kramanar@ciena.com> Tue May 16 14:50:46 2017 -0700
committer A.R Karthick <kramanar@ciena.com> Tue May 16 14:50:46 2017 -0700
tree 57407f795dcc9fb1dd8fbcb2feac13fe535ccabe
parent 008f38e4a8432c5c143dee3ab11aae75979007ec

Accept olt_config file as a separate argument to cord-tester or to manifest.
Change all tests to use OLT_CONFIG_FILE environment as appropriate.
Add a manifest file for voltha scenario that can test AAA/TLS with voltha and access side ONOS.

Change-Id: I6af70cd38d9b14187790dea7011839b8ba614432

src/test/utils/Cluster.py

diff --git a/src/test/utils/Cluster.py b/src/test/utils/Cluster.py
index 5e248ec..75dd270 100644
--- a/src/test/utils/Cluster.py
+++ b/src/test/utils/Cluster.py
@@ -59,7 +59,7 @@
     PORT_RX_DEFAULT = 1
     max_packets = 100
     app = 'org.opencord.igmp'
-    olt_conf_file = os.path.join(os.path.dirname(os.path.realpath(__file__)), '../setup/olt_config.json')
+    olt_conf_file = os.getenv('OLT_CONFIG_FILE', os.path.join(os.path.dirname(os.path.realpath(__file__)), '../setup/olt_config.json'))
     ROVER_TEST_TIMEOUT = 300 #3600*86
     ROVER_TIMEOUT = (ROVER_TEST_TIMEOUT - 100)
     ROVER_JOIN_TIMEOUT = 60
@@ -444,7 +444,7 @@
     MAX_PORTS = 100
     hosts_list = [ ('192.168.10.1', '00:00:00:00:00:01'), ('192.168.11.1', '00:00:00:00:02:01'), ]
 
-    olt_conf_file = os.path.join(os.path.dirname(os.path.realpath(__file__)), '../setup/olt_config.json')
+    olt_conf_file = os.getenv('OLT_CONFIG_FILE', os.path.join(os.path.dirname(os.path.realpath(__file__)), '../setup/olt_config.json'))
 
     @classmethod
     def setUpClass(cls):
@@ -1174,7 +1174,7 @@
     host_ip_map = {}
     test_path = os.path.dirname(os.path.realpath(__file__))
     dhcp_data_dir = os.path.join(test_path, '..', 'setup')
-    olt_conf_file = os.path.join(test_path, '..', 'setup/olt_config.json')
+    olt_conf_file = os.getenv('OLT_CONFIG_FILE', os.path.join(test_path, '..', 'setup/olt_config.json'))
     default_config = { 'default-lease-time' : 600, 'max-lease-time' : 7200, }
     default_options = [ ('subnet-mask', '255.255.255.0'),
                      ('broadcast-address', '192.168.1.255'),
@@ -1618,7 +1618,7 @@
       table_app_file = os.path.join(test_path, '..', 'apps/ciena-cordigmp-multitable-2.0-SNAPSHOT.oar')
       app_file = os.path.join(test_path, '..', 'apps/ciena-cordigmp-2.0-SNAPSHOT.oar')
       onos_config_path = os.path.join(test_path, '..', 'setup/onos-config')
-      olt_conf_file = os.path.join(test_path, '..', 'setup/olt_config.json')
+      olt_conf_file = os.getenv('OLT_CONFIG_FILE', os.path.join(test_path, '..', 'setup/olt_config.json'))
       cpqd_path = os.path.join(test_path, '..', 'setup')
       ovs_path = cpqd_path
       test_services = ('IGMP', 'TRAFFIC')