Merge ~bjornt/maas:bug-2052958-3.3 into maas:3.3

[Björn Tillenius]

fix: LP:2052958 cope with disks with missing serial metadata

(cherry picked from commit f57ed04744e7110659d7b6833b2ad2b1571a020e)
(cherry picked from commit c13a8beb452f270d795fd1a722928287ed51bb1f)

[Björn Tillenius (bjornt)]

Self-approve backport.

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b bug-2052958-3.3 lp:~bjornt/maas/+git/maas into -b 3.3 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/5498/console
COMMIT: 05e783147982cb823710e88c4706ab0e2f4ac719

review: Needs Fixing

diff --git a/src/metadataserver/builtin_scripts/hooks.py b/src/metadataserver/builtin_scripts/hooks.py
index 7bc96c7..529d62b 100644
--- a/src/metadataserver/builtin_scripts/hooks.py
+++ b/src/metadataserver/builtin_scripts/hooks.py
@@ -763,7 +763,7 @@ def _condense_luns(disks):
         if dev_match["bus"] == "pci" and "pci_address" not in disk:
             disk["pci_address"] = dev_match["bus_addr"]
 
-        if disk["serial"] and (rexp_list := _MP_PATH_ID.get(proto)):
+        if disk.get("serial") and (rexp_list := _MP_PATH_ID.get(proto)):
             for r in rexp_list:
                 if m := r.match(device):
                     serial_lun_map[(disk["serial"], m["lun"])].append(disk)
diff --git a/src/metadataserver/builtin_scripts/tests/test_hooks.py b/src/metadataserver/builtin_scripts/tests/test_hooks.py
index a2334fa..ab3602d 100644
--- a/src/metadataserver/builtin_scripts/tests/test_hooks.py
+++ b/src/metadataserver/builtin_scripts/tests/test_hooks.py
@@ -4017,6 +4017,54 @@ class TestUpdateNodePhysicalBlockDevices(MAASServerTestCase):
             ["sda", "sdb"],
         )
 
+    def test_no_condense_luns_no_serial(self):
+        node = factory.make_Node()
+        resources = deepcopy(SAMPLE_LXD_RESOURCES)
+        resources["storage"]["disks"] = [
+            {
+                "id": "sde",
+                "device": "8:64",
+                "model": "IPR-0   6DC90500",
+                "type": "scsi",
+                "read_only": False,
+                "size": 283794997248,
+                "removable": False,
+                "numa_node": 0,
+                "device_path": "pci-0001:08:00.0-scsi-0:2:4:0",
+                "block_size": 4096,
+                "rpm": 1,
+                "serial": "IBM_IPR-0_6DC90500000000A0",
+                "device_id": "scsi-1IBM_IPR-0_6DC90500000000A0",
+                "partitions": [],
+            },
+            {
+                "id": "sr9",
+                "device": "11:0",
+                "model": "RMBO0140532",
+                "type": "cdrom",
+                "read_only": False,
+                "size": 0,
+                "removable": True,
+                "numa_node": 0,
+                "device_path": "pci-0001:08:00.0-scsi-0:0:7:0",
+                "block_size": 0,
+                "firmware_version": "RA64",
+                "rpm": 1,
+                "device_id": "",
+                "partitions": [],
+            },
+        ]
+
+        _update_node_physical_block_devices(
+            node, resources, create_numa_nodes(node)
+        )
+
+        # sr9 is not included because it's a cdrom
+        self.assertCountEqual(
+            node.physicalblockdevice_set.values_list("name", flat=True),
+            ["sde"],
+        )
+
 
 class TestUpdateNodeNetworkInformation(MAASServerTestCase):
     """Tests the update_node_network_information function using data from LXD.