Merge lp:~ltrager/maas/hwe_kernel_with_release into lp:~maas-committers/maas/trunk

[Lee Trager]

Display the release the hwe-kernel comes from in the UI

Display the release the hwe-kernel comes from in the UI. To find this information I first check the BootSourceCache, if it isn't found there I then check UbuntuDistroInfo from the distro_info package. We do have supported hwe-kernels from releases we no longer support. For example Precise has hwe-q but because Quantal is no longer in our simplestreams(due to it being EOL) we need to fall back on UbuntuDistroInfo to get our mapping. I made the hwe-kernel label 'hwe-kernel (release)' e.g 'hwe-v (vivid)' or 'hwe-t (trusty)'. If MAAS can't find a mapping it just displays the kernel e.g 'hwe-q' or 'hwe-r'.

[Gavin Panella (allenap)]

This all looks good except for the conspicuous absence of tests.

review: Needs Fixing

[Gavin Panella (allenap)]

The tests you've added look good (with one suggestion) but a few things are still untested.

review: Needs Fixing

[Lee Trager (ltrager)]

I've added more testing. Let me know if you think this needs anything else.

[Gavin Panella (allenap)]

Looks good, thanks doing those extra tests.

review: Approve

[Andres Rodriguez (andreserl)]

There's a tiny mistake in the branch, it is display HWE kernels as:

hwe-t (trusty)

instead of

trusty (hwe-t)

Please make this change in a following branch.

=== modified file 'src/maasserver/forms_settings.py'
--- src/maasserver/forms_settings.py	2015-10-23 17:53:22 +0000
+++ src/maasserver/forms_settings.py	2015-10-27 17:51:01 +0000
@@ -39,6 +39,7 @@
     list_all_usable_osystems,
     list_all_usable_releases,
     list_commissioning_choices,
+    list_hwe_kernel_choices,
     list_osystem_choices,
     release_a_newer_than_b,
 )
@@ -125,11 +126,11 @@
         'commissioning_distro_series')
     if commissioning_series:
         commissioning_os_release = "ubuntu/" + commissioning_series
-        kernel_choices += [
-            (kernel, kernel)
-            for kernel in BootResource.objects.get_usable_hwe_kernels(
-                commissioning_os_release)
-            if release_a_newer_than_b(kernel, commissioning_series)]
+        kernel_choices += list_hwe_kernel_choices(
+            [kernel
+             for kernel in BootResource.objects.get_usable_hwe_kernels(
+                 commissioning_os_release)
+             if release_a_newer_than_b(kernel, commissioning_series)])
     field = forms.ChoiceField(
         initial=Config.objects.get_config('default_min_hwe_kernel'),
         choices=kernel_choices,

=== modified file 'src/maasserver/static/js/angular/directives/os_select.js'
--- src/maasserver/static/js/angular/directives/os_select.js	2015-10-15 19:36:22 +0000
+++ src/maasserver/static/js/angular/directives/os_select.js	2015-10-27 17:51:01 +0000
@@ -20,7 +20,7 @@
         '<select name="hwe_kernel" data-ng-model="ngModel.hwe_kernel" ',
             'data-ng-show="hwe_kernels.length"',
             'data-ng-options="',
-            'hwe_kernel for hwe_kernel in hwe_kernels">',
+            'hwe_kernel[0] as hwe_kernel[1] for hwe_kernel in hwe_kernels">',
             '<option value="">Default kernel</option>',
         '</select>'
     ].join(''));

=== modified file 'src/maasserver/static/partials/node-details.html'
--- src/maasserver/static/partials/node-details.html	2015-10-26 11:46:36 +0000
+++ src/maasserver/static/partials/node-details.html	2015-10-27 17:51:01 +0000
@@ -183,7 +183,7 @@
                                 <select name="min_hwe_kernel" id="min_hwe_kernel" placeholder="No minimum kernel"
                                     data-ng-disabled="!summary.editing"
                                     data-ng-model="summary.min_hwe_kernel.selected"
-                                    data-ng-options="hwe_kernel for hwe_kernel in summary.min_hwe_kernel.options">
+                                    data-ng-options="hwe_kernel[0] as hwe_kernel[1] for hwe_kernel in summary.min_hwe_kernel.options">
                                     <option value="">No minimum kernel</option>
                                 </select>
                             </div>

