x/gantt
Code Issues Proposed changes

Merge "Update scheduler rpc API version."

Browse Source
This commit is contained in:
Jenkins 2012-09-18 22:08:58 +00:00 committed by Gerrit Code Review
commit 4c6a935509
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nova/scheduler/manager.py
View File

@ -53,7 +53,7 @@ QUOTAS = quota.QUOTAS
class SchedulerManager(manager.Manager):
"""Chooses a host to run instances on."""
RPC_API_VERSION = '2.0'
RPC_API_VERSION = '2.1'
def __init__(self, scheduler_driver=None, *args, **kwargs):
if not scheduler_driver:
@ -69,8 +69,8 @@ class SchedulerManager(manager.Manager):
self.driver.update_service_capabilities(service_name, host,
capabilities)
def create_volume(self, context, volume_id, snapshot_id, image_id,
reservations):
def create_volume(self, context, volume_id, snapshot_id,
reservations, image_id=None):
try:
self.driver.schedule_create_volume(
context, volume_id, snapshot_id, image_id, reservations)

4
nova/scheduler/rpcapi.py
View File

@ -44,6 +44,7 @@ class SchedulerAPI(nova.openstack.common.rpc.proxy.RpcProxy):
1.7 - Add create_volume() method, remove topic from live_migration()
2.0 - Remove 1.x backwards compat
2.1 - Add image_id to create_volume()
'''
#
@ -98,7 +99,8 @@ class SchedulerAPI(nova.openstack.common.rpc.proxy.RpcProxy):
self.cast(ctxt,
self.make_msg('create_volume',
volume_id=volume_id, snapshot_id=snapshot_id,
image_id=image_id, reservations=reservations))
image_id=image_id, reservations=reservations),
version='2.1')
def update_service_capabilities(self, ctxt, service_name, host,
capabilities):

2
nova/tests/scheduler/test_rpcapi.py
View File

@ -95,4 +95,4 @@ class SchedulerRpcAPITestCase(test.TestCase):
self._test_scheduler_api('create_volume',
rpc_method='cast', volume_id="fake_volume",
snapshot_id="fake_snapshots", image_id="fake_image",
reservations=list('fake_res'))
reservations=list('fake_res'), version='2.1')