Merge lp:~rvb/maas/bootimages-api into lp:~maas-committers/maas/trunk

[Raphaël Badin]

Add API endpoint to list the boot images. Add API endpoint to get the details of a boot image.

Boot images are essential components for a MAAS installation. Being able to track these boot images using the API is useful to know what type of machines a MAAS installation can manage.

I had to refactor the existing endpoint to make the nodegroup UUID part of the URL but I think this modification to the API is okay considering that the method in question, report_boot_images(), was a purely internal method.

The corresponding UI change (display the list of available boot images on a cluster's page) will follow.

The diff is bigger than it should be because I moved the existing tests from src/maasserver/tests/test_api.py to src/maasserver/tests/test_api_boot_images.py.

[Julian Edwards (julian-edwards)]

79 + :param uuid: The UUID of the cluster for which the images are
80 + should be listed.

"for which the images are should be listed". Not sure what language this is :)

"for which the images should be listed" perhaps?

409 + reverse(
410 + 'boot_image_handler',
411 + args=[boot_image.nodegroup.uuid, boot_image.id]
412 + ),

You already tested this part in test_handler_path, no?

Also please consider using MatchesStructure here (byEquality is also a useful helper).

Everything else looks marvellous. The change to the api url is pretty nice.

review: Approve

[Raphaël Badin (rvb)]

> 79 + :param uuid: The UUID of the cluster for which the images are
> 80 + should be listed.
>
> "for which the images are should be listed". Not sure what language this is
> :)
>
> "for which the images should be listed" perhaps?

Right, fixed.

>
> 409 + reverse(
> 410 + 'boot_image_handler',
> 411 + args=[boot_image.nodegroup.uuid, boot_image.id]
> 412 + ),
>
> You already tested this part in test_handler_path, no?

No, here I test that the returned object has the right 'resource_uri' field.

> Also please consider using MatchesStructure here (byEquality is also a useful
> helper).

Okay, this means two tests (because 'resource_uri' is not part of the original object) but that's probably still more readable:

        # The returned object contains a 'resource_uri' field.
        self.assertEqual(
            reverse(
                    'boot_image_handler',
                    args=[boot_image.nodegroup.uuid, boot_image.id]
            ),
            returned_boot_image['resource_uri'])
        # The other fields are the boot image's fields.
        del returned_boot_image['resource_uri']
        self.assertThat(
            boot_image,
            MatchesStructure.byEquality(**returned_boot_image))

> Everything else looks marvellous. The change to the api url is pretty nice.

Thanks for the review!

=== modified file 'src/maasserver/api.py'
--- src/maasserver/api.py	2014-03-19 15:26:59 +0000
+++ src/maasserver/api.py	2014-03-20 09:00:00 +0000
@@ -61,6 +61,7 @@
     "AnonNodesHandler",
     "api_doc",
     "api_doc_title",
+    "BootImageHandler",
     "BootImagesHandler",
     "CommissioningScriptHandler",
     "CommissioningScriptsHandler",
@@ -242,8 +243,8 @@
 from piston.emitters import JSONEmitter
 from piston.handler import typemapper
 from piston.utils import rc
+from provisioningserver.kernel_opts import KernelParameters
 from provisioningserver.power_schema import UNKNOWN_POWER_TYPE
-from provisioningserver.kernel_opts import KernelParameters
 import simplejson as json
 
 # Node's fields exposed on the API.
@@ -2541,26 +2542,76 @@
         db_images.delete()
 
 
+DISPLAYED_BOOTIMAGE_FIELDS = (
+    'id',
+    'release',
+    'architecture',
+    'subarchitecture',
+    'purpose',
+    'label',
+)
+
+
+class BootImageHandler(OperationsHandler):
+    """API for boot images."""
+    create = replace = update = delete = None
+
+    model = BootImage
+    fields = DISPLAYED_BOOTIMAGE_FIELDS
+
+    def read(self, request, uuid, id):
+        """Read a boot image."""
+        nodegroup = get_object_or_404(NodeGroup, uuid=uuid)
+        return get_object_or_404(
+            BootImage, nodegroup=nodegroup, id=id)
+
+    @classmethod
+    def resource_uri(cls, bootimage=None):
+        if bootimage is None:
+            id = 'id'
+            uuid = 'uuid'
+        else:
+            id = bootimage.id
+            uuid = bootimage.nodegroup.uuid
+        return ('boot_image_handler', (uuid, id))
+
+
 class BootImagesHandler(OperationsHandler):
 
     create = replace = update = delete = None
 
     @classmethod
