openstack
/
neutron
Code Issues Proposed changes

Merge "lb-agent: use 'replace' instead of 'add' with 'bridge fdb'" into stable/juno

This commit is contained in:
Jenkins 2015-03-29 17:48:23 +00:00 committed by Gerrit Code Review
parent 28ac255935 9e01647ad3
commit 0494eef885
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py
View File

@ -625,7 +625,8 @@ class LinuxBridgeManager:
for mac, ip in ports:
if mac != constants.FLOODING_ENTRY[0]:
self.add_fdb_ip_entry(mac, ip, interface)
self.add_fdb_bridge_entry(mac, agent_ip, interface)
self.add_fdb_bridge_entry(mac, agent_ip, interface,
operation="replace")
elif self.vxlan_mode == lconst.VXLAN_UCAST:
if self.fdb_bridge_entry_exists(mac, interface):
self.add_fdb_bridge_entry(mac, agent_ip, interface,

2
neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
View File

@ -994,7 +994,7 @@ class TestLinuxBridgeRpcCallbacks(base.BaseTestCase):
'port_mac', 'dev', 'vxlan-1', 'nud', 'permanent'],
root_helper=self.root_helper,
check_exit_code=False),
mock.call(['bridge', 'fdb', 'add', 'port_mac', 'dev',
mock.call(['bridge', 'fdb', 'replace', 'port_mac', 'dev',
'vxlan-1', 'dst', 'agent_ip'],
root_helper=self.root_helper,
check_exit_code=False),