Skip to content

Commit fc8f08a

Browse files
Updated wred_affected_model_check
1 parent d299ca5 commit fc8f08a

1 file changed

Lines changed: 12 additions & 9 deletions

File tree

aci-preupgrade-validation-script.py

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6412,6 +6412,7 @@ def svccore_excessive_data_check(**kwargs):
64126412

64136413
@check_wrapper(check_title="WRED with Affected FM Models")
64146414
def wred_affected_model_check(tversion, fabric_nodes, **kwargs):
6415+
result = PASS
64156416
headers = ["Node ID", "Node Name", "Source", "Model"]
64166417
data = []
64176418
recommended_action = "Disable WRED in fabric or upgrade to a release newer than 6.1(5e) or 6.2(1g)."
@@ -6431,7 +6432,6 @@ def wred_affected_model_check(tversion, fabric_nodes, **kwargs):
64316432
for node in fabric_nodes
64326433
}
64336434

6434-
# FM model gate
64356435
for obj in icurl("class", "eqptFC.json"):
64366436
attr = obj["eqptFC"]["attributes"]
64376437
model = attr.get("model", "")
@@ -6446,16 +6446,19 @@ def wred_affected_model_check(tversion, fabric_nodes, **kwargs):
64466446
if not data:
64476447
return Result(result=NA, msg="No affected Fabric module found.")
64486448

6449-
wred_enabled = any(
6450-
cong.get("qosCong", {}).get("attributes", {}).get("algo") == "wred"
6451-
for cong in icurl("class", "qosCong.json")
6452-
)
6453-
if not wred_enabled:
6454-
return Result(result=PASS, msg="WRED not enabled.")
6449+
wred_enabled = False
6450+
for cong in icurl("class", "qosCong.json"):
6451+
if cong.get("qosCong", {}).get("attributes", {}).get("algo") == "wred":
6452+
wred_enabled = True
6453+
break
64556454

6456-
data.sort(key=lambda row: (int(row[0]) if row[0].isdigit() else row[0], row[3]))
6455+
if wred_enabled:
6456+
data.sort(key=lambda row: (int(row[0]) if row[0].isdigit() else row[0], row[3]))
6457+
result = FAIL_O
6458+
else:
6459+
data = []
64576460

6458-
return Result(result=FAIL_O, headers=headers, data=data, recommended_action=recommended_action, doc_url=doc_url)
6461+
return Result(result=result, headers=headers, data=data, recommended_action=recommended_action, doc_url=doc_url)
64596462

64606463

64616464
# ---- Script Execution ----

0 commit comments

Comments
 (0)