Merge ~ltrager/maas:lp1701694_2.2 into maas:2.2

[Lee Trager]

Allow uploading images with the format osystem/release.

All images uploaded are now of rtype UPLOADED. Users can upload using the format osystem/release where osystem is a supported OS.

Fixes: LP: #1701694, #1361370

This is a backport of https://code.launchpad.net/~ltrager/maas/+git/maas/+merge/327482 however I also had to backport the CentOS customization from https://code.launchpad.net/~ltrager/maas/rhel_driver/+merge/324909 as well.

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b lp1701694_2.2 lp:~ltrager/maas into -b 2.2 lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/129/console

[MAAS Lander (maas-lander)]

LANDING
-b lp1701694_2.2 lp:~ltrager/maas into -b 2.2 lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/132/console

[MAAS Lander (maas-lander)]

LANDING
-b lp1701694_2.2 lp:~ltrager/maas into -b 2.2 lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/134/console

[MAAS Lander (maas-lander)]

LANDING
-b lp1701694_2.2 lp:~ltrager/maas into -b 2.2 lp:~maas-committers/maas

STATUS: FAILED MERGE
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-lander/23983/console

diff --git a/src/maasserver/bootresources.py b/src/maasserver/bootresources.py
index 996a6a0..f3c3824 100644
--- a/src/maasserver/bootresources.py
+++ b/src/maasserver/bootresources.py
@@ -224,11 +224,11 @@ class SimpleStreamsHandler:
     def get_boot_resource_identifiers(self, resource):
         """Return tuple (os, arch, subarch, series) for the given resource."""
         arch, subarch = resource.split_arch()
-        if resource.rtype == BOOT_RESOURCE_TYPE.UPLOADED:
+        if '/' in resource.name:
+            os, series = resource.name.split('/')
+        else:
             os = 'custom'
             series = resource.name
-        else:
-            os, series = resource.name.split('/')
         return (os, arch, subarch, series)
 
     def get_product_name(self, resource):
diff --git a/src/maasserver/forms/__init__.py b/src/maasserver/forms/__init__.py
index c03cc54..e6384c8 100644
--- a/src/maasserver/forms/__init__.py
+++ b/src/maasserver/forms/__init__.py
@@ -2237,11 +2237,19 @@ class BootResourceForm(MAASModelForm):
         If the passed resource already has a match in the database then that
         resource is returned. If not then the passed resource is returned.
         """
+        if resource.rtype == BOOT_RESOURCE_TYPE.UPLOADED:
+            # Uploaded BootResources were previously generated, now they're
+            # uploaded. Search for both to convert.
+            rtypes = [
+                BOOT_RESOURCE_TYPE.UPLOADED, BOOT_RESOURCE_TYPE.GENERATED]
+        else:
+            rtypes = [resource.type]
         existing_resource = get_one(
             BootResource.objects.filter(
-                rtype=resource.rtype,
+                rtype__in=rtypes,
                 name=resource.name, architecture=resource.architecture))
         if existing_resource is not None:
+            existing_resource.rtype = resource.rtype
             return existing_resource
         return resource
 
@@ -2289,24 +2297,14 @@ class BootResourceForm(MAASModelForm):
         This implementation of `save` does not support the `commit` argument.
         """
         resource = super(BootResourceForm, self).save(commit=False)
-
-        # XXX blake_r 2014-09-22 bug=1361370: Temporarily support the ability
-        # to upload a generated image. This should only exist while CentOS and
-        # Windows images need to be uploaded, rather than synced or generated.
-        if '/' not in resource.name:
-            label = 'uploaded'
-            resource.rtype = BOOT_RESOURCE_TYPE.UPLOADED
-        else:
-            label = 'generated'
-            resource.rtype = BOOT_RESOURCE_TYPE.GENERATED
-
+        resource.rtype = BOOT_RESOURCE_TYPE.UPLOADED
         resource = self.get_existing_resource(resource)
         resource.extra = {'subarches': resource.architecture.split('/')[1]}
         if 'title' in self.cleaned_data:
             resource.extra['title'] = self.cleaned_data['title']
 
         resource.save()
