From: Ihar Hrachyshka Date: Wed, 7 Jan 2015 12:23:48 +0000 (+0100) Subject: Bump minimal dnsmasq version to 2.67 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=012ffe86752416cd55269924d6236cdfac6b7434;p=openstack-build%2Fneutron-build.git 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 --- diff --git a/neutron/agent/linux/dhcp.py b/neutron/agent/linux/dhcp.py index ff8c1a654..c3cae0197 100644 --- a/neutron/agent/linux/dhcp.py +++ b/neutron/agent/linux/dhcp.py @@ -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): diff --git a/neutron/tests/unit/test_linux_dhcp.py b/neutron/tests/unit/test_linux_dhcp.py index fdbf83067..d02297307 100644 --- a/neutron/tests/unit/test_linux_dhcp.py +++ b/neutron/tests/unit/test_linux_dhcp.py @@ -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):