Support APIC 6.1(6) CIMC release-note versions

aci-preupgrade-validation-script.py

@@ -151,6 +151,101 @@
         "4.2(3e)",
         "4.2(3b)",
     ),
+    ("6.1(6)", "apicg5"): (
+        "6.0(2.260143)",
+        "6.0(2.260044)",
+        "6.0(1.250192)",
+        "6.0(1.250131)",
+        "4.3(6.250044)",
+    ),
+    ("6.1(6)", "apicl2"): (
+        "4.1(2m)",
+        "4.1(2k)",
+        "4.1(2g)",
+        "4.1(2b)",
+        "4.1(1g)",
+        "4.1(1c)",
+        "4.0(2g)",
+        "3.0(4d)",
+        "3.0(3f)",
+    ),
+    ("6.1(6)", "apicl3"): (
+        "4.3(2.260020)",
+        "4.3(2.260007)",
+        "4.3(2.250016)",
+        "4.3(2.240077)",
+        "4.3(2.240009)",
+        "4.3(2.230207)",
+        "4.2(3e)",
+        "4.2(3b)",
+        "4.2(2a)",
+        "4.1(3m)",
+        "4.1(3f)",
+        "4.1(3d)",
+        "4.1(3c)",
+        "4.1(1g)",
+        "4.1(1d)",
+        "4.0(4e)",
+        "4.0(2g)",
+        "4.0(1a)",
+    ),
+    ("6.1(6)", "apicl4"): (
+        "6.0(2.260143)",
+        "6.0(2.260044)",
+        "6.0(1.250192)",
+        "6.0(1.250131)",
+        "4.3(6.250053)",
+        "4.3(4.252002)",
+        "4.3(4.241063)",
+        "4.3(2.240009)",
+        "4.3(2.230207)",
+        "4.2(3e)",
+        "4.2(3b)",
+    ),
+    ("6.1(6)", "apicm2"): (
+        "4.1(2m)",
+        "4.1(2k)",
+        "4.1(2g)",
+        "4.1(2b)",
+        "4.1(1g)",
+        "4.1(1c)",
+        "4.0(2g)",
+        "3.0(4d)",
+        "3.0(3f)",
+    ),
+    ("6.1(6)", "apicm3"): (
+        "4.3(2.260020)",
+        "4.3(2.260007)",
+        "4.3(2.250016)",
+        "4.3(2.240077)",
+        "4.3(2.240009)",
+        "4.3(2.230207)",
+        "4.2(3e)",
+        "4.2(3b)",
+        "4.2(2a)",
+        "4.1(3m)",
+        "4.1(3f)",
+        "4.1(3d)",
+        "4.1(3c)",
+        "4.1(1g)",
+        "4.1(1d)",
+        "4.0(4e)",
+        "4.0(2g)",
+        "4.0(1a)",
+    ),
+    ("6.1(6)", "apicm4"): (
+        "6.0(2.260143)",
+        "6.0(2.260044)",
+        "6.0(1.250192)",
+        "6.0(1.250131)",
+        "4.3(6.250053)",
+        "4.3(4.252002)",
+        "4.3(4.241063)",
+        "4.3(2.240009)",
+        "4.3(2.230207)",
+        "4.2(3e)",
+        "4.2(3b)",
+    ),
 }
 # END GENERATED CIMC RELEASE NOTE SUPPORT
 # regex constants

tests/checks/cimc_compatibilty_check/test_cimc_compatibilty_check.py

@@ -36,11 +36,11 @@
     compatRsSuppHwM4_531_api: [{"compatRsSuppHw": {"attributes": {"cimcVersion": "4.0(2g)"}}}],
 }
 
-def release_note_supported_outputs(model, cimc_version):
+def release_note_supported_outputs(model, cimc_version, target_version="6.1(5)"):
     apic_model = "APIC-SERVER-{}".format(model[4:].upper())
     compat_api = (
-        "uni/fabric/compcat-default/ctlrfw-apic-6.1(5)"
-        "/rssuppHw-[uni/fabric/compcat-default/ctlrhw-{}].json".format(model)
+        "uni/fabric/compcat-default/ctlrfw-apic-{}".format(target_version)
+        + "/rssuppHw-[uni/fabric/compcat-default/ctlrhw-{}].json".format(model)
     )
     return {
         eqptCh_api: [
@@ -69,7 +69,7 @@ def release_note_supported_outputs(model, cimc_version):
 
 
 release_note_supported_cases = [
-    release_note_supported_outputs(model, cimc_version)
+    release_note_supported_outputs(model, cimc_version, target)
     for (target, model), cimc_versions in script.CIMC_RELEASE_NOTE_SUPPORT.items()
     if target == "6.1(5)"
     for cimc_version in cimc_versions
@@ -92,6 +92,13 @@ def release_note_supported_outputs(model, cimc_version):
             "5.2(8g)",
             script.PASS,
         ),
+        # Issue #484: CIMC 4.2(2a) is release-note supported on APIC-M3 for 6.1(6).
+        (
+            release_note_supported_outputs("apicm3", "4.2(2a)", "6.1(6)"),
+            "6.1(6g)",
+            "6.0(9e)",
+            script.PASS,
+        ),
         # The generic compatibility check does not own CSCwo74485 upgrade-order guidance.
         (
             release_note_supported_615_outputs,

tools/cimc_release_note_sources.json

@@ -24,5 +24,31 @@
       "2.0(9c)",
       "2.0(3i)"
     ]
+  },
+  "6.1(6)": {
+    "url": "https://www.cisco.com/c/en/us/td/docs/dcn/aci/apic/6x/release-notes/cisco-apic-release-notes-616.html#Miscellaneouscompatibilityinformation",
+    "expected_models": [
+      "apicg5",
+      "apicl2",
+      "apicl3",
+      "apicl4",
+      "apicm2",
+      "apicm3",
+      "apicm4"
+    ],
+    "minimum_versions_per_model": {
+      "apicg5": 5,
+      "apicl2": 9,
+      "apicl3": 18,
+      "apicl4": 11,
+      "apicm2": 9,
+      "apicm3": 18,
+      "apicm4": 11
+    },
+    "ignored_unqualified_versions": [
+      "2.0(13i)",
+      "2.0(9c)",
+      "2.0(3i)"
+    ]
   }
 }