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

[Blake Rouse]

Add is_registered as an authenticated operation as well.

[Newell Jensen (newell-jensen)]

Looks good.

review: Approve

=== modified file 'src/maasserver/api/nodes.py'
--- src/maasserver/api/nodes.py	2017-04-12 16:25:49 +0000
+++ src/maasserver/api/nodes.py	2017-04-12 19:02:03 +0000
@@ -137,6 +137,15 @@
     return nodes.order_by('id')
 
 
+def is_registered(request):
+    """Used by both `NodesHandler` and `AnonNodesHandler`."""
+    mac_address = get_mandatory_param(request.GET, 'mac_address')
+    interfaces = Interface.objects.filter(mac_address=mac_address)
+    interfaces = interfaces.exclude(node__isnull=True)
+    interfaces = interfaces.exclude(node__status=NODE_STATUS.RETIRED)
+    return interfaces.exists()
+
+
 class NodeHandler(OperationsHandler):
     """Manage an individual Node.
 
@@ -283,11 +292,7 @@
 
         Returns 400 if any mandatory parameters are missing.
         """
-        mac_address = get_mandatory_param(request.GET, 'mac_address')
-        interfaces = Interface.objects.filter(mac_address=mac_address)
-        interfaces = interfaces.exclude(node__isnull=True)
-        interfaces = interfaces.exclude(node__status=NODE_STATUS.RETIRED)
-        return interfaces.exists()
+        return is_registered(request)
 
     @classmethod
     def resource_uri(cls, *args, **kwargs):
@@ -360,6 +365,20 @@
             nodes = nodes.prefetch_related('zone')
             return nodes.order_by('id')
 
+    @operation(idempotent=True)
+    def is_registered(self, request):
+        """Returns whether or not the given MAC address is registered within
+        this MAAS (and attached to a non-retired node).
+
+        :param mac_address: The mac address to be checked.
+        :type mac_address: unicode
+        :return: 'true' or 'false'.
+        :rtype: unicode
+
+        Returns 400 if any mandatory parameters are missing.
+        """
+        return is_registered(request)
+
     @admin_method
     @operation(idempotent=False)
     def set_zone(self, request):

=== modified file 'src/maasserver/api/tests/test_nodes.py'
--- src/maasserver/api/tests/test_nodes.py	2017-04-12 16:25:49 +0000
+++ src/maasserver/api/tests/test_nodes.py	2017-04-12 19:02:03 +0000
@@ -28,7 +28,7 @@
 from maastesting.djangotestcase import count_queries
 
 
-class AnonymousIsRegisteredAPITest(APITestCase.ForAnonymous):
+class TestIsRegisteredAPI(APITestCase.ForAnonymousAndUserAndAdmin):
 
     def test_is_registered_returns_True_if_node_registered(self):
         mac_address = factory.make_mac_address()