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

[LaMont Jones]

Update get_GENERATE_directives to deal with spanning_cidr not liking single-IP ranges.

Update get_GENERATE_directives to deal with spanning_cidr not liking single-IP ranges.

[Mike Pontillo (mpontillo)]

Looks good to me.

review: Approve

=== modified file 'src/provisioningserver/dns/tests/test_zoneconfig.py'
--- src/provisioningserver/dns/tests/test_zoneconfig.py	2016-03-28 13:54:47 +0000
+++ src/provisioningserver/dns/tests/test_zoneconfig.py	2016-08-22 15:30:50 +0000
@@ -157,6 +157,53 @@
             DNSForwardZoneConfig.get_AAAA_mapping(
                 combined_mapping, ns_ttl, dns_ip))
 
+    def test_handles_slash_32_dynamic_range(self):
+        target_dir = patch_dns_config_path(self)
+        domain = factory.make_string()
+        network = factory.make_ipv4_network()
+        dns_ip = factory.pick_ip_in_network(network)
+        ipv4_hostname = factory.make_name('host')
+        ipv4_ip = factory.pick_ip_in_network(network)
+        range_ip = factory.pick_ip_in_network(network, but_not={ipv4_ip})
+        ipv6_hostname = factory.make_name('host')
+        ipv6_ip = factory.make_ipv6_address()
+        ttl = random.randint(10, 300)
+        mapping = {
+            ipv4_hostname: HostnameIPMapping(None, ttl, {ipv4_ip}),
+            ipv6_hostname: HostnameIPMapping(None, ttl, {ipv6_ip}),
+        }
+        dynamic_range = IPRange(IPAddress(range_ip), IPAddress(range_ip))
+        expected_generate_directives = (
+            DNSForwardZoneConfig.get_GENERATE_directives(
+                dynamic_range))
+        other_mapping = {ipv4_hostname: HostnameRRsetMapping(
+            None, {(ttl, 'MX', '10 bar')})}
+        dns_zone_config = DNSForwardZoneConfig(
+            domain, serial=random.randint(1, 100),
+            other_mapping=other_mapping, default_ttl=ttl,
+            mapping=mapping, dns_ip=dns_ip,
+            dynamic_ranges=[dynamic_range])
+        dns_zone_config.write_config()
+        self.assertThat(
+            os.path.join(target_dir, 'zone.%s' % domain),
+            FileContains(
+                matcher=ContainsAll(
+                    [
+                        '$TTL %d' % ttl,
+                        '%s %d IN A %s' % (ipv4_hostname, ttl, ipv4_ip),
+                        '%s %d IN AAAA %s' % (ipv6_hostname, ttl, ipv6_ip),
+                        '%s %d IN MX 10 bar' % (ipv4_hostname, ttl),
+                    ] +
+                    [
+                        '$GENERATE %s %s IN A %s' % (
+                            iterator_values, reverse_dns, hostname)
+                        for iterator_values, reverse_dns, hostname in
+                        expected_generate_directives
+                    ]
+                )
+            )
+        )
+
     def test_writes_dns_zone_config(self):
         target_dir = patch_dns_config_path(self)
         domain = factory.make_string()

=== modified file 'src/provisioningserver/dns/zoneconfig.py'
--- src/provisioningserver/dns/zoneconfig.py	2016-03-28 13:54:47 +0000
+++ src/provisioningserver/dns/zoneconfig.py	2016-08-22 15:30:50 +0000
@@ -75,7 +75,10 @@
     # 256 /24 networks in a /16, so that's the most /24s we're going
     # to have to deal with; this matters later on when we iterate
     # through the /24s within this network.
-    cidr = spanning_cidr(ip_range)
+    if ip_range.size == 1:
+        cidr = IPNetwork(IPAddress(ip_range.first))
+    else:
+        cidr = spanning_cidr(ip_range)
     subnets = cidr.subnet(max(24, cidr.prefixlen))
 
     # Split the spanning network into /24 subnets, then see if they fall