Updated the if condition for maintenance release,6.1(5e) and variable name for impacted nodes.Also, updated pytest test cases

Author: Harinadh-Saladi

aci-preupgrade-validation-script.py

@@ -6032,25 +6032,28 @@ def n9k_c9408_model_lem_count_check(tversion, fabric_nodes, **kwargs):
     headers = ["Node ID", "Switch Model", "LEM Model", "LEM Count"]
     data = []
     recommended_action = (
-        "Upgrade from pre-16.1(2f) to 16.1(2f) or later on N9K-C9408 with 6 or more LEMs will result in boot loop.Choose a different version."
+        "Upgrade from pre-16.1(2f) to 16.1(2f) or later on N9K-C9408 with 6 or more LEMs will result in boot loop. Choose a different version."
     )
     doc_url = 'https://datacenter.github.io/ACI-Pre-Upgrade-Validation-Script/validations/#n9k-c9408-with-6-n9k-x9400-16w-lems'
 
-    if tversion.older_than("6.1(2f)") or tversion.newer_than("6.2(1g)"):
+    if tversion.older_than("6.1(2f)") or (tversion.newer_than("6.1(5e)") and not tversion.same_as("6.2(1g)")):
         return Result(result=NA, msg=VER_NOT_AFFECTED)
 
-    c9408_nodes = {}
+    affected_nodes = {}
     for node in fabric_nodes:
         node_id = node['fabricNode']['attributes']['id']
         model = node['fabricNode']['attributes']['model']
         if model == "N9K-C9408":
-            c9408_nodes[node_id] = "N9K-C9408"
+            affected_nodes[node_id] = "N9K-C9408"
 
-    if not c9408_nodes:
+    if not affected_nodes:
         return Result(result=NA, msg='No N9K-C9408 nodes found. Skipping.')
 
     eqptLC_api = 'eqptLC.json?query-target-filter=eq(eqptLC.model,"N9K-X9400-16W")'
-    eqptLCs = icurl('class', eqptLC_api)
+    try:
+        eqptLCs = icurl('class', eqptLC_api)
+    except Exception as e:
+        return Result(result=ERROR, msg="Failed to query {}: {}".format(eqptLC_api, e))
 
     lem_count_per_node = defaultdict(int)
     for eqptLC in eqptLCs:
@@ -6059,13 +6062,13 @@ def n9k_c9408_model_lem_count_check(tversion, fabric_nodes, **kwargs):
         if not dn_match:
             continue
         node_id = dn_match.group("node")
-        if node_id in c9408_nodes:
+        if node_id in affected_nodes:
             lem_count_per_node[node_id] += 1
 
-    for node_id in sorted(c9408_nodes, key=int):
+    for node_id in sorted(affected_nodes, key=int):
         lem_count = lem_count_per_node[node_id]
         if lem_count > 5:
-            data.append([node_id, c9408_nodes[node_id], "N9K-X9400-16W", lem_count])
+            data.append([node_id, affected_nodes[node_id], "N9K-X9400-16W", lem_count])
 
     if data:
         result = FAIL_O
@@ -6405,4 +6408,4 @@ def main(_args=None):
         msg = "Abort due to unexpected error - {}".format(e)
         prints(msg)
         log.error(msg, exc_info=True)
-        sys.exit(1)
+        sys.exit(1)

docs/docs/validations.md

@@ -187,13 +187,13 @@ Items                                           | Defect       | This Script
 [Nexus 950X FM or LC Might Fail to boot after reload][d20] | CSCvg26013   | :white_check_mark: | :no_entry_sign:
 [Stale Decommissioned Spine][d21]               | CSCwf58763   | :white_check_mark: | :no_entry_sign:
 [N9K-C9408 Platform Model][d22]                 | CSCwk77800   | :white_check_mark: | :no_entry_sign:
