diff options
| -rwxr-xr-x | ci/exec_test.sh | 4 | ||||
| -rw-r--r-- | testcases/security_scan/security_scan.py | 13 |
2 files changed, 13 insertions, 4 deletions
diff --git a/ci/exec_test.sh b/ci/exec_test.sh index 3af16495..04f38e6a 100755 --- a/ci/exec_test.sh +++ b/ci/exec_test.sh @@ -130,10 +130,12 @@ function run_test(){ ;; "ovno") # suite under rewritting for colorado - # no need to run anything until refactoring done + # no need to run anything until refactoring done # ${repos_dir}/ovno/Testcases/RunTests.sh ;; "security_scan") + echo "Sourcing Credentials ${FUNCTEST_CONF_DIR}/stackrc for security_scan test.." + source ${FUNCTEST_CONF_DIR}/stackrc python ${FUNCTEST_REPO_DIR}/testcases/security_scan/security_scan.py --config ${FUNCTEST_REPO_DIR}/testcases/security_scan/config.ini ;; *) diff --git a/testcases/security_scan/security_scan.py b/testcases/security_scan/security_scan.py index e6fc5a8c..7ed85b64 100644 --- a/testcases/security_scan/security_scan.py +++ b/testcases/security_scan/security_scan.py @@ -27,10 +27,17 @@ __author__ = 'Luke Hinds (lhinds@redhat.com)' __url__ = 'https://wiki.opnfv.org/display/functest/Functest+Security' # Global vars -INSTALLER_IP = os.getenv('INSTALLER_IP') oscapbin = 'sudo /bin/oscap' +INSTALLER_IP = os.getenv('INSTALLER_IP') + +# Apex Spefic var needed to query Undercloud +if os.getenv('OS_AUTH_URL') is None: + connect.logger.error(" Enviroment variable OS_AUTH_URL is not set") + sys.exit(0) +else: + OS_AUTH_URL = os.getenv('OS_AUTH_URL') -# args +# argparse parser = argparse.ArgumentParser(description='OPNFV OpenSCAP Scanner') parser.add_argument('--config', action='store', dest='cfgfile', help='Config file', required=True) @@ -51,7 +58,7 @@ setup.getockey() com = 'sudo hiera admin_password' setup = connect.SetUp(com) keypass = setup.keystonepass() -auth = v2.Password(auth_url='http://{0}:5000/v2.0'.format(INSTALLER_IP), +auth = v2.Password(auth_url='http://{0}:5000/v2.0'.format(OS_AUTH_URL), username='admin', password=str(keypass).rstrip(), tenant_name='admin') |