aboutsummaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests
diff options
context:
space:
mode:
authorJose Lausuch <jose.lausuch@ericsson.com>2016-11-10 16:37:08 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-11-10 16:37:08 +0000
commitd9cecf6576de1115252f78e78ff987f3a1ebb340 (patch)
treec5ee696425e950a516f3a0bbd4ff782bdafc0ea3 /functest/opnfv_tests
parent6dce2ff0b0bf7e5819eaca161b7e67f954479f1b (diff)
parentc23c513374db124ce4188f8db2367184569896d1 (diff)
Merge "Fix paths in SFC testcase configuration"
Diffstat (limited to 'functest/opnfv_tests')
-rwxr-xr-xfunctest/opnfv_tests/features/sfc/prepare_odl_sfc.py3
-rwxr-xr-xfunctest/opnfv_tests/features/sfc/sfc.py7
2 files changed, 5 insertions, 5 deletions
diff --git a/functest/opnfv_tests/features/sfc/prepare_odl_sfc.py b/functest/opnfv_tests/features/sfc/prepare_odl_sfc.py
index 3d700b8a..8ba287e9 100755
--- a/functest/opnfv_tests/features/sfc/prepare_odl_sfc.py
+++ b/functest/opnfv_tests/features/sfc/prepare_odl_sfc.py
@@ -33,7 +33,8 @@ except:
INSTALLER_IP = "10.20.0.2"
os.environ['ODL_SFC_LOG'] = "/home/opnfv/functest/results/odl-sfc.log"
-os.environ['ODL_SFC_DIR'] = FUNCTEST_REPO_DIR + "/opnfv_tests/features/sfc"
+os.environ['ODL_SFC_DIR'] = os.path.join(FUNCTEST_REPO_DIR,
+ "functest/opnfv_tests/features/sfc")
command = os.environ['ODL_SFC_DIR'] + ("/server_presetup_CI.bash | "
"tee -a ${ODL_SFC_LOG} "
diff --git a/functest/opnfv_tests/features/sfc/sfc.py b/functest/opnfv_tests/features/sfc/sfc.py
index 32cd2d25..5e3e37d7 100755
--- a/functest/opnfv_tests/features/sfc/sfc.py
+++ b/functest/opnfv_tests/features/sfc/sfc.py
@@ -25,8 +25,7 @@ logger = ft_logger.Logger("ODL_SFC").getLogger()
FUNCTEST_RESULTS_DIR = '/home/opnfv/functest/results/odl-sfc'
FUNCTEST_REPO = ft_utils.FUNCTEST_REPO
-REPO_PATH = os.environ['repos_dir'] + '/functest/'
-HOME = os.environ['HOME'] + "/"
+REPO_PATH = os.path.join(os.environ['repos_dir'], 'functest/')
CLIENT = "client"
SERVER = "server"
FLAVOR = "custom"
@@ -34,7 +33,7 @@ IMAGE_NAME = "sf_nsh_colorado"
IMAGE_FILENAME = "sf_nsh_colorado.qcow2"
IMAGE_FORMAT = "qcow2"
IMAGE_DIR = "/home/opnfv/functest/data"
-IMAGE_PATH = IMAGE_DIR + "/" + IMAGE_FILENAME
+IMAGE_PATH = os.path.join(IMAGE_DIR, IMAGE_FILENAME)
IMAGE_URL = "http://artifacts.opnfv.org/sfc/demo/" + IMAGE_FILENAME
# NEUTRON Private Network parameters
@@ -44,7 +43,7 @@ SUBNET_CIDR = "11.0.0.0/24"
ROUTER_NAME = "example-router"
SECGROUP_NAME = "example-sg"
SECGROUP_DESCR = "Example Security group"
-SFC_TEST_DIR = REPO_PATH + "/opnfv_tests/features/sfc/"
+SFC_TEST_DIR = os.path.join(REPO_PATH, "functest/opnfv_tests/features/sfc/")
TACKER_SCRIPT = SFC_TEST_DIR + "sfc_tacker.bash"
TACKER_CHANGECLASSI = SFC_TEST_DIR + "sfc_change_classi.bash"
ssh_options = '-q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no'