Merge ~ltrager/maas:lp1749210_2.3 into maas:2.3

[Lee Trager]

Backport of 03beeaf LP:1749210 - Boot ephemeral environment when status is RESCUE_MODE

[Lee Trager (ltrager)]

Approved in https://code.launchpad.net/~ltrager/maas/+git/maas/+merge/345738

review: Approve

diff --git a/src/maasserver/node_status.py b/src/maasserver/node_status.py
index fd05b12..0c56527 100644
--- a/src/maasserver/node_status.py
+++ b/src/maasserver/node_status.py
@@ -310,6 +310,7 @@ COMMISSIONING_LIKE_STATUSES = [
     NODE_STATUS.COMMISSIONING,
     NODE_STATUS.DISK_ERASING,
     NODE_STATUS.ENTERING_RESCUE_MODE,
+    NODE_STATUS.RESCUE_MODE,
     NODE_STATUS.TESTING,
 ]
 
diff --git a/src/maasserver/rpc/boot.py b/src/maasserver/rpc/boot.py
index 56bc51f..3e427f9 100644
--- a/src/maasserver/rpc/boot.py
+++ b/src/maasserver/rpc/boot.py
@@ -243,8 +243,9 @@ def get_config(
         purpose = machine.get_boot_purpose()
 
         # Log the request into the event log for that machine.
-        if (machine.status == NODE_STATUS.ENTERING_RESCUE_MODE and
-                purpose == 'commissioning'):
+        if (machine.status in [
+                NODE_STATUS.ENTERING_RESCUE_MODE,
+                NODE_STATUS.RESCUE_MODE] and purpose == 'commissioning'):
             event_log_pxe_request(machine, 'rescue')
         else:
             event_log_pxe_request(machine, purpose)
diff --git a/src/maasserver/rpc/tests/test_boot.py b/src/maasserver/rpc/tests/test_boot.py
index 17898db..3bcc343 100644
--- a/src/maasserver/rpc/tests/test_boot.py
+++ b/src/maasserver/rpc/tests/test_boot.py
@@ -429,6 +429,20 @@ class TestGetConfig(MAASServerTestCase):
         self.assertThat(
             event_log_pxe_request, MockCalledOnceWith(node, 'rescue'))
 
+    def test__uses_rescue_mode_reboot_purpose(self):
+        # Regression test for LP:1749210
+        rack_controller = factory.make_RackController()
+        local_ip = factory.make_ip_address()
+        remote_ip = factory.make_ip_address()
+        node = self.make_node(status=NODE_STATUS.RESCUE_MODE)
+        mac = node.get_boot_interface().mac_address
+        event_log_pxe_request = self.patch_autospec(
+            boot_module, 'event_log_pxe_request')
+        get_config(
+            rack_controller.system_id, local_ip, remote_ip, mac=mac)
+        self.assertThat(
+            event_log_pxe_request, MockCalledOnceWith(node, 'rescue'))
+
     def test__calls_event_log_pxe_request(self):
         rack_controller = factory.make_RackController()
         local_ip = factory.make_ip_address()