-        resource_set = self.create_resource_set(resource, label)
+        resource_set = self.create_resource_set(resource, 'uploaded')
         self.create_resource_file(
             resource_set, self.cleaned_data)
         return resource
diff --git a/src/maasserver/forms/tests/test_bootresource.py b/src/maasserver/forms/tests/test_bootresource.py
index be7845a..5fb843f 100644
--- a/src/maasserver/forms/tests/test_bootresource.py
+++ b/src/maasserver/forms/tests/test_bootresource.py
@@ -8,6 +8,7 @@ __all__ = []
 import random
 
 from django.core.files.uploadedfile import SimpleUploadedFile
+from maasserver.clusterrpc import osystems
 from maasserver.enum import (
     BOOT_RESOURCE_FILE_TYPE,
     BOOT_RESOURCE_TYPE,
@@ -99,8 +100,11 @@ class TestBootResourceForm(MAASServerTestCase):
             written_content = stream.read()
         self.assertEqual(content, written_content)
 
-    def test_creates_boot_resoures_with_generated_rtype(self):
+    def test_creates_boot_resoures_with_uploaded_rtype(self):
         os = factory.make_name('os')
+        self.patch(
+            osystems, 'gen_all_known_operating_systems').return_value = [
+                {'name': os}]
         series = factory.make_name('series')
         name = '%s/%s' % (os, series)
         architecture = make_usable_architecture(self)
@@ -118,7 +122,7 @@ class TestBootResourceForm(MAASServerTestCase):
         self.assertTrue(form.is_valid(), form._errors)
         form.save()
         resource = BootResource.objects.get(
-            rtype=BOOT_RESOURCE_TYPE.GENERATED,
+            rtype=BOOT_RESOURCE_TYPE.UPLOADED,
             name=name, architecture=architecture)
         resource_set = resource.sets.first()
         rfile = resource_set.files.first()
@@ -131,6 +135,9 @@ class TestBootResourceForm(MAASServerTestCase):
 
     def test_adds_boot_resource_set_to_existing_generated_boot_resource(self):
         os = factory.make_name('os')
+        self.patch(
+            osystems, 'gen_all_known_operating_systems').return_value = [
+                {'name': os}]
         series = factory.make_name('series')
         name = '%s/%s' % (os, series)
         architecture = make_usable_architecture(self)
@@ -159,6 +166,42 @@ class TestBootResourceForm(MAASServerTestCase):
         with rfile.largefile.content.open('rb') as stream:
             written_content = stream.read()
         self.assertEqual(content, written_content)
+        self.assertEqual(resource.rtype, BOOT_RESOURCE_TYPE.UPLOADED)
+
+    def test_adds_boot_resource_set_to_existing_uploaded_boot_resource(self):
+        os = factory.make_name('os')
+        self.patch(
+            osystems, 'gen_all_known_operating_systems').return_value = [
+                {'name': os}]
+        series = factory.make_name('series')
+        name = '%s/%s' % (os, series)
+        architecture = make_usable_architecture(self)
+        resource = factory.make_usable_boot_resource(
+            rtype=BOOT_RESOURCE_TYPE.UPLOADED,
+            name=name, architecture=architecture)
+        upload_type, filetype = self.pick_filetype()
+        size = random.randint(1024, 2048)
+        content = factory.make_string(size).encode('utf-8')
+        upload_name = factory.make_name('filename')
+        uploaded_file = SimpleUploadedFile(content=content, name=upload_name)
+        data = {
+            'name': name,
+            'architecture': architecture,
+            'filetype': upload_type,
+            }
+        form = BootResourceForm(data=data, files={'content': uploaded_file})
+        self.assertTrue(form.is_valid(), form._errors)
+        form.save()
+        resource = reload_object(resource)
+        resource_set = resource.sets.order_by('id').last()
+        rfile = resource_set.files.first()
+        self.assertTrue(filetype, rfile.filetype)
+        self.assertTrue(filetype, rfile.filename)
+        self.assertTrue(size, rfile.largefile.total_size)
+        with rfile.largefile.content.open('rb') as stream:
+            written_content = stream.read()
+        self.assertEqual(content, written_content)
+        self.assertEqual(resource.rtype, BOOT_RESOURCE_TYPE.UPLOADED)
 
     def test_requires_fields(self):
         form = BootResourceForm(data={})
diff --git a/src/maasserver/models/bootresource.py b/src/maasserver/models/bootresource.py
index 905e675..5af3eee 100644
--- a/src/maasserver/models/bootresource.py
+++ b/src/maasserver/models/bootresource.py
@@ -187,6 +187,7 @@ class BootResourceManager(Manager):
                     rtypes = [
                         BOOT_RESOURCE_TYPE.SYNCED,
                         BOOT_RESOURCE_TYPE.GENERATED,
+                        BOOT_RESOURCE_TYPE.UPLOADED,
                     ]
                     name = '%s/%s' % (image['osystem'], image['release'])
                 else:
@@ -442,9 +443,17 @@ class BootResource(CleanSave, TimestampedModel):
         """
         if self.rtype == BOOT_RESOURCE_TYPE.UPLOADED:
             if '/' in self.name:
-                raise ValidationError(
-                    "%s boot resource cannot contain a '/' in it's name." % (
-                        self.display_rtype))
+                # Avoid circular dependency
+                from maasserver.clusterrpc.osystems import (
+                    gen_all_known_operating_systems,
+                )
+                osystem = self.name.split('/')[0]
+                if osystem not in {
+                        i['name'] for i in gen_all_known_operating_systems()}:
+                    raise ValidationError(
+                        "%s boot resource cannot contain a '/' in it's name "
+                        "unless it starts with a supported operating system."
+                        % (self.display_rtype))
         elif self.rtype in RTYPE_REQUIRING_OS_SERIES_NAME:
             if '/' not in self.name:
                 raise ValidationError(
diff --git a/src/maasserver/models/tests/test_bootresource.py b/src/maasserver/models/tests/test_bootresource.py
index 2efb4fc..59c3ac2 100644
--- a/src/maasserver/models/tests/test_bootresource.py
+++ b/src/maasserver/models/tests/test_bootresource.py
@@ -10,6 +10,7 @@ from datetime import datetime
 import random
 
 from django.core.exceptions import ValidationError
+from maasserver.clusterrpc import osystems
 from maasserver.clusterrpc.testing.boot_images import make_rpc_boot_image
 from maasserver.enum import (
     BOOT_RESOURCE_FILE_TYPE,
@@ -771,6 +772,26 @@ class TestBootResource(MAASServerTestCase):
         self.assertRaises(
             ValidationError, resource.save)
 
+    def test_validation_allows_any_uploaded_name_slash_with_supported_os(self):
+        osystem = factory.make_name('osystem')
+        self.patch(
+            osystems, 'gen_all_known_operating_systems').return_value = [
+                {'name': osystem}]
+        name = '%s/%s' % (osystem, factory.make_name('release'))
+        arch = '%s/%s' % (
+            factory.make_name('arch'), factory.make_name('subarch'))
+        resource = BootResource(
+            rtype=BOOT_RESOURCE_TYPE.UPLOADED, name=name, architecture=arch)
+        resource.save()
+
+    def test_validation_allows_any_uploaded_name_without_slash(self):
+        name = factory.make_name('name')
+        arch = '%s/%s' % (
+            factory.make_name('arch'), factory.make_name('subarch'))
+        resource = BootResource(
+            rtype=BOOT_RESOURCE_TYPE.UPLOADED, name=name, architecture=arch)
+        resource.save()
+
     def test_create_raises_error_on_not_unique(self):
         name = '%s/%s' % (
             factory.make_name('os'), factory.make_name('series'))
diff --git a/src/maasserver/tests/test_bootresources.py b/src/maasserver/tests/test_bootresources.py
index 135715b..3c860e8 100644
--- a/src/maasserver/tests/test_bootresources.py
+++ b/src/maasserver/tests/test_bootresources.py
@@ -200,11 +200,11 @@ class TestSimpleStreamsHandler(MAASServerTestCase):
 
     def get_product_name_for_resource(self, resource):
         arch, subarch = resource.architecture.split('/')
-        if resource.rtype == BOOT_RESOURCE_TYPE.UPLOADED:
+        if '/' in resource.name:
+            os, series = resource.name.split('/')
+        else:
             os = 'custom'
             series = resource.name
-        else:
-            os, series = resource.name.split('/')
         return 'maas:boot:%s:%s:%s:%s' % (os, arch, subarch, series)
 
     def make_usable_product_boot_resource(
diff --git a/src/maasserver/utils/osystems.py b/src/maasserver/utils/osystems.py
index d7ad380..2746d46 100644
--- a/src/maasserver/utils/osystems.py
+++ b/src/maasserver/utils/osystems.py
@@ -25,7 +25,6 @@ from distro_info import UbuntuDistroInfo
 from django.core.exceptions import ValidationError
 from django.db.models import Q
 from maasserver.clusterrpc.osystems import gen_all_known_operating_systems
-from maasserver.enum import BOOT_RESOURCE_TYPE
 from maasserver.models import (
     BootResource,
     BootSourceCache,
@@ -57,7 +56,7 @@ def list_osystem_choices(osystems, include_default=True):
         (osystem['name'], osystem['title'])
         for osystem in osystems
         ]
-    return choices
+    return sorted(list(set(choices)))
 
 
 def list_all_usable_releases(osystems):
@@ -75,11 +74,11 @@ def list_all_usable_releases(osystems):
             # When custom images are returned by list_all_usable_osystems
             # the osystem name is 'custom' and the release name to whatever
             # the user specified.
-            if resource.rtype == BOOT_RESOURCE_TYPE.UPLOADED:
+            if '/' in resource.name:
+                osystem, release = resource.name.split('/')
+            else:
                 osystem = 'custom'
                 release = resource.name
-            else:
-                osystem, release = resource.name.split('/')
             if osystem not in titles:
                 titles[osystem] = {}
             titles[osystem][release] = resource.extra['title']
diff --git a/src/maasserver/utils/tests/test_osystems.py b/src/maasserver/utils/tests/test_osystems.py
index e0d92a8..8ee6b92 100644
--- a/src/maasserver/utils/tests/test_osystems.py
+++ b/src/maasserver/utils/tests/test_osystems.py
@@ -10,6 +10,7 @@ import random
 
 from distro_info import UbuntuDistroInfo
 from django.core.exceptions import ValidationError
+from maasserver.clusterrpc import osystems
 from maasserver.clusterrpc.testing.osystems import (
     make_rpc_osystem,
     make_rpc_release,
@@ -95,6 +96,15 @@ class TestOsystems(MAASServerTestCase):
             [(osystem['name'], osystem['title'])],
             list_osystem_choices([osystem], include_default=False))
 
+    def test_list_osystem_choices_doesnt_duplicate(self):
+        self.assertEqual(
+            [('custom', 'Custom')],
+            list_osystem_choices(
+                [
+                    {'name': 'custom', 'title': 'Custom'},
+                    {'name': 'custom', 'title': 'Custom'},
+                ], include_default=False))
+
 
 class TestReleases(MAASServerTestCase):
 
@@ -145,6 +155,21 @@ class TestReleases(MAASServerTestCase):
             title,
             list_all_usable_releases([osystem])[osystem['name']][0]['title'])
 
+    def test_list_all_usable_releases_finds_uploaded_with_osystem(self):
+        release = make_rpc_release()
+        osystem = make_rpc_osystem(releases=[release])
+        title = factory.make_name('title')
+        self.patch(
+            osystems, 'gen_all_known_operating_systems').return_value = [
+                {'name': osystem['name']}]
+        factory.make_BootResource(
+            rtype=BOOT_RESOURCE_TYPE.UPLOADED,
+            name='%s/%s' % (osystem['name'], release['name']),
+            extra={'title': title})
+        self.assertEquals(
+            title,
+            list_all_usable_releases([osystem])[osystem['name']][0]['title'])
+
     def test_list_all_releases_requiring_keys(self):
         releases = [
             make_rpc_release(requires_license_key=True) for _ in range(3)]
diff --git a/src/provisioningserver/drivers/osystem/__init__.py b/src/provisioningserver/drivers/osystem/__init__.py
index bdf6ff8..93a9f4b 100644
--- a/src/provisioningserver/drivers/osystem/__init__.py
+++ b/src/provisioningserver/drivers/osystem/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2017 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Osystem Drivers."""
@@ -67,10 +67,6 @@ class OperatingSystem(metaclass=ABCMeta):
         """Title of the operating system."""
 
     @abstractmethod
-    def is_release_supported(self, release):
-        """Return True when the release is supported, False otherwise."""
-
-    @abstractmethod
     def get_default_release(self):
         """Return the default release to use when none is specified.
 
@@ -96,6 +92,11 @@ class OperatingSystem(metaclass=ABCMeta):
         :return: list of supported purposes
         """
 
+    def is_release_supported(self, release):
+        """Return True when the release is supported, False otherwise."""
+        # If the osystem matches assume all releases are supported.
+        return True
+
     def format_release_choices(self, releases):
         """Format the release choices that are presented to the user.
 
diff --git a/src/provisioningserver/drivers/osystem/bootloader.py b/src/provisioningserver/drivers/osystem/bootloader.py
index 6ada008..2811a82 100644
--- a/src/provisioningserver/drivers/osystem/bootloader.py
+++ b/src/provisioningserver/drivers/osystem/bootloader.py
@@ -18,10 +18,6 @@ class BootLoaderOS(OperatingSystem):
     name = 'bootloader'
     title = 'Bootloader'
 
-    def is_release_supported(self, release):
-        # All releases are supported, they're pulled from the Ubuntu archive.
-        return True
-
     def get_default_release(self):
         # No Default bootloader as it depends on the arch.
         return ''
diff --git a/src/provisioningserver/drivers/osystem/centos.py b/src/provisioningserver/drivers/osystem/centos.py
index aee813b..b9f2290 100644
--- a/src/provisioningserver/drivers/osystem/centos.py
+++ b/src/provisioningserver/drivers/osystem/centos.py
@@ -1,4 +1,4 @@
-# Copyright 2014-2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2017 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """CentOS Operating System."""
@@ -14,20 +14,20 @@ from provisioningserver.drivers.osystem import (
     OperatingSystem,
 )
 
-
-DISTRO_SERIES_DEFAULT = 'centos65'
-
-# Regex matcher that is used to check if the release is supported.
-# It needs to match the name "centosXY". Where "X" is the major version
-# and "Y" is the minor version.
-DISTRO_MATCHER = re.compile("centos(?P<major>[0-9])(?P<minor>[0-9])?\Z")
+# Regex matcher that is used to check if the release is supported. The release
+# name just has to start with 'centos' to be supported but the major, minor,
+# and title are found if available to help format the title.
+DISTRO_MATCHER = re.compile(
+    '^centos((?P<major>[0-9])(?P<minor>[0-9])?)?([\-\.]?(?P<title>.+))?$',
+    re.I)
+DISTRO_SERIES_DEFAULT = 'centos70'
 
 
 class CentOS(OperatingSystem):
     """CentOS operating system."""
 
-    name = "centos"
-    title = "CentOS"
+    name = 'centos'
+    title = 'CentOS'
 
     def get_boot_image_purposes(self, arch, subarch, release, label):
         """Gets the purpose of each boot image."""
@@ -35,11 +35,6 @@ class CentOS(OperatingSystem):
             BOOT_IMAGE_PURPOSE.XINSTALL
             ]
 
-    def is_release_supported(self, release):
-        """Return True when the release is supported, False otherwise."""
-        matched = DISTRO_MATCHER.match(release)
-        return matched is not None
-
     def get_default_release(self):
         """Gets the default release to use when a release is not
         explicit."""
@@ -49,10 +44,14 @@ class CentOS(OperatingSystem):
         """Return the title for the given release."""
         matched = DISTRO_MATCHER.match(release)
         if matched is None:
-            return None
-        matched_dict = matched.groupdict()
-        major = matched_dict['major']
-        minor = matched_dict['minor']
+            # This should never happen as is_release_supported will return
+            # false but just in case it does...
+            return "%s %s" % (self.title, release)
+
+        ret = self.title
+        major = matched.group('major')
+        minor = matched.group('minor')
+        title = matched.group('title')
         # MAAS provided images via streams are not bound to a minor
         # release version, which means we always provide the latest
         # available release from CentOS 6 and CentOS 7.  To address
@@ -65,9 +64,14 @@ class CentOS(OperatingSystem):
         # from the stream and the minor version doesn't match to what
         # we publish. As such, we ensure that we only return minor
         # if we have any other version other that X.0, 7.0 and 6.6.
-        if minor is None or minor == '0':
-            return "CentOS %s" % major
+        if major is not None and minor is None or minor == '0':
+            ret = "%s %s" % (ret, major)
         elif major == '6' and minor == '6':
-            return "CentOS %s" % major
-        else:
-            return "CentOS %s.%s" % (major, minor)
+            ret = "%s %s" % (ret, major)
+        elif None not in (major, minor):
+            ret = "%s %s.%s" % (ret, major, minor)
+
+        if title is not None:
+            ret = "%s %s" % (ret, title)
+
+        return ret
diff --git a/src/provisioningserver/drivers/osystem/custom.py b/src/provisioningserver/drivers/osystem/custom.py
index 6e817e1..845c132 100644
--- a/src/provisioningserver/drivers/osystem/custom.py
+++ b/src/provisioningserver/drivers/osystem/custom.py
@@ -27,11 +27,6 @@ class CustomOS(OperatingSystem):
         # Custom images can only be used with XINSTALL.
         return [BOOT_IMAGE_PURPOSE.XINSTALL]
 
-    def is_release_supported(self, release):
-        """Return True when the release is supported, False otherwise."""
-        # All release are supported, since the user uploaded it.
-        return True
-
     def get_default_release(self):
         """Gets the default release to use when a release is not
         explicit."""
diff --git a/src/provisioningserver/drivers/osystem/tests/test_base.py b/src/provisioningserver/drivers/osystem/tests/test_base.py
index 9c41dc4..1fa9ca1 100644
--- a/src/provisioningserver/drivers/osystem/tests/test_base.py
+++ b/src/provisioningserver/drivers/osystem/tests/test_base.py
@@ -1,4 +1,4 @@
-# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2017 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for `provisioningserver.drivers.osystem`."""
@@ -42,6 +42,15 @@ class TestOperatingSystem(MAASTestCase):
             osystem_module, 'list_boot_images_for').return_value = images
         return images
 
