Addressed and updated n9300_switch_memory_check files

Author: Priyanka-Patil14

aci-preupgrade-validation-script.py

@@ -5877,67 +5877,6 @@ def isis_database_byte_check(tversion, **kwargs):
     return Result(result=result, headers=headers, data=data, recommended_action=recommended_action, doc_url=doc_url)
 
 
-@check_wrapper(check_title='N9300 Switch Memory')
-def n9300_switch_memory_check(tversion, fabric_nodes, **kwargs):
-    result = PASS
-    headers = ["NodeId", "Name", "Model", "Memory Detected (GB)"]
-    data = []
-    recommended_action = 'Increase the switch memory to at least 24GB on affected N9300-series switches.'
-    doc_url = 'https://datacenter.github.io/ACI-Pre-Upgrade-Validation-Script/validations/#n9300-switch-memory'
-    min_memory_kb = 24 * 1024 * 1024
-
-    proc_mem_query = 'procMemUsage.json'
-    affected_nodes = [
-        node for node in fabric_nodes
-        if node.get('fabricNode', {}).get('attributes', {}).get('model', '').startswith('N9K-C93')
-    ]
-
-    if not affected_nodes:
-        return Result(result=NA, msg='No N9300 switches found. Skipping.')
-
-    proc_mem_mos = icurl('class', proc_mem_query)
-    node_total_kb = {}
-
-    for memory_mo in proc_mem_mos:
-        attrs = memory_mo.get('procMemUsage', {}).get('attributes', {})
-        total = attrs.get('Total')
-        mem_dn = attrs.get('dn', '')
-        if not total or '/memusage-sup' not in mem_dn:
-            continue
-        dn_match = re.search(node_regex, mem_dn)
-        if not dn_match:
-            continue
-        try:
-            total_kb = int(total)
-        except ValueError:
-            continue
-
-        node_id = dn_match.group('node')
-        if node_id not in node_total_kb:
-            node_total_kb[node_id] = total_kb
-
-    for node in affected_nodes:
-        node_id = node['fabricNode']['attributes']['id']
-        total_kb = node_total_kb.get(node_id)
-        if total_kb is None:
-            continue
-
-        memory_in_gb = round(total_kb / 1048576, 2)
-        if total_kb < min_memory_kb:
-            result = FAIL_O
-            data.append([
-                node_id,
-                node['fabricNode']['attributes'].get('name', ''),
-                node['fabricNode']['attributes'].get('model', ''),
-                memory_in_gb,
-            ])
-
-    if result == PASS:
-        return Result(result=result)
-
-    return Result(result=result, headers=headers, data=data, recommended_action=recommended_action, doc_url=doc_url)
-
-
 # Subprocess check - cat + acidiag
 @check_wrapper(check_title='APIC Database Size')
 def apic_database_size_check(cversion, **kwargs):
@@ -6114,6 +6053,91 @@ def auto_firmware_update_on_switch_check(cversion, tversion, **kwargs):
 
     return Result(result=result, headers=headers, data=data, recommended_action=recommended_action, doc_url=doc_url)
 
