Merge lp:~mpontillo/maas/subnet-dns-override-maas-dns-for-default-gw--bug-1576116--2.0 into lp:maas/2.0

[Mike Pontillo]

Merge revision 5178 from trunk.

When deploying a node, override the MAAS DNS server with the DNS servers specified on the subnet for the default gateway, when specifying DNS servers for the loopback interface.

[Mike Pontillo (mpontillo)]

Self-approved backport.

review: Approve

[MAAS Lander (maas-lander)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'docs/changelog.rst'
--- docs/changelog.rst	2016-07-14 23:49:58 +0000
+++ docs/changelog.rst	2016-07-15 02:30:37 +0000
@@ -15,6 +15,8 @@
 
 LP: #1603147    Commissioning dropdown is grey and checkmarks are missing.
 
+LP: #1576116    MAAS adds regions controller as DNS resolver
+
 
 2.0.0 (rc2)
 ===========
@@ -61,6 +63,9 @@
 
 LP: #1596046    [2.0] maas 2.0 pxeboot fails on PowerNV
 
+LP: #1600267    [1.9,2.0,UX] Can't add aliases when parent interface is set to 'DCHP'
+
+LP: #1598937    [2.0 rc1] Following fresh install maas command fails - PermissionError: [Errno 13] Permission denied: '/home/ubuntu/.maascli.db'
 
 2.0.0 (beta8)
 =============

=== modified file 'src/maasserver/models/node.py'
--- src/maasserver/models/node.py	2016-06-17 21:26:46 +0000
+++ src/maasserver/models/node.py	2016-07-15 02:30:37 +0000
@@ -209,8 +209,23 @@
 
 # Return type from `get_effective_power_info`.
 PowerInfo = namedtuple("PowerInfo", (
-    "can_be_started", "can_be_stopped", "can_be_queried", "power_type",
-    "power_parameters"))
+    "can_be_started",
+    "can_be_stopped",
+    "can_be_queried",
+    "power_type",
+    "power_parameters",
+))
+
+DefaultGateways = namedtuple("DefaultGateways", (
+    "ipv4",
+    "ipv6",
+))
+
+GatewayDefinition = namedtuple("GatewayDefinition", (
+    "interface_id",
+    "subnet_id",
+    "gateway_ip",
+))
 
 # The sequence from which the decimal form of node system IDs should be
 # pulled. At the time of writing this should match the definition in migration
@@ -2568,7 +2583,7 @@
                 interface.id
             """, (self.id,))
         return [
-            (found[0], found[1], found[2])
+            GatewayDefinition._make((found[0], found[1], found[2]))
             for found in cursor.fetchall()
         ]
 
@@ -2620,7 +2635,7 @@
 
         # Early out if we already have both gateways.
         if gateway_ipv4 and gateway_ipv6:
-            return (gateway_ipv4, gateway_ipv6)
+            return DefaultGateways._make((gateway_ipv4, gateway_ipv6))
 
         # Get the best guesses for the missing IP families.
         found_gateways = self.get_best_guess_for_default_gateways()
@@ -2630,7 +2645,47 @@
         if not gateway_ipv6:
             gateway_ipv6 = self._get_gateway_tuple_by_family(
                 found_gateways, IPADDRESS_FAMILY.IPv6)
-        return (gateway_ipv4, gateway_ipv6)
+        return DefaultGateways._make((gateway_ipv4, gateway_ipv6))
+
+    def get_default_dns_servers(self):
+        """Return the default DNS servers for this node."""
+        # Circular imports.
+        from maasserver.dns.zonegenerator import get_dns_server_address
+
+        gateways = self.get_default_gateways()
+
+        # Try first to use DNS servers from default gateway subnets.
+        if gateways.ipv4 is not None:
+            subnet = Subnet.objects.get(id=gateways.ipv4.subnet_id)
+            if subnet.dns_servers is not None and len(subnet.dns_servers) > 0:
+                # An IPv4 subnet is hosting the default gateway and has DNS
+                # servers defined. IPv4 DNS servers take first-priority.
+                return subnet.dns_servers
+        if gateways.ipv6 is not None:
+            subnet = Subnet.objects.get(id=gateways.ipv6.subnet_id)
+            if subnet.dns_servers is not None and len(subnet.dns_servers) > 0:
+                # An IPv6 subnet is hosting the default gateway and has DNS
+                # servers defined. IPv6 DNS servers take second-priority.
+                return subnet.dns_servers
+
+        # No default gateway subnet has specific DNS servers defined, so
+        # use MAAS for the default DNS server.
+        if gateways.ipv4 is None and gateways.ipv6 is None:
+            # If there are no default gateways, the default is the MAAS
+            # region IP address.
+            maas_dns_server = get_dns_server_address(
+                rack_controller=self.get_boot_rack_controller())
+        else:
+            # Choose an address consistent with the primary address-family
+            # in use, as indicated by the presence (or not) of a gateway.
+            # Note that this path is only taken if the MAAS URL is set to
+            # a hostname, and the hostname resolves to both an IPv4 and an
+            # IPv6 address.
+            maas_dns_server = get_dns_server_address(
+                rack_controller=self.get_boot_rack_controller(),
+                ipv4=(gateways.ipv4 is not None),
+                ipv6=(gateways.ipv6 is not None))
+        return [maas_dns_server]
 
     def get_boot_purpose(self):
         """