+    def test_is_release_supported(self):
+        osystem = self.make_usable_osystem()
+        releases = [factory.make_name('release') for _ in range(3)]
+        supported = [
+            osystem.is_release_supported(release)
+            for release in releases
+            ]
+        self.assertEqual([True, True, True], supported)
+
     def test_format_release_choices(self):
         osystem = self.make_usable_osystem()
         releases = osystem.get_supported_releases()
diff --git a/src/provisioningserver/drivers/osystem/tests/test_bootloader.py b/src/provisioningserver/drivers/osystem/tests/test_bootloader.py
index da0766e..9d89480 100644
--- a/src/provisioningserver/drivers/osystem/tests/test_bootloader.py
+++ b/src/provisioningserver/drivers/osystem/tests/test_bootloader.py
@@ -13,11 +13,6 @@ from provisioningserver.drivers.osystem.bootloader import BootLoaderOS
 
 class TestCustomOS(MAASTestCase):
 
-    def test_is_release_supported(self):
-        osystem = BootLoaderOS()
-        self.assertTrue(
-            osystem.is_release_supported(factory.make_name('release')))
-
     def test_get_default_release(self):
         osystem = BootLoaderOS()
         self.assertEquals("", osystem.get_default_release())
diff --git a/src/provisioningserver/drivers/osystem/tests/test_centos.py b/src/provisioningserver/drivers/osystem/tests/test_centos.py
index 8b3dbb6..92f8be7 100644
--- a/src/provisioningserver/drivers/osystem/tests/test_centos.py
+++ b/src/provisioningserver/drivers/osystem/tests/test_centos.py
@@ -1,4 +1,4 @@
-# Copyright 2014-2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2017 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for the CentOS module."""
@@ -34,21 +34,6 @@ class TestCentOS(MAASTestCase):
                 BOOT_IMAGE_PURPOSE.XINSTALL,
                 ])
 
