Introduced rpc_compat.create_connection()

This will be used to emulate oslo-rpc API using oslo.messaging.

blueprint oslo-messaging

Change-Id: I2c1aa159132e4aad0138d4b0b7ff90eb98ed400c

diff --git a/neutron/agent/rpc.py b/neutron/agent/rpc.py
index d005aa01d15becb4863b21aed1030574626e6e94..5d2abf978e31b7c4133f763ec40c0b3feae43c4e 100644 (file)
--- a/neutron/agent/rpc.py
+++ b/neutron/agent/rpc.py
@@ -21,7 +21,6 @@ from neutron.common import rpc_compat
 from neutron.common import topics
 
 from neutron.openstack.common import log as logging
-from neutron.openstack.common import rpc
 from neutron.openstack.common import timeutils
 
 
@@ -40,7 +39,7 @@ def create_consumers(dispatcher, prefix, topic_details):
     :returns: A common Connection.
     """
 
-    connection = rpc.create_connection(new=True)
+    connection = rpc_compat.create_connection(new=True)
     for details in topic_details:
         topic, operation, node_name = itertools.islice(
             itertools.chain(details, [None]), 3)

diff --git a/neutron/common/rpc_compat.py b/neutron/common/rpc_compat.py
index bf8d40c35c63487a3815a9549436163776f9946a..f494d533804f6e5a373e8a23538ed7eea8976eb6 100644 (file)
--- a/neutron/common/rpc_compat.py
+++ b/neutron/common/rpc_compat.py
@@ -60,7 +60,7 @@ class Service(service.Service):
     def start(self):
         super(Service, self).start()
 
-        self.conn = rpc.create_connection(new=True)
+        self.conn = create_connection(new=True)
         LOG.debug("Creating Consumer connection for Service %s" %
                   self.topic)
 
@@ -93,6 +93,10 @@ class Service(service.Service):
         super(Service, self).stop()
 
 
+# functions
+create_connection = rpc.create_connection
+
+
 # exceptions
 RPCException = rpc_common.RPCException
 RemoteError = rpc_common.RemoteError

diff --git a/neutron/plugins/bigswitch/plugin.py b/neutron/plugins/bigswitch/plugin.py
index 230098a2ca654bb319d05ce338ff6d60f8bb4313..1c81a9ab26252d7ecaad0edd73010a324d3d4a95 100644 (file)
--- a/neutron/plugins/bigswitch/plugin.py
+++ b/neutron/plugins/bigswitch/plugin.py
@@ -83,7 +83,6 @@ from neutron import manager
 from neutron.openstack.common import excutils
 from neutron.openstack.common import importutils
 from neutron.openstack.common import log as logging
-from neutron.openstack.common import rpc
 from neutron.plugins.bigswitch import config as pl_config
 from neutron.plugins.bigswitch.db import porttracker_db
 from neutron.plugins.bigswitch import extensions
@@ -505,7 +504,7 @@ class NeutronRestProxyV2(NeutronRestProxyV2Base,
         LOG.debug(_("NeutronRestProxyV2: initialization done"))
 
     def _setup_rpc(self):
-        self.conn = rpc.create_connection(new=True)
+        self.conn = rpc_compat.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 9eb4db2df5547b07869288892189f96ddeb8120d..9a654501e13e1cb7dbf67667dbc5e25e042bdce6 100644 (file)
--- a/neutron/plugins/brocade/NeutronPlugin.py
+++ b/neutron/plugins/brocade/NeutronPlugin.py
@@ -51,7 +51,6 @@ from neutron.extensions import securitygroup as ext_sg
 from neutron.openstack.common import context
 from neutron.openstack.common import importutils
 from neutron.openstack.common import log as logging
-from neutron.openstack.common import rpc
 from neutron.plugins.brocade.db import models as brocade_db
 from neutron.plugins.brocade import vlanbm as vbm
 from neutron.plugins.common import constants as svc_constants
@@ -264,7 +263,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.create_connection(new=True)
+        self.conn = rpc_compat.create_connection(new=True)
         self.callbacks = BridgeRpcCallbacks()
         self.dispatcher = self.callbacks.create_rpc_dispatcher()
         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 2f60e1790507b3f5d533c823ce98a911fe48b708..1294a8581984facde3a33678a1e9b462e5b3a648 100644 (file)
--- a/neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py
+++ b/neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py
@@ -45,7 +45,6 @@ from neutron.extensions import portbindings
 from neutron.extensions import providernet
 from neutron.openstack.common import importutils
 from neutron.openstack.common import log as logging
-from neutron.openstack.common import rpc
 from neutron.openstack.common import uuidutils as uuidutils
 from neutron.plugins.cisco.common import cisco_constants as c_const
 from neutron.plugins.cisco.common import cisco_credentials_v2 as c_cred
@@ -137,7 +136,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.create_connection(new=True)
+        self.conn = rpc_compat.create_connection(new=True)
         self.dispatcher = N1kvRpcCallbacks().create_rpc_dispatcher()
         for svc_topic in self.service_topics.values():
             self.conn.create_consumer(svc_topic, self.dispatcher, fanout=False)

diff --git a/neutron/plugins/hyperv/hyperv_neutron_plugin.py b/neutron/plugins/hyperv/hyperv_neutron_plugin.py
index e18bad8c725f02ebe87d1ddb0f2321d9d135e475..3bfb043ed587dac6f423323318d11b425a6c4852 100644 (file)
--- a/neutron/plugins/hyperv/hyperv_neutron_plugin.py
+++ b/neutron/plugins/hyperv/hyperv_neutron_plugin.py
@@ -20,6 +20,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 topics
 from neutron.db import agents_db
 from neutron.db import db_base_plugin_v2
@@ -30,7 +31,6 @@ from neutron.db import quota_db  # noqa
 from neutron.extensions import portbindings
 from neutron.extensions import providernet as provider
 from neutron.openstack.common import log as logging
-from neutron.openstack.common import rpc
 from neutron.plugins.common import constants as svc_constants
 from neutron.plugins.common import utils as plugin_utils
 from neutron.plugins.hyperv import agent_notifier_api
@@ -187,7 +187,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.create_connection(new=True)
+        self.conn = rpc_compat.create_connection(new=True)
         self.notifier = agent_notifier_api.AgentNotifierApi(
             topics.AGENT)
         self.callbacks = rpc_callbacks.HyperVRpcCallbacks(self.notifier)

diff --git a/neutron/plugins/ibm/sdnve_neutron_plugin.py b/neutron/plugins/ibm/sdnve_neutron_plugin.py
index fc613d1d87ce1edc60f0a4290fd9fe58aca61fe4..d3be17e5170a817137d200ea1ce4d069be2754e1 100644 (file)
--- a/neutron/plugins/ibm/sdnve_neutron_plugin.py
+++ b/neutron/plugins/ibm/sdnve_neutron_plugin.py
@@ -35,7 +35,6 @@ from neutron.db import quota_db  # noqa
 from neutron.extensions import portbindings
 from neutron.openstack.common import excutils
 from neutron.openstack.common import log as logging
-from neutron.openstack.common import rpc
 from neutron.plugins.ibm.common import config  # noqa
 from neutron.plugins.ibm.common import constants
 from neutron.plugins.ibm.common import exceptions as sdnve_exc
@@ -141,7 +140,7 @@ class SdnvePluginV2(db_base_plugin_v2.NeutronDbPluginV2,
     def setup_rpc(self):
         # RPC support
         self.topic = topics.PLUGIN
-        self.conn = rpc.create_connection(new=True)
+        self.conn = rpc_compat.create_connection(new=True)
         self.notifier = AgentNotifierApi(topics.AGENT)
         self.callbacks = SdnveRpcCallbacks(self.notifier)
         self.dispatcher = self.callbacks.create_rpc_dispatcher()

diff --git a/neutron/plugins/linuxbridge/lb_neutron_plugin.py b/neutron/plugins/linuxbridge/lb_neutron_plugin.py
index fdf3f00bcad19478ec6ddfb9d2d5297f16a9447f..ac7859966e09a7d103f4226681a7deb88b1d0f42 100644 (file)
--- a/neutron/plugins/linuxbridge/lb_neutron_plugin.py
+++ b/neutron/plugins/linuxbridge/lb_neutron_plugin.py
@@ -45,7 +45,6 @@ from neutron.extensions import providernet as provider
 from neutron import manager
 from neutron.openstack.common import importutils
 from neutron.openstack.common import log as logging
-from neutron.openstack.common import rpc
 from neutron.plugins.common import constants as svc_constants
 from neutron.plugins.common import utils as plugin_utils
 from neutron.plugins.linuxbridge.common import constants
@@ -283,7 +282,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.create_connection(new=True)
+        self.conn = rpc_compat.create_connection(new=True)
         self.callbacks = LinuxBridgeRpcCallbacks()
         self.dispatcher = self.callbacks.create_rpc_dispatcher()
         for svc_topic in self.service_topics.values():

diff --git a/neutron/plugins/midonet/plugin.py b/neutron/plugins/midonet/plugin.py
index 10f5af36160a061c5598ad3874a461ed088dc672..3902278e46453aa9c6907fd077ea3bb5e9750aa0 100644 (file)
--- a/neutron/plugins/midonet/plugin.py
+++ b/neutron/plugins/midonet/plugin.py
@@ -47,7 +47,6 @@ from neutron.extensions import portbindings
 from neutron.extensions import securitygroup as ext_sg
 from neutron.openstack.common import excutils
 from neutron.openstack.common import log as logging
-from neutron.openstack.common import rpc
 from neutron.plugins.midonet.common import config  # noqa
 from neutron.plugins.midonet.common import net_util
 from neutron.plugins.midonet import midonet_lib
@@ -384,7 +383,7 @@ class MidonetPluginV2(db_base_plugin_v2.NeutronDbPluginV2,
     def setup_rpc(self):
         # RPC support
         self.topic = topics.PLUGIN
-        self.conn = rpc.create_connection(new=True)
+        self.conn = rpc_compat.create_connection(new=True)
         self.callbacks = MidoRpcCallbacks()
         self.dispatcher = self.callbacks.create_rpc_dispatcher()
         self.conn.create_consumer(self.topic, self.dispatcher,

diff --git a/neutron/plugins/ml2/plugin.py b/neutron/plugins/ml2/plugin.py
index b501bc195801ac23f46f8b32fbdcb9aa66c4efb4..04f8df24a092751cd6bd8cfa6e5d13673b7186f0 100644 (file)
--- a/neutron/plugins/ml2/plugin.py
+++ b/neutron/plugins/ml2/plugin.py
@@ -23,6 +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 topics
 from neutron.db import agentschedulers_db
 from neutron.db import allowedaddresspairs_db as addr_pair_db
@@ -44,7 +45,6 @@ from neutron.openstack.common import importutils
 from neutron.openstack.common import jsonutils
 from neutron.openstack.common import lockutils
 from neutron.openstack.common import log
-from neutron.openstack.common import rpc as c_rpc
 from neutron.plugins.common import constants as service_constants
 from neutron.plugins.ml2.common import exceptions as ml2_exc
 from neutron.plugins.ml2 import config  # noqa
@@ -128,7 +128,7 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2,
     def start_rpc_listener(self):
         self.callbacks = rpc.RpcCallbacks(self.notifier, self.type_manager)
         self.topic = topics.PLUGIN
-        self.conn = c_rpc.create_connection(new=True)
+        self.conn = rpc_compat.create_connection(new=True)
         self.dispatcher = self.callbacks.create_rpc_dispatcher()
         self.conn.create_consumer(self.topic, self.dispatcher,
                                   fanout=False)

diff --git a/neutron/plugins/mlnx/mlnx_plugin.py b/neutron/plugins/mlnx/mlnx_plugin.py
index 48e8ae79590b55b9d092927e733fec6b84577bdf..371fe2d3877787e9735edda5c091d8cd329e0f25 100644 (file)
--- a/neutron/plugins/mlnx/mlnx_plugin.py
+++ b/neutron/plugins/mlnx/mlnx_plugin.py
@@ -25,6 +25,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 topics
 from neutron.common import utils
 from neutron.db import agentschedulers_db
@@ -40,7 +41,6 @@ from neutron.extensions import portbindings
 from neutron.extensions import providernet as provider
 from neutron.openstack.common import importutils
 from neutron.openstack.common import log as logging
-from neutron.openstack.common import rpc
 from neutron.plugins.common import constants as svc_constants
 from neutron.plugins.common import utils as plugin_utils
 from neutron.plugins.mlnx import agent_notify_api
@@ -119,7 +119,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.create_connection(new=True)
+        self.conn = rpc_compat.create_connection(new=True)
         self.callbacks = rpc_callbacks.MlnxRpcCallbacks()
         self.dispatcher = self.callbacks.create_rpc_dispatcher()
         for svc_topic in self.service_topics.values():

diff --git a/neutron/plugins/nec/nec_plugin.py b/neutron/plugins/nec/nec_plugin.py
index 7fd5d8214561687d63b9f6554e298af13471dfa5..e36f9d63eea46d8f43bedcef32ee8dfa971069c6 100644 (file)
--- a/neutron/plugins/nec/nec_plugin.py
+++ b/neutron/plugins/nec/nec_plugin.py
@@ -41,7 +41,6 @@ from neutron.extensions import portbindings
 from neutron.openstack.common import excutils
 from neutron.openstack.common import importutils
 from neutron.openstack.common import log as logging
-from neutron.openstack.common import rpc
 from neutron.openstack.common import uuidutils
 from neutron.plugins.common import constants as svc_constants
 from neutron.plugins.nec.common import config
@@ -137,7 +136,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.create_connection(new=True)
+        self.conn = rpc_compat.create_connection(new=True)
         self.notifier = NECPluginV2AgentNotifierApi(topics.AGENT)
         self.agent_notifiers[const.AGENT_TYPE_DHCP] = (
             dhcp_rpc_agent_api.DhcpAgentNotifyAPI()

diff --git a/neutron/plugins/oneconvergence/plugin.py b/neutron/plugins/oneconvergence/plugin.py
index 7f28ec5cea5237018144b245a703a959e0c4c3e4..33ff42a5c8b5d648e386ecb22805a766176ab6c1 100644 (file)
--- a/neutron/plugins/oneconvergence/plugin.py
+++ b/neutron/plugins/oneconvergence/plugin.py
@@ -42,7 +42,6 @@ from neutron.extensions import portbindings
 from neutron.openstack.common import excutils
 from neutron.openstack.common import importutils
 from neutron.openstack.common import log as logging
-from neutron.openstack.common import rpc
 from neutron.plugins.common import constants as svc_constants
 import neutron.plugins.oneconvergence.lib.config  # noqa
 import neutron.plugins.oneconvergence.lib.exception as nvsdexception
@@ -160,7 +159,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.create_connection(new=True)
+        self.conn = rpc_compat.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/ovs_neutron_plugin.py b/neutron/plugins/openvswitch/ovs_neutron_plugin.py
index f5f199db8996ddb770420d7aa62a3d43e0aadb67..cfcaf44f879ac1cfdbb115a818bac3d49980e7f7 100644 (file)
--- a/neutron/plugins/openvswitch/ovs_neutron_plugin.py
+++ b/neutron/plugins/openvswitch/ovs_neutron_plugin.py
@@ -48,7 +48,6 @@ from neutron.extensions import providernet as provider
 from neutron import manager
 from neutron.openstack.common import importutils
 from neutron.openstack.common import log as logging
-from neutron.openstack.common import rpc
 from neutron.plugins.common import constants as svc_constants
 from neutron.plugins.common import utils as plugin_utils
 from neutron.plugins.openvswitch.common import config  # noqa
@@ -336,7 +335,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.create_connection(new=True)
+        self.conn = rpc_compat.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/ryu_neutron_plugin.py b/neutron/plugins/ryu/ryu_neutron_plugin.py
index e0b6e3792c2362adedb00b2d271f8309a94ac327..35065a41e57eab0ba49ddd66d6e03441c8a79298 100644 (file)
--- a/neutron/plugins/ryu/ryu_neutron_plugin.py
+++ b/neutron/plugins/ryu/ryu_neutron_plugin.py
@@ -39,7 +39,6 @@ from neutron.db import securitygroups_rpc_base as sg_db_rpc
 from neutron.extensions import portbindings
 from neutron.openstack.common import excutils
 from neutron.openstack.common import log as logging
-from neutron.openstack.common import rpc
 from neutron.plugins.common import constants as svc_constants
 from neutron.plugins.ryu.common import config  # noqa
 from neutron.plugins.ryu.db import api_v2 as db_api_v2
@@ -143,7 +142,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.create_connection(new=True)
+        self.conn = rpc_compat.create_connection(new=True)
         self.notifier = AgentNotifierApi(topics.AGENT)
         self.callbacks = RyuRpcCallbacks(self.ofp_api_host)
         self.dispatcher = self.callbacks.create_rpc_dispatcher()

diff --git a/neutron/plugins/vmware/dhcpmeta_modes.py b/neutron/plugins/vmware/dhcpmeta_modes.py
index d0a2ed0c1c29f2b4ef08f151a276feab23b4fcfc..734358a63944d676fcc9575ac0b00f3ec6cdc837 100644 (file)
--- a/neutron/plugins/vmware/dhcpmeta_modes.py
+++ b/neutron/plugins/vmware/dhcpmeta_modes.py
@@ -19,10 +19,10 @@ 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 topics
 from neutron.openstack.common import importutils
 from neutron.openstack.common import log as logging
-from neutron.openstack.common import rpc
 from neutron.plugins.vmware.common import config
 from neutron.plugins.vmware.common import exceptions as nsx_exc
 from neutron.plugins.vmware.dhcp_meta import combined
@@ -69,7 +69,7 @@ class DhcpMetadataAccess(object):
 
     def _setup_rpc_dhcp_metadata(self, notifier=None):
         self.topic = topics.PLUGIN
-        self.conn = rpc.create_connection(new=True)
+        self.conn = rpc_compat.create_connection(new=True)
         self.dispatcher = nsx_rpc.NSXRpcCallbacks().create_rpc_dispatcher()
         self.conn.create_consumer(self.topic, self.dispatcher, fanout=False)
         self.agent_notifiers[const.AGENT_TYPE_DHCP] = (

diff --git a/neutron/services/firewall/fwaas_plugin.py b/neutron/services/firewall/fwaas_plugin.py
index 5ba4b9399230fe737e3b3d16ec8d76ef517830bf..fd2131e219c4af926e99ab42aeeb200206c540d9 100644 (file)
--- a/neutron/services/firewall/fwaas_plugin.py
+++ b/neutron/services/firewall/fwaas_plugin.py
@@ -28,7 +28,6 @@ from neutron.db import api as qdbapi
 from neutron.db.firewall import firewall_db
 from neutron.extensions import firewall as fw_ext
 from neutron.openstack.common import log as logging
-from neutron.openstack.common import rpc
 from neutron.plugins.common import constants as const
 
 
@@ -169,7 +168,7 @@ class FirewallPlugin(firewall_db.Firewall_db_mixin):
 
         self.callbacks = FirewallCallbacks(self)
 
-        self.conn = rpc.create_connection(new=True)
+        self.conn = rpc_compat.create_connection(new=True)
         self.conn.create_consumer(
             topics.FIREWALL_PLUGIN,
             self.callbacks.create_rpc_dispatcher(),

diff --git a/neutron/services/l3_router/l3_router_plugin.py b/neutron/services/l3_router/l3_router_plugin.py
index 5f3cc2031ec99a5946d80b0e2b50b399c053355b..082553ec78ba8d3c3b46c35368e9e13c56fb7b8d 100644 (file)
--- a/neutron/services/l3_router/l3_router_plugin.py
+++ b/neutron/services/l3_router/l3_router_plugin.py
@@ -32,7 +32,6 @@ from neutron.db import l3_gwmode_db
 from neutron.db import l3_rpc_base
 from neutron.db import model_base
 from neutron.openstack.common import importutils
-from neutron.openstack.common import rpc
 from neutron.plugins.common import constants
 
 
@@ -75,7 +74,7 @@ class L3RouterPlugin(db_base_plugin_v2.CommonDbMixin,
     def setup_rpc(self):
         # RPC support
         self.topic = topics.L3PLUGIN
-        self.conn = rpc.create_connection(new=True)
+        self.conn = rpc_compat.create_connection(new=True)
         self.agent_notifiers.update(
             {q_const.AGENT_TYPE_L3: l3_rpc_agent_api.L3AgentNotify})
         self.callbacks = L3RouterPluginRpcCallbacks()

diff --git a/neutron/services/loadbalancer/drivers/common/agent_driver_base.py b/neutron/services/loadbalancer/drivers/common/agent_driver_base.py
index 916ce886a625f1ca7980859704a2490950fb630a..8436cb835459609dbed7db68d304555ee7da98a0 100644 (file)
--- a/neutron/services/loadbalancer/drivers/common/agent_driver_base.py
+++ b/neutron/services/loadbalancer/drivers/common/agent_driver_base.py
@@ -31,7 +31,6 @@ from neutron.extensions import lbaas_agentscheduler
 from neutron.extensions import portbindings
 from neutron.openstack.common import importutils
 from neutron.openstack.common import log as logging
-from neutron.openstack.common import rpc
 from neutron.plugins.common import constants
 from neutron.services.loadbalancer.drivers import abstract_driver
 
@@ -346,7 +345,7 @@ class AgentDriverBase(abstract_driver.LoadBalancerAbstractDriver):
             return
 
         self.plugin.agent_callbacks = LoadBalancerCallbacks(self.plugin)
-        self.plugin.conn = rpc.create_connection(new=True)
+        self.plugin.conn = rpc_compat.create_connection(new=True)
         self.plugin.conn.create_consumer(
             topics.LOADBALANCER_PLUGIN,
             self.plugin.agent_callbacks.create_rpc_dispatcher(),

diff --git a/neutron/services/metering/metering_plugin.py b/neutron/services/metering/metering_plugin.py
index af0c54be9f62db352212c9031edc94a316d2083b..61385cc046233fea4ff38ea1f60dd71f15902b5a 100644 (file)
--- a/neutron/services/metering/metering_plugin.py
+++ b/neutron/services/metering/metering_plugin.py
@@ -15,10 +15,10 @@
 # under the License.
 
 from neutron.api.rpc.agentnotifiers import metering_rpc_agent_api
+from neutron.common import rpc_compat
 from neutron.common import topics
 from neutron.db.metering import metering_db
 from neutron.db.metering import metering_rpc
-from neutron.openstack.common import rpc
 
 
 class MeteringPlugin(metering_db.MeteringDbMixin):
@@ -30,7 +30,7 @@ class MeteringPlugin(metering_db.MeteringDbMixin):
 
         self.callbacks = metering_rpc.MeteringRpcCallbacks(self)
 
-        self.conn = rpc.create_connection(new=True)
+        self.conn = rpc_compat.create_connection(new=True)
         self.conn.create_consumer(
             topics.METERING_PLUGIN,
             self.callbacks.create_rpc_dispatcher(),

diff --git a/neutron/services/vpn/device_drivers/cisco_ipsec.py b/neutron/services/vpn/device_drivers/cisco_ipsec.py
index 9a6288072b20720d0b0989b4a136c93ab4065dbd..ba19460d772f278fe7a8649e80d9a81358923452 100644 (file)
--- a/neutron/services/vpn/device_drivers/cisco_ipsec.py
+++ b/neutron/services/vpn/device_drivers/cisco_ipsec.py
@@ -29,7 +29,6 @@ from neutron import context as ctx
 from neutron.openstack.common import lockutils
 from neutron.openstack.common import log as logging
 from neutron.openstack.common import loopingcall
-from neutron.openstack.common import rpc
 from neutron.plugins.common import constants
 from neutron.plugins.common import utils as plugin_utils
 from neutron.services.vpn.common import topics
@@ -192,7 +191,7 @@ class CiscoCsrIPsecDriver(device_drivers.DeviceDriver):
         # TODO(ihrachys): we can't use RpcCallback here due to
         # inheritance issues
         self.host = host
-        self.conn = rpc.create_connection(new=True)
+        self.conn = rpc_compat.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 893ddc88fe9a1e6c52592c1f768c5a2fc9539ab0..0d9ded9604542ef18ecc3a59fbfd546180ea9c89 100644 (file)
--- a/neutron/services/vpn/device_drivers/ipsec.py
+++ b/neutron/services/vpn/device_drivers/ipsec.py
@@ -33,7 +33,6 @@ from neutron import context
 from neutron.openstack.common import lockutils
 from neutron.openstack.common import log as logging
 from neutron.openstack.common import loopingcall
-from neutron.openstack.common import rpc
 from neutron.plugins.common import constants
 from neutron.plugins.common import utils as plugin_utils
 from neutron.services.vpn.common import topics
@@ -495,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.create_connection(new=True)
+        self.conn = rpc_compat.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/cisco_ipsec.py b/neutron/services/vpn/service_drivers/cisco_ipsec.py
index 1d33da50e9a87b18b14cfeb40d20c39dcfd68499..85657231977e0dfd18795ba652cb7208fe6c667b 100644 (file)
--- a/neutron/services/vpn/service_drivers/cisco_ipsec.py
+++ b/neutron/services/vpn/service_drivers/cisco_ipsec.py
@@ -20,7 +20,6 @@ from neutron.common import rpc as n_rpc
 from neutron.common import rpc_compat
 from neutron.openstack.common import excutils
 from neutron.openstack.common import log as logging
-from neutron.openstack.common import rpc
 from neutron.plugins.common import constants
 from neutron.services.vpn.common import topics
 from neutron.services.vpn import service_drivers
@@ -91,7 +90,7 @@ class CiscoCsrIPsecVPNDriver(service_drivers.VpnDriver):
     def __init__(self, service_plugin):
         super(CiscoCsrIPsecVPNDriver, self).__init__(service_plugin)
         self.callbacks = CiscoCsrIPsecVpnDriverCallBack(self)
-        self.conn = rpc.create_connection(new=True)
+        self.conn = rpc_compat.create_connection(new=True)
         self.conn.create_consumer(
             topics.CISCO_IPSEC_DRIVER_TOPIC,
             self.callbacks.create_rpc_dispatcher(),

diff --git a/neutron/services/vpn/service_drivers/ipsec.py b/neutron/services/vpn/service_drivers/ipsec.py
index 9e529fd097e68f025fe9cb4cdb9b66754f8a16c4..cf4b055d89b05fbeb215dc0707464d46c077df15 100644 (file)
--- a/neutron/services/vpn/service_drivers/ipsec.py
+++ b/neutron/services/vpn/service_drivers/ipsec.py
@@ -19,7 +19,6 @@ import netaddr
 from neutron.common import rpc as n_rpc
 from neutron.common import rpc_compat
 from neutron.openstack.common import log as logging
-from neutron.openstack.common import rpc
 from neutron.services.vpn.common import topics
 from neutron.services.vpn import service_drivers
 
@@ -76,7 +75,7 @@ class IPsecVPNDriver(service_drivers.VpnDriver):
     def __init__(self, service_plugin):
         super(IPsecVPNDriver, self).__init__(service_plugin)
         self.callbacks = IPsecVpnDriverCallBack(self)
-        self.conn = rpc.create_connection(new=True)
+        self.conn = rpc_compat.create_connection(new=True)
         self.conn.create_consumer(
             topics.IPSEC_DRIVER_TOPIC,
             self.callbacks.create_rpc_dispatcher(),

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 562416bd412f3df95cf10e5475629da5b98888c5..20f2ccba3df397c7addd180b029b50b4e358d1d6 100644 (file)
--- 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.openstack.common.rpc.create_connection',
+        for klass in ['neutron.common.rpc_compat.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 c7bc4d7198a42a2876b8934ae2619ef8e4599c8d..29867a144d310d0e00a76b66e96b7e399c582c2c 100644 (file)
--- a/neutron/tests/unit/services/vpn/device_drivers/test_ipsec.py
+++ b/neutron/tests/unit/services/vpn/device_drivers/test_ipsec.py
@@ -47,7 +47,7 @@ class TestIPsecDeviceDriver(base.BaseTestCase):
             'os.makedirs',
             'os.path.isdir',
             'neutron.agent.linux.utils.replace_file',
-            'neutron.openstack.common.rpc.create_connection',
+            'neutron.common.rpc_compat.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 c513330c8c9b37605b54948adef9e4fb15f7b2e7..f78d8b16c0f729b27f4b169fe54caf59736c3bb6 100644 (file)
--- 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.openstack.common.rpc.create_connection').start()
+        mock.patch('neutron.common.rpc_compat.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.openstack.common.rpc.create_connection').start()
+        mock.patch('neutron.common.rpc_compat.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 33aebe977691e491485e712af245f1aeaa7fbfa7..2f7cbfaf95074ad24dc8ae443aac2b1b3846bcb4 100644 (file)
--- a/neutron/tests/unit/services/vpn/service_drivers/test_ipsec.py
+++ b/neutron/tests/unit/services/vpn/service_drivers/test_ipsec.py
@@ -37,7 +37,7 @@ FAKE_HOST = 'fake_host'
 class TestIPsecDriver(base.BaseTestCase):
     def setUp(self):
         super(TestIPsecDriver, self).setUp()
-        mock.patch('neutron.openstack.common.rpc.create_connection').start()
+        mock.patch('neutron.common.rpc_compat.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 35e9b75fb84d22792d8975832d096af5ef83eea7..bc4ae4a17805d34b4463a242a8f99468314d5a14 100644 (file)
--- a/neutron/tests/unit/test_agent_rpc.py
+++ b/neutron/tests/unit/test_agent_rpc.py
@@ -91,7 +91,7 @@ class AgentRPCMethods(base.BaseTestCase):
             mock.call().consume_in_thread()
         ]
 
-        call_to_patch = 'neutron.openstack.common.rpc.create_connection'
+        call_to_patch = 'neutron.common.rpc_compat.create_connection'
         with mock.patch(call_to_patch) as create_connection:
             rpc.create_consumers(dispatcher, 'foo', [('topic', 'op')])
             create_connection.assert_has_calls(expected)
@@ -107,7 +107,7 @@ class AgentRPCMethods(base.BaseTestCase):
             mock.call().consume_in_thread()
         ]
 
-        call_to_patch = 'neutron.openstack.common.rpc.create_connection'
+        call_to_patch = 'neutron.common.rpc_compat.create_connection'
         with mock.patch(call_to_patch) as create_connection:
             rpc.create_consumers(dispatcher, 'foo', [('topic', 'op', 'node1')])
             create_connection.assert_has_calls(expected)