=== modified file 'src/maasserver/models/tests/test_node.py'
--- src/maasserver/models/tests/test_node.py	2016-06-28 07:12:49 +0000
+++ src/maasserver/models/tests/test_node.py	2016-07-15 02:30:37 +0000
@@ -37,6 +37,7 @@
 from maasserver.enum import (
     FILESYSTEM_GROUP_TYPE,
     FILESYSTEM_TYPE,
+    INTERFACE_LINK_TYPE,
     INTERFACE_TYPE,
     IPADDRESS_TYPE,
     NODE_PERMISSION,
@@ -93,6 +94,7 @@
     NODE_TRANSITIONS,
 )
 from maasserver.rpc.testing.fixtures import MockLiveRegionToClusterRPCFixture
+import maasserver.server_address as server_address_module
 from maasserver.storage_layouts import (
     StorageLayoutError,
     StorageLayoutMissingBootDiskError,
@@ -134,6 +136,7 @@
     commissioning,
     disk_erasing,
 )
+from netaddr import IPAddress
 from provisioningserver.events import (
     EVENT_DETAILS,
     EVENT_TYPES,
@@ -4101,6 +4104,158 @@
             ), node.get_default_gateways())
 
 
+class TestGetDefaultDNSServers(MAASServerTestCase):
+    """Tests for `Node.get_default_dns_servers`."""
+
+    def make_Node_with_RackController(
+            self, ipv4=True, ipv6=True, ipv4_gateway=True, ipv6_gateway=True,
+            ipv4_subnet_dns=None, ipv6_subnet_dns=None):
+        ipv4_subnet_dns = [] if ipv4_subnet_dns is None else ipv4_subnet_dns
+        ipv6_subnet_dns = [] if ipv6_subnet_dns is None else ipv6_subnet_dns
+        rack_v4 = None
+        rack_v6 = None
+        fabric = factory.make_Fabric()
+        vlan = fabric.get_default_vlan()
+        if ipv4:
+            gateway_ip = None if ipv4_gateway else ""
+            v4_subnet = factory.make_Subnet(
+                version=4, vlan=vlan, dns_servers=ipv4_subnet_dns,
+                gateway_ip=gateway_ip)
+        if ipv6:
+            gateway_ip = None if ipv6_gateway else ""
+            v6_subnet = factory.make_Subnet(
+                version=6, vlan=vlan, dns_servers=ipv6_subnet_dns,
+                gateway_ip=gateway_ip)
+        rack = factory.make_RegionRackController()
+        vlan.primary_rack = rack
+        vlan.dhcp_on = True
+        vlan.save()
+        # In order to determine the correct IP address per-address-family,
+        # a name lookup is performed on the hostname part of the URL.
+        # We need to mock that so we can return whatever IP addresses it
+        # resolves to.
+        rack.url = "http://region:5240/MAAS/"
+        if ipv4:
+            rack_v4 = factory.pick_ip_in_Subnet(v4_subnet)
+        if ipv6:
+            rack_v6 = factory.pick_ip_in_Subnet(v6_subnet)
+
+        def get_address(hostname, ip_version=4):
+            """Mock function to return the IP address of the rack based on the
+            given address family.
+            """
+            if ip_version == 4:
+                return {IPAddress(rack_v4)} if rack_v4 else set()
+            elif ip_version == 6:
+                return {IPAddress(rack_v6)} if rack_v6 else set()
+
+        resolve_hostname = self.patch(
+            server_address_module, 'resolve_hostname')
+        resolve_hostname.side_effect = get_address
+        rack.interface_set.all().delete()
+        rackif = factory.make_Interface(vlan=vlan, node=rack)
+        if ipv4:
+            rackif.link_subnet(INTERFACE_LINK_TYPE.STATIC, v4_subnet, rack_v4)
+        if ipv6:
+            rackif.link_subnet(INTERFACE_LINK_TYPE.STATIC, v6_subnet, rack_v6)
+        rack.boot_interface = rackif
+        rack.save()
+        node = factory.make_Node(status=NODE_STATUS.READY, disable_ipv4=False)
+        nodeif = factory.make_Interface(vlan=vlan, node=node)
+        if ipv4:
+            nodeif.link_subnet(INTERFACE_LINK_TYPE.AUTO, v4_subnet)
+        if ipv6:
+            nodeif.link_subnet(INTERFACE_LINK_TYPE.AUTO, v6_subnet)
+        node.boot_interface = nodeif
+        node.save()
+        return rack_v4, rack_v6, node
+
+    def test__uses_rack_ipv4_if_ipv4_only_with_no_gateway(self):
+        rack_v4, rack_v6, node = self.make_Node_with_RackController(
+            ipv4=True, ipv4_gateway=False, ipv6=False, ipv6_gateway=False)
+        self.assertThat(node.get_default_dns_servers(), Equals([rack_v4]))
+
+    def test__uses_rack_ipv4_if_ipv4_only_with_no_gateway_v4_dns(self):
+        ipv4_subnet_dns = factory.make_ip_address(ipv6=False)
+        rack_v4, rack_v6, node = self.make_Node_with_RackController(
+            ipv4=True, ipv4_gateway=False, ipv6=False, ipv6_gateway=False,
+            ipv4_subnet_dns=[ipv4_subnet_dns])
+        self.assertThat(
+            node.get_default_dns_servers(), Equals([rack_v4]))
+
+    def test__uses_rack_ipv6_if_ipv6_only_with_no_gateway_v6_dns(self):
+        ipv6_subnet_dns = factory.make_ip_address(ipv6=True)
+        rack_v4, rack_v6, node = self.make_Node_with_RackController(
+            ipv4=False, ipv4_gateway=False, ipv6=True, ipv6_gateway=False,
+            ipv6_subnet_dns=[ipv6_subnet_dns])
+        self.assertThat(node.get_default_dns_servers(), Equals([rack_v6]))
+
+    def test__uses_rack_ipv4_if_dual_stack_with_no_gateway(self):
+        rack_v4, rack_v6, node = self.make_Node_with_RackController(
+            ipv4=True, ipv4_gateway=False, ipv6=True, ipv6_gateway=False)
+        self.assertThat(node.get_default_dns_servers(), Equals([rack_v4]))
+
+    def test__uses_rack_ipv4_if_dual_stack_with_ipv4_gateway(self):
+        rack_v4, rack_v6, node = self.make_Node_with_RackController(
+            ipv4=True, ipv4_gateway=True, ipv6=True, ipv6_gateway=False)
+        self.assertThat(node.get_default_dns_servers(), Equals([rack_v4]))
+
+    def test__uses_subnet_ipv4_if_dual_stack_with_ipv4_gateway_with_dns(self):
+        ipv4_subnet_dns = factory.make_ip_address(ipv6=False)
+        ipv6_subnet_dns = factory.make_ip_address(ipv6=True)
+        rack_v4, rack_v6, node = self.make_Node_with_RackController(
+            ipv4=True, ipv4_gateway=True, ipv6=True, ipv6_gateway=False,
+            ipv4_subnet_dns=[ipv4_subnet_dns],
+            ipv6_subnet_dns=[ipv6_subnet_dns])
+        self.assertThat(
+            node.get_default_dns_servers(), Equals([ipv4_subnet_dns]))
+
+    def test__uses_rack_ipv6_if_dual_stack_with_ipv6_gateway(self):
+        rack_v4, rack_v6, node = self.make_Node_with_RackController(
+            ipv4=True, ipv4_gateway=False, ipv6=True, ipv6_gateway=True)
+        self.assertThat(node.get_default_dns_servers(), Equals([rack_v6]))
+
+    def test__uses_subnet_ipv6_if_dual_stack_with_ipv6_gateway(self):
+        ipv4_subnet_dns = factory.make_ip_address(ipv6=False)
+        ipv6_subnet_dns = factory.make_ip_address(ipv6=True)
+        rack_v4, rack_v6, node = self.make_Node_with_RackController(
+            ipv4=True, ipv4_gateway=False, ipv6=True, ipv6_gateway=True,
+            ipv4_subnet_dns=[ipv4_subnet_dns],
+            ipv6_subnet_dns=[ipv6_subnet_dns])
+        self.assertThat(
+            node.get_default_dns_servers(), Equals([ipv6_subnet_dns]))
+
+    def test__uses_rack_ipv4_if_ipv4_with_ipv4_gateway(self):
+        rack_v4, rack_v6, node = self.make_Node_with_RackController(
+            ipv4=True, ipv4_gateway=True, ipv6=False, ipv6_gateway=False)
+        self.assertThat(node.get_default_dns_servers(), Equals([rack_v4]))
+
+    def test__uses_subnet_ipv4_if_ipv4_stack_with_ipv4_gateway_and_dns(self):
+        ipv4_subnet_dns = factory.make_ip_address(ipv6=False)
+        ipv6_subnet_dns = factory.make_ip_address(ipv6=True)
+        rack_v4, rack_v6, node = self.make_Node_with_RackController(
+            ipv4=True, ipv4_gateway=True, ipv6=False, ipv6_gateway=False,
+            ipv4_subnet_dns=[ipv4_subnet_dns],
+            ipv6_subnet_dns=[ipv6_subnet_dns])
+        self.assertThat(
+            node.get_default_dns_servers(), Equals([ipv4_subnet_dns]))
+
+    def test__uses_rack_ipv6_if_ipv6_with_ipv6_gateway(self):
+        rack_v4, rack_v6, node = self.make_Node_with_RackController(
+            ipv4=False, ipv4_gateway=False, ipv6=True, ipv6_gateway=True)
+        self.assertThat(node.get_default_dns_servers(), Equals([rack_v6]))
+
+    def test__uses_subnet_ipv6_if_ipv6_with_ipv6_gateway_and_dns(self):
+        ipv4_subnet_dns = factory.make_ip_address(ipv6=False)
+        ipv6_subnet_dns = factory.make_ip_address(ipv6=True)
+        rack_v4, rack_v6, node = self.make_Node_with_RackController(
+            ipv4=False, ipv4_gateway=False, ipv6=True, ipv6_gateway=True,
+            ipv4_subnet_dns=[ipv4_subnet_dns],
+            ipv6_subnet_dns=[ipv6_subnet_dns])
+        self.assertThat(
+            node.get_default_dns_servers(), Equals([ipv6_subnet_dns]))
+
+
 class TestNode_Start(MAASServerTestCase):
     """Tests for Node.start()."""
 