-    def test_is_release_supported(self):
-        name_supported = {
-            "centos6": True,
-            "centos65": True,
-            "centos7": True,
-            "centos71": True,
-            "cent65": False,
-            "cent": False,
-            "centos711": False,
-            }
-        osystem = CentOS()
-        for name, supported in name_supported.items():
-            self.expectThat(
-                osystem.is_release_supported(name), Equals(supported))
-
     def test_get_default_release(self):
         osystem = CentOS()
         expected = osystem.get_default_release()
@@ -62,9 +47,10 @@ class TestCentOS(MAASTestCase):
             "centos7": "CentOS 7",
             "centos70": "CentOS 7",  # See LP: #1654063
             "centos71": "CentOS 7.1",
-            "cent65": None,
-            "cent": None,
-            "centos711": None,
+            "centos65": "CentOS 6.5",
+            "cent": "CentOS cent",
+            "centos711": "CentOS 7.1 1",
+            "centos71-custom": "CentOS 7.1 custom",
             }
         osystem = CentOS()
         for name, title in name_titles.items():
diff --git a/src/provisioningserver/drivers/osystem/tests/test_custom.py b/src/provisioningserver/drivers/osystem/tests/test_custom.py
index 1b7ff8e..80a6cce 100644
--- a/src/provisioningserver/drivers/osystem/tests/test_custom.py
+++ b/src/provisioningserver/drivers/osystem/tests/test_custom.py
@@ -51,15 +51,6 @@ class TestCustomOS(MAASTestCase):
                 BOOT_IMAGE_PURPOSE.XINSTALL,
                 ])
 
