Merge "OVS and OF Agents: Create updated_ports attribute before setup_rpc"
This commit is contained in:
commit
4240c0577b
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user