Merge ~ltrager/maas:lp1910473 into maas:master

[Lee Trager]

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

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1910473 lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: b2e1da41c90501ef5322075e490ecc5f5f58880a

review: Approve

[Alberto Donato (ack)]

+1

review: Approve

diff --git a/src/metadataserver/builtin_scripts/hooks.py b/src/metadataserver/builtin_scripts/hooks.py
index 6840288..d3ec6b0 100644
--- a/src/metadataserver/builtin_scripts/hooks.py
+++ b/src/metadataserver/builtin_scripts/hooks.py
@@ -652,8 +652,10 @@ def _process_lxd_resources(node, data):
     node.memory, hugepages_size, numa_nodes_info = _parse_memory(
         resources.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,
@@ -666,7 +668,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 e991837..34df4f8 100644
--- a/src/metadataserver/builtin_scripts/tests/test_hooks.py
+++ b/src/metadataserver/builtin_scripts/tests/test_hooks.py
@@ -398,18 +398,19 @@ def make_lxd_host_info(
     }
 
 
-def make_lxd_pcie_device():
-    return {
-        "driver": factory.make_name("driver"),
-        "driver_version": factory.make_name("driver-version"),
-        "numa_node": 0,
-        "pci_address": "%s:%s:%s.%s"
-        % (
+def make_lxd_pcie_device(numa_node=0, pci_address=None):
+    if pci_address is None:
+        pci_address = "%s:%s:%s.%s" % (
             factory.make_hex_string(size=4),
             factory.make_hex_string(size=2),
             factory.make_hex_string(size=2),
             factory.make_hex_string(size=1),
-        ),
+        )
+    return {
+        "driver": factory.make_name("driver"),
+        "driver_version": factory.make_name("driver-version"),
+        "numa_node": numa_node,
+        "pci_address": pci_address,
         "product": factory.make_name("product"),
         "product_id": factory.make_hex_string(size=4),
         "vendor": factory.make_name("vendor"),
@@ -1755,6 +1756,29 @@ class TestProcessLXDResults(MAASServerTestCase):
             },
         )
 
+    def test_allows_devices_on_sparse_numa_nodes(self):
+        node = factory.make_Node()
+        lxd_output = make_lxd_output()
+        pci_address = lxd_output["resources"]["network"]["cards"][-1][
+            "pci_address"
+        ]
+        lxd_output["resources"]["cpu"]["sockets"][-1]["cores"][-1]["threads"][
+            -1
+        ]["numa_node"] = 16
+        lxd_output["resources"]["network"]["cards"][-1]["numa_node"] = 16
+        lxd_output["resources"]["pci"] = {
+            "devices": [
+                make_lxd_pcie_device(numa_node=16, pci_address=pci_address)
+            ],
+            "total": 1,
+        }
+
+        process_lxd_results(node, json.dumps(lxd_output).encode(), 0)
+        node_device = node.node_devices.get(pci_address=pci_address)
+
+        self.assertEquals(16, node_device.numa_node.index)
+        self.assertEquals(16, node_device.physical_interface.numa_node.index)
+
     def test_updates_interfaces_speed(self):
         node = factory.make_Node()
         iface = factory.make_Interface(