openstack
/
python-novaclient
Code Issues Proposed changes

Merge "Handle server_id and serverId in volume list" into milestone-proposed

This commit is contained in:
Jenkins 2012-03-28 17:16:38 +00:00 committed by Gerrit Code Review
parent 10d226f06f dcd906554d
commit 45fb6b6de8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
novaclient/v1_1/shell.py
View File

@ -860,7 +860,8 @@ def do_volume_list(cs, args):
# Create a list of servers to which the volume is attached
for vol in volumes:
servers = [server.get('serverId') for server in vol.attachments]
servers = [s.get('server_id') or s.get('serverId')
for s in vol.attachments]
setattr(vol, 'attached_to', ','.join(map(str, servers)))
utils.print_list(volumes, ['ID', 'Status', 'Display Name',
'Size', 'Volume Type', 'Attached to'])