=== modified file 'src/maasserver/tests/test_forms_commissioning.py'
--- src/maasserver/tests/test_forms_commissioning.py	2015-10-23 17:53:22 +0000
+++ src/maasserver/tests/test_forms_commissioning.py	2015-10-27 17:51:01 +0000
@@ -14,11 +14,16 @@
 __metaclass__ = type
 __all__ = []
 
+import random
+
+from distro_info import UbuntuDistroInfo
 from django.core.files.uploadedfile import SimpleUploadedFile
+from maasserver.enum import BOOT_RESOURCE_TYPE
 from maasserver.forms import (
     CommissioningForm,
     CommissioningScriptForm,
 )
+from maasserver.models import Config
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASServerTestCase
 from maasserver.utils.forms import compose_invalid_choice_text
@@ -44,6 +49,24 @@
                 'default_min_hwe_kernel', field.choices),
             field.error_messages['invalid_choice'])
 
+    def test_commissioningform_contains_real_and_ui_choice(self):
+        ubuntu_releases = UbuntuDistroInfo()
+        release = random.choice(ubuntu_releases.all).decode("utf-8")
+        name = 'ubuntu/%s' % release
+        kernel = 'hwe-' + release[0]
+        factory.make_usable_boot_resource(
+            name=name,
+            extra={'subarches': kernel},
+            rtype=BOOT_RESOURCE_TYPE.SYNCED)
+        Config.objects.set_config(
+            'commissioning_distro_series',
+            release)
+        form = CommissioningForm()
+        self.assertItemsEqual([
+            ('', '--- No minimum kernel ---'),
+            (kernel, '%s (%s)' % (kernel, release))],
+            form.fields['default_min_hwe_kernel'].choices)
+
 
 class TestCommissioningScriptForm(MAASServerTestCase):
 

=== modified file 'src/maasserver/utils/osystems.py'
--- src/maasserver/utils/osystems.py	2015-09-08 18:41:57 +0000
+++ src/maasserver/utils/osystems.py	2015-10-27 17:51:01 +0000
@@ -18,17 +18,23 @@
     'list_all_usable_osystems',
     'list_all_usable_releases',
     'list_all_usable_hwe_kernels',
+    'list_hwe_kernel_choices',
     'list_osystem_choices',
     'list_release_choices',
     'list_commissioning_choices',
+    'make_hwe_kernel_ui_text',
     'validate_hwe_kernel',
     ]
 
 from operator import itemgetter
 
+from distro_info import UbuntuDistroInfo
 from django.core.exceptions import ValidationError
 from maasserver.clusterrpc.osystems import gen_all_known_operating_systems
-from maasserver.models import BootResource
+from maasserver.models import (
+    BootResource,
+    BootSourceCache,
+)
 
 
 def list_all_usable_osystems():
@@ -76,13 +82,37 @@
             kernels[osystem] = {}
         for release in osystems:
             os_release = osystem + '/' + release['name']
-            kernels[osystem][release['name']] = sorted([
-                i for i in BootResource.objects.get_usable_hwe_kernels(
-                    os_release)
-                if release_a_newer_than_b(i, release['name'])])
+            kernels[osystem][release['name']] = list_hwe_kernel_choices(
+                sorted([
+                    i for i in BootResource.objects.get_usable_hwe_kernels(
+                        os_release)
+                    if release_a_newer_than_b(i, release['name'])]))
     return kernels
 
 
+def make_hwe_kernel_ui_text(hwe_kernel):
+    if not hwe_kernel:
+        return hwe_kernel
+    release_letter = hwe_kernel.replace('hwe-', '')
+    boot_sources = BootSourceCache.objects.filter(
+        release__startswith=release_letter,
+        subarch=hwe_kernel)
+    if len(boot_sources) > 0:
+        return "%s (%s)" % (hwe_kernel, boot_sources[0].release)
+    else:
+        ubuntu = UbuntuDistroInfo()
+        for release in ubuntu.all:
+            if release.startswith(release_letter):
+                return "%s (%s)" % (hwe_kernel, release)
+    return hwe_kernel
+
+
+def list_hwe_kernel_choices(hwe_kernels):
+    return [(hwe_kernel, make_hwe_kernel_ui_text(hwe_kernel))
+            for hwe_kernel in hwe_kernels
+            ]
+
+
 def list_all_releases_requiring_keys(osystems):
     """Return dictionary of OS name mapping to `releases` that require
     license keys."""

