From e79cdb3060abd4605e8514e4eeafc4d0b2d62508 Mon Sep 17 00:00:00 2001 From: jonnary Date: Fri, 4 Nov 2016 17:59:06 +0800 Subject: [PATCH] Rework do_action_list function's "full_id" handling Rework do_action_list function's "full_id" handling. Change-Id: Ib6738e6a85d690ac5f57c24ddb0c1457619b6f5b --- senlinclient/v1/shell.py | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/senlinclient/v1/shell.py b/senlinclient/v1/shell.py index d8dab0c4..742b66d3 100644 --- a/senlinclient/v1/shell.py +++ b/senlinclient/v1/shell.py @@ -1521,19 +1521,15 @@ def do_action_list(service, args): actions = service.actions(**queries) formatters = {} - if args.full_id: - f_depon = lambda x: '\n'.join(a for a in x.depends_on) - f_depby = lambda x: '\n'.join(a for a in x.depended_by) + s = None + if not args.full_id: + s = 8 + formatters['id'] = lambda x: x.id[:s] + formatters['target_id'] = lambda x: x.target_id[:s] - formatters['depends_on'] = f_depon - formatters['depended_by'] = f_depby - else: - formatters['id'] = lambda x: x.id[:8] - formatters['target_id'] = lambda x: x.target_id[:8] - f_depon = lambda x: '\n'.join(a[:8] for a in x.depends_on) - f_depby = lambda x: '\n'.join(a[:8] for a in x.depended_by) - formatters['depends_on'] = f_depon - formatters['depended_by'] = f_depby + formatters['depends_on'] = lambda x: '\n'.join(a[:s] for a in x.depends_on) + formatters['depended_by'] = lambda x: '\n'.join(a[:s] for a in x. + depended_by) utils.print_list(actions, fields, formatters=formatters, sortby_index=sortby_index)