From d7493a223f97fa2b6b684454926b5cea7c121de9 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Mon, 9 Jun 2014 16:09:26 +0200 Subject: [PATCH] Moved rpc_compat.py code back into rpc.py Most of this code will probably stay with us for quite some time, so let's make things easier and consider them as our way of doing RPC. blueprint oslo-messaging Change-Id: Iaf353b23f9c54b82d1e02a6bd5a5960cec827c88 --- neutron/agent/dhcp_agent.py | 6 +- neutron/agent/l3_agent.py | 14 +- neutron/agent/rpc.py | 8 +- .../rpc/agentnotifiers/dhcp_rpc_agent_api.py | 4 +- .../rpc/agentnotifiers/l3_rpc_agent_api.py | 4 +- .../agentnotifiers/metering_rpc_agent_api.py | 4 +- neutron/common/rpc.py | 143 +++++++++++++++ neutron/common/rpc_compat.py | 165 ------------------ neutron/db/agents_db.py | 4 +- neutron/manager.py | 4 +- .../bigswitch/agent/restproxy_agent.py | 4 +- neutron/plugins/bigswitch/plugin.py | 8 +- neutron/plugins/brocade/NeutronPlugin.py | 8 +- .../plugins/cisco/n1kv/n1kv_neutron_plugin.py | 6 +- .../hyperv/agent/hyperv_neutron_agent.py | 8 +- neutron/plugins/hyperv/agent_notifier_api.py | 4 +- .../plugins/hyperv/hyperv_neutron_plugin.py | 4 +- neutron/plugins/hyperv/rpc_callbacks.py | 4 +- .../plugins/ibm/agent/sdnve_neutron_agent.py | 4 +- neutron/plugins/ibm/sdnve_neutron_plugin.py | 6 +- .../agent/linuxbridge_neutron_agent.py | 4 +- .../plugins/linuxbridge/lb_neutron_plugin.py | 8 +- neutron/plugins/midonet/plugin.py | 6 +- neutron/plugins/ml2/drivers/l2pop/rpc.py | 4 +- neutron/plugins/ml2/plugin.py | 4 +- neutron/plugins/ml2/rpc.py | 6 +- .../mlnx/agent/eswitch_neutron_agent.py | 6 +- neutron/plugins/mlnx/agent_notify_api.py | 4 +- neutron/plugins/mlnx/mlnx_plugin.py | 4 +- neutron/plugins/mlnx/rpc_callbacks.py | 4 +- .../plugins/nec/agent/nec_neutron_agent.py | 8 +- neutron/plugins/nec/nec_plugin.py | 14 +- .../ofagent/agent/ofa_neutron_agent.py | 4 +- .../agent/nvsd_neutron_agent.py | 10 +- neutron/plugins/oneconvergence/plugin.py | 8 +- .../openvswitch/agent/ovs_neutron_agent.py | 4 +- .../plugins/openvswitch/ovs_neutron_plugin.py | 8 +- .../plugins/ryu/agent/ryu_neutron_agent.py | 4 +- neutron/plugins/ryu/ryu_neutron_plugin.py | 8 +- neutron/plugins/vmware/dhcp_meta/rpc.py | 4 +- neutron/plugins/vmware/dhcpmeta_modes.py | 4 +- neutron/service.py | 4 +- .../firewall/agents/firewall_agent_api.py | 4 +- neutron/services/firewall/fwaas_plugin.py | 8 +- .../services/l3_router/l3_router_plugin.py | 6 +- neutron/services/loadbalancer/agent/agent.py | 4 +- .../services/loadbalancer/agent/agent_api.py | 4 +- .../loadbalancer/agent/agent_manager.py | 4 +- .../drivers/common/agent_driver_base.py | 8 +- .../metering/agents/metering_agent.py | 3 +- neutron/services/metering/metering_plugin.py | 4 +- .../vpn/device_drivers/cisco_ipsec.py | 6 +- neutron/services/vpn/device_drivers/ipsec.py | 6 +- .../services/vpn/service_drivers/__init__.py | 4 +- .../vpn/service_drivers/cisco_ipsec.py | 8 +- neutron/services/vpn/service_drivers/ipsec.py | 8 +- neutron/tests/base.py | 2 +- .../tests/unit/hyperv/test_hyperv_rpcapi.py | 4 +- neutron/tests/unit/linuxbridge/test_rpcapi.py | 2 +- .../unit/ml2/drivers/test_l2population.py | 4 +- neutron/tests/unit/ml2/test_rpcapi.py | 4 +- neutron/tests/unit/mlnx/test_rpcapi.py | 2 +- .../tests/unit/openvswitch/test_ovs_rpcapi.py | 2 +- .../services/loadbalancer/agent/test_agent.py | 2 +- .../services/metering/test_metering_plugin.py | 4 +- .../vpn/device_drivers/test_cisco_ipsec.py | 2 +- .../services/vpn/device_drivers/test_ipsec.py | 2 +- .../vpn/service_drivers/test_cisco_ipsec.py | 4 +- .../vpn/service_drivers/test_ipsec.py | 2 +- neutron/tests/unit/test_agent_rpc.py | 6 +- neutron/tests/unit/test_dhcp_agent.py | 4 +- .../tests/unit/test_security_groups_rpc.py | 4 +- 72 files changed, 323 insertions(+), 346 deletions(-) delete mode 100644 neutron/common/rpc_compat.py diff --git a/neutron/agent/dhcp_agent.py b/neutron/agent/dhcp_agent.py index 61325291ef..29119799e4 100644 --- a/neutron/agent/dhcp_agent.py +++ b/neutron/agent/dhcp_agent.py @@ -31,7 +31,7 @@ from neutron.agent import rpc as agent_rpc from neutron.common import config as common_config from neutron.common import constants from neutron.common import exceptions -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.common import utils from neutron import context @@ -137,7 +137,7 @@ class DhcpAgent(manager.Manager): % {'net_id': network.id, 'action': action}) except Exception as e: self.schedule_resync(e) - if (isinstance(e, rpc_compat.RemoteError) + if (isinstance(e, n_rpc.RemoteError) and e.exc_type == 'NetworkNotFound' or isinstance(e, exceptions.NetworkNotFound)): LOG.warning(_("Network %s has been deleted."), network.id) @@ -377,7 +377,7 @@ class DhcpAgent(manager.Manager): pm.disable() -class DhcpPluginApi(rpc_compat.RpcProxy): +class DhcpPluginApi(n_rpc.RpcProxy): """Agent side of the dhcp rpc API. API version history: diff --git a/neutron/agent/l3_agent.py b/neutron/agent/l3_agent.py index 7dcb81e3b4..e4c5aff49f 100644 --- a/neutron/agent/l3_agent.py +++ b/neutron/agent/l3_agent.py @@ -30,7 +30,7 @@ from neutron.agent.linux import ovs_lib # noqa from neutron.agent import rpc as agent_rpc from neutron.common import config as common_config from neutron.common import constants as l3_constants -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.common import utils as common_utils from neutron import context @@ -54,7 +54,7 @@ RPC_LOOP_INTERVAL = 1 FLOATING_IP_CIDR_SUFFIX = '/32' -class L3PluginApi(rpc_compat.RpcProxy): +class L3PluginApi(n_rpc.RpcProxy): """Agent side of the l3 agent RPC API. API version history: @@ -80,9 +80,9 @@ class L3PluginApi(rpc_compat.RpcProxy): def get_external_network_id(self, context): """Make a remote process call to retrieve the external network id. - @raise rpc_compat.RemoteError: with TooManyExternalNetworks - as exc_type if there are - more than one external network + @raise n_rpc.RemoteError: with TooManyExternalNetworks as + exc_type if there are more than one + external network """ return self.call(context, self.make_msg('get_external_network_id', @@ -328,7 +328,7 @@ class L3NATAgent(firewall_l3_agent.FWaaSL3AgentRpcCallback, manager.Manager): self.target_ex_net_id = self.plugin_rpc.get_external_network_id( self.context) return self.target_ex_net_id - except rpc_compat.RemoteError as e: + except n_rpc.RemoteError as e: with excutils.save_and_reraise_exception() as ctx: if e.exc_type == 'TooManyExternalNetworks': ctx.reraise = False @@ -861,7 +861,7 @@ class L3NATAgent(firewall_l3_agent.FWaaSL3AgentRpcCallback, manager.Manager): self._process_routers(routers, all_routers=True) self.fullsync = False LOG.debug(_("_sync_routers_task successfully completed")) - except rpc_compat.RPCException: + except n_rpc.RPCException: LOG.exception(_("Failed synchronizing routers due to RPC error")) self.fullsync = True return diff --git a/neutron/agent/rpc.py b/neutron/agent/rpc.py index d497c65fba..2f60f12589 100644 --- a/neutron/agent/rpc.py +++ b/neutron/agent/rpc.py @@ -15,7 +15,7 @@ import itertools -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.openstack.common import log as logging @@ -37,7 +37,7 @@ def create_consumers(endpoints, prefix, topic_details): :returns: A common Connection. """ - connection = rpc_compat.create_connection(new=True) + connection = n_rpc.create_connection(new=True) for details in topic_details: topic, operation, node_name = itertools.islice( itertools.chain(details, [None]), 3) @@ -53,7 +53,7 @@ def create_consumers(endpoints, prefix, topic_details): return connection -class PluginReportStateAPI(rpc_compat.RpcProxy): +class PluginReportStateAPI(n_rpc.RpcProxy): BASE_RPC_API_VERSION = '1.0' def __init__(self, topic): @@ -71,7 +71,7 @@ class PluginReportStateAPI(rpc_compat.RpcProxy): return self.cast(context, msg, topic=self.topic) -class PluginApi(rpc_compat.RpcProxy): +class PluginApi(n_rpc.RpcProxy): '''Agent side of the rpc API. API version history: diff --git a/neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py b/neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py index 71ca52c254..96c50bce91 100644 --- a/neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py +++ b/neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py @@ -14,7 +14,7 @@ # limitations under the License. from neutron.common import constants -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.common import utils from neutron import manager @@ -24,7 +24,7 @@ from neutron.openstack.common import log as logging LOG = logging.getLogger(__name__) -class DhcpAgentNotifyAPI(rpc_compat.RpcProxy): +class DhcpAgentNotifyAPI(n_rpc.RpcProxy): """API for plugin to notify DHCP agent.""" BASE_RPC_API_VERSION = '1.0' # It seems dhcp agent does not support bulk operation diff --git a/neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py b/neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py index 9bf1080dbb..0515ba40f5 100644 --- a/neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py +++ b/neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py @@ -14,7 +14,7 @@ # limitations under the License. from neutron.common import constants -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.common import utils from neutron import manager @@ -25,7 +25,7 @@ from neutron.plugins.common import constants as service_constants LOG = logging.getLogger(__name__) -class L3AgentNotifyAPI(rpc_compat.RpcProxy): +class L3AgentNotifyAPI(n_rpc.RpcProxy): """API for plugin to notify L3 agent.""" BASE_RPC_API_VERSION = '1.0' diff --git a/neutron/api/rpc/agentnotifiers/metering_rpc_agent_api.py b/neutron/api/rpc/agentnotifiers/metering_rpc_agent_api.py index da38cd8f80..e00e73b39f 100644 --- a/neutron/api/rpc/agentnotifiers/metering_rpc_agent_api.py +++ b/neutron/api/rpc/agentnotifiers/metering_rpc_agent_api.py @@ -15,7 +15,7 @@ # under the License. from neutron.common import constants -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.common import utils from neutron import manager @@ -25,7 +25,7 @@ from neutron.plugins.common import constants as service_constants LOG = logging.getLogger(__name__) -class MeteringAgentNotifyAPI(rpc_compat.RpcProxy): +class MeteringAgentNotifyAPI(n_rpc.RpcProxy): """API for plugin to notify L3 metering agent.""" BASE_RPC_API_VERSION = '1.0' diff --git a/neutron/common/rpc.py b/neutron/common/rpc.py index 73a1090f29..3800a683df 100644 --- a/neutron/common/rpc.py +++ b/neutron/common/rpc.py @@ -1,4 +1,5 @@ # Copyright (c) 2012 OpenStack Foundation. +# Copyright (c) 2014 Red Hat, Inc. # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may @@ -20,6 +21,7 @@ from oslo.messaging import serializer as om_serializer from neutron.common import exceptions from neutron import context from neutron.openstack.common import log as logging +from neutron.openstack.common import service LOG = logging.getLogger(__name__) @@ -133,3 +135,144 @@ class RequestContextSerializer(om_serializer.Serializer): tenant_id = rpc_ctxt_dict.pop('project_id', None) return context.Context(user_id, tenant_id, load_admin_roles=False, **rpc_ctxt_dict) + + +class RpcProxy(object): + ''' + This class is created to facilitate migration from oslo-incubator + RPC layer implementation to oslo.messaging and is intended to + emulate RpcProxy class behaviour using oslo.messaging API once the + migration is applied. + ''' + RPC_API_NAMESPACE = None + + def __init__(self, topic, default_version, version_cap=None): + self.topic = topic + target = messaging.Target(topic=topic, version=default_version) + self._client = get_client(target, version_cap=version_cap) + + def make_msg(self, method, **kwargs): + return {'method': method, + 'namespace': self.RPC_API_NAMESPACE, + 'args': kwargs} + + def call(self, context, msg, **kwargs): + return self.__call_rpc_method( + context, msg, rpc_method='call', **kwargs) + + def cast(self, context, msg, **kwargs): + self.__call_rpc_method(context, msg, rpc_method='cast', **kwargs) + + def fanout_cast(self, context, msg, **kwargs): + kwargs['fanout'] = True + self.__call_rpc_method(context, msg, rpc_method='cast', **kwargs) + + def __call_rpc_method(self, context, msg, **kwargs): + options = dict( + ((opt, kwargs[opt]) + for opt in ('fanout', 'timeout', 'topic', 'version') + if kwargs.get(opt)) + ) + if msg['namespace']: + options['namespace'] = msg['namespace'] + + if options: + callee = self._client.prepare(**options) + else: + callee = self._client + + func = getattr(callee, kwargs['rpc_method']) + return func(context, msg['method'], **msg['args']) + + +class RpcCallback(object): + ''' + This class is created to facilitate migration from oslo-incubator + RPC layer implementation to oslo.messaging and is intended to set + callback version using oslo.messaging API once the migration is + applied. + ''' + RPC_API_VERSION = '1.0' + + def __init__(self): + super(RpcCallback, self).__init__() + self.target = messaging.Target(version=self.RPC_API_VERSION) + + +class Service(service.Service): + """Service object for binaries running on hosts. + + A service enables rpc by listening to queues based on topic and host. + """ + def __init__(self, host, topic, manager=None, serializer=None): + super(Service, self).__init__() + self.host = host + self.topic = topic + self.serializer = serializer + if manager is None: + self.manager = self + else: + self.manager = manager + + def start(self): + super(Service, self).start() + + self.conn = create_connection(new=True) + LOG.debug("Creating Consumer connection for Service %s" % + self.topic) + + endpoints = [self.manager] + + # Share this same connection for these Consumers + self.conn.create_consumer(self.topic, endpoints, fanout=False) + + node_topic = '%s.%s' % (self.topic, self.host) + self.conn.create_consumer(node_topic, endpoints, fanout=False) + + self.conn.create_consumer(self.topic, endpoints, fanout=True) + + # Hook to allow the manager to do other initializations after + # the rpc connection is created. + if callable(getattr(self.manager, 'initialize_service_hook', None)): + self.manager.initialize_service_hook(self) + + # Consume from all consumers in threads + self.conn.consume_in_threads() + + def stop(self): + # Try to shut the connection down, but if we get any sort of + # errors, go ahead and ignore them.. as we're shutting down anyway + try: + self.conn.close() + except Exception: + pass + super(Service, self).stop() + + +class Connection(object): + + def __init__(self): + super(Connection, self).__init__() + self.servers = [] + + def create_consumer(self, topic, endpoints, fanout=False): + target = messaging.Target( + topic=topic, server=cfg.CONF.host, fanout=fanout) + server = get_server(target, endpoints) + self.servers.append(server) + + def consume_in_threads(self): + for server in self.servers: + server.start() + return self.servers + + +# functions +def create_connection(new=True): + return Connection() + + +# exceptions +RPCException = messaging.MessagingException +RemoteError = messaging.RemoteError +MessagingTimeout = messaging.MessagingTimeout diff --git a/neutron/common/rpc_compat.py b/neutron/common/rpc_compat.py deleted file mode 100644 index 8c16c2c5bf..0000000000 --- a/neutron/common/rpc_compat.py +++ /dev/null @@ -1,165 +0,0 @@ -# Copyright (c) 2014 Red Hat, Inc. -# 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. - -from oslo.config import cfg -from oslo import messaging - -from neutron.common import rpc as n_rpc -from neutron.openstack.common import log as logging -from neutron.openstack.common import service - - -LOG = logging.getLogger(__name__) - - -class RpcProxy(object): - ''' - This class is created to facilitate migration from oslo-incubator - RPC layer implementation to oslo.messaging and is intended to - emulate RpcProxy class behaviour using oslo.messaging API once the - migration is applied. - ''' - RPC_API_NAMESPACE = None - - def __init__(self, topic, default_version, version_cap=None): - self.topic = topic - target = messaging.Target(topic=topic, version=default_version) - self._client = n_rpc.get_client(target, version_cap=version_cap) - - def make_msg(self, method, **kwargs): - return {'method': method, - 'namespace': self.RPC_API_NAMESPACE, - 'args': kwargs} - - def call(self, context, msg, **kwargs): - return self.__call_rpc_method( - context, msg, rpc_method='call', **kwargs) - - def cast(self, context, msg, **kwargs): - self.__call_rpc_method(context, msg, rpc_method='cast', **kwargs) - - def fanout_cast(self, context, msg, **kwargs): - kwargs['fanout'] = True - self.__call_rpc_method(context, msg, rpc_method='cast', **kwargs) - - def __call_rpc_method(self, context, msg, **kwargs): - options = dict( - ((opt, kwargs[opt]) - for opt in ('fanout', 'timeout', 'topic', 'version') - if kwargs.get(opt)) - ) - if msg['namespace']: - options['namespace'] = msg['namespace'] - - if options: - callee = self._client.prepare(**options) - else: - callee = self._client - - func = getattr(callee, kwargs['rpc_method']) - return func(context, msg['method'], **msg['args']) - - -class RpcCallback(object): - ''' - This class is created to facilitate migration from oslo-incubator - RPC layer implementation to oslo.messaging and is intended to set - callback version using oslo.messaging API once the migration is - applied. - ''' - RPC_API_VERSION = '1.0' - - def __init__(self): - super(RpcCallback, self).__init__() - self.target = messaging.Target(version=self.RPC_API_VERSION) - - -class Service(service.Service): - """Service object for binaries running on hosts. - - A service enables rpc by listening to queues based on topic and host. - """ - def __init__(self, host, topic, manager=None, serializer=None): - super(Service, self).__init__() - self.host = host - self.topic = topic - self.serializer = serializer - if manager is None: - self.manager = self - else: - self.manager = manager - - def start(self): - super(Service, self).start() - - self.conn = create_connection(new=True) - LOG.debug("Creating Consumer connection for Service %s" % - self.topic) - - endpoints = [self.manager] - - # Share this same connection for these Consumers - self.conn.create_consumer(self.topic, endpoints, fanout=False) - - node_topic = '%s.%s' % (self.topic, self.host) - self.conn.create_consumer(node_topic, endpoints, fanout=False) - - self.conn.create_consumer(self.topic, endpoints, fanout=True) - - # Hook to allow the manager to do other initializations after - # the rpc connection is created. - if callable(getattr(self.manager, 'initialize_service_hook', None)): - self.manager.initialize_service_hook(self) - - # Consume from all consumers in threads - self.conn.consume_in_threads() - - def stop(self): - # Try to shut the connection down, but if we get any sort of - # errors, go ahead and ignore them.. as we're shutting down anyway - try: - self.conn.close() - except Exception: - pass - super(Service, self).stop() - - -class Connection(object): - - def __init__(self): - super(Connection, self).__init__() - self.servers = [] - - def create_consumer(self, topic, endpoints, fanout=False): - target = messaging.Target( - topic=topic, server=cfg.CONF.host, fanout=fanout) - server = n_rpc.get_server(target, endpoints) - self.servers.append(server) - - def consume_in_threads(self): - for server in self.servers: - server.start() - return self.servers - - -# functions -def create_connection(new=True): - return Connection() - - -# exceptions -RPCException = messaging.MessagingException -RemoteError = messaging.RemoteError -MessagingTimeout = messaging.MessagingTimeout diff --git a/neutron/db/agents_db.py b/neutron/db/agents_db.py index 57712066ad..6e8421e9e4 100644 --- a/neutron/db/agents_db.py +++ b/neutron/db/agents_db.py @@ -19,7 +19,7 @@ from oslo.config import cfg import sqlalchemy as sa from sqlalchemy.orm import exc -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.db import model_base from neutron.db import models_v2 from neutron.extensions import agent as ext_agent @@ -196,7 +196,7 @@ class AgentDbMixin(ext_agent.AgentPluginBase): return self._create_or_update_agent(context, agent) -class AgentExtRpcCallback(rpc_compat.RpcCallback): +class AgentExtRpcCallback(n_rpc.RpcCallback): """Processes the rpc report in plugin implementations.""" RPC_API_VERSION = '1.0' diff --git a/neutron/manager.py b/neutron/manager.py index a84056d2f3..3a21f617f5 100644 --- a/neutron/manager.py +++ b/neutron/manager.py @@ -17,7 +17,7 @@ import weakref from oslo.config import cfg -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import utils from neutron.openstack.common import importutils from neutron.openstack.common import log as logging @@ -30,7 +30,7 @@ from stevedore import driver LOG = logging.getLogger(__name__) -class Manager(rpc_compat.RpcCallback, periodic_task.PeriodicTasks): +class Manager(n_rpc.RpcCallback, periodic_task.PeriodicTasks): # Set RPC API version to 1.0 by default. RPC_API_VERSION = '1.0' diff --git a/neutron/plugins/bigswitch/agent/restproxy_agent.py b/neutron/plugins/bigswitch/agent/restproxy_agent.py index 97aa7d0e3f..caf57e4bf6 100644 --- a/neutron/plugins/bigswitch/agent/restproxy_agent.py +++ b/neutron/plugins/bigswitch/agent/restproxy_agent.py @@ -30,7 +30,7 @@ from neutron.agent.linux import utils from neutron.agent import rpc as agent_rpc from neutron.agent import securitygroups_rpc as sg_rpc from neutron.common import config -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron import context as q_context from neutron.extensions import securitygroup as ext_sg @@ -84,7 +84,7 @@ class SecurityGroupAgent(sg_rpc.SecurityGroupAgentRpcMixin): self.init_firewall() -class RestProxyAgent(rpc_compat.RpcCallback, +class RestProxyAgent(n_rpc.RpcCallback, sg_rpc.SecurityGroupAgentRpcCallbackMixin): RPC_API_VERSION = '1.1' diff --git a/neutron/plugins/bigswitch/plugin.py b/neutron/plugins/bigswitch/plugin.py index fa3b1f7667..ef9cc03cd7 100644 --- a/neutron/plugins/bigswitch/plugin.py +++ b/neutron/plugins/bigswitch/plugin.py @@ -56,7 +56,7 @@ from neutron.api import extensions as neutron_extensions from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api from neutron.common import constants as const from neutron.common import exceptions -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.common import utils from neutron import context as qcontext @@ -94,7 +94,7 @@ SYNTAX_ERROR_MESSAGE = _('Syntax error in server config file, aborting plugin') METADATA_SERVER_IP = '169.254.169.254' -class AgentNotifierApi(rpc_compat.RpcProxy, +class AgentNotifierApi(n_rpc.RpcProxy, sg_rpc.SecurityGroupAgentRpcApiMixin): BASE_RPC_API_VERSION = '1.1' @@ -112,7 +112,7 @@ class AgentNotifierApi(rpc_compat.RpcProxy, topic=self.topic_port_update) -class RestProxyCallbacks(rpc_compat.RpcCallback, +class RestProxyCallbacks(n_rpc.RpcCallback, sg_rpc_base.SecurityGroupServerRpcCallbackMixin, dhcp_rpc_base.DhcpRpcCallbackMixin): @@ -493,7 +493,7 @@ class NeutronRestProxyV2(NeutronRestProxyV2Base, LOG.debug(_("NeutronRestProxyV2: initialization done")) def _setup_rpc(self): - self.conn = rpc_compat.create_connection(new=True) + self.conn = n_rpc.create_connection(new=True) self.topic = topics.PLUGIN self.notifier = AgentNotifierApi(topics.AGENT) # init dhcp agent support diff --git a/neutron/plugins/brocade/NeutronPlugin.py b/neutron/plugins/brocade/NeutronPlugin.py index d4b49ddc0c..bac256a380 100644 --- a/neutron/plugins/brocade/NeutronPlugin.py +++ b/neutron/plugins/brocade/NeutronPlugin.py @@ -29,7 +29,7 @@ from neutron.agent import securitygroups_rpc as sg_rpc from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api from neutron.api.rpc.agentnotifiers import l3_rpc_agent_api from neutron.common import constants as q_const -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.common import utils from neutron.db import agents_db @@ -77,7 +77,7 @@ cfg.CONF.register_opts(SWITCH_OPTS, "SWITCH") cfg.CONF.register_opts(PHYSICAL_INTERFACE_OPTS, "PHYSICAL_INTERFACE") -class BridgeRpcCallbacks(rpc_compat.RpcCallback, +class BridgeRpcCallbacks(n_rpc.RpcCallback, dhcp_rpc_base.DhcpRpcCallbackMixin, l3_rpc_base.L3RpcCallbackMixin, sg_db_rpc.SecurityGroupServerRpcCallbackMixin): @@ -154,7 +154,7 @@ class BridgeRpcCallbacks(rpc_compat.RpcCallback, return entry -class AgentNotifierApi(rpc_compat.RpcProxy, +class AgentNotifierApi(n_rpc.RpcProxy, sg_rpc.SecurityGroupAgentRpcApiMixin): """Agent side of the linux bridge rpc API. @@ -251,7 +251,7 @@ class BrocadePluginV2(db_base_plugin_v2.NeutronDbPluginV2, svc_constants.L3_ROUTER_NAT: topics.L3PLUGIN} self.rpc_context = context.RequestContext('neutron', 'neutron', is_admin=False) - self.conn = rpc_compat.create_connection(new=True) + self.conn = n_rpc.create_connection(new=True) self.endpoints = [BridgeRpcCallbacks(), agents_db.AgentExtRpcCallback()] for svc_topic in self.service_topics.values(): diff --git a/neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py b/neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py index 220a9077dc..431cbc6d8b 100644 --- a/neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py +++ b/neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py @@ -26,7 +26,7 @@ from neutron.api.rpc.agentnotifiers import l3_rpc_agent_api from neutron.api.v2 import attributes from neutron.common import constants from neutron.common import exceptions as n_exc -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.common import utils from neutron.db import agents_db @@ -57,7 +57,7 @@ from neutron.plugins.common import constants as svc_constants LOG = logging.getLogger(__name__) -class N1kvRpcCallbacks(rpc_compat.RpcCallback, +class N1kvRpcCallbacks(n_rpc.RpcCallback, dhcp_rpc_base.DhcpRpcCallbackMixin, l3_rpc_base.L3RpcCallbackMixin): @@ -124,7 +124,7 @@ class N1kvNeutronPluginV2(db_base_plugin_v2.NeutronDbPluginV2, # RPC support self.service_topics = {svc_constants.CORE: topics.PLUGIN, svc_constants.L3_ROUTER_NAT: topics.L3PLUGIN} - self.conn = rpc_compat.create_connection(new=True) + self.conn = n_rpc.create_connection(new=True) self.endpoints = [N1kvRpcCallbacks(), agents_db.AgentExtRpcCallback()] for svc_topic in self.service_topics.values(): self.conn.create_consumer(svc_topic, self.endpoints, fanout=False) diff --git a/neutron/plugins/hyperv/agent/hyperv_neutron_agent.py b/neutron/plugins/hyperv/agent/hyperv_neutron_agent.py index 471e37631c..0a06a43a67 100644 --- a/neutron/plugins/hyperv/agent/hyperv_neutron_agent.py +++ b/neutron/plugins/hyperv/agent/hyperv_neutron_agent.py @@ -31,7 +31,7 @@ from neutron.agent import rpc as agent_rpc from neutron.agent import securitygroups_rpc as sg_rpc from neutron.common import config as common_config from neutron.common import constants as n_const -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron import context from neutron.openstack.common import log as logging @@ -79,7 +79,7 @@ CONF.register_opts(agent_opts, "AGENT") config.register_agent_state_opts_helper(cfg.CONF) -class HyperVSecurityAgent(rpc_compat.RpcCallback, +class HyperVSecurityAgent(n_rpc.RpcCallback, sg_rpc.SecurityGroupAgentRpcMixin): # Set RPC API version to 1.1 by default. RPC_API_VERSION = '1.1' @@ -103,7 +103,7 @@ class HyperVSecurityAgent(rpc_compat.RpcCallback, consumers) -class HyperVSecurityCallbackMixin(rpc_compat.RpcCallback, +class HyperVSecurityCallbackMixin(n_rpc.RpcCallback, sg_rpc.SecurityGroupAgentRpcCallbackMixin): # Set RPC API version to 1.1 by default. RPC_API_VERSION = '1.1' @@ -118,7 +118,7 @@ class HyperVPluginApi(agent_rpc.PluginApi, pass -class HyperVNeutronAgent(rpc_compat.RpcCallback): +class HyperVNeutronAgent(n_rpc.RpcCallback): # Set RPC API version to 1.0 by default. RPC_API_VERSION = '1.0' diff --git a/neutron/plugins/hyperv/agent_notifier_api.py b/neutron/plugins/hyperv/agent_notifier_api.py index bebb0e9e4c..bceab0a221 100644 --- a/neutron/plugins/hyperv/agent_notifier_api.py +++ b/neutron/plugins/hyperv/agent_notifier_api.py @@ -14,7 +14,7 @@ # under the License. # @author: Alessandro Pilotti, Cloudbase Solutions Srl -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.openstack.common import log as logging from neutron.plugins.hyperv.common import constants @@ -22,7 +22,7 @@ from neutron.plugins.hyperv.common import constants LOG = logging.getLogger(__name__) -class AgentNotifierApi(rpc_compat.RpcProxy): +class AgentNotifierApi(n_rpc.RpcProxy): '''Agent side of the openvswitch rpc API. API version history: diff --git a/neutron/plugins/hyperv/hyperv_neutron_plugin.py b/neutron/plugins/hyperv/hyperv_neutron_plugin.py index 51c7eabdba..765f65bbd4 100644 --- a/neutron/plugins/hyperv/hyperv_neutron_plugin.py +++ b/neutron/plugins/hyperv/hyperv_neutron_plugin.py @@ -18,7 +18,7 @@ from oslo.config import cfg from neutron.api.v2 import attributes from neutron.common import exceptions as n_exc -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.db import agents_db from neutron.db import db_base_plugin_v2 @@ -185,7 +185,7 @@ class HyperVNeutronPlugin(agents_db.AgentDbMixin, # RPC support self.service_topics = {svc_constants.CORE: topics.PLUGIN, svc_constants.L3_ROUTER_NAT: topics.L3PLUGIN} - self.conn = rpc_compat.create_connection(new=True) + self.conn = n_rpc.create_connection(new=True) self.notifier = agent_notifier_api.AgentNotifierApi( topics.AGENT) self.endpoints = [rpc_callbacks.HyperVRpcCallbacks(self.notifier), diff --git a/neutron/plugins/hyperv/rpc_callbacks.py b/neutron/plugins/hyperv/rpc_callbacks.py index 086069f3a5..8f71828e65 100644 --- a/neutron/plugins/hyperv/rpc_callbacks.py +++ b/neutron/plugins/hyperv/rpc_callbacks.py @@ -15,7 +15,7 @@ # @author: Alessandro Pilotti, Cloudbase Solutions Srl from neutron.common import constants as q_const -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.db import dhcp_rpc_base from neutron.db import l3_rpc_base from neutron.openstack.common import log as logging @@ -26,7 +26,7 @@ LOG = logging.getLogger(__name__) class HyperVRpcCallbacks( - rpc_compat.RpcCallback, + n_rpc.RpcCallback, dhcp_rpc_base.DhcpRpcCallbackMixin, l3_rpc_base.L3RpcCallbackMixin): diff --git a/neutron/plugins/ibm/agent/sdnve_neutron_agent.py b/neutron/plugins/ibm/agent/sdnve_neutron_agent.py index e1c8d3ed71..b3203d4ae9 100644 --- a/neutron/plugins/ibm/agent/sdnve_neutron_agent.py +++ b/neutron/plugins/ibm/agent/sdnve_neutron_agent.py @@ -31,7 +31,7 @@ from neutron.agent.linux import ovs_lib from neutron.agent import rpc as agent_rpc from neutron.common import config as common_config from neutron.common import constants as n_const -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.common import utils as n_utils from neutron import context @@ -52,7 +52,7 @@ class SdnvePluginApi(agent_rpc.PluginApi): topic=self.topic) -class SdnveNeutronAgent(rpc_compat.RpcCallback): +class SdnveNeutronAgent(n_rpc.RpcCallback): RPC_API_VERSION = '1.1' diff --git a/neutron/plugins/ibm/sdnve_neutron_plugin.py b/neutron/plugins/ibm/sdnve_neutron_plugin.py index cf127f0014..2097122792 100644 --- a/neutron/plugins/ibm/sdnve_neutron_plugin.py +++ b/neutron/plugins/ibm/sdnve_neutron_plugin.py @@ -23,7 +23,7 @@ from oslo.config import cfg from neutron.common import constants as n_const from neutron.common import exceptions as n_exc -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.db import agents_db from neutron.db import db_base_plugin_v2 @@ -56,7 +56,7 @@ class SdnveRpcCallbacks(): return info -class AgentNotifierApi(rpc_compat.RpcProxy): +class AgentNotifierApi(n_rpc.RpcProxy): '''Agent side of the SDN-VE rpc API.''' BASE_RPC_API_VERSION = '1.0' @@ -131,7 +131,7 @@ class SdnvePluginV2(db_base_plugin_v2.NeutronDbPluginV2, def setup_rpc(self): # RPC support self.topic = topics.PLUGIN - self.conn = rpc_compat.create_connection(new=True) + self.conn = n_rpc.create_connection(new=True) self.notifier = AgentNotifierApi(topics.AGENT) self.endpoints = [SdnveRpcCallbacks(self.notifier), agents_db.AgentExtRpcCallback()] diff --git a/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py b/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py index f468bc0fec..bef54d3c72 100755 --- a/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py +++ b/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py @@ -37,7 +37,7 @@ from neutron.agent import securitygroups_rpc as sg_rpc from neutron.common import config as common_config from neutron.common import constants from neutron.common import exceptions -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.common import utils as q_utils from neutron import context @@ -644,7 +644,7 @@ class LinuxBridgeManager: self.remove_fdb_bridge_entry(mac, agent_ip, interface) -class LinuxBridgeRpcCallbacks(rpc_compat.RpcCallback, +class LinuxBridgeRpcCallbacks(n_rpc.RpcCallback, sg_rpc.SecurityGroupAgentRpcCallbackMixin, l2pop_rpc.L2populationRpcCallBackMixin): diff --git a/neutron/plugins/linuxbridge/lb_neutron_plugin.py b/neutron/plugins/linuxbridge/lb_neutron_plugin.py index 412275d24e..b1d828dfc9 100644 --- a/neutron/plugins/linuxbridge/lb_neutron_plugin.py +++ b/neutron/plugins/linuxbridge/lb_neutron_plugin.py @@ -23,7 +23,7 @@ from neutron.api.rpc.agentnotifiers import l3_rpc_agent_api from neutron.api.v2 import attributes from neutron.common import constants as q_const from neutron.common import exceptions as n_exc -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.common import utils from neutron.db import agents_db @@ -53,7 +53,7 @@ from neutron.plugins.linuxbridge.db import l2network_db_v2 as db LOG = logging.getLogger(__name__) -class LinuxBridgeRpcCallbacks(rpc_compat.RpcCallback, +class LinuxBridgeRpcCallbacks(n_rpc.RpcCallback, dhcp_rpc_base.DhcpRpcCallbackMixin, l3_rpc_base.L3RpcCallbackMixin, sg_db_rpc.SecurityGroupServerRpcCallbackMixin @@ -152,7 +152,7 @@ class LinuxBridgeRpcCallbacks(rpc_compat.RpcCallback, LOG.debug(_("%s can not be found in database"), device) -class AgentNotifierApi(rpc_compat.RpcProxy, +class AgentNotifierApi(n_rpc.RpcProxy, sg_rpc.SecurityGroupAgentRpcApiMixin): '''Agent side of the linux bridge rpc API. @@ -272,7 +272,7 @@ class LinuxBridgePluginV2(db_base_plugin_v2.NeutronDbPluginV2, # RPC support self.service_topics = {svc_constants.CORE: topics.PLUGIN, svc_constants.L3_ROUTER_NAT: topics.L3PLUGIN} - self.conn = rpc_compat.create_connection(new=True) + self.conn = n_rpc.create_connection(new=True) self.endpoints = [LinuxBridgeRpcCallbacks(), agents_db.AgentExtRpcCallback()] for svc_topic in self.service_topics.values(): diff --git a/neutron/plugins/midonet/plugin.py b/neutron/plugins/midonet/plugin.py index 0ca7eadc71..3de1194ffe 100644 --- a/neutron/plugins/midonet/plugin.py +++ b/neutron/plugins/midonet/plugin.py @@ -27,7 +27,7 @@ from sqlalchemy.orm import exc as sa_exc from neutron.api.v2 import attributes from neutron.common import constants from neutron.common import exceptions as n_exc -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.db import agents_db from neutron.db import agentschedulers_db @@ -174,7 +174,7 @@ def _check_resource_exists(func, id, name, raise_exc=False): raise MidonetPluginException(msg=exc) -class MidoRpcCallbacks(rpc_compat.RpcCallback, +class MidoRpcCallbacks(n_rpc.RpcCallback, dhcp_rpc_base.DhcpRpcCallbackMixin): RPC_API_VERSION = '1.1' @@ -369,7 +369,7 @@ class MidonetPluginV2(db_base_plugin_v2.NeutronDbPluginV2, def setup_rpc(self): # RPC support self.topic = topics.PLUGIN - self.conn = rpc_compat.create_connection(new=True) + self.conn = n_rpc.create_connection(new=True) self.endpoints = [MidoRpcCallbacks(), agents_db.AgentExtRpcCallback()] self.conn.create_consumer(self.topic, self.endpoints, diff --git a/neutron/plugins/ml2/drivers/l2pop/rpc.py b/neutron/plugins/ml2/drivers/l2pop/rpc.py index b4f171a27f..7be7b8a664 100644 --- a/neutron/plugins/ml2/drivers/l2pop/rpc.py +++ b/neutron/plugins/ml2/drivers/l2pop/rpc.py @@ -17,7 +17,7 @@ # @author: Francois Eleouet, Orange # @author: Mathieu Rohon, Orange -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.openstack.common import log as logging @@ -25,7 +25,7 @@ from neutron.openstack.common import log as logging LOG = logging.getLogger(__name__) -class L2populationAgentNotifyAPI(rpc_compat.RpcProxy): +class L2populationAgentNotifyAPI(n_rpc.RpcProxy): BASE_RPC_API_VERSION = '1.0' def __init__(self, topic=topics.AGENT): diff --git a/neutron/plugins/ml2/plugin.py b/neutron/plugins/ml2/plugin.py index a324637c5f..9232b4b40a 100644 --- a/neutron/plugins/ml2/plugin.py +++ b/neutron/plugins/ml2/plugin.py @@ -23,7 +23,7 @@ from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api from neutron.api.v2 import attributes from neutron.common import constants as const from neutron.common import exceptions as exc -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.db import agents_db from neutron.db import agentschedulers_db @@ -130,7 +130,7 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2, self.endpoints = [rpc.RpcCallbacks(self.notifier, self.type_manager), agents_db.AgentExtRpcCallback()] self.topic = topics.PLUGIN - self.conn = rpc_compat.create_connection(new=True) + self.conn = n_rpc.create_connection(new=True) self.conn.create_consumer(self.topic, self.endpoints, fanout=False) return self.conn.consume_in_threads() diff --git a/neutron/plugins/ml2/rpc.py b/neutron/plugins/ml2/rpc.py index c744147c68..d58751c94d 100644 --- a/neutron/plugins/ml2/rpc.py +++ b/neutron/plugins/ml2/rpc.py @@ -17,7 +17,7 @@ from oslo import messaging from neutron.agent import securitygroups_rpc as sg_rpc from neutron.common import constants as q_const -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.db import api as db_api from neutron.db import dhcp_rpc_base @@ -46,7 +46,7 @@ class RpcCallbacks(dhcp_rpc_base.DhcpRpcCallbackMixin, # 1.0 Initial version (from openvswitch/linuxbridge) # 1.1 Support Security Group RPC - # FIXME(ihrachys): we can't use rpc_compat.RpcCallback here due to + # FIXME(ihrachys): we can't use n_rpc.RpcCallback here due to # inheritance problems target = messaging.Target(version=RPC_API_VERSION) @@ -198,7 +198,7 @@ class RpcCallbacks(dhcp_rpc_base.DhcpRpcCallbackMixin, q_const.PORT_STATUS_ACTIVE) -class AgentNotifierApi(rpc_compat.RpcProxy, +class AgentNotifierApi(n_rpc.RpcProxy, sg_rpc.SecurityGroupAgentRpcApiMixin, type_tunnel.TunnelAgentRpcApiMixin): """Agent side of the openvswitch rpc API. diff --git a/neutron/plugins/mlnx/agent/eswitch_neutron_agent.py b/neutron/plugins/mlnx/agent/eswitch_neutron_agent.py index 3cdc41bab0..ecb134cf03 100644 --- a/neutron/plugins/mlnx/agent/eswitch_neutron_agent.py +++ b/neutron/plugins/mlnx/agent/eswitch_neutron_agent.py @@ -27,7 +27,7 @@ from neutron.agent import rpc as agent_rpc from neutron.agent import securitygroups_rpc as sg_rpc from neutron.common import config as common_config from neutron.common import constants as q_constants -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.common import utils as q_utils from neutron import context @@ -143,7 +143,7 @@ class EswitchManager(object): self.network_map[network_id] = data -class MlnxEswitchRpcCallbacks(rpc_compat.RpcCallback, +class MlnxEswitchRpcCallbacks(n_rpc.RpcCallback, sg_rpc.SecurityGroupAgentRpcCallbackMixin): # Set RPC API version to 1.0 by default. @@ -203,7 +203,7 @@ class MlnxEswitchRpcCallbacks(rpc_compat.RpcCallback, port['mac_address'], self.agent.agent_id, cfg.CONF.host) - except rpc_compat.MessagingTimeout: + except n_rpc.MessagingTimeout: LOG.error(_("RPC timeout while updating port %s"), port['id']) else: LOG.debug(_("No port %s defined on agent."), port['id']) diff --git a/neutron/plugins/mlnx/agent_notify_api.py b/neutron/plugins/mlnx/agent_notify_api.py index 4839f8f53a..b17ad7e6b7 100644 --- a/neutron/plugins/mlnx/agent_notify_api.py +++ b/neutron/plugins/mlnx/agent_notify_api.py @@ -15,14 +15,14 @@ from oslo.config import cfg from neutron.agent import securitygroups_rpc as sg_rpc -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.openstack.common import log as logging LOG = logging.getLogger(__name__) -class AgentNotifierApi(rpc_compat.RpcProxy, +class AgentNotifierApi(n_rpc.RpcProxy, sg_rpc.SecurityGroupAgentRpcApiMixin): """Agent side of the Embedded Switch RPC API. diff --git a/neutron/plugins/mlnx/mlnx_plugin.py b/neutron/plugins/mlnx/mlnx_plugin.py index 41c0e98041..79af922504 100644 --- a/neutron/plugins/mlnx/mlnx_plugin.py +++ b/neutron/plugins/mlnx/mlnx_plugin.py @@ -23,7 +23,7 @@ from neutron.api.rpc.agentnotifiers import l3_rpc_agent_api from neutron.api.v2 import attributes from neutron.common import constants as q_const from neutron.common import exceptions as n_exc -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.common import utils from neutron.db import agents_db @@ -118,7 +118,7 @@ class MellanoxEswitchPlugin(db_base_plugin_v2.NeutronDbPluginV2, # RPC support self.service_topics = {svc_constants.CORE: topics.PLUGIN, svc_constants.L3_ROUTER_NAT: topics.L3PLUGIN} - self.conn = rpc_compat.create_connection(new=True) + self.conn = n_rpc.create_connection(new=True) self.endpoints = [rpc_callbacks.MlnxRpcCallbacks(), agents_db.AgentExtRpcCallback()] for svc_topic in self.service_topics.values(): diff --git a/neutron/plugins/mlnx/rpc_callbacks.py b/neutron/plugins/mlnx/rpc_callbacks.py index e7f1f30b62..279ba57a80 100644 --- a/neutron/plugins/mlnx/rpc_callbacks.py +++ b/neutron/plugins/mlnx/rpc_callbacks.py @@ -15,7 +15,7 @@ from oslo.config import cfg from neutron.common import constants as q_const -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.db import api as db_api from neutron.db import dhcp_rpc_base from neutron.db import l3_rpc_base @@ -26,7 +26,7 @@ from neutron.plugins.mlnx.db import mlnx_db_v2 as db LOG = logging.getLogger(__name__) -class MlnxRpcCallbacks(rpc_compat.RpcCallback, +class MlnxRpcCallbacks(n_rpc.RpcCallback, dhcp_rpc_base.DhcpRpcCallbackMixin, l3_rpc_base.L3RpcCallbackMixin, sg_db_rpc.SecurityGroupServerRpcCallbackMixin): diff --git a/neutron/plugins/nec/agent/nec_neutron_agent.py b/neutron/plugins/nec/agent/nec_neutron_agent.py index 6ab5f82b4e..241503afc0 100755 --- a/neutron/plugins/nec/agent/nec_neutron_agent.py +++ b/neutron/plugins/nec/agent/nec_neutron_agent.py @@ -32,7 +32,7 @@ from neutron.agent import rpc as agent_rpc from neutron.agent import securitygroups_rpc as sg_rpc from neutron.common import config as common_config from neutron.common import constants as q_const -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron import context as q_context from neutron.extensions import securitygroup as ext_sg @@ -62,7 +62,7 @@ class NECPluginApi(agent_rpc.PluginApi): port_removed=port_removed)) -class NECAgentRpcCallback(rpc_compat.RpcCallback): +class NECAgentRpcCallback(n_rpc.RpcCallback): RPC_API_VERSION = '1.0' @@ -84,7 +84,7 @@ class NECAgentRpcCallback(rpc_compat.RpcCallback): self.sg_agent.refresh_firewall() -class SecurityGroupServerRpcApi(rpc_compat.RpcProxy, +class SecurityGroupServerRpcApi(n_rpc.RpcProxy, sg_rpc.SecurityGroupServerRpcApiMixin): def __init__(self, topic): @@ -93,7 +93,7 @@ class SecurityGroupServerRpcApi(rpc_compat.RpcProxy, class SecurityGroupAgentRpcCallback( - rpc_compat.RpcCallback, + n_rpc.RpcCallback, sg_rpc.SecurityGroupAgentRpcCallbackMixin): RPC_API_VERSION = sg_rpc.SG_RPC_VERSION diff --git a/neutron/plugins/nec/nec_plugin.py b/neutron/plugins/nec/nec_plugin.py index 2c55c58982..fbeebd7a1a 100644 --- a/neutron/plugins/nec/nec_plugin.py +++ b/neutron/plugins/nec/nec_plugin.py @@ -20,7 +20,7 @@ from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api from neutron.api.v2 import attributes as attrs from neutron.common import constants as const from neutron.common import exceptions as n_exc -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.db import agents_db from neutron.db import agentschedulers_db @@ -133,7 +133,7 @@ class NECPluginV2(db_base_plugin_v2.NeutronDbPluginV2, def setup_rpc(self): self.service_topics = {svc_constants.CORE: topics.PLUGIN, svc_constants.L3_ROUTER_NAT: topics.L3PLUGIN} - self.conn = rpc_compat.create_connection(new=True) + self.conn = n_rpc.create_connection(new=True) self.notifier = NECPluginV2AgentNotifierApi(topics.AGENT) self.agent_notifiers[const.AGENT_TYPE_DHCP] = ( dhcp_rpc_agent_api.DhcpAgentNotifyAPI() @@ -657,7 +657,7 @@ class NECPluginV2(db_base_plugin_v2.NeutronDbPluginV2, self.notify_security_groups_member_updated(context, port) -class NECPluginV2AgentNotifierApi(rpc_compat.RpcProxy, +class NECPluginV2AgentNotifierApi(n_rpc.RpcProxy, sg_rpc.SecurityGroupAgentRpcApiMixin): '''RPC API for NEC plugin agent.''' @@ -676,20 +676,20 @@ class NECPluginV2AgentNotifierApi(rpc_compat.RpcProxy, topic=self.topic_port_update) -class DhcpRpcCallback(rpc_compat.RpcCallback, +class DhcpRpcCallback(n_rpc.RpcCallback, dhcp_rpc_base.DhcpRpcCallbackMixin): # DhcpPluginApi BASE_RPC_API_VERSION RPC_API_VERSION = '1.1' -class L3RpcCallback(rpc_compat.RpcCallback, l3_rpc_base.L3RpcCallbackMixin): +class L3RpcCallback(n_rpc.RpcCallback, l3_rpc_base.L3RpcCallbackMixin): # 1.0 L3PluginApi BASE_RPC_API_VERSION # 1.1 Support update_floatingip_statuses RPC_API_VERSION = '1.1' class SecurityGroupServerRpcCallback( - rpc_compat.RpcCallback, + n_rpc.RpcCallback, sg_db_rpc.SecurityGroupServerRpcCallbackMixin): RPC_API_VERSION = sg_rpc.SG_RPC_VERSION @@ -705,7 +705,7 @@ class SecurityGroupServerRpcCallback( return port -class NECPluginV2RPCCallbacks(rpc_compat.RpcCallback): +class NECPluginV2RPCCallbacks(n_rpc.RpcCallback): RPC_API_VERSION = '1.0' diff --git a/neutron/plugins/ofagent/agent/ofa_neutron_agent.py b/neutron/plugins/ofagent/agent/ofa_neutron_agent.py index 6e6cd84d7f..a38e584618 100644 --- a/neutron/plugins/ofagent/agent/ofa_neutron_agent.py +++ b/neutron/plugins/ofagent/agent/ofa_neutron_agent.py @@ -33,7 +33,7 @@ from neutron.agent.linux import utils from neutron.agent import rpc as agent_rpc from neutron.agent import securitygroups_rpc as sg_rpc from neutron.common import constants as n_const -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.common import utils as n_utils from neutron import context @@ -159,7 +159,7 @@ class OFANeutronAgentRyuApp(app_manager.RyuApp): agent.daemon_loop() -class OFANeutronAgent(rpc_compat.RpcCallback, +class OFANeutronAgent(n_rpc.RpcCallback, sg_rpc.SecurityGroupAgentRpcCallbackMixin): """A agent for OpenFlow Agent ML2 mechanism driver. diff --git a/neutron/plugins/oneconvergence/agent/nvsd_neutron_agent.py b/neutron/plugins/oneconvergence/agent/nvsd_neutron_agent.py index 377cdda1e9..674cc197aa 100644 --- a/neutron/plugins/oneconvergence/agent/nvsd_neutron_agent.py +++ b/neutron/plugins/oneconvergence/agent/nvsd_neutron_agent.py @@ -27,7 +27,7 @@ from neutron.agent.linux import ovs_lib from neutron.agent import rpc as agent_rpc from neutron.agent import securitygroups_rpc as sg_rpc from neutron.common import config as common_config -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron import context as n_context from neutron.extensions import securitygroup as ext_sg @@ -37,7 +37,7 @@ from neutron.plugins.oneconvergence.lib import config LOG = logging.getLogger(__name__) -class NVSDAgentRpcCallback(rpc_compat.RpcCallback): +class NVSDAgentRpcCallback(n_rpc.RpcCallback): RPC_API_VERSION = '1.0' @@ -59,7 +59,7 @@ class NVSDAgentRpcCallback(rpc_compat.RpcCallback): self.sg_agent.refresh_firewall() -class SecurityGroupServerRpcApi(rpc_compat.RpcProxy, +class SecurityGroupServerRpcApi(n_rpc.RpcProxy, sg_rpc.SecurityGroupServerRpcApiMixin): def __init__(self, topic): super(SecurityGroupServerRpcApi, self).__init__( @@ -67,7 +67,7 @@ class SecurityGroupServerRpcApi(rpc_compat.RpcProxy, class SecurityGroupAgentRpcCallback( - rpc_compat.RpcCallback, + n_rpc.RpcCallback, sg_rpc.SecurityGroupAgentRpcCallbackMixin): RPC_API_VERSION = sg_rpc.SG_RPC_VERSION @@ -88,7 +88,7 @@ class SecurityGroupAgentRpc(sg_rpc.SecurityGroupAgentRpcMixin): self.init_firewall() -class NVSDNeutronAgent(rpc_compat.RpcCallback): +class NVSDNeutronAgent(n_rpc.RpcCallback): # history # 1.0 Initial version # 1.1 Support Security Group RPC diff --git a/neutron/plugins/oneconvergence/plugin.py b/neutron/plugins/oneconvergence/plugin.py index 257ab5494e..1456007bdf 100644 --- a/neutron/plugins/oneconvergence/plugin.py +++ b/neutron/plugins/oneconvergence/plugin.py @@ -23,7 +23,7 @@ from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api from neutron.api.rpc.agentnotifiers import l3_rpc_agent_api from neutron.common import constants as q_const from neutron.common import exceptions as nexception -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.db import agents_db from neutron.db import agentschedulers_db @@ -51,7 +51,7 @@ LOG = logging.getLogger(__name__) IPv6 = 6 -class NVSDPluginRpcCallbacks(rpc_compat.RpcCallback, +class NVSDPluginRpcCallbacks(n_rpc.RpcCallback, dhcp_rpc_base.DhcpRpcCallbackMixin, l3_rpc_base.L3RpcCallbackMixin, sg_db_rpc.SecurityGroupServerRpcCallbackMixin): @@ -66,7 +66,7 @@ class NVSDPluginRpcCallbacks(rpc_compat.RpcCallback, return port -class NVSDPluginV2AgentNotifierApi(rpc_compat.RpcProxy, +class NVSDPluginV2AgentNotifierApi(n_rpc.RpcProxy, sg_rpc.SecurityGroupAgentRpcApiMixin): BASE_RPC_API_VERSION = '1.0' @@ -153,7 +153,7 @@ class OneConvergencePluginV2(db_base_plugin_v2.NeutronDbPluginV2, # RPC support self.service_topics = {svc_constants.CORE: topics.PLUGIN, svc_constants.L3_ROUTER_NAT: topics.L3PLUGIN} - self.conn = rpc_compat.create_connection(new=True) + self.conn = n_rpc.create_connection(new=True) self.notifier = NVSDPluginV2AgentNotifierApi(topics.AGENT) self.agent_notifiers[q_const.AGENT_TYPE_DHCP] = ( dhcp_rpc_agent_api.DhcpAgentNotifyAPI() diff --git a/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py b/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py index 46b9bf4f08..a45c59a938 100644 --- a/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py +++ b/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py @@ -35,7 +35,7 @@ from neutron.agent import rpc as agent_rpc from neutron.agent import securitygroups_rpc as sg_rpc from neutron.common import config as common_config from neutron.common import constants as q_const -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.common import utils as q_utils from neutron import context @@ -86,7 +86,7 @@ class OVSSecurityGroupAgent(sg_rpc.SecurityGroupAgentRpcMixin): self.init_firewall(defer_refresh_firewall=True) -class OVSNeutronAgent(rpc_compat.RpcCallback, +class OVSNeutronAgent(n_rpc.RpcCallback, sg_rpc.SecurityGroupAgentRpcCallbackMixin, l2population_rpc.L2populationRpcCallBackMixin): '''Implements OVS-based tunneling, VLANs and flat networks. diff --git a/neutron/plugins/openvswitch/ovs_neutron_plugin.py b/neutron/plugins/openvswitch/ovs_neutron_plugin.py index 31698a3df5..ebfeacf10f 100644 --- a/neutron/plugins/openvswitch/ovs_neutron_plugin.py +++ b/neutron/plugins/openvswitch/ovs_neutron_plugin.py @@ -23,7 +23,7 @@ from neutron.api.rpc.agentnotifiers import l3_rpc_agent_api from neutron.api.v2 import attributes from neutron.common import constants as q_const from neutron.common import exceptions as n_exc -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.common import utils from neutron.db import agents_db @@ -57,7 +57,7 @@ from neutron.plugins.openvswitch import ovs_db_v2 LOG = logging.getLogger(__name__) -class OVSRpcCallbacks(rpc_compat.RpcCallback, +class OVSRpcCallbacks(n_rpc.RpcCallback, dhcp_rpc_base.DhcpRpcCallbackMixin, l3_rpc_base.L3RpcCallbackMixin, sg_db_rpc.SecurityGroupServerRpcCallbackMixin): @@ -173,7 +173,7 @@ class OVSRpcCallbacks(rpc_compat.RpcCallback, return entry -class AgentNotifierApi(rpc_compat.RpcProxy, +class AgentNotifierApi(n_rpc.RpcProxy, sg_rpc.SecurityGroupAgentRpcApiMixin): '''Agent side of the openvswitch rpc API. @@ -325,7 +325,7 @@ class OVSNeutronPluginV2(db_base_plugin_v2.NeutronDbPluginV2, # RPC support self.service_topics = {svc_constants.CORE: topics.PLUGIN, svc_constants.L3_ROUTER_NAT: topics.L3PLUGIN} - self.conn = rpc_compat.create_connection(new=True) + self.conn = n_rpc.create_connection(new=True) self.notifier = AgentNotifierApi(topics.AGENT) self.agent_notifiers[q_const.AGENT_TYPE_DHCP] = ( dhcp_rpc_agent_api.DhcpAgentNotifyAPI() diff --git a/neutron/plugins/ryu/agent/ryu_neutron_agent.py b/neutron/plugins/ryu/agent/ryu_neutron_agent.py index d1fac31852..18db0f9190 100755 --- a/neutron/plugins/ryu/agent/ryu_neutron_agent.py +++ b/neutron/plugins/ryu/agent/ryu_neutron_agent.py @@ -37,7 +37,7 @@ from neutron.agent import rpc as agent_rpc from neutron.agent import securitygroups_rpc as sg_rpc from neutron.common import config as common_config from neutron.common import exceptions as n_exc -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron import context as q_context from neutron.extensions import securitygroup as ext_sg @@ -180,7 +180,7 @@ class RyuSecurityGroupAgent(sg_rpc.SecurityGroupAgentRpcMixin): self.init_firewall() -class OVSNeutronOFPRyuAgent(rpc_compat.RpcCallback, +class OVSNeutronOFPRyuAgent(n_rpc.RpcCallback, sg_rpc.SecurityGroupAgentRpcCallbackMixin): RPC_API_VERSION = '1.1' diff --git a/neutron/plugins/ryu/ryu_neutron_plugin.py b/neutron/plugins/ryu/ryu_neutron_plugin.py index fd6426c45b..34ace9d7d0 100644 --- a/neutron/plugins/ryu/ryu_neutron_plugin.py +++ b/neutron/plugins/ryu/ryu_neutron_plugin.py @@ -22,7 +22,7 @@ from ryu.app import rest_nw_id from neutron.agent import securitygroups_rpc as sg_rpc from neutron.common import constants as q_const from neutron.common import exceptions as n_exc -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.db import api as db from neutron.db import db_base_plugin_v2 @@ -45,7 +45,7 @@ from neutron.plugins.ryu.db import api_v2 as db_api_v2 LOG = logging.getLogger(__name__) -class RyuRpcCallbacks(rpc_compat.RpcCallback, +class RyuRpcCallbacks(n_rpc.RpcCallback, dhcp_rpc_base.DhcpRpcCallbackMixin, l3_rpc_base.L3RpcCallbackMixin, sg_db_rpc.SecurityGroupServerRpcCallbackMixin): @@ -68,7 +68,7 @@ class RyuRpcCallbacks(rpc_compat.RpcCallback, return port -class AgentNotifierApi(rpc_compat.RpcProxy, +class AgentNotifierApi(n_rpc.RpcProxy, sg_rpc.SecurityGroupAgentRpcApiMixin): BASE_RPC_API_VERSION = '1.0' @@ -137,7 +137,7 @@ class RyuNeutronPluginV2(db_base_plugin_v2.NeutronDbPluginV2, def _setup_rpc(self): self.service_topics = {svc_constants.CORE: topics.PLUGIN, svc_constants.L3_ROUTER_NAT: topics.L3PLUGIN} - self.conn = rpc_compat.create_connection(new=True) + self.conn = n_rpc.create_connection(new=True) self.notifier = AgentNotifierApi(topics.AGENT) self.endpoints = [RyuRpcCallbacks(self.ofp_api_host)] for svc_topic in self.service_topics.values(): diff --git a/neutron/plugins/vmware/dhcp_meta/rpc.py b/neutron/plugins/vmware/dhcp_meta/rpc.py index af19bc601e..e4e06134bc 100644 --- a/neutron/plugins/vmware/dhcp_meta/rpc.py +++ b/neutron/plugins/vmware/dhcp_meta/rpc.py @@ -22,7 +22,7 @@ from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api from neutron.api.v2 import attributes from neutron.common import constants as const from neutron.common import exceptions as ntn_exc -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.db import db_base_plugin_v2 from neutron.db import dhcp_rpc_base from neutron.db import l3_db @@ -40,7 +40,7 @@ METADATA_GATEWAY_IP = '169.254.169.253' METADATA_DHCP_ROUTE = '169.254.169.254/32' -class NSXRpcCallbacks(rpc_compat.RpcCallback, +class NSXRpcCallbacks(n_rpc.RpcCallback, dhcp_rpc_base.DhcpRpcCallbackMixin): RPC_API_VERSION = '1.1' diff --git a/neutron/plugins/vmware/dhcpmeta_modes.py b/neutron/plugins/vmware/dhcpmeta_modes.py index 0ce2112f60..6312700b78 100644 --- a/neutron/plugins/vmware/dhcpmeta_modes.py +++ b/neutron/plugins/vmware/dhcpmeta_modes.py @@ -19,7 +19,7 @@ from oslo.config import cfg from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api from neutron.common import constants as const -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.db import agents_db from neutron.openstack.common import importutils @@ -70,7 +70,7 @@ class DhcpMetadataAccess(object): def _setup_rpc_dhcp_metadata(self, notifier=None): self.topic = topics.PLUGIN - self.conn = rpc_compat.create_connection(new=True) + self.conn = n_rpc.create_connection(new=True) self.endpoints = [nsx_rpc.NSXRpcCallbacks(), agents_db.AgentExtRpcCallback()] self.conn.create_consumer(self.topic, self.endpoints, fanout=False) diff --git a/neutron/service.py b/neutron/service.py index c26182bc5d..cf357d16fa 100644 --- a/neutron/service.py +++ b/neutron/service.py @@ -22,7 +22,7 @@ from oslo.config import cfg from oslo.messaging import server as rpc_server from neutron.common import config -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron import context from neutron.db import api as session from neutron import manager @@ -180,7 +180,7 @@ def _run_wsgi(app_name): return server -class Service(rpc_compat.Service): +class Service(n_rpc.Service): """Service object for binaries running on hosts. A service takes a manager and enables rpc by listening to queues based diff --git a/neutron/services/firewall/agents/firewall_agent_api.py b/neutron/services/firewall/agents/firewall_agent_api.py index 9bd917d4c2..9dcc44ae08 100644 --- a/neutron/services/firewall/agents/firewall_agent_api.py +++ b/neutron/services/firewall/agents/firewall_agent_api.py @@ -19,7 +19,7 @@ from oslo.config import cfg -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.openstack.common import log as logging LOG = logging.getLogger(__name__) @@ -37,7 +37,7 @@ FWaaSOpts = [ cfg.CONF.register_opts(FWaaSOpts, 'fwaas') -class FWaaSPluginApiMixin(rpc_compat.RpcProxy): +class FWaaSPluginApiMixin(n_rpc.RpcProxy): """Agent side of the FWaaS agent to FWaaS Plugin RPC API.""" RPC_API_VERSION = '1.0' diff --git a/neutron/services/firewall/fwaas_plugin.py b/neutron/services/firewall/fwaas_plugin.py index a63863e996..27a5439306 100644 --- a/neutron/services/firewall/fwaas_plugin.py +++ b/neutron/services/firewall/fwaas_plugin.py @@ -18,7 +18,7 @@ from oslo.config import cfg from neutron.common import exceptions as n_exception -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron import context as neutron_context from neutron.db import api as qdbapi @@ -31,7 +31,7 @@ from neutron.plugins.common import constants as const LOG = logging.getLogger(__name__) -class FirewallCallbacks(rpc_compat.RpcCallback): +class FirewallCallbacks(n_rpc.RpcCallback): RPC_API_VERSION = '1.0' def __init__(self, plugin): @@ -101,7 +101,7 @@ class FirewallCallbacks(rpc_compat.RpcCallback): return fw_tenant_list -class FirewallAgentApi(rpc_compat.RpcProxy): +class FirewallAgentApi(n_rpc.RpcProxy): """Plugin side of plugin to agent RPC API.""" API_VERSION = '1.0' @@ -162,7 +162,7 @@ class FirewallPlugin(firewall_db.Firewall_db_mixin): self.endpoints = [FirewallCallbacks(self)] - self.conn = rpc_compat.create_connection(new=True) + self.conn = n_rpc.create_connection(new=True) self.conn.create_consumer( topics.FIREWALL_PLUGIN, self.endpoints, fanout=False) self.conn.consume_in_threads() diff --git a/neutron/services/l3_router/l3_router_plugin.py b/neutron/services/l3_router/l3_router_plugin.py index 29c638ddc4..c018a3c4e6 100644 --- a/neutron/services/l3_router/l3_router_plugin.py +++ b/neutron/services/l3_router/l3_router_plugin.py @@ -19,7 +19,7 @@ from oslo.config import cfg from neutron.api.rpc.agentnotifiers import l3_rpc_agent_api from neutron.common import constants as q_const -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.db import api as qdbapi from neutron.db import db_base_plugin_v2 @@ -32,7 +32,7 @@ from neutron.openstack.common import importutils from neutron.plugins.common import constants -class L3RouterPluginRpcCallbacks(rpc_compat.RpcCallback, +class L3RouterPluginRpcCallbacks(n_rpc.RpcCallback, l3_rpc_base.L3RpcCallbackMixin): RPC_API_VERSION = '1.1' @@ -63,7 +63,7 @@ class L3RouterPlugin(db_base_plugin_v2.CommonDbMixin, def setup_rpc(self): # RPC support self.topic = topics.L3PLUGIN - self.conn = rpc_compat.create_connection(new=True) + self.conn = n_rpc.create_connection(new=True) self.agent_notifiers.update( {q_const.AGENT_TYPE_L3: l3_rpc_agent_api.L3AgentNotifyAPI()}) self.endpoints = [L3RouterPluginRpcCallbacks()] diff --git a/neutron/services/loadbalancer/agent/agent.py b/neutron/services/loadbalancer/agent/agent.py index 7c7a13c083..0434c688c8 100644 --- a/neutron/services/loadbalancer/agent/agent.py +++ b/neutron/services/loadbalancer/agent/agent.py @@ -24,7 +24,7 @@ from oslo.config import cfg from neutron.agent.common import config from neutron.agent.linux import interface from neutron.common import config as common_config -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.openstack.common import service from neutron.services.loadbalancer.agent import agent_manager as manager @@ -38,7 +38,7 @@ OPTS = [ ] -class LbaasAgentService(rpc_compat.Service): +class LbaasAgentService(n_rpc.Service): def start(self): super(LbaasAgentService, self).start() self.tg.add_timer( diff --git a/neutron/services/loadbalancer/agent/agent_api.py b/neutron/services/loadbalancer/agent/agent_api.py index a2d981a6fe..eb2a165c55 100644 --- a/neutron/services/loadbalancer/agent/agent_api.py +++ b/neutron/services/loadbalancer/agent/agent_api.py @@ -14,10 +14,10 @@ # # @author: Mark McClain, DreamHost -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc -class LbaasAgentApi(rpc_compat.RpcProxy): +class LbaasAgentApi(n_rpc.RpcProxy): """Agent side of the Agent to Plugin RPC API.""" API_VERSION = '2.0' diff --git a/neutron/services/loadbalancer/agent/agent_manager.py b/neutron/services/loadbalancer/agent/agent_manager.py index 74d7c717d7..52da4f5eee 100644 --- a/neutron/services/loadbalancer/agent/agent_manager.py +++ b/neutron/services/loadbalancer/agent/agent_manager.py @@ -19,7 +19,7 @@ from oslo.config import cfg from neutron.agent import rpc as agent_rpc from neutron.common import constants as n_const from neutron.common import exceptions as n_exc -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron import context from neutron.openstack.common import importutils @@ -45,7 +45,7 @@ class DeviceNotFoundOnAgent(n_exc.NotFound): msg = _('Unknown device with pool_id %(pool_id)s') -class LbaasAgentManager(rpc_compat.RpcCallback, periodic_task.PeriodicTasks): +class LbaasAgentManager(n_rpc.RpcCallback, periodic_task.PeriodicTasks): RPC_API_VERSION = '2.0' # history diff --git a/neutron/services/loadbalancer/drivers/common/agent_driver_base.py b/neutron/services/loadbalancer/drivers/common/agent_driver_base.py index ad87041914..0f8e036d11 100644 --- a/neutron/services/loadbalancer/drivers/common/agent_driver_base.py +++ b/neutron/services/loadbalancer/drivers/common/agent_driver_base.py @@ -20,7 +20,7 @@ from oslo.config import cfg from neutron.common import constants as q_const from neutron.common import exceptions as n_exc -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.db import agents_db from neutron.db.loadbalancer import loadbalancer_db @@ -49,7 +49,7 @@ class DriverNotSpecified(n_exc.NeutronException): "in plugin driver.") -class LoadBalancerCallbacks(rpc_compat.RpcCallback): +class LoadBalancerCallbacks(n_rpc.RpcCallback): RPC_API_VERSION = '2.0' # history @@ -232,7 +232,7 @@ class LoadBalancerCallbacks(rpc_compat.RpcCallback): self.plugin.update_pool_stats(context, pool_id, data=stats) -class LoadBalancerAgentApi(rpc_compat.RpcProxy): +class LoadBalancerAgentApi(n_rpc.RpcProxy): """Plugin side of plugin to agent RPC API.""" BASE_RPC_API_VERSION = '2.0' @@ -341,7 +341,7 @@ class AgentDriverBase(abstract_driver.LoadBalancerAbstractDriver): LoadBalancerCallbacks(self.plugin), agents_db.AgentExtRpcCallback(self.plugin) ] - self.plugin.conn = rpc_compat.create_connection(new=True) + self.plugin.conn = n_rpc.create_connection(new=True) self.plugin.conn.create_consumer( topics.LOADBALANCER_PLUGIN, self.plugin.agent_endpoints, diff --git a/neutron/services/metering/agents/metering_agent.py b/neutron/services/metering/agents/metering_agent.py index 80883f41b3..2747fe8427 100644 --- a/neutron/services/metering/agents/metering_agent.py +++ b/neutron/services/metering/agents/metering_agent.py @@ -27,7 +27,6 @@ from neutron.agent import rpc as agent_rpc from neutron.common import config as common_config from neutron.common import constants as constants from neutron.common import rpc as n_rpc -from neutron.common import rpc_compat from neutron.common import topics from neutron.common import utils from neutron import context @@ -43,7 +42,7 @@ from neutron import service as neutron_service LOG = logging.getLogger(__name__) -class MeteringPluginRpc(rpc_compat.RpcProxy): +class MeteringPluginRpc(n_rpc.RpcProxy): BASE_RPC_API_VERSION = '1.0' diff --git a/neutron/services/metering/metering_plugin.py b/neutron/services/metering/metering_plugin.py index e67dbab60d..b2e9215b8e 100644 --- a/neutron/services/metering/metering_plugin.py +++ b/neutron/services/metering/metering_plugin.py @@ -15,7 +15,7 @@ # under the License. from neutron.api.rpc.agentnotifiers import metering_rpc_agent_api -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.db.metering import metering_db from neutron.db.metering import metering_rpc @@ -30,7 +30,7 @@ class MeteringPlugin(metering_db.MeteringDbMixin): self.endpoints = [metering_rpc.MeteringRpcCallbacks(self)] - self.conn = rpc_compat.create_connection(new=True) + self.conn = n_rpc.create_connection(new=True) self.conn.create_consumer( topics.METERING_PLUGIN, self.endpoints, fanout=False) self.conn.consume_in_threads() diff --git a/neutron/services/vpn/device_drivers/cisco_ipsec.py b/neutron/services/vpn/device_drivers/cisco_ipsec.py index 7d73735c1c..33a806d4bf 100644 --- a/neutron/services/vpn/device_drivers/cisco_ipsec.py +++ b/neutron/services/vpn/device_drivers/cisco_ipsec.py @@ -24,7 +24,7 @@ from oslo import messaging import six from neutron.common import exceptions -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron import context as ctx from neutron.openstack.common import lockutils from neutron.openstack.common import log as logging @@ -150,7 +150,7 @@ def find_available_csrs_from_config(config_files): return csrs_found -class CiscoCsrIPsecVpnDriverApi(rpc_compat.RpcProxy): +class CiscoCsrIPsecVpnDriverApi(n_rpc.RpcProxy): """RPC API for agent to plugin messaging.""" def get_vpn_services_on_host(self, context, host): @@ -192,7 +192,7 @@ class CiscoCsrIPsecDriver(device_drivers.DeviceDriver): def __init__(self, agent, host): self.host = host - self.conn = rpc_compat.create_connection(new=True) + self.conn = n_rpc.create_connection(new=True) context = ctx.get_admin_context_without_session() node_topic = '%s.%s' % (topics.CISCO_IPSEC_AGENT_TOPIC, self.host) diff --git a/neutron/services/vpn/device_drivers/ipsec.py b/neutron/services/vpn/device_drivers/ipsec.py index 1c9bad8791..6d2188fde5 100644 --- a/neutron/services/vpn/device_drivers/ipsec.py +++ b/neutron/services/vpn/device_drivers/ipsec.py @@ -26,7 +26,7 @@ import six from neutron.agent.linux import ip_lib from neutron.agent.linux import utils -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron import context from neutron.openstack.common import lockutils from neutron.openstack.common import log as logging @@ -441,7 +441,7 @@ class OpenSwanProcess(BaseSwanProcess): self.connection_status = {} -class IPsecVpnDriverApi(rpc_compat.RpcProxy): +class IPsecVpnDriverApi(n_rpc.RpcProxy): """IPSecVpnDriver RPC api.""" IPSEC_PLUGIN_VERSION = '1.0' @@ -494,7 +494,7 @@ class IPsecDriver(device_drivers.DeviceDriver): self.conf = self.agent.conf self.root_helper = self.agent.root_helper self.host = host - self.conn = rpc_compat.create_connection(new=True) + self.conn = n_rpc.create_connection(new=True) self.context = context.get_admin_context_without_session() self.topic = topics.IPSEC_AGENT_TOPIC node_topic = '%s.%s' % (self.topic, self.host) diff --git a/neutron/services/vpn/service_drivers/__init__.py b/neutron/services/vpn/service_drivers/__init__.py index 3bd45670f6..17db33384f 100644 --- a/neutron/services/vpn/service_drivers/__init__.py +++ b/neutron/services/vpn/service_drivers/__init__.py @@ -17,7 +17,7 @@ import abc import six -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron import manager from neutron.openstack.common import log as logging from neutron.plugins.common import constants @@ -49,7 +49,7 @@ class VpnDriver(object): pass -class BaseIPsecVpnAgentApi(rpc_compat.RpcProxy): +class BaseIPsecVpnAgentApi(n_rpc.RpcProxy): """Base class for IPSec API to agent.""" def __init__(self, to_agent_topic, topic, default_version): diff --git a/neutron/services/vpn/service_drivers/cisco_ipsec.py b/neutron/services/vpn/service_drivers/cisco_ipsec.py index ed34f41ff7..93ce79232f 100644 --- a/neutron/services/vpn/service_drivers/cisco_ipsec.py +++ b/neutron/services/vpn/service_drivers/cisco_ipsec.py @@ -16,7 +16,7 @@ import netaddr from netaddr import core as net_exc from neutron.common import exceptions -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.openstack.common import excutils from neutron.openstack.common import log as logging from neutron.plugins.common import constants @@ -40,7 +40,7 @@ class CsrValidationFailure(exceptions.BadRequest): "with value '%(value)s'") -class CiscoCsrIPsecVpnDriverCallBack(rpc_compat.RpcCallback): +class CiscoCsrIPsecVpnDriverCallBack(n_rpc.RpcCallback): """Handler for agent to plugin RPC messaging.""" @@ -68,7 +68,7 @@ class CiscoCsrIPsecVpnDriverCallBack(rpc_compat.RpcCallback): class CiscoCsrIPsecVpnAgentApi(service_drivers.BaseIPsecVpnAgentApi, - rpc_compat.RpcCallback): + n_rpc.RpcCallback): """API and handler for Cisco IPSec plugin to agent RPC messaging.""" @@ -86,7 +86,7 @@ class CiscoCsrIPsecVPNDriver(service_drivers.VpnDriver): def __init__(self, service_plugin): super(CiscoCsrIPsecVPNDriver, self).__init__(service_plugin) self.endpoints = [CiscoCsrIPsecVpnDriverCallBack(self)] - self.conn = rpc_compat.create_connection(new=True) + self.conn = n_rpc.create_connection(new=True) self.conn.create_consumer( topics.CISCO_IPSEC_DRIVER_TOPIC, self.endpoints, fanout=False) self.conn.consume_in_threads() diff --git a/neutron/services/vpn/service_drivers/ipsec.py b/neutron/services/vpn/service_drivers/ipsec.py index 7a7886df7d..e3c2ee2317 100644 --- a/neutron/services/vpn/service_drivers/ipsec.py +++ b/neutron/services/vpn/service_drivers/ipsec.py @@ -14,7 +14,7 @@ # under the License. import netaddr -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.openstack.common import log as logging from neutron.services.vpn.common import topics from neutron.services.vpn import service_drivers @@ -26,7 +26,7 @@ IPSEC = 'ipsec' BASE_IPSEC_VERSION = '1.0' -class IPsecVpnDriverCallBack(rpc_compat.RpcCallback): +class IPsecVpnDriverCallBack(n_rpc.RpcCallback): """Callback for IPSecVpnDriver rpc.""" # history @@ -53,7 +53,7 @@ class IPsecVpnDriverCallBack(rpc_compat.RpcCallback): class IPsecVpnAgentApi(service_drivers.BaseIPsecVpnAgentApi, - rpc_compat.RpcCallback): + n_rpc.RpcCallback): """Agent RPC API for IPsecVPNAgent.""" RPC_API_VERSION = BASE_IPSEC_VERSION @@ -69,7 +69,7 @@ class IPsecVPNDriver(service_drivers.VpnDriver): def __init__(self, service_plugin): super(IPsecVPNDriver, self).__init__(service_plugin) self.endpoints = [IPsecVpnDriverCallBack(self)] - self.conn = rpc_compat.create_connection(new=True) + self.conn = n_rpc.create_connection(new=True) self.conn.create_consumer( topics.IPSEC_DRIVER_TOPIC, self.endpoints, fanout=False) self.conn.consume_in_threads() diff --git a/neutron/tests/base.py b/neutron/tests/base.py index dcd12057f1..253210f768 100644 --- a/neutron/tests/base.py +++ b/neutron/tests/base.py @@ -170,7 +170,7 @@ class BaseTestCase(testtools.TestCase): # don't actually start RPC listeners when testing self.useFixture(fixtures.MonkeyPatch( - 'neutron.common.rpc_compat.Connection.consume_in_threads', + 'neutron.common.rpc.Connection.consume_in_threads', fake_consume_in_threads)) self.useFixture(fixtures.MonkeyPatch( diff --git a/neutron/tests/unit/hyperv/test_hyperv_rpcapi.py b/neutron/tests/unit/hyperv/test_hyperv_rpcapi.py index ff64b8aecc..e04bd0156b 100644 --- a/neutron/tests/unit/hyperv/test_hyperv_rpcapi.py +++ b/neutron/tests/unit/hyperv/test_hyperv_rpcapi.py @@ -21,7 +21,7 @@ Unit Tests for hyperv neutron rpc import mock from neutron.agent import rpc as agent_rpc -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.openstack.common import context from neutron.plugins.hyperv import agent_notifier_api as ana @@ -39,7 +39,7 @@ class rpcHyperVApiTestCase(base.BaseTestCase): if rpc_method == 'cast' and method == 'run_instance': kwargs['call'] = False - proxy = rpc_compat.RpcProxy + proxy = n_rpc.RpcProxy with mock.patch.object(proxy, rpc_method) as rpc_method_mock: rpc_method_mock.return_value = expected_retval retval = getattr(rpcapi, method)(ctxt, **kwargs) diff --git a/neutron/tests/unit/linuxbridge/test_rpcapi.py b/neutron/tests/unit/linuxbridge/test_rpcapi.py index 71ccbd707c..78346c67de 100644 --- a/neutron/tests/unit/linuxbridge/test_rpcapi.py +++ b/neutron/tests/unit/linuxbridge/test_rpcapi.py @@ -46,7 +46,7 @@ class rpcApiTestCase(base.BaseTestCase): return expected_retval self.useFixture(fixtures.MonkeyPatch( - 'neutron.common.rpc_compat.RpcProxy.' + rpc_method, + 'neutron.common.rpc.RpcProxy.' + rpc_method, _fake_rpc_method)) retval = getattr(rpcapi, method)(ctxt, **kwargs) diff --git a/neutron/tests/unit/ml2/drivers/test_l2population.py b/neutron/tests/unit/ml2/drivers/test_l2population.py index d96be1ccd0..4ac07b1653 100644 --- a/neutron/tests/unit/ml2/drivers/test_l2population.py +++ b/neutron/tests/unit/ml2/drivers/test_l2population.py @@ -117,11 +117,11 @@ class TestL2PopulationRpcTestCase(test_plugin.NeutronDbPluginV2TestCase): self.fanout_topic = topics.get_topic_name(topics.AGENT, topics.L2POPULATION, topics.UPDATE) - fanout = ('neutron.common.rpc_compat.RpcProxy.fanout_cast') + fanout = ('neutron.common.rpc.RpcProxy.fanout_cast') fanout_patch = mock.patch(fanout) self.mock_fanout = fanout_patch.start() - cast = ('neutron.common.rpc_compat.RpcProxy.cast') + cast = ('neutron.common.rpc.RpcProxy.cast') cast_patch = mock.patch(cast) self.mock_cast = cast_patch.start() diff --git a/neutron/tests/unit/ml2/test_rpcapi.py b/neutron/tests/unit/ml2/test_rpcapi.py index af48a74f17..c552546ac0 100644 --- a/neutron/tests/unit/ml2/test_rpcapi.py +++ b/neutron/tests/unit/ml2/test_rpcapi.py @@ -20,7 +20,7 @@ Unit Tests for ml2 rpc import mock from neutron.agent import rpc as agent_rpc -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.openstack.common import context from neutron.plugins.ml2.drivers import type_tunnel @@ -37,7 +37,7 @@ class RpcApiTestCase(base.BaseTestCase): if rpc_method == 'cast' and method == 'run_instance': kwargs['call'] = False - rpc = rpc_compat.RpcProxy + rpc = n_rpc.RpcProxy with mock.patch.object(rpc, rpc_method) as rpc_method_mock: rpc_method_mock.return_value = expected_retval retval = getattr(rpcapi, method)(ctxt, **kwargs) diff --git a/neutron/tests/unit/mlnx/test_rpcapi.py b/neutron/tests/unit/mlnx/test_rpcapi.py index 27efedc785..674ba03e9e 100644 --- a/neutron/tests/unit/mlnx/test_rpcapi.py +++ b/neutron/tests/unit/mlnx/test_rpcapi.py @@ -48,7 +48,7 @@ class rpcApiTestCase(base.BaseTestCase): return expected_retval self.useFixture(fixtures.MonkeyPatch( - 'neutron.common.rpc_compat.RpcProxy.' + rpc_method, + 'neutron.common.rpc.RpcProxy.' + rpc_method, _fake_rpc_method)) retval = getattr(rpcapi, method)(ctxt, **kwargs) diff --git a/neutron/tests/unit/openvswitch/test_ovs_rpcapi.py b/neutron/tests/unit/openvswitch/test_ovs_rpcapi.py index 279c76d9e1..aca9d8b98c 100644 --- a/neutron/tests/unit/openvswitch/test_ovs_rpcapi.py +++ b/neutron/tests/unit/openvswitch/test_ovs_rpcapi.py @@ -45,7 +45,7 @@ class rpcApiTestCase(base.BaseTestCase): return expected_retval self.useFixture(fixtures.MonkeyPatch( - 'neutron.common.rpc_compat.RpcProxy.' + rpc_method, + 'neutron.common.rpc.RpcProxy.' + rpc_method, _fake_rpc_method)) retval = getattr(rpcapi, method)(ctxt, **kwargs) diff --git a/neutron/tests/unit/services/loadbalancer/agent/test_agent.py b/neutron/tests/unit/services/loadbalancer/agent/test_agent.py index 881b248d85..d8dd60513e 100644 --- a/neutron/tests/unit/services/loadbalancer/agent/test_agent.py +++ b/neutron/tests/unit/services/loadbalancer/agent/test_agent.py @@ -25,7 +25,7 @@ from neutron.tests import base class TestLbaasService(base.BaseTestCase): def test_start(self): with mock.patch.object( - agent.rpc_compat.Service, 'start' + agent.n_rpc.Service, 'start' ) as mock_start: mgr = mock.Mock() diff --git a/neutron/tests/unit/services/metering/test_metering_plugin.py b/neutron/tests/unit/services/metering/test_metering_plugin.py index 7d7c4c025c..04ac8d2d7d 100644 --- a/neutron/tests/unit/services/metering/test_metering_plugin.py +++ b/neutron/tests/unit/services/metering/test_metering_plugin.py @@ -83,7 +83,7 @@ class TestMeteringPlugin(test_db_plugin.NeutronDbPluginV2TestCase, self.uuid_patch = mock.patch(uuid, return_value=self.uuid) self.mock_uuid = self.uuid_patch.start() - fanout = ('neutron.common.rpc_compat.RpcProxy.fanout_cast') + fanout = ('neutron.common.rpc.RpcProxy.fanout_cast') self.fanout_patch = mock.patch(fanout) self.mock_fanout = self.fanout_patch.start() @@ -290,7 +290,7 @@ class TestMeteringPluginL3AgentScheduler( self.uuid_patch = mock.patch(uuid, return_value=self.uuid) self.mock_uuid = self.uuid_patch.start() - cast = 'neutron.common.rpc_compat.RpcProxy.cast' + cast = 'neutron.common.rpc.RpcProxy.cast' self.cast_patch = mock.patch(cast) self.mock_cast = self.cast_patch.start() diff --git a/neutron/tests/unit/services/vpn/device_drivers/test_cisco_ipsec.py b/neutron/tests/unit/services/vpn/device_drivers/test_cisco_ipsec.py index 3c29e7551f..b92b77cff0 100644 --- a/neutron/tests/unit/services/vpn/device_drivers/test_cisco_ipsec.py +++ b/neutron/tests/unit/services/vpn/device_drivers/test_cisco_ipsec.py @@ -399,7 +399,7 @@ class TestCiscoCsrIPsecDeviceDriverSyncStatuses(base.BaseTestCase): def setUp(self): super(TestCiscoCsrIPsecDeviceDriverSyncStatuses, self).setUp() - for klass in ['neutron.common.rpc_compat.create_connection', + for klass in ['neutron.common.rpc.create_connection', 'neutron.context.get_admin_context_without_session', 'neutron.openstack.common.' 'loopingcall.FixedIntervalLoopingCall']: diff --git a/neutron/tests/unit/services/vpn/device_drivers/test_ipsec.py b/neutron/tests/unit/services/vpn/device_drivers/test_ipsec.py index d10ae3d5be..bec8b78ce7 100644 --- a/neutron/tests/unit/services/vpn/device_drivers/test_ipsec.py +++ b/neutron/tests/unit/services/vpn/device_drivers/test_ipsec.py @@ -45,7 +45,7 @@ class TestIPsecDeviceDriver(base.BaseTestCase): 'os.makedirs', 'os.path.isdir', 'neutron.agent.linux.utils.replace_file', - 'neutron.common.rpc_compat.create_connection', + 'neutron.common.rpc.create_connection', 'neutron.services.vpn.device_drivers.ipsec.' 'OpenSwanProcess._gen_config_content', 'shutil.rmtree', diff --git a/neutron/tests/unit/services/vpn/service_drivers/test_cisco_ipsec.py b/neutron/tests/unit/services/vpn/service_drivers/test_cisco_ipsec.py index f78d8b16c0..7a59acedcc 100644 --- a/neutron/tests/unit/services/vpn/service_drivers/test_cisco_ipsec.py +++ b/neutron/tests/unit/services/vpn/service_drivers/test_cisco_ipsec.py @@ -44,7 +44,7 @@ class TestCiscoIPsecDriverValidation(base.BaseTestCase): def setUp(self): super(TestCiscoIPsecDriverValidation, self).setUp() - mock.patch('neutron.common.rpc_compat.create_connection').start() + mock.patch('neutron.common.rpc.create_connection').start() self.service_plugin = mock.Mock() self.driver = ipsec_driver.CiscoCsrIPsecVPNDriver(self.service_plugin) self.context = n_ctx.Context('some_user', 'some_tenant') @@ -284,7 +284,7 @@ class TestCiscoIPsecDriver(base.BaseTestCase): super(TestCiscoIPsecDriver, self).setUp() dbapi.configure_db() self.addCleanup(dbapi.clear_db) - mock.patch('neutron.common.rpc_compat.create_connection').start() + mock.patch('neutron.common.rpc.create_connection').start() l3_agent = mock.Mock() l3_agent.host = FAKE_HOST diff --git a/neutron/tests/unit/services/vpn/service_drivers/test_ipsec.py b/neutron/tests/unit/services/vpn/service_drivers/test_ipsec.py index 713f8d8464..646827e0e2 100644 --- a/neutron/tests/unit/services/vpn/service_drivers/test_ipsec.py +++ b/neutron/tests/unit/services/vpn/service_drivers/test_ipsec.py @@ -35,7 +35,7 @@ FAKE_HOST = 'fake_host' class TestIPsecDriver(base.BaseTestCase): def setUp(self): super(TestIPsecDriver, self).setUp() - mock.patch('neutron.common.rpc_compat.create_connection').start() + mock.patch('neutron.common.rpc.create_connection').start() l3_agent = mock.Mock() l3_agent.host = FAKE_HOST diff --git a/neutron/tests/unit/test_agent_rpc.py b/neutron/tests/unit/test_agent_rpc.py index 4eb48e3e31..c2fa412119 100644 --- a/neutron/tests/unit/test_agent_rpc.py +++ b/neutron/tests/unit/test_agent_rpc.py @@ -25,7 +25,7 @@ class AgentRPCPluginApi(base.BaseTestCase): agent = rpc.PluginApi('fake_topic') ctxt = context.RequestContext('fake_user', 'fake_project') expect_val = 'foo' - with mock.patch('neutron.common.rpc_compat.RpcProxy.call') as rpc_call: + with mock.patch('neutron.common.rpc.RpcProxy.call') as rpc_call: rpc_call.return_value = expect_val func_obj = getattr(agent, method) if method == 'tunnel_sync': @@ -89,7 +89,7 @@ class AgentRPCMethods(base.BaseTestCase): mock.call().consume_in_threads() ] - call_to_patch = 'neutron.common.rpc_compat.create_connection' + call_to_patch = 'neutron.common.rpc.create_connection' with mock.patch(call_to_patch) as create_connection: rpc.create_consumers(endpoints, 'foo', [('topic', 'op')]) create_connection.assert_has_calls(expected) @@ -105,7 +105,7 @@ class AgentRPCMethods(base.BaseTestCase): mock.call().consume_in_threads() ] - call_to_patch = 'neutron.common.rpc_compat.create_connection' + call_to_patch = 'neutron.common.rpc.create_connection' with mock.patch(call_to_patch) as create_connection: rpc.create_consumers(endpoints, 'foo', [('topic', 'op', 'node1')]) create_connection.assert_has_calls(expected) diff --git a/neutron/tests/unit/test_dhcp_agent.py b/neutron/tests/unit/test_dhcp_agent.py index e5bc84095d..37ac61e0e2 100644 --- a/neutron/tests/unit/test_dhcp_agent.py +++ b/neutron/tests/unit/test_dhcp_agent.py @@ -29,7 +29,7 @@ from neutron.agent.linux import interface from neutron.common import config as common_config from neutron.common import constants as const from neutron.common import exceptions -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron.tests import base @@ -226,7 +226,7 @@ class TestDhcpAgent(base.BaseTestCase): def test_call_driver_remote_error_net_not_found(self): self._test_call_driver_failure( - exc=rpc_compat.RemoteError(exc_type='NetworkNotFound'), + exc=n_rpc.RemoteError(exc_type='NetworkNotFound'), trace_level='warning') def test_call_driver_network_not_found(self): diff --git a/neutron/tests/unit/test_security_groups_rpc.py b/neutron/tests/unit/test_security_groups_rpc.py index 49c85e1d80..6d2e7a970c 100644 --- a/neutron/tests/unit/test_security_groups_rpc.py +++ b/neutron/tests/unit/test_security_groups_rpc.py @@ -27,7 +27,7 @@ from neutron.agent import rpc as agent_rpc from neutron.agent import securitygroups_rpc as sg_rpc from neutron.common import constants as const from neutron.common import ipv6_utils as ipv6 -from neutron.common import rpc_compat +from neutron.common import rpc as n_rpc from neutron import context from neutron.db import securitygroups_rpc_base as sg_db_rpc from neutron.extensions import allowedaddresspairs as addr_pair @@ -1100,7 +1100,7 @@ class SecurityGroupServerRpcApiTestCase(base.BaseTestCase): topic='fake_topic')]) -class FakeSGNotifierAPI(rpc_compat.RpcProxy, +class FakeSGNotifierAPI(n_rpc.RpcProxy, sg_rpc.SecurityGroupAgentRpcApiMixin): pass