Merge lp:~jtv/maas/label-level-in-boot-image-dir-tree into lp:~maas-committers/maas/trunk

[Jeroen T. Vermeulen]

Splice ‘label’ level into the directory hierarchy for boot images.

The new level goes between ‘release’ and ‘purpose’ — so the new directory hierarchy is incompatible with the old one. We still need to provide migration code. The default label is ‘release’ (which can get a bit confusing because of the adjoining ‘release’ parameter).

This is a large change, driven largely by just making the change in one place and following the propagating test failures from there. There may be more places that need the change, such as the import scripts.

Jeroen

[Raphaël Badin (rvb)]

Looks good; I'm afraid this will require some serious QA before we can be confident all the places requiring a change have been fixed.

[0]

> There may be more places that need the change, such as the import scripts.

Looks like you've taken care of ephemerals_script.py but not maas-import-pxe-files… but I see a card on the board named "Change import script to use label in path" so this might be what this card is about.

[1]

This is a fairly fundamental change and we want to keep the daily package is a working state as much as possible; many people rely on the daily package being in a working state to do their QA/testing. Consider working on dependent branches without actually landing this until QA proves that we reached a state where a newly-installed packages imports its images okay (the migration script for existing installations can probably be done as a completely separated step).

review: Approve

[Julian Edwards (julian-edwards)]

Agree with rvb, let's QA this *before* landing.

+ :param label: Image label, e.g. "release" or a special hardware-
enablement
+ image.

Just FYI, but Scott thinks that we don't need label for this any more and that
subarch will solve everything related to specific HWE images. While that
might be the case, I don't think it's the right way to do it, subarch is meant
to be a specialisation of some hardware, and QA folks will want to pull in
kernel versions from different point releases for that hardware.

=== modified file 'src/maasserver/api.py'
--- src/maasserver/api.py	2014-03-14 08:50:51 +0000
+++ src/maasserver/api.py	2014-03-18 03:24:23 +0000
@@ -2358,9 +2358,8 @@
         hostname = 'maas-enlist'
         domain = Config.objects.get_config('enlistment_domain')
 
-        try:
-            arch = request.GET['arch']
-        except KeyError:
+        arch = get_optional_param(request.GET, 'arch')
+        if arch is None:
             if 'mac' in request.GET:
                 # Request was pxelinux.cfg/01-<mac>, so attempt fall back
                 # to pxelinux.cfg/default-<arch>-<subarch> for arch detection.
@@ -2376,11 +2375,9 @@
                 else:
                     arch = image.architecture
 
-        # Use subarch if supplied; otherwise assume 'generic'.
-        try:
-            subarch = request.GET['subarch']
-        except KeyError:
-            subarch = 'generic'
+        subarch = get_optional_param(request.GET, 'subarch', 'generic')
+
+    label = get_optional_param(request.GET, 'label', 'release')
 
     if node is not None:
         # We don't care if the kernel opts is from the global setting or a tag,
@@ -2395,10 +2392,10 @@
     cluster_address = get_mandatory_param(request.GET, "local")
 
     params = KernelParameters(
-        arch=arch, subarch=subarch, release=series, purpose=purpose,
-        hostname=hostname, domain=domain, preseed_url=preseed_url,
-        log_host=server_address, fs_host=cluster_address,
-        extra_opts=extra_kernel_opts)
+        arch=arch, subarch=subarch, release=series, label=label,
+        purpose=purpose, hostname=hostname, domain=domain,
+        preseed_url=preseed_url, log_host=server_address,
+        fs_host=cluster_address, extra_opts=extra_kernel_opts)
 
     return HttpResponse(
         json.dumps(params._asdict()),

=== modified file 'src/maasserver/api_utils.py'
--- src/maasserver/api_utils.py	2014-03-12 14:09:13 +0000
+++ src/maasserver/api_utils.py	2014-03-18 03:24:23 +0000
@@ -1,4 +1,4 @@
-# Copyright 2012 Canonical Ltd.  This software is licensed under the
+# Copyright 2012-2014 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Helpers for Piston-based MAAS APIs."""
@@ -19,6 +19,7 @@
     'get_mandatory_param',
     'get_oauth_token',
     'get_optional_list',
+    'get_optional_param',
     'get_overridden_query_dict',
     ]
 
