Merge ~mpontillo/maas:fix-dnsresource-synthetic-records-for-zero-record-case--bug-1791383 into maas:master

[Mike Pontillo]

LP: #1791383 - Fix dnsresources read all=true when no concrete records exist.

9001459... by Mike Pontillo on 2018-09-07

Format imports.

[Andres Rodriguez (andreserl)]

Lgtm!!!

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b fix-dnsresource-synthetic-records-for-zero-record-case--bug-1791383 lp:~mpontillo/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 900145961bbb448a430186fd29c99b9705bf7985

review: Approve

diff --git a/src/maasserver/api/dnsresources.py b/src/maasserver/api/dnsresources.py
index bd8e994..7a8ae00 100644
--- a/src/maasserver/api/dnsresources.py
+++ b/src/maasserver/api/dnsresources.py
@@ -34,41 +34,50 @@ class DNSResourcesQuerySet(QuerySet):
 
     def __iter__(self):
         """Custom iterator which also includes implicit DNS records."""
-        previous_domain = None
+        domain = None
+        if self._domain_filter is not None:
+            unvisited_domains = set()
+            unvisited_domains.add(self._domain_filter)
+        else:
+            unvisited_domains = set(Domain.objects.all())
         for record in super().__iter__():
             # This works because the query always either contains a single
             # domain, or is sorted by domain.
-            if record.domain != previous_domain:
-                previous_domain = record.domain
-                rrdata = record.domain.render_json_for_related_rrdata(
-                    include_dnsdata=False, as_dict=True,
-                    user=self._user_filter)
-                for name, value in rrdata.items():
-                    name = name.split('.')[0]
-                    # Remove redundant info (this is provided in the top
-                    # level 'fqdn' field).
-                    if (self._name_filter is not None and
-                            name != self._name_filter):
-                        continue
-                    items = []
-                    for rr in value:
-                        if (self._rrtype_filter is not None and
-                                rr['rrtype'] != self._rrtype_filter):
-                            continue
-                        del rr['name']
-                        items.append(rr)
-                    if len(items) > 0:
-                        resource = DNSResource(
-                            id=-1, name=name, domain=record.domain)
-                        resource._rrdata = items
-                        yield resource
+            if record.domain != domain:
+                domain = record.domain
+                unvisited_domains.remove(domain)
+                yield from self._generate_synthetic_rrdata(domain)
             yield record
+        for domain in unvisited_domains:
+            yield from self._generate_synthetic_rrdata(domain)
+
+    def _generate_synthetic_rrdata(self, domain):
+        rrdata = domain.render_json_for_related_rrdata(
+            include_dnsdata=False, as_dict=True, user=self._user_filter)
+        for name, value in rrdata.items():
+            name = name.split('.')[0]
+            # Remove redundant info (this is provided in the top
+            # level 'fqdn' field).
+            if (self._name_filter is not None and name != self._name_filter):
+                continue
+            items = []
+            for rr in value:
+                if (self._rrtype_filter is not None and
+                        rr['rrtype'] != self._rrtype_filter):
+                    continue
+                del rr['name']
+                items.append(rr)
+            if len(items) > 0:
+                resource = DNSResource(id=-1, name=name, domain=domain)
+                resource._rrdata = items
+                yield resource
 
 
 def get_dnsresource_queryset(
         all_records: bool, domainname: str=None, name: str=None,
         rrtype: str=None, user=None):
     # If the domain is a name, make it an id.
+    domain = None
     if domainname is not None:
         if domainname.isdigit():
             domain = Domain.objects.get_domain_or_404(
@@ -96,6 +105,7 @@ def get_dnsresource_queryset(
         query.__class__ = DNSResourcesQuerySet
         query._name_filter = name_filter
         query._rrtype_filter = rrtype_filter
+        query._domain_filter = domain
         # Note: the _user_filter should be set to None we want to display
         # all records, even for non-superusers.
         query._user_filter = user
diff --git a/src/maasserver/api/tests/test_dnsresources.py b/src/maasserver/api/tests/test_dnsresources.py
index ed3aa02..6c92513 100644
--- a/src/maasserver/api/tests/test_dnsresources.py
+++ b/src/maasserver/api/tests/test_dnsresources.py
@@ -11,8 +11,10 @@ import random
 
 from django.conf import settings
 from maasserver.api.dnsresources import get_dnsresource_queryset
+from maasserver.enum import NODE_STATUS
 from maasserver.models.dnsdata import DNSData
 from maasserver.models.dnsresource import DNSResource
+from maasserver.models.domain import Domain
 from maasserver.testing.api import APITestCase
 from maasserver.testing.factory import factory
 from maasserver.utils.django_urls import reverse
@@ -121,6 +123,29 @@ class TestDNSResourcesAPI(APITestCase.ForUser):
         ]
         self.assertItemsEqual(expected_ids, result_ids)
 
+    def test_read_all_with_only_implicit_records(self):
+        self.become_admin()
+        domain = Domain.objects.get_default_domain()
+        uri = get_dnsresources_uri()
+        machine = factory.make_Node_with_Interface_on_Subnet(
+            status=NODE_STATUS.DEPLOYED, domain=domain)
+        factory.make_StaticIPAddress(interface=machine.boot_interface)
+        response = self.client.get(
+            uri,
+            {
+                'all': 'true',
+            }
+        )
+        self.assertEqual(
+            http.client.OK, response.status_code, response.content)
+        expected_ids = [-1]
+        result_ids = [
+            dnsresource["id"]
+            for dnsresource in json.loads(
+                response.content.decode(settings.DEFAULT_CHARSET))
+        ]
+        self.assertItemsEqual(expected_ids, result_ids)
+
     def test_read_with_name(self):
         for _ in range(3):
             factory.make_DNSResource()