Addressed PR review comments

Author: Priyanka-Patil14

aci-preupgrade-validation-script.py

@@ -6418,6 +6418,9 @@ def wred_affected_model_check(tversion, fabric_nodes, **kwargs):
     recommended_action = "Disable WRED in fabric or upgrade to a release newer than 6.1(5e) or 6.2(1g)."
     doc_url = "https://datacenter.github.io/ACI-Pre-Upgrade-Validation-Script/validations/#wred-with-affected-fm-models"
 
+    if not tversion:
+        return Result(result=MANUAL, msg=TVER_MISSING)
+
     version_affected = (
         (tversion.major1 == "6" and tversion.major2 == "1" and (tversion.older_than("6.1(5e)") or tversion.same_as("6.1(5e)")))
         or (tversion.major1 == "6" and tversion.major2 == "2" and (tversion.older_than("6.2(1g)") or tversion.same_as("6.2(1g)")))
@@ -6432,6 +6435,12 @@ def wred_affected_model_check(tversion, fabric_nodes, **kwargs):
         for node in fabric_nodes
     }
 
+    for cong in icurl("class", "qosCong.json"):
+        if cong.get("qosCong", {}).get("attributes", {}).get("algo") == "wred":
+            break
+    else:
+        return Result(result=PASS, msg="WRED not enabled.")
+
     for obj in icurl("class", "eqptFC.json"):
         attr = obj["eqptFC"]["attributes"]
         model = attr.get("model", "")
@@ -6446,17 +6455,8 @@ def wred_affected_model_check(tversion, fabric_nodes, **kwargs):
     if not data:
         return Result(result=NA, msg="No affected Fabric module found.")
 
-    wred_enabled = False
-    for cong in icurl("class", "qosCong.json"):
-        if cong.get("qosCong", {}).get("attributes", {}).get("algo") == "wred":
-            wred_enabled = True
-            break
-
-    if wred_enabled:
-        data.sort(key=lambda row: (int(row[0]) if row[0].isdigit() else row[0], row[3]))
-        result = FAIL_O
-    else:
-        data = []
+    data.sort(key=lambda row: (int(row[0]) if row[0].isdigit() else row[0], row[3]))
+    result = FAIL_O
 
     return Result(result=result, headers=headers, data=data, recommended_action=recommended_action, doc_url=doc_url)
 

tests/checks/wred_affected_model_check/test_wred_affected_model_check.py

@@ -17,7 +17,15 @@
 @pytest.mark.parametrize(
     "tversion, fabric_nodes, icurl_outputs, expected_result, expected_data",
     [
-        # Case 1: Target version 6.2(2a) is the first fixed release and not in the affected range.
+        # Case 1: Target version not supplied. Expected: MANUAL.
+        (
+            None,
+            read_data(dir, "fabricNode_spine.json"),
+            {},
+            script.MANUAL,
+            [],
+        ),
+        # Case 2: Target version 6.2(2a) is the first fixed release and not in the affected range.
         # Version gate fails. Expected: NA without any API calls.
         (
             "6.2(2a)",
@@ -40,11 +48,13 @@
             [["1001", "spine1001", "FM", "N9K-C9508-FM-E"]],
         ),
         # Case 3: Version is affected but no affected FM hardware found.
-        # Hardware gate fails before WRED is checked. Expected: NA - issue is model-specific.
+        # WRED is enabled so the script proceeds to the FM check, which finds nothing.
+        # Hardware gate fails. Expected: NA - issue is model-specific.
         (
             "6.1(5e)",
             read_data(dir, "fabricNode_spine.json"),
             {
+                qosCong_api: read_data(dir, "qosCong_wred.json"),
                 eqptFC_api: read_data(dir, "eqptFC_empty.json"),
             },
             script.NA,
@@ -75,11 +85,23 @@
             script.FAIL_O,
             [["1001", "spine1001", "FM", "N9K-C9508-FM-E"]],
         ),
+        # Case 6: Version is affected, WRED is enabled, but no affected FM models found.
+        # FM gate fails. Expected: NA.
+        (
+            "6.2(1g)",
+            read_data(dir, "fabricNode_spine.json"),
+            {
+                qosCong_api: read_data(dir, "qosCong_wred.json"),
+                eqptFC_api: read_data(dir, "eqptFC_empty.json"),
+            },
+            script.NA,
+            [],
+        ),
     ],
 )
 def test_logic(run_check, mock_icurl, tversion, fabric_nodes, expected_result, expected_data):
     result = run_check(
-        tversion=script.AciVersion(tversion),
+        tversion=script.AciVersion(tversion) if tversion else None,
         fabric_nodes=fabric_nodes,
     )
     assert result.result == expected_result