From b582e4a5be0bcc3521cc239a31f681a11f4504db Mon Sep 17 00:00:00 2001 From: SerenaFeng Date: Thu, 1 Sep 2016 10:19:58 +0800 Subject: 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 (cherry picked from commit 470f573a3ac2eb1783efec6da01a3bee33360c65) --- testcases/OpenStack/vPing/vping_util.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'testcases/OpenStack/vPing') diff --git a/testcases/OpenStack/vPing/vping_util.py b/testcases/OpenStack/vPing/vping_util.py index 8e9ce23ec..d3ca44139 100644 --- a/testcases/OpenStack/vPing/vping_util.py +++ b/testcases/OpenStack/vPing/vping_util.py @@ -7,10 +7,9 @@ import time import functest.utils.functest_utils as ft_utils import functest.utils.openstack_utils as os_utils import paramiko +from functest.utils.functest_utils import FUNCTEST_REPO as REPO_PATH from scp import SCPClient -REPO_PATH = os.environ['repos_dir'] + '/functest/' - functest_yaml = ft_utils.get_functest_yaml() NAME_VM_1 = functest_yaml.get("vping").get("vm_name_1") @@ -340,7 +339,7 @@ def transfer_ping_script(ssh, floatip): logger.info("Trying to transfer ping.sh to %s..." % floatip) scp = SCPClient(ssh.get_transport()) - ping_script = REPO_PATH + "testcases/OpenStack/vPing/ping.sh" + ping_script = REPO_PATH + '/' + "testcases/OpenStack/vPing/ping.sh" try: scp.put(ping_script, "~/") except: -- cgit 1.2.3-korg