openstack
/
neutron
Code Issues Proposed changes

Merge "OVS agent don't hard code tunnel bridge name"

This commit is contained in:
Jenkins 2015-08-26 05:03:47 +00:00 committed by Gerrit Code Review
parent dea4f9fac1 d74c57a1be
commit 88cdc66158
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
View File

@ -938,7 +938,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
self.tun_br = self.br_tun_cls(tun_br_name)
self.tun_br.set_agent_uuid_stamp(self.agent_uuid_stamp)
if not self.tun_br.bridge_exists('br-tun'):
if not self.tun_br.bridge_exists(self.tun_br.br_name):
self.tun_br.create(secure_mode=True)
self.tun_br.setup_controllers(self.conf)
if (not self.int_br.port_exists(self.conf.OVS.int_peer_patch_port) or

4
neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_tunnel.py
View File

@ -212,7 +212,7 @@ class TunnelTest(object):
self.mock_tun_bridge_expected = [
mock.call.set_agent_uuid_stamp(mock.ANY),
mock.call.bridge_exists('br-tun'),
mock.call.bridge_exists(mock.ANY),
nonzero(mock.call.bridge_exists()),
mock.call.setup_controllers(mock.ANY),
mock.call.port_exists('patch-int'),
@ -621,7 +621,7 @@ class TunnelTestUseVethInterco(TunnelTest):
self.mock_tun_bridge_expected = [
mock.call.set_agent_uuid_stamp(mock.ANY),
mock.call.bridge_exists('br-tun'),
mock.call.bridge_exists(mock.ANY),
nonzero(mock.call.bridge_exists()),
mock.call.setup_controllers(mock.ANY),
mock.call.port_exists('patch-int'),