x
/
fuel-ccp
Code Issues Proposed changes

Merge "Change options for action status command"

This commit is contained in:
Jenkins 2017-02-15 10:32:18 +00:00 committed by Gerrit Code Review
parent ab916c8ab0 ad0f7e0019
commit 6e39888989
2 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fuel_ccp/action.py
View File

@ -303,3 +303,17 @@ def get_action_status_by_name(action_name):
return action
raise exceptions.NotFoundException("Action with name \"%s\" not found" % (
action_name))
def get_action_statuses_by_names(action_names):
action_names = set(action_names)
actions = []
for action in list_action_status():
if action.name in action_names:
action_names.remove(action.name)
actions.append(action)
if action_names:
raise exceptions.NotFoundException(
"Action(s) with name(s) %s not found" % (
", ".join(action_names)))
return actions

32
fuel_ccp/cli.py
View File

@ -321,17 +321,17 @@ class ActionStatus(BaseCommand, lister.Lister):
def get_parser(self, *args, **kwargs):
parser = super(ActionStatus, self).get_parser(*args, **kwargs)
parser.add_argument("action",
nargs="?",
nargs='*',
help="Show action status")
return parser
def take_action(self, parsed_args):
self._fetch_repos()
return (
ACTION_FIELDS,
((a.name, a.component, a.date, a.status, a.restarts)
for a in action.list_action_status(parsed_args.action))
)
if not parsed_args.action:
return get_statuses_for_actions(action.list_action_status())
else:
return get_statuses_for_actions(
action.get_action_statuses_by_names(parsed_args.action))
class ActionRun(BaseCommand, show.ShowOne):
@ -348,10 +348,22 @@ class ActionRun(BaseCommand, show.ShowOne):
config.load_component_defaults()
action_name = action.run_action(parsed_args.action)
action_obj = action.get_action_status_by_name(action_name)
return (
ACTION_FIELDS,
(action_obj.name, action_obj.component, action_obj.date,
action_obj.status, action_obj.restarts))
return get_status_for_single_action(action_obj)
def get_status_for_single_action(action_obj):
return (
ACTION_FIELDS,
(action_obj.name, action_obj.component, action_obj.date,
action_obj.status, action_obj.restarts))
def get_statuses_for_actions(action_objects):
return (
ACTION_FIELDS,
((a.name, a.component, a.date, a.status, a.restarts)
for a in action_objects)
)
def signal_handler(signo, frame):