Merge "Add service_create to conductor."

2 files changed, 6 insertions, 1 deletions

diff --git a/nova/tests/conductor/test_conductor.py b/nova/tests/conductor/test_conductor.py
index 909174fa9..885788187 100644
--- a/nova/tests/conductor/test_conductor.py
+++ b/nova/tests/conductor/test_conductor.py
@@ -650,6 +650,9 @@ class ConductorAPITestCase(_BaseTestCase, test.TestCase):
     def test_service_get_all_compute_by_host(self):
         self._test_stubbed('service_get_all_compute_by_host', 'host')
 
+    def test_service_create(self):
+        self._test_stubbed('service_create', {})
+
     def test_ping(self):
         timeouts = []
         calls = dict(count=0)
diff --git a/nova/tests/test_service.py b/nova/tests/test_service.py
index 0bb57d542..8cc24cb1c 100644
--- a/nova/tests/test_service.py
+++ b/nova/tests/test_service.py
@@ -113,6 +113,8 @@ class ServiceTestCase(test.TestCase):
         self.binary = 'nova-fake'
         self.topic = 'fake'
         self.mox.StubOutWithMock(service, 'db')
+        self.mox.StubOutWithMock(db, 'service_create')
+        self.flags(use_local=True, group='conductor')
 
     def test_create(self):
 
@@ -136,7 +138,7 @@ class ServiceTestCase(test.TestCase):
 
         service.db.service_get_by_args(mox.IgnoreArg(),
                 self.host, self.binary).AndRaise(exception.NotFound())
-        service.db.service_create(mox.IgnoreArg(),
+        db.service_create(mox.IgnoreArg(),
                 service_create).AndReturn(service_ref)
         return service_ref