Skip to content

Commit d849e8e

Browse files
authored
fix: Add cversion check for post_upgrade_cb_check (#377)
1 parent 6a2fe7f commit d849e8e

2 files changed

Lines changed: 6 additions & 0 deletions

File tree

aci-preupgrade-validation-script.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4387,6 +4387,10 @@ def post_upgrade_cb_check(cversion, tversion, **kwargs):
43874387
recommended_action = 'Contact Cisco TAC with Output'
43884388
doc_url = 'https://datacenter.github.io/ACI-Pre-Upgrade-Validation-Script/validations/#post-upgrade-callback-integrity'
43894389

4390+
# Post Upgrade Status is natively checked by APIC starting from 6.0(6)
4391+
if cversion.newer_than("6.0(6a)"):
4392+
return Result(result=NA, msg=VER_NOT_AFFECTED, doc_url=doc_url)
4393+
43904394
new_mo_dict = {
43914395
"infraImplicitSetPol": {
43924396
"CreatedBy": "",

tests/checks/post_upgrade_cb_check/test_post_upgrade_cb_check.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@
6969
@pytest.mark.parametrize(
7070
"icurl_outputs, cversion, tversion, expected_result",
7171
[
72+
# Current Version not affected
73+
(mo_count_fail, "6.0(6b)", None, script.NA),
7274
# Target Version not supplied
7375
(mo_count_fail, "3.2(8f)", None, script.POST),
7476
# Target Version newer than current (i.e. APIC upgrade not done yet)

0 commit comments

Comments
 (0)