Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
6 changes: 2 additions & 4 deletions aci-preupgrade-validation-script.py
Original file line number Diff line number Diff line change
Expand Up @@ -3917,9 +3917,6 @@ def llfc_susceptibility_check(cversion, tversion, vpc_node_ids, **kwargs):
recommended_action = 'Manually change Peer devices Transmit(send) Flow Control to off prior to switch Upgrade'
doc_url = 'https://bst.cloudapps.cisco.com/bugsearch/bug/CSCvo27498'

if not tversion:
return Result(result=MANUAL, msg=TVER_MISSING)

if not vpc_node_ids:
return Result(result=PASS, msg="No VPC Nodes found. Not susceptible.")

Expand All @@ -3928,7 +3925,8 @@ def llfc_susceptibility_check(cversion, tversion, vpc_node_ids, **kwargs):
sx_affected = True

# Check for Copper 1000base-T, CSCvj67507 fixed by CSCwd37387
if cversion.older_than("4.1(1i)") and tversion.newer_than("4.1(1h)") and tversion.older_than("5.2(7f)"):
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)")
or (tversion.older_than("5.2(7f)") and cversion.same_as(tversion))):
t_affected = True

if sx_affected or t_affected:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,27 @@
@pytest.mark.parametrize(
"icurl_outputs, cversion, tversion, vpc_node_ids, expected_result",
[
(
{ethpmFcots: read_data(dir, "ethpmFcot.json")},
"5.2(5c)",
"6.1(5e)",
["101", "103", "204", "206"],
script.MANUAL,
),
(
{ethpmFcots: read_data(dir, "ethpmFcot.json")},
"4.1(1i)",
"5.2(2a)",
["101", "103", "204", "206"],
script.MANUAL,
),
(
{ethpmFcots: read_data(dir, "ethpmFcot.json")},
"5.2(7f)",
"6.1(5c)",
["101", "103", "204", "206"],
script.PASS,
),
(
{ethpmFcots: read_data(dir, "ethpmFcot.json")},
"4.2(1b)",
Expand Down Expand Up @@ -53,13 +74,6 @@
["101", "103", "204", "206"],
script.PASS,
),
(
{ethpmFcots: read_data(dir, "ethpmFcot.json")},
"5.2(1a)",
None,
["101", "103", "204", "206"],
script.MANUAL,
),
(
{ethpmFcots: read_data(dir, "ethpmFcot.json")},
"4.1(1a)",
Expand Down
Loading