x/vmware-nsx
Code Issues Proposed changes

Merge "Revert "ovs-agent: Ensure integration bridge is created""

Browse Source
This commit is contained in:
Jenkins
2014-06-20 09:05:59 +00:00
committed by Gerrit Code Review
parent e649c6c89d 692af5e504
commit ac3f9a75af
3 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
View File

@@ -178,11 +178,11 @@ class OVSNeutronAgent(rpc_compat.RpcCallback,
self.int_br_device_count = 0
self.int_br = ovs_lib.OVSBridge(integ_br, self.root_helper)
self.setup_integration_br()
self.int_br.set_secure_mode()
# Stores port update notifications for processing in main rpc loop
self.updated_ports = set()
self.setup_rpc()
self.setup_integration_br()
self.bridge_mappings = bridge_mappings
self.setup_physical_bridges(self.bridge_mappings)
self.local_vlan_map = {}
@@ -732,12 +732,6 @@ class OVSNeutronAgent(rpc_compat.RpcCallback,
:param bridge_name: the name of the integration bridge.
:returns: the integration bridge
'''
# Ensure the integration bridge is created.
# ovs_lib.OVSBridge.create() will run
# ovs-vsctl -- --may-exist add-br BRIDGE_NAME
# which does nothing if bridge already exists.
self.int_br.create()
self.int_br.delete_port(cfg.CONF.OVS.int_peer_patch_port)
self.int_br.remove_all_flows()
# switch all traffic using L2 learning