deb27d9c24
Now that all preparations are done, actually port the code to use
oslo.messaging. This patch does as little as possible. Follow up patches
that refactor and cleanup the code and configuration files, will be
merged later. The reason for this is to make the patch as slim as
possible, to make review process more smooth and concentrated.
Details:
* neutron/common/rpc.py:
- added init() and cleanup() to set global RPC layer state.
- added utility functions: get_server(), get_client(), get_notifier()
that wrap up oslo.messaging API a bit, enforcing eventlet executor
and setting serializer, among other things.
- removed PluginRpcDispatcher, instead introduced PluginRpcSerializer
to use as a default serializer for API callbacks.
* neutron/common/rpc_compat.py:
- emulated incubator RPC layer behaviour thru previously introduced
stub classes (RpcCallback, RpcProxy, ...) using new oslo.messaging
API.
- switched to using new oslo.messaging exception types.
* neutron/service.py:
- expect multiple RPC listeners that are of MessageHandlingServer
type, not GreenThread.
* neutron/common/config.py:
- initialize RPC layer in init()
* setup.cfg:
- added entry points for old notifier drivers to retain backward
compatibility.
* neutron/tests/...:
- introduced fake_notifier to replace impl_fake.
- faked out consume_in_thread() to avoid starting RPC listeners when
running unit tests.
- used 'fake' transport driver.
- made sure neutron.test.* exceptions are caught.
- initialize and clean up RPC layer for each test case.
* Ported all affected code from using neutron.openstack.common.notifier
API to oslo.messaging.Notifier.
* rpc.set_defaults() was renamed to rpc.set_transport_defaults()
* other changes not worth mentioning here.
blueprint oslo-messaging
DocImpact
Change-Id: I5a91c34df6e300f2dc46217b1b16352fcc3039fc
85 lines
3.0 KiB
Python
85 lines
3.0 KiB
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
#
|
|
# Copyright 2012 NEC Corporation. All rights reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
# @author: Ryota MIBU
|
|
|
|
from oslo.config import cfg
|
|
|
|
from neutron.agent.common import config
|
|
from neutron.plugins.nec.common import constants as nconst
|
|
|
|
|
|
ovs_opts = [
|
|
cfg.StrOpt('integration_bridge', default='br-int',
|
|
help=_("Integration bridge to use")),
|
|
]
|
|
|
|
agent_opts = [
|
|
cfg.IntOpt('polling_interval', default=2,
|
|
help=_("The number of seconds the agent will wait between "
|
|
"polling for local device changes.")),
|
|
]
|
|
|
|
ofc_opts = [
|
|
cfg.StrOpt('host', default='127.0.0.1',
|
|
help=_("Host to connect to")),
|
|
cfg.StrOpt('path_prefix', default='',
|
|
help=_("Base URL of OFC REST API. "
|
|
"It is prepended to each API request.")),
|
|
cfg.StrOpt('port', default='8888',
|
|
help=_("Port to connect to")),
|
|
cfg.StrOpt('driver', default='trema',
|
|
help=_("Driver to use")),
|
|
cfg.BoolOpt('enable_packet_filter', default=True,
|
|
help=_("Enable packet filter")),
|
|
cfg.BoolOpt('use_ssl', default=False,
|
|
help=_("Use SSL to connect")),
|
|
cfg.StrOpt('key_file',
|
|
help=_("Key file")),
|
|
cfg.StrOpt('cert_file',
|
|
help=_("Certificate file")),
|
|
cfg.BoolOpt('insecure_ssl', default=False,
|
|
help=_("Disable SSL certificate verification")),
|
|
cfg.IntOpt('api_max_attempts', default=3,
|
|
help=_("Maximum attempts per OFC API request."
|
|
"NEC plugin retries API request to OFC "
|
|
"when OFC returns ServiceUnavailable (503)."
|
|
"The value must be greater than 0.")),
|
|
]
|
|
|
|
provider_opts = [
|
|
cfg.StrOpt('default_router_provider',
|
|
default=nconst.DEFAULT_ROUTER_PROVIDER,
|
|
help=_('Default router provider to use.')),
|
|
cfg.ListOpt('router_providers',
|
|
default=nconst.DEFAULT_ROUTER_PROVIDERS,
|
|
help=_('List of enabled router providers.'))
|
|
]
|
|
|
|
|
|
cfg.CONF.register_opts(ovs_opts, "OVS")
|
|
cfg.CONF.register_opts(agent_opts, "AGENT")
|
|
cfg.CONF.register_opts(ofc_opts, "OFC")
|
|
cfg.CONF.register_opts(provider_opts, "PROVIDER")
|
|
config.register_agent_state_opts_helper(cfg.CONF)
|
|
config.register_root_helper(cfg.CONF)
|
|
|
|
# shortcuts
|
|
CONF = cfg.CONF
|
|
OVS = cfg.CONF.OVS
|
|
AGENT = cfg.CONF.AGENT
|
|
OFC = cfg.CONF.OFC
|
|
PROVIDER = cfg.CONF.PROVIDER
|