From 436655c030021a3f52e085c64090429440fdcdee Mon Sep 17 00:00:00 2001 From: Andrey Pavlov Date: Sun, 29 Jan 2017 13:06:41 +0000 Subject: [PATCH] Remove -l param from ccp status command There's no additional information provided with -l param, so it can be removed. Also "no cluster" message changed to "not deployed". Change-Id: Id0f3cf4b873eb3d5d9e59ed5f7d6fd6fec947887 --- fuel_ccp/cli.py | 11 +++-------- fuel_ccp/status.py | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/fuel_ccp/cli.py b/fuel_ccp/cli.py index da19c330..224ec405 100644 --- a/fuel_ccp/cli.py +++ b/fuel_ccp/cli.py @@ -198,22 +198,17 @@ class ShowStatus(lister.Lister): parser = super(ShowStatus, self).get_parser(*args, **kwargs) parser.set_defaults(**CONF.action._dict) - parser.add_argument("-l", "--long", - action="store_true", - help="show all components status") parser.add_argument("-s", "--short", action="store_true", - help="show cluster status (ready or not)") + help="show only state (ok/wip/not deployed)") parser.add_argument("components", nargs="*", - help="CCP conponents to show status") + help="CCP components to show status") return parser def take_action(self, parsed_args): config.load_component_defaults() - if parsed_args.long: - return status.show_long_status() - elif parsed_args.short: + if parsed_args.short: return status.show_short_status(parsed_args.components) else: return status.show_long_status(parsed_args.components) diff --git a/fuel_ccp/status.py b/fuel_ccp/status.py index 8924ecf8..a2b29723 100644 --- a/fuel_ccp/status.py +++ b/fuel_ccp/status.py @@ -107,7 +107,7 @@ def show_long_status(components=None): def show_short_status(components=None): states = get_pod_states(components) if not states: - status = "no cluster" + status = "not deployed" else: status = ST_OK if all(map(is_app_ready, states.values())) else ST_WIP return ("status",), ((status,),)