Merge lp:~blake-rouse/maas/fix-1592132 into lp:~maas-committers/maas/trunk

[Blake Rouse]

Fix anonymous machines create endpoint to return the correct fields on domain and zone.

[Andres Rodriguez (andreserl)]

It looks good to me...

review: Approve

=== modified file 'src/maasserver/api/domains.py'
--- src/maasserver/api/domains.py	2016-04-28 10:13:46 +0000
+++ src/maasserver/api/domains.py	2016-06-14 18:38:54 +0000
@@ -5,6 +5,7 @@
 
 from maasserver.api.support import (
     admin_method,
+    AnonymousOperationsHandler,
     operation,
     OperationsHandler,
 )
@@ -78,6 +79,13 @@
         dns_force_reload()
 
 
+class AnonDomainHandler(AnonymousOperationsHandler):
+    """Anonymous access to domain."""
+    read = create = update = delete = None
+    model = Domain
+    fields = DISPLAYED_DOMAIN_FIELDS
+
+
 class DomainHandler(OperationsHandler):
     """Manage domain."""
     api_doc_section_name = "Domain"

=== modified file 'src/maasserver/api/tests/test_enlistment.py'
--- src/maasserver/api/tests/test_enlistment.py	2016-06-10 02:57:23 +0000
+++ src/maasserver/api/tests/test_enlistment.py	2016-06-14 18:38:54 +0000
@@ -377,6 +377,7 @@
                 'mac_addresses': ['aa:bb:cc:dd:ee:ff', '22:bb:cc:dd:ee:ff'],
             })
         parsed_result = json_load_bytes(response.content)
+        # Limited fields on machine.
         self.assertItemsEqual(
             [
                 'system_id',
@@ -395,6 +396,24 @@
                 'resource_uri',
             ],
             list(parsed_result))
+        # Limited fields on domain.
+        self.assertItemsEqual(
+            [
+                'id',
+                'name',
+                'ttl',
+                'authoritative',
+                'resource_record_count',
+            ],
+            list(parsed_result['domain']))
+        # Limited fields on zone.
+        self.assertItemsEqual(
+            [
+                'id',
+                'name',
+                'description',
+            ],
+            list(parsed_result['zone']))
 
 
 class SimpleUserLoggedInEnlistmentAPITest(APITestCase.ForUser):

=== modified file 'src/maasserver/api/zones.py'
--- src/maasserver/api/zones.py	2016-03-28 13:54:47 +0000
+++ src/maasserver/api/zones.py	2016-06-14 18:38:54 +0000
@@ -11,6 +11,7 @@
 from django.shortcuts import get_object_or_404
 from maasserver.api.support import (
     admin_method,
+    AnonymousOperationsHandler,
     OperationsHandler,
 )
 from maasserver.exceptions import MAASAPIValidationError
@@ -20,6 +21,20 @@
 from piston3.utils import rc
 
 
+DISPLAYED_ZONE_FIELDS = (
+    'id',
+    'name',
+    'description',
+)
+
+
+class AnonZoneHandler(AnonymousOperationsHandler):
+    """Anonymous access to zone."""
+    read = create = update = delete = None
+    model = Zone
+    fields = DISPLAYED_ZONE_FIELDS
+
+
 class ZoneHandler(OperationsHandler):
     """Manage a physical zone.
 
@@ -33,7 +48,7 @@
     """
     api_doc_section_name = "Zone"
     model = Zone
-    fields = ('name', 'description')
+    fields = DISPLAYED_ZONE_FIELDS
 
     # Creation happens on the ZonesHandler.
     create = None