diff --git a/nova/scheduler/multi.py b/nova/scheduler/multi.py index 83ecd8e6..31d92583 100644 --- a/nova/scheduler/multi.py +++ b/nova/scheduler/multi.py @@ -36,7 +36,6 @@ flags.DEFINE_string('volume_scheduler_driver', # A mapping of methods to topics so we can figure out which driver to use. _METHOD_MAP = {'run_instance': 'compute', - 'start_instance': 'compute', 'prep_resize': 'compute', 'live_migration': 'compute', 'create_volume': 'volume', diff --git a/nova/scheduler/simple.py b/nova/scheduler/simple.py index 64ebfb75..9ce3473e 100644 --- a/nova/scheduler/simple.py +++ b/nova/scheduler/simple.py @@ -100,13 +100,6 @@ class SimpleScheduler(chance.ChanceScheduler): del request_spec['instance_properties']['uuid'] return instances - def schedule_start_instance(self, context, instance_id, *_args, **_kwargs): - instance_ref = db.instance_get(context, instance_id) - host = self._schedule_instance(context, instance_ref, - *_args, **_kwargs) - driver.cast_to_compute_host(context, host, 'start_instance', - instance_id=instance_id, **_kwargs) - def schedule_create_volume(self, context, volume_id, *_args, **_kwargs): """Picks a host that is up and has the fewest volumes.""" elevated = context.elevated() diff --git a/nova/tests/scheduler/test_multi_scheduler.py b/nova/tests/scheduler/test_multi_scheduler.py index cefc31b7..7468a244 100644 --- a/nova/tests/scheduler/test_multi_scheduler.py +++ b/nova/tests/scheduler/test_multi_scheduler.py @@ -31,7 +31,10 @@ class FakeComputeScheduler(driver.Scheduler): def schedule_run_instance(self, *args, **kwargs): pass - def schedule_start_instance(self, *args, **kwargs): + def schedule_live_migration(self, *args, **kwargs): + pass + + def schedule_prep_resize(self, *args, **kwargs): pass def schedule(self, *args, **kwargs): @@ -76,7 +79,7 @@ class MultiDriverTestCase(test_scheduler.SchedulerTestCase): compute_driver = mgr.drivers['compute'] volume_driver = mgr.drivers['volume'] - test_methods = {compute_driver: ['run_instance', 'start_instance'], + test_methods = {compute_driver: ['run_instance', 'prep_resize'], volume_driver: ['create_volume', 'create_volumes']} for driver, methods in test_methods.iteritems():