Merge remote-tracking branch 'upstream/v4.2.0-dev' into tmp_dir_snapshot

Author: monrog2

aci-preupgrade-validation-script.py

@@ -3880,27 +3880,83 @@ def target_version_compatibility_check(cversion, tversion, **kwargs):
     return Result(result=result, headers=headers, data=data, recommended_action=recommended_action, doc_url=doc_url)
 
 
-@check_wrapper(check_title="Gen 1 switch compatibility")
-def gen1_switch_compatibility_check(tversion, fabric_nodes, **kwargs):
+@check_wrapper(check_title="Supported hardware compatibility")
+def supported_hardware_check(tversion, fabric_nodes, **kwargs):
     result = FAIL_UF
-    headers = ["Target Version", "Node ID", "Model", "Warning"]
+    headers = ["Target Version", "Node ID", "Model", "Type", "Warning"]
+    data = []
+    unformatted_headers = ["Target Version", "DN", "Model", "Type", "Warning"]
+    unformatted_data = []
     gen1_models = ["N9K-C9336PQ", "N9K-X9736PQ", "N9K-C9504-FM", "N9K-C9508-FM", "N9K-C9516-FM", "N9K-C9372PX-E",
                    "N9K-C9372TX-E", "N9K-C9332PQ", "N9K-C9372PX", "N9K-C9372TX", "N9K-C9396PX", "N9K-C9396TX",
                    "N9K-C93128TX"]
-    data = []
+    unsupported_6_0_1_switch_models = ["N9K-C93120TX"]
+    unsupported_6_1_1_switch_models = ["N9K-C93180LC-EX"]
+    unsupported_5_0_1_exp_module_models = ["N9K-M12PQ", "N9K-M6PQ", "N9K-M6PQ-E"]
+    unsupported_6_1_1_fex_models = ["N2K-C2332TQ-10GT", "N2K-C2348TQ-10GE", "N2K-C2232PP-10GE", "N2K-C2232TM-E-10GE", "N2K-C2348TQ-10G-E"]
+    unsupported_6_1_1_sup_models = ["N9K-SUP-A", "N9K-SUP-B"]
     recommended_action = 'Select supported target version or upgrade hardware'
-    doc_url = 'https://datacenter.github.io/ACI-Pre-Upgrade-Validation-Script/validations/#compatibility-switch-hardware-gen1'
+    doc_url = 'https://datacenter.github.io/ACI-Pre-Upgrade-Validation-Script/validations/#supported-hardware-compatibility'
 
-    if not tversion:
-        return Result(result=MANUAL, msg=TVER_MISSING)
-    if tversion.newer_than("5.0(1a)"):
+    if not tversion.older_than("5.0(1a)"):
         for node in fabric_nodes:
-            if node['fabricNode']['attributes']['model'] in gen1_models:
-                data.append([str(tversion), node['fabricNode']['attributes']['id'],
-                            node['fabricNode']['attributes']['model'], 'Not supported on 5.x+'])
-    if not data:
+            model = node['fabricNode']['attributes']['model']
+            if model in gen1_models:
+                data.append([str(tversion), node['fabricNode']['attributes']['id'], model, 'Switch', 'Not supported on 5.x+'])
+
+        eqptLCs = icurl('class', 'eqptLC.json')
+        for eqptLC in eqptLCs:
+            model = eqptLC['eqptLC']['attributes']['model']
+            if model in unsupported_5_0_1_exp_module_models:
+                dn = re.search(node_regex, eqptLC['eqptLC']['attributes']['dn'])
+                if dn:
+                    data.append([str(tversion), dn.group('node'), model, 'Expansion Module', 'Not supported on 5.x+'])
+                else:
+                    unformatted_data.append([str(tversion), eqptLC['eqptLC']['attributes']['dn'], model, 'Expansion Module', 'Not supported on 5.x+'])
+
+    if not tversion.older_than("6.0(1a)"):
+        for node in fabric_nodes:
+            model = node['fabricNode']['attributes']['model']
+            if model in unsupported_6_0_1_switch_models:
+                data.append([str(tversion), node['fabricNode']['attributes']['id'], model, 'Switch', 'Deprecated from 6.0(1)+'])
+
+    if not tversion.older_than("6.1(1f)"):
+        for node in fabric_nodes:
+            model = node['fabricNode']['attributes']['model']
+            if model in unsupported_6_1_1_switch_models:
+                data.append([str(tversion), node['fabricNode']['attributes']['id'], model, 'Switch', 'Deprecated from 6.1(1)+'])
+
+        eqptExtChs = icurl('class', 'eqptExtCh.json')
+        for eqptExtCh in eqptExtChs:
+            model = eqptExtCh['eqptExtCh']['attributes']['model']
+            if model in unsupported_6_1_1_fex_models:
+                dn = re.search(node_regex, eqptExtCh['eqptExtCh']['attributes']['dn'])
+                if dn:
+                    data.append([str(tversion), dn.group('node'), model, 'FEX', 'Deprecated from 6.1(1)+'])
+                else:
+                    unformatted_data.append([str(tversion), eqptExtCh['eqptExtCh']['attributes']['dn'], model, 'FEX', 'Deprecated from 6.1(1)+'])
+
+        eqptSupCs = icurl('class', 'eqptSupC.json')
+        for eqptSupC in eqptSupCs:
+            model = eqptSupC['eqptSupC']['attributes']['model']
+            if model in unsupported_6_1_1_sup_models:
+                dn = re.search(node_regex, eqptSupC['eqptSupC']['attributes']['dn'])
+                if dn:
+                    data.append([str(tversion), dn.group('node'), model, 'Supervisor', 'Deprecated from 6.1(1)+'])
+                else:
+                    unformatted_data.append([str(tversion), eqptSupC['eqptSupC']['attributes']['dn'], model, 'Supervisor', 'Deprecated from 6.1(1)+'])
+
+    if not data and not unformatted_data:
         result = PASS
