Shrink Simple Scheduler

* The same functionality exists in the filter scheduler, except for
  nova volumes. So just keep nova-volume scheduling here.
* Add very basic Simple Scheduler testing
* Simple Scheduler will be completely removed after Folsom release

Change-Id: Ia2a2b26bc67cf152963533d68a774f454d763cbd

1 files changed, 40 insertions, 0 deletions

diff --git a/nova/tests/scheduler/test_multi_scheduler.py b/nova/tests/scheduler/test_multi_scheduler.py
index d6a59450e..fd79fffb3 100644
--- a/nova/tests/scheduler/test_multi_scheduler.py
+++ b/nova/tests/scheduler/test_multi_scheduler.py
@@ -143,3 +143,43 @@ class MultiDriverTestCase(test_scheduler.SchedulerTestCase):
         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):
+    """Test case for simple driver."""
+
+    driver_cls = multi.MultiScheduler
+
+    def setUp(self):
+        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()
+
+    def test_update_service_capabilities(self):
+        def fake_update_service_capabilities(self, service, host, caps):
+            self.is_update_caps_called = True
+
+        mgr = self._manager
+        self.stubs.Set(driver.Scheduler,
+                       'update_service_capabilities',
+                       fake_update_service_capabilities)
+        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.assertTrue(mgr.drivers['compute'].is_fake_compute)
+        self.assertTrue(mgr.drivers['volume'] is not None)
+        self.assertTrue(mgr.drivers['default'].is_fake_default)
+
+    def test_proxy_calls(self):
+        pass