openstack
/
neutron
Code Issues Proposed changes

Merge "Remove unneeded argment in "_read_leases_file_leases""

This commit is contained in:
Zuul 2020-06-25 18:05:52 +00:00 committed by Gerrit Code Review
parent 5787708a01 b2748250f1
commit 49106829ea
2 changed files with 12 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -901,7 +901,7 @@ class Dnsmasq(DhcpLocalProcess):
LOG.debug('Error while reading hosts file %s', filename) LOG.debug('Error while reading hosts file %s', filename)
return leases return leases
def _read_leases_file_leases(self, filename, ip_version=None): def _read_leases_file_leases(self, filename):
"""Read dnsmasq dhcp leases file """Read dnsmasq dhcp leases file
Read information from leases file, which is needed to pass to Read information from leases file, which is needed to pass to
@ -936,7 +936,6 @@ class Dnsmasq(DhcpLocalProcess):
dnsmasq-discuss/2016q2/010595.html dnsmasq-discuss/2016q2/010595.html
:param filename: leases file :param filename: leases file
:param ip_version: IP version of entries to return, or None for all
:return: dict, keys are IP(v6) addresses, values are dicts containing :return: dict, keys are IP(v6) addresses, values are dicts containing
iaid, client_id and server_id iaid, client_id and server_id
""" """
@ -962,9 +961,6 @@ class Dnsmasq(DhcpLocalProcess):
continue continue
(iaid, ip, client_id) = parts[1], parts[2], parts[4] (iaid, ip, client_id) = parts[1], parts[2], parts[4]
ip = ip.strip('[]') ip = ip.strip('[]')
if (ip_version and
netaddr.IPAddress(ip).version != ip_version):
continue
leases[ip] = {'iaid': iaid, leases[ip] = {'iaid': iaid,
'client_id': client_id, 'client_id': client_id,
'server_id': server_id 'server_id': server_id

37
neutron/tests/unit/agent/linux/test_dhcp.py
View File

@ -2624,7 +2624,7 @@ class TestDnsmasq(TestBase):
("fdca:3ba5:a17a::4", "00:00:80:aa:bb:cc", None)} ("fdca:3ba5:a17a::4", "00:00:80:aa:bb:cc", None)}
self._test_read_hosts_file_leases(lines, result) self._test_read_hosts_file_leases(lines, result)
def _test_read_leases_file_leases(self, ip_version, add_bad_line=False): def _test_read_leases_file_leases(self, add_bad_line=False):
filename = '/path/to/file' filename = '/path/to/file'
lines = [ lines = [
"1472673289 aa:bb:cc:00:00:02 192.168.1.2 host-192-168-1-2 *", "1472673289 aa:bb:cc:00:00:02 192.168.1.2 host-192-168-1-2 *",
@ -2648,7 +2648,7 @@ class TestDnsmasq(TestBase):
dnsmasq = self._get_dnsmasq(FakeDualNetwork()) dnsmasq = self._get_dnsmasq(FakeDualNetwork())
with mock.patch('os.path.exists', return_value=True), \ with mock.patch('os.path.exists', return_value=True), \
mock.patch.object(dhcp.LOG, 'warning') as mock_log_warn: mock.patch.object(dhcp.LOG, 'warning') as mock_log_warn:
leases = dnsmasq._read_leases_file_leases(filename, ip_version) leases = dnsmasq._read_leases_file_leases(filename)
server_id = '00:01:00:01:02:03:04:05:06:07:08:09:0a:0b' server_id = '00:01:00:01:02:03:04:05:06:07:08:09:0a:0b'
entry1 = {'iaid': '1044800001', entry1 = {'iaid': '1044800001',
'client_id': '00:04:4a:d0:d2:34:19:2b:49:08:84:' 'client_id': '00:04:4a:d0:d2:34:19:2b:49:08:84:'
@ -2665,11 +2665,6 @@ class TestDnsmasq(TestBase):
'7f:5c:33:31:37:5d:80:77:b4', '7f:5c:33:31:37:5d:80:77:b4',
'server_id': server_id 'server_id': server_id
} }
v6_expected = {'2001:DB8::a': entry1,
'2001:DB8::b': entry2,
'2001:DB8::c': entry3
}
entry4 = {'iaid': 'aa:bb:cc:00:00:02', entry4 = {'iaid': 'aa:bb:cc:00:00:02',
'client_id': '*', 'client_id': '*',
'server_id': None 'server_id': None
@ -2682,34 +2677,24 @@ class TestDnsmasq(TestBase):
'client_id': '*', 'client_id': '*',
'server_id': None 'server_id': None
} }
v4_expected = {'192.168.1.2': entry4, expected = {'2001:DB8::a': entry1,
'192.168.1.3': entry5, '2001:DB8::b': entry2,
'192.168.1.4': entry6 '2001:DB8::c': entry3,
} '192.168.1.2': entry4,
'192.168.1.3': entry5,
expected = {} '192.168.1.4': entry6
if not ip_version or ip_version == constants.IP_VERSION_6: }
expected.update(v6_expected)
if not ip_version or ip_version == constants.IP_VERSION_4:
expected.update(v4_expected)
mock_open.assert_called_once_with(filename) mock_open.assert_called_once_with(filename)
self.assertEqual(expected, leases) self.assertEqual(expected, leases)
if add_bad_line: if add_bad_line:
self.assertTrue(mock_log_warn.called) self.assertTrue(mock_log_warn.called)
def test_read_v6_leases_file_leases(self):
self._test_read_leases_file_leases(constants.IP_VERSION_6)
def test_read_v4_leases_file_leases(self):
self._test_read_leases_file_leases(constants.IP_VERSION_4)
def test_read_all_leases_file_leases(self): def test_read_all_leases_file_leases(self):
self._test_read_leases_file_leases(None) self._test_read_leases_file_leases()
def test_read_all_leases_file_leases_with_bad_line(self): def test_read_all_leases_file_leases_with_bad_line(self):
self._test_read_leases_file_leases(None, True) self._test_read_leases_file_leases(add_bad_line=True)
def test_make_subnet_interface_ip_map(self): def test_make_subnet_interface_ip_map(self):
with mock.patch('neutron.agent.linux.ip_lib.' with mock.patch('neutron.agent.linux.ip_lib.'