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 7f463c5aa1ac9950a9da7d1d742a8029e177716f..0d02d9180628f8b33764800bf6365e5cb4475c31 100644 (file)
--- 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):