aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuke Hinds <lukehinds@gmail.com>2016-07-04 19:29:34 +0100
committerJose Lausuch <jose.lausuch@ericsson.com>2016-07-05 10:07:17 +0000
commitd06192797130151a119d8854479eba01bbe52cce (patch)
tree2eebdd27cd2fa162a4988e385e27f30629ac7566
parent13fe51d15d96b477c67b44876b89e0405fb1b2b5 (diff)
Fix incorrect path for createfiles.py and amended hiera path
JIRA: FUNCTEST-350 Change-Id: I29cdd2e6783fb659a673346d3033b1b2e7b3461b Signed-off-by: Luke Hinds <lukehinds@gmail.com>
-rw-r--r--testcases/security_scan/security_scan.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/testcases/security_scan/security_scan.py b/testcases/security_scan/security_scan.py
index 5910331a..d39c2905 100644
--- a/testcases/security_scan/security_scan.py
+++ b/testcases/security_scan/security_scan.py
@@ -30,6 +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/'
# Apex Spefic var needed to query Undercloud
if os.getenv('OS_AUTH_URL') is None:
@@ -56,7 +57,7 @@ setup.getockey()
# Configure Nova Credentials
-com = 'sudo hiera admin_password'
+com = 'sudo /usr/bin/hiera admin_password'
setup = connect.SetUp(com)
keypass = setup.keystonepass()
auth = v2.Password(auth_url=OS_AUTH_URL,
@@ -108,7 +109,7 @@ def nova_iterate():
def createfiles(host, port, user, localkey):
import connect
global tmpdir
- localpath = os.getcwd() + '/scripts/createfiles.py'
+ localpath = functest_dir + 'scripts/createfiles.py'
remotepath = '/tmp/createfiles.py'
com = 'python /tmp/createfiles.py'
connect = connect.ConnectionManager(host, port, user, localkey,