aboutsummaryrefslogtreecommitdiffstats
path: root/cli
diff options
context:
space:
mode:
Diffstat (limited to 'cli')
-rw-r--r--cli/commands/cli_env.py5
-rw-r--r--cli/commands/cli_os.py13
-rw-r--r--cli/commands/cli_testcase.py8
-rw-r--r--cli/commands/cli_tier.py8
4 files changed, 17 insertions, 17 deletions
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..4324ae44d 100644
--- a/cli/commands/cli_os.py
+++ b/cli/commands/cli_os.py
@@ -11,18 +11,17 @@
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()
-FUNCTEST_CONF_DIR = functest_yaml.get("general").get(
- "directories").get("dir_functest_conf")
+FUNCTEST_CONF_DIR = \
+ ft_utils.get_functest_config('general.directories.dir_functest_conf')
RC_FILE = os.getenv('creds')
-OS_SNAPSHOT_FILE = ft_utils.get_parameter_from_yaml(
- "general.openstack.snapshot_file")
+OS_SNAPSHOT_FILE = \
+ ft_utils.get_functest_config("general.openstack.snapshot_file")
class CliOpenStack:
@@ -80,7 +79,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..510d740ba 100644
--- a/cli/commands/cli_testcase.py
+++ b/cli/commands/cli_testcase.py
@@ -12,16 +12,16 @@
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")
+FUNCTEST_CONF_DIR = \
+ ft_utils.get_functest_config('general.directories.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..aa0541981 100644
--- a/cli/commands/cli_tier.py
+++ b/cli/commands/cli_tier.py
@@ -12,15 +12,15 @@
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")
+FUNCTEST_CONF_DIR = \
+ ft_utils.get_functest_config('general.directories.dir_functest_conf')
ENV_FILE = FUNCTEST_CONF_DIR + "/env_active"
+FUNCTEST_REPO = ft_utils.FUNCTEST_REPO
class CliTier: