Merge lp:~lamont/maas/bug-1606508 into lp:~maas-committers/maas/trunk

[LaMont Jones]

Properly configure DHCPv6 for high availability.

Properly configure DHCPv6 for high availability.

[LaMont Jones (lamont)]

FWIW, I struggled to find a place where the tests for dhcp/config.py are not skipped, and failed (lxc, vm, and bare metal all skip them when running xenial, at a minimum.)

Fix verified via install-and-look technology.

[Mike Pontillo (mpontillo)]

Missing some unit tests. (Other than that, looks good.)

review: Needs Fixing

[Mike Pontillo (mpontillo)]

Looks good. Thanks for adding the tests.

review: Approve

[MAAS Lander (maas-lander)]

The attempt to merge lp:~lamont/maas/bug-1606508 into lp:maas failed. Below is the output from the failed tests.

Hit:1 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial InRelease
Get:2 http://security.ubuntu.com/ubuntu xenial-security InRelease [94.5 kB]
Get:3 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates InRelease [95.7 kB]
Hit:4 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-backports InRelease
Fetched 190 kB in 0s (293 kB/s)

sudo: unable to resolve host juju-prod-cdo-maas-machine-3
E: Could not get lock /var/lib/dpkg/lock - open (11: Resource temporarily unavailable)
E: Unable to lock the administration directory (/var/lib/dpkg/), is another process using it?

=== modified file 'src/maasserver/models/iprange.py'
--- src/maasserver/models/iprange.py	2016-05-12 19:07:37 +0000
+++ src/maasserver/models/iprange.py	2016-10-19 22:51:50 +0000
@@ -161,6 +161,10 @@
             if end_ip not in cidr:
                 raise ValidationError(
                     "End IP address must be within subnet: %s." % cidr)
+        if (start_ip.version == 6 and self.type == IPRANGE_TYPE.DYNAMIC and
+                netaddr.IPRange(start_ip, end_ip).size < 256):
+            raise ValidationError(
+                "IPv6 dynamic range must be at least 256 addresses in size.")
         self.clean_prevent_dupes_and_overlaps()
 
     @property

=== modified file 'src/maasserver/models/tests/test_iprange.py'
--- src/maasserver/models/tests/test_iprange.py	2016-06-09 23:26:48 +0000
+++ src/maasserver/models/tests/test_iprange.py	2016-10-19 22:51:50 +0000
@@ -134,6 +134,20 @@
                 ValidationError, '.*End IP address must not be less than.*'):
             iprange.save()
 
+    def test__requires_256_addresses_for_ipv6_dynamic(self):
+        subnet = factory.make_Subnet(
+            cidr='2001:db8::/64', gateway_ip='fe80::1', dns_servers=[])
+        iprange = IPRange(
+            start_ip='2001:db8::', end_ip='2001:db8::fe',
+            user=factory.make_User(), subnet=subnet,
+            type=IPRANGE_TYPE.DYNAMIC,
+            comment="This is a comment.")
+        with ExpectedException(
+                ValidationError,
+                ".*IPv6 dynamic range must be "
+                "at least 256 addresses in size."):
+            iprange.save()
+
     def test__requires_type(self):
         subnet = make_plain_subnet()
         iprange = IPRange(

=== modified file 'src/provisioningserver/dhcp/config.py'
--- src/provisioningserver/dhcp/config.py	2016-09-26 15:35:54 +0000
+++ src/provisioningserver/dhcp/config.py	2016-10-19 22:51:50 +0000
@@ -20,6 +20,7 @@
 from netaddr import (
     IPAddress,
     IPNetwork,
+    IPRange,
 )
 from provisioningserver.boot import BootMethodRegistry
 from provisioningserver.utils import (
@@ -296,6 +297,35 @@
         IPAddress(addr)
         for addr in net_utils.get_all_interface_addresses()]
 
+    shared_networks = _process_network_parameters_v6(
+        rack_addrs, failover_peers, shared_networks)
+
+    try:
+        return template.substitute(
+            global_dhcp_snippets=global_dhcp_snippets, hosts=hosts,
+            failover_peers=failover_peers, shared_networks=shared_networks,
+            platform_codename=platform_codename,
+            omapi_key=omapi_key, **helpers)
+    except (KeyError, NameError) as error:
+        raise DHCPConfigError(
+            "Failed to render DHCP configuration.") from error
+
+
+def _process_network_parameters_v6(
+        rack_addrs, failover_peers, shared_networks):
+    """Preprocess shared_networks prior to rendering the template.
+
+    This is a separate function, partly for readability, and partly for ease
+    of testing.
+
+    :param rack_addrs: a list of IPAddress values for the interfaces on this
+        rack controller.
+    :param failover_peers: failover_peers from get_config_v6.
+    :param shared_networks: shared_networks from get_config_v6.
+    :return: an updated shared_networks, suitable for rendering the template.
+    """
+    peers = {x["name"]: x for x in failover_peers}
+
     for shared_network in shared_networks:
         for subnet in shared_network["subnets"]:
             cidr = IPNetwork(subnet['subnet_cidr'])
@@ -312,13 +342,18 @@
             ntp_servers_ipv4, ntp_servers_ipv6 = _get_addresses(*ntp_servers)
             subnet["ntp_servers_ipv4"] = ", ".join(ntp_servers_ipv4)
             subnet["ntp_servers_ipv6"] = ", ".join(ntp_servers_ipv6)
-
-    try:
-        return template.substitute(
-            global_dhcp_snippets=global_dhcp_snippets, hosts=hosts,
-            failover_peers=failover_peers, shared_networks=shared_networks,
-            platform_codename=platform_codename,
-            omapi_key=omapi_key, **helpers)
-    except (KeyError, NameError) as error:
-        raise DHCPConfigError(
-            "Failed to render DHCP configuration.") from error
+            for pool in subnet["pools"]:
+                peer = pool.get("failover_peer", None)
+                if peer is not None:
+                    ip_range = IPRange(
+                        pool["ip_range_low"],
+                        pool["ip_range_high"])
+                    if peers[peer]["mode"] == "primary":
+                        pool["ip_range_high"] = str(
+                            IPAddress(
+                                ip_range.first + int(ip_range.size / 2) - 1))
+                    else:
+                        pool["ip_range_low"] = str(
+                            IPAddress(
+                                ip_range.first + int(ip_range.size / 2)))
+    return shared_networks

=== modified file 'src/provisioningserver/dhcp/tests/test_config.py'
--- src/provisioningserver/dhcp/tests/test_config.py	2016-10-18 11:55:44 +0000
+++ src/provisioningserver/dhcp/tests/test_config.py	2016-10-19 22:51:50 +0000
@@ -475,6 +475,72 @@
                     Contains(expected))
 
 
+class Test_process_shared_network_v6(MAASTestCase):
+    """Tests for `_process_network_parameters_v6`."""
+
+    scenarios = (
+        ('singleton', dict(
+            expected={
+                'ip_range_high': '2001:db8:3:1::ffff',
+                'ip_range_low': '2001:db8:3:1::',
+                'failover_peer': None},
+            rack_addrs=[netaddr.IPAddress('2001:db8:3:280::2')],
+            failover_peers=[])),
+        ('primary', dict(
+            expected={
+                'ip_range_high': '2001:db8:3:1::7fff',
+                'ip_range_low': '2001:db8:3:1::',
+                'failover_peer': 'failover-vlan-5020'},
+            rack_addrs=[netaddr.IPAddress('2001:db8:3:280::2')],
+            failover_peers=[{
+                'mode': 'primary',
+                'peer_address': '2001:db8:3:0:1::',
+                'name': 'failover-vlan-5020',
+                'address': '2001:db8:3:280::2'}])),
+        ('secondary', dict(
+            expected={
+                'ip_range_high': '2001:db8:3:1::ffff',
+                'ip_range_low': '2001:db8:3:1::8000',
+                'failover_peer': 'failover-vlan-5020'},
+            rack_addrs=[netaddr.IPAddress('2001:db8:3:0:1::')],
+            failover_peers=[{
+                'mode': 'secondary',
+                'address': '2001:db8:3:0:1::',
+                'name': 'failover-vlan-5020',
+                'peer_address': '2001:db8:3:280::2'}])))
+
+    def test__adjusts_parameters_for_primary(self):
+        shared_networks = [
+            {
+                'name': 'vlan-5020',
+                'subnets': [
+                    {
+                        'domain_name': 'maas.example.com',
+                        'pools': [{
+                            'ip_range_high': '2001:db8:3:1::ffff',
+                            'ip_range_low': '2001:db8:3:1::',
+                            'failover_peer': self.expected['failover_peer']}],
+                        'dns_servers': [],
+                        'subnet_mask': 'ffff:ffff:ffff:ffff::',
+                        'ntp_servers': [],
+                        'broadcast_ip': '2001:db8:3::ffff:ffff:ffff:ffff',
+                        'router_ip': 'fe80::1',
+                        'subnet': '2001:db8:3::',
+                        'subnet_cidr': '2001:db8:3::/64',
+                        'dhcp_snippets': []
+                    }],
+            }]
+        self.patch(
+            config, 'compose_conditional_bootloader').return_value = ""
+        self.patch(
+            config, '_get_addresses').return_value = (
+                [''], ['2001:db8:280::2'])
+        actual = config._process_network_parameters_v6(
+            self.rack_addrs, self.failover_peers, shared_networks)
+        self.assertDictEqual(
+            actual[0]['subnets'][0]['pools'][0], self.expected)
+
+
 class TestComposeConditionalBootloader(MAASTestCase):
     """Tests for `compose_conditional_bootloader`."""
 

=== modified file 'src/provisioningserver/templates/dhcp/dhcpd6.conf.template'
--- src/provisioningserver/templates/dhcp/dhcpd6.conf.template	2016-10-12 22:07:21 +0000
+++ src/provisioningserver/templates/dhcp/dhcpd6.conf.template	2016-10-19 22:51:50 +0000
@@ -50,8 +50,8 @@
            option dhcp6.sntp-servers {{dhcp_subnet['ntp_servers_ipv6']}};
            {{endif}}
 
-           default-lease-time 600;
-           max-lease-time 600;
+           default-lease-time 1800;
+           max-lease-time 1800;
            #
            # Subnet DHCP snippets
            #