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

[LaMont Jones]

Fix typo in the handling of api "ipaddresses reserve hostname=".

Fix typo in the handling of api "ipaddresses reserve hostname=".

[Blake Rouse (blake-rouse)]

Looks good. Does this affect 1.9?

review: Approve

[LaMont Jones (lamont)]

> Looks good. Does this affect 1.9?

This was not a thing in 1.9 (DNSResource wasn't there.)

=== modified file 'src/maasserver/api/ip_addresses.py'
--- src/maasserver/api/ip_addresses.py	2016-03-31 23:34:55 +0000
+++ src/maasserver/api/ip_addresses.py	2016-06-07 14:57:13 +0000
@@ -116,7 +116,7 @@
                 alloc_type=IPADDRESS_TYPE.USER_RESERVED,
                 user=user)
             if hostname is not None and hostname != '':
-                dnsrr = DNSResource.objects.get_or_create(
+                dnsrr, _ = DNSResource.objects.get_or_create(
                     name=hostname, domain=domain)
                 dnsrr.ip_addresses.add(sip)
             maaslog.info(

=== modified file 'src/maasserver/api/tests/test_ipaddresses.py'
--- src/maasserver/api/tests/test_ipaddresses.py	2016-05-24 22:05:45 +0000
+++ src/maasserver/api/tests/test_ipaddresses.py	2016-06-07 14:57:13 +0000
@@ -15,7 +15,10 @@
     INTERFACE_TYPE,
     IPADDRESS_TYPE,
 )
-from maasserver.models import StaticIPAddress
+from maasserver.models import (
+    DNSResource,
+    StaticIPAddress,
+)
 from maasserver.testing.api import APITestCase
 from maasserver.testing.factory import factory
 from maasserver.utils.converters import json_load_bytes
@@ -85,6 +88,32 @@
             IPADDRESS_TYPE.USER_RESERVED, staticipaddress.alloc_type)
         self.assertEqual(self.user, staticipaddress.user)
 
+    def test_POST_reserve_creates_dnsresource(self):
+        # The api doesn't autocreate the domain, so create one now.
+        domain = factory.make_Domain()
+        hostname = factory.make_name("host")
+        fqdn = "%s.%s" % (hostname, domain.name)
+        subnet = factory.make_Subnet()
+        response = self.post_reservation_request(subnet, hostname=fqdn)
+        self.assertEqual(http.client.OK, response.status_code)
+        returned_address = json_load_bytes(response.content)
+        [staticipaddress] = StaticIPAddress.objects.all()
+        # We don't need to test the value of the 'created' datetime
+        # field. By removing it, we also test for its presence.
+        del returned_address['created']
+        del returned_address['subnet']
+        expected = dict(
+            alloc_type=staticipaddress.alloc_type,
+            ip=staticipaddress.ip,
+            resource_uri=reverse('ipaddresses_handler'),
+            )
+        self.assertEqual(expected, returned_address)
+        self.assertEqual(
+            IPADDRESS_TYPE.USER_RESERVED, staticipaddress.alloc_type)
+        self.assertEqual(self.user, staticipaddress.user)
+        dnsrr = DNSResource.objects.get(name=hostname, domain=domain)
+        self.assertItemsEqual(dnsrr.ip_addresses.all(), [staticipaddress])
+
     def test_POST_reserve_with_MAC_links_MAC_to_ip_address(self):
         subnet = factory.make_Subnet()
         mac = factory.make_mac_address()