Skip to content

Commit 6f07e2c

Browse files
committed
Updated the pytest files
1 parent d41ad25 commit 6f07e2c

3 files changed

Lines changed: 4 additions & 34 deletions

File tree

docs/docs/validations.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2760,6 +2760,7 @@ To avoid this issue, change the target version to another version. Or verify tha
27602760

27612761
This bug [CSCwt78235][67] validates `F0467` faults where `changeSet` contains 'bgpProt-policy-already-existing'. The fault indicates conflicting BGP protocol timer policy under an L3Outs deployed in same vrf under same node. If this fault is not resolved, l3out will not be programmed properly in the leaf after the upgrade.
27622762

2763+
27632764
[0]: https://github.com/datacenter/ACI-Pre-Upgrade-Validation-Script
27642765
[1]: https://www.cisco.com/c/dam/en/us/td/docs/Website/datacenter/apicmatrix/index.html
27652766
[2]: https://www.cisco.com/c/en/us/support/switches/nexus-9000-series-switches/products-release-notes-list.html

tests/checks/bgp_timer_policy_already_existing_check/faultDelegate_UNFORMATTED.json

Lines changed: 0 additions & 11 deletions
This file was deleted.

tests/checks/bgp_timer_policy_already_existing_check/test_bgp_timer_policy_already_existing_check.py

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,21 @@
1212
faultDelegates = 'faultDelegate.json?query-target-filter=and(eq(faultDelegate.code,"F0467"),wcard(faultDelegate.changeSet,"bgpProt-policy-already-existing"))'
1313

1414
@pytest.mark.parametrize(
15-
"icurl_outputs, tversion, expected_result, expected_data, expected_unformatted_data",
15+
"icurl_outputs, tversion, expected_result, expected_data",
1616
[
1717
# target release not affected (> 6.2(1g))
1818
(
1919
{faultDelegates: read_data(dir, "faultDelegate_POS.json")},
2020
"6.2(2a)",
2121
script.NA,
2222
[],
23-
[],
2423
),
2524
# target release not affected on 6.1 train (> 6.1(5e))
2625
(
2726
{faultDelegates: read_data(dir, "faultDelegate_POS.json")},
2827
"6.1(5f)",
2928
script.NA,
3029
[],
31-
[],
3230
),
3331
# boundary version is still affected for strict newer_than check
3432
(
@@ -49,7 +47,6 @@
4947
"configQual:bgpProt-policy-already-existing, configSt:failed-to-apply, temporaryError:no",
5048
],
5149
],
52-
[],
5350
),
5451
# 6.1 boundary version is still affected for strict newer_than check
5552
(
@@ -70,7 +67,6 @@
7067
"configQual:bgpProt-policy-already-existing, configSt:failed-to-apply, temporaryError:no",
7168
],
7269
],
73-
[],
7470
),
7571
# target release affected on 6.1 train (< 6.1(5e))
7672
(
@@ -91,32 +87,16 @@
9187
"configQual:bgpProt-policy-already-existing, configSt:failed-to-apply, temporaryError:no",
9288
],
9389
],
94-
[],
95-
),
96-
(
97-
{faultDelegates: read_data(dir, "faultDelegate_UNFORMATTED.json")},
98-
"6.1(5a)",
99-
script.FAIL_O,
100-
[],
101-
[
102-
[
103-
"F0467",
104-
"resPolCont/rtdOutCont/rtdOutDef-[uni/invalid]/nwissues",
105-
"configQual:bgpProt-policy-already-existing, configSt:failed-to-apply, temporaryError:no",
106-
],
107-
],
10890
),
10991
(
11092
{faultDelegates: read_data(dir, "faultDelegate_NEG.json")},
11193
"6.1(5a)",
11294
script.PASS,
11395
[],
114-
[],
11596
),
11697
],
11798
)
118-
def test_logic(run_check, mock_icurl, tversion, expected_result, expected_data, expected_unformatted_data):
99+
def test_logic(run_check, mock_icurl, tversion, expected_result, expected_data):
119100
result = run_check(tversion=script.AciVersion(tversion))
120101
assert result.result == expected_result
121-
assert result.data == expected_data
122-
assert result.unformatted_data == expected_unformatted_data
102+
assert result.data == expected_data

0 commit comments

Comments
 (0)