Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added support for one portChannel and one routed interface if two por… #5331

Merged
merged 2 commits into from
Oct 27, 2022
Merged

Added support for one portChannel and one routed interface if two por… #5331

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c0aa5c
Added code to get the first set of available ports
mannytaheri Jun 2, 2022
3fb1d5d
Used yield instead of return
mannytaheri Jun 30, 2022
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
38 changes: 31 additions & 7 deletions tests/crm/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,38 @@ def crm_interface(duthosts, enum_rand_one_per_hwsku_frontend_hostname, tbinfo, e
if "backend" in tbinfo["topo"]["name"]:
crm_intf1 = mg_facts["minigraph_vlan_sub_interfaces"][0]["attachto"]
crm_intf2 = mg_facts["minigraph_vlan_sub_interfaces"][2]["attachto"]
elif len(mg_facts["minigraph_portchannel_interfaces"]) >= 4:
crm_intf1 = mg_facts["minigraph_portchannel_interfaces"][0]["attachto"]
crm_intf2 = mg_facts["minigraph_portchannel_interfaces"][2]["attachto"]
else:
mannytaheri marked this conversation as resolved.
Show resolved Hide resolved
crm_intf1 = mg_facts["minigraph_interfaces"][0]["attachto"]
crm_intf2 = mg_facts["minigraph_interfaces"][2]["attachto"]
yield (crm_intf1, crm_intf2)

crm_intf1 = None
crm_intf2 = None
intf_status = asichost.show_interface(command='status')['ansible_facts']['int_status']

# 1. we try to get crm interfaces from portchannel interfaces
for a_pc in mg_facts["minigraph_portchannels"]:
if intf_status[a_pc]['oper_state'] == 'up':
# this is a pc that I can use.
if crm_intf1 is None:
crm_intf1 = a_pc
elif crm_intf2 is None:
crm_intf2 = a_pc

if crm_intf1 is not None and crm_intf2 is not None:
return (crm_intf1, crm_intf2)

# 2. we try to get crm interfaces from routed interfaces
for a_intf in mg_facts["minigraph_interfaces"]:
intf = a_intf['attachto']
if intf_status[intf]['oper_state'] == 'up':
if crm_intf1 is None:
crm_intf1 = intf
elif crm_intf2 is None:
crm_intf2 = intf

if crm_intf1 is not None and crm_intf2 is not None:
return (crm_intf1, crm_intf2)

if crm_intf1 is None or crm_intf2 is None:
pytest.skip("Not enough interfaces on this host/asic (%s/%s) to support test." % (duthost.hostname,
asichost.asic_index))

@pytest.fixture(scope="module", autouse=True)
def set_polling_interval(duthosts, enum_rand_one_per_hwsku_frontend_hostname):
Expand Down