diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-21 11:17:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-21 11:17:30 +0000 |
| commit | bd045581db42adae4bf7ac3702d53dd02ffc8ec0 (patch) | |
| tree | 107f876b45bf38a3878742841e51841dd00b27fe | |
| parent | 6e01cfc9b165f189c94bd4095e358b0e190fbf6c (diff) | |
| parent | b19764d2c6a8160102a806c1d6811c4182a8bac8 (diff) | |
| download | nova-bd045581db42adae4bf7ac3702d53dd02ffc8ec0.tar.gz | |
Merge "compute: stop handling virt lifecycle events in cleanup_host()" into stable/kilo
| -rw-r--r-- | nova/compute/manager.py | 1 | ||||
| -rw-r--r-- | nova/tests/unit/compute/test_compute_mgr.py | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 708d73451b..4c694a6a8c 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1276,6 +1276,7 @@ class ComputeManager(manager.Manager): self._update_scheduler_instance_info(context, instances) def cleanup_host(self): + self.driver.register_event_listener(None) self.instance_events.cancel_all_events() self.driver.cleanup_host(host=self.host) diff --git a/nova/tests/unit/compute/test_compute_mgr.py b/nova/tests/unit/compute/test_compute_mgr.py index cd30ab0880..0379306e02 100644 --- a/nova/tests/unit/compute/test_compute_mgr.py +++ b/nova/tests/unit/compute/test_compute_mgr.py @@ -455,6 +455,10 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase): mock_driver.init_host.assert_called_once_with(host='fake-mini') self.compute.cleanup_host() + # register_event_listener is called on startup (init_host) and + # in cleanup_host + mock_driver.register_event_listener.assert_has_calls([ + mock.call(self.compute.handle_events), mock.call(None)]) mock_driver.cleanup_host.assert_called_once_with(host='fake-mini') def test_init_host_with_deleted_migration(self): |