From 4698b20d9529cebc9a68cda9ef61f667f7190053 Mon Sep 17 00:00:00 2001 From: Linda Wang Date: Fri, 3 Mar 2017 07:54:37 +0000 Subject: Modify functest_dir to securityscanning repo path After the logic of security_scan called by functest is changed, the path of some functions needed when running security_scan.py is modified to the path where securityscanning project is located, that is "/home/opnfv/ repos/securityscanning" Change-Id: I7fee0c508f8ce67b0403556a15531c4fd9989c0d Signed-off-by: Linda Wang --- security_scan.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/security_scan.py b/security_scan.py index 6a0c562..2c171fc 100644 --- a/security_scan.py +++ b/security_scan.py @@ -30,7 +30,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/' +repo_dir = '/home/opnfv/repos/securityscanning/' # Apex Spefic var needed to query Undercloud if os.getenv('OS_AUTH_URL') is None: @@ -118,7 +118,7 @@ def internet_check(host, nodetype): import connect user = cfgparse.get(nodetype, 'user') port = cfgparse.get(nodetype, 'port') - localpath = functest_dir + 'scripts/internet_check.py' + localpath = repo_dir + 'scripts/internet_check.py' remotepath = '/tmp/internet_check.py' com = 'python /tmp/internet_check.py' testconnect = connect.ConnectionManager(host, port, user, localkey, @@ -136,7 +136,7 @@ def createfiles(host, port, user, localkey): """ import connect global tmpdir - localpath = functest_dir + 'scripts/createfiles.py' + localpath = repo_dir + 'scripts/createfiles.py' remotepath = '/tmp/createfiles.py' com = 'python /tmp/createfiles.py' connect = connect.ConnectionManager(host, port, user, localkey, -- cgit 1.2.3-korg