From b781e959ccd0034a468f53634bc5ccc934efc89d Mon Sep 17 00:00:00 2001 From: jonnary Date: Wed, 19 Oct 2016 05:22:51 -0700 Subject: [PATCH] Rework take_action function in class ListAction Rework take_action's "full_id" handling. Change-Id: Id8797f9dde0c77901e6fa39c0083e5cee6090894 --- senlinclient/v1/action.py | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/senlinclient/v1/action.py b/senlinclient/v1/action.py index 2f0bbfb..9622b61 100644 --- a/senlinclient/v1/action.py +++ b/senlinclient/v1/action.py @@ -86,19 +86,14 @@ class ListAction(command.Lister): actions = senlin_client.actions(**queries) formatters = {} - if parsed_args.full_id: - f_depon = lambda x: '\n'.join(a for a in x) - f_depby = lambda x: '\n'.join(a for a in x) + s = None + if not parsed_args.full_id: + s = 8 + formatters['id'] = lambda x: x[:s] + formatters['target_id'] = lambda x: x[:s] - formatters['depends_on'] = f_depon - formatters['depended_by'] = f_depby - else: - formatters['id'] = lambda x: x[:8] - formatters['target_id'] = lambda x: x[:8] - f_depon = lambda x: '\n'.join(a[:8] for a in x) - f_depby = lambda x: '\n'.join(a[:8] for a in x) - formatters['depends_on'] = f_depon - formatters['depended_by'] = f_depby + formatters['depends_on'] = lambda x: '\n'.join(a[:s] for a in x) + formatters['depended_by'] = lambda x: '\n'.join(a[:s] for a in x) return ( columns,