From c30ca3fc42d09b1cb8fd1f2f877f21fcbe396732 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Fri, 16 Jan 2015 10:15:17 -0500 Subject: [PATCH] ovs: drop usage of SecurityGroupServerRpcApiMixin Drop usage of SecurityGroupServerRpcApiMixin in the ovs plugin. 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: I6c3f3325b4337e55aed2316dade8025425c4e919 --- neutron/plugins/openvswitch/agent/ovs_neutron_agent.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py b/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py index 2b6339a27..a00100d61 100644 --- a/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py +++ b/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py @@ -82,9 +82,7 @@ class LocalVLANMapping(object): self.segmentation_id)) -class OVSPluginApi(agent_rpc.PluginApi, - dvr_rpc.DVRServerRpcApiMixin, - sg_rpc.SecurityGroupServerRpcApiMixin): +class OVSPluginApi(agent_rpc.PluginApi, dvr_rpc.DVRServerRpcApiMixin): pass @@ -253,7 +251,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin, # Security group agent support self.sg_agent = OVSSecurityGroupAgent(self.context, - self.plugin_rpc, + self.sg_plugin_rpc, root_helper) # Initialize iteration counter self.iter_num = 0 @@ -282,6 +280,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin, self.agent_id = 'ovs-agent-%s' % cfg.CONF.host self.topic = topics.AGENT self.plugin_rpc = OVSPluginApi(topics.PLUGIN) + self.sg_plugin_rpc = sg_rpc.SecurityGroupServerRpcApi(topics.PLUGIN) self.state_rpc = agent_rpc.PluginReportStateAPI(topics.PLUGIN) # RPC network init -- 2.45.2