diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-01 23:04:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-01 23:04:26 +0000 |
| commit | 223f5f9d53bb95f267815ad00904d0dc26935b2a (patch) | |
| tree | b679e334acff82b0e6616189f451a6d136c03c08 | |
| parent | 6fcdcc42b172857ee37ccaaf90683a499c21c37d (diff) | |
| parent | 177c9c2cbe5f8d883dac49016b06d63a2045e468 (diff) | |
| download | python-heatclient-223f5f9d53bb95f267815ad00904d0dc26935b2a.tar.gz | |
Merge "Do not show snapshot data when doing snapshot-list"
| -rw-r--r-- | heatclient/tests/unit/test_shell.py | 3 | ||||
| -rw-r--r-- | heatclient/v1/shell.py | 5 |
2 files changed, 1 insertions, 7 deletions
diff --git a/heatclient/tests/unit/test_shell.py b/heatclient/tests/unit/test_shell.py index 1039395..9851bb8 100644 --- a/heatclient/tests/unit/test_shell.py +++ b/heatclient/tests/unit/test_shell.py @@ -2410,7 +2410,6 @@ class ShellTestUserPass(ShellBase): "name": "snap1", "status": "COMPLETE", "status_reason": "", - "data": {}, "creation_time": "2014-12-05T01:25:52Z" }]} @@ -2447,11 +2446,9 @@ class ShellTestUserPass(ShellBase): 'name', 'status', 'status_reason', - 'data', 'creation_time', '2', 'COMPLETE', - '{}', '2014-12-05T01:25:52Z', ] for r in required: diff --git a/heatclient/v1/shell.py b/heatclient/v1/shell.py index 5821101..1a32a30 100644 --- a/heatclient/v1/shell.py +++ b/heatclient/v1/shell.py @@ -1401,15 +1401,12 @@ def do_snapshot_list(hc, args): except exc.HTTPNotFound: raise exc.CommandError(_('Stack not found: %s') % args.id) else: - fields = ['id', 'name', 'status', 'status_reason', 'data', - 'creation_time'] + fields = ['id', 'name', 'status', 'status_reason', 'creation_time'] formatters = { 'id': lambda x: x['id'], 'name': lambda x: x['name'], 'status': lambda x: x['status'], 'status_reason': lambda x: x['status_reason'], - 'data': lambda x: jsonutils.dumps(x['data'], indent=2, - ensure_ascii=False), 'creation_time': lambda x: x['creation_time'], } utils.print_list(snapshots["snapshots"], fields, formatters=formatters) |