diff options
author | SerenaFeng <feng.xiaowei@zte.com.cn> | 2016-09-07 09:14:27 +0800 |
---|---|---|
committer | Jose Lausuch <jose.lausuch@ericsson.com> | 2016-09-08 08:41:36 +0000 |
commit | 2679afde530042a2913a6d7aca5d3af3b524ac47 (patch) | |
tree | 147043ab332f0f1e978e370fae91c6b3a6650f5f /testcases/OpenStack/vPing/vping_util.py | |
parent | 921c2b17d33589801ae3de0521e965575dca91ad (diff) |
remove imported FUNCTEST_REPO object
According to openstack style guidelines in http://docs.openstack.org/developer/hacking/
**** Do not import objects, only modules (*) ****
so direct FUNCTEST_REPO import should be avoided
from functest.utils.functest_utils import FUNCTEST_REPO as FUNCTEST_REPO
JIRA: FUNCTEST-459
Change-Id: Iac0d07a54957cd7419391de183660ac1ce0efd49
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
Diffstat (limited to 'testcases/OpenStack/vPing/vping_util.py')
-rw-r--r-- | testcases/OpenStack/vPing/vping_util.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/testcases/OpenStack/vPing/vping_util.py b/testcases/OpenStack/vPing/vping_util.py index 7e7173aee..e85476e66 100644 --- a/testcases/OpenStack/vPing/vping_util.py +++ b/testcases/OpenStack/vPing/vping_util.py @@ -4,12 +4,13 @@ import re import sys 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 +import functest.utils.functest_utils as ft_utils +import functest.utils.openstack_utils as os_utils + +FUNCTEST_REPO = ft_utils.FUNCTEST_REPO functest_yaml = ft_utils.get_functest_yaml() NAME_VM_1 = functest_yaml.get("vping").get("vm_name_1") @@ -57,8 +58,8 @@ def pMsg(value): def check_repo_exist(): - if not os.path.exists(REPO_PATH): - logger.error("Functest repository not found '%s'" % REPO_PATH) + if not os.path.exists(FUNCTEST_REPO): + logger.error("Functest repository not found '%s'" % FUNCTEST_REPO) exit(-1) @@ -339,7 +340,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 = FUNCTEST_REPO + "/testcases/OpenStack/vPing/ping.sh" try: scp.put(ping_script, "~/") except: |