From 10644ad65b025389f5b90d5a2cae157d7b073254 Mon Sep 17 00:00:00 2001 From: Boden R Date: Tue, 12 Dec 2017 11:31:14 -0700 Subject: [PATCH] use callback payloads for _SPAWN events This patch switches callbacks over to the payload object style events [1] for BEFORE_SPAWN and AFTER_SPAWN based notifications. As no event data is passed for SPAWN notifications, an actual payload object is not needed and thus this change uses publish() rather than notify() and updates and callback receivers to accept the payload parameter. NeutronLibImpact [1] https://docs.openstack.org/neutron-lib/latest/contributor/callbacks.html#event-payloads Change-Id: Ifad4781d82aa07f213f4e075b0c9455aa95e94bb --- neutron/service.py | 4 ++-- neutron/tests/unit/test_service.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/neutron/service.py b/neutron/service.py index 29d47ae2f41..f31f44c01c2 100644 --- a/neutron/service.py +++ b/neutron/service.py @@ -89,7 +89,7 @@ def serve_wsgi(cls): LOG.exception('Unrecoverable error: please check log ' 'for details.') - registry.notify(resources.PROCESS, events.BEFORE_SPAWN, service) + registry.publish(resources.PROCESS, events.BEFORE_SPAWN, service) return service @@ -262,7 +262,7 @@ def _start_workers(workers): def start_all_workers(): workers = _get_rpc_workers() + _get_plugins_workers() launcher = _start_workers(workers) - registry.notify(resources.PROCESS, events.AFTER_SPAWN, None) + registry.publish(resources.PROCESS, events.AFTER_SPAWN, None) return launcher diff --git a/neutron/tests/unit/test_service.py b/neutron/tests/unit/test_service.py index fb700400b28..de5c3507baa 100644 --- a/neutron/tests/unit/test_service.py +++ b/neutron/tests/unit/test_service.py @@ -69,4 +69,4 @@ class TestRunWsgiApp(base.BaseTestCase): registry.subscribe(callback, resources.PROCESS, events.AFTER_SPAWN) service.start_all_workers() callback.assert_called_once_with( - resources.PROCESS, events.AFTER_SPAWN, mock.ANY) + resources.PROCESS, events.AFTER_SPAWN, mock.ANY, payload=None)