Skip to content

Commit 2b46fea

Browse files
committed
added version c heck for
CSCwd37387
1 parent 68f3673 commit 2b46fea

2 files changed

Lines changed: 23 additions & 11 deletions

File tree

aci-preupgrade-validation-script.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3889,9 +3889,6 @@ def llfc_susceptibility_check(cversion, tversion, vpc_node_ids, **kwargs):
38893889
recommended_action = 'Manually change Peer devices Transmit(send) Flow Control to off prior to switch Upgrade'
38903890
doc_url = 'https://bst.cloudapps.cisco.com/bugsearch/bug/CSCvo27498'
38913891

3892-
if not tversion:
3893-
return Result(result=MANUAL, msg=TVER_MISSING)
3894-
38953892
if not vpc_node_ids:
38963893
return Result(result=PASS, msg="No VPC Nodes found. Not susceptible.")
38973894

@@ -3900,7 +3897,8 @@ def llfc_susceptibility_check(cversion, tversion, vpc_node_ids, **kwargs):
39003897
sx_affected = True
39013898

39023899
# Check for Copper 1000base-T, CSCvj67507 fixed by CSCwd37387
3903-
if cversion.older_than("4.1(1i)") and tversion.newer_than("4.1(1h)") and tversion.older_than("5.2(7f)"):
3900+
if ((cversion.older_than("4.1(1i)") or cversion.same_as("4.1(1i)")) and tversion.older_than("5.2(7f)") and tversion.newer_than("4.0(1h")) or (cversion.older_than("5.2(7f)") and tversion.newer_than("5.2(7f)")
3901+
or (tversion.older_than("5.2(7f)") and cversion.same_as(tversion))):
39043902
t_affected = True
39053903

39063904
if sx_affected or t_affected:

tests/checks/llfc_susceptibility_check/test_llfc_susceptibility_check.py

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,27 @@
1818
@pytest.mark.parametrize(
1919
"icurl_outputs, cversion, tversion, vpc_node_ids, expected_result",
2020
[
21+
(
22+
{ethpmFcots: read_data(dir, "ethpmFcot.json")},
23+
"5.2(5c)",
24+
"6.1(5e)",
25+
["101", "103", "204", "206"],
26+
script.MANUAL,
27+
),
28+
(
29+
{ethpmFcots: read_data(dir, "ethpmFcot.json")},
30+
"4.1(1i)",
31+
"5.2(2a)",
32+
["101", "103", "204", "206"],
33+
script.MANUAL,
34+
),
35+
(
36+
{ethpmFcots: read_data(dir, "ethpmFcot.json")},
37+
"5.2(7f)",
38+
"6.1(5c)",
39+
["101", "103", "204", "206"],
40+
script.PASS,
41+
),
2142
(
2243
{ethpmFcots: read_data(dir, "ethpmFcot.json")},
2344
"4.2(1b)",
@@ -53,13 +74,6 @@
5374
["101", "103", "204", "206"],
5475
script.PASS,
5576
),
56-
(
57-
{ethpmFcots: read_data(dir, "ethpmFcot.json")},
58-
"5.2(1a)",
59-
None,
60-
["101", "103", "204", "206"],
61-
script.MANUAL,
62-
),
6377
(
6478
{ethpmFcots: read_data(dir, "ethpmFcot.json")},
6579
"4.1(1a)",

0 commit comments

Comments
 (0)