Merge "Fix storage_protocol"
diff --git a/_modules/runtest/tempest_sections/volume.py b/_modules/runtest/tempest_sections/volume.py
index 7deeeb1..8de5e2b 100644
--- a/_modules/runtest/tempest_sections/volume.py
+++ b/_modules/runtest/tempest_sections/volume.py
@@ -73,8 +73,9 @@
@property
def storage_protocol(self):
c = conditions.BaseRule('cinder.volume.enabled', 'eq', True)
- backends = self.get_item_when_condition_match(
- 'cinder.volume.backend', c)
+ backends = (self.get_item_when_condition_match(
+ 'cinder.volume.backend', c) or self.get_item_when_condition_match(
+ 'cinder.controller.backend', c))
if not backends:
return
@@ -83,10 +84,9 @@
# TODO: cinder support multibackends with different storage protocols,
# pick first we know about for now, but might be refactored in future.
- for backend_name,backend in backends.iteritems():
+ for backend_name, backend in backends.iteritems():
res = backend['engine']
- if res:
- return res
+ return protocol_map.get(res)
@property
def vendor_name(self):