Merge lp:~blake-rouse/maas/simplestreams-os-field into lp:~maas-committers/maas/trunk

[Blake Rouse]

Added support for os field on product from simplestreams endpoint.

[Jason Hobbs (jason-hobbs)]

Blake, just a few comments and questions below.

review: Needs Fixing

[Blake Rouse (blake-rouse)]

Have updated the code. Could you give it another look.

[Jason Hobbs (jason-hobbs)]

Looks good, thanks.

review: Approve

=== modified file 'src/provisioningserver/boot/tests/test_tftppath.py'
--- src/provisioningserver/boot/tests/test_tftppath.py	2014-08-13 21:49:35 +0000
+++ src/provisioningserver/boot/tests/test_tftppath.py	2014-08-22 21:52:07 +0000
@@ -122,6 +122,7 @@
 
     def make_meta_file(self, image_params, image_resource, tftproot):
         image = ImageSpec(
+            os=image_params["osystem"],
             arch=image_params["architecture"],
             subarch=image_params["subarchitecture"],
             release=image_params["release"], label=image_params["label"])
@@ -349,6 +350,7 @@
         # and subarch vs subarchitecture means I can't just do a simple
         # dict parameter expansion here.
         params = {
+            "osystem": image.os,
             "architecture": image.arch,
             "subarchitecture": image.subarch,
             "release": image.release,
@@ -372,6 +374,7 @@
         # and subarch vs subarchitecture means I can't just do a simple
         # dict parameter expansion here.
         params = {
+            "osystem": image.os,
             "architecture": image.arch,
             "subarchitecture": image.subarch,
             "release": image.release,
@@ -459,7 +462,8 @@
 
         # Create some maas.meta content.
         image = ImageSpec(
-            arch=arch, subarch=subarch, release=release, label=label)
+            os=osystem, arch=arch, subarch=subarch, release=release,
+            label=label)
         image_resource = dict(subarches=factory.make_name("subarches"))
         mapping = BootImageMapping()
         mapping.setdefault(image, image_resource)

=== modified file 'src/provisioningserver/boot/tftppath.py'
--- src/provisioningserver/boot/tftppath.py	2014-08-13 21:49:35 +0000
+++ src/provisioningserver/boot/tftppath.py	2014-08-22 21:52:07 +0000
@@ -132,6 +132,7 @@
     mapping = BootImageMapping.load_json(metadata)
 
     image = ImageSpec(
+        os=params["osystem"],
         arch=params["architecture"],
         subarch=params["subarchitecture"],
         release=params["release"],

=== modified file 'src/provisioningserver/config.py'
--- src/provisioningserver/config.py	2014-08-13 21:49:35 +0000
+++ src/provisioningserver/config.py	2014-08-22 21:52:07 +0000
@@ -174,6 +174,7 @@
 
     if_key_missing = None
 
+    os = String(if_missing="*")
     release = String(if_missing="*")
     arches = Set(if_missing=["*"])
     subarches = Set(if_missing=['*'])

=== modified file 'src/provisioningserver/import_images/boot_image_mapping.py'
--- src/provisioningserver/import_images/boot_image_mapping.py	2014-05-19 05:27:29 +0000
+++ src/provisioningserver/import_images/boot_image_mapping.py	2014-08-22 21:52:07 +0000
@@ -19,6 +19,20 @@
 import json
 
 from provisioningserver.import_images.helpers import ImageSpec
+from provisioningserver.utils import dict_depth
+
+
+def gen_image_spec_with_resource(os, data):
+    """Generate image and resource for given operating system and data."""
+    for arch in data:
+        for subarch in data[arch]:
+            for release in data[arch][subarch]:
+                for label in data[arch][subarch][release]:
+                    image = ImageSpec(
+                        os=os, arch=arch, subarch=subarch,
+                        release=release, label=label)
+                    resource = data[arch][subarch][release][label]
+                    yield image, resource
 
 
 class BootImageMapping:
@@ -57,11 +71,12 @@
         # Keep that format.
         data = {}
         for image, resource in self.items():
-            arch, subarch, release, label = image
-            data.setdefault(arch, {})
-            data[arch].setdefault(subarch, {})
-            data[arch][subarch].setdefault(release, {})
-            data[arch][subarch][release][label] = resource
+            os, arch, subarch, release, label = image
+            data.setdefault(os, {})
+            data[os].setdefault(arch, {})
+            data[os][arch].setdefault(subarch, {})
+            data[os][arch][subarch].setdefault(release, {})
+            data[os][arch][subarch][release][label] = resource
         return json.dumps(data, sort_keys=True)
 
     @staticmethod
@@ -79,14 +94,16 @@
         except ValueError:
             return mapping
 
-        for arch in data:
-            for subarch in data[arch]:
-                for release in data[arch][subarch]:
-                    for label in data[arch][subarch][release]:
-                        image = ImageSpec(
-                            arch=arch, subarch=subarch, release=release,
-                            label=label)
-                        resource = data[arch][subarch][release][label]
-                        mapping.setdefault(image, resource)
-
+        depth = dict_depth(data)
+        if depth == 5:
+            # Support for older data. This has no operating system, then
+            # it is ubuntu.
+            for image, resource in gen_image_spec_with_resource(
+                    "ubuntu", data):
+                mapping.setdefault(image, resource)
+        elif depth == 6:
+            for os in data:
+                for image, resource in gen_image_spec_with_resource(
+                        os, data[os]):
+                    mapping.setdefault(image, resource)
         return mapping

=== modified file 'src/provisioningserver/import_images/download_descriptions.py'
--- src/provisioningserver/import_images/download_descriptions.py	2014-08-13 21:49:35 +0000
+++ src/provisioningserver/import_images/download_descriptions.py	2014-08-22 21:52:07 +0000
@@ -26,6 +26,7 @@
     BootImageMapping,
     )
 from provisioningserver.import_images.helpers import (
+    get_os_from_product,
     get_signing_policy,
     ImageSpec,
     maaslog,
@@ -77,10 +78,11 @@
     def insert_item(self, data, src, target, pedigree, contentsource):
         """Overridable from `BasicMirrorWriter`."""
         item = products_exdata(src, pedigree)
+        os = get_os_from_product(item)
         arch, subarches = item['arch'], item['subarches']
         release = item['release']
         label = item['label']
-        base_image = ImageSpec(arch, None, release, label)
+        base_image = ImageSpec(os, arch, None, release, label)
         compact_item = clean_up_repo_item(item)
         for subarch in subarches.split(','):
             self.boot_images_dict.setdefault(
@@ -105,13 +107,14 @@
     return filter_value in ('*', property_value)
 
 
-def image_passes_filter(filters, arch, subarch, release, label):
+def image_passes_filter(filters, os, arch, subarch, release, label):
     """Filter a boot image against configured import filters.
 
     :param filters: A list of dicts describing the filters, as in `boot_merge`.
         If the list is empty, or `None`, any image matches.  Any entry in a
         filter may be a string containing just an asterisk (`*`) to denote that
         the entry will match any value.
+    :param os: The given boot image's operating system.
     :param arch: The given boot image's architecture.
     :param subarch: The given boot image's subarchitecture.
     :param release: The given boot image's OS release.
@@ -122,6 +125,7 @@
         return True
     for filter_dict in filters:
         item_matches = (
+            value_passes_filter(filter_dict['os'], os) and
             value_passes_filter(filter_dict['release'], release) and
             value_passes_filter_list(filter_dict['arches'], arch) and
             value_passes_filter_list(filter_dict['subarches'], subarch) and
@@ -143,21 +147,22 @@
         in-place.
     :param additions: A second `BootImageMapping`, which will be used as a
         source of additional entries.
-    :param filters: List of dicts, each of which contains 'arch', 'subarch',
-        and 'release' keys.  If given, entries are only considered for copying
-        from `additions` to `destination` if they match at least one of the
-        filters.  Entries in the filter may be the string `*` (or for entries
-        that are lists, may contain the string `*`) to make them match any
-        value.
+    :param filters: List of dicts, each of which contains 'os', arch',
+        'subarch', 'release', and 'label' keys.  If given, entries are only
+        considered for copying from `additions` to `destination` if they match
+        at least one of the filters.  Entries in the filter may be the string
+        `*` (or for entries that are lists, may contain the string `*`) to make
+        them match any value.
     """
     for image, resource in additions.items():
-        arch, subarch, release, label = image
-        if image_passes_filter(filters, arch, subarch, release, label):
+        os, arch, subarch, release, label = image
+        if image_passes_filter(
+                filters, os, arch, subarch, release, label):
             maaslog.debug(
                 "Merging boot resource for %s/%s/%s/%s.",
                 arch, subarch, release, label)
             # Do not override an existing entry with the same
-            # arch/subarch/release/label: the first entry found takes
+            # os/arch/subarch/release/label: the first entry found takes
             # precedence.
             destination.setdefault(image, resource)
 
@@ -188,6 +193,6 @@
     boot = BootImageMapping()
     for source in sources:
         repo_boot = download_image_descriptions(
-            source['url'], keyring=source['keyring'])
+            source['url'], keyring=source.get('keyring', None))
         boot_merge(boot, repo_boot, source['selections'])
     return boot

=== modified file 'src/provisioningserver/import_images/download_resources.py'
--- src/provisioningserver/import_images/download_resources.py	2014-08-13 21:49:35 +0000
+++ src/provisioningserver/import_images/download_resources.py	2014-08-22 21:52:07 +0000
@@ -21,6 +21,7 @@
 import os.path
 
 from provisioningserver.import_images.helpers import (
+    get_os_from_product,
     get_signing_policy,
     maaslog,
     )
@@ -121,7 +122,8 @@
     return [(root_image_path, 'root-image'), (root_tgz_path, 'root-tgz')]
 
 
-def link_resources(snapshot_path, links, arch, release, label, subarches):
+def link_resources(snapshot_path, links, osystem, arch, release, label,
+                   subarches):
     """Hardlink entries in the snapshot directory to resources in the cache.
 
     This creates file entries in the snapshot directory for boot resources
@@ -132,6 +134,7 @@
         the cache.  Each link is described as a tuple of (path, logical
         name).  The path points to a file in the cache directory.  The logical
         name will be link's filename, without path.
+    :param osystem: Operating system with this boot image supports.
     :param arch: Architecture which this boot image supports.
     :param release: OS release of which this boot image is a part.
     :param label: OS release label of which this boot image is a part, e.g.
@@ -143,7 +146,8 @@
         for older Ubuntu releases.
     """
     for subarch in subarches:
-        directory = os.path.join(snapshot_path, arch, subarch, release, label)
+        directory = os.path.join(
+            snapshot_path, osystem, arch, subarch, release, label)
         if not os.path.exists(directory):
             os.makedirs(directory)
         for cached_file, logical_name in links:
@@ -194,11 +198,12 @@
             links = insert_file(
                 self.store, ftype, tag, checksums, size, contentsource)
 
+        os = get_os_from_product(item)
         subarches = self.product_mapping.get(item)
         link_resources(
             snapshot_path=self.root_path, links=links,
-            arch=item['arch'], release=item['release'], label=item['label'],
-            subarches=subarches)
+            osystem=os, arch=item['arch'], release=item['release'],
+            label=item['label'], subarches=subarches)
 
 
 def download_boot_resources(path, store, snapshot_path, product_mapping,
@@ -262,7 +267,6 @@
     """
     storage_path = os.path.abspath(storage_path)
     snapshot_path = compose_snapshot_path(storage_path)
-    ubuntu_path = os.path.join(snapshot_path, 'ubuntu')
     # Use a FileStore as our ObjectStore implementation.  It will write to the
     # cache directory.
     if store is None:
@@ -273,7 +277,7 @@
 
     for source in sources:
         download_boot_resources(
-            source['url'], store, ubuntu_path, product_mapping,
+            source['url'], store, snapshot_path, product_mapping,
             keyring_file=source.get('keyring')),
 
     return snapshot_path

=== modified file 'src/provisioningserver/import_images/helpers.py'
--- src/provisioningserver/import_images/helpers.py	2014-08-15 04:03:34 +0000
+++ src/provisioningserver/import_images/helpers.py	2014-08-22 21:52:07 +0000
@@ -27,6 +27,7 @@
 
 # A tuple of the items that together select a boot image.
 ImageSpec = namedtuple(b'ImageSpec', [
+    'os',
     'arch',
     'subarch',
     'release',

=== modified file 'src/provisioningserver/import_images/testing/factory.py'
--- src/provisioningserver/import_images/testing/factory.py	2014-05-19 02:45:04 +0000
+++ src/provisioningserver/import_images/testing/factory.py	2014-08-22 21:52:07 +0000
@@ -16,6 +16,7 @@
     'make_boot_resource',
     'make_image_spec',
     'make_maas_meta',
+    'make_maas_meta_without_os',
     'set_resource',
     ]
 
@@ -31,6 +32,12 @@
 def make_maas_meta():
     """Return fake maas.meta data."""
     return dedent("""\
+        {"ubuntu": {"amd64": {"generic": {"precise": {"release": {"content_id": "com.ubuntu.maas:v2:download", "path": "precise/amd64/20140410/raring/generic/boot-kernel", "product_name": "com.ubuntu.maas:v2:boot:12.04:amd64:hwe-r", "subarches": "generic,hwe-p,hwe-q,hwe-r", "version_name": "20140410"}}, "trusty": {"release": {"content_id": "com.ubuntu.maas:v2:download", "path": "trusty/amd64/20140416.1/root-image.gz", "product_name": "com.ubuntu.maas:v2:boot:14.04:amd64:hwe-t", "subarches": "generic,hwe-p,hwe-q,hwe-r,hwe-s,hwe-t", "version_name": "20140416.1"}}}, "hwe-s": {"precise": {"release": {"content_id": "com.ubuntu.maas:v2:download", "path": "precise/amd64/20140410/saucy/generic/boot-kernel", "product_name": "com.ubuntu.maas:v2:boot:12.04:amd64:hwe-s", "subarches": "generic,hwe-p,hwe-q,hwe-r,hwe-s", "version_name": "20140410"}}}}}}""")  # NOQA
+
+
+def make_maas_meta_without_os():
+    """Return fake maas.meta data, without the os field."""
+    return dedent("""\
         {"amd64": {"generic": {"precise": {"release": {"content_id": "com.ubuntu.maas:v2:download", "path": "precise/amd64/20140410/raring/generic/boot-kernel", "product_name": "com.ubuntu.maas:v2:boot:12.04:amd64:hwe-r", "subarches": "generic,hwe-p,hwe-q,hwe-r", "version_name": "20140410"}}, "trusty": {"release": {"content_id": "com.ubuntu.maas:v2:download", "path": "trusty/amd64/20140416.1/root-image.gz", "product_name": "com.ubuntu.maas:v2:boot:14.04:amd64:hwe-t", "subarches": "generic,hwe-p,hwe-q,hwe-r,hwe-s,hwe-t", "version_name": "20140416.1"}}}, "hwe-s": {"precise": {"release": {"content_id": "com.ubuntu.maas:v2:download", "path": "precise/amd64/20140410/saucy/generic/boot-kernel", "product_name": "com.ubuntu.maas:v2:boot:12.04:amd64:hwe-s", "subarches": "generic,hwe-p,hwe-q,hwe-r,hwe-s", "version_name": "20140410"}}}}}""")  # NOQA
 
 
@@ -46,6 +53,7 @@
 def make_image_spec():
     """Return an `ImageSpec` with random values."""
     return ImageSpec(
+        factory.make_name('os'),
         factory.make_name('arch'),
         factory.make_name('subarch'),
         factory.make_name('release'),

=== modified file 'src/provisioningserver/import_images/tests/test_boot_image_mapping.py'
--- src/provisioningserver/import_images/tests/test_boot_image_mapping.py	2014-05-19 05:27:29 +0000
+++ src/provisioningserver/import_images/tests/test_boot_image_mapping.py	2014-08-22 21:52:07 +0000
@@ -24,6 +24,7 @@
 from provisioningserver.import_images.testing.factory import (
     make_image_spec,
     make_maas_meta,
+    make_maas_meta_without_os,
     set_resource,
     )
 
@@ -78,9 +79,11 @@
         image_dict = set_resource(image_spec=image, resource=resource)
         self.assertEqual(
             {
-                image.arch: {
-                    image.subarch: {
-                        image.release: {image.label: resource},
+                image.os: {
+                    image.arch: {
+                        image.subarch: {
+                            image.release: {image.label: resource},
+                        },
                     },
                 },
             },
@@ -97,10 +100,12 @@
             image_dict, image._replace(release=other_release), resource2)
         self.assertEqual(
             {
-                image.arch: {
-                    image.subarch: {
-                        image.release: {image.label: resource1},
-                        other_release: {image.label: resource2},
+                image.os: {
+                    image.arch: {
+                        image.subarch: {
+                            image.release: {image.label: resource1},
+                            other_release: {image.label: resource2},
+                        },
                     },
                 },
             },
@@ -114,6 +119,12 @@
         dumped = mapping.dump_json()
         self.assertEqual(test_meta_file_content, dumped)
 
+    def test_load_json_result_of_old_data_uses_ubuntu_as_os(self):
+        test_meta_file_content = make_maas_meta_without_os()
+        mapping = BootImageMapping.load_json(test_meta_file_content)
+        os = {image.os for image, _ in mapping.items()}.pop()
+        self.assertEqual('ubuntu', os)
+
     def test_load_json_returns_empty_mapping_for_invalid_json(self):
         bad_json = ""
         mapping = BootImageMapping.load_json(bad_json)

=== modified file 'src/provisioningserver/import_images/tests/test_boot_resources.py'
--- src/provisioningserver/import_images/tests/test_boot_resources.py	2014-08-13 21:49:35 +0000
+++ src/provisioningserver/import_images/tests/test_boot_resources.py	2014-08-22 21:52:07 +0000
@@ -114,7 +114,8 @@
         self.patch(
             provisioningserver.config, 'BOOT_RESOURCES_STORAGE', self.storage)
         self.image = make_image_spec()
-        self.arch, self.subarch, self.release, self.label = self.image
+        self.os, self.arch, self.subarch, \
+            self.release, self.label = self.image
         self.repo = self.make_simplestreams_repo(self.image)
 
     def patch_maaslog(self):
@@ -212,6 +213,7 @@
                     'subarches': [image_spec.subarch],
                     'release': image_spec.release,
                     'arch': image_spec.arch,
+                    'os': image_spec.os,
                 },
             },
         }
@@ -255,6 +257,7 @@
                 'url': self.repo,
                 'selections': [
                     {
+                        'os': self.os,
                         'release': self.release,
                         'arches': [self.arch],
                         'subarches': [self.subarch],
@@ -287,6 +290,7 @@
                 self.patch(boot_method, 'install_bootloader')
 
         args = self.make_working_args()
+        osystem = self.os
         arch = self.arch
         subarch = self.subarch
         release = self.release
@@ -305,16 +309,18 @@
         self.assertThat(os.path.join(current, 'maas.tgt'), FileExists())
         self.assertThat(
             os.path.join(
-                current, 'ubuntu', arch, subarch, self.release, self.label),
+                current, osystem, arch, subarch, self.release, self.label),
             DirExists())
 
         # Verify the contents of the "meta" file.
         with open(os.path.join(current, 'maas.meta'), 'rb') as meta_file:
             meta_data = json.load(meta_file)
-        self.assertEqual([arch], meta_data.keys())
-        self.assertEqual([subarch], meta_data[arch].keys())
-        self.assertEqual([release], meta_data[arch][subarch].keys())
-        self.assertEqual([label], meta_data[arch][subarch][release].keys())
+        self.assertEqual([osystem], meta_data.keys())
+        self.assertEqual([arch], meta_data[osystem].keys())
+        self.assertEqual([subarch], meta_data[osystem][arch].keys())
+        self.assertEqual([release], meta_data[osystem][arch][subarch].keys())
+        self.assertEqual(
+            [label], meta_data[osystem][arch][subarch][release].keys())
         self.assertItemsEqual(
             [
                 'content_id',
@@ -323,7 +329,7 @@
                 'version_name',
                 'subarches',
             ],
-            meta_data[arch][subarch][release][label].keys())
+            meta_data[osystem][arch][subarch][release][label].keys())
 
     def test_warns_if_no_sources_selected(self):
         self.patch_maaslog()
@@ -442,6 +448,7 @@
                 'url': factory.make_name("something"),
                 'selections': [
                     {
+                        'os': factory.make_name("os"),
                         'release': factory.make_name("release"),
                         'arches': [factory.make_name("arch")],
                         'subarches': [factory.make_name("subarch")],
@@ -477,6 +484,7 @@
                 'url': factory.make_name("something"),
                 'selections': [
                     {
+                        'os': factory.make_name("os"),
                         'release': factory.make_name("release"),
                         'arches': [factory.make_name("arch")],
                         'subarches': [factory.make_name("subarch")],

=== modified file 'src/provisioningserver/import_images/tests/test_download_descriptions.py'
--- src/provisioningserver/import_images/tests/test_download_descriptions.py	2014-08-13 21:49:35 +0000
+++ src/provisioningserver/import_images/tests/test_download_descriptions.py	2014-08-22 21:52:07 +0000
@@ -92,6 +92,7 @@
         if image_spec is None:
             image_spec = make_image_spec()
         return {
+            'os': image_spec.os,
             'arches': [image_spec.arch],
             'subarches': [image_spec.subarch],
             'release': image_spec.release,
@@ -99,30 +100,32 @@
             }
 
     def test_any_image_passes_none_filter(self):
-        arch, subarch, release, label = make_image_spec()
+        os, arch, subarch, release, label = make_image_spec()
         self.assertTrue(
             download_descriptions.image_passes_filter(
-                None, arch, subarch, release, label))
+                None, os, arch, subarch, release, label))
 
     def test_any_image_passes_empty_filter(self):
-        arch, subarch, release, label = make_image_spec()
+        os, arch, subarch, release, label = make_image_spec()
         self.assertTrue(
             download_descriptions.image_passes_filter(
-                [], arch, subarch, release, label))
+                [], os, arch, subarch, release, label))
 
     def test_image_passes_matching_filter(self):
         image = make_image_spec()
         self.assertTrue(
             download_descriptions.image_passes_filter(
                 [self.make_filter_from_image(image)],
-                image.arch, image.subarch, image.release, image.label))
+                image.os, image.arch, image.subarch,
+                image.release, image.label))
 
     def test_image_does_not_pass_nonmatching_filter(self):
         image = make_image_spec()
         self.assertFalse(
             download_descriptions.image_passes_filter(
                 [self.make_filter_from_image()],
-                image.arch, image.subarch, image.release, image.label))
+                image.os, image.arch, image.subarch,
+                image.release, image.label))
 
     def test_image_passes_if_one_filter_matches(self):
         image = make_image_spec()
@@ -132,7 +135,9 @@
                     self.make_filter_from_image(),
                     self.make_filter_from_image(image),
                     self.make_filter_from_image(),
-                ], image.arch, image.subarch, image.release, image.label))
+                ],
+                image.os, image.arch, image.subarch,
+                image.release, image.label))
 
     def test_filter_checks_release(self):
         image = make_image_spec()
@@ -141,7 +146,9 @@
                 [
                     self.make_filter_from_image(image._replace(
                         release=factory.make_name('other-release')))
-                ], image.arch, image.subarch, image.release, image.label))
+                ],
+                image.os, image.arch, image.subarch,
+                image.release, image.label))
 
     def test_filter_checks_arches(self):
         image = make_image_spec()
@@ -150,7 +157,9 @@
                 [
                     self.make_filter_from_image(image._replace(
                         arch=factory.make_name('other-arch')))
-                ], image.arch, image.subarch, image.release, image.label))
+                ],
+                image.os, image.arch, image.subarch,
+                image.release, image.label))
 
     def test_filter_checks_subarches(self):
         image = make_image_spec()
@@ -159,7 +168,9 @@
                 [
                     self.make_filter_from_image(image._replace(
                         subarch=factory.make_name('other-subarch')))
-                ], image.arch, image.subarch, image.release, image.label))
+                ],
+                image.os, image.arch, image.subarch,
+                image.release, image.label))
 
     def test_filter_checks_labels(self):
         image = make_image_spec()
@@ -168,7 +179,9 @@
                 [
                     self.make_filter_from_image(image._replace(
                         label=factory.make_name('other-label')))
-                ], image.arch, image.subarch, image.release, image.label))
+                ],
+                image.os, image.arch, image.subarch,
+                image.release, image.label))
 
 
 class TestBootMerge(MAASTestCase):
@@ -187,6 +200,7 @@
     def test_obeys_filters(self):
         filters = [
             {
+                'os': factory.make_name('os'),
                 'arches': [factory.make_name('other-arch')],
                 'subarches': [factory.make_name('other-subarch')],
                 'release': factory.make_name('other-release'),

=== modified file 'src/provisioningserver/import_images/tests/test_download_resources.py'
--- src/provisioningserver/import_images/tests/test_download_resources.py	2014-06-10 14:45:14 +0000
+++ src/provisioningserver/import_images/tests/test_download_resources.py	2014-08-22 21:52:07 +0000
@@ -55,7 +55,6 @@
         storage_path = self.make_dir()
         snapshot_path = download_resources.compose_snapshot_path(
             storage_path)
-        ubuntu_path = os.path.join(snapshot_path, 'ubuntu')
         cache_path = os.path.join(storage_path, 'cache')
         file_store = FileStore(cache_path)
         source = {
@@ -70,7 +69,7 @@
         self.assertThat(
             fake,
             MockCalledWith(
-                source['url'], file_store, ubuntu_path, product_mapping,
+                source['url'], file_store, snapshot_path, product_mapping,
                 keyring_file=source['keyring']))
 
 

=== modified file 'src/provisioningserver/tests/test_config.py'
--- src/provisioningserver/tests/test_config.py	2014-07-18 17:05:57 +0000
+++ src/provisioningserver/tests/test_config.py	2014-08-22 21:52:07 +0000
@@ -437,6 +437,7 @@
         'keyring_data': None,
         'selections': [
             {
+                'os': '*',
                 'release': '*',
                 'labels': ['*'],
                 'arches': ['*'],
@@ -452,6 +453,7 @@
             'keyring': factory.make_name('keyring'),
             'keyring_data': factory.make_string(),
             'selections': [{
+                'os': factory.make_name('os'),
                 'release': factory.make_name('release'),
                 'labels': [factory.make_name('label')],
                 'arches': [factory.make_name('arch')],

=== modified file 'src/provisioningserver/utils/__init__.py'
--- src/provisioningserver/utils/__init__.py	2014-08-13 21:49:35 +0000
+++ src/provisioningserver/utils/__init__.py	2014-08-22 21:52:07 +0000
@@ -143,6 +143,13 @@
     }
 
 
+def dict_depth(d, depth=0):
+    """Returns the max depth of a dictionary."""
+    if not isinstance(d, dict) or not d:
+        return depth
+    return max(dict_depth(v, depth + 1) for _, v in d.iteritems())
+
+
 def split_lines(input, separator):
     """Split each item from `input` into a key/value pair."""
     return (line.split(separator, 1) for line in input if line.strip() != '')