Merge ~andreserl/maas:lp1707850 into maas:master

[Andres Rodriguez]

LP: #1707850 - MAAS doesn't report cloud-init failures post-deployment

[Mike Pontillo (mpontillo)]

Looks good.

review: Approve

diff --git a/src/metadataserver/api.py b/src/metadataserver/api.py
index 02c02b6..a7473da 100644
--- a/src/metadataserver/api.py
+++ b/src/metadataserver/api.py
@@ -188,6 +188,8 @@ def add_event_to_node_event_log(
             type_name = EVENT_TYPES.NODE_INSTALL_EVENT
         else:
             type_name = EVENT_TYPES.NODE_INSTALL_EVENT_FAILED
+    elif node.status == NODE_STATUS.DEPLOYED and result in ['FAIL']:
+        type_name = EVENT_TYPES.NODE_POST_INSTALL_EVENT_FAILED
     elif node.status == NODE_STATUS.ENTERING_RESCUE_MODE:
         if result in ['SUCCESS', None]:
             type_name = EVENT_TYPES.NODE_ENTERING_RESCUE_MODE_EVENT
diff --git a/src/metadataserver/tests/test_api.py b/src/metadataserver/tests/test_api.py
index 6738480..f5c0800 100644
--- a/src/metadataserver/tests/test_api.py
+++ b/src/metadataserver/tests/test_api.py
@@ -203,7 +203,6 @@ class TestHelpers(MAASServerTestCase):
             NODE_STATUS.READY: EVENT_TYPES.NODE_STATUS_EVENT,
             NODE_STATUS.RESERVED: EVENT_TYPES.NODE_STATUS_EVENT,
             NODE_STATUS.ALLOCATED: EVENT_TYPES.NODE_STATUS_EVENT,
-            NODE_STATUS.DEPLOYED: EVENT_TYPES.NODE_STATUS_EVENT,
             NODE_STATUS.RETIRED: EVENT_TYPES.NODE_STATUS_EVENT,
             NODE_STATUS.BROKEN: EVENT_TYPES.NODE_STATUS_EVENT,
             NODE_STATUS.FAILED_DEPLOYMENT: EVENT_TYPES.NODE_STATUS_EVENT,
@@ -211,6 +210,9 @@ class TestHelpers(MAASServerTestCase):
             NODE_STATUS.FAILED_RELEASING: EVENT_TYPES.NODE_STATUS_EVENT,
             NODE_STATUS.DISK_ERASING: EVENT_TYPES.NODE_STATUS_EVENT,
             NODE_STATUS.FAILED_DISK_ERASING: EVENT_TYPES.NODE_STATUS_EVENT,
+            # Deployed generates different event types.
+            NODE_STATUS.DEPLOYED: EVENT_TYPES.NODE_POST_INSTALL_EVENT_FAILED,
+            NODE_STATUS.DEPLOYED: EVENT_TYPES.NODE_STATUS_EVENT,
         }
 
         for status in expected_type:
diff --git a/src/provisioningserver/events.py b/src/provisioningserver/events.py
index f4227ec..6af6f2d 100644
--- a/src/provisioningserver/events.py
+++ b/src/provisioningserver/events.py
@@ -78,6 +78,7 @@ class EVENT_TYPES:
     NODE_COMMISSIONING_EVENT_FAILED = "NODE_COMMISSIONING_EVENT_FAILED"
     NODE_INSTALL_EVENT = "NODE_INSTALL_EVENT"
     NODE_INSTALL_EVENT_FAILED = "NODE_INSTALL_EVENT_FAILED"
+    NODE_POST_INSTALL_EVENT_FAILED = "NODE_POST_INSTALL_EVENT_FAILED"
     NODE_ENTERING_RESCUE_MODE_EVENT = "NODE_ENTERING_RESCUE_MODE_EVENT"
     NODE_ENTERING_RESCUE_MODE_EVENT_FAILED = (
         "NODE_ENTERING_RESCUE_MODE_EVENT_FAILED")
@@ -203,6 +204,10 @@ EVENT_DETAILS = {
         description="Node installation failure",
         level=ERROR,
     ),
+    EVENT_TYPES.NODE_POST_INSTALL_EVENT_FAILED: EventDetail(
+        description="Node post-installation failure",
+        level=ERROR,
+    ),
     EVENT_TYPES.NODE_ENTERING_RESCUE_MODE_EVENT: EventDetail(
         description="Node entering rescue mode",
         level=DEBUG,