Skip to content

Fix to use non RegionalHub T3 peers when selecting port. #9023

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

Merged
judyjoseph merged 3 commits into from
Jul 25, 2023
Merged

Fix to use non RegionalHub T3 peers when selecting port. #9023

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
28e13d4
Fix to use non RegionalHub T3 peers when selecting port. Regional hub…
judyjoseph Jul 19, 2023
7594bd5
Fixes to remove unwanted spaces.
judyjoseph Jul 19, 2023
ba9ac0e
Fixes to indentation
judyjoseph Jul 19, 2023
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
21 changes: 20 additions & 1 deletion tests/voq/test_voq_ipfwd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,9 +288,28 @@ def pick_ports(duthosts, all_cfg_facts, nbrhosts, tbinfo, port_type_a="ethernet"
continue
cfg_facts = asic_cfg['ansible_facts']
cfgd_intfs = cfg_facts['INTERFACE'] if 'INTERFACE' in cfg_facts else {}
cfgd_dev_neighbor = cfg_facts['DEVICE_NEIGHBOR'] if 'DEVICE_NEIGHBOR' in cfg_facts else {}
cfgd_dev_neigh_md = cfg_facts['DEVICE_NEIGHBOR_METADATA'] if 'DEVICE_NEIGHBOR_METADATA' in cfg_facts else {}
cfgd_pos = cfg_facts['PORTCHANNEL_INTERFACE'] if 'PORTCHANNEL_INTERFACE' in cfg_facts else {}
eths = [intf for intf in cfgd_intfs if "ethernet" in intf.lower() and cfgd_intfs[intf] != {}]
cfgd_pc_members = cfg_facts['PORTCHANNEL_MEMBER'] if 'PORTCHANNEL_MEMBER' in cfg_facts else {}
eths_orig = [intf for intf in cfgd_intfs if "ethernet" in intf.lower() and cfgd_intfs[intf] != {}]
pos = [intf for intf in cfgd_pos if "portchannel" in intf.lower()]

# Remove the interface from eths and pos if the BGP neighbor is of type RegionalHub
dev_rh_neigh = [neigh for neigh in cfgd_dev_neigh_md
if cfgd_dev_neigh_md[neigh]["type"] == "RegionalHub"]

# Interfaces to be excluded
intfs_exclude = [intf for intf in cfgd_dev_neighbor if cfgd_dev_neighbor[intf]["name"] in dev_rh_neigh]
eths = [eth for eth in eths_orig if eth not in intfs_exclude]

# portchannels to be excluded
for k, v in cfgd_pc_members.items():
keys = v.keys()
for intf in keys:
if intf in intfs_exclude and k in pos:
pos.remove(k)

if len(eths) != 0:
if port_type_a == "ethernet":
intfs_to_test['portC'] = get_info_for_a_port(
Expand Down