-    return Result(result=result, headers=headers, data=data, recommended_action=recommended_action, doc_url=doc_url)
+    return Result(
+        result=result,
+        headers=headers,
+        data=data,
+        unformatted_headers=unformatted_headers,
+        unformatted_data=unformatted_data,
+        recommended_action=recommended_action,
+        doc_url=doc_url,
+    )
 
 
 @check_wrapper(check_title="Contract Port 22 Defect")
@@ -6431,7 +6487,7 @@ class CheckManager:
     api_checks = [
         # General Checks
         target_version_compatibility_check,
-        gen1_switch_compatibility_check,
+        supported_hardware_check,
         r_leaf_compatibility_check,
         cimc_compatibilty_check,
         apic_cluster_health_check,

docs/docs/validations.md

@@ -37,7 +37,8 @@ Items                                                        | This Script
 [Fabric Link Redundancy][g17]                                | :white_check_mark: | :no_entry_sign:
 [APIC Database Size][g18]                                    | :white_check_mark: | :no_entry_sign:
 [APIC downgrade compatibility when crossing 6.2 release][g19]| :white_check_mark: | :no_entry_sign:
-[Svccore Excessive Data Check][g20]                          | :white_check_mark: | :no_entry_sign:
+[Supported Hardware Compatibility][g20]                      | :white_check_mark: | :no_entry_sign:
+[Svccore Excessive Data Check][g21]                          | :white_check_mark: | :no_entry_sign:
 
 [g1]: #compatibility-target-aci-version
 [g2]: #compatibility-cimc-version
@@ -58,7 +59,8 @@ Items                                                        | This Script
 [g17]: #fabric-link-redundancy
 [g18]: #apic-database-size
 [g19]: #apic-downgrade-compatibility-when-crossing-62-release
-[g20]: #svccore-excessive-data-check
+[g20]: #supported-hardware-compatibility
+[g21]: #svccore-excessive-data-check
 
 ### Fault Checks
 Items                                         | Faults         | This Script       | APIC built-in
@@ -267,6 +269,17 @@ The script checks the presence of generation one switches when the upgrade is cr
 Or you can check the [Release Note 15.0(1) of ACI switches][3] to see the list of generation one switches, typically the one without any suffix such as N9K-C9372PX, that are no longer supported from 15.0(1) release.
 
 
+### Supported Hardware Compatibility
+
+The script checks the presence of deprecated hardware in the fabric.
+
+The list of supported and unsupported hardware is populated from the Release Notes across all ACI releases. This means the check covers hardware compatibility changes introduced in any version, not just the most recent release. As new release notes are published and hardware is deprecated, this list is updated accordingly.
+
+Refer the [Release Note 15.0(1) of ACI switches][3] to see the list of unsuporrted hardware for your desired target versions. Prior upgrading to target version, replace the unsupported hardware elements in your fabric with other supported hardware.
+
+Contact cisco TAC for further assistance.
+
+
 ### Compatibility (Remote Leaf Switch)
 
 The script checks the requirement to use remote leaf switches on the target version.

tests/checks/gen1_switch_compatibility_check/fabricNode_no_gen1.json

@@ -0,0 +1,10 @@
+[
+  {
+    "eqptExtCh": {
+      "attributes": {
+        "dn": "topology/pod-1/node-101/sys/ch/supslot-1/extch-101",
+        "model": "N2K-C2348UPQ"
+      }
+    }
+  }
+]

tests/checks/gen1_switch_compatibility_check/fabricNode_with_gen1.json

@@ -0,0 +1,18 @@
+[
+  {
+    "eqptExtCh": {
+      "attributes": {
+        "dn": "topology/pod-1/node-101/sys/ch/supslot-1/extch-101",
+        "model": "N2K-C2232PP-10GE"
+      }
+    }
+  },
+  {
+    "eqptExtCh": {
+      "attributes": {
+        "dn": "topology/pod-1/node-101/sys/ch/supslot-1/extch-102",
+        "model": "N2K-C2348UPQ"
+      }
+    }
+  }
+]

tests/checks/gen1_switch_compatibility_check/test_gen1_switch_compatibility_check.py

@@ -0,0 +1,10 @@
+[
+  {
+    "eqptLC": {
+      "attributes": {
+        "dn": "topology/pod-1/node-1001/sys/ch/lcslot-1/lc",
+        "model": "N9K-X9732C-EX"
+      }
+    }
+  }
+]

tests/checks/supported_hardware_check/eqptExtCh_supported_only.json

@@ -0,0 +1,10 @@
+[
+  {
+    "eqptLC": {
+      "attributes": {
+        "dn": "sys/ch/lcslot-1/lc",
+        "model": "N9K-M6PQ"
+      }
+    }
+  }
+]

tests/checks/supported_hardware_check/eqptExtCh_with_unsupported.json

@@ -0,0 +1,18 @@
+[
+  {
+    "eqptLC": {
+      "attributes": {
+        "dn": "topology/pod-1/node-1001/sys/ch/lcslot-1/lc",
+        "model": "N9K-M6PQ"
+      }
+    }
+  },
+  {
+    "eqptLC": {
+      "attributes": {
+        "dn": "topology/pod-1/node-1001/sys/ch/lcslot-2/lc",
+        "model": "N9K-X9732C-EX"
+      }
+    }
+  }
+]