openstack/neutron
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
commit bb2d4ac8e2
3 changed files with 4 additions and 13 deletions
Show Stats 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_device_count = 0
self.int_br = ovs_lib.OVSBridge(integ_br, self.root_helper) self.int_br = ovs_lib.OVSBridge(integ_br, self.root_helper)
self.setup_integration_br()
self.int_br.set_secure_mode() self.int_br.set_secure_mode()
# Stores port update notifications for processing in main rpc loop # Stores port update notifications for processing in main rpc loop
self.updated_ports = set() self.updated_ports = set()
self.setup_rpc() self.setup_rpc()
self.setup_integration_br()
self.bridge_mappings = bridge_mappings self.bridge_mappings = bridge_mappings
self.setup_physical_bridges(self.bridge_mappings) self.setup_physical_bridges(self.bridge_mappings)
self.local_vlan_map = {} self.local_vlan_map = {}
@ -732,12 +732,6 @@ class OVSNeutronAgent(rpc_compat.RpcCallback,
:param bridge_name: the name of the integration bridge. :param bridge_name: the name of the integration bridge.
:returns: 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.delete_port(cfg.CONF.OVS.int_peer_patch_port)
self.int_br.remove_all_flows() self.int_br.remove_all_flows()
# switch all traffic using L2 learning # switch all traffic using L2 learning

2
neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py
View File

@ -118,8 +118,6 @@ class TestOvsNeutronAgent(base.BaseTestCase):
mock.patch('neutron.plugins.openvswitch.agent.ovs_neutron_agent.' mock.patch('neutron.plugins.openvswitch.agent.ovs_neutron_agent.'
'OVSNeutronAgent.setup_ancillary_bridges', 'OVSNeutronAgent.setup_ancillary_bridges',
return_value=[]), return_value=[]),
mock.patch('neutron.agent.linux.ovs_lib.OVSBridge.'
'create'),
mock.patch('neutron.agent.linux.ovs_lib.OVSBridge.' mock.patch('neutron.agent.linux.ovs_lib.OVSBridge.'
'set_secure_mode'), 'set_secure_mode'),
mock.patch('neutron.agent.linux.ovs_lib.OVSBridge.' mock.patch('neutron.agent.linux.ovs_lib.OVSBridge.'

7
neutron/tests/unit/openvswitch/test_ovs_tunnel.py
View File

@ -107,14 +107,13 @@ class TunnelTest(base.BaseTestCase):
self.mock_int_bridge = self.ovs_bridges[self.INT_BRIDGE] self.mock_int_bridge = self.ovs_bridges[self.INT_BRIDGE]
self.mock_int_bridge.get_local_port_mac.return_value = '000000000001' self.mock_int_bridge.get_local_port_mac.return_value = '000000000001'
self.mock_int_bridge_expected = [ self.mock_int_bridge_expected = [
mock.call.create(), mock.call.set_secure_mode(),
mock.call.get_local_port_mac(),
mock.call.delete_port('patch-tun'), mock.call.delete_port('patch-tun'),
mock.call.remove_all_flows(), mock.call.remove_all_flows(),
mock.call.add_flow(priority=1, actions='normal'), mock.call.add_flow(priority=1, actions='normal'),
mock.call.add_flow(priority=0, table=constants.CANARY_TABLE, mock.call.add_flow(priority=0, table=constants.CANARY_TABLE,
actions='drop'), actions='drop')
mock.call.set_secure_mode(),
mock.call.get_local_port_mac()
] ]
self.mock_map_tun_bridge = self.ovs_bridges[self.MAP_TUN_BRIDGE] self.mock_map_tun_bridge = self.ovs_bridges[self.MAP_TUN_BRIDGE]