Remove unneeded argment in "_read_leases_file_leases"
The method "_read_leases_file_leases" is not called with the parameter "ip_version". This parameter can be removed from the method signature and the related code. Trivial-Fix Change-Id: I3ba720243ae4c405c10895d423e8a014201f4067
This commit is contained in:
parent
7d8f400791
commit
b2748250f1
|
@ -893,7 +893,7 @@ class Dnsmasq(DhcpLocalProcess):
|
|||
LOG.debug('Error while reading hosts file %s', filename)
|
||||
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 information from leases file, which is needed to pass to
|
||||
|
@ -928,7 +928,6 @@ class Dnsmasq(DhcpLocalProcess):
|
|||
dnsmasq-discuss/2016q2/010595.html
|
||||
|
||||
: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
|
||||
iaid, client_id and server_id
|
||||
"""
|
||||
|
@ -954,9 +953,6 @@ class Dnsmasq(DhcpLocalProcess):
|
|||
continue
|
||||
(iaid, ip, client_id) = parts[1], parts[2], parts[4]
|
||||
ip = ip.strip('[]')
|
||||
if (ip_version and
|
||||
netaddr.IPAddress(ip).version != ip_version):
|
||||
continue
|
||||
leases[ip] = {'iaid': iaid,
|
||||
'client_id': client_id,
|
||||
'server_id': server_id
|
||||
|
|
|
@ -2618,7 +2618,7 @@ class TestDnsmasq(TestBase):
|
|||
("fdca:3ba5:a17a::1", "00:00:80:aa:bb:cc",
|
||||
'client2')]), leases)
|
||||
|
||||
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'
|
||||
lines = [
|
||||
"1472673289 aa:bb:cc:00:00:02 192.168.1.2 host-192-168-1-2 *",
|
||||
|
@ -2642,7 +2642,7 @@ class TestDnsmasq(TestBase):
|
|||
dnsmasq = self._get_dnsmasq(FakeDualNetwork())
|
||||
with mock.patch('os.path.exists', return_value=True), \
|
||||
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'
|
||||
entry1 = {'iaid': '1044800001',
|
||||
'client_id': '00:04:4a:d0:d2:34:19:2b:49:08:84:'
|
||||
|
@ -2659,11 +2659,6 @@ class TestDnsmasq(TestBase):
|
|||
'7f:5c:33:31:37:5d:80:77:b4',
|
||||
'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',
|
||||
'client_id': '*',
|
||||
'server_id': None
|
||||
|
@ -2676,34 +2671,24 @@ class TestDnsmasq(TestBase):
|
|||
'client_id': '*',
|
||||
'server_id': None
|
||||
}
|
||||
v4_expected = {'192.168.1.2': entry4,
|
||||
'192.168.1.3': entry5,
|
||||
'192.168.1.4': entry6
|
||||
}
|
||||
|
||||
expected = {}
|
||||
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)
|
||||
expected = {'2001:DB8::a': entry1,
|
||||
'2001:DB8::b': entry2,
|
||||
'2001:DB8::c': entry3,
|
||||
'192.168.1.2': entry4,
|
||||
'192.168.1.3': entry5,
|
||||
'192.168.1.4': entry6
|
||||
}
|
||||
|
||||
mock_open.assert_called_once_with(filename)
|
||||
self.assertEqual(expected, leases)
|
||||
if add_bad_line:
|
||||
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):
|
||||
self._test_read_leases_file_leases(None)
|
||||
self._test_read_leases_file_leases()
|
||||
|
||||
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):
|
||||
with mock.patch('neutron.agent.linux.ip_lib.'
|
||||
|
|
Loading…
Reference in New Issue