From: Eugene Nikanorov <enikanorov@mirantis.com>
Date: Wed, 30 Apr 2014 12:04:58 +0000 (+0400)
Subject: OVS and OF Agents: Create updated_ports attribute before setup_rpc
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=717a0a0ab4436e2904360fe4e34226af7d0e412d;p=openstack-build%2Fneutron-build.git

OVS and OF Agents: Create updated_ports attribute before setup_rpc

setup_rpc spawns rpc-consuming thread that can access
self.updated_ports before it is created in the constructor

Change-Id: Icc447c3bb7099125aae30e2430a6ad98ba00f6f9
Closes-Bug: #1314472
---

diff --git a/neutron/plugins/ofagent/agent/ofa_neutron_agent.py b/neutron/plugins/ofagent/agent/ofa_neutron_agent.py
index 3b57f5800..8eeb7577b 100644
--- a/neutron/plugins/ofagent/agent/ofa_neutron_agent.py
+++ b/neutron/plugins/ofagent/agent/ofa_neutron_agent.py
@@ -250,6 +250,8 @@ class OFANeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin):
         self.int_br_device_count = 0
 
         self.int_br = OVSBridge(integ_br, self.root_helper, self.ryuapp)
+        # Stores port update notifications for processing in main loop
+        self.updated_ports = set()
         self.setup_rpc()
         self.setup_integration_br()
         self.setup_physical_bridges(bridge_mappings)
@@ -275,8 +277,6 @@ class OFANeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin):
         self.sg_agent = OFASecurityGroupAgent(self.context,
                                               self.plugin_rpc,
                                               self.root_helper)
-        # Stores port update notifications for processing in main loop
-        self.updated_ports = set()
         # Initialize iteration counter
         self.iter_num = 0
 
diff --git a/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py b/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
index a92a36bf0..bbae1cb90 100644
--- a/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
+++ b/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
@@ -192,6 +192,8 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
         self.int_br_device_count = 0
 
         self.int_br = ovs_lib.OVSBridge(integ_br, self.root_helper)
+        # Stores port update notifications for processing in main rpc loop
+        self.updated_ports = set()
         self.setup_rpc()
         self.setup_integration_br()
         self.setup_physical_bridges(bridge_mappings)
@@ -220,8 +222,6 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
         self.sg_agent = OVSSecurityGroupAgent(self.context,
                                               self.plugin_rpc,
                                               root_helper)
-        # Stores port update notifications for processing in main rpc loop
-        self.updated_ports = set()
         # Initialize iteration counter
         self.iter_num = 0