diff options
| author | Ihar Hrachyshka <ihrachys@redhat.com> | 2014-06-09 16:09:26 +0200 |
|---|---|---|
| committer | Ihar Hrachyshka <ihrachys@redhat.com> | 2014-06-24 10:35:39 +0200 |
| commit | b43307b768a0fa851194ada5b73baf541934ea19 (patch) | |
| tree | 2b96f460826f982c708b709f8884a7902abcb4d2 /neutron/plugins/nec/nec_plugin.py | |
| parent | f7ef6ea7ec798e62814f2071126de6e4fcb15b02 (diff) | |
| download | neutron-b43307b768a0fa851194ada5b73baf541934ea19.tar.gz | |
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
Diffstat (limited to 'neutron/plugins/nec/nec_plugin.py')
| -rw-r--r-- | neutron/plugins/nec/nec_plugin.py | 14 |
1 files changed, 7 insertions, 7 deletions
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' |