Merge ~cgrabowski/maas:backport_lp2033632_fix_3.3 into maas:3.3

[Christian Grabowski]

Fix lp bug 2033632
https://bugs.launchpad.net/maas/+bug/2033632
(cherry picked from commit 147ce845b0575adf944eccafff804caf0bdd876e)

[Christian Grabowski (cgrabowski)]

self-approving backport

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b backport_lp2033632_fix_3.3 lp:~cgrabowski/maas/+git/maas into -b 3.3 lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas-tester/5330/console

61475a1... by Christian Grabowski on 2024-04-22

fix ephemeral deploy reference

[MAAS Lander (maas-lander)]

UNIT TESTS
-b backport_lp2033632_fix_3.3 lp:~cgrabowski/maas/+git/maas into -b 3.3 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/5333/console
COMMIT: 2f5a540af1a007261b4f717f954f8d4ee81a13c8

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b backport_lp2033632_fix_3.3 lp:~cgrabowski/maas/+git/maas into -b 3.3 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/5334/console
COMMIT: 1b223b7c9adacd9246719186e95ce73dae79d909

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b backport_lp2033632_fix_3.3 lp:~cgrabowski/maas/+git/maas into -b 3.3 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/5338/console
COMMIT: fc495fb8a8f42fb15d21fe209166ee079200436b

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b backport_lp2033632_fix_3.3 lp:~cgrabowski/maas/+git/maas into -b 3.3 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/5339/console
COMMIT: 61475a132807281279bea3fdf532e5db553aea06

review: Needs Fixing

[Christian Grabowski (cgrabowski)]

jenkins: !test

[MAAS Lander (maas-lander)]

UNIT TESTS
-b backport_lp2033632_fix_3.3 lp:~cgrabowski/maas/+git/maas into -b 3.3 lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 61475a132807281279bea3fdf532e5db553aea06

review: Approve

diff --git a/src/maasserver/api/machines.py b/src/maasserver/api/machines.py
index 3f9b55e..6ce47cb 100644
--- a/src/maasserver/api/machines.py
+++ b/src/maasserver/api/machines.py
@@ -123,6 +123,8 @@ DISPLAYED_MACHINE_FIELDS = (
     "description",
     "hardware_uuid",
     "domain",
+    "ephemeral_deploy",
+    "enable_hw_sync",
     "fqdn",
     "owner",
     "owner_data",
@@ -849,24 +851,19 @@ class MachineHandler(NodeHandler, WorkloadAnnotationsMixin, PowerMixin):
                     NODE_STATUS_CHOICES_DICT[machine.status]
                 )
             )
-        if not machine.distro_series and not series:
+
+        if not series:
             series = Config.objects.get_config("default_distro_series")
         Form = get_machine_edit_form(request.user)
         form = Form(instance=machine, data={})
-        if series is not None:
-            form.set_distro_series(series=series)
+        form.set_distro_series(series=series)
         if license_key is not None:
             form.set_license_key(license_key=license_key)
         if hwe_kernel is not None:
             form.set_hwe_kernel(hwe_kernel=hwe_kernel)
-        if options.install_rackd:
-            form.set_install_rackd(install_rackd=options.install_rackd)
-        if options.ephemeral_deploy:
-            form.set_ephemeral_deploy(
-                ephemeral_deploy=options.ephemeral_deploy
-            )
-        if options.enable_hw_sync:
-            form.set_enable_hw_sync(enable_hw_sync=options.enable_hw_sync)
+        form.set_install_rackd(install_rackd=options.install_rackd)
+        form.set_ephemeral_deploy(ephemeral_deploy=options.ephemeral_deploy)
+        form.set_enable_hw_sync(enable_hw_sync=options.enable_hw_sync)
         if form.is_valid():
             form.save()
         else:
diff --git a/src/maasserver/api/tests/test_enlistment.py b/src/maasserver/api/tests/test_enlistment.py
index fe5f429..db6e0d5 100644
--- a/src/maasserver/api/tests/test_enlistment.py
+++ b/src/maasserver/api/tests/test_enlistment.py
@@ -684,6 +684,8 @@ class TestSimpleUserLoggedInEnlistmentAPI(APITestCase.ForUser):
                 "hardware_uuid",
                 "default_gateways",
                 "domain",
+                "ephemeral_deploy",
+                "enable_hw_sync",
                 "fqdn",
                 "owner",
                 "owner_data",
@@ -909,6 +911,8 @@ class TestAdminLoggedInEnlistmentAPI(APITestCase.ForAdmin):
                 "hardware_uuid",
                 "default_gateways",
                 "domain",
+                "ephemeral_deploy",
+                "enable_hw_sync",
                 "fqdn",
                 "owner",
                 "owner_data",
