openstack
/
neutron
Code Issues Proposed changes

use neutron-lib.callback.events.AFTER_SPAWN 

Change-Id: Ia3d9dbe751964ded7cf5b99bfcd7e28c30a5d4a6
Depends-On: I50513229b207c6a0a0b0b0a5e00873fb634f6b67
This commit is contained in:
Isaku Yamahata 2017-05-18 17:43:02 -07:00 committed by Isaku Yamahata
parent 47a6348e53
commit 5f02ed398a
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/service.py
View File

@ -33,7 +33,6 @@ from oslo_utils import excutils
from oslo_utils import importutils
from neutron._i18n import _LE, _LI
from neutron.callbacks import events as n_events
from neutron.common import config
from neutron.common import profiler
from neutron.common import rpc as n_rpc
@ -264,8 +263,7 @@ def _start_workers(workers):
def start_all_workers():
workers = _get_rpc_workers() + _get_plugins_workers()
launcher = _start_workers(workers)
# TODO(yamahata): replace n_events with neutron_lib.callback.events
registry.notify(resources.PROCESS, n_events.AFTER_SPAWN, None)
registry.notify(resources.PROCESS, events.AFTER_SPAWN, None)
return launcher

7
neutron/tests/unit/test_service.py
View File

@ -15,11 +15,11 @@
import mock
from neutron_lib.callbacks import events
from neutron_lib.callbacks import registry
from neutron_lib.callbacks import resources
from oslo_config import cfg
from neutron.callbacks import events as n_events
from neutron import service
from neutron.tests import base
from neutron.tests.unit import test_wsgi
@ -66,8 +66,7 @@ class TestRunWsgiApp(base.BaseTestCase):
mock.patch.object(service, '_start_workers').start()
callback = mock.Mock()
# TODO(yamahata): replace n_events with neutron_lib.callback.events
registry.subscribe(callback, resources.PROCESS, n_events.AFTER_SPAWN)
registry.subscribe(callback, resources.PROCESS, events.AFTER_SPAWN)
service.start_all_workers()
callback.assert_called_once_with(
resources.PROCESS, n_events.AFTER_SPAWN, mock.ANY)
resources.PROCESS, events.AFTER_SPAWN, mock.ANY)