diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-28 17:16:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-28 17:16:38 +0000 |
| commit | 45fb6b6de89eaec642ecbf755af45fd55f8224d4 (patch) | |
| tree | f6b03443036f5bc787921f457933664ec9ce5ad9 | |
| parent | 10d226f06fae9957f59784c8fa29ca059bf378a5 (diff) | |
| parent | dcd906554dbffc849c2e494a6fc8d045ddd70eff (diff) | |
| download | python-novaclient-essex-rc4.tar.gz | |
Merge "Handle server_id and serverId in volume list" into milestone-proposedessex-rc4essex-rc3essex-rc22012.1
| -rw-r--r-- | novaclient/v1_1/shell.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/novaclient/v1_1/shell.py b/novaclient/v1_1/shell.py index 10729e47..8c78d4e8 100644 --- 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']) |