VOL-1054 Kubernetes Conversion and PonsimV2date Makefile with selective changes from the one from SIAB to allow compatibility with Helm Chart changes
Change Class and filenames according to best practices
Change preprovisionTest -> Preprovision
Change-Id: Ib15e34ad397d2307b5ba3890cc6e8b245e5e3004
diff --git a/tests/atests/common/auto_test.py b/tests/atests/common/auto_test.py
index d0bd327..8f1997e 100755
--- a/tests/atests/common/auto_test.py
+++ b/tests/atests/common/auto_test.py
@@ -23,15 +23,10 @@
import time
import argparse
import volthaMngr
-import preprovisioningTest
+import preprovisioning
DEFAULT_LOG_DIR = '/tmp/voltha_test_results'
-def runOnos():
- os.system('docker-compose -f compose/docker-compose-auth-test.yml'
- ' up -d onos freeradius' + ' > /dev/null 2>&1')
-
-
def dirInit(logDir=DEFAULT_LOG_DIR,
volthaDir=os.environ['VOLTHA_BASE']):
print(__file__)
@@ -47,9 +42,9 @@
# In future in order to keep the history of jobs, the run time should be
# added to the log directory name
# logDir += '_' + currentTime
-
+
os.system('mkdir -p ' + logDir + ' > /dev/null 2>&1')
- os.system('rm -rf %s/*' + logDir)
+ os.system('rm -rf %s/*' % logDir)
print('Start Provisioning Test at: %s\nRoot Directory: %s\n'
'VOLTHA Directory: %s\nLog Directory: %s' %
(currentTime, rootDir, volthaDir, logDir))
@@ -74,8 +69,6 @@
volthaMngr.voltha_Initialize(ROOT_DIR, VOLTHA_DIR, LOG_DIR)
- runOnos()
-
- preprovisioningTest.runTest('172.17.0.1', 50060, LOG_DIR)
+ preprovisioning.runTest('olt.voltha.svc', 50060, LOG_DIR)
time.sleep(5)