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

…roposed
openstack · Mar 28, 2012 · 45fb6b6 · 45fb6b6
2 parents 10d226f + dcd9065
commit 45fb6b6
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/novaclient/v1_1/shell.py b/novaclient/v1_1/shell.py
@@ -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'])