-    def test_is_release_supported(self):
-        osystem = CustomOS()
-        releases = [factory.make_name('release') for _ in range(3)]
-        supported = [
-            osystem.is_release_supported(release)
-            for release in releases
-            ]
-        self.assertEqual([True, True, True], supported)
-
     def test_get_default_release(self):
         osystem = CustomOS()
         self.assertEqual("", osystem.get_default_release())
diff --git a/src/provisioningserver/drivers/osystem/tests/test_ubuntu.py b/src/provisioningserver/drivers/osystem/tests/test_ubuntu.py
index d64faa9..f68f493 100644
--- a/src/provisioningserver/drivers/osystem/tests/test_ubuntu.py
+++ b/src/provisioningserver/drivers/osystem/tests/test_ubuntu.py
@@ -19,12 +19,7 @@ from provisioningserver.drivers.osystem.ubuntu import UbuntuOS
 class TestUbuntuOS(MAASTestCase):
 
     def get_lts_release(self):
-        # XXX ltrager 2016-04-06 - python3-distro-info won't set the latest lts
-        # to Xenial until its been released. So we can start testing MAAS 2.0
-        # with Xenial by default override it here. Once Xenial is released this
-        # can be removed
-        # return UbuntuDistroInfo().lts()
-        return "xenial"
+        return UbuntuDistroInfo().lts()
 
     def get_release_title(self, release):
         info = UbuntuDistroInfo()