-    def resource_uri(cls):
-        return ('boot_images_handler', [])
+    def resource_uri(cls, nodegroup=None):
+        if nodegroup is None:
+            uuid = 'uuid'
+        else:
+            uuid = nodegroup.uuid
+        return ('boot_images_handler', [uuid])
+
+    def read(self, request, uuid):
+        """List boot images.
+
+        Get a listing of a cluster's boot images.
+
+        :param uuid: The UUID of the cluster for which the images
+            should be listed.
+        """
+        nodegroup = get_object_or_404(NodeGroup, uuid=uuid)
+        return BootImage.objects.filter(nodegroup=nodegroup)
 
     @operation(idempotent=False)
-    def report_boot_images(self, request):
+    def report_boot_images(self, request, uuid):
         """Report images available to net-boot nodes from.
 
+        :param uuid: The UUID of the cluster for which the images are
+            being reported.
         :param images: A list of dicts, each describing a boot image with
             these properties: `architecture`, `subarchitecture`, `release`,
             `purpose`, and optionally, `label` (which defaults to "release").
             These should match the code that determines TFTP paths for these
             images.
         """
-        nodegroup_uuid = get_mandatory_param(request.data, "nodegroup")
-        nodegroup = get_object_or_404(NodeGroup, uuid=nodegroup_uuid)
+        nodegroup = get_object_or_404(NodeGroup, uuid=uuid)
         check_nodegroup_access(request, nodegroup)
         reported_images = summarise_reported_images(request)
         existing_images = summarise_stored_images(nodegroup)

=== modified file 'src/maasserver/tests/test_api.py'
--- src/maasserver/tests/test_api.py	2014-03-12 07:33:55 +0000
+++ src/maasserver/tests/test_api.py	2014-03-20 09:00:00 +0000
@@ -19,16 +19,11 @@
 from itertools import izip
 import json
 
-from apiclient.maas_client import MAASClient
-from django.conf import settings
 from django.core.urlresolvers import reverse
