openstack
/
neutron
Code Issues Proposed changes

Merge "l2-population/lb/vxlan : ip neigh add command failed"

This commit is contained in:
Jenkins 2014-03-02 01:25:48 +00:00 committed by Gerrit Code Review
parent ea57e883eb e3e0401672
commit f3f072a069
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/linuxbridge/agent/linuxbridge_neutron_agent.py
View File

@ -566,7 +566,7 @@ class LinuxBridgeManager:
return (agent_ip in entries and mac in entries)
def add_fdb_ip_entry(self, mac, ip, interface):
utils.execute(['ip', 'neigh', 'add', ip, 'lladdr', mac,
utils.execute(['ip', 'neigh', 'replace', ip, 'lladdr', mac,
'dev', interface, 'nud', 'permanent'],
root_helper=self.root_helper,
check_exit_code=False)

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

@ -899,7 +899,7 @@ class TestLinuxBridgeRpcCallbacks(base.BaseTestCase):
'dev', 'vxlan-1', 'dst', 'agent_ip'],
root_helper=self.root_helper,
check_exit_code=False),
mock.call(['ip', 'neigh', 'add', 'port_ip', 'lladdr',
mock.call(['ip', 'neigh', 'replace', 'port_ip', 'lladdr',
'port_mac', 'dev', 'vxlan-1', 'nud', 'permanent'],
root_helper=self.root_helper,
check_exit_code=False),
@ -980,7 +980,7 @@ class TestLinuxBridgeRpcCallbacks(base.BaseTestCase):
self.lb_rpc.fdb_update(None, fdb_entries)
expected = [
mock.call(['ip', 'neigh', 'add', 'port_ip_2', 'lladdr',
mock.call(['ip', 'neigh', 'replace', 'port_ip_2', 'lladdr',
'port_mac', 'dev', 'vxlan-1', 'nud', 'permanent'],
root_helper=self.root_helper,
check_exit_code=False),