Updated fix version

Author: Harinadh-Saladi

aci-preupgrade-validation-script.py

@@ -3001,8 +3001,9 @@ def apic_disk_space_faults_check(cversion, tversion,**kwargs):
 
     dn_regex = node_regex + r'/.+p-\[(?P<mountpoint>.+)\]-f'
     desc_regex = r'is (?P<usage>\d{2,3}%) full'
-    
-    tmp_faults_skipped = False  # Track if we skip /tmp faults for tversion >= 6.1(4a)
+
+    tmp_faults_skip_versions = ["6.0(9f)", "6.1(4h)", "6.2(1g)"]
+    tmp_faults_skipped = False  # Track if we skip /tmp faults for CSCwo96334 versions
     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:
@@ -3014,8 +3015,8 @@ def apic_disk_space_faults_check(cversion, tversion,**kwargs):
         desc = re.search(desc_regex, faultInst['faultInst']['attributes']['descr'])
         if dn:
             mountpoint = dn.group('mountpoint')
-            # CSCwo96334: Skip /tmp faults if tversion >= 6.1(4a) (snapshots use /data instead)
-            if mountpoint == '/tmp' and tversion and not tversion.older_than("6.1(4a)"):
+            # CSCwo96334: Skip /tmp faults when target is >= 6.1(4h) or any unaffected versions
+            if mountpoint == '/tmp' and (not tversion.older_than("6.1(4h)") or any(tversion.same_as(version) for version in tmp_faults_skip_versions)):
                 tmp_faults_skipped = True
                 continue
             if desc:
@@ -3025,7 +3026,7 @@ def apic_disk_space_faults_check(cversion, tversion,**kwargs):
             else:
                 unformatted_data.append([fc, faultInst['faultInst']['attributes']['dn'], default_action])
     if not data and not unformatted_data:
-        # If we only found /tmp faults that were skipped (tversion >= 6.1(4a)), return NA
+        # If we only found /tmp faults that were skipped (CSCwo96334 fixed target versions), return NA
         if tmp_faults_skipped:
             result = NA
         else:

tests/checks/apic_disk_space_faults_check/Fault_raised.json

@@ -147,5 +147,35 @@
                     "type": "operational"
                 }
             }
+        },
+
+        {
+            "faultInst": {
+                "attributes": {
+                    "ack": "no",
+                    "alert": "no",
+                    "cause": "equipment-full",
+                    "changeSet": "inodesFree (Old: 12167881, New: 12167880), inodesUsed (Old: 64, New: 65)",
+                    "childAction": "",
+                    "code": "F1527",
+                    "created": "2026-03-13T11:46:02.307+00:00",
+                    "delegated": "no",
+                    "descr": "Storage unit /tmp on node 1 with hostname fab3-apic1 mounted at /tmp is 82% full",
+                    "dn": "topology/pod-1/node-1/sys/ch/p-[/tmp]-f-[tmpfs]/fault-F1527",
+                    "domain": "infra",
+                    "highestSeverity": "warning",
+                    "lastTransition": "2026-03-13T11:48:02.867+00:00",
+                    "lc": "raised",
+                    "occur": "1",
+                    "origSeverity": "warning",
+                    "prevSeverity": "warning",
+                    "rule": "eqpt-storage-full-warning",
+                    "severity": "warning",
+                    "status": "",
+                    "subject": "equipment-full",
+                    "title": "",
+                    "type": "operational"
+                }
+            }
         }
     ]

tests/checks/apic_disk_space_faults_check/test_apic_disk_space_faults_check.py

@@ -38,6 +38,7 @@
                 ["F1528", "1", "1", "/techsupport", "89%", "Remove unneeded techsupports/cores"],
                 ["F1529", "1", "1", "/tmp", "100%", "Remove unneeded logs in /tmp directory"],
                 ["F1528", "1", "1", "/tmp", "89%", "Remove unneeded logs in /tmp directory"],
+                ["F1527", "1", "1", "/tmp", "82%", "Remove unneeded logs in /tmp directory"],
             ],
         ),
         # PASS - Faults exist but not raised nor soaking (cleared)
@@ -62,7 +63,7 @@
                 ["F1527", "1", "1", "/data/log", "82%", "Remove unneeded logs in var/log/dme/log"],
             ],
         ),
-        # FAIL - /tmp included when tversion is below 6.1(4a)
+        # FAIL - /tmp included when tversion is below 6.1(4h)
         (
             {faultInst: read_data(dir, "Fault_combination.json")},
             "4.2(1h)",
@@ -76,23 +77,37 @@
                 ["F1527", "1", "1", "/data/log", "82%", "Remove unneeded logs in var/log/dme/log"],
             ],
         ),
-        # FAIL - /tmp skipped when tversion is 6.1(4a) or later
+        # FAIL - /tmp included when tversion is not one of CSCwo96334 fixed target versions
         (
             {faultInst: read_data(dir, "Fault_combination.json")},
             "4.2(1h)",
-            "6.1(4a)",
+            "6.1(2g)",
+            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"],
+                ["F1529", "1", "1", "/tmp", "100%", "Remove unneeded logs in /tmp directory"],
+                ["F1528", "1", "1", "/tmp", "89%", "Remove unneeded logs in /tmp directory"],
+                ["F1527", "1", "1", "/data/log", "82%", "Remove unneeded logs in var/log/dme/log"],
+            ],
+        ),
+        # FAIL - /tmp skipped when tversion is one of CSCwo96334 fixed target versions
+        (
+            {faultInst: read_data(dir, "Fault_combination.json")},
+            "4.2(1h)",
+            "6.0(9f)",
             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"],
                 ["F1527", "1", "1", "/data/log", "82%", "Remove unneeded logs in var/log/dme/log"],
             ],
         ),
-        # NA - only /tmp faults and tversion is 6.1(4a) or later
+        # NA - only /tmp faults and tversion is one of CSCwo96334 fixed target versions
         (
             {faultInst: read_data(dir, "Fault_combination.json")[3:5]},
             "4.2(1h)",
-            "6.1(4a)",
+            "6.1(4h)",
             script.NA,
             [],
         ),