x/vmware-nsx
Code Issues Proposed changes

Merge "ip-lib : use "ip neigh replace" instead of "ip neigh add""

Browse Source
This commit is contained in:
Jenkins 2014-04-22 19:40:25 +00:00 committed by Gerrit Code Review
commit 19a79084fb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/agent/linux/ip_lib.py
View File

@ -444,7 +444,7 @@ class IpNeighCommand(IpDeviceCommandBase):
COMMAND = 'neigh' COMMAND = 'neigh'
def add(self, ip_version, ip_address, mac_address): def add(self, ip_version, ip_address, mac_address):
self._as_root('add', self._as_root('replace',
ip_address, ip_address,
'lladdr', 'lladdr',
mac_address, mac_address,

2
neutron/tests/unit/test_linux_ip_lib.py
View File

@ -810,7 +810,7 @@ class TestIpNeighCommand(TestIPCmdBase):
def test_add_entry(self): def test_add_entry(self):
self.neigh_cmd.add(4, '192.168.45.100', 'cc:dd:ee:ff:ab:cd') self.neigh_cmd.add(4, '192.168.45.100', 'cc:dd:ee:ff:ab:cd')
self._assert_sudo([4], ('add', '192.168.45.100', 'lladdr', self._assert_sudo([4], ('replace', '192.168.45.100', 'lladdr',
'cc:dd:ee:ff:ab:cd', 'nud', 'permanent', 'cc:dd:ee:ff:ab:cd', 'nud', 'permanent',
'dev', 'tap0')) 'dev', 'tap0'))