From a9b57aafb7a32af4a6ec1a892542f22e817b5b20 Mon Sep 17 00:00:00 2001 From: adrian-turjak Date: Mon, 29 May 2017 11:55:35 +1200 Subject: [PATCH] Properly handle empty values for show task. * added getattr for getting values in the _show_task function Change-Id: I4619c7d9989894fe32fdfe310d18a26b2f80c80c --- adjutantclient/osc/v1/tasks.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/adjutantclient/osc/v1/tasks.py b/adjutantclient/osc/v1/tasks.py index e23e550..8973957 100644 --- a/adjutantclient/osc/v1/tasks.py +++ b/adjutantclient/osc/v1/tasks.py @@ -26,13 +26,14 @@ LOG = logging.getLogger(__name__) def _show_task(task_id, client, formatter): task = client.tasks.get(task_id) if formatter == 'table': - task._info['actions'] = json.dumps(task.actions, indent=2) - task._info['keystone_user'] = json.dumps(task.keystone_user, - indent=2) - task._info['action_notes'] = json.dumps(task.action_notes, - indent=2) - task._info['approved_by'] = json.dumps(task.approved_by, - indent=2) + task._info['actions'] = json.dumps( + getattr(task, 'actions', ""), indent=2) + task._info['keystone_user'] = json.dumps( + getattr(task, 'keystone_user', ""), indent=2) + task._info['action_notes'] = json.dumps( + getattr(task, 'action_notes', ""), indent=2) + task._info['approved_by'] = json.dumps( + getattr(task, 'approved_by', ""), indent=2) return zip(*six.iteritems(task.to_dict()))