summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Griffith <john.griffith@solidfire.com>2012-07-10 14:02:52 -0600
committerJohn Griffith <john.griffith@solidfire.com>2012-07-10 14:25:43 -0600
commit868374f005d7d3490f9089e045d7b35717770703 (patch)
treebfc8141ed56873d259f5486f0112c76bb8b466bd
parent4a981877c9b62863fe6478b813d8ebd7055d94aa (diff)
Fixes api fails to unpack metadata using cinder
Fix for bug 1023027 Change-Id: I2d19f461f3734518717b8b54d9d3428b75a2a44d
-rw-r--r--nova/volume/cinder.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/volume/cinder.py b/nova/volume/cinder.py
index 0950f4113..a0900094b 100644
--- a/nova/volume/cinder.py
+++ b/nova/volume/cinder.py
@@ -89,10 +89,10 @@ def _untranslate_volume_summary_view(context, vol):
d['snapshot_id'] = vol.snapshot_id
d['vol_metadata'] = []
- for k, v in vol.metadata:
+ for key, value in vol.metadata.items():
item = {}
- item['key'] = k
- item['value'] = v
+ item['key'] = key
+ item['value'] = value
d['vol_metadata'].append(item)
return d