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/Controllers/ONOS/Teston | |
| 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/Controllers/ONOS/Teston')
| -rw-r--r-- | testcases/Controllers/ONOS/Teston/adapters/foundation.py | 4 | ||||
| -rwxr-xr-x | testcases/Controllers/ONOS/Teston/onosfunctest.py | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/testcases/Controllers/ONOS/Teston/adapters/foundation.py b/testcases/Controllers/ONOS/Teston/adapters/foundation.py index 3fae2a5d2..90eb14490 100644 --- a/testcases/Controllers/ONOS/Teston/adapters/foundation.py +++ b/testcases/Controllers/ONOS/Teston/adapters/foundation.py @@ -18,7 +18,7 @@ import re import time import yaml -from functest.utils.functest_utils import FUNCTEST_REPO as FUNCTEST_REPO +import functest.utils.functest_utils as ft_utils class foundation: @@ -26,7 +26,7 @@ class foundation: def __init__(self): # currentpath = os.getcwd() - REPO_PATH = FUNCTEST_REPO + '/' + REPO_PATH = ft_utils.FUNCTEST_REPO + '/' currentpath = REPO_PATH + 'testcases/Controllers/ONOS/Teston/CI' self.cipath = currentpath self.logdir = os.path.join(currentpath, 'log') diff --git a/testcases/Controllers/ONOS/Teston/onosfunctest.py b/testcases/Controllers/ONOS/Teston/onosfunctest.py index 01537b990..a5c225edc 100755 --- a/testcases/Controllers/ONOS/Teston/onosfunctest.py +++ b/testcases/Controllers/ONOS/Teston/onosfunctest.py @@ -20,11 +20,11 @@ import re import time import argparse +from neutronclient.v2_0 import client as neutronclient + import functest.utils.functest_logger as ft_logger import functest.utils.functest_utils as functest_utils import functest.utils.openstack_utils as openstack_utils -from functest.utils.functest_utils import FUNCTEST_REPO as REPO_PATH -from neutronclient.v2_0 import client as neutronclient parser = argparse.ArgumentParser() parser.add_argument("-t", "--testcase", help="Testcase name") @@ -55,8 +55,9 @@ GLANCE_IMAGE_FILENAME = functest_utils.get_parameter_from_yaml( "onos_sfc.image_file_name") GLANCE_IMAGE_PATH = functest_utils.get_parameter_from_yaml( "general.directories.dir_functest_data") + "/" + GLANCE_IMAGE_FILENAME -SFC_PATH = REPO_PATH + "/" + functest_utils.get_parameter_from_yaml( - "general.directories.dir_onos_sfc") +SFC_PATH = functest_utils.FUNCTEST_REPO + "/" + \ + functest_utils.get_parameter_from_yaml( + "general.directories.dir_onos_sfc") def RunScript(testname): |