Merge "Fix getting metadata attr error in snapshot-list command"

This commit is contained in:
Jenkins
2017-01-26 18:31:34 +00:00
committed by Gerrit Code Review

View File

@@ -1251,14 +1251,20 @@ def do_snapshot_list(cs, args):
if args.display_name is not None: if args.display_name is not None:
args.name = args.display_name args.name = args.display_name
metadata = None
try:
if args.metadata:
metadata = shell_utils.extract_metadata(args)
except AttributeError:
pass
search_opts = { search_opts = {
'all_tenants': all_tenants, 'all_tenants': all_tenants,
'name': args.name, 'name': args.name,
'status': args.status, 'status': args.status,
'volume_id': args.volume_id, 'volume_id': args.volume_id,
'project_id': args.tenant, 'project_id': args.tenant,
'metadata': shell_utils.extract_metadata(args) 'metadata': metadata
if args.metadata else None,
} }
snapshots = cs.volume_snapshots.list(search_opts=search_opts, snapshots = cs.volume_snapshots.list(search_opts=search_opts,
@@ -1269,4 +1275,4 @@ def do_snapshot_list(cs, args):
sortby_index = None if args.sort else 0 sortby_index = None if args.sort else 0
utils.print_list(snapshots, utils.print_list(snapshots,
['ID', 'Volume ID', 'Status', 'Name', 'Size'], ['ID', 'Volume ID', 'Status', 'Name', 'Size'],
sortby_index=sortby_index) sortby_index=sortby_index)