=== modified file 'src/maasserver/utils/tests/test_osystems.py'
--- src/maasserver/utils/tests/test_osystems.py	2015-09-08 18:41:57 +0000
+++ src/maasserver/utils/tests/test_osystems.py	2015-10-27 17:51:01 +0000
@@ -17,11 +17,13 @@
 from operator import itemgetter
 import random
 
+from distro_info import UbuntuDistroInfo
 from django.core.exceptions import ValidationError
 from maasserver.clusterrpc.testing.osystems import (
     make_rpc_osystem,
     make_rpc_release,
 )
+from maasserver.enum import BOOT_RESOURCE_TYPE
 from maasserver.models import BootResource
 from maasserver.testing.factory import factory
 from maasserver.testing.osystems import make_usable_osystem
@@ -36,6 +38,7 @@
     list_commissioning_choices,
     list_osystem_choices,
     list_release_choices,
+    make_hwe_kernel_ui_text,
     release_a_newer_than_b,
     validate_hwe_kernel,
     validate_osystem_and_distro_series,
@@ -260,6 +263,30 @@
             ]
         self.assertEqual(choices, list_commissioning_choices([osystem]))
 
+    def test_make_hwe_kernel_ui_text_finds_release_from_bootsourcecache(self):
+        ubuntu_releases = UbuntuDistroInfo()
+        release = random.choice(ubuntu_releases.all).decode("utf-8")
+        kernel = 'hwe-' + release[0]
+        factory.make_usable_boot_resource(
+            name="ubuntu/%s" % release,
+            extra={'subarches': kernel},
+            rtype=BOOT_RESOURCE_TYPE.SYNCED)
+        self.assertEqual(
+            '%s (%s)' % (kernel, release),
+            make_hwe_kernel_ui_text(kernel))
+
+    def test_make_hwe_kernel_ui_finds_release_from_ubuntudistroinfo(self):
+        self.assertEqual('hwe-t (trusty)', make_hwe_kernel_ui_text('hwe-t'))
+
+    def test_make_hwe_kernel_ui_returns_kernel_when_none_found(self):
+        # Since this is testing that our fall final fall back returns just the
+        # kernel name when the release isn't found in BootSourceCache or
+        # UbuntuDistroInfo we patch out UbuntuDistroInfo so nothing is found.
+        self.patch(UbuntuDistroInfo, 'all').value = []
+        self.assertEqual(
+            'hwe-m',
+            make_hwe_kernel_ui_text('hwe-m'))
+
 
 class TestValidateOsystemAndDistroSeries(MAASServerTestCase):
 

=== modified file 'src/maasserver/websockets/handlers/general.py'
--- src/maasserver/websockets/handlers/general.py	2015-10-23 17:53:22 +0000
+++ src/maasserver/websockets/handlers/general.py	2015-10-27 17:51:01 +0000
@@ -31,6 +31,7 @@
     list_all_usable_hwe_kernels,
     list_all_usable_osystems,
     list_all_usable_releases,
+    list_hwe_kernel_choices,
     list_osystem_choices,
     list_release_choices,
 )
@@ -60,7 +61,8 @@
 
     def hwe_kernels(self, params):
         """Return all supported hwe_kernels."""
-        return BootResource.objects.get_usable_hwe_kernels()
+        return list_hwe_kernel_choices(
+            BootResource.objects.get_usable_hwe_kernels())
 
     def default_min_hwe_kernel(self, params):
         """Return the default_min_hwe_kernel."""

=== modified file 'src/maasserver/websockets/handlers/node.py'
--- src/maasserver/websockets/handlers/node.py	2015-10-27 00:37:52 +0000
+++ src/maasserver/websockets/handlers/node.py	2015-10-27 17:51:01 +0000
@@ -73,6 +73,7 @@
     XMLToYAML,
 )
 from maasserver.utils.orm import transactional