@@ -95,7 +96,7 @@
     :return: The value of the parameter.
     :raises: ValidationError
     """
-    value = data.get(key, None)
+    value = data.get(key)
     if value is None:
         return default
     if validator is not None:

=== modified file 'src/provisioningserver/import_images/ephemerals_script.py'
--- src/provisioningserver/import_images/ephemerals_script.py	2014-01-29 10:12:41 +0000
+++ src/provisioningserver/import_images/ephemerals_script.py	2014-03-18 03:24:23 +0000
@@ -1,4 +1,4 @@
-# Copyright 2013 Canonical Ltd.  This software is licensed under the
+# Copyright 2013-2014 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Script code for `maas-import-ephemerals.py`."""
@@ -157,7 +157,7 @@
     return image_dir
 
 
-def install_image_from_simplestreams(storage_dir, release, arch,
+def install_image_from_simplestreams(storage_dir, release, label, arch,
                                      subarch='generic',
                                      purpose='commissioning',
                                      alternate_purpose='xinstall',
@@ -168,6 +168,7 @@
         `initrd.gz`, `dist-root.tar.gz`).  The image that will be installed is
         a directory of symlinks to these files.
     :param release: Release name to install, e.g. "precise".
+    :param label: Image label, e.g. "release" or an alpha or beta version.
     :param arch: Architecture for the image, e.g. "i386".
     :param subarch: Sub-architecture.  Defaults to "generic".
     :param purpose: Boot purpose for the image.  Defaults to `commissioning`.
@@ -183,7 +184,8 @@
 
     try:
         install_image(
-            provision_tmp, release=release, arch=arch, subarch=subarch,
+            provision_tmp, arch=arch, subarch=subarch,
+            release=release, label=label,
             purpose=purpose, alternate_purpose=alternate_purpose)
     finally:
         shutil.rmtree(provision_tmp, ignore_errors=True)
@@ -280,7 +282,9 @@
         release = metadata['release']
         version = metadata['version']
         version_name = metadata['version_name']
-        label = metadata['label']
+        # XXX jtv 2014-03-14: At the time of writing we don't know whether
+        # simplestreams will pass the release label in this way.
+        label = metadata.get('label', 'release')
         target_dir = self._target_dir(metadata)
         name = get_target_name(
             release=release, version=version, arch=arch,

=== modified file 'src/provisioningserver/import_images/tests/test_ephemerals_script.py'
--- src/provisioningserver/import_images/tests/test_ephemerals_script.py	2014-01-05 21:27:58 +0000
+++ src/provisioningserver/import_images/tests/test_ephemerals_script.py	2014-03-18 03:24:23 +0000
@@ -1,4 +1,4 @@
-# Copyright 2013 Canonical Ltd.  This software is licensed under the
+# Copyright 2013-2014 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for `ephemerals_script`."""
@@ -323,13 +323,15 @@
         self.patch_config(tftp_root)
         storage_dir = self.prepare_storage_dir()
         release = factory.make_name('release')
+        label = factory.make_name('label')
         arch = factory.make_name('arch')
 
         install_image_from_simplestreams(
-            storage_dir, release=release, arch=arch)
+            storage_dir, release=release, label=label, arch=arch)
 
         install_dir = locate_tftp_path(
-            compose_image_path(arch, 'generic', release, 'commissioning'),
+            compose_image_path(
+                arch, 'generic', release, label, 'commissioning'),
             tftproot=tftp_root)
         self.assertItemsEqual(
             ['linux', 'initrd.gz', 'root.tar.gz'],
@@ -345,7 +347,8 @@
 
         install_image_from_simplestreams(
             storage_dir, release=factory.make_name('release'),
-            arch=factory.make_name('arch'), temp_location=temp_location)
+            label=factory.make_name('label'), arch=factory.make_name('arch'),
+            temp_location=temp_location)
 
         self.assertItemsEqual([], listdir(temp_location))
 
@@ -362,7 +365,8 @@
             DeliberateFailure,
             install_image_from_simplestreams,
             storage_dir, release=factory.make_name('release'),
-            arch=factory.make_name('arch'), temp_location=temp_location)
+            label=factory.make_name('label'), arch=factory.make_name('arch'),
+            temp_location=temp_location)
 
         self.assertItemsEqual([], listdir(temp_location))
 

