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 ff8c1a6541a00e5abda0c7a2482f04fb99ace82b..c3cae01977161b80874ba0114e47c990ce4cd643 100644 (file)
--- 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 fdbf83067a8d9d47eb8b1fa4542434f0c7cc0cd7..d022973073e646e7331d28f9d4ad3aeb541d31ab 100644 (file)
--- 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):