diff --git a/src/maasserver/api/tests/test_machine.py b/src/maasserver/api/tests/test_machine.py
index 459f1a2..c0cd15f 100644
--- a/src/maasserver/api/tests/test_machine.py
+++ b/src/maasserver/api/tests/test_machine.py
@@ -1403,6 +1403,112 @@ class TestMachineAPI(APITestCase.ForUser):
         machine.refresh_from_db()
         self.assertTrue(machine.enable_hw_sync)
 
+    def test_POST_multiple_deploy_override_options_ephemeral_deploy(self):
+        self.patch(node_module.Node, "_start")
+        self.patch(machines_module, "get_curtin_merged_config")
+        osystem = Config.objects.get_config("default_osystem")
+        distro_series = Config.objects.get_config("default_distro_series")
+        make_usable_osystem(
+            self, osystem_name=osystem, releases=[distro_series]
+        )
+        machine = factory.make_Node(
+            owner=self.user,
+            interface=True,
+            status=NODE_STATUS.ALLOCATED,
+            power_type="manual",
+            distro_series=distro_series,
+            osystem=osystem,
+            architecture=make_usable_architecture(self),
+        )
+
+        response = self.client.post(
+            self.get_machine_uri(machine),
+            {"op": "deploy", "ephemeral_deploy": True},
+        )
+        self.assertEqual(http.client.OK, response.status_code)
+        response_info = json_load_bytes(response.content)
+        self.assertTrue(response_info["ephemeral_deploy"])
+
+        response = self.client.post(
+            self.get_machine_uri(machine), {"op": "deploy"}
+        )
+        self.assertEqual(http.client.OK, response.status_code)
+        response_info = json_load_bytes(response.content)
+        self.assertFalse(response_info["ephemeral_deploy"])
+
+    def test_POST_multiple_deploy_override_options_hw_sync(self):
+        self.patch(node_module.Node, "_start")
+        self.patch(machines_module, "get_curtin_merged_config")
+        osystem = Config.objects.get_config("default_osystem")
+        distro_series = Config.objects.get_config("default_distro_series")
+        make_usable_osystem(
+            self, osystem_name=osystem, releases=[distro_series]
+        )
+        machine = factory.make_Node(
+            owner=self.user,
+            interface=True,
+            status=NODE_STATUS.ALLOCATED,
+            power_type="manual",
+            distro_series=distro_series,
+            osystem=osystem,
+            architecture=make_usable_architecture(self),
+        )
+
+        response = self.client.post(
+            self.get_machine_uri(machine),
+            {"op": "deploy", "enable_hw_sync": True},
+        )
+        self.assertEqual(http.client.OK, response.status_code)
+        response_info = json_load_bytes(response.content)
+        self.assertTrue(response_info["enable_hw_sync"])
+
+        response = self.client.post(
+            self.get_machine_uri(machine), {"op": "deploy"}
+        )
+        self.assertEqual(http.client.OK, response.status_code)
+        response_info = json_load_bytes(response.content)
+        self.assertFalse(response_info["enable_hw_sync"])
+
+    def test_POST_multiple_deploy_override_options_distro_series(self):
+        self.patch(node_module.Node, "_start")
+        self.patch(machines_module, "get_curtin_merged_config")
+        osystem = Config.objects.get_config("default_osystem")
+        os = make_usable_osystem(self)
+        releases = [release["name"] for release in os.get("releases", [])]
+        default_distro_series = Config.objects.get_config(
+            "default_distro_series"
+        )
+        distro_series = (
+            releases[0]
+            if releases[0] != default_distro_series
+            else releases[1]
+        )
+
+        machine = factory.make_Node(
+            owner=self.user,
+            interface=True,
+            status=NODE_STATUS.ALLOCATED,
+            power_type="manual",
+            distro_series=distro_series,
+            osystem=osystem,
+            architecture=make_usable_architecture(self),
+        )
+
+        response = self.client.post(
+            self.get_machine_uri(machine),
+            {"op": "deploy", "distro_series": distro_series},
+        )
+        self.assertEqual(http.client.OK, response.status_code)
+        response_info = json_load_bytes(response.content)
+        self.assertEqual(response_info["distro_series"], distro_series)
+
+        response = self.client.post(
+            self.get_machine_uri(machine), {"op": "deploy"}
+        )
+        self.assertEqual(http.client.OK, response.status_code)
+        response_info = json_load_bytes(response.content)
+        self.assertEqual(response_info["distro_series"], default_distro_series)
+
     def test_POST_release_releases_owned_machine(self):
         self.patch(node_module.Machine, "_stop")
         owned_statuses = [NODE_STATUS.RESERVED, NODE_STATUS.ALLOCATED]