Skip to content

Commit 1bea834

Browse files
Addressed comments:recommended message,doc_url and rebased the code with latest changes
1 parent 6f82308 commit 1bea834

3 files changed

Lines changed: 9 additions & 23 deletions

File tree

aci-preupgrade-validation-script.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6059,7 +6059,7 @@ def n9k_c9408_model_lem_count_check(tversion, fabric_nodes, **kwargs):
60596059
headers = ["Node ID", "Switch Model", "LEM Model", "LEM Count"]
60606060
data = []
60616061
recommended_action = (
6062-
"Upgrade from pre-16.1(2f) to 16.1(2f) or later on N9K-C9408 with 6 or more N9K-X9400-16W LEMs can result in boot loop. Choose a different version."
6062+
"N9K-C9408 switches configured with >5 N9K-X9400-16W LEMs will enter a boot loop if upgraded to 16.1(2f)-16.1(5) or 16.2(1g). Please select a fix version."
60636063
)
60646064
doc_url = 'https://datacenter.github.io/ACI-Pre-Upgrade-Validation-Script/validations/#n9k-c9408-with-6-n9k-x9400-16w-lems'
60656065

@@ -6260,14 +6260,14 @@ class CheckManager:
62606260
clock_signal_component_failure_check,
62616261
stale_decomissioned_spine_check,
62626262
n9408_model_check,
6263-
n9k_c9408_model_lem_count_check,
62646263
pbr_high_scale_check,
62656264
standby_sup_sync_check,
62666265
isis_database_byte_check,
62676266
configpush_shard_check,
62686267
auto_firmware_update_on_switch_check,
62696268
n9k_c9408_model_lem_count_check,
62706269
auto_firmware_update_on_switch_check,
6270+
n9k_c9408_model_lem_count_check,
62716271

62726272
]
62736273
ssh_checks = [

docs/docs/validations.md

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -192,13 +192,9 @@ Items | Defect | This Script
192192
[Observer Database Size][d25] | CSCvw45531 | :white_check_mark: | :no_entry_sign:
193193
[Stale pconsRA Object][d26] | CSCwp22212 | :warning:{title="Deprecated"} | :no_entry_sign:
194194
[ISIS DTEPs Byte Size][d27] | CSCwp15375 | :white_check_mark: | :no_entry_sign:
195-
<<<<<<< HEAD
196195
[Policydist configpushShardCont Crash][d28] | CSCwp95515 | :white_check_mark: | :no_entry_sign:
197196
[Auto Firmware Update on Switch Discovery][d29] | CSCwe83941 | :white_check_mark: | :no_entry_sign:
198-
=======
199-
[Policydist configpushShardCont Crash][d28] | CSCwp95515 | :white_check_mark: |
200-
[N9K-C9408 with 6+ N9K-X9400-16W LEMs][d29] | CSCws82819 | :white_check_mark: | :no_entry_sign:
201-
>>>>>>> Updated the if condition for maintenance release,6.1(5e) and variable name for impacted nodes.Also, updated pytest test cases
197+
[N9K-C9408 with more than 5 N9K-X9400-16W LEMs][d30] | CSCws82819 | :white_check_mark: | :no_entry_sign:
202198

203199
[d1]: #ep-announce-compatibility
204200
[d2]: #eventmgr-db-size-defect-susceptibility
@@ -228,12 +224,9 @@ Items | Defect | This Script
228224
[d26]: #stale-pconsra-object
229225
[d27]: #isis-dteps-byte-size
230226
[d28]: #policydist-configpushshardcont-crash
231-
<<<<<<< HEAD
232227
[d29]: #auto-firmware-update-on-switch-discovery
233-
=======
234-
[d29]: #n9k-c9408-with-6-n9k-x9400-16w-lems
228+
[d30]: #n9k-c9408-with-more-than-5-n9k-x9400-16w-lems
235229

236-
>>>>>>> Added a new check for the bug 'CSCws82819N9K-C9408 boot loop on 16.1.2f and later with 6 or more LEMs'
237230

238231
## General Check Details
239232

@@ -2658,7 +2651,6 @@ Due to [CSCwp95515][59], upgrading to an affected version while having any `conf
26582651

26592652
If any instances of `configpushShardCont` are flagged by this script, Cisco TAC must be contacted to identify and resolve the underlying issue before performing the upgrade.
26602653

2661-
<<<<<<< HEAD
26622654
### Auto Firmware Update on Switch Discovery
26632655

26642656
[Auto Firmware Update on Switch Discovery][63] automatically upgrades a new switch to the target firmware version before registering it to the ACI fabric. This feature activates in three scenarios:
@@ -2677,17 +2669,14 @@ To avoid this risk, consider disabling Auto Firmware Update before upgrading to
26772669

26782670
!!! note
26792671
This issue occurs because older switch firmware versions are not compatible with switch images 6.0(3) or newer. The APIC version is not a factor.
2680-
=======
2681-
### N9K-C9408 with 6 or more N9K-X9400-16W LEMs
26822672

2683-
Due to defect [CSCws82819][62], upgrading from pre-16.1(2f) to 16.1(2f) or later can result in a boot loop when a `N9K-C9408` node has 6 or more installed N9K-X9400-16W` LEMs.
2673+
### N9K-C9408 with more than 5 N9K-X9400-16W LEMs
26842674

2685-
Recommended action:
2675+
Due to defect [CSCws82819][64], `N9K-C9408` switch will experience a boot loop with dt_helper process crash if upgraded from pre-16.1(2f) to 16.1(2f)-16.1(5) or 16.2(1g) with more than 5 `N9K-X9400-16W` LEMs installed.
26862676

2687-
Please use a different target version.
2677+
To avoid this issue, please select a fix version.
26882678

26892679

2690-
>>>>>>> Removed if conditio for model check and modified the recommended actions
26912680

26922681

26932682
[0]: https://github.com/datacenter/ACI-Pre-Upgrade-Validation-Script
@@ -2752,9 +2741,6 @@ Please use a different target version.
27522741
[59]: https://bst.cloudapps.cisco.com/bugsearch/bug/CSCwp95515
27532742
[60]: https://www.cisco.com/c/en/us/solutions/collateral/data-center-virtualization/application-centric-infrastructure/white-paper-c11-743951.html#Inter
27542743
[61]: https://www.cisco.com/c/en/us/solutions/collateral/data-center-virtualization/application-centric-infrastructure/white-paper-c11-743951.html#EnablePolicyCompression
2755-
<<<<<<< HEAD
27562744
[62]: https://bst.cloudapps.cisco.com/bugsearch/bug/CSCwe83941
27572745
[63]: 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-auto-firmware-update.html
2758-
=======
2759-
[62]: https://bst.cloudapps.cisco.com/bugsearch/bug/CSCws82819
2760-
>>>>>>> Added a new check for the bug 'CSCws82819N9K-C9408 boot loop on 16.1.2f and later with 6 or more LEMs'
2746+
[64]: https://bst.cloudapps.cisco.com/bugsearch/bug/CSCws82819

tests/checks/n9k_c9408_model_lem_count_check/test_n9k_c9408_model_lem_count_check.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
test_function = "n9k_c9408_model_lem_count_check"
1313

14-
14+
# icurl queries
1515
eqptLC_api = 'eqptLC.json?query-target-filter=eq(eqptLC.model,"N9K-X9400-16W")'
1616

1717

0 commit comments

Comments
 (0)