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

[Lee Trager]

Validate the min_hwe_kernel on enlistment.

[Данило Шеган (danilo)]

Thanks Lee for working on this: it generally looks good, but since I am not well versed in all the concepts, can you please respond to my question inline?

review: Needs Information

[Lee Trager (ltrager)]

Thanks for the review. I've updated the patch to clean up the code a little and add a comment to try and explain as well as responded inline.

[Данило Шеган (danilo)]

Looks good, thanks for the explanations!

(a few minor nits inline)

review: Approve

[Lee Trager (ltrager)]

Thanks for the suggestions, I've updated and added another test as suggested.

=== modified file 'src/maasserver/rpc/boot.py'
--- src/maasserver/rpc/boot.py	2017-04-26 13:44:20 +0000
+++ src/maasserver/rpc/boot.py	2017-06-01 06:16:36 +0000
@@ -1,4 +1,4 @@
-# Copyright 2016 Canonical Ltd.  This software is licensed under the
+# Copyright 2016-2017 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """RPC helpers for getting the configuration for a booting machine."""
@@ -269,11 +269,22 @@
                 arch = DEFAULT_ARCH
             else:
                 arch, _ = resource.split_arch()
+        # The subarch defines what kernel is booted. With MAAS 2.1 this changed
+        # from hwe-<letter> to hwe-<version> or ga-<version>. Validation
+        # converts between the two formats to make sure a bootable subarch is
+        # selected.
         if subarch is None:
-            if min_hwe_kernel:
-                subarch = min_hwe_kernel
-            else:
-                subarch = 'generic'
+            min_hwe_kernel = validate_hwe_kernel(
+                None, min_hwe_kernel, '%s/generic' % arch, osystem, series)
+        else:
+            min_hwe_kernel = validate_hwe_kernel(
+                None, min_hwe_kernel, '%s/%s' % (arch, subarch), osystem,
+                series)
+        # If no hwe_kernel was found set the subarch to the default, 'generic.'
+        if min_hwe_kernel is None:
+            subarch = 'generic'
+        else:
+            subarch = min_hwe_kernel
 
         # Global kernel options for enlistment.
         extra_kernel_opts = Config.objects.get_config("kernel_opts")
 
=== modified file 'src/maasserver/rpc/tests/test_boot.py'
--- src/maasserver/rpc/tests/test_boot.py	2017-04-26 13:44:20 +0000
+++ src/maasserver/rpc/tests/test_boot.py	2017-06-01 06:16:36 +0000
@@ -1,4 +1,4 @@
-# Copyright 2016 Canonical Ltd.  This software is licensed under the
+# Copyright 2016-2017 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for boot configuration retrieval from RPC."""
@@ -149,7 +149,7 @@
         remote_ip = factory.make_ip_address()
         expected_arch = tuple(
             make_usable_architecture(
-                self, arch_name="i386", subarch_name="generic").split("/"))
+                self, arch_name="i386", subarch_name="hwe-16.04").split("/"))
         observed_config = get_config(
             rack_controller.system_id, local_ip, remote_ip)
         observed_arch = observed_config["arch"], observed_config["subarch"]
@@ -209,14 +209,26 @@
         local_ip = factory.make_ip_address()
         remote_ip = factory.make_ip_address()
         arch = 'armhf'
-        Config.objects.set_config('default_min_hwe_kernel', 'hwe-v')
-        self.patch(boot_module, 'get_boot_filenames').return_value = (
-            None, None, None)
-        observed_config = get_config(
-            rack_controller.system_id, local_ip, remote_ip, arch=arch)
-        self.assertEqual(
-            "hwe-v",
-            observed_config["subarch"])
+        Config.objects.set_config('default_min_hwe_kernel', 'hwe-x')
+        self.patch(boot_module, 'get_boot_filenames').return_value = (
+            None, None, None)
+        factory.make_default_ubuntu_release_bootable(arch)
+        observed_config = get_config(
+            rack_controller.system_id, local_ip, remote_ip, arch=arch)
+        self.assertEqual('hwe-16.04', observed_config['subarch'])
+
+    def test__enlistment_return_generic_when_none(self):
+        rack_controller = factory.make_RackController()
+        local_ip = factory.make_ip_address()
+        remote_ip = factory.make_ip_address()
+        arch = 'armhf'
+        self.patch(boot_module, 'get_boot_filenames').return_value = (
+            None, None, None)
+        self.patch(boot_module, 'validate_hwe_kernel').return_value = None
+        factory.make_default_ubuntu_release_bootable(arch)
+        observed_config = get_config(
+            rack_controller.system_id, local_ip, remote_ip, arch=arch)
+        self.assertEqual('generic', observed_config['subarch'])
 
     def test__has_preseed_url_for_known_node(self):
         rack_controller = factory.make_RackController()