summaryrefslogtreecommitdiffstats
path: root/tests/functest/odl-sfc/prepare_odl_sfc.py
diff options
context:
space:
mode:
authorGeorge Paraskevopoulos <geopar@intracom-telecom.com>2016-12-13 11:27:36 +0200
committerGeorge Paraskevopoulos <geopar@intracom-telecom.com>2016-12-13 11:33:24 +0200
commit8b09f0ad06e5ae941fc497754cc5778fae9018de (patch)
treecac03d63b8b98805bbf001f41a81b35b11223149 /tests/functest/odl-sfc/prepare_odl_sfc.py
parentcf27d8c61ee456fdd05f5e7d558bb8fadbff2fdc (diff)
Introduce setup_scripts directory
JIRA: SFC-52 Move every setup script to a separate directory. Change-Id: I99ea937a04d7580c7e85220091fe0c32213c587e Signed-off-by: George Paraskevopoulos <geopar@intracom-telecom.com>
Diffstat (limited to 'tests/functest/odl-sfc/prepare_odl_sfc.py')
-rwxr-xr-xtests/functest/odl-sfc/prepare_odl_sfc.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/tests/functest/odl-sfc/prepare_odl_sfc.py b/tests/functest/odl-sfc/prepare_odl_sfc.py
index cdfc1dc8..c3162cba 100755
--- a/tests/functest/odl-sfc/prepare_odl_sfc.py
+++ b/tests/functest/odl-sfc/prepare_odl_sfc.py
@@ -29,10 +29,10 @@ except:
os.environ['ODL_SFC_LOG'] = "/home/opnfv/functest/results/odl-sfc.log"
os.environ['ODL_SFC_DIR'] = os.path.join(SFC_REPO_DIR,
"tests/functest/odl-sfc")
+SETUP_SCRIPTS_DIR = os.path.join(os.environ['ODL_SFC_DIR'], 'setup_scripts')
-command = os.environ['ODL_SFC_DIR'] + ("/server_presetup_CI.bash | "
- "tee -a ${ODL_SFC_LOG} "
- "1>/dev/null 2>&1")
+command = SETUP_SCRIPTS_DIR + ("/server_presetup_CI.bash | "
+ "tee -a ${ODL_SFC_LOG} 1>/dev/null 2>&1")
output = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE)
@@ -67,9 +67,8 @@ except:
output = stdout.readlines()
for ip in output:
- command = os.environ['ODL_SFC_DIR'] + ("/compute_presetup_CI.bash "
- "" + ip.rstrip() + "| tee -a "
- "${ODL_SFC_LOG} 1>/dev/null 2>&1")
+ command = SETUP_SCRIPTS_DIR + ("/compute_presetup_CI.bash " + ip.rstrip() +
+ "| tee -a ${ODL_SFC_LOG} 1>/dev/null 2>&1")
output = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE)