From 2679afde530042a2913a6d7aca5d3af3b524ac47 Mon Sep 17 00:00:00 2001 From: SerenaFeng Date: Wed, 7 Sep 2016 09:14:27 +0800 Subject: 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 --- cli/commands/cli_env.py | 5 +++-- cli/commands/cli_os.py | 4 ++-- cli/commands/cli_testcase.py | 3 ++- cli/commands/cli_tier.py | 3 ++- 4 files changed, 9 insertions(+), 6 deletions(-) (limited to 'cli') diff --git a/cli/commands/cli_env.py b/cli/commands/cli_env.py index 0f5ef2c60..572012643 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 d38dc9e6a..fc027d5fe 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 68f9ed610..5cfe99881 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 314246890..ee45d8438 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: -- cgit 1.2.3-korg