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
This commit is contained in:
@@ -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,
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user