From 3ee70cf4e8c2d8505230f73ef0b6b44185567dc2 Mon Sep 17 00:00:00 2001 From: huangtianhua Date: Sat, 24 Dec 2016 11:28:35 +0800 Subject: Show 'project' info if heat server returns Show 'project'/'Project' info in heatclient if heat server returns 'project' info of stacks. Change-Id: I7d95ae96a678ef41bcd3d5379f204db83e4b585c Closes-Bug: #1652412 --- heatclient/osc/v1/stack.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'heatclient/osc') diff --git a/heatclient/osc/v1/stack.py b/heatclient/osc/v1/stack.py index cf03cec..4b04dff 100644 --- a/heatclient/osc/v1/stack.py +++ b/heatclient/osc/v1/stack.py @@ -623,8 +623,6 @@ def _list(client, args=None): columns.pop() if args.long: columns.insert(2, 'Stack Owner') - if args.long or args.all_projects: - columns.insert(2, 'Project') if args.nested: columns.append('Parent') @@ -634,6 +632,11 @@ def _list(client, args=None): columns.append('Deletion Time') data = client.stacks.list(**kwargs) + data = list(data) + for stk in data: + if hasattr(stk, 'project'): + columns.insert(2, 'Project') + break data = utils.sort_items(data, args.sort if args else None) return ( -- cgit v1.2.1