Openstack: handle attached_volumes field when fetching volumes

Some clouds use attached_volumes instead of os-extended-volumes:volumes_attached

Signed-off-by: deepssin <deepssin@redhat.com>

diff --git a/teuthology/openstack/__init__.py b/teuthology/openstack/__init__.py
index 54973cfd1d5d66d39934d09ec0263ea5b2ff2404..11d8ff150d7c67c8cc6f565a0019c7583385e632 100644 (file)
--- a/teuthology/openstack/__init__.py
+++ b/teuthology/openstack/__init__.py
@@ -128,8 +128,12 @@ class OpenStackInstance(object):
         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):
         """