Merge ~lloydwaltersj/maas:commissioning-kernel-resets-default into maas:master

[Jack Lloyd-Walters]

prevent commissioning from enforcing MAAS-wide kernel default

b401e25... by Jack Lloyd-Walters on 2022-07-01

fix spelling mistake

8153f22... by Jack Lloyd-Walters on 2022-07-01

replace ternary operation to improve clarity

[MAAS Lander (maas-lander)]

UNIT TESTS
-b commissioning-kernel-resets-default lp:~lloydwaltersj/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: b401e25913450c932b64498ae1d57861bde70f87

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b commissioning-kernel-resets-default lp:~lloydwaltersj/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 8153f222043941176866e44e4ba8335f51ce95bf

review: Approve

[Alexsander de Souza (alexsander-souza)]

+1

review: Approve

diff --git a/src/maasserver/models/node.py b/src/maasserver/models/node.py
index 5cf2deb..f2ccae3 100644
--- a/src/maasserver/models/node.py
+++ b/src/maasserver/models/node.py
@@ -2341,10 +2341,12 @@ class Node(CleanSave, TimestampedModel):
         old_status = self.update_status(NODE_STATUS.COMMISSIONING)
         self.owner = user
 
-        # Set min_hwe_kernel to default_min_hwe_kernel.
-        # This makes sure that the min_hwe_kernel is up to date
-        # with what is stored in the settings.
-        self.min_hwe_kernel = config["default_min_hwe_kernel"]
+        # Set to default_min_hwe_kernel if min_hwe_kernel not given, and
+        # default_min_hwe_kernel is defined. Should ensure that set kernels
+        # are respected on commission, while still allowing the MAAS-wide
+        # defaults to be set.
+        if not self.min_hwe_kernel and config["default_min_hwe_kernel"]:
+            self.min_hwe_kernel = config["default_min_hwe_kernel"]
         self.save()
 
         try:
diff --git a/src/maasserver/models/tests/test_node.py b/src/maasserver/models/tests/test_node.py
index 4a607d8..714d078 100644
--- a/src/maasserver/models/tests/test_node.py
+++ b/src/maasserver/models/tests/test_node.py
@@ -3442,6 +3442,21 @@ class TestNode(MAASServerTestCase):
         Config.objects.set_config("default_min_hwe_kernel", "hwe-16.04")
         node.start_commissioning(admin)
         post_commit_hooks.reset()  # Ignore these for now.
+        self.assertEqual("ga-16.04", node.min_hwe_kernel)
+
+    def test_start_commissioning_sets_min_hwe_kernel_when_default_set(self):
+        node = factory.make_Node(status=NODE_STATUS.NEW)
+        node_start = self.patch(node, "_start")
+        node_start.side_effect = lambda *args, **kwargs: post_commit()
+        user_data = factory.make_string().encode("ascii")
+        generate_user_data_for_status = self.patch(
+            node_module, "generate_user_data_for_status"
+        )
+        generate_user_data_for_status.return_value = user_data
+        admin = factory.make_admin()
+        Config.objects.set_config("default_min_hwe_kernel", "hwe-16.04")
+        node.start_commissioning(admin)
+        post_commit_hooks.reset()  # Ignore these for now.
         self.assertEqual("hwe-16.04", node.min_hwe_kernel)
 
     def test_start_commissioning_starts_node_if_already_on(self):