diff options
| author |   SerenaFeng <feng.xiaowei@zte.com.cn> | 2016-09-01 10:19:58 +0800 |
|---|---|---|
| committer | SerenaFeng <feng.xiaowei@zte.com.cn> | 2016-09-01 16:44:18 +0800 |
| commit | 470f573a3ac2eb1783efec6da01a3bee33360c65 (patch) | |
| tree | 859f4bbd7afc35ce2a8ca33b0bc570f7f32c5724 /testcases/security_scan | |
| parent | c94a1c01e46b21f0139a8b1419f26c8b9f867a41 (diff) | |
stop hardcoded FUNCTEST_REPO path everywhere
functest repo is used by almost every testcase, each place we get it like:
REPOS_DIR = os.getenv('repos_dir')
FUNCTEST_REPO = ("%s/functest" % REPOS_DIR)
provide a common interface in functest_util.py
JIRA: FUNCTEST-453
Change-Id: Ie0635dacc761ed2d05b7e606530368844f32ebaf
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
Diffstat (limited to 'testcases/security_scan')
| -rwxr-xr-x | testcases/security_scan/security_scan.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/testcases/security_scan/security_scan.py b/testcases/security_scan/security_scan.py index 36b795431..7b9250215 100755 --- a/testcases/security_scan/security_scan.py +++ b/testcases/security_scan/security_scan.py @@ -12,17 +12,19 @@ # nominated node. Post scan a report is downloaded and if '--clean' is passed # all trace of the scan is removed from the remote system. -import argparse -import connect import datetime import os import sys - from ConfigParser import SafeConfigParser -from keystoneclient.auth.identity import v2 + +import argparse +from functest.utils.functest_utils import FUNCTEST_REPO as FUNCTEST_REPO from keystoneclient import session +from keystoneclient.auth.identity import v2 from novaclient import client +import connect + __version__ = 0.1 __author__ = 'Luke Hinds (lhinds@redhat.com)' __url__ = 'https://wiki.opnfv.org/display/functest/Functest+Security' @@ -30,7 +32,7 @@ __url__ = 'https://wiki.opnfv.org/display/functest/Functest+Security' # Global vars INSTALLER_IP = os.getenv('INSTALLER_IP') oscapbin = 'sudo /bin/oscap' -functest_dir = '/home/opnfv/repos/functest/testcases/security_scan/' +functest_dir = '%s/testcases/security_scan/' % FUNCTEST_REPO # Apex Spefic var needed to query Undercloud if os.getenv('OS_AUTH_URL') is None: |