logic + pytest cleanup

Author: monrog2

aci-preupgrade-validation-script.py

@@ -5297,6 +5297,36 @@ def apic_database_size_check(cversion, **kwargs):
         result = FAIL_UF
     return Result(result=result, headers=headers, data=data, recommended_action=recommended_action, doc_url=doc_url)
 
+
+@check_wrapper(check_title='configpushShardCont headTx')
+def configpush_shard_check(tversion, **kwargs):
+    result = NA
+    headers = ["dn", "headTx",  "tailTx"]
+    data = []
+    recommended_action = 'Contact Cisco TAC for Support before upgrade'
+    doc_url = 'https://datacenter.github.io/ACI-Pre-Upgrade-Validation-Script/validations/#policydist-configpushshardcont-defect'
+
+    if not tversion:
+        return Result(result=MANUAL, msg=TVER_MISSING) 
+
+    if tversion.older_than("6.1(4a)"):
+        result = PASS
+        configpushShardCont_api = 'configpushShardCont.json'
+        configpushShardCont_api += '?query-target-filter=or(ne(configpushShardCont.tailTx,"0"),ne(configpushShardCont.headTx,"0"))'
+        configpush_sh_cont = icurl('class', configpushShardCont_api)
+        if configpush_sh_cont:
+            for sh_cont in configpush_sh_cont:
+                headtx = sh_cont['configpushShardCont']['attributes']['headTx']
+                tailtx = sh_cont['configpushShardCont']['attributes']['tailTx']
+                if ((headtx != '0' and tailtx == '0') or (tailtx != '0' and headtx == '0')):
+                    sh_cont_dn = sh_cont['configpushShardCont']['attributes']['dn']
+                    data.append([sh_cont_dn, headtx, tailtx])
+
+    if data:
+        result = FAIL_O
+
+    return Result(result=result, headers=headers, data=data, recommended_action=recommended_action, doc_url=doc_url)
+
 # ---- Script Execution ----
 
 def parse_args(args):
@@ -5452,6 +5482,7 @@ def get_checks(api_only, debug_function):
         standby_sup_sync_check,
         stale_pcons_ra_mo_check,
         isis_database_byte_check,
+        configpush_shard_check,
 
     ]
     conn_checks = [

tests/configpuh_shard_cont_check/na-configpushShardCont.json

@@ -3,11 +3,11 @@
         "configpushShardCont": {
             "attributes": {
                 "childAction": "",
-                "dn": "configpush/sh-20",
-                "headTx": "0",
+                "dn": "configpush/sh-22",
+                "headTx": "576460752318322171",
                 "lcOwn": "local",
-                "modTs": "2025-07-01T16:54:36.155+00:00",
-                "shard": "20",
+                "modTs": "2025-06-28T21:32:58.754+00:00",
+                "shard": "2",
                 "status": "",
                 "tailTx": "0"
             }
@@ -17,11 +17,11 @@
         "configpushShardCont": {
             "attributes": {
                 "childAction": "",
-                "dn": "configpush/sh-2",
-                "headTx": "576460752318322171",
+                "dn": "configpush/sh-31",
+                "headTx": "516460756318314171",
                 "lcOwn": "local",
-                "modTs": "2025-06-28T21:32:58.754+00:00",
-                "shard": "2",
+                "modTs": "2025-06-23T18:12:06.867+00:00",
+                "shard": "3",
                 "status": "",
                 "tailTx": "0"
             }
@@ -31,13 +31,13 @@
         "configpushShardCont": {
             "attributes": {
                 "childAction": "",
-                "dn": "configpush/sh-17",
+                "dn": "configpush/sh-2",
                 "headTx": "0",
                 "lcOwn": "local",
-                "modTs": "2025-06-28T00:12:53.523+00:00",
-                "shard": "17",
+                "modTs": "2025-06-28T21:32:58.754+00:00",
+                "shard": "2",
                 "status": "",
-                "tailTx": "0"
+                "tailTx": "576460752318322171"
             }
         }
     },
@@ -46,12 +46,12 @@
             "attributes": {
                 "childAction": "",
                 "dn": "configpush/sh-3",
-                "headTx": "516460756318314171",
+                "headTx": "0",
                 "lcOwn": "local",
                 "modTs": "2025-06-23T18:12:06.867+00:00",
                 "shard": "3",
                 "status": "",
-                "tailTx": "0"
+                "tailTx": "516460756318314171"
             }
         }
     }

tests/configpuh_shard_cont_check/neg-configpushShardCont.json

@@ -0,0 +1,56 @@
+import os
+import pytest
+import logging
+import importlib
+from helpers.utils import read_data
+
+script = importlib.import_module("aci-preupgrade-validation-script")
+
+log = logging.getLogger(__name__)
+dir = os.path.dirname(os.path.abspath(__file__))
+
+# icurl queries
+configpushShardCont_api = 'configpushShardCont.json'
+configpushShardCont_api += '?query-target-filter=or(ne(configpushShardCont.tailTx,"0"),ne(configpushShardCont.headTx,"0"))'
+
+@pytest.mark.parametrize(
+    "icurl_outputs, tversion, expected_result",
+    [
+        # tversion not given 
+        (
+            {configpushShardCont_api: []},
+            None,
+            script.MANUAL,
+        ),
+        # Non-fixed Versions
+        (
+            # affected tversion, configpushShardCont_api has non-zero headTx / tailTx
+            {configpushShardCont_api: read_data(dir, "configpushShardCont_pos.json")},
+            "6.0(3a)",
+            script.FAIL_O,
+        ),
+        (
+            # affected tversion, all configpushShardCont_api tx are 0
+            {configpushShardCont_api: []},
+            "5.2(6a)",
+            script.PASS,
+        ),
+        # Fixed Versions
+        (
+            # non-affected tversion, configpushShardCont_api has non-zero headTx / tailTx
+            {configpushShardCont_api: read_data(dir, "configpushShardCont_pos.json")},
+            "6.1(6b)",
+            script.NA,
+        ),
+        (
+            # non-affected tversion, all configpushShardCont_api tx are 0
+            {configpushShardCont_api: []},
+            "6.1(4b)",
+            script.NA,
+        ),
+    ],
+)
+def test_logic(mock_icurl, tversion, expected_result):
+    tversion = script.AciVersion(tversion) if tversion else None
+    result = script.configpush_shard_check(1, 1, tversion)
+    assert result == expected_result