openstack
/
neutron
Code Issues Proposed changes

Bump minimal dnsmasq version to 2.67 

Versions prior to 2.67 did not support MAC address matching for IPv6 clients.
Quoting dnsmasq CHANGELOG:

"
version 2.67
[...]
    Support identification of clients by MAC address in
    DHCPv6. When using a relay, the relay must support RFC
    6939 for this to work. It always works for directly
    connected clients. Thanks to Vladislav Grishenko
    for prompting this feature.
"

Change-Id: I2f7dba6e3f8ea4ddebe7638d908b2ae42997225a
Closes-Bug: #1408297
This commit is contained in:
Ihar Hrachyshka 2015-01-07 13:23:48 +01:00
parent 98c53d5b37
commit 012ffe8675
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -315,7 +315,7 @@ class Dnsmasq(DhcpLocalProcess):
NEUTRON_NETWORK_ID_KEY = 'NEUTRON_NETWORK_ID'
NEUTRON_RELAY_SOCKET_PATH_KEY = 'NEUTRON_RELAY_SOCKET_PATH'
MINIMUM_VERSION = 2.63
MINIMUM_VERSION = 2.67
@classmethod
def check_version(cls):

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

@ -1311,16 +1311,16 @@ class TestDnsmasq(TestBase):
def test_check_find_version(self):
# Dnsmasq output currently gives the version number before the
# copyright year, but just in case ...
self._check_version('Copyright 2000-2014. Dnsmasq version 2.65 ...',
float(2.65))
self._check_version('Copyright 2000-2014. Dnsmasq version 3.33 ...',
float(3.33))
def test_check_minimum_version(self):
self._check_version('Dnsmasq version 2.63 Copyright (c)...',
self._check_version('Dnsmasq version 2.67 Copyright (c)...',
dhcp.Dnsmasq.MINIMUM_VERSION)
def test_check_future_version(self):
self._check_version('Dnsmasq version 2.65 Copyright (c)...',
float(2.65))
self._check_version('Dnsmasq version 2.99 Copyright (c)...',
float(2.99))
def test_check_fail_version(self):
with testtools.ExpectedException(SystemExit):