Merge lp:~ltrager/maas/lp1654450_2.1 into lp:maas/2.1

[Lee Trager]

Backport r5629 from trunk: Only include real kernels when listing all usable kernels.

Each kernel lists all the other kernels supported in that release. For example hwe-16.04 lists hwe-{p,q,r,s,t,u,v,w} as it contains the support proved by all of those kernels. MAAS was filtering out the older versions however edge kernels also display the next kernel as they are a preview release.

[Lee Trager (ltrager)]

Reviewed in https://code.launchpad.net/~ltrager/maas/lp1654450/+merge/314195

review: Approve

=== modified file 'docs/changelog.rst'
--- docs/changelog.rst	2017-01-09 22:37:53 +0000
+++ docs/changelog.rst	2017-01-10 02:39:19 +0000
@@ -40,6 +40,7 @@
 
 LP: #1654432    Unable to deploy ga kernel on node-details page
 
+LP: #1654450    MAAS shouldn't show newer kernels when edge kernels are added
 
 2.1.2
 =====

=== modified file 'src/maasserver/models/bootresource.py'
--- src/maasserver/models/bootresource.py	2016-10-12 15:26:17 +0000
+++ src/maasserver/models/bootresource.py	2017-01-10 02:39:19 +0000
@@ -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).
 
 """Boot Resource."""
@@ -230,9 +230,10 @@
             return False
         return True
 
-    def get_usable_hwe_kernels(
-            self, name=None, architecture=None, kflavor=None):
-        """Return the set of usable kernels for architecture and release."""
+    def get_hwe_kernels(
+            self, name=None, architecture=None, kflavor=None,
+            include_subarches=False):
+        """Return the set of kernels."""
         from maasserver.utils.osystems import get_release_version_from_string
 
         if not name:
@@ -257,7 +258,7 @@
                     subarch_parts[1] = 'rolling'
                     kernels.add('-'.join(subarch_parts))
 
-            if "subarches" in resource.extra:
+            if include_subarches and "subarches" in resource.extra:
                 for subarch in resource.extra["subarches"].split(","):
                     if subarch.startswith("hwe-") or subarch.startswith("ga-"):
                         if kflavor is None:
@@ -277,6 +278,28 @@
         return sorted(
             kernels, key=lambda k: get_release_version_from_string(k))
 
+    def get_usable_hwe_kernels(
+            self, name=None, architecture=None, kflavor=None):
+        """Return the set of usable kernels for the given name, arch, kflavor.
+
+        Returns only the list of kernels which MAAS has downloaded. For example
+        if Trusty and Xenial have been downloaded this will return hwe-t,
+        ga-16.04, hwe-16.04, hwe-16.04-edge, hwe-16.04-lowlatency, and
+        hwe-16.04-lowlatency-edge."""
+        return self.get_hwe_kernels(name, architecture, kflavor, False)
+
+    def get_supported_hwe_kernels(
+            self, name=None, architecture=None, kflavor=None):
+        """Return the set of supported kernels for the given name, arch,
+        kflavor.
+
+        Returns the list of kernels downloaded by MAAS and the subarches each
+        of those kernels support. For example if Trusty and Xenial have been
+        downloaded this will return hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u,
+        hwe-v, hwe-w, ga-16.04, hwe-16.04, hwe-16.04-edge,
+        hwe-16.04-lowlatency, and hwe-16.04-lowlatency-edge."""
+        return self.get_hwe_kernels(name, architecture, kflavor, True)
+
     def get_kpackage_for_node(self, node):
         """Return the kernel package name for the kernel specified."""
         if not node.hwe_kernel:

