From: Russell Bryant Date: Wed, 21 Jan 2015 19:52:53 +0000 (-0500) Subject: mlnx: drop usage of SecurityGroupServerRpcApiMixin X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=168b3c5dfd2b9bf50520e89ebc293f0fac0c35a6;p=openstack-build%2Fneutron-build.git mlnx: drop usage of SecurityGroupServerRpcApiMixin Drop usage of SecurityGroupServerRpcApiMixin in the mlnx agent. This is required to be able to eventually move this API into a messaging namespace. It needs to use its own messaging client instance, instead of a different one it gets after being used as a mixin. Part of blueprint rpc-docs-and-namespaces. Change-Id: Iba96bddf30f33569a96548a5f116d66a4db6fc8f --- diff --git a/neutron/plugins/mlnx/agent/eswitch_neutron_agent.py b/neutron/plugins/mlnx/agent/eswitch_neutron_agent.py index 7f463c5aa..0d02d9180 100644 --- a/neutron/plugins/mlnx/agent/eswitch_neutron_agent.py +++ b/neutron/plugins/mlnx/agent/eswitch_neutron_agent.py @@ -174,11 +174,6 @@ class MlnxEswitchRpcCallbacks(sg_rpc.SecurityGroupAgentRpcCallbackMixin): port['mac_address']) -class MlnxEswitchPluginApi(agent_rpc.PluginApi, - sg_rpc.SecurityGroupServerRpcApiMixin): - pass - - class MlnxEswitchSecurityGroupAgent(sg_rpc.SecurityGroupAgentRpcMixin): def __init__(self, context, plugin_rpc, root_helper): self.context = context @@ -203,9 +198,10 @@ class MlnxEswitchNeutronAgent(object): # Stores port update notifications for processing in main rpc loop self.updated_ports = set() self.context = context.get_admin_context_without_session() - self.plugin_rpc = MlnxEswitchPluginApi(topics.PLUGIN) + self.plugin_rpc = agent_rpc.PluginApi(topics.PLUGIN) + self.sg_plugin_rpc = sg_rpc.SecurityGroupServerRpcApi(topics.PLUGIN) self.sg_agent = MlnxEswitchSecurityGroupAgent(self.context, - self.plugin_rpc, root_helper) + self.sg_plugin_rpc, root_helper) self._setup_rpc() def _setup_eswitches(self, interface_mapping):