Merge "use worker from neutron-lib"

neutron/service.py

@@ -22,6 +22,7 @@ from neutron_lib.callbacks import registry
 from neutron_lib.callbacks import resources
 from neutron_lib import context
 from neutron_lib.plugins import directory
+from neutron_lib import worker as neutron_worker
 from oslo_concurrency import processutils
 from oslo_config import cfg
 from oslo_log import log as logging
@@ -38,7 +39,6 @@ from neutron.common import profiler
 from neutron.common import rpc as n_rpc
 from neutron.conf import service
 from neutron.db import api as session
-from neutron import worker as neutron_worker
 from neutron import wsgi
 
 
@@ -95,7 +95,7 @@ def serve_wsgi(cls):
     return service
 
 
-class RpcWorker(neutron_worker.NeutronWorker):
+class RpcWorker(neutron_worker.BaseWorker):
     """Wraps a worker to be handled by ProcessLauncher"""
     start_listeners_method = 'start_rpc_listeners'
 
@@ -198,7 +198,7 @@ def _get_plugins_workers():
     ]
 
 
-class AllServicesNeutronWorker(neutron_worker.NeutronWorker):
+class AllServicesNeutronWorker(neutron_worker.BaseWorker):
     def __init__(self, services, worker_process_count=1):
         super(AllServicesNeutronWorker, self).__init__(worker_process_count)
         self._services = services