Merge lp:~jtv/maas/extract-nodemacs-handlers into lp:~maas-committers/maas/trunk

[Jeroen T. Vermeulen]

Extract API handlers: NodeMacs.

For self-approval after cursory inspection.

Jeroen

[Jeroen T. Vermeulen (jtv)]

Looks OK. Self-approving.

review: Approve

=== modified file 'src/maasserver/api/api.py'
--- src/maasserver/api/api.py	2014-08-18 13:29:45 +0000
+++ src/maasserver/api/api.py	2014-08-18 13:29:45 +0000
@@ -14,8 +14,6 @@
     "AnonNodesHandler",
     "get_oauth_token",
     "NodeHandler",
-    "NodeMacHandler",
-    "NodeMacsHandler",
     "NodesHandler",
     "store_node_power_parameters",
     ]
@@ -55,10 +53,7 @@
     StaticIPAddressExhaustion,
     Unauthorized,
     )
-from maasserver.fields import (
-    MAC_RE,
-    validate_mac,
-    )
+from maasserver.fields import MAC_RE
 from maasserver.forms import (
     BulkNodeActionForm,
     get_action_form,
@@ -963,73 +958,3 @@
     @classmethod
     def resource_uri(cls, *args, **kwargs):
         return ('nodes_handler', [])
-
-
-class NodeMacsHandler(OperationsHandler):
-    """Manage MAC addresses for a given Node.
-
-    This is where you manage the MAC addresses linked to a Node, including
-    associating a new MAC address with the Node.
-
-    The Node is identified by its system_id.
-    """
-    api_doc_section_name = "Node MAC addresses"
-    update = delete = None
-
-    def read(self, request, system_id):
-        """Read all MAC addresses related to a Node."""
-        node = Node.objects.get_node_or_404(
-            user=request.user, system_id=system_id, perm=NODE_PERMISSION.VIEW)
-
-        return MACAddress.objects.filter(node=node).order_by('id')
-
-    def create(self, request, system_id):
-        """Create a MAC address for a specified Node."""
-        node = Node.objects.get_node_or_404(
-            user=request.user, system_id=system_id, perm=NODE_PERMISSION.EDIT)
-        mac = node.add_mac_address(request.data.get('mac_address', None))
-        return mac
-
-    @classmethod
-    def resource_uri(cls, *args, **kwargs):
-        return ('node_macs_handler', ['system_id'])
-
-
-class NodeMacHandler(OperationsHandler):
-    """Manage a Node MAC address.
-
-    The MAC address object is identified by the system_id for the Node it
-    is attached to, plus the MAC address itself.
-    """
-    api_doc_section_name = "Node MAC address"
-    create = update = None
-    fields = ('mac_address',)
-    model = MACAddress
-
-    def read(self, request, system_id, mac_address):
-        """Read a MAC address related to a Node."""
-        node = Node.objects.get_node_or_404(
-            user=request.user, system_id=system_id, perm=NODE_PERMISSION.VIEW)
-
-        validate_mac(mac_address)
-        return get_object_or_404(
-            MACAddress, node=node, mac_address=mac_address)
-
-    def delete(self, request, system_id, mac_address):
-        """Delete a specific MAC address for the specified Node."""
-        validate_mac(mac_address)
-        node = Node.objects.get_node_or_404(
-            user=request.user, system_id=system_id, perm=NODE_PERMISSION.EDIT)
-
-        mac = get_object_or_404(MACAddress, node=node, mac_address=mac_address)
-        mac.delete()
-        return rc.DELETED
-
-    @classmethod
-    def resource_uri(cls, mac=None):
-        node_system_id = "system_id"
-        mac_address = "mac_address"
-        if mac is not None:
-            node_system_id = mac.node.system_id
-            mac_address = mac.mac_address
-        return ('node_mac_handler', [node_system_id, mac_address])

=== added file 'src/maasserver/api/node_macs.py'
--- src/maasserver/api/node_macs.py	1970-01-01 00:00:00 +0000
+++ src/maasserver/api/node_macs.py	2014-08-18 13:29:45 +0000
@@ -0,0 +1,99 @@
+# Copyright 2014 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""API handlers: `NodeMac`."""
+
+from __future__ import (
+    absolute_import,
+    print_function,
+    unicode_literals,
+    )
+
+str = None
+
+__metaclass__ = type
+__all__ = [
+    'NodeMacHandler',
+    'NodeMacsHandler',
+    ]
+
+
+from django.shortcuts import get_object_or_404
+from maasserver.api.support import OperationsHandler
+from maasserver.enum import NODE_PERMISSION
+from maasserver.fields import validate_mac
+from maasserver.models import (
+    MACAddress,
+    Node,
+    )
+from piston.utils import rc
+
+
+class NodeMacsHandler(OperationsHandler):
+    """Manage MAC addresses for a given Node.
+
+    This is where you manage the MAC addresses linked to a Node, including
+    associating a new MAC address with the Node.
+
+    The Node is identified by its system_id.
+    """
+    api_doc_section_name = "Node MAC addresses"
+    update = delete = None
+
+    def read(self, request, system_id):
+        """Read all MAC addresses related to a Node."""
+        node = Node.objects.get_node_or_404(
+            user=request.user, system_id=system_id, perm=NODE_PERMISSION.VIEW)
+
+        return MACAddress.objects.filter(node=node).order_by('id')
+
+    def create(self, request, system_id):
+        """Create a MAC address for a specified Node."""
+        node = Node.objects.get_node_or_404(
+            user=request.user, system_id=system_id, perm=NODE_PERMISSION.EDIT)
+        mac = node.add_mac_address(request.data.get('mac_address', None))
+        return mac
+
+    @classmethod
+    def resource_uri(cls, *args, **kwargs):
+        return ('node_macs_handler', ['system_id'])
+
+
+class NodeMacHandler(OperationsHandler):
+    """Manage a Node MAC address.
+
+    The MAC address object is identified by the system_id for the Node it
+    is attached to, plus the MAC address itself.
+    """
+    api_doc_section_name = "Node MAC address"
+    create = update = None
+    fields = ('mac_address',)
+    model = MACAddress
+
+    def read(self, request, system_id, mac_address):
+        """Read a MAC address related to a Node."""
+        node = Node.objects.get_node_or_404(
+            user=request.user, system_id=system_id, perm=NODE_PERMISSION.VIEW)
+
+        validate_mac(mac_address)
+        return get_object_or_404(
+            MACAddress, node=node, mac_address=mac_address)
+
+    def delete(self, request, system_id, mac_address):
+        """Delete a specific MAC address for the specified Node."""
+        validate_mac(mac_address)
+        node = Node.objects.get_node_or_404(
+            user=request.user, system_id=system_id, perm=NODE_PERMISSION.EDIT)
+
+        mac = get_object_or_404(MACAddress, node=node, mac_address=mac_address)
+        mac.delete()
+        return rc.DELETED
+
+    @classmethod
+    def resource_uri(cls, mac=None):
+        node_system_id = "system_id"
+        mac_address = "mac_address"
+        if mac is not None:
+            node_system_id = mac.node.system_id
+            mac_address = mac.mac_address
+        return ('node_mac_handler', [node_system_id, mac_address])

=== modified file 'src/maasserver/urls_api.py'
--- src/maasserver/urls_api.py	2014-08-18 13:29:45 +0000
+++ src/maasserver/urls_api.py	2014-08-18 13:29:45 +0000
@@ -21,8 +21,6 @@
 from maasserver.api.account import AccountHandler
 from maasserver.api.api import (
     NodeHandler,
-    NodeMacHandler,
-    NodeMacsHandler,
     NodesHandler,
     )
 from maasserver.api.auth import api_auth
@@ -69,6 +67,10 @@
     NodeGroupHandler,
     NodeGroupsHandler,
     )
+from maasserver.api.node_macs import (
+    NodeMacHandler,
+    NodeMacsHandler,
+    )
 from maasserver.api.pxeconfig import pxeconfig
 from maasserver.api.ssh_keys import (
     SSHKeyHandler,