diff options
| author | Dan Smith <danms@us.ibm.com> | 2013-04-12 11:25:18 -0700 |
|---|---|---|
| committer | Dan Smith <danms@us.ibm.com> | 2013-04-12 11:25:18 -0700 |
| commit | 188f306aa88a6a5b73959c74f1642720d7627789 (patch) | |
| tree | 2b2d209a2a3147e2d8a64c84f869d584d330c9b2 /nova/tests/conductor | |
| parent | 4861a3b6a56217bc75ab8056411a4340486b50c4 (diff) | |
| download | nova-188f306aa88a6a5b73959c74f1642720d7627789.tar.gz nova-188f306aa88a6a5b73959c74f1642720d7627789.tar.xz nova-188f306aa88a6a5b73959c74f1642720d7627789.zip | |
Make compute/manager use conductor for unrescue()
The compute_api.unrescue() call makes direct database queries, which means
it can't be called directly from compute manager. This patch adds support
in conductor for proxying this request and makes compute manager utilize
it.
Fixes bug 1167619
Change-Id: I158c64cabdfe436462f5669047fb930819a13c50
Diffstat (limited to 'nova/tests/conductor')
| -rw-r--r-- | nova/tests/conductor/test_conductor.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/nova/tests/conductor/test_conductor.py b/nova/tests/conductor/test_conductor.py index e339ecf44..fee919a33 100644 --- a/nova/tests/conductor/test_conductor.py +++ b/nova/tests/conductor/test_conductor.py @@ -612,6 +612,13 @@ class _BaseTestCase(object): self.conductor.compute_confirm_resize(self.context, 'instance', 'migration') + def test_compute_unrescue(self): + self.mox.StubOutWithMock(self.conductor_manager.compute_api, + 'unrescue') + self.conductor_manager.compute_api.unrescue(self.context, 'instance') + self.mox.ReplayAll() + self.conductor.compute_unrescue(self.context, 'instance') + class ConductorTestCase(_BaseTestCase, test.TestCase): """Conductor Manager Tests.""" |