Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add new hw rev + tver check #150

Merged
merged 3 commits into from
Aug 13, 2024
Merged

add new hw rev + tver check #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff90da6
add new hw rev + tver check
monrog2 Aug 13, 2024
b44fff6
doc update to include fix
monrog2 Aug 13, 2024
808ba88
update doc link
monrog2 Aug 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions aci-preupgrade-validation-script.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2894,19 +2894,18 @@ def fabricdomain_name_check(index, total_checks, cversion, tversion, **kwargs):
return result


# TODO: Add tversion handling when CSCwb86706 is fixed.
def sup_hwrev_check(index, total_checks, cversion, tversion, **kwargs):
title = 'Spine SUP HW Revision'
result = FAIL_O
msg = ''
headers = ["Pod", "Node", "Sup Slot", "Part Number"]
data = []
recommended_action = "Do not upgrade yet. Contact TAC and share these results."
doc_url = 'https://bst.cloudapps.cisco.com/bugsearch/bug/CSCwb86706'
recommended_action = "Consider changing target version to a fixed release from CSCwf44222"
doc_url = 'https://datacenter.github.io/ACI-Pre-Upgrade-Validation-Script/validations/#spine-sup-hw-revision'

print_title(title, index, total_checks)

if cversion.newer_than("5.2(1a)") and cversion.older_than("6.0(1a)"):
if cversion.newer_than("5.2(1a)") and cversion.older_than("6.0(1a)") and tversion.older_than("5.2(8f)") or (tversion.major1 == "6" and tversion.older_than("6.0(3d)")):
sup_re = r'/.+(?P<supslot>supslot-\d+)'
sups = icurl('class', 'eqptSpCmnBlk.json?&query-target-filter=wcard(eqptSpromSupBlk.dn,"sup")')
if not sups:
Expand All @@ -2915,7 +2914,7 @@ def sup_hwrev_check(index, total_checks, cversion, tversion, **kwargs):

for sup in sups:
prtNum = sup['eqptSpCmnBlk']['attributes']['prtNum']
if prtNum in ['73-18562-02', '73-18570-02']:
if prtNum in ['73-18562-02', '73-18570-02', '73-18570-03']:
dn = re.search(node_regex+sup_re, sup['eqptSpCmnBlk']['attributes']['dn'])
pod_id = dn.group("pod")
node_id = dn.group("node")
Expand Down
10 changes: 7 additions & 3 deletions docs/docs/validations.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ Items | Defect | This Script
[Internal VLAN Pool Check][d6] | CSCvw33061 | :white_check_mark: | :no_entry_sign: |:white_check_mark:
[APIC CA Cert Validation][d7] | CSCvy35257 | :white_check_mark: | :no_entry_sign: |:no_entry_sign:
[FabricDomain Name Check][d8] | CSCwf80352 | :white_check_mark: | :no_entry_sign: |:no_entry_sign:
[Spine SUP HW Revision Check][d9] | CSCwb86706 | :white_check_mark: | :no_entry_sign: |:no_entry_sign:
[Spine SUP HW Revision][d9] | CSCwb86706 | :white_check_mark: | :no_entry_sign: |:no_entry_sign:
[SUP-A/A+ High Memory Usage][d10] | CSCwh39489 | :white_check_mark: | :no_entry_sign: |:no_entry_sign:
[VMM Uplink Container with empty Actives][d11] | CSCvr96408 | :white_check_mark: | :no_entry_sign: |:no_entry_sign:
[CoS 3 with Dynamic Packet Prioritization][d12] | CSCwf05073 | :white_check_mark: | :no_entry_sign: |:no_entry_sign:
Expand Down Expand Up @@ -1782,10 +1782,12 @@ The script checks if the target version is 6.0(2) and if the fabric name contain

### Spine SUP HW Revision

Due to the defect CSCwb86706, ACI modular spine switches may not be able to boot after an upgrade depending on the hardware revision (part number) of the SUP modules.
Due to the defect [CSCwb86706][29], ACI modular spine switches may not be able to boot after an upgrade depending on the hardware revision (part number) of the SUP modules.

The script checks if the version and the SUP modules are susceptible to the defect.

If this check is flagged, Known Fixed Releases documented in [CSCwf44222][30] should be assessed as a target image to avoid the defect condition.

### CoS 3 with Dynamic Packet Prioritization

Due to the defect CSCwf05073, ACI unexpectedly assigning a COS3 value to traffic egressing front ports.
Expand Down Expand Up @@ -1964,4 +1966,6 @@ If found, the target version of your upgrade should be a version with a fix for
[25]: https://bst.cloudapps.cisco.com/bugsearch/bug/CSCwb08081
[26]: https://www.cisco.com/c/en/us/td/docs/switches/datacenter/aci/apic/sw/kb/b_Cisco_ACI_and_Forward_Error_Correction.html#Cisco_Reference.dita_5cef69b3-b7fa-4bde-ba60-38129c9e7d82
[27]: https://bst.cloudapps.cisco.com/bugsearch/bug/CSCwb91766
[28]: https://www.cisco.com/c/en/us/td/docs/dcn/aci/apic/all/apic-installation-aci-upgrade-downgrade/Cisco-APIC-Installation-ACI-Upgrade-Downgrade-Guide/m-aci-upgrade-downgrade-architecture.html#Cisco_Reference.dita_22480abb-4138-416b-8dd5-ecde23f707b4
[28]: https://www.cisco.com/c/en/us/td/docs/dcn/aci/apic/all/apic-installation-aci-upgrade-downgrade/Cisco-APIC-Installation-ACI-Upgrade-Downgrade-Guide/m-aci-upgrade-downgrade-architecture.html#Cisco_Reference.dita_22480abb-4138-416b-8dd5-ecde23f707b4
[29]: https://bst.cloudapps.cisco.com/bugsearch/bug/CSCwb86706
[30]: https://bst.cloudapps.cisco.com/bugsearch/bug/CSCwf44222
10 changes: 10 additions & 0 deletions tests/sup_hwrev_check/eqptSpCmnBlk_POS.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,15 @@
"prtNum": "73-18570-02"
}
}
},
{
"eqptSpCmnBlk": {
"attributes": {
"dn": "topology/pod-1/node-1203/sys/ch/supslot-1/sup/spsup/spcmn",
"oem": "Cisco Systems, Inc.",
"pdNum": "N9K-SUP-B",
"prtNum": "73-18570-03"
}
}
}
]
17 changes: 12 additions & 5 deletions tests/sup_hwrev_check/test_sup_hwrev_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,21 @@
(
{eqptSpCmnBlk: read_data(dir, "eqptSpCmnBlk_POS.json")},
"5.2(1g)",
"6.0(2h)",
"5.2(8e)",
script.FAIL_O,
),
# Affected sups, no longer on 5.2
# Affected Sups, going to fixed version
(
{eqptSpCmnBlk: read_data(dir, "eqptSpCmnBlk_POS.json")},
"6.0(3a)",
"6.0(2h)",
"5.2(1g)",
"5.2(8f)",
script.PASS,
),
# Affected sups, going to fixed version
(
{eqptSpCmnBlk: read_data(dir, "eqptSpCmnBlk_POS.json")},
"6.0(1a)",
"6.0(3d)",
script.PASS,
),
# affected sups, not yet on 5.2
Expand All @@ -42,7 +49,7 @@
(
{eqptSpCmnBlk: read_data(dir, "eqptSpCmnBlk_NEG.json")},
"5.2(1g)",
"6.0(2h)",
"5.2(8e)",
script.PASS,
),
],
Expand Down