Merge ~ltrager/maas:lp1910473_2.9 into maas:2.9

[Lee Trager]

LP: #1910473 - Don't assume NUMA nodes maintain linear continuity.

Cherry pick of ed1ad1bc2

[Lee Trager (ltrager)]

Reviewed in https://code.launchpad.net/~ltrager/maas/+git/maas/+merge/395878

review: Approve

diff --git a/src/metadataserver/builtin_scripts/hooks.py b/src/metadataserver/builtin_scripts/hooks.py
index 057a314..96d7d12 100644
--- a/src/metadataserver/builtin_scripts/hooks.py
+++ b/src/metadataserver/builtin_scripts/hooks.py
@@ -489,8 +489,10 @@ def _process_lxd_resources(node, data):
     node.memory, hugepages_size, numa_nodes_info = _parse_memory(
         data.get("memory", {}), numa_nodes
     )
-    # Create or update NUMA nodes.
-    numa_nodes = []
+    # Create or update NUMA nodes. This must be kept as a dictionary as not all
+    # systems maintain linear continuity. e.g the PPC64 machine in our CI uses
+    # 0, 1, 16, 17.
+    numa_nodes = {}
     for numa_index, numa_data in numa_nodes_info.items():
         numa_node, _ = NUMANode.objects.update_or_create(
             node=node,
@@ -503,7 +505,7 @@ def _process_lxd_resources(node, data):
                 page_size=hugepages_size,
                 defaults={"total": numa_data.hugepages},
             )
-        numa_nodes.append(numa_node)
+        numa_nodes[numa_index] = numa_node
 
     # Network interfaces
     # LP: #1849355 -- Don't update the node network information
diff --git a/src/metadataserver/builtin_scripts/tests/test_hooks.py b/src/metadataserver/builtin_scripts/tests/test_hooks.py
index 7eb8679..bac7d2a 100644
--- a/src/metadataserver/builtin_scripts/tests/test_hooks.py
+++ b/src/metadataserver/builtin_scripts/tests/test_hooks.py
@@ -1630,6 +1630,26 @@ class TestProcessLXDResults(MAASServerTestCase):
         self.assertEqual(node_interfaces[0].numa_node, numa_nodes[0])
         self.assertEqual(node_interfaces[1].numa_node, numa_nodes[1])
 
+    def test_allows_devices_on_sparse_numa_nodes(self):
+        node = factory.make_Node()
+        create_IPADDR_OUTPUT_NAME_script(node, IP_ADDR_OUTPUT)
+        lxd_output = make_lxd_output()
+        lxd_output["resources"]["cpu"]["sockets"][-1]["cores"][-1]["threads"][
+            -1
+        ]["numa_node"] = 16
+        lxd_output["resources"]["network"]["cards"][-1]["numa_node"] = 16
+
+        process_lxd_results(node, json.dumps(lxd_output).encode(), 0)
+
+        self.assertEqual(
+            16,
+            node.interface_set.get(
+                mac_address=lxd_output["resources"]["network"]["cards"][-1][
+                    "ports"
+                ][-1]["address"]
+            ).numa_node.index,
+        )
+
     def test_updates_interfaces_speed(self):
         node = factory.make_Node()
         iface = factory.make_Interface(