=== modified file 'src/maasserver/models/tests/test_bootresource.py'
--- src/maasserver/models/tests/test_bootresource.py	2016-10-12 15:26:17 +0000
+++ src/maasserver/models/tests/test_bootresource.py	2017-01-10 02:39:19 +0000
@@ -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 `BootResource`."""
@@ -174,6 +174,21 @@
         self.assertItemsEqual(
             arches, usable_arches)
 
+    def test_get_usable_hwe_kernel_doesnt_include_all_subarches(self):
+        factory.make_usable_boot_resource(
+            architecture='amd64/hwe-16.04',
+            extra={'subarches': 'hwe-p,hwe-t,hwe-16.04,hwe-16.10'})
+        self.assertEquals(
+            ['hwe-16.04'], BootResource.objects.get_usable_hwe_kernels())
+
+    def test_get_supported_hwe_kernel_includes_all_subarches(self):
+        factory.make_usable_boot_resource(
+            architecture='amd64/hwe-16.04',
+            extra={'subarches': 'hwe-p,hwe-t,hwe-16.04,hwe-16.10'})
+        self.assertEquals(
+            ['hwe-p', 'hwe-t', 'hwe-16.04', 'hwe-16.10'],
+            BootResource.objects.get_supported_hwe_kernels())
+
     def test_get_commissionable_resource_returns_iterable(self):
         os = factory.make_name('os')
         series = factory.make_name('series')

=== modified file 'src/maasserver/tests/test_forms_commissioning.py'
--- src/maasserver/tests/test_forms_commissioning.py	2016-07-30 01:17:54 +0000
+++ src/maasserver/tests/test_forms_commissioning.py	2017-01-10 02:39:19 +0000
@@ -40,18 +40,18 @@
 
     def test_commissioningform_contains_real_and_ui_choice(self):
         release = factory.pick_ubuntu_release()
-        name = "ubuntu/" + release
+        name = 'ubuntu/%s' % release
+        arch = factory.make_name('arch')
         kernel = 'hwe-' + release[0]
         # Disable boot sources signals otherwise the test fails due to unrun
         # post-commit tasks at the end of the test.
-        self.useFixture(SignalsDisabled("bootsources"))
+        self.useFixture(SignalsDisabled('bootsources'))
         factory.make_BootSourceCache(
             os=name,
             subarch=kernel,
             release=release)
         factory.make_usable_boot_resource(
-            name=name,
-            extra={'subarches': kernel},
+            name=name, architecture='%s/%s' % (arch, kernel),
             rtype=BOOT_RESOURCE_TYPE.SYNCED)
         Config.objects.set_config(
             'commissioning_distro_series',

=== modified file 'src/maasserver/utils/osystems.py'
--- src/maasserver/utils/osystems.py	2016-10-03 16:27:26 +0000
+++ src/maasserver/utils/osystems.py	2017-01-10 02:39:19 +0000
@@ -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).
 """Utilities for working with operating systems."""
 
@@ -78,10 +78,8 @@
         for release in osystems:
             os_release = osystem + '/' + 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'])]))
+                sorted(BootResource.objects.get_usable_hwe_kernels(os_release))
+            )
     return kernels
 
 
@@ -473,7 +471,7 @@
     """Check that the min_hwe_kernel is avalible."""
     if not min_hwe_kernel or min_hwe_kernel == "":
         return ""
-    usable_kernels = BootResource.objects.get_usable_hwe_kernels()
+    usable_kernels = BootResource.objects.get_supported_hwe_kernels()
     if min_hwe_kernel not in usable_kernels:
         raise ValidationError('%s is not a usable kernel.' % min_hwe_kernel)
     else:

=== modified file 'src/maasserver/utils/tests/test_osystems.py'
--- src/maasserver/utils/tests/test_osystems.py	2016-10-03 16:27:26 +0000
+++ src/maasserver/utils/tests/test_osystems.py	2017-01-10 02:39:19 +0000
@@ -588,7 +588,7 @@
         kernel = factory.make_kernel_string(generic_only=True)
         self.patch(
             BootResource.objects,
-            'get_usable_hwe_kernels').return_value = (kernel,)
+            'get_supported_hwe_kernels').return_value = (kernel,)
         self.assertEquals(kernel, validate_min_hwe_kernel(kernel))
 
     def test_returns_empty_string_when_none(self):

=== modified file 'src/maasserver/websockets/handlers/general.py'
--- src/maasserver/websockets/handlers/general.py	2016-10-12 21:37:41 +0000
+++ src/maasserver/websockets/handlers/general.py	2017-01-10 02:39:19 +0000
@@ -1,4 +1,4 @@
-# Copyright 2015-2016 Canonical Ltd.  This software is licensed under the
+# Copyright 2015-2017 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """The general handler for the WebSocket connection."""
@@ -86,7 +86,7 @@
         the flavor during deployment.
         """
         return list_hwe_kernel_choices(
-            BootResource.objects.get_usable_hwe_kernels()
+            BootResource.objects.get_supported_hwe_kernels()
         )
 
     def default_min_hwe_kernel(self, params):