diff options
Diffstat (limited to 'functest/cli/commands/cli_env.py')
| -rw-r--r-- | functest/cli/commands/cli_env.py | 39 |
1 files changed, 14 insertions, 25 deletions
diff --git a/functest/cli/commands/cli_env.py b/functest/cli/commands/cli_env.py index f5ba4b34..ce977572 100644 --- a/functest/cli/commands/cli_env.py +++ b/functest/cli/commands/cli_env.py @@ -8,9 +8,10 @@ # import os +import pkg_resources import click -import git +import prettytable from functest.utils.constants import CONST import functest.utils.functest_utils as ft_utils @@ -35,8 +36,8 @@ class CliEnv(object): else: answer = raw_input("Invalid answer. Please type [y|n]\n") - cmd = ("python %s/functest/ci/prepare_env.py start" % - CONST.__getattribute__('dir_repo_functest')) + cmd = ("python %s start" % pkg_resources.resource_filename( + 'functest', 'ci/prepare_env.py')) ft_utils.execute_command(cmd) def show(self): @@ -48,14 +49,6 @@ class CliEnv(object): installer_info = ("%s, %s" % (install_type, installer_ip)) scenario = _get_value(CONST.__getattribute__('DEPLOY_SCENARIO')) node = _get_value(CONST.__getattribute__('NODE_NAME')) - repo_h = git.Repo(CONST.__getattribute__('dir_repo_functest')).head - if repo_h.is_detached: - git_branch = 'detached from FETCH_HEAD' - git_hash = repo_h.commit.hexsha - else: - branch = repo_h.reference - git_branch = branch.name - git_hash = branch.commit.hexsha is_debug = _get_value(CONST.__getattribute__('CI_DEBUG'), 'false') build_tag = CONST.__getattribute__('BUILD_TAG') if build_tag is not None: @@ -66,21 +59,17 @@ class CliEnv(object): if self.status(verbose=False) == 0: STATUS = "ready" - click.echo("+======================================================+") - click.echo("| Functest Environment info |") - click.echo("+======================================================+") - click.echo("| INSTALLER: %s|" % installer_info.ljust(41)) - click.echo("| SCENARIO: %s|" % scenario.ljust(41)) - click.echo("| POD: %s|" % node.ljust(41)) - click.echo("| GIT BRACNH: %s|" % git_branch.ljust(41)) - click.echo("| GIT HASH: %s|" % git_hash.ljust(41)) + msg = prettytable.PrettyTable( + header_style='upper', padding_width=5, + field_names=['Functest Environment', 'value']) + msg.add_row(['INSTALLER', installer_info]) + msg.add_row(['SCENARIO', scenario]) + msg.add_row(['POD', node]) if build_tag: - click.echo("| BUILD TAG: %s|" % build_tag.ljust(41)) - click.echo("| DEBUG FLAG: %s|" % is_debug.ljust(41)) - click.echo("+------------------------------------------------------+") - click.echo("| STATUS: %s|" % STATUS.ljust(41)) - click.echo("+------------------------------------------------------+") - click.echo("") + msg.add_row(['BUILD TAG', build_tag]) + msg.add_row(['DEBUG FLAG', is_debug]) + msg.add_row(['STATUS', STATUS]) + click.echo(msg.get_string()) def status(self, verbose=True): ret_val = 0 |