Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions teuthology/openstack/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,12 @@ def get_volumes(self):
Return the uuid of the volumes attached to the name_or_id
OpenStack instance.
"""
volumes = self['os-extended-volumes:volumes_attached']
return [volume['id'] for volume in volumes ]
info = self.info or {}
vols = (info.get('os-extended-volumes:volumes_attached')
or info.get('attached_volumes')
or [])
volumes = [v['id'] for v in vols if isinstance(v, dict) and 'id' in v]
return volumes

def get_addresses(self):
"""
Expand Down
Loading