Merge ~ltrager/maas:lp1879416_2.7 into maas:2.7

[Lee Trager]

Backport of 84f687c LP: #1879416 - Mark commissioning scripts as failed if processing errored

[Lee Trager (ltrager)]

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

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b lp1879416_2.7 lp:~ltrager/maas/+git/maas into -b 2.7 lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/7553/consoleText

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1879416_2.7 lp:~ltrager/maas/+git/maas into -b 2.7 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/7554/console
COMMIT: 8bf9dca69516984b69b28ec1a1fab8061f91febe

review: Needs Fixing

diff --git a/src/maasserver/models/tests/test_node.py b/src/maasserver/models/tests/test_node.py
index e34af88..4d12207 100644
--- a/src/maasserver/models/tests/test_node.py
+++ b/src/maasserver/models/tests/test_node.py
@@ -10483,11 +10483,10 @@ class TestUpdateInterfaces(MAASServerTestCase, UpdateInterfacesMixin):
 
     def test__new_physical_with_multiple_dhcp_link_with_resource_info(self):
         controller = self.create_empty_controller(with_empty_script_sets=True)
-        mac_address = factory.make_mac_address()
         interfaces = {
             "eth0": {
                 "type": "physical",
-                "mac_address": mac_address,
+                "mac_address": "00:00:00:00:00:01",
                 "parents": [],
                 "links": [{"mode": "dhcp"}, {"mode": "dhcp"}],
                 "enabled": True,
@@ -10503,19 +10502,22 @@ class TestUpdateInterfaces(MAASServerTestCase, UpdateInterfacesMixin):
         lxd_script = controller.current_commissioning_script_set.find_script_result(
             script_name=LXD_OUTPUT_NAME
         )
-        lxd_script_output = {
-            "network": {
-                "cards": [
-                    {
-                        "ports": [
-                            {"id": "eth0", "address": mac_address, "port": 0}
-                        ],
-                        "vendor": vendor,
-                        "product": product,
-                        "firmware_version": firmware_version,
-                    }
-                ]
-            }
+        lxd_script_output = deepcopy(test_hooks.SAMPLE_LXD_JSON)
+        lxd_script_output["network"] = {
+            "cards": [
+                {
+                    "ports": [
+                        {
+                            "id": "eth0",
+                            "address": "00:00:00:00:00:01",
+                            "port": 0,
+                        }
+                    ],
+                    "vendor": vendor,
+                    "product": product,
+                    "firmware_version": firmware_version,
+                }
+            ]
         }
         lxd_script.store_result(
             0, stdout=json.dumps(lxd_script_output).encode("utf-8")
diff --git a/src/metadataserver/models/scriptresult.py b/src/metadataserver/models/scriptresult.py
index 355746e..ebeef91 100644
--- a/src/metadataserver/models/scriptresult.py
+++ b/src/metadataserver/models/scriptresult.py
@@ -378,7 +378,7 @@ class ScriptResult(CleanSave, TimestampedModel):
             # Circular imports.
             from metadataserver.api import try_or_log_event
 
-            try_or_log_event(
+            signal_status = try_or_log_event(
                 self.script_set.node,
                 None,
                 err,
@@ -387,6 +387,12 @@ class ScriptResult(CleanSave, TimestampedModel):
                 output=self.stdout,
                 exit_status=self.exit_status,
             )
+            # If the script failed to process mark the script as failed to
+            # prevent testing from running and help users identify where
+            # the error came from. This can happen when a commissioning
+            # script generated invalid output.
+            if signal_status is not None:
+                self.status = SCRIPT_STATUS.FAILED
 
         if (
             self.status == SCRIPT_STATUS.PASSED
diff --git a/src/metadataserver/models/tests/test_scriptresult.py b/src/metadataserver/models/tests/test_scriptresult.py
index ccce2e8..6c0b79a 100644
--- a/src/metadataserver/models/tests/test_scriptresult.py
+++ b/src/metadataserver/models/tests/test_scriptresult.py
@@ -338,7 +338,6 @@ class TestScriptResult(MAASServerTestCase):
         script_result = factory.make_ScriptResult(
             script_set=script_set, status=SCRIPT_STATUS.RUNNING
         )
-        exit_status = random.randint(0, 255)
 
         def _raise():
             raise Exception()
@@ -349,12 +348,15 @@ class TestScriptResult(MAASServerTestCase):
         self.addCleanup(
             scriptresult_module.NODE_INFO_SCRIPTS.pop, script_result.name
         )
-        script_result.store_result(exit_status, stdout=b"")
+        script_result.store_result(0, stdout=b"")
         expected_event = Event.objects.first()
         self.assertThat(
             expected_event.description,
             DocTestMatches("...failed during post-processing."),
         )
+        self.assertEquals(
+            reload_object(script_result).status, SCRIPT_STATUS.FAILED
+        )
 
     def test_store_result_on_recommission_script_resets_builtin_commiss(self):
         script_set = factory.make_ScriptSet(