diff options
| author | John Griffith <john.griffith@solidfire.com> | 2012-07-24 19:31:50 -0600 |
|---|---|---|
| committer | John Griffith <john.griffith@solidfire.com> | 2012-07-25 08:20:12 -0600 |
| commit | 00d65fa8bf83c2e9e5937108cbbf096918bbd23f (patch) | |
| tree | 70cd18e94abeac8612ca0b969f361f88dffb4657 /nova | |
| parent | b8aedb281f8e6cc8b1583640c31f5d52ce5e4eac (diff) | |
| download | nova-00d65fa8bf83c2e9e5937108cbbf096918bbd23f.tar.gz nova-00d65fa8bf83c2e9e5937108cbbf096918bbd23f.tar.xz nova-00d65fa8bf83c2e9e5937108cbbf096918bbd23f.zip | |
Add missing parameters to novas cinder api
* Addresses bug 1028684
* Adds metadata and other parameters to volume create and translate_view
Change-Id: I0c1def739c4a5cbcd2dbe72df6fc54b16e68b4b7
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/volume/cinder.py | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/nova/volume/cinder.py b/nova/volume/cinder.py index a0900094b..4bd52c45d 100644 --- a/nova/volume/cinder.py +++ b/nova/volume/cinder.py @@ -59,7 +59,6 @@ def cinderclient(context): def _untranslate_volume_summary_view(context, vol): """Maps keys for volumes summary view.""" d = {} - d['id'] = vol.id d['status'] = vol.status d['size'] = vol.size @@ -88,12 +87,12 @@ def _untranslate_volume_summary_view(context, vol): d['volume_type_id'] = vol.volume_type d['snapshot_id'] = vol.snapshot_id - d['vol_metadata'] = [] + d['volume_metadata'] = [] for key, value in vol.metadata.items(): item = {} item['key'] = key item['value'] = value - d['vol_metadata'].append(item) + d['volume_metadata'].append(item) return d @@ -170,13 +169,18 @@ class API(base.Base): volumes.terminate_connection(volume['id'], connector) def create(self, context, size, name, description, snapshot=None, - volume_type=None, metadata=None, availability_zone=None): - - item = cinderclient(context).volumes.create(size, snapshot, - name, description, - volume_type) + volume_type=None, metadata=None, availability_zone=None): + + item = cinderclient(context).volumes.create(size, + snapshot, + name, + description, + volume_type, + context.user_id, + context.project_id, + availability_zone, + metadata) - volume = _untranslate_volume_summary_view(context, item) return _untranslate_volume_summary_view(context, item) def delete(self, context, volume): |