From 9c9e053f815a3fcbd036eef79e60cda19e4c4d8b Mon Sep 17 00:00:00 2001 From: yanyanhu Date: Mon, 5 Sep 2016 23:50:43 -0400 Subject: [PATCH] Fix receiver list Receiver list doesn't work for cluster_id of receiver could be None now. This patch fixes it. Change-Id: If0eb5af896d8482cb819597988b6ef0dc6e16e09 --- senlinclient/v1/receiver.py | 2 +- senlinclient/v1/shell.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/senlinclient/v1/receiver.py b/senlinclient/v1/receiver.py index 6fa2aca1..96e2d645 100644 --- a/senlinclient/v1/receiver.py +++ b/senlinclient/v1/receiver.py @@ -97,7 +97,7 @@ class ListReceiver(command.Lister): if not parsed_args.full_id: formatters = { 'id': lambda x: x[:8], - 'cluster_id': lambda x: x[:8], + 'cluster_id': lambda x: x[:8] if x else None, } return ( diff --git a/senlinclient/v1/shell.py b/senlinclient/v1/shell.py index ac995e9e..cfdf2bcc 100644 --- a/senlinclient/v1/shell.py +++ b/senlinclient/v1/shell.py @@ -1335,7 +1335,7 @@ def do_receiver_list(service, args): if not args.full_id: formatters = { 'id': lambda x: x.id[:8], - 'cluster_id': lambda x: x.cluster_id[:8], + 'cluster_id': lambda x: x.cluster_id[:8] if x.cluster_id else '-', } utils.print_list(receivers, fields, formatters=formatters, sortby_index=sortby_index)