Merge ~newell-jensen/maas:2.6-lp1804563 into maas:2.6

[Newell Jensen]

backport of b65d218f01be698e858c27aae2d9b4f11291fc00

LP: #1804563 -- Modify dnsresource update API endpoint to take same parameters that dnsresources create API endpoint uses.

[Newell Jensen (newell-jensen)]

Self reviewed backport

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b 2.6-lp1804563 lp:~newell-jensen/maas/+git/maas into -b 2.6 lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/5801/consoleText

diff --git a/src/maasserver/api/dnsresources.py b/src/maasserver/api/dnsresources.py
index 1386d7a..81ba2a5 100644
--- a/src/maasserver/api/dnsresources.py
+++ b/src/maasserver/api/dnsresources.py
@@ -289,10 +289,20 @@ class DNSResourceHandler(OperationsHandler):
         @param (int) "{id}" [required=true] The DNS resource id.
 
         @param (string) "fqdn" [required=false] Hostname (with domain) for the
-        dnsresource.
+        dnsresource.  Either ``fqdn`` or ``name`` and ``domain`` must be
+        specified.  ``fqdn`` is ignored if either ``name`` or ``domain`` is
+        given.
 
-        @param (string) "ip_address" [required=false] Address to assign to the
-        dnsresource.
+        @param (string) "name" [required=false] Hostname (without domain).
+
+        @param (string) "domain" [required=false] Domain (name or id).
+
+        @param (string) "address_ttl" [required=false] Default TTL for entries
+        in this zone.
+
+        @param (string) "ip_addresses" [required=false] Address (ip or id) to
+        assign to the dnsresource. This creates an A or AAAA record,
+        for each of the supplied ip_addresses, IPv4 or IPv6, respectively.
 
         @success (http-status-code) "server-success" 200
         @success (json) "success-json" A JSON object containing the updated DNS
@@ -309,10 +319,32 @@ class DNSResourceHandler(OperationsHandler):
         @error-example "not-found"
             Not Found
         """
+        data = request.data.copy()
+        fqdn = data.get('fqdn', None)
+        name = data.get('name', None)
+        domainname = data.get('domain', None)
+        # If the user gave us fqdn and did not give us name/domain, expand
+        # fqdn.
+        if domainname is None and name is None and fqdn is not None:
+            # Assume that we're working with an address, since we ignore
+            # rrtype and rrdata.
+            (name, domainname) = separate_fqdn(fqdn, 'A')
+            data['domain'] = domainname
+            data['name'] = name
+        # If the domain is a name, make it an id.
+        if domainname is not None:
+            if domainname.isdigit():
+                domain = Domain.objects.get_domain_or_404(
+                    domainname, user=request.user, perm=NodePermission.view)
+            else:
+                domain = Domain.objects.get_domain_or_404(
+                    "name:%s" % domainname, user=request.user,
+                    perm=NodePermission.view)
+            data['domain'] = domain.id
         dnsresource = DNSResource.objects.get_dnsresource_or_404(
             id, request.user, NodePermission.admin)
         form = DNSResourceForm(
-            instance=dnsresource, data=request.data, request=request)
+            instance=dnsresource, data=data, request=request)
         if form.is_valid():
             return form.save()
         else:
diff --git a/src/maasserver/api/tests/test_dnsresources.py b/src/maasserver/api/tests/test_dnsresources.py
index 6c92513..0025a42 100644
--- a/src/maasserver/api/tests/test_dnsresources.py
+++ b/src/maasserver/api/tests/test_dnsresources.py
@@ -1,4 +1,4 @@
-# Copyright 2016 Canonical Ltd.  This software is licensed under the
+# Copyright 2016-2019 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for DNSResource API."""
@@ -349,6 +349,103 @@ class TestDNSResourceAPI(APITestCase.ForUser):
         self.assertEqual(
             http.client.FORBIDDEN, response.status_code, response.content)
 