=== modified file 'src/maasserver/preseed_network.py'
--- src/maasserver/preseed_network.py	2016-03-28 13:54:47 +0000
+++ src/maasserver/preseed_network.py	2016-07-15 02:30:37 +0000
@@ -6,10 +6,7 @@
 __all__ = [
     ]
 
-from maasserver.dns.zonegenerator import (
-    get_dns_search_paths,
-    get_dns_server_address,
-)
+from maasserver.dns.zonegenerator import get_dns_search_paths
 from maasserver.enum import (
     INTERFACE_TYPE,
     IPADDRESS_FAMILY,
@@ -24,6 +21,7 @@
     def __init__(self, node):
         self.node = node
         self.gateways = node.get_default_gateways()
+        self.dns_servers = node.get_default_dns_servers()
         self.gateway_ipv4_set = False
         self.gateway_ipv6_set = False
         self.operations = {
@@ -51,8 +49,7 @@
 
         self.network_config.append({
             "type": "nameserver",
-            "address": get_dns_server_address(
-                rack_controller=self.node.get_boot_rack_controller()),
+            "address": self.dns_servers,
             "search": sorted(get_dns_search_paths()),
         })
 

=== modified file 'src/maasserver/tests/test_preseed_network.py'
--- src/maasserver/tests/test_preseed_network.py	2016-04-15 23:38:27 +0000
+++ src/maasserver/tests/test_preseed_network.py	2016-07-15 02:30:37 +0000
@@ -8,10 +8,7 @@
 import random
 from textwrap import dedent
 
-from maasserver.dns.zonegenerator import (
-    get_dns_search_paths,
-    get_dns_server_address,
-)
+from maasserver.dns.zonegenerator import get_dns_search_paths
 from maasserver.enum import (
     INTERFACE_TYPE,
     IPADDRESS_FAMILY,
@@ -203,8 +200,7 @@
 
     def collectDNSConfig(self, node):
         config = "- type: nameserver\n  address: %s\n  search:\n" % (
-            get_dns_server_address(
-                rack_controller=node.get_boot_primary_rack_controller()))
+            repr(node.get_default_dns_servers()))
         dns_searches = sorted(get_dns_search_paths())
         for dns_name in dns_searches:
             config += "   - %s\n" % dns_name