=== modified file 'src/provisioningserver/kernel_opts.py'
--- src/provisioningserver/kernel_opts.py	2014-03-17 08:32:52 +0000
+++ src/provisioningserver/kernel_opts.py	2014-03-18 03:24:23 +0000
@@ -1,4 +1,4 @@
-# Copyright 2012, 2013 Canonical Ltd.  This software is licensed under the
+# Copyright 2012-2014 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Generate kernel command-line options for inclusion in PXE configs."""
@@ -35,6 +35,7 @@
         "arch",  # Machine architecture, e.g. "i386"
         "subarch",  # Machine subarchitecture, e.g. "generic"
         "release",  # Ubuntu release, e.g. "precise"
+        "label",  # Image label, e.g. "release"
         "purpose",  # Boot purpose, e.g. "commissioning"
         "hostname",  # Machine hostname, e.g. "coleman"
         "domain",  # Machine domain name, e.g. "example.com"

=== modified file 'src/provisioningserver/pxe/config.py'
--- src/provisioningserver/pxe/config.py	2014-01-17 08:45:01 +0000
+++ src/provisioningserver/pxe/config.py	2014-03-18 03:24:23 +0000
@@ -1,4 +1,4 @@
-# Copyright 2012-2013 Canonical Ltd.  This software is licensed under the
+# Copyright 2012-2014 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Generating PXE configuration files.
@@ -101,7 +101,7 @@
     def image_dir(params):
         return compose_image_path(
             params.arch, params.subarch,
-            params.release, params.purpose)
+            params.release, params.label, params.purpose)
 
     def initrd_path(params):
         return "%s/initrd.gz" % image_dir(params)

=== modified file 'src/provisioningserver/pxe/install_image.py'
--- src/provisioningserver/pxe/install_image.py	2013-10-07 09:12:40 +0000
+++ src/provisioningserver/pxe/install_image.py	2014-03-18 03:24:23 +0000
@@ -1,4 +1,4 @@
-# Copyright 2012, 2013 Canonical Ltd.  This software is licensed under the
+# Copyright 2012-2014 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Install a netboot image directory for TFTP download."""
@@ -33,7 +33,7 @@
 from twisted.python.filepath import FilePath
 
 
-def make_destination(tftproot, arch, subarch, release, purpose):
+def make_destination(tftproot, arch, subarch, release, label, purpose):
     """Locate an image's destination.  Create containing directory if needed.
 
     :param tftproot: The root directory served up by the TFTP server,
@@ -41,13 +41,15 @@
     :param arch: Main architecture to locate the destination for.
     :param subarch: Sub-architecture of the main architecture.
     :param release: OS release name, e.g. "precise".
+    :param label: Image label, e.g. for a beta release, or "release" for the
+        default images.
     :param purpose: Purpose of this image, e.g. "install".
     :return: Full path describing the image directory's new location and
         name.  In other words, a file "linux" in the image directory should
         become os.path.join(make_destination(...), 'linux').
     """
     dest = locate_tftp_path(
-        compose_image_path(arch, subarch, release, purpose),
+        compose_image_path(arch, subarch, release, label, purpose),
         tftproot=tftproot)
     parent = os.path.dirname(dest)
     if not os.path.isdir(parent):
@@ -157,8 +159,8 @@
     rmtree('%s.old' % old, ignore_errors=True)
 
 
