Merge "Remove nova-volume scheduling support"

4 files changed, 4 insertions, 27 deletions

diff --git a/nova/tests/fake_flags.py b/nova/tests/fake_flags.py
index 70c166aa9..d1c166ba1 100644
--- a/nova/tests/fake_flags.py
+++ b/nova/tests/fake_flags.py
@@ -20,7 +20,7 @@ from nova import flags
 
 FLAGS = flags.FLAGS
 
-flags.DECLARE('compute_scheduler_driver', 'nova.scheduler.multi')
+flags.DECLARE('scheduler_driver', 'nova.scheduler.manager')
 flags.DECLARE('fake_network', 'nova.network.manager')
 flags.DECLARE('iscsi_num_targets', 'nova.volume.driver')
 flags.DECLARE('network_size', 'nova.network.manager')
diff --git a/nova/tests/integrated/integrated_helpers.py b/nova/tests/integrated/integrated_helpers.py
index f3bd944da..b1b2c076e 100644
--- a/nova/tests/integrated/integrated_helpers.py
+++ b/nova/tests/integrated/integrated_helpers.py
@@ -69,7 +69,7 @@ class _IntegratedTestBase(test.TestCase):
 
         self.stub_module('crypto', fake_crypto)
         nova.tests.image.fake.stub_out_image_service(self.stubs)
-        self.flags(compute_scheduler_driver='nova.scheduler.'
+        self.flags(scheduler_driver='nova.scheduler.'
                     'chance.ChanceScheduler')
 
         # set up services
diff --git a/nova/tests/scheduler/test_multi_scheduler.py b/nova/tests/scheduler/test_multi_scheduler.py
index 04ab67675..ee9e0bbd3 100644
--- a/nova/tests/scheduler/test_multi_scheduler.py
+++ b/nova/tests/scheduler/test_multi_scheduler.py
@@ -36,14 +36,6 @@ class FakeComputeScheduler(driver.Scheduler):
         pass
 
 
-class FakeVolumeScheduler(driver.Scheduler):
-    is_fake_volume = True
-
-    def __init__(self):
-        super(FakeVolumeScheduler, self).__init__()
-        self.is_update_caps_called = False
-
-
 class FakeDefaultScheduler(driver.Scheduler):
     is_fake_default = True
 
@@ -61,18 +53,15 @@ class MultiDriverTestCase(test_scheduler.SchedulerTestCase):
         super(MultiDriverTestCase, self).setUp()
         base_name = 'nova.tests.scheduler.test_multi_scheduler.%s'
         compute_cls_name = base_name % 'FakeComputeScheduler'
-        volume_cls_name = base_name % 'FakeVolumeScheduler'
         default_cls_name = base_name % 'FakeDefaultScheduler'
         self.flags(compute_scheduler_driver=compute_cls_name,
-                volume_scheduler_driver=volume_cls_name,
                 default_scheduler_driver=default_cls_name)
         self._manager = multi.MultiScheduler()
 
     def test_drivers_inited(self):
         mgr = self._manager
-        self.assertEqual(len(mgr.drivers), 3)
+        self.assertEqual(len(mgr.drivers), 2)
         self.assertTrue(mgr.drivers['compute'].is_fake_compute)
-        self.assertTrue(mgr.drivers['volume'].is_fake_volume)
         self.assertTrue(mgr.drivers['default'].is_fake_default)
 
     def test_update_service_capabilities(self):
@@ -84,10 +73,8 @@ class MultiDriverTestCase(test_scheduler.SchedulerTestCase):
                        'update_service_capabilities',
                        fake_update_service_capabilities)
         self.assertFalse(mgr.drivers['compute'].is_update_caps_called)
-        self.assertFalse(mgr.drivers['volume'].is_update_caps_called)
         mgr.update_service_capabilities('foo_svc', 'foo_host', 'foo_caps')
         self.assertTrue(mgr.drivers['compute'].is_update_caps_called)
-        self.assertTrue(mgr.drivers['volume'].is_update_caps_called)
 
 
 class SimpleSchedulerTestCase(MultiDriverTestCase):
@@ -99,10 +86,8 @@ class SimpleSchedulerTestCase(MultiDriverTestCase):
         super(SimpleSchedulerTestCase, self).setUp()
         base_name = 'nova.tests.scheduler.test_multi_scheduler.%s'
         compute_cls_name = base_name % 'FakeComputeScheduler'
-        volume_cls_name = 'nova.scheduler.simple.SimpleScheduler'
         default_cls_name = base_name % 'FakeDefaultScheduler'
         self.flags(compute_scheduler_driver=compute_cls_name,
-                volume_scheduler_driver=volume_cls_name,
                 default_scheduler_driver=default_cls_name)
         self._manager = multi.MultiScheduler()
 
@@ -117,11 +102,9 @@ class SimpleSchedulerTestCase(MultiDriverTestCase):
         self.assertFalse(mgr.drivers['compute'].is_update_caps_called)
         mgr.update_service_capabilities('foo_svc', 'foo_host', 'foo_caps')
         self.assertTrue(mgr.drivers['compute'].is_update_caps_called)
-        self.assertTrue(mgr.drivers['volume'].is_update_caps_called)
 
     def test_drivers_inited(self):
         mgr = self._manager
-        self.assertEqual(len(mgr.drivers), 3)
+        self.assertEqual(len(mgr.drivers), 2)
         self.assertTrue(mgr.drivers['compute'].is_fake_compute)
-        self.assertTrue(mgr.drivers['volume'] is not None)
         self.assertTrue(mgr.drivers['default'].is_fake_default)
diff --git a/nova/tests/scheduler/test_rpcapi.py b/nova/tests/scheduler/test_rpcapi.py
index 100812175..8cf741118 100644
--- a/nova/tests/scheduler/test_rpcapi.py
+++ b/nova/tests/scheduler/test_rpcapi.py
@@ -83,9 +83,3 @@ class SchedulerRpcAPITestCase(test.TestCase):
         self._test_scheduler_api('update_service_capabilities',
                 rpc_method='fanout_cast', service_name='fake_name',
                 host='fake_host', capabilities='fake_capabilities')
-
-    def test_create_volume(self):
-        self._test_scheduler_api('create_volume',
-                rpc_method='cast', volume_id="fake_volume",
-                snapshot_id="fake_snapshots", image_id="fake_image",
-                version='2.2')