fix: Include soaking, add result data in pytest

Author: takishida

aci-preupgrade-validation-script.py

@@ -3000,21 +3000,22 @@ def apic_disk_space_faults_check(cversion, **kwargs):
 
     dn_regex = node_regex + r'/.+p-\[(?P<mountpoint>.+)\]-f'
     desc_regex = r'is (?P<usage>\d{2,3}%) full'
-    
+
     faultInsts = icurl('class',
                        'faultInst.json?query-target-filter=or(eq(faultInst.code,"F1527"),eq(faultInst.code,"F1528"),eq(faultInst.code,"F1529"))')
     for faultInst in faultInsts:
         lc = faultInst['faultInst']['attributes']['lc']
-        if lc == "raised":
-            fc = faultInst['faultInst']['attributes']['code']
-            dn = re.search(dn_regex, faultInst['faultInst']['attributes']['dn'])
-            desc = re.search(desc_regex, faultInst['faultInst']['attributes']['descr'])
-            if dn and desc:
-                data.append([fc, dn.group('pod'), dn.group('node'), dn.group('mountpoint'),
-                            desc.group('usage'),
-                            recommended_action.get(dn.group('mountpoint'), default_action)])
-            else:
-                unformatted_data.append([fc, faultInst['faultInst']['attributes']['dn'], default_action])
+        if lc not in ["raised", "soaking"]:
+            continue
+        fc = faultInst['faultInst']['attributes']['code']
+        dn = re.search(dn_regex, faultInst['faultInst']['attributes']['dn'])
+        desc = re.search(desc_regex, faultInst['faultInst']['attributes']['descr'])
+        if dn and desc:
+            data.append([fc, dn.group('pod'), dn.group('node'), dn.group('mountpoint'),
+                        desc.group('usage'),
+                        recommended_action.get(dn.group('mountpoint'), default_action)])
+        else:
+            unformatted_data.append([fc, faultInst['faultInst']['attributes']['dn'], default_action])
     if not data and not unformatted_data:
         result = PASS
     return Result(

tests/checks/apic_disk_space_faults_check/Fault_exists_not_raised.json

@@ -45,7 +45,7 @@
                     "domain": "infra",
                     "highestSeverity": "major",
                     "lastTransition": "2026-01-12T06:44:26.382+00:00",
-                    "lc": "soaking",
+                    "lc": "soaking-clearing",
                     "occur": "1",
                     "origSeverity": "major",
                     "prevSeverity": "major",

tests/checks/apic_disk_space_faults_check/test_apic_disk_space_faults_check.py

@@ -16,65 +16,71 @@
 
 
 @pytest.mark.parametrize(
-    "icurl_outputs, cversion, expected_result",
+    "icurl_outputs, cversion, expected_result, expected_data",
     [
         # PASS - No raised faults
         (
             {faultInst: []},
             "4.2(1h)",
             script.PASS,
+            [],
         ),
         # FAIL - Raised faults with /firmware,/techsupport,/data/log mount points
         (
-            {
-                faultInst: read_data(dir, "Fault_raised.json")
-            },
+            {faultInst: read_data(dir, "Fault_raised.json")},
             "4.2(1h)",
             script.FAIL_UF,
+            [
+                ["F1528", "1", "1", "/data/log", "89%", "Remove unneeded logs in var/log/dme/log"],
+                ["F1528", "1", "1", "/firmware", "89%", "Remove unneeded images"],
+                ["F1528", "1", "1", "/techsupport", "89%", "Remove unneeded techsupports/cores"],
+            ],
         ),
-        
-        # PASS - Faults exist but not raised (cleared)
+        # PASS - Faults exist but not raised nor soaking (cleared)
         (
-            {
-                faultInst: read_data(dir, "Fault_exists_not_raised.json")
-            },
+            {faultInst: read_data(dir, "Fault_exists_not_raised.json")},
             "4.2(1h)",
             script.PASS,
+            [],
         ),
-
         # FAIL - Raised faults with multiple status - Cleared and Active
         (
-            {
-                faultInst: read_data(dir, "Fault_combination.json")
-            },
+            {faultInst: read_data(dir, "Fault_combination.json")},
             "4.2(1h)",
             script.FAIL_UF,
+            [
+                ["F1529", "1", "1", "/data/log", "94%", "Remove unneeded logs in var/log/dme/log"],
+                ["F1528", "1", "1", "/firmware", "89%", "Remove unneeded images"],
+            ],
         ),
-
         # FAIL - Raised faults with unknown mount point (unformatted data)
         (
-            {
-                faultInst: read_data(dir, "Fault_unformatted_data.json")
-            },
+            {faultInst: read_data(dir, "Fault_unformatted_data.json")},
             "4.2(1h)",
             script.FAIL_UF,
+            [
+                ["F1528", "1", "1", "/unknown", "88%", "Contact Cisco TAC."],
+            ],
         ),
         # FAIL - Raised faults with CSCvn13119 affected version
         (
-            {
-                faultInst: read_data(dir, "Fault_raised.json")
-            },
+            {faultInst: read_data(dir, "Fault_unformatted_data.json")},
             "4.0(1h)",
             script.FAIL_UF,
+            [
+                ["F1528", "1", "1", "/unknown", "88%", "Contact Cisco TAC. A typical issue is CSCvn13119."],
+            ],
         ),
         # PASS - No raised faults with CSCvn13119 affected version
         (
             {faultInst: []},
             "4.0(1h)",
             script.PASS,
+            [],
         ),
     ],
 )
-def test_logic(run_check, mock_icurl, cversion, expected_result):
+def test_logic(run_check, mock_icurl, cversion, expected_result, expected_data):
     result = run_check(cversion=script.AciVersion(cversion))
-    assert result.result == expected_result
+    assert result.result == expected_result
+    assert result.data == expected_data