+    def test_update_by_name_domain__id(self):
+        self.become_admin()
+        dnsresource = factory.make_DNSResource()
+        new_name = factory.make_name("dnsresource")
+        domain = factory.make_Domain()
+        fqdn = "%s.%s" % (new_name, domain.name)
+        sip = factory.make_StaticIPAddress()
+        uri = get_dnsresource_uri(dnsresource)
+        response = self.client.put(uri, {
+            "name": new_name,
+            "domain": domain.id,
+            "ip_addresses": str(sip.ip),
+        })
+        self.assertEqual(
+            http.client.OK, response.status_code, response.content)
+        self.assertEqual(
+            fqdn,
+            json.loads(
+                response.content.decode(settings.DEFAULT_CHARSET))['fqdn'])
+        self.assertEqual(
+            sip.ip,
+            json.loads(
+                response.content.decode(
+                    settings.DEFAULT_CHARSET))['ip_addresses'][0]['ip'])
+
+    def test_update_by_name_domain__name(self):
+        self.become_admin()
+        dnsresource = factory.make_DNSResource()
+        new_name = factory.make_name("dnsresource")
+        domain = factory.make_Domain()
+        fqdn = "%s.%s" % (new_name, domain.name)
+        sip = factory.make_StaticIPAddress()
+        uri = get_dnsresource_uri(dnsresource)
+        response = self.client.put(uri, {
+            "name": new_name,
+            "domain": domain.name,
+            "ip_addresses": str(sip.ip),
+        })
+        self.assertEqual(
+            http.client.OK, response.status_code, response.content)
+        self.assertEqual(
+            fqdn,
+            json.loads(
+                response.content.decode(settings.DEFAULT_CHARSET))['fqdn'])
+        self.assertEqual(
+            sip.ip,
+            json.loads(
+                response.content.decode(
+                    settings.DEFAULT_CHARSET))['ip_addresses'][0]['ip'])
+
+    def test_update_by_fqdn(self):
+        self.become_admin()
+        dnsresource = factory.make_DNSResource()
+        new_name = factory.make_name("dnsresource")
+        domain = factory.make_Domain()
+        fqdn = "%s.%s" % (new_name, domain.name)
+        sip = factory.make_StaticIPAddress()
+        uri = get_dnsresource_uri(dnsresource)
+        response = self.client.put(uri, {
+            "fqdn": fqdn,
+            "ip_addresses": str(sip.ip),
+        })
+        self.assertEqual(
+            http.client.OK, response.status_code, response.content)
+        self.assertEqual(
+            fqdn,
+            json.loads(
+                response.content.decode(settings.DEFAULT_CHARSET))['fqdn'])
+        self.assertEqual(
+            sip.ip,
+            json.loads(
+                response.content.decode(
+                    settings.DEFAULT_CHARSET))['ip_addresses'][0]['ip'])
+
+    def test_update_multiple_ips(self):
+        self.become_admin()
+        dnsresource = factory.make_DNSResource()
+        new_name = factory.make_name("dnsresource")
+        domain = factory.make_Domain()
+        fqdn = "%s.%s" % (new_name, domain.name)
+        ips = [factory.make_StaticIPAddress() for _ in range(2)]
+        uri = get_dnsresource_uri(dnsresource)
+        response = self.client.put(uri, {
+            "name": new_name,
+            "domain": domain.id,
+            "ip_addresses": " ".join([str(ip.ip) for ip in ips]),
+        })
+        self.assertEqual(
+            http.client.OK, response.status_code, response.content)
+        self.assertEqual(
+            fqdn,
+            json.loads(
+                response.content.decode(settings.DEFAULT_CHARSET))['fqdn'])
+        result = json.loads(response.content.decode(
+            settings.DEFAULT_CHARSET))['ip_addresses']
+        self.assertEqual([ip.ip for ip in ips], [ip['ip'] for ip in result])
+
     def test_delete_deletes_dnsresource(self):
         self.become_admin()
         dnsresource = factory.make_DNSResource()