From 8e7cc89d058d773ada13d615c1d978ae9d73917c Mon Sep 17 00:00:00 2001 From: Avishay Traeger Date: Fri, 14 Jun 2013 08:42:49 +0300 Subject: [PATCH] Fix volume info display error on create with v2. Error due to popping 'links' when it does not exist. Change-Id: I3f25b97f16699373ef12d9ac47905900b4b631f8 Fixes: bug 1190853 --- cinderclient/v2/shell.py | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/cinderclient/v2/shell.py b/cinderclient/v2/shell.py index b86f7f9be..448982343 100644 --- a/cinderclient/v2/shell.py +++ b/cinderclient/v2/shell.py @@ -170,9 +170,7 @@ def do_show(cs, args): volume = _find_volume(cs, args.volume) info.update(volume._info) - if 'links' in info: - info.pop('links') - + info.pop('links', None) utils.print_dict(info) @@ -282,8 +280,7 @@ def do_create(cs, args): volume = cs.volumes.get(volume.id) info.update(volume._info) - info.pop('links') - + info.pop('links', None) utils.print_dict(info) @@ -792,9 +789,7 @@ def do_backup_show(cs, args): info = dict() info.update(backup._info) - if 'links' in info: - info.pop('links') - + info.pop('links', None) utils.print_dict(info) @@ -847,9 +842,7 @@ def do_transfer_create(cs, args): info = dict() info.update(transfer._info) - if 'links' in info: - info.pop('links') - + info.pop('links', None) utils.print_dict(info) @@ -873,9 +866,7 @@ def do_transfer_accept(cs, args): info = dict() info.update(transfer._info) - if 'links' in info: - info.pop('links') - + info.pop('links', None) utils.print_dict(info) @@ -896,7 +887,5 @@ def do_transfer_show(cs, args): info = dict() info.update(transfer._info) - if 'links' in info: - info.pop('links') - + info.pop('links', None) utils.print_dict(info)