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

[Lee Trager]

Backport r5631 from trunk: Properly set the kflavor when validating an edge kernel.

[Lee Trager (ltrager)]

Reviewed in https://code.launchpad.net/~ltrager/maas/lp1654412/+merge/314192

review: Approve

=== modified file 'docs/changelog.rst'
--- docs/changelog.rst	2017-01-10 02:36:23 +0000
+++ docs/changelog.rst	2017-01-10 17:59:22 +0000
@@ -42,6 +42,8 @@
 
 LP: #1654450    MAAS shouldn't show newer kernels when edge kernels are added
 
+LP: #1654412	Unable to set edge kernel as the min_hwe_kernel and deploy with the default kernel
+
 2.1.2
 =====
 

=== modified file 'src/maasserver/utils/osystems.py'
--- src/maasserver/utils/osystems.py	2017-01-10 02:36:23 +0000
+++ src/maasserver/utils/osystems.py	2017-01-10 17:59:22 +0000
@@ -446,11 +446,15 @@
                 (hwe_kernel, min_hwe_kernel))
         return hwe_kernel
     elif(min_hwe_kernel and validate_kernel_str(min_hwe_kernel)):
-        kernel_parts = min_hwe_kernel.split('-')
-        if len(kernel_parts) == 2:
-            kflavor = 'generic'
-        else:
-            kflavor = kernel_parts[2]
+        # Determine what kflavor is being used by check against a list of
+        # known kflavors.
+        valid_kflavors = {
+            br.kflavor for br in BootResource.objects.exclude(kflavor=None)}
+        kflavor = 'generic'
+        for kernel_part in min_hwe_kernel.split('-'):
+            if kernel_part in valid_kflavors:
+                kflavor = kernel_part
+                break
         usable_kernels = BootResource.objects.get_usable_hwe_kernels(
             os_release, arch, kflavor)
         for i in usable_kernels:

=== modified file 'src/maasserver/utils/tests/test_osystems.py'
--- src/maasserver/utils/tests/test_osystems.py	2017-01-10 02:36:23 +0000
+++ src/maasserver/utils/tests/test_osystems.py	2017-01-10 17:59:22 +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 `maasserver.utils.osystems`."""
@@ -41,7 +41,10 @@
     validate_min_hwe_kernel,
     validate_osystem_and_distro_series,
 )
-from maastesting.matchers import MockAnyCall
+from maastesting.matchers import (
+    MockAnyCall,
+    MockCalledOnceWith,
+)
 
 
 class TestOsystems(MAASServerTestCase):
@@ -581,6 +584,22 @@
             mock_get_config, MockAnyCall('commissioning_distro_series'))
         self.assertEqual('hwe-v', kernel)
 
+    def test_validate_hwe_kern_sets_hwe_kern_to_min_hwe_kern_for_edge(self):
+        # Regression test for LP:1654412
+        mock_get_usable_hwe_kernels = self.patch(
+            BootResource.objects, 'get_usable_hwe_kernels')
+        mock_get_usable_hwe_kernels.return_value = (
+            'hwe-16.04', 'hwe-16.04-edge')
+        arch = factory.make_name('arch')
+
+        kernel = validate_hwe_kernel(
+            None, 'hwe-16.04-edge', '%s/generic' % arch, 'ubuntu', 'xenial')
+
+        self.assertEquals('hwe-16.04-edge', kernel)
+        self.assertThat(
+            mock_get_usable_hwe_kernels,
+            MockCalledOnceWith('ubuntu/xenial', arch, 'generic'))
+
 
 class TestValidateMinHweKernel(MAASServerTestCase):