Merge ~r00ta/maas:lp-2060687 into maas:master

[Jacopo Rota]

fix: lp-2060687. Ensure release scripts are Included for machines in DISK_ERASING status.

When a machine is released with the option to erase the disks, it has the DISK_ERASING status.
When the machine retrieves the scripts to run, all the release scripts should be included if the machine is in such status.

[Stamatis Katsaounis (skatsaounis)]

LGTM +1

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp-2060687 lp:~r00ta/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 73500b4b42cd3a9f1bbffa84d7b535f210912718

review: Approve

diff --git a/src/metadataserver/api.py b/src/metadataserver/api.py
index 35f9a9e..40696f7 100644
--- a/src/metadataserver/api.py
+++ b/src/metadataserver/api.py
@@ -1466,7 +1466,10 @@ class MAASScriptsHandler(OperationsHandler):
                         meta_data, key=itemgetter("name", "script_result_id")
                     )
 
-            if node.status == NODE_STATUS.RELEASING:
+            if (
+                node.status == NODE_STATUS.RELEASING
+                or node.status == NODE_STATUS.DISK_ERASING
+            ):
                 meta_data = self._add_script_set_to_tar(
                     node.current_release_script_set,
                     tar,
diff --git a/src/metadataserver/tests/test_api.py b/src/metadataserver/tests/test_api.py
index 89be8b0..6de3f30 100644
--- a/src/metadataserver/tests/test_api.py
+++ b/src/metadataserver/tests/test_api.py
@@ -2454,10 +2454,10 @@ class TestMAASScripts(MAASServerTestCase):
             meta_data,
         )
 
-    def test_returns_release_scripts_when_releasing(self):
+    def _test_release_scripts_are_returned(self, node_status: NODE_STATUS):
         start_time = floor(time.time())
         node = factory.make_Node(
-            status=NODE_STATUS.RELEASING, with_empty_script_sets=True
+            status=node_status, with_empty_script_sets=True
         )
 
         script = factory.make_Script(script_type=SCRIPT_TYPE.RELEASE)
@@ -2509,6 +2509,12 @@ class TestMAASScripts(MAASServerTestCase):
             meta_data,
         )
 
+    def test_returns_release_scripts_when_releasing(self):
+        self._test_release_scripts_are_returned(NODE_STATUS.RELEASING)
+
+    def test_returns_release_scripts_when_erasing_disks(self):
+        self._test_release_scripts_are_returned(NODE_STATUS.DISK_ERASING)
+
 
 class TestMAASScriptsProperties(MAASServerTestCase):
     def setUp(self):