Merge lp:~blake-rouse/maas/fix-1496562 into lp:~maas-committers/maas/trunk

[Blake Rouse]

Send the dns-search in the networking preseed to curtin.

[Andres Rodriguez (andreserl)]

review: Needs Information

[Andres Rodriguez (andreserl)]

comment inline

[Blake Rouse (blake-rouse)]

;-)

[Andres Rodriguez (andreserl)]

review: Approve

=== modified file 'src/maasserver/dns/tests/test_zonegenerator.py'
--- src/maasserver/dns/tests/test_zonegenerator.py	2015-09-08 21:59:19 +0000
+++ src/maasserver/dns/tests/test_zonegenerator.py	2015-09-25 15:17:42 +0000
@@ -21,6 +21,7 @@
 from maasserver.dns import zonegenerator
 from maasserver.dns.zonegenerator import (
     DNSException,
+    get_dns_search_paths,
     get_dns_server_address,
     get_hostname_ip_mapping,
     lazydict,
@@ -37,6 +38,7 @@
 from maasserver.models import (
     Config,
     interface as interface_module,
+    NodeGroup,
 )
 from maasserver.testing.config import RegionConfigurationFixture
 from maasserver.testing.factory import factory
@@ -132,6 +134,26 @@
         self.expectThat(resolver, MockAnyCall(hostname, 6))
 
 
+class TestGetDNSSearchPaths(MAASServerTestCase):
+
+    def test__returns_all_nodegroup_names(self):
+        nodegroup_master = NodeGroup.objects.ensure_master()
+        dns_search_names = [
+            factory.make_name("dns")
+            for _ in range(3)
+        ]
+        for name in dns_search_names:
+            factory.make_NodeGroup(status=NODEGROUP_STATUS.ENABLED, name=name)
+        # Create some with empty names.
+        for _ in range(3):
+            factory.make_NodeGroup(status=NODEGROUP_STATUS.ENABLED, name="")
+        # Create some not enabled.
+        for _ in range(3):
+            factory.make_NodeGroup(status=NODEGROUP_STATUS.DISABLED, name="")
+        self.assertItemsEqual(
+            [nodegroup_master.name] + dns_search_names, get_dns_search_paths())
+
+
 class TestWarnLoopback(MAASServerTestCase):
     def test_warn_loopback_warns_about_IPv4_loopback(self):
         logger = self.patch(zonegenerator, 'logger')

=== modified file 'src/maasserver/dns/zonegenerator.py'
--- src/maasserver/dns/zonegenerator.py	2015-08-28 18:04:33 +0000
+++ src/maasserver/dns/zonegenerator.py	2015-09-25 15:17:42 +0000
@@ -25,6 +25,7 @@
 import socket
 
 from maasserver import logger
+from maasserver.enum import NODEGROUP_STATUS
 from maasserver.exceptions import MAASException
 from maasserver.models.config import Config
 from maasserver.models.nodegroup import NodeGroup
@@ -129,6 +130,16 @@
     return ip
 
 
+def get_dns_search_paths():
+    """Return all the search paths for the DNS server."""
+    return set(
+        name
+        for name in NodeGroup.objects.filter(
+            status=NODEGROUP_STATUS.ENABLED).values_list("name", flat=True)
+        if name
+    )
+
+
 class ZoneGenerator:
     """Generate zones describing those relating to the given node groups."""
 

=== modified file 'src/maasserver/preseed_network.py'
--- src/maasserver/preseed_network.py	2015-09-16 14:23:58 +0000
+++ src/maasserver/preseed_network.py	2015-09-25 15:17:42 +0000
@@ -15,7 +15,10 @@
 __all__ = [
     ]
 
-from maasserver.dns.zonegenerator import get_dns_server_address
+from maasserver.dns.zonegenerator import (
+    get_dns_search_paths,
+    get_dns_server_address,
+)
 from maasserver.enum import (
     INTERFACE_TYPE,
     IPADDRESS_FAMILY,
@@ -57,7 +60,8 @@
 
         self.network_config.append({
             "type": "nameserver",
-            "address": get_dns_server_address(nodegroup=self.node.nodegroup)
+            "address": get_dns_server_address(nodegroup=self.node.nodegroup),
+            "search": sorted(get_dns_search_paths()),
         })
 
         network_config = {

=== modified file 'src/maasserver/tests/test_preseed_network.py'
--- src/maasserver/tests/test_preseed_network.py	2015-09-24 19:54:30 +0000
+++ src/maasserver/tests/test_preseed_network.py	2015-09-25 15:17:42 +0000
@@ -17,7 +17,10 @@
 import random
 from textwrap import dedent
 
-from maasserver.dns.zonegenerator import get_dns_server_address
+from maasserver.dns.zonegenerator import (
+    get_dns_search_paths,
+    get_dns_server_address,
+)
 from maasserver.enum import (
     INTERFACE_TYPE,
     IPADDRESS_FAMILY,
@@ -206,8 +209,12 @@
         return ret
 
     def collectDNSConfig(self, node):
-        return "- type: nameserver\n  address: %s" % (
+        config = "- type: nameserver\n  address: %s\n  search:\n" % (
             get_dns_server_address(nodegroup=node.nodegroup))
+        dns_searches = sorted(get_dns_search_paths())
+        for dns_name in dns_searches:
+            config += "   - %s\n" % dns_name
+        return config
 
 
 class TestSimpleNetworkLayout(MAASServerTestCase, AssertNetworkConfigMixin):