diff options
author | Mark McLoughlin <markmc@redhat.com> | 2012-08-29 12:09:31 +0100 |
---|---|---|
committer | Mark McLoughlin <markmc@redhat.com> | 2012-08-29 20:22:37 +0100 |
commit | edfec5ac77b8dab51c54dfc68ec3711de6191330 (patch) | |
tree | d6bf9857a26155fa38082fdb5828b6af8364bcdc | |
parent | 8cf635b08a57a9e3be2bef980ef38cf857b6525a (diff) | |
download | nova-edfec5ac77b8dab51c54dfc68ec3711de6191330.tar.gz nova-edfec5ac77b8dab51c54dfc68ec3711de6191330.tar.xz nova-edfec5ac77b8dab51c54dfc68ec3711de6191330.zip |
Remove some remnants of VSA support
The VSA code removed by commit a3bab242 was the only user and
implementor of the 'create_volumes' RPC method.
Change-Id: Ic718d54d938059b034b78bc287668b0b9fa27f94
-rw-r--r-- | nova/scheduler/multi.py | 13 | ||||
-rw-r--r-- | nova/tests/scheduler/test_multi_scheduler.py | 18 |
2 files changed, 0 insertions, 31 deletions
diff --git a/nova/scheduler/multi.py b/nova/scheduler/multi.py index 59e1212c0..253c2fc33 100644 --- a/nova/scheduler/multi.py +++ b/nova/scheduler/multi.py @@ -43,11 +43,6 @@ multi_scheduler_opts = [ FLAGS = flags.FLAGS FLAGS.register_opts(multi_scheduler_opts) -# A mapping of methods to topics so we can figure out which driver to use. -# There are currently no compute methods proxied through the map -_METHOD_MAP = {'create_volume': 'volume', - 'create_volumes': 'volume'} - class MultiScheduler(driver.Scheduler): """A scheduler that holds multiple sub-schedulers. @@ -70,14 +65,6 @@ class MultiScheduler(driver.Scheduler): 'volume': volume_driver, 'default': default_driver} - def __getattr__(self, key): - if not key.startswith('schedule_'): - raise AttributeError(key) - method = key[len('schedule_'):] - if method not in _METHOD_MAP: - raise AttributeError(key) - return getattr(self.drivers[_METHOD_MAP[method]], key) - def schedule(self, context, topic, method, *_args, **_kwargs): driver = self.drivers.get(topic, self.drivers['default']) return driver.schedule(context, topic, diff --git a/nova/tests/scheduler/test_multi_scheduler.py b/nova/tests/scheduler/test_multi_scheduler.py index 6fce5bc35..8220fa60d 100644 --- a/nova/tests/scheduler/test_multi_scheduler.py +++ b/nova/tests/scheduler/test_multi_scheduler.py @@ -46,9 +46,6 @@ class FakeVolumeScheduler(driver.Scheduler): super(FakeVolumeScheduler, self).__init__() self.is_update_caps_called = False - def schedule_create_volumes(self, *args, **kwargs): - pass - def schedule(self, *args, **kwargs): pass @@ -87,21 +84,6 @@ class MultiDriverTestCase(test_scheduler.SchedulerTestCase): self.assertTrue(mgr.drivers['volume'].is_fake_volume) self.assertTrue(mgr.drivers['default'].is_fake_default) - def test_proxy_calls(self): - mgr = self._manager - compute_driver = mgr.drivers['compute'] - volume_driver = mgr.drivers['volume'] - - #no compute methods are proxied at this time - test_methods = {compute_driver: [], - volume_driver: ['create_volumes']} - - for driver, methods in test_methods.iteritems(): - for method in methods: - mgr_func = getattr(mgr, 'schedule_' + method) - driver_func = getattr(driver, 'schedule_' + method) - self.assertEqual(mgr_func, driver_func) - def test_schedule_fallback_proxy(self): mgr = self._manager |