Merge ~troyanov/maas:backport-147ce84-3.5 into maas:3.5

[Anton Troyanov]

Fix lp bug 2033632
https://bugs.launchpad.net/maas/+bug/2033632

(cherry picked from commit 147ce845b0575adf944eccafff804caf0bdd876e)

[Anton Troyanov (troyanov)]

Self approving backport

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b backport-147ce84-3.5 lp:~troyanov/maas/+git/maas into -b 3.5 lp:~maas-committers/maas

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

[MAAS Lander (maas-lander)]

UNIT TESTS
-b backport-147ce84-3.5 lp:~troyanov/maas/+git/maas into -b 3.5 lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: f715ebf83d50464921f6571e89fd1eaf6ad479bf

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b backport-147ce84-3.5 lp:~troyanov/maas/+git/maas into -b 3.5 lp:~maas-committers/maas

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

diff --git a/src/maasserver/api/machines.py b/src/maasserver/api/machines.py
index 6a2c152..255bbe3 100644
--- a/src/maasserver/api/machines.py
+++ b/src/maasserver/api/machines.py
@@ -852,21 +852,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)
+        form.set_install_rackd(install_rackd=options.install_rackd)
         form.set_ephemeral_deploy(ephemeral_deploy=ephemeral_deploy)
-        if options.enable_hw_sync:
-            form.set_enable_hw_sync(enable_hw_sync=options.enable_hw_sync)
+        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_machine.py b/src/maasserver/api/tests/test_machine.py
index be86cb1..caeb5fa 100644
--- a/src/maasserver/api/tests/test_machine.py
+++ b/src/maasserver/api/tests/test_machine.py
@@ -1427,6 +1427,111 @@ 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")
+        _, releases = make_usable_osystem(self)
+        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]