Skip to content

Commit ea26774

Browse files
Addressed PR comments
1 parent a5ed4ce commit ea26774

2 files changed

Lines changed: 3 additions & 12 deletions

File tree

aci-preupgrade-validation-script.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6595,7 +6595,6 @@ class CheckManager:
65956595
validate_32_64_bit_image_check,
65966596
fabric_link_redundancy_check,
65976597
apic_downgrade_compat_warning_check,
6598-
n9k_c93180yc_fx3_switch_memory_check,
65996598
svccore_excessive_data_check,
66006599

66016600
# Faults
@@ -6676,6 +6675,7 @@ class CheckManager:
66766675
rogue_ep_coop_exception_mac_check,
66776676
n9k_c9408_model_lem_count_check,
66786677
inband_management_policy_misconfig_check,
6678+
n9k_c93180yc_fx3_switch_memory_check,
66796679
]
66806680
ssh_checks = [
66816681
# General

tests/checks/n9k_c93180yc_fx3_switch_memory_check/test_n9k_c93180yc_fx3_switch_memory_check.py

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,12 @@
1616

1717

1818
@pytest.mark.parametrize(
19-
"fabric_nodes, icurl_outputs, tversion, expected_result, expected_msg, expected_data",
19+
"fabric_nodes, icurl_outputs, expected_result, expected_msg, expected_data",
2020
[
2121
# No nodes returned
2222
(
2323
[],
2424
{},
25-
"6.0(3c)",
2625
script.NA,
2726
'No N9K-C93180YC-FX3 switches found. Skipping.',
2827
[],
@@ -33,7 +32,6 @@
3332
{
3433
proc_mem_query: read_data(dir, "procMemUsage_node201_gt32gb.json"),
3534
},
36-
"6.0(3c)",
3735
script.NA,
3836
'No N9K-C93180YC-FX3 switches found. Skipping.',
3937
[],
@@ -44,7 +42,6 @@
4442
{
4543
proc_mem_query: read_data(dir, "procMemUsage_gt32gb.json"),
4644
},
47-
"6.0(3c)",
4845
script.PASS,
4946
'',
5047
[],
@@ -55,7 +52,6 @@
5552
{
5653
proc_mem_query: read_data(dir, "procMemUsage_all_gt32gb.json"),
5754
},
58-
"6.0(3c)",
5955
script.PASS,
6056
'',
6157
[],
@@ -66,7 +62,6 @@
6662
{
6763
proc_mem_query: read_data(dir, "procMemUsage_missing_affected_node.json"),
6864
},
69-
"6.0(3c)",
7065
script.ERROR,
7166
'Missing procMemUsage data for one or more affected N9K-C93180YC-FX3 nodes.',
7267
[["101", "leaf101", "N9K-C93180YC-FX3"]],
@@ -77,7 +72,6 @@
7772
{
7873
proc_mem_query: read_data(dir, "procMemUsage_mixed.json"),
7974
},
80-
"6.0(3c)",
8175
script.PASS,
8276
'',
8377
[],
@@ -88,7 +82,6 @@
8882
{
8983
proc_mem_query: read_data(dir, "procMemUsage_lt32gb.json"),
9084
},
91-
"6.0(3c)",
9285
script.MANUAL,
9386
(
9487
'One or more N9K-C93180YC-FX3 switches have less than 32GB of memory. '
@@ -102,7 +95,6 @@
10295
{
10396
proc_mem_query: read_data(dir, "procMemUsage_fail_and_missing.json"),
10497
},
105-
"6.0(3c)",
10698
script.MANUAL,
10799
(
108100
'Some N9K-C93180YC-FX3 nodes have insufficient memory and others are missing '
@@ -114,9 +106,8 @@
114106
),
115107
],
116108
)
117-
def test_logic(run_check, mock_icurl, fabric_nodes, tversion, expected_result, expected_msg, expected_data):
109+
def test_logic(run_check, mock_icurl, fabric_nodes, expected_result, expected_msg, expected_data):
118110
result = run_check(
119-
tversion=script.AciVersion(tversion),
120111
fabric_nodes=fabric_nodes,
121112
)
122113
assert result.result == expected_result

0 commit comments

Comments
 (0)