-def install_image(image_dir, arch, subarch, release, purpose, config_file=None,
-                  alternate_purpose=None):
+def install_image(image_dir, arch, subarch, release, label, purpose,
+                  config_file=None, alternate_purpose=None):
     """Install a PXE boot image.
 
     This is the function-call equivalent to a command-line invocation calling
@@ -166,7 +168,8 @@
     """
     config = Config.load_from_cache(config_file)
     tftproot = config["tftp"]["root"]
-    destination = make_destination(tftproot, arch, subarch, release, purpose)
+    destination = make_destination(
+        tftproot, arch, subarch, release, label, purpose)
     if not are_identical_dirs(destination, image_dir):
         # Image has changed.  Move the new version into place.
         install_dir(image_dir, destination)
@@ -174,7 +177,7 @@
     if alternate_purpose is not None:
         # Symlink the new image directory under the alternate purpose name.
         alternate_destination = make_destination(
-            tftproot, arch, subarch, release, alternate_purpose)
+            tftproot, arch, subarch, release, label, alternate_purpose)
         install_symlink(destination, alternate_destination)
 
     rmtree(image_dir, ignore_errors=True)
@@ -191,6 +194,9 @@
         '--release', dest='release', default=None,
         help="Ubuntu release that the image is for.")
     parser.add_argument(
+        '--label', dest='label', default='release',
+        help="Image label, for specific pre-release images."),
+    parser.add_argument(
         '--purpose', dest='purpose', default=None,
         help="Purpose of the image (e.g. 'install' or 'commissioning').")
     parser.add_argument(
@@ -211,5 +217,5 @@
     """
     install_image(
         args.image, arch=args.arch, subarch=args.subarch, release=args.release,
-        purpose=args.purpose, config_file=args.config_file,
+        label=args.label, purpose=args.purpose, config_file=args.config_file,
         alternate_purpose=args.symlink)

=== modified file 'src/provisioningserver/pxe/tests/test_config.py'
--- src/provisioningserver/pxe/tests/test_config.py	2014-03-13 06:17:50 +0000
+++ src/provisioningserver/pxe/tests/test_config.py	2014-03-18 03:24:23 +0000
@@ -1,4 +1,4 @@
-# Copyright 2012-2013 Canonical Ltd.  This software is licensed under the
+# Copyright 2012-2014 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for `provisioningserver.pxe.config`."""
@@ -174,7 +174,7 @@
         # The PXE parameters are all set according to the options.
         image_dir = compose_image_path(
             arch=params.arch, subarch=params.subarch,
-            release=params.release, purpose=params.purpose)
+            release=params.release, label=params.label, purpose=params.purpose)
         self.assertThat(
             output, MatchesAll(
                 MatchesRegex(

=== modified file 'src/provisioningserver/pxe/tests/test_install_image.py'
--- src/provisioningserver/pxe/tests/test_install_image.py	2013-10-07 09:12:40 +0000
+++ src/provisioningserver/pxe/tests/test_install_image.py	2014-03-18 03:24:23 +0000
@@ -1,4 +1,4 @@
-# Copyright 2012, 2013 Canonical Ltd.  This software is licensed under the
+# Copyright 2012-2014 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for the install_pxe_image command."""
@@ -41,14 +41,15 @@
 from twisted.python.filepath import FilePath
 
 
-def make_arch_subarch_release_purpose():
-    """Create arbitrary architecture/subarchitecture/release names.
+def make_arch_subarch_release_label_purpose():
+    """Create arbitrary architecture/subarchitecture/release etc. names.
 
-    :return: A triplet of three identifiers for these respective items.
+    :return: A tuple of architecture, subarchitecture, release, label, and
+        purpose.
     """
     return tuple(
         factory.make_name(item)
-        for item in ('arch', 'subarch', 'release', 'purpose'))
+        for item in ('arch', 'subarch', 'release', 'label', 'purpose'))
 
 
 class TestInstallPXEImage(MAASTestCase):
@@ -63,20 +64,21 @@
         image_dir = os.path.join(download_dir, 'image')
         os.makedirs(image_dir)
         factory.make_file(image_dir, 'kernel')
-        arch, subarch, release, purpose = make_arch_subarch_release_purpose()
+        arch, subarch, release, label, purpose = (
+            make_arch_subarch_release_label_purpose())
 
         action = factory.make_name("action")
         script = MainScript(action)
         script.register(action, provisioningserver.pxe.install_image)
         script.execute(
             ("--config-file", config_fixture.filename, action, "--arch", arch,
-             "--subarch", subarch, "--release", release, "--purpose", purpose,
-             "--image", image_dir))
+             "--subarch", subarch, "--release", release, "--label", label,
+             "--purpose", purpose, "--image", image_dir))
 
         self.assertThat(
             os.path.join(
                 locate_tftp_path(
-                    compose_image_path(arch, subarch, release, purpose),
+                    compose_image_path(arch, subarch, release, label, purpose),
                     tftproot=tftproot),
                 'kernel'),
             FileExists())
@@ -88,31 +90,35 @@
         # (Where the /var/lib/maas/tftp/ part is configurable, so we
         # can test this without overwriting system files).
         tftproot = self.make_dir()
-        arch, subarch, release, purpose = make_arch_subarch_release_purpose()
+        arch, subarch, release, label, purpose = (
+            make_arch_subarch_release_label_purpose())
         self.assertEqual(
-            os.path.join(tftproot, arch, subarch, release, purpose),
-            make_destination(tftproot, arch, subarch, release, purpose))
+            os.path.join(tftproot, arch, subarch, release, label, purpose),
+            make_destination(tftproot, arch, subarch, release, label, purpose))
 
     def test_make_destination_creates_directory_if_not_present(self):
         tftproot = self.make_dir()
-        arch, subarch, release, purpose = make_arch_subarch_release_purpose()
+        arch, subarch, release, label, purpose = (
+            make_arch_subarch_release_label_purpose())
         expected_destination = os.path.dirname(locate_tftp_path(
-            compose_image_path(arch, subarch, release, purpose),
+            compose_image_path(arch, subarch, release, label, purpose),
             tftproot=tftproot))
-        make_destination(tftproot, arch, subarch, release, purpose)
+        make_destination(tftproot, arch, subarch, release, label, purpose)
         self.assertThat(expected_destination, DirExists())
 
     def test_make_destination_returns_existing_directory(self):
         tftproot = self.make_dir()
-        arch, subarch, release, purpose = make_arch_subarch_release_purpose()
+        arch, subarch, release, label, purpose = (
+            make_arch_subarch_release_label_purpose())
         expected_dest = locate_tftp_path(
-            compose_image_path(arch, subarch, release, purpose),
+            compose_image_path(arch, subarch, release, label, purpose),
             tftproot=tftproot)
         os.makedirs(expected_dest)
         contents = factory.getRandomString()
         testfile = factory.make_name('testfile')
         factory.make_file(expected_dest, contents=contents, name=testfile)
-        dest = make_destination(tftproot, arch, subarch, release, purpose)
+        dest = make_destination(
+            tftproot, arch, subarch, release, label, purpose)
         self.assertThat(os.path.join(dest, testfile), FileContains(contents))
 
     def test_are_identical_dirs_sees_missing_old_dir_as_different(self):
@@ -293,19 +299,21 @@
         arch = factory.make_name('arch')
         subarch = factory.make_name('subarch')
         release = factory.make_name('release')
+        label = factory.make_name('label')
         purpose = factory.make_name('purpose')
         alternate_purpose = factory.make_name('alt')
 
         install_image(
-            downloaded_image, arch, subarch, release, purpose,
+            downloaded_image, arch, subarch, release, label, purpose,
             alternate_purpose=alternate_purpose)
 
-        main_image = os.path.join(tftp_root, arch, subarch, release, purpose)
+        main_image = os.path.join(
+            tftp_root, arch, subarch, release, label, purpose)
         self.assertThat(
             os.path.join(main_image, 'linux'),
             FileContains(kernel_content))
         alternate_image = os.path.join(
-            tftp_root, arch, subarch, release, alternate_purpose)
+            tftp_root, arch, subarch, release, label, alternate_purpose)
         self.assertTrue(os.path.islink(os.path.join(alternate_image)))
         self.assertThat(
             os.path.join(alternate_image, 'linux'),

=== modified file 'src/provisioningserver/pxe/tests/test_tftppath.py'
--- src/provisioningserver/pxe/tests/test_tftppath.py	2014-03-14 08:50:51 +0000
+++ src/provisioningserver/pxe/tests/test_tftppath.py	2014-03-18 03:24:23 +0000
@@ -53,6 +53,7 @@
                 arch=image_params['architecture'],
                 subarch=image_params['subarchitecture'],
                 release=image_params['release'],
+                label=image_params['label'],
                 purpose=image_params['purpose']),
             tftproot)
         os.makedirs(image_dir)
@@ -75,18 +76,20 @@
         arch = factory.make_name('arch')
         subarch = factory.make_name('subarch')
         release = factory.make_name('release')
+        label = factory.make_name('label')
         purpose = factory.make_name('purpose')
         self.assertEqual(
-            '%s/%s/%s/%s' % (arch, subarch, release, purpose),
-            compose_image_path(arch, subarch, release, purpose))
+            '%s/%s/%s/%s/%s' % (arch, subarch, release, label, purpose),
+            compose_image_path(arch, subarch, release, label, purpose))
 
     def test_compose_image_path_does_not_include_tftp_root(self):
         arch = factory.make_name('arch')
         subarch = factory.make_name('subarch')
         release = factory.make_name('release')
+        label = factory.make_name('label')
         purpose = factory.make_name('purpose')
         self.assertThat(
-            compose_image_path(arch, subarch, release, purpose),
+            compose_image_path(arch, subarch, release, label, purpose),
             Not(StartsWith(self.tftproot)))
 
     def test_compose_bootloader_path_follows_maas_pxe_directory_layout(self):
@@ -117,20 +120,12 @@
 
     def test_list_boot_images_finds_boot_image(self):
         image = make_boot_image_params()
-        # XXX jtv 2014-03-11 bug=1290822: The directory hierarchy for boot
-        # images doesn't actually support labels yet.  Hard-code "release"
-        # as the label for now, to make the test pass during transition.
-        image['label'] = 'release'
         self.make_image_dir(image, self.tftproot)
         self.assertItemsEqual([image], list_boot_images(self.tftproot))
 
     def test_list_boot_images_enumerates_boot_images(self):
         images = [make_boot_image_params() for counter in range(3)]
         for image in images:
-            # XXX jtv 2014-03-11 bug=1290822: The directory hierarchy for boot
-            # images doesn't actually support labels yet.  Hard-code "release"
-            # as the label for now, to make the test pass during transition.
-            image['label'] = 'release'
             self.make_image_dir(image, self.tftproot)
         self.assertItemsEqual(images, list_boot_images(self.tftproot))
 

=== modified file 'src/provisioningserver/pxe/tftppath.py'
--- src/provisioningserver/pxe/tftppath.py	2014-03-14 09:48:52 +0000
+++ src/provisioningserver/pxe/tftppath.py	2014-03-18 03:24:23 +0000
@@ -1,4 +1,4 @@
-# Copyright 2012 Canonical Ltd.  This software is licensed under the
+# Copyright 2012-2014 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Construct TFTP paths for PXE files."""
@@ -60,7 +60,7 @@
         htype=ARP_HTYPE.ETHERNET, mac=mac)
 
 
-def compose_image_path(arch, subarch, release, purpose):
+def compose_image_path(arch, subarch, release, label, purpose):
     """Compose the TFTP path for a PXE kernel/initrd directory.
 
     The path returned is relative to the TFTP root, as it would be
@@ -69,12 +69,14 @@
     :param arch: Main machine architecture.
     :param subarch: Sub-architecture, or "generic" if there is none.
     :param release: Operating system release, e.g. "precise".
+    :param label: An image label, e.g. for a beta version, or "release" for
+        the default images.
     :param purpose: Purpose of the image, e.g. "install" or
         "commissioning".
     :return: Path for the corresponding image directory (containing a
         kernel and initrd) as exposed over TFTP.
     """
-    return '/'.join([arch, subarch, release, purpose])
+    return '/'.join([arch, subarch, release, label, purpose])
 
 
 def locate_tftp_path(path, tftproot):
@@ -146,11 +148,10 @@
     The path must consist of a full [architecture, subarchitecture, release,
     purpose] that identify a kind of boot that we may need an image for.
     """
-    arch, subarch, release, purpose = path
-    # XXX: the hard-coded label needs to be fixed in a future change.
+    arch, subarch, release, label, purpose = path
     return dict(
         architecture=arch, subarchitecture=subarch, release=release,
-        purpose=purpose, label="release")
+        label=label, purpose=purpose)
 
 
 def list_boot_images(tftproot):
@@ -171,7 +172,7 @@
     # Extend paths deeper into the filesystem, through the levels that
     # represent sub-architecture, release, and purpose.  Any directory
     # that doesn't extend this deep isn't a boot image.
-    for level in ['subarch', 'release', 'purpose']:
+    for level in ['subarch', 'release', 'label', 'purpose']:
         paths = drill_down(tftproot, paths)
 
     # Each path we find this way should be a boot image.

=== modified file 'src/provisioningserver/rpc/cluster.py'
--- src/provisioningserver/rpc/cluster.py	2014-03-10 04:22:07 +0000
+++ src/provisioningserver/rpc/cluster.py	2014-03-18 03:24:23 +0000
@@ -41,6 +41,7 @@
             [(b"architecture", amp.Unicode()),
              (b"subarchitecture", amp.Unicode()),
              (b"release", amp.Unicode()),
+             (b"label", amp.Unicode()),
              (b"purpose", amp.Unicode())]))
     ]
     errors = []

=== modified file 'src/provisioningserver/rpc/tests/test_clusterservice.py'
--- src/provisioningserver/rpc/tests/test_clusterservice.py	2014-03-10 04:22:07 +0000
+++ src/provisioningserver/rpc/tests/test_clusterservice.py	2014-03-18 03:24:23 +0000
@@ -161,6 +161,7 @@
 
         self.assertEqual({"images": []}, response)
 
+    @inlineCallbacks
     def test_list_boot_images_with_things_to_report(self):
         # tftppath.list_boot_images()'s return value matches the
         # response schema that ListBootImages declares, and is
@@ -170,11 +171,12 @@
         archs = "i386", "amd64"
         subarchs = "generic", "special"
         releases = "precise", "trusty"
+        labels = "beta-1", "release"
         purposes = "commission", "install"
 
         # Create a TFTP file tree with a variety of subdirectories.
         tftpdir = self.make_dir()
-        for options in product(archs, subarchs, releases, purposes):
+        for options in product(archs, subarchs, releases, labels, purposes):
             os.makedirs(os.path.join(tftpdir, *options))
 
         # Ensure that list_boot_images() uses the above TFTP file tree.
@@ -182,19 +184,21 @@
         load_from_cache.return_value = {"tftp": {"root": tftpdir}}
 
         expected_images = [
-            {"architecture": arch, "subarchitecture": subarch,
-             "release": release, "purpose": purpose}
-            for arch, subarch, release, purpose in product(
-                archs, subarchs, releases, purposes)
-        ]
-
-        d = call_responder(Cluster(), cluster.ListBootImages, {})
-
-        def check(response):
-            self.assertThat(response, KeysEqual("images"))
-            self.assertItemsEqual(expected_images, response["images"])
-
-        return d.addCallback(check)
+            {
+                "architecture": arch,
+                "subarchitecture": subarch,
+                "release": release,
+                "label": label,
+                "purpose": purpose,
+            }
+            for arch, subarch, release, label, purpose in product(
+                archs, subarchs, releases, labels, purposes)
+            ]
+
+        response = yield call_responder(Cluster(), cluster.ListBootImages, {})
+
+        self.assertThat(response, KeysEqual("images"))
+        self.assertItemsEqual(expected_images, response["images"])
 
 
 class TestClusterProtocol_DescribePowerTypes(MAASTestCase):

=== modified file 'src/provisioningserver/tasks.py'
--- src/provisioningserver/tasks.py	2014-03-12 14:09:13 +0000
+++ src/provisioningserver/tasks.py	2014-03-18 03:24:23 +0000
@@ -1,4 +1,4 @@
-# Copyright 2012 Canonical Ltd.  This software is licensed under the
+# Copyright 2012-2014 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Provisioning server tasks that are run in Celery workers."""
@@ -16,6 +16,7 @@
     'power_off',
     'power_on',
     'refresh_secrets',
+    'report_boot_images',
     'rndc_command',
     'setup_rndc_configuration',
     'restart_dhcp_server',

=== modified file 'src/provisioningserver/tests/test_maas_import_pxe_files.py'
--- src/provisioningserver/tests/test_maas_import_pxe_files.py	2014-03-11 12:19:40 +0000
+++ src/provisioningserver/tests/test_maas_import_pxe_files.py	2014-03-18 03:24:23 +0000
@@ -119,7 +119,7 @@
         tftppath.compose_bootloader_path(), tftproot)
 
 
-def compose_tftp_path(tftproot, arch, release, purpose, *path):
+def compose_tftp_path(tftproot, arch, release, label, purpose, *path):
     """Compose path for MAAS TFTP files for given architecture.
 
     After the TFTP root directory and the architecture, just append any path
@@ -128,7 +128,8 @@
     """
     return os.path.join(
         tftppath.locate_tftp_path(
-            tftppath.compose_image_path(arch[0], arch[1], release, purpose),
+            tftppath.compose_image_path(
+                arch[0], arch[1], release, label, purpose),
             tftproot),
         *path)
 
@@ -235,7 +236,7 @@
         archive = self.make_downloads(arch=arch, release=release)
         self.call_script(archive, self.tftproot, arch=arch, release=release)
         tftp_path = compose_tftp_path(
-            self.tftproot, arch, release, 'install', 'linux')
+            self.tftproot, arch, release, 'release', 'install', 'linux')
         _, download_path = compose_download_dir(archive, arch, release)
         expected_contents = read_file(
             download_path, compose_download_kernel_name(arch, release))
@@ -245,7 +246,7 @@
         arch = self.get_arch()
         release = 'precise'
         tftp_path = compose_tftp_path(
-            self.tftproot, arch, release, 'install', 'linux')
+            self.tftproot, arch, release, 'release', 'install', 'linux')
         os.makedirs(os.path.dirname(tftp_path))
         with open(tftp_path, 'w') as existing_file:
             existing_file.write(factory.getRandomString())
@@ -262,7 +263,7 @@
         archive = self.make_downloads(arch=arch, release=release)
         self.call_script(archive, self.tftproot, arch=arch, release=release)
         tftp_path = compose_tftp_path(
-            self.tftproot, arch, release, 'install', 'linux')
+            self.tftproot, arch, release, 'release', 'install', 'linux')
         backdate(tftp_path)
         original_timestamp = get_write_time(tftp_path)
         self.call_script(archive, self.tftproot, arch=arch, release=release)
@@ -280,5 +281,5 @@
 
         # The script does not install the broken image, and does not fail.
         installed_kernel = compose_tftp_path(
-            self.tftproot, arch, release, 'initrd.gz')
+            self.tftproot, arch, release, 'release', 'initrd.gz')
         self.assertThat(installed_kernel, Not(DirExists()))