-from fixtures import EnvironmentVariableFixture
 from maasserver import api
 from maasserver.api import (
     DISPLAYED_NODEGROUPINTERFACE_FIELDS,
     store_node_power_parameters,
-    summarise_boot_image_dict,
-    summarise_boot_image_object,
     warn_if_missing_boot_images,
     )
 from maasserver.enum import (
@@ -39,14 +34,12 @@
 from maasserver.exceptions import MAASAPIBadRequest
 from maasserver.forms_settings import INVALID_SETTING_MSG_TEMPLATE
 from maasserver.models import (
-    BootImage,
     Config,
     NodeGroup,
     NodeGroupInterface,
     SSHKey,
     )
 from maasserver.models.user import get_auth_tokens
-from maasserver.refresh_worker import refresh_worker
 from maasserver.testing import (
     get_data,
     reload_object,
@@ -61,20 +54,9 @@
 from maasserver.testing.testcase import MAASServerTestCase
 from maasserver.tests.test_forms import make_interface_settings
 from maasserver.utils.orm import get_one
-from maastesting.celery import CeleryFixture
 from maastesting.djangotestcase import TransactionTestCase
 from maastesting.matchers import MockCalledOnceWith
-from mock import (
-    ANY,
-    Mock,
-    )
-from provisioningserver import (
-    boot_images,
-    tasks,
-    )
-from provisioningserver.pxe import tftppath
-from provisioningserver.testing.boot_images import make_boot_image_params
-from testresources import FixtureResource
+from mock import Mock
 from testtools.matchers import (
     Contains,
     Equals,
@@ -760,155 +742,6 @@
         self.assertEqual(None, reload_object(interface).foreign_dhcp_ip)
 
 
-class TestBootImagesAPI(APITestCase):
-
-    resources = (
-        ('celery', FixtureResource(CeleryFixture())),
-        )
-
-    def report_images(self, nodegroup, images, client=None):
-        if client is None:
-            client = self.client
-        return client.post(
-            reverse('boot_images_handler'), {
-                'images': json.dumps(images),
-                'nodegroup': nodegroup.uuid,
-                'op': 'report_boot_images',
-                })
-
-    def test_summarise_boot_image_object_returns_tuple(self):
-        image = factory.make_boot_image()
-        self.assertEqual(
-            (
-                image.architecture,
-                image.subarchitecture,
-                image.release,
-                image.label,
-                image.purpose,
-            ),
-            summarise_boot_image_object(image))
-
-    def test_summarise_boot_image_dict_returns_tuple(self):
-        image = make_boot_image_params()
-        self.assertEqual(
-            (
-                image['architecture'],
-                image['subarchitecture'],
-                image['release'],
-                image['label'],
-                image['purpose'],
-            ),
-            summarise_boot_image_dict(image))
-
-    def test_summarise_boot_image_dict_substitutes_defaults(self):
-        image = make_boot_image_params()
-        del image['subarchitecture']
-        del image['label']
-        _, subarchitecture, _, label, _ = summarise_boot_image_dict(image)
-        self.assertEqual(('generic', 'release'), (subarchitecture, label))
-
-    def test_summarise_boot_image_functions_are_compatible(self):
-        image_dict = make_boot_image_params()
-        image_obj = factory.make_boot_image(
-            architecture=image_dict['architecture'],
-            subarchitecture=image_dict['subarchitecture'],
-            release=image_dict['release'], label=image_dict['label'],
-            purpose=image_dict['purpose'])
-        self.assertEqual(
-            summarise_boot_image_dict(image_dict),
-            summarise_boot_image_object(image_obj))
-
-    def test_report_boot_images_does_not_work_for_normal_user(self):
-        nodegroup = NodeGroup.objects.ensure_master()
-        log_in_as_normal_user(self.client)
-        response = self.report_images(nodegroup, [])
-        self.assertEqual(
-            httplib.FORBIDDEN, response.status_code, response.content)
-
-    def test_report_boot_images_works_for_master_worker(self):
-        nodegroup = NodeGroup.objects.ensure_master()
-        client = make_worker_client(nodegroup)
-        response = self.report_images(nodegroup, [], client=client)
-        self.assertEqual(httplib.OK, response.status_code)
-
-    def test_report_boot_images_stores_images(self):
-        nodegroup = NodeGroup.objects.ensure_master()
-        image = make_boot_image_params()
-        client = make_worker_client(nodegroup)
-        response = self.report_images(nodegroup, [image], client=client)
-        self.assertEqual(
-            (httplib.OK, "OK"),
-            (response.status_code, response.content))
-        self.assertTrue(
-            BootImage.objects.have_image(nodegroup=nodegroup, **image))
-
-    def test_report_boot_images_removes_unreported_images(self):
-        deleted_image = factory.make_boot_image()
-        nodegroup = deleted_image.nodegroup
-        client = make_worker_client(nodegroup)
-        response = self.report_images(nodegroup, [], client=client)
-        self.assertEqual(httplib.OK, response.status_code)
-        self.assertIsNone(reload_object(deleted_image))
-
-    def test_report_boot_images_keeps_known_images(self):
-        nodegroup = factory.make_node_group()
-        image = make_boot_image_params()
-        client = make_worker_client(nodegroup)
-        response = self.report_images(nodegroup, [image], client=client)
-        self.assertEqual(httplib.OK, response.status_code)
-        known_image = BootImage.objects.get(nodegroup=nodegroup)
-        response = self.report_images(nodegroup, [image], client=client)
-        self.assertEqual(httplib.OK, response.status_code)
-        self.assertEqual(known_image, reload_object(known_image))
-
-    def test_report_boot_images_ignores_images_for_other_nodegroups(self):
-        unrelated_image = factory.make_boot_image()
-        deleted_image = factory.make_boot_image()
-        nodegroup = deleted_image.nodegroup
-        client = make_worker_client(nodegroup)
-        response = self.report_images(nodegroup, [], client=client)
-        self.assertEqual(httplib.OK, response.status_code)
-        self.assertIsNotNone(reload_object(unrelated_image))
-
-    def test_report_boot_images_ignores_unknown_image_properties(self):
-        nodegroup = NodeGroup.objects.ensure_master()
-        image = make_boot_image_params()
-        image['nonesuch'] = factory.make_name('nonesuch'),
-        client = make_worker_client(nodegroup)
-        response = self.report_images(nodegroup, [image], client=client)
-        self.assertEqual(
-            (httplib.OK, "OK"),
-            (response.status_code, response.content))
-
-    def test_report_boot_images_warns_about_missing_boot_images(self):
-        register_error = self.patch(api, 'register_persistent_error')
-        nodegroup = factory.make_node_group(status=NODEGROUP_STATUS.ACCEPTED)
-        response = self.report_images(
-            nodegroup, [], client=make_worker_client(nodegroup))
-        self.assertEqual(httplib.OK, response.status_code)
-        self.assertThat(
-            register_error,
-            MockCalledOnceWith(COMPONENT.IMPORT_PXE_FILES, ANY))
-
-    def test_worker_calls_report_boot_images(self):
-        # report_boot_images() uses the report_boot_images op on the nodes
-        # handlers to send image information.
-        self.useFixture(
-            EnvironmentVariableFixture("MAAS_URL", settings.DEFAULT_MAAS_URL))
-        refresh_worker(NodeGroup.objects.ensure_master())
-        self.patch(MAASClient, 'post')
-        self.patch(tftppath, 'list_boot_images', Mock(return_value=[]))
-        self.patch(boot_images, "get_cluster_uuid")
-
-        tasks.report_boot_images.delay()
-
-        # We're not concerned about the payloads (images and nodegroup) here;
-        # those are tested in provisioningserver.tests.test_boot_images.
-        MAASClient.post.assert_called_once_with(
-            reverse('boot_images_handler').lstrip('/'), 'report_boot_images',
-            images=ANY, nodegroup=ANY)
-
-
 class TestWarnIfMissingBootImages(MAASServerTestCase):
     """Test `warn_if_missing_boot_images`."""
 

=== added file 'src/maasserver/tests/test_api_boot_images.py'
--- src/maasserver/tests/test_api_boot_images.py	1970-01-01 00:00:00 +0000
+++ src/maasserver/tests/test_api_boot_images.py	2014-03-20 09:00:00 +0000
@@ -0,0 +1,266 @@
+# Copyright 2013 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Tests for the `Boot Images` API."""
+
+from __future__ import (
+    absolute_import,
+    print_function,
+    unicode_literals,
+    )
+
+str = None
+
+__metaclass__ = type
+__all__ = []
+
+import httplib
+import json
+
+from apiclient.maas_client import MAASClient
+from django.conf import settings
+from django.core.urlresolvers import reverse
+from fixtures import EnvironmentVariableFixture
+from maasserver import api
+from maasserver.api import (
+    summarise_boot_image_dict,
+    summarise_boot_image_object,
+    )
+from maasserver.enum import (
+    COMPONENT,
+    NODEGROUP_STATUS,
+    )
+from maasserver.models import (
+    BootImage,
+    NodeGroup,
+    )
+from maasserver.refresh_worker import refresh_worker
+from maasserver.testing import reload_object
+from maasserver.testing.api import (
+    APITestCase,
+    log_in_as_normal_user,
+    make_worker_client,
+    )
+from maasserver.testing.factory import factory
+from maastesting.celery import CeleryFixture
+from maastesting.matchers import MockCalledOnceWith
+from mock import (
+    ANY,
+    Mock,
+    )
+from provisioningserver import (
+    boot_images,
+    tasks,
+    )
+from provisioningserver.pxe import tftppath
+from provisioningserver.testing.boot_images import make_boot_image_params
+from testresources import FixtureResource
+from testtools.matchers import MatchesStructure
+
+
+def get_boot_image_uri(boot_image):
+    """Return a boot image's URI on the API."""
+    return reverse(
+        'boot_image_handler',
+        args=[boot_image.nodegroup.uuid, boot_image.id])
+
+
+class TestBootImageAPI(APITestCase):
+
+    def test_handler_path(self):
+        self.assertEqual(
+            '/api/1.0/nodegroups/uuid/boot-images/3/',
+            reverse('boot_image_handler', args=['uuid', '3']))
+
+    def test_GET_returns_boot_image(self):
+        boot_image = factory.make_boot_image()
+        response = self.client.get(get_boot_image_uri(boot_image))
+        self.assertEqual(httplib.OK, response.status_code)
+        returned_boot_image = json.loads(response.content)
+        # The returned object contains a 'resource_uri' field.
+        self.assertEqual(
+            reverse(
+                    'boot_image_handler',
+                    args=[boot_image.nodegroup.uuid, boot_image.id]
+            ),
+            returned_boot_image['resource_uri'])
+        # The other fields are the boot image's fields.
+        del returned_boot_image['resource_uri']
+        self.assertThat(
+            boot_image,
+            MatchesStructure.byEquality(**returned_boot_image))
+
+
+class TestBootImagesAPI(APITestCase):
+    """Test the the boot images API."""
+
+    def test_handler_path(self):
+        self.assertEqual(
+            '/api/1.0/nodegroups/uuid/boot-images/',
+            reverse('boot_images_handler', args=['uuid']))
+
+    def test_GET_returns_boot_image_list(self):
+        nodegroup = factory.make_node_group()
+        images = [
+            factory.make_boot_image(nodegroup=nodegroup) for _ in range(3)]
+        # Create images in another nodegroup.
+        [factory.make_boot_image() for _ in range(3)]
+        response = self.client.get(
+            reverse('boot_images_handler', args=[nodegroup.uuid]))
+        self.assertEqual(httplib.OK, response.status_code, response.content)
+        parsed_result = json.loads(response.content)
+        self.assertItemsEqual(
+            [boot_image.id for boot_image in images],
+            [boot_image.get('id') for boot_image in parsed_result])
+
+
+class TestBootImagesReportImagesAPI(APITestCase):
+    """Test the method report_boot_images from the boot images API."""
+
+    resources = (
+        ('celery', FixtureResource(CeleryFixture())),
+        )
+
+    def report_images(self, nodegroup, images, client=None):
+        if client is None:
+            client = self.client
+        return client.post(
+            reverse('boot_images_handler', args=[nodegroup.uuid]), {
+                'images': json.dumps(images),
+                'op': 'report_boot_images',
+                })
+
+    def test_summarise_boot_image_object_returns_tuple(self):
+        image = factory.make_boot_image()
+        self.assertEqual(
+            (
+                image.architecture,
+                image.subarchitecture,
+                image.release,
+                image.label,
+                image.purpose,
+            ),
+            summarise_boot_image_object(image))
+
+    def test_summarise_boot_image_dict_returns_tuple(self):
+        image = make_boot_image_params()
+        self.assertEqual(
+            (
+                image['architecture'],
+                image['subarchitecture'],
+                image['release'],
+                image['label'],
+                image['purpose'],
+            ),
+            summarise_boot_image_dict(image))
+
+    def test_summarise_boot_image_dict_substitutes_defaults(self):
+        image = make_boot_image_params()
+        del image['subarchitecture']
+        del image['label']
+        _, subarchitecture, _, label, _ = summarise_boot_image_dict(image)
+        self.assertEqual(('generic', 'release'), (subarchitecture, label))
+
+    def test_summarise_boot_image_functions_are_compatible(self):
+        image_dict = make_boot_image_params()
+        image_obj = factory.make_boot_image(
+            architecture=image_dict['architecture'],
+            subarchitecture=image_dict['subarchitecture'],
+            release=image_dict['release'], label=image_dict['label'],
+            purpose=image_dict['purpose'])
+        self.assertEqual(
+            summarise_boot_image_dict(image_dict),
+            summarise_boot_image_object(image_obj))
+
+    def test_report_boot_images_does_not_work_for_normal_user(self):
+        nodegroup = NodeGroup.objects.ensure_master()
+        log_in_as_normal_user(self.client)
+        response = self.report_images(nodegroup, [])
+        self.assertEqual(
+            httplib.FORBIDDEN, response.status_code, response.content)
+
+    def test_report_boot_images_works_for_master_worker(self):
+        nodegroup = NodeGroup.objects.ensure_master()
+        client = make_worker_client(nodegroup)
+        response = self.report_images(nodegroup, [], client=client)
+        self.assertEqual(httplib.OK, response.status_code)
+
+    def test_report_boot_images_stores_images(self):
+        nodegroup = NodeGroup.objects.ensure_master()
+        image = make_boot_image_params()
+        client = make_worker_client(nodegroup)
+        response = self.report_images(nodegroup, [image], client=client)
+        self.assertEqual(
+            (httplib.OK, "OK"),
+            (response.status_code, response.content))
+        self.assertTrue(
+            BootImage.objects.have_image(nodegroup=nodegroup, **image))
+
+    def test_report_boot_images_removes_unreported_images(self):
+        deleted_image = factory.make_boot_image()
+        nodegroup = deleted_image.nodegroup
+        client = make_worker_client(nodegroup)
+        response = self.report_images(nodegroup, [], client=client)
+        self.assertEqual(httplib.OK, response.status_code)
+        self.assertIsNone(reload_object(deleted_image))
+
+    def test_report_boot_images_keeps_known_images(self):
+        nodegroup = factory.make_node_group()
+        image = make_boot_image_params()
+        client = make_worker_client(nodegroup)
+        response = self.report_images(nodegroup, [image], client=client)
+        self.assertEqual(httplib.OK, response.status_code)
+        known_image = BootImage.objects.get(nodegroup=nodegroup)
+        response = self.report_images(nodegroup, [image], client=client)
+        self.assertEqual(httplib.OK, response.status_code)
+        self.assertEqual(known_image, reload_object(known_image))
+
+    def test_report_boot_images_ignores_images_for_other_nodegroups(self):
+        unrelated_image = factory.make_boot_image()
+        deleted_image = factory.make_boot_image()
+        nodegroup = deleted_image.nodegroup
+        client = make_worker_client(nodegroup)
+        response = self.report_images(nodegroup, [], client=client)
+        self.assertEqual(httplib.OK, response.status_code)
+        self.assertIsNotNone(reload_object(unrelated_image))
+
+    def test_report_boot_images_ignores_unknown_image_properties(self):
+        nodegroup = NodeGroup.objects.ensure_master()
+        image = make_boot_image_params()
+        image['nonesuch'] = factory.make_name('nonesuch'),
+        client = make_worker_client(nodegroup)
+        response = self.report_images(nodegroup, [image], client=client)
+        self.assertEqual(
+            (httplib.OK, "OK"),
+            (response.status_code, response.content))
+
+    def test_report_boot_images_warns_about_missing_boot_images(self):
+        register_error = self.patch(api, 'register_persistent_error')
+        nodegroup = factory.make_node_group(status=NODEGROUP_STATUS.ACCEPTED)
+        response = self.report_images(
+            nodegroup, [], client=make_worker_client(nodegroup))
+        self.assertEqual(httplib.OK, response.status_code)
+        self.assertThat(
+            register_error,
+            MockCalledOnceWith(COMPONENT.IMPORT_PXE_FILES, ANY))
+
+    def test_worker_calls_report_boot_images(self):
+        # report_boot_images() uses the report_boot_images op on the nodes
+        # handlers to send image information.
+        self.useFixture(
+            EnvironmentVariableFixture("MAAS_URL", settings.DEFAULT_MAAS_URL))
+        refresh_worker(NodeGroup.objects.ensure_master())
+        self.patch(MAASClient, 'post')
+        self.patch(tftppath, 'list_boot_images', Mock(return_value=[]))
+        nodegroup_uuid = factory.make_name('uuid')
+        get_cluster_uuid = self.patch(boot_images, "get_cluster_uuid")
+        get_cluster_uuid.return_value = nodegroup_uuid
+
+        tasks.report_boot_images.delay()
+
+        # We're not concerned about the payload (images) here;
+        # this is tested in provisioningserver.tests.test_boot_images.
+        MAASClient.post.assert_called_once_with(
+            path=reverse(
+                'boot_images_handler', args=[nodegroup_uuid]).lstrip('/'),
+            op='report_boot_images', images=ANY)

=== modified file 'src/maasserver/urls_api.py'
--- src/maasserver/urls_api.py	2014-02-10 07:52:26 +0000
+++ src/maasserver/urls_api.py	2014-03-20 09:00:00 +0000
@@ -21,6 +21,7 @@
 from maasserver.api import (
     AccountHandler,
     api_doc,
+    BootImageHandler,
     BootImagesHandler,
     CommissioningResultsHandler,
     CommissioningScriptHandler,
@@ -76,6 +77,8 @@
     NodeGroupInterfacesHandler, authentication=api_auth)
 boot_images_handler = RestrictedResource(
     BootImagesHandler, authentication=api_auth)
+boot_image_handler = RestrictedResource(
+    BootImageHandler, authentication=api_auth)
 tag_handler = RestrictedResource(TagHandler, authentication=api_auth)
 tags_handler = RestrictedResource(TagsHandler, authentication=api_auth)
 commissioning_results_handler = RestrictedResource(
@@ -130,6 +133,10 @@
         nodegroupinterfaces_handler, name='nodegroupinterfaces_handler'),
     url(r'^nodegroups/(?P<uuid>[^/]+)/interfaces/(?P<interface>[^/]+)/$',
         nodegroupinterface_handler, name='nodegroupinterface_handler'),
+    url(r'^nodegroups/(?P<uuid>[^/]+)/boot-images/$',
+        boot_images_handler, name='boot_images_handler'),
+    url(r'^nodegroups/(?P<uuid>[^/]+)/boot-images/(?P<id>[^/]+)/$',
+        boot_image_handler, name='boot_image_handler'),
     url(
         r'^networks/(?P<name>[\w\-]+)/$',
         network_handler, name='network_handler'),
@@ -141,7 +148,6 @@
         r'^account/prefs/sshkeys/(?P<keyid>[^/]+)/$', sshkey_handler,
         name='sshkey_handler'),
     url(r'^account/prefs/sshkeys/$', sshkeys_handler, name='sshkeys_handler'),
-    url(r'^boot-images/$', boot_images_handler, name='boot_images_handler'),
     url(r'^tags/(?P<name>[\w\-]+)/$', tag_handler, name='tag_handler'),
     url(r'^tags/$', tags_handler, name='tags_handler'),
     url(

=== modified file 'src/provisioningserver/boot_images.py'
--- src/provisioningserver/boot_images.py	2013-10-07 09:12:40 +0000
+++ src/provisioningserver/boot_images.py	2014-03-20 09:00:00 +0000
@@ -57,9 +57,9 @@
 
 def submit(maas_url, api_credentials, images):
     """Submit images to server."""
+    path = 'api/1.0/nodegroups/%s/boot-images/' % get_cluster_uuid()
     MAASClient(MAASOAuth(*api_credentials), MAASDispatcher(), maas_url).post(
-        'api/1.0/boot-images/', 'report_boot_images',
-        nodegroup=get_cluster_uuid(), images=json.dumps(images))
+        path=path, op='report_boot_images', images=json.dumps(images))
 
 
 def report_to_server():

=== modified file 'src/provisioningserver/tests/test_boot_images.py'
--- src/provisioningserver/tests/test_boot_images.py	2013-10-07 09:12:40 +0000
+++ src/provisioningserver/tests/test_boot_images.py	2014-03-20 09:00:00 +0000
@@ -44,7 +44,12 @@
         self.patch(MAASClient, 'post')
         boot_images.report_to_server()
         args, kwargs = MAASClient.post.call_args
-        self.assertIs(sentinel.uuid, kwargs["nodegroup"])
+        self.assertEqual(
+            (
+                'api/1.0/nodegroups/%s/boot-images/' % sentinel.uuid,
+                'report_boot_images',
+            ),
+            (kwargs["path"], kwargs["op"]))
         self.assertItemsEqual([image], json.loads(kwargs['images']))
 
     def test_does_nothing_without_credentials(self):