2399008546
Currently a request for multiple instances issent to the scheduler, where it is written to the database. It appears that this was done so that more advanced schedulers could handle the request as one batch, but the result is the scheduler is sometimes slow enough that the call will timeout. Instead this converts to always creating the instance records locally and making run_instance into a casting instead of a call. This made a small change to the rpc api for run instance, so the version was bumped. Legacy messages are still handled properly. Fixes bug 1036911 Co-authored-by: Chris Behrens <cbehrens@codestud.com> Change-Id: I63bbc98c285faebec53f8e62857c01548807db68
96 lines
3.5 KiB
Python
96 lines
3.5 KiB
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
|
|
# Copyright 2012, Red Hat, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
"""
|
|
Unit Tests for nova.scheduler.rpcapi
|
|
"""
|
|
|
|
from nova import context
|
|
from nova import flags
|
|
from nova.openstack.common import rpc
|
|
from nova.scheduler import rpcapi as scheduler_rpcapi
|
|
from nova import test
|
|
|
|
|
|
FLAGS = flags.FLAGS
|
|
|
|
|
|
class SchedulerRpcAPITestCase(test.TestCase):
|
|
|
|
def setUp(self):
|
|
super(SchedulerRpcAPITestCase, self).setUp()
|
|
|
|
def tearDown(self):
|
|
super(SchedulerRpcAPITestCase, self).tearDown()
|
|
|
|
def _test_scheduler_api(self, method, rpc_method, **kwargs):
|
|
ctxt = context.RequestContext('fake_user', 'fake_project')
|
|
rpcapi = scheduler_rpcapi.SchedulerAPI()
|
|
expected_retval = 'foo' if method == 'call' else None
|
|
expected_version = kwargs.pop('version', rpcapi.BASE_RPC_API_VERSION)
|
|
expected_msg = rpcapi.make_msg(method, **kwargs)
|
|
expected_msg['version'] = expected_version
|
|
|
|
self.fake_args = None
|
|
self.fake_kwargs = None
|
|
|
|
def _fake_rpc_method(*args, **kwargs):
|
|
self.fake_args = args
|
|
self.fake_kwargs = kwargs
|
|
if expected_retval:
|
|
return expected_retval
|
|
|
|
self.stubs.Set(rpc, rpc_method, _fake_rpc_method)
|
|
|
|
retval = getattr(rpcapi, method)(ctxt, **kwargs)
|
|
|
|
self.assertEqual(retval, expected_retval)
|
|
expected_args = [ctxt, FLAGS.scheduler_topic, expected_msg]
|
|
for arg, expected_arg in zip(self.fake_args, expected_args):
|
|
self.assertEqual(arg, expected_arg)
|
|
|
|
def test_run_instance(self):
|
|
self._test_scheduler_api('run_instance', rpc_method='cast',
|
|
request_spec='fake_request_spec',
|
|
admin_password='pw', injected_files='fake_injected_files',
|
|
requested_networks='fake_requested_networks',
|
|
is_first_time=True, filter_properties='fake_filter_properties',
|
|
version='1.6')
|
|
|
|
def test_prep_resize(self):
|
|
self._test_scheduler_api('prep_resize', rpc_method='cast',
|
|
instance='fake_instance',
|
|
instance_type='fake_type', image='fake_image',
|
|
request_spec='fake_request_spec',
|
|
filter_properties='fake_props', reservations=list('fake_res'),
|
|
version='1.5')
|
|
|
|
def test_show_host_resources(self):
|
|
self._test_scheduler_api('show_host_resources', rpc_method='call',
|
|
host='fake_host')
|
|
|
|
def test_live_migration(self):
|
|
self._test_scheduler_api('live_migration', rpc_method='call',
|
|
block_migration='fake_block_migration',
|
|
disk_over_commit='fake_disk_over_commit',
|
|
instance='fake_instance', dest='fake_dest', topic='fake_topic',
|
|
version='1.3')
|
|
|
|
def test_update_service_capabilities(self):
|
|
self._test_scheduler_api('update_service_capabilities',
|
|
rpc_method='fanout_cast', service_name='fake_name',
|
|
host='fake_host', capabilities='fake_capabilities')
|