From a1af2cdc374f6b1b62a3258ff6cda51369aad7a5 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Wed, 21 Jan 2015 15:57:31 -0500 Subject: [PATCH] sriovnicagent: drop usage of SecurityGroupServerRpcApiMixin Drop usage of SecurityGroupServerRpcApiMixin in sriovnicagent. 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: I157866bb65f884f80a9c3d70ffdcd487644caaef --- neutron/plugins/sriovnicagent/sriov_nic_agent.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/neutron/plugins/sriovnicagent/sriov_nic_agent.py b/neutron/plugins/sriovnicagent/sriov_nic_agent.py index 751e1c445..12374297f 100644 --- a/neutron/plugins/sriovnicagent/sriov_nic_agent.py +++ b/neutron/plugins/sriovnicagent/sriov_nic_agent.py @@ -66,11 +66,6 @@ class SriovNicSwitchRpcCallbacks(sg_rpc.SecurityGroupAgentRpcCallbackMixin): LOG.debug("port_update RPC received for port: %s", port['id']) -class SriovNicSwitchPluginApi(agent_rpc.PluginApi, - sg_rpc.SecurityGroupServerRpcApiMixin): - pass - - class SriovNicSwitchSecurityGroupAgent(sg_rpc.SecurityGroupAgentRpcMixin): def __init__(self, context, plugin_rpc, root_helper): self.context = context @@ -100,9 +95,10 @@ class SriovNicSwitchAgent(object): self.updated_devices = set() self.context = context.get_admin_context_without_session() - self.plugin_rpc = SriovNicSwitchPluginApi(topics.PLUGIN) + self.plugin_rpc = agent_rpc.PluginApi(topics.PLUGIN) + self.sg_plugin_rpc = sg_rpc.SecurityGroupServerRpcApi(topics.PLUGIN) self.sg_agent = SriovNicSwitchSecurityGroupAgent(self.context, - self.plugin_rpc, self.root_helper) + self.sg_plugin_rpc, self.root_helper) self._setup_rpc() # Initialize iteration counter self.iter_num = 0 -- 2.45.2