+from maasserver.utils.osystems import make_hwe_kernel_ui_text
 from maasserver.utils.threads import deferToDatabase
 from maasserver.websockets.base import (
     HandlerDoesNotExistError,
@@ -276,7 +277,7 @@
             data["show_os_info"] = self.dehydrate_show_os_info(obj)
             data["osystem"] = obj.get_osystem()
             data["distro_series"] = obj.get_distro_series()
-            data["hwe_kernel"] = obj.hwe_kernel
+            data["hwe_kernel"] = make_hwe_kernel_ui_text(obj.hwe_kernel)
 
             # Network
             data["interfaces"] = [

=== modified file 'src/maasserver/websockets/handlers/tests/test_general.py'
--- src/maasserver/websockets/handlers/tests/test_general.py	2015-10-21 19:45:50 +0000
+++ src/maasserver/websockets/handlers/tests/test_general.py	2015-10-27 17:51:01 +0000
@@ -14,17 +14,21 @@
 __metaclass__ = type
 __all__ = []
 
+from distro_info import UbuntuDistroInfo
 from maasserver.enum import (
     BOND_LACP_RATE_CHOICES,
     BOND_MODE_CHOICES,
     BOND_XMIT_HASH_POLICY_CHOICES,
+    BOOT_RESOURCE_TYPE,
     NODE_PERMISSION,
 )
+from maasserver.models import BootSourceCache
 from maasserver.models.config import Config
 from maasserver.node_action import ACTIONS_DICT
 from maasserver.testing.factory import factory
 from maasserver.testing.osystems import make_osystem_with_releases
 from maasserver.testing.testcase import MAASServerTestCase
+from maasserver.utils.orm import post_commit_hooks
 from maasserver.websockets.handlers import general
 from maasserver.websockets.handlers.general import GeneralHandler
 from mock import sentinel
@@ -52,6 +56,45 @@
         handler = GeneralHandler(factory.make_User(), {})
         self.assertEquals(sorted(arches), handler.architectures({}))
 
+    def test_hwe_kernels(self):
+        ubuntu_releases = UbuntuDistroInfo()
+        expected_output = []
+        # Stub out the post commit tasks otherwise the test fails due to
+        # unrun post-commit tasks at the end of the test.
+        self.patch(BootSourceCache, "post_commit_do")
+        # Start with the first release MAAS supported. We do this
+        # because the lookup between hwe- kernel and release can fail
+        # when multiple releases start with the same letter. For
+        # example both warty(4.10) and wily(15.10) will have an hwe-w
+        # kernel. Because of this the mapping between kernel and
+        # release will pick the release which was downloaded
+        # first. Since precise no release has used the same first
+        # letter so we do not have this problem with supported
+        # releases.
+        for release in ubuntu_releases.all[
+                ubuntu_releases.all.index('precise'):]:
+            release = release.decode("utf-8")
+            kernel = 'hwe-' + release[0]
+            arch = factory.make_name('arch')
+            architecture = "%s/%s" % (arch, kernel)
+            factory.make_usable_boot_resource(
+                name="ubuntu/" + release,
+                extra={'subarches': kernel},
+                architecture=architecture,
+                rtype=BOOT_RESOURCE_TYPE.SYNCED)
+            # Force run the post commit tasks as we make new boot sources
+            with post_commit_hooks:
+                factory.make_BootSourceCache(
+                    os="ubuntu",
+                    arch=arch,
+                    subarch=kernel,
+                    release=release)
+            expected_output.append((kernel, '%s (%s)' % (kernel, release)))
+        handler = GeneralHandler(factory.make_User(), {})
+        self.assertItemsEqual(
+            sorted(expected_output, key=lambda choice: choice[0]),
+            sorted(handler.hwe_kernels({}), key=lambda choice: choice[0]))
+
     def test_osinfo(self):
         handler = GeneralHandler(factory.make_User(), {})
         osystem = make_osystem_with_releases(self)

=== modified file 'src/maasserver/websockets/handlers/tests/test_node.py'
--- src/maasserver/websockets/handlers/tests/test_node.py	2015-10-27 02:32:56 +0000
+++ src/maasserver/websockets/handlers/tests/test_node.py	2015-10-27 17:51:01 +0000
@@ -71,6 +71,7 @@
     get_one,
     transactional,
 )
+from maasserver.utils.osystems import make_hwe_kernel_ui_text
 from maasserver.utils.threads import deferToDatabase
 from maasserver.websockets.base import (
     HandlerDoesNotExistError,
@@ -171,7 +172,7 @@
                 for mac_address in node.get_extra_macs()
             ],
             "fqdn": node.fqdn,
-            "hwe_kernel": node.hwe_kernel,
+            "hwe_kernel": make_hwe_kernel_ui_text(node.hwe_kernel),
             "hostname": node.hostname,
             "id": node.id,
             "installation_results": handler.dehydrate_node_results(