Merge ~ack/maas:1862680-commissioning-script-only-json-output into maas:master

[Alberto Donato]

LP: #1862680 - Silence wget since script output is parsed as json

[Adam Collard (adam-collard)]

review: Approve

[Björn Tillenius (bjornt)]

review: Needs Information

[MAAS Lander (maas-lander)]

UNIT TESTS
-b 1862680-commissioning-script-only-json-output lp:~ack/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: a5ffe1c3849a8c46d70c9a50e18685e36a1d5587

review: Approve

[Alberto Donato (ack)]

@Bjorn updated as suggested, thanks

[Björn Tillenius (bjornt)]

+1

review: Approve

diff --git a/src/maasserver/models/node.py b/src/maasserver/models/node.py
index 5306ff1..0203088 100644
--- a/src/maasserver/models/node.py
+++ b/src/maasserver/models/node.py
@@ -4534,7 +4534,7 @@ class Node(CleanSave, TimestampedModel):
             script_name=LXD_OUTPUT_NAME
         )
         update_node_network_information(
-            self, json.loads(script.output), NUMANode.objects.filter(node=self)
+            self, json.loads(script.stdout), NUMANode.objects.filter(node=self)
         )
 
     def set_initial_networking_configuration(self):
diff --git a/src/maasserver/models/tests/test_node.py b/src/maasserver/models/tests/test_node.py
index 62fc0a9..dc9ec6c 100644
--- a/src/maasserver/models/tests/test_node.py
+++ b/src/maasserver/models/tests/test_node.py
@@ -7295,11 +7295,58 @@ class TestNodeNetworking(MAASTransactionServerTestCase):
             node, scripts=[lxd_script.name, ip_addr_script.name]
         )
         node.current_commissioning_script_set = commissioning_script_set
+        output = json.dumps(XENIAL_NETWORK).encode("utf-8")
         factory.make_ScriptResult(
             script_set=commissioning_script_set,
             script=lxd_script,
             exit_status=0,
-            output=json.dumps(XENIAL_NETWORK).encode("utf-8"),
+            output=output,
+            stdout=output,
+        )
+        factory.make_ScriptResult(
+            script_set=commissioning_script_set,
+            script=ip_addr_script,
+            exit_status=0,
+            output=IP_ADDR_OUTPUT_XENIAL,
+        )
+        # Create NUMA nodes.
+        test_hooks.create_numa_nodes(node)
+        # restore_network_interfaces() will set up the network intefaces
+        # specified in ip_addr_results_xenial.txt
+        node.restore_network_interfaces()
+        self.assertEqual(
+            ["ens10", "ens11", "ens12", "ens3"],
+            sorted(interface.name for interface in node.interface_set.all()),
+        )
+
+    def test_restore_network_interfaces_ignores_stderr(self):
+        node = factory.make_Node()
+        IP_ADDR_OUTPUT_FILE = os.path.join(
+            os.path.dirname(test_hooks.__file__), "ip_addr_results_xenial.txt"
+        )
+        with open(IP_ADDR_OUTPUT_FILE, "rb") as fd:
+            IP_ADDR_OUTPUT_XENIAL = fd.read()
+        lxd_script = factory.make_Script(
+            name=LXD_OUTPUT_NAME, script_type=SCRIPT_TYPE.COMMISSIONING
+        )
+        ip_addr_script = factory.make_Script(
+            name=IPADDR_OUTPUT_NAME, script_type=SCRIPT_TYPE.COMMISSIONING
+        )
+        XENIAL_NETWORK = deepcopy(test_hooks.SAMPLE_LXD_JSON)
+        XENIAL_NETWORK["network"] = test_hooks.SAMPLE_LXD_XENIAL_NETWORK_JSON
+        commissioning_script_set = ScriptSet.objects.create_commissioning_script_set(
+            node, scripts=[lxd_script.name, ip_addr_script.name]
+        )
+        node.current_commissioning_script_set = commissioning_script_set
+        output = json.dumps(XENIAL_NETWORK).encode("utf-8")
+        error_message = b"some error message"
+        factory.make_ScriptResult(
+            script_set=commissioning_script_set,
+            script=lxd_script,
+            exit_status=0,
+            output=error_message + output,
+            stdout=output,
+            stderr=error_message,
         )
         factory.make_ScriptResult(
             script_set=commissioning_script_set,
@@ -7336,11 +7383,13 @@ class TestNodeNetworking(MAASTransactionServerTestCase):
             node, scripts=[lxd_script.name, ip_addr_script.name]
         )
         node.current_commissioning_script_set = commissioning_script_set
+        output = json.dumps(XENIAL_NETWORK).encode("utf-8")
         factory.make_ScriptResult(
             script_set=commissioning_script_set,
             script=lxd_script,
             exit_status=0,
-            output=json.dumps(XENIAL_NETWORK).encode("utf-8"),
+            output=output,
+            stdout=output,
         )
         factory.make_ScriptResult(
             script_set=commissioning_script_set,
diff --git a/src/provisioningserver/refresh/node_info_scripts.py b/src/provisioningserver/refresh/node_info_scripts.py
index 31641e4..bcb29c3 100644
--- a/src/provisioningserver/refresh/node_info_scripts.py
+++ b/src/provisioningserver/refresh/node_info_scripts.py
@@ -120,12 +120,12 @@ LXD_SCRIPT = dedent(
     url=$(echo "$url" | awk -F '/' ' { print $1 "//" $3 } ')
 
     if [ -z "$url" ] || $(echo "$url" | grep -vq "://"); then
-        echo "ERROR: Unable to find rack controller URL!"
+        echo "ERROR: Unable to find rack controller URL!" >&2
         exit 1
     fi
 
     BINARY="$(archdetect | cut -d '/' -f1 | sed 's/i386/386/g')"
-    wget $url/machine-resources/$BINARY -O $DOWNLOAD_PATH/$BINARY 1>&2
+    wget $url/machine-resources/$BINARY -O $DOWNLOAD_PATH/$BINARY >&2
     chmod +x $DOWNLOAD_PATH/$BINARY
     $DOWNLOAD_PATH/$BINARY
     """