VOL-1532: BBSim OLT preprovisioning test case
VOL-1533: BBSim OLT/ONU Discovery
Fix issus with pod list no longer printing to console
Change-Id: I9309aee43306e8ca36d0b59e6942db51a929eca7
diff --git a/tests/atests/common/auto_test.py b/tests/atests/common/auto_test.py
index d93e7b5..6e21842 100755
--- a/tests/atests/common/auto_test.py
+++ b/tests/atests/common/auto_test.py
@@ -31,12 +31,20 @@
import logging
DEFAULT_LOG_DIR = '/tmp/voltha_test_results'
+DEFAULT_ADAPTER = 'ponsim'
logging.basicConfig(level=logging.INFO)
def dir_init(log_dir=DEFAULT_LOG_DIR, voltha_dir=os.environ['VOLTHA_BASE']):
- logging.info(__file__)
"""
+
+ :param log_dir: default log dir
+ :param voltha_dir: voltha base dir
+ :return: root_dir, voltha_dir, log_dir
+ """
+ logging.info(__file__)
+
+ """
Init automated testing environment and return three directories: root dir,
voltha sources dir and log dir
"""
@@ -58,6 +66,31 @@
return root_dir, voltha_dir, log_dir
+def adapter_init(adapter=DEFAULT_ADAPTER):
+ """
+
+ :param adapter: ponsim or bbsim
+ :return: olt_type, onu_type, olt_host_ip, onu_count
+ """
+ if adapter == 'ponsim':
+ olt_type = 'ponsim_olt'
+ onu_type = 'ponsim_onu'
+ olt_host_ip = 'olt.voltha.svc'
+ onu_count = 1
+ elif adapter == 'bbsim':
+ olt_type = 'openolt'
+ onu_type = 'brcm_openomci_onu'
+ olt_host_ip = 'bbsim.voltha.svc'
+ onu_count = 16
+ else:
+ olt_type = None
+ onu_type = None
+ olt_host_ip = None
+ onu_count = 0
+
+ return olt_type, onu_type, olt_host_ip, onu_count
+
+
#
# MAIN
#
@@ -69,20 +102,21 @@
parser = argparse.ArgumentParser(description='VOLTHA Automated Testing')
parser.add_argument('-l', dest='logDir', default=DEFAULT_LOG_DIR,
help='log directory (default: %s).' % DEFAULT_LOG_DIR)
+ parser.add_argument('-a', dest='adapter', choices=['ponsim', 'bbsim'], default=DEFAULT_ADAPTER,
+ help='adapter (default: %s).' % DEFAULT_ADAPTER)
args = parser.parse_args()
ROOT_DIR, VOLTHA_DIR, LOG_DIR = dir_init(args.logDir)
+ OLT_TYPE, ONU_TYPE, OLT_HOST_IP, ONU_COUNT = adapter_init(args.adapter)
- volthaMngr.voltha_initialize(ROOT_DIR, VOLTHA_DIR, LOG_DIR)
+ volthaMngr.voltha_initialize(ROOT_DIR, VOLTHA_DIR, LOG_DIR, args.adapter)
- preprovisioning.run_test('olt.voltha.svc', 50060, 'ponsim_olt', 'ponsim_onu', LOG_DIR)
-
- discovery.run_test('olt.voltha.svc', 'ponsim_olt', 'ponsim_onu', LOG_DIR)
+ preprovisioning.run_test(OLT_HOST_IP, 50060, OLT_TYPE, ONU_TYPE, ONU_COUNT, LOG_DIR)
+ time.sleep(60)
+ discovery.run_test(OLT_HOST_IP, OLT_TYPE, ONU_TYPE, ONU_COUNT, LOG_DIR)
+ if args.adapter == 'ponsim':
+ authentication.run_test(ROOT_DIR, VOLTHA_DIR, LOG_DIR)
- authentication.run_test(ROOT_DIR, VOLTHA_DIR, LOG_DIR)
+ dhcp.run_test(ROOT_DIR, VOLTHA_DIR, LOG_DIR)
- dhcp.run_test(ROOT_DIR, VOLTHA_DIR, LOG_DIR)
-
- unicast.run_test(ROOT_DIR, VOLTHA_DIR, LOG_DIR)
-
- time.sleep(5)
+ unicast.run_test(ONU_TYPE, ONU_COUNT, ROOT_DIR, VOLTHA_DIR, LOG_DIR)