Show 'deletion_time' of stacks

Add 'deletion_time' column in following cases:
1. if specify --show-deleted when list stack
2. show stack

Change-Id: I4348d03b3433c4962f51aa124ea27dc0c55c71c1
DependsOn: I8c55fe7f6a899ca66aa3fef15c93195c03c5aa11

3 files changed, 23 insertions, 3 deletions

diff --git a/heatclient/osc/v1/stack.py b/heatclient/osc/v1/stack.py
index c845ee0..75f1ce3 100644
--- a/heatclient/osc/v1/stack.py
+++ b/heatclient/osc/v1/stack.py
@@ -593,6 +593,9 @@ def _list(client, args=None):
             columns.append('Parent')
             kwargs['show_nested'] = True
 
+        if args.deleted:
+            columns.append('Deletion Time')
+
     data = client.stacks.list(**kwargs)
     data = utils.sort_items(data, args.sort if args else None)
 
diff --git a/heatclient/tests/unit/osc/v1/test_stack.py b/heatclient/tests/unit/osc/v1/test_stack.py
index 46ab7d5..5803684 100644
--- a/heatclient/tests/unit/osc/v1/test_stack.py
+++ b/heatclient/tests/unit/osc/v1/test_stack.py
@@ -427,7 +427,8 @@ class TestStackList(TestStack):
         'stack_name': 'my_stack',
         'stack_status': 'CREATE_COMPLETE',
         'creation_time': '2015-10-21T07:28:00Z',
-        'update_time': '2015-10-21T07:30:00Z'
+        'update_time': '2015-10-21T07:30:00Z',
+        'deletion_time': '2015-10-21T07:50:00Z',
     }
 
     def setUp(self):
@@ -458,6 +459,19 @@ class TestStackList(TestStack):
         self.stack_client.list.assert_called_with(**kwargs)
         self.assertEqual(cols, columns)
 
+    def test_stack_list_deleted(self):
+        kwargs = copy.deepcopy(self.defaults)
+        kwargs['show_deleted'] = True
+        cols = copy.deepcopy(self.columns)
+        cols.append('Deletion Time')
+        arglist = ['--deleted']
+        parsed_args = self.check_parser(self.cmd, arglist, [])
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.stack_client.list.assert_called_with(**kwargs)
+        self.assertEqual(cols, columns)
+
     def test_stack_list_all_projects(self):
         kwargs = copy.deepcopy(self.defaults)
         kwargs['global_tenant'] = True
diff --git a/heatclient/v1/shell.py b/heatclient/v1/shell.py
index f2d5a52..5202692 100644
--- a/heatclient/v1/shell.py
+++ b/heatclient/v1/shell.py
@@ -686,9 +686,12 @@ def do_stack_list(hc, args=None):
             kwargs['sort_dir'] = args.sort_dir
 
         if args.global_tenant or args.show_owner:
-            fields.insert(2, 'stack_owner')
+            fields.append('stack_owner')
         if args.global_tenant:
-            fields.insert(2, 'project')
+            fields.append('project')
+
+        if args.show_deleted:
+            fields.append('deletion_time')
 
     stacks = hc.stacks.list(**kwargs)
     utils.print_list(stacks, fields, sortby_index=sortby_index)