diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-11 00:51:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-11 00:51:40 +0000 |
| commit | 523277cbdf87ba855d7fe97171ed6acd2c8ddc2f (patch) | |
| tree | 0a8b4cefd5023787538b30b530f748b0f7ae6371 | |
| parent | 58a6d062bd9eb90a7d52aebeeb0e8cec03f63651 (diff) | |
| parent | 868374f005d7d3490f9089e045d7b35717770703 (diff) | |
| download | nova-523277cbdf87ba855d7fe97171ed6acd2c8ddc2f.tar.gz nova-523277cbdf87ba855d7fe97171ed6acd2c8ddc2f.tar.xz nova-523277cbdf87ba855d7fe97171ed6acd2c8ddc2f.zip | |
Merge "Fixes api fails to unpack metadata using cinder"
| -rw-r--r-- | nova/volume/cinder.py | 6 |
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 |