diff options
| author |   SerenaFeng <feng.xiaowei@zte.com.cn> | 2016-09-07 09:14:27 +0800 |
|---|---|---|
| committer | SerenaFeng <feng.xiaowei@zte.com.cn> | 2016-09-07 20:47:51 +0800 |
| commit | f3381f49cc72fded67c1febe78b27e18ec396878 (patch) | |
| tree | e6c7558efe3b08575c4589b2a46ef62e5d22d63f /cli | |
| parent | 44364e6db1941410632e6ab732e72bcc718a86da (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 'cli')
| -rw-r--r-- | cli/commands/cli_env.py | 5 | ||||
| -rw-r--r-- | cli/commands/cli_os.py | 4 | ||||
| -rw-r--r-- | cli/commands/cli_testcase.py | 3 | ||||
| -rw-r--r-- | cli/commands/cli_tier.py | 3 |
4 files changed, 9 insertions, 6 deletions
diff --git a/cli/commands/cli_env.py b/cli/commands/cli_env.py index 0f5ef2c6..57201264 100644 --- a/cli/commands/cli_env.py +++ b/cli/commands/cli_env.py @@ -7,14 +7,15 @@ # http://www.apache.org/licenses/LICENSE-2.0 # +import os + import click import git -import os import functest.utils.functest_utils as ft_utils -from functest.utils.functest_utils import FUNCTEST_REPO as FUNCTEST_REPO ENV_FILE = "/home/opnfv/functest/conf/env_active" +FUNCTEST_REPO = ft_utils.FUNCTEST_REPO class CliEnv: diff --git a/cli/commands/cli_os.py b/cli/commands/cli_os.py index d38dc9e6..fc027d5f 100644 --- a/cli/commands/cli_os.py +++ b/cli/commands/cli_os.py @@ -11,10 +11,10 @@ import os import click + import functest.utils.functest_utils as ft_utils import functest.utils.openstack_clean as os_clean import functest.utils.openstack_snapshot as os_snapshot -from functest.utils.functest_utils import FUNCTEST_REPO as FUNCTEST_REPO functest_yaml = ft_utils.get_functest_yaml() @@ -80,7 +80,7 @@ class CliOpenStack: def check(self): self.ping_endpoint() - cmd = FUNCTEST_REPO + "/ci/check_os.sh" + cmd = ft_utils.FUNCTEST_REPO + "/ci/check_os.sh" ft_utils.execute_command(cmd, verbose=False) def snapshot_create(self): diff --git a/cli/commands/cli_testcase.py b/cli/commands/cli_testcase.py index 68f9ed61..5cfe9988 100644 --- a/cli/commands/cli_testcase.py +++ b/cli/commands/cli_testcase.py @@ -12,16 +12,17 @@ import os import click + import functest.ci.tier_builder as tb import functest.utils.functest_utils as ft_utils import functest.utils.functest_vacation as vacation -from functest.utils.functest_utils import FUNCTEST_REPO as FUNCTEST_REPO functest_yaml = ft_utils.get_functest_yaml() FUNCTEST_CONF_DIR = functest_yaml.get("general").get( "directories").get("dir_functest_conf") ENV_FILE = FUNCTEST_CONF_DIR + "/env_active" +FUNCTEST_REPO = ft_utils.FUNCTEST_REPO class CliTestcase: diff --git a/cli/commands/cli_tier.py b/cli/commands/cli_tier.py index 31424689..ee45d843 100644 --- a/cli/commands/cli_tier.py +++ b/cli/commands/cli_tier.py @@ -12,15 +12,16 @@ import os import click + import functest.ci.tier_builder as tb import functest.utils.functest_utils as ft_utils -from functest.utils.functest_utils import FUNCTEST_REPO as FUNCTEST_REPO functest_yaml = ft_utils.get_functest_yaml() FUNCTEST_CONF_DIR = functest_yaml.get("general").get( "directories").get("dir_functest_conf") ENV_FILE = FUNCTEST_CONF_DIR + "/env_active" +FUNCTEST_REPO = ft_utils.FUNCTEST_REPO class CliTier: |