From 9f1b8228c93571552de4df73d1827dcd21498256 Mon Sep 17 00:00:00 2001 From: Dan Smith Date: Thu, 3 Jan 2013 14:34:48 -0800 Subject: Move instance_destroy() to conductor This patch moves compute/manager's use of db.instance_destroy() to the conductor. Related to blueprint no-db-compute-manager Change-Id: I72ee249ee2842a453fdf225414a03527448d2a26 --- nova/tests/conductor/test_conductor.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'nova/tests') diff --git a/nova/tests/conductor/test_conductor.py b/nova/tests/conductor/test_conductor.py index a7caa3ac9..18035c135 100644 --- a/nova/tests/conductor/test_conductor.py +++ b/nova/tests/conductor/test_conductor.py @@ -288,6 +288,12 @@ class _BaseTestCase(object): 'fake-begin', 'fake-end', 'fake-proj', 'fake-host') + def test_instance_destroy(self): + self.mox.StubOutWithMock(db, 'instance_destroy') + db.instance_destroy(self.context, 'fake-uuid') + self.mox.ReplayAll() + self.conductor.instance_destroy(self.context, {'uuid': 'fake-uuid'}) + class ConductorTestCase(_BaseTestCase, test.TestCase): """Conductor Manager Tests""" -- cgit