Merge ~newell-jensen/maas:lp1828493 into maas:master

[Newell Jensen]

LP: #1828493 -- Improve when status message for Rebooting takes place. This creates the event when the install.log completes and the node's netboot is already set to False.

[Blake Rouse (blake-rouse)]

Looks good!

review: Approve

112b1ad... by Newell Jensen on 2019-05-15

Rename unit test.

diff --git a/src/maasserver/models/signals/scriptresult.py b/src/maasserver/models/signals/scriptresult.py
index 49be5d7..68e88da 100644
--- a/src/maasserver/models/signals/scriptresult.py
+++ b/src/maasserver/models/signals/scriptresult.py
@@ -54,6 +54,10 @@ def emit_script_result_status_transition_event(instance, old_values, **kwargs):
             EVENT_TYPES.SCRIPT_RESULT_CHANGED_STATUS,
             event_description="%s changed status from '%s' to '%s'" % (
                 script_result.name, old_status_name, new_status_name))
+        if ('install.log' in script_result.name and not
+                script_result.script_set.node.netboot):
+            Event.objects.create_node_event(
+                script_result.script_set.node, EVENT_TYPES.REBOOTING)
 
 
 signals.watch_fields(
diff --git a/src/maasserver/models/signals/tests/test_scriptresult.py b/src/maasserver/models/signals/tests/test_scriptresult.py
index 7ca8d1e..4be637d 100644
--- a/src/maasserver/models/signals/tests/test_scriptresult.py
+++ b/src/maasserver/models/signals/tests/test_scriptresult.py
@@ -98,3 +98,27 @@ class TestStatusTransitionEvent(MAASServerTestCase):
                 latest_event.type.description,
                 latest_event.description,
             ))
+
+    def test__install_log_emits_event(self):
+
+        old_status = SCRIPT_STATUS.RUNNING
+        script_result = factory.make_ScriptResult(
+            status=old_status, script_set=factory.make_ScriptSet(
+                result_type=RESULT_TYPE.COMMISSIONING),
+            script=factory.make_Script(name="/tmp/install.log"))
+        script_result.status = SCRIPT_STATUS.PASSED
+        script_result.script_set.node.netboot = False
+        script_result.save()
+
+        latest_event = Event.objects.last()
+        self.assertEqual(
+            (
+                EVENT_TYPES.REBOOTING,
+                EVENT_DETAILS[EVENT_TYPES.REBOOTING].description,
+                "",
+            ),
+            (
+                latest_event.type.name,
+                latest_event.type.description,
+                latest_event.description,
+            ))
diff --git a/src/metadataserver/api.py b/src/metadataserver/api.py
index 791e290..ff79192 100644
--- a/src/metadataserver/api.py
+++ b/src/metadataserver/api.py
@@ -1238,6 +1238,4 @@ class AnonMetaDataHandler(VersionIndexHandler):
         Event.objects.create_node_event(
             node, EVENT_TYPES.NODE_INSTALLATION_FINISHED,
             event_description="Node disabled netboot")
-        # Create status message event for rebooting the machine.
-        Event.objects.create_node_event(node, EVENT_TYPES.REBOOTING)
         return rc.ALL_OK
diff --git a/src/metadataserver/tests/test_api.py b/src/metadataserver/tests/test_api.py
index 1a36c9e..f93f02b 100644
--- a/src/metadataserver/tests/test_api.py
+++ b/src/metadataserver/tests/test_api.py
@@ -2904,37 +2904,6 @@ class TestAnonymousAPI(MAASServerTestCase):
         response = self.client.get(anon_node_url, {'op': 'get_preseed'})
         self.assertThat(response, HasStatusCode(http.client.OK))
 
-    def test_anonymous_netboot_off_adds_install_and_reboot_events(self):
-        node = factory.make_Node(netboot=True)
-        anon_netboot_off_url = reverse(
-            'metadata-node-by-id', args=['latest', node.system_id])
-        self.client.post(
-            anon_netboot_off_url, {'op': 'netboot_off'})
-        events = Event.objects.filter(node=node)
-        self.assertEqual(
-            (
-                EVENT_TYPES.NODE_INSTALLATION_FINISHED,
-                EVENT_DETAILS[
-                    EVENT_TYPES.NODE_INSTALLATION_FINISHED].description,
-                "Node disabled netboot",
-            ),
-            (
-                events[0].type.name,
-                events[0].type.description,
-                events[0].description,
-            ))
-        self.assertEqual(
-            (
-                EVENT_TYPES.REBOOTING,
-                EVENT_DETAILS[EVENT_TYPES.REBOOTING].description,
-                "",
-            ),
-            (
-                events[1].type.name,
-                events[1].type.description,
-                events[1].description,
-            ))
-
 
 class TestEnlistViews(MAASServerTestCase):
     """Tests for the enlistment metadata views."""