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

[LaMont Jones]

Place the domain that the host is in at the front of the search list, so that the FQDN is correctly generated.

Place the domain that the host is in at the front of the search list, so that the FQDN is correctly generated.

[Mike Pontillo (mpontillo)]

LGTM!

review: Approve

=== modified file 'src/maasserver/preseed_network.py'
--- src/maasserver/preseed_network.py	2016-08-25 14:19:40 +0000
+++ src/maasserver/preseed_network.py	2016-10-24 23:23:34 +0000
@@ -62,10 +62,14 @@
             self.addr_family_present[4] = True
         default_dns_servers = self.node.get_default_dns_servers(
             ipv4=self.addr_family_present[4], ipv6=self.addr_family_present[6])
+        search_list = [self.node.domain.name] + [
+            name
+            for name in sorted(get_dns_search_paths())
+            if name != self.node.domain.name]
         self.network_config.append({
             "type": "nameserver",
             "address": default_dns_servers,
-            "search": sorted(get_dns_search_paths()),
+            "search": search_list,
         })
 
         network_config = {
 
=== modified file 'src/maasserver/tests/test_preseed_network.py'
--- src/maasserver/tests/test_preseed_network.py	2016-08-24 21:04:59 +0000
+++ src/maasserver/tests/test_preseed_network.py	2016-10-24 23:23:34 +0000
@@ -244,7 +244,11 @@
     def collectDNSConfig(self, node, ipv4=True, ipv6=True):
         config = "- type: nameserver\n  address: %s\n  search:\n" % (
             repr(node.get_default_dns_servers(ipv4=ipv4, ipv6=ipv6)))
-        dns_searches = sorted(get_dns_search_paths())
+        domain_name = node.domain.name
+        dns_searches = [domain_name] + [
+            name
+            for name in sorted(get_dns_search_paths())
+            if name != domain_name]
         for dns_name in dns_searches:
             config += "   - %s\n" % dns_name
         return config
@@ -258,9 +262,14 @@
     )
 
     def test_renders_expected_output(self):
+        # Force it to have a domain name in the middle of two others.  This
+        # will confirm that sorting is working correctly.
+        factory.make_Domain('aaa')
+        domain = factory.make_Domain('bbb')
+        factory.make_Domain('ccc')
         subnet = factory.make_Subnet(version=self.version)
         node = factory.make_Node_with_Interface_on_Subnet(
-            interface_count=2, subnet=subnet)
+            interface_count=2, subnet=subnet, domain=domain)
         for iface in node.interface_set.filter(enabled=True):
             factory.make_StaticIPAddress(
                 interface=iface,
@@ -288,8 +297,13 @@
 class TestSimpleNetworkLayout(MAASServerTestCase, AssertNetworkConfigMixin):
 
     def test__renders_expected_output(self):
+        # Force it to have a domain name in the middle of two others.  This
+        # will confirm that sorting is working correctly.
+        factory.make_Domain('aaa')
+        domain = factory.make_Domain('bbb')
+        factory.make_Domain('ccc')
         node = factory.make_Node_with_Interface_on_Subnet(
-            interface_count=2)
+            interface_count=2, domain=domain)
         for iface in node.interface_set.filter(enabled=True):
             factory.make_StaticIPAddress(
                 interface=iface,