+
+@check_wrapper(check_title='N9300 Switch Memory')
+def n9300_switch_memory_check(tversion, fabric_nodes, **kwargs):
+    result = PASS
+    headers = ["NodeId", "Name", "Model", "Memory Detected (GB)"]
+    data = []
+    recommended_action = 'Increase the switch memory to at least 24GB on affected N9300-series switches.'
+    doc_url = 'https://datacenter.github.io/ACI-Pre-Upgrade-Validation-Script/validations/#n9300-switch-memory'
+    min_memory_kb = 24 * 1024 * 1024
+
+    affected_nodes = [
+        node for node in fabric_nodes
+        if node.get('fabricNode', {}).get('attributes', {}).get('model', '').startswith('N9K-C93')
+    ]
+
+    if not affected_nodes:
+        return Result(result=NA, msg='No N9300 switches found. Skipping.')
+
+    proc_mem_mos = icurl('class', 'procMemUsage.json')
+    node_total_kb = {}
+    parse_errors = []
+
+    for memory_mo in proc_mem_mos:
+        attrs = memory_mo.get('procMemUsage', {}).get('attributes', {})
+        total = attrs.get('Total')
+        mem_dn = attrs.get('dn', '')
+        if not total or '/memusage-sup' not in mem_dn:
+            continue
+        dn_match = re.search(node_regex, mem_dn)
+        if not dn_match:
+            continue
+        try:
+            total_kb = int(total)
+        except (TypeError, ValueError):
+            parse_errors.append([mem_dn, total])
+            continue
+
+        node_id = dn_match.group('node')
+        if node_id not in node_total_kb:
+            node_total_kb[node_id] = total_kb
+
+    if parse_errors:
+        return Result(
+            result=ERROR,
+            msg='Failed to parse procMemUsage Total for one or more nodes.',
+            headers=['DN', 'Total'],
+            data=parse_errors,
+        )
+
+    missing_nodes = []
+
+    for node in affected_nodes:
+        node_id = node['fabricNode']['attributes']['id']
+        total_kb = node_total_kb.get(node_id)
+        if total_kb is None:
+            missing_nodes.append([
+                node_id,
+                node['fabricNode']['attributes'].get('name', ''),
+                node['fabricNode']['attributes'].get('model', ''),
+            ])
+            continue
+
+        memory_in_gb = round(total_kb / 1048576, 2)
+        if total_kb < min_memory_kb:
+            result = FAIL_O
+            data.append([
+                node_id,
+                node['fabricNode']['attributes'].get('name', ''),
+                node['fabricNode']['attributes'].get('model', ''),
+                memory_in_gb,
+            ])
+
+    if missing_nodes:
+        return Result(
+            result=ERROR,
+            msg='Missing procMemUsage data for one or more affected N9300 nodes.',
+            headers=['NodeId', 'Name', 'Model'],
+            data=missing_nodes,
+        )
+
+    if result == FAIL_O:
+        return Result(result=result, headers=headers, data=data, recommended_action=recommended_action, doc_url=doc_url)
+
+    return Result(result=result)
+
 # ---- Script Execution ----
 
 
@@ -6275,9 +6299,9 @@ class CheckManager:
         pbr_high_scale_check,
         standby_sup_sync_check,
         isis_database_byte_check,
-        n9300_switch_memory_check,
         configpush_shard_check,
         auto_firmware_update_on_switch_check,
+        n9300_switch_memory_check,
 
     ]
     ssh_checks = [

tests/checks/n9300_switch_memory_24g_check/procMemUsage_invalid_total.json

@@ -0,0 +1,11 @@
+[
+    {
+        "procMemUsage": {
+            "attributes": {
+                "dn": "topology/pod-1/node-101/sys/procmem/memusage-sup",
+                "Modname": "sup",
+                "Total": "unknown"
+            }
+        }
+    }
+]

tests/checks/n9300_switch_memory_24g_check/procMemUsage_missing_affected_node.json

@@ -0,0 +1,11 @@
+[
+    {
+        "procMemUsage": {
+            "attributes": {
+                "dn": "topology/pod-1/node-201/sys/procmem/memusage-sup",
+                "Modname": "sup",
+                "Total": "26535444"
+            }
+        }
+    }
+]

tests/checks/n9300_switch_memory_24g_check/test_n9300_switch_memory_24g_check.py

@@ -60,6 +60,28 @@
             '',
             [],
         ),
+        # Invalid procMemUsage Total value
+        (
+            read_data(dir, "fabricNode_one.json"),
+            {
+                proc_mem_query: read_data(dir, "procMemUsage_invalid_total.json"),
+            },
+            "6.0(3c)",
+            script.ERROR,
+            'Failed to parse procMemUsage Total for one or more nodes.',
+            [["topology/pod-1/node-101/sys/procmem/memusage-sup", "unknown"]],
+        ),
+        # Missing procMemUsage data for affected node
+        (
+            read_data(dir, "fabricNode_one.json"),
+            {
+                proc_mem_query: read_data(dir, "procMemUsage_missing_affected_node.json"),
+            },
+            "6.0(3c)",
+            script.ERROR,
+            'Missing procMemUsage data for one or more affected N9300 nodes.',
+            [["101", "leaf101", "N9K-C93180YC-FX3"]],
+        ),
         # N9300 node with <24GB memory
         (
             read_data(dir, "fabricNode_two.json"),