x/vmware-nsx
Code Issues Proposed changes

Merge "Strip square brackets from IPv6 addresses"

Browse Source
This commit is contained in:
Jenkins 2014-12-15 06:10:29 +00:00 committed by Gerrit Code Review
commit c2fff3c73a
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -532,7 +532,7 @@ class Dnsmasq(DhcpLocalProcess):
with open(filename) as f: with open(filename) as f:
for l in f.readlines(): for l in f.readlines():
host = l.strip().split(',') host = l.strip().split(',')
leases.add((host[2], host[0])) leases.add((host[2].strip('[]'), host[0]))
return leases return leases
def _release_unused_leases(self): def _release_unused_leases(self):

7
neutron/tests/unit/test_linux_dhcp.py
View File

@ -1237,13 +1237,16 @@ class TestDnsmasq(TestBase):
with mock.patch('__builtin__.open') as mock_open: with mock.patch('__builtin__.open') as mock_open:
mock_open.return_value.__enter__ = lambda s: s mock_open.return_value.__enter__ = lambda s: s
mock_open.return_value.__exit__ = mock.Mock() mock_open.return_value.__exit__ = mock.Mock()
lines = ["00:00:80:aa:bb:cc,inst-name,192.168.0.1"] lines = ["00:00:80:aa:bb:cc,inst-name,192.168.0.1",
"00:00:80:aa:bb:cc,inst-name,[fdca:3ba5:a17a::1]"]
mock_open.return_value.readlines.return_value = lines mock_open.return_value.readlines.return_value = lines
dnsmasq = dhcp.Dnsmasq(self.conf, FakeDualNetwork()) dnsmasq = dhcp.Dnsmasq(self.conf, FakeDualNetwork())
leases = dnsmasq._read_hosts_file_leases(filename) leases = dnsmasq._read_hosts_file_leases(filename)
self.assertEqual(set([("192.168.0.1", "00:00:80:aa:bb:cc")]), leases) self.assertEqual(set([("192.168.0.1", "00:00:80:aa:bb:cc"),
("fdca:3ba5:a17a::1", "00:00:80:aa:bb:cc")]),
leases)
mock_exists.assert_called_once_with(filename) mock_exists.assert_called_once_with(filename)
mock_open.assert_called_once_with(filename) mock_open.assert_called_once_with(filename)