@@ -51,6 +46,16 @@ class TestUbuntuOS(MAASTestCase):
                 BOOT_IMAGE_PURPOSE.DISKLESS,
                 ])
 
+    def test_is_release_supported(self):
+        osystem = UbuntuOS()
+        info = UbuntuDistroInfo()
+        self.assertTrue(osystem.is_release_supported(random.choice(info.all)))
+
+    def test_get_lts_release(self):
+        # Canary so we know when the lts changes
+        osystem = UbuntuOS()
+        self.assertEquals('xenial', osystem.get_lts_release())
+
     def test_get_default_release(self):
         osystem = UbuntuOS()
         expected = osystem.get_default_release()
diff --git a/src/provisioningserver/drivers/osystem/tests/test_ubuntucore.py b/src/provisioningserver/drivers/osystem/tests/test_ubuntucore.py
index 591a7bf..c01ee28 100644
--- a/src/provisioningserver/drivers/osystem/tests/test_ubuntucore.py
+++ b/src/provisioningserver/drivers/osystem/tests/test_ubuntucore.py
@@ -51,15 +51,6 @@ class TestUbuntuCoreOS(MAASTestCase):
                 BOOT_IMAGE_PURPOSE.XINSTALL,
                 ])
 
-    def test_is_release_supported(self):
-        osystem = UbuntuCoreOS()
-        releases = [factory.make_name('release') for _ in range(3)]
-        supported = [
-            osystem.is_release_supported(release)
-            for release in releases
-            ]
-        self.assertEqual([True, True, True], supported)
-
     def test_get_default_release(self):
         osystem = UbuntuCoreOS()
         self.assertEqual("16", osystem.get_default_release())
