diff options
| author | Unmesh Gurjar <unmesh.gurjar@vertex.co.in> | 2012-08-11 10:31:51 -0700 |
|---|---|---|
| committer | Josh Durgin <josh.durgin@inktank.com> | 2012-09-18 08:54:25 -0700 |
| commit | de09c1866b9138610914ddaaebb9b030884d1e28 (patch) | |
| tree | 3a26edadd5d7a794b7c46dd2f30d08285878f3c1 /nova/scheduler/rpcapi.py | |
| parent | f615e9c22c4c003ac1cd3d01ec8f7cbabd76b96d (diff) | |
| download | nova-de09c1866b9138610914ddaaebb9b030884d1e28.tar.gz nova-de09c1866b9138610914ddaaebb9b030884d1e28.tar.xz nova-de09c1866b9138610914ddaaebb9b030884d1e28.zip | |
Adds new volume API extensions
Adds following extensions:
1. Create volume from image
2. Copy volume to image
Added unit tests.
Implements: blueprint create-volume-from-image
Conflicts:
cinder/api/openstack/volume/contrib/volume_actions.py
cinder/tests/api/openstack/fakes.py
cinder/tests/api/openstack/volume/contrib/test_volume_actions.py
cinder/tests/policy.json
nova/api/openstack/volume/volumes.py
nova/flags.py
nova/tests/api/openstack/volume/test_volumes.py
nova/tests/test_volume.py
nova/utils.py
nova/volume/api.py
nova/volume/manager.py
This is based on a cherry-pick of cinder commit
2f5360753308eb8b10581fc3c026c1b66f42ebdc with bug fixes
8c30edff982042d2533a810709308b586267c0e9 and
ffe5036fa0e63ccde2d19aa0f425ec43de338dd7 squashed in.
Change-Id: I9c73bd3fa2fa2e0648c01ff3f4fc66f757d7bc3f
Diffstat (limited to 'nova/scheduler/rpcapi.py')
| -rw-r--r-- | nova/scheduler/rpcapi.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/scheduler/rpcapi.py b/nova/scheduler/rpcapi.py index 940fe315e..894131179 100644 --- a/nova/scheduler/rpcapi.py +++ b/nova/scheduler/rpcapi.py @@ -93,11 +93,12 @@ class SchedulerAPI(nova.openstack.common.rpc.proxy.RpcProxy): disk_over_commit=disk_over_commit, instance=instance_p, dest=dest)) - def create_volume(self, ctxt, volume_id, snapshot_id, reservations): + def create_volume(self, ctxt, volume_id, snapshot_id, image_id, + reservations): self.cast(ctxt, self.make_msg('create_volume', volume_id=volume_id, snapshot_id=snapshot_id, - reservations=reservations)) + image_id=image_id, reservations=reservations)) def update_service_capabilities(self, ctxt, service_name, host, capabilities): |