-[N9K-C9408 with 6+ N9K-X9400-16W LEMs][d29]     | CSCws82819   | :white_check_mark: | :no_entry_sign:
 [PBR High Scale][d23]                           | CSCwi66348   | :white_check_mark: | :no_entry_sign:
 [Standby Sup Image Sync][d24]                   | CSCwi66348   | :white_check_mark: | :no_entry_sign:
 [Observer Database Size][d25]                   | CSCvw45531   | :white_check_mark: | :no_entry_sign:
 [Stale pconsRA Object][d26]                     | CSCwp22212   | :warning:{title="Deprecated"} | :no_entry_sign:
 [ISIS DTEPs Byte Size][d27]                     | CSCwp15375   | :white_check_mark: | :no_entry_sign:
 [Policydist configpushShardCont Crash][d28]     | CSCwp95515   | :white_check_mark: | 
+[N9K-C9408 with 6+ N9K-X9400-16W LEMs][d29]     | CSCws82819   | :white_check_mark: | :no_entry_sign:
 
 [d1]: #ep-announce-compatibility
 [d2]: #eventmgr-db-size-defect-susceptibility

tests/checks/n9k_c9408_model_lem_count_check/test_n9k_c9408_model_lem_count_check.py

@@ -36,7 +36,7 @@
             [],
             script.VER_NOT_AFFECTED,
         ),
-        # Version not affected (higher than 6.2(1g))
+        # Applicable version but no N9K-C9408 nodes found
         (
             {eqptLC_api: read_data(dir, "eqptLC_6_node.json")},
             "6.1(2f)",
@@ -54,7 +54,7 @@
             [],
             "",
         ),
-        # Applicable version, exactly 5 LEMs -> PASS
+        # Applicable version, C9408 exists, with <=5 LEMs -> PASS
         (
             {eqptLC_api: read_data(dir, "eqptLC_5_node.json")},
             "6.2(1g)",
@@ -63,6 +63,15 @@
             [],
             "",
         ),
+        # Applicable version with 6 LEMs -> FAIL_O
+        (
+            {eqptLC_api: read_data(dir, "eqptLC_6_node.json")},
+            "6.2(1g)",
+            read_data(dir, "fabricNode_n9k_c9408.json"),
+            script.FAIL_O,
+            [["101", "N9K-C9408", "N9K-X9400-16W", 6]],
+            "",
+        ),
         # Applicable mid-train version 6.1(5e), less than 6 LEMs on C9408 -> PASS
         (
             {eqptLC_api: read_data(dir, "eqptLC_5_node.json")},
@@ -81,14 +90,14 @@
             [["101", "N9K-C9408", "N9K-X9400-16W", 6]],
             "",
         ),
-        # Applicable mid-train version 6.1(5e), more than 6 LEMs on C9408 -> FAIL_O
+        # Version not affected (fixed after 6.1(5e))
         (
-            {eqptLC_api: read_data(dir, "eqptLC_7_node.json")},
-            "6.1(5e)",
+            {eqptLC_api: read_data(dir, "eqptLC_6_node.json")},
+            "6.1(5f)",
             read_data(dir, "fabricNode_n9k_c9408.json"),
-            script.FAIL_O,
-            [["101", "N9K-C9408", "N9K-X9400-16W", 7]],
-            "",
+            script.NA,
+            [],
+            script.VER_NOT_AFFECTED,
         ),
         # Applicable version, 6 LEMs on C9408 -> FAIL_O
         (
@@ -99,15 +108,6 @@
             [["101", "N9K-C9408", "N9K-X9400-16W", 6]],
             "",
         ),
-        # Applicable version, more than 6 LEMs on C9408 -> FAIL_O
-        (
-            {eqptLC_api: read_data(dir, "eqptLC_7_node.json")},
-            "6.1(2f)",
-            read_data(dir, "fabricNode_n9k_c9408.json"),
-            script.FAIL_O,
-            [["101", "N9K-C9408", "N9K-X9400-16W", 7]],
-            "",
-        ),
         # Count only C9408 nodes and only matching LEM model
         (
             {eqptLC_api: read_data(dir, "eqptLC_mixed.json")},