diff --git a/src/provisioningserver/drivers/osystem/ubuntu.py b/src/provisioningserver/drivers/osystem/ubuntu.py
index 7490465..dd8d243 100644
--- a/src/provisioningserver/drivers/osystem/ubuntu.py
+++ b/src/provisioningserver/drivers/osystem/ubuntu.py
@@ -42,15 +42,7 @@ class UbuntuOS(OperatingSystem):
 
     def get_lts_release(self):
         """Return the latest Ubuntu LTS release."""
-        lts_release = self.ubuntu_distro_info.lts()
-        # XXX ltrager 2016-04-06 - python3-distro-info won't set the latest lts
-        # to Xenial until its been released. So we can start testing MAAS 2.0
-        # with Xenial by default override it here. Once Xenial is released this
-        # can be removed
-        if lts_release == "trusty":
-            return "xenial"
-        else:
-            return lts_release
+        return self.ubuntu_distro_info.lts()
 
     def get_default_release(self):
         """Gets the default release to use when a release is not
diff --git a/src/provisioningserver/drivers/osystem/ubuntucore.py b/src/provisioningserver/drivers/osystem/ubuntucore.py
index 0a1ea45..1830da6 100644
--- a/src/provisioningserver/drivers/osystem/ubuntucore.py
+++ b/src/provisioningserver/drivers/osystem/ubuntucore.py
@@ -27,11 +27,6 @@ class UbuntuCoreOS(OperatingSystem):
         # Custom images can only be used with XINSTALL.
         return [BOOT_IMAGE_PURPOSE.XINSTALL]
 
-    def is_release_supported(self, release):
-        """Return True when the release is supported, False otherwise."""
-        # All release are supported, since the user uploaded it.
-        return True
-
     def get_default_release(self):
         """Gets the default release to use when a release is not
         explicit."""
diff --git a/src/provisioningserver/drivers/osystem/windows.py b/src/provisioningserver/drivers/osystem/windows.py
index a3bc514..ad7391d 100644
--- a/src/provisioningserver/drivers/osystem/windows.py
+++ b/src/provisioningserver/drivers/osystem/windows.py
@@ -55,10 +55,6 @@ class WindowsOS(OperatingSystem):
             purposes.append(BOOT_IMAGE_PURPOSE.INSTALL)
         return purposes
 
-    def is_release_supported(self, release):
-        """Return True when the release is supported, False otherwise."""
-        return release in WINDOWS_CHOICES
-
     def get_default_release(self):
         """Gets the default release to use when a release is not
         explicit."""
@@ -66,7 +62,7 @@ class WindowsOS(OperatingSystem):
 
     def get_release_title(self, release):
         """Return the title for the given release."""
-        return WINDOWS_CHOICES.get(release)
+        return WINDOWS_CHOICES.get(release, release)
 
     def requires_license_key(self, release):
         return release in REQUIRE_LICENSE_KEY
diff --git a/src/provisioningserver/testing/os.py b/src/provisioningserver/testing/os.py
index 5dd7538..9bc5626 100644
--- a/src/provisioningserver/testing/os.py
+++ b/src/provisioningserver/testing/os.py
@@ -34,9 +34,6 @@ class FakeOS(OperatingSystem):
     def get_boot_image_purposes(self, *args):
         return self.purpose
 
-    def is_release_supported(self, release):
-        return release in self.fake_list
-
     def get_supported_releases(self):
         return self.fake_list