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

[bgp] Don't use portchannel members entry #7568

Merged
merged 2 commits into from
Feb 27, 2023
Merged

[bgp] Don't use portchannel members entry #7568

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d31e00d
[bgp] Don't use portchannel members entry
saiarcot895 Feb 24, 2023
a4c9025
Fix logic
saiarcot895 Feb 26, 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
4 changes: 2 additions & 2 deletions tests/bgp/test_bgp_gr_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def _verify_prefix_counters_from_neighbor_after_graceful_restart(duthost, bgp_ne

config_facts = duthost.config_facts(host=duthost.hostname, source="running")['ansible_facts']
bgp_neighbors = config_facts.get('BGP_NEIGHBOR', {})
portchannels = config_facts.get('PORTCHANNEL', {})
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Likely some change in the image changed the naming convention?
Do you know if other test modules need such naming changes?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was caused by sonic-net/sonic-buildimage#13660

portchannels = config_facts.get('PORTCHANNEL_MEMBER', {})
dev_nbrs = config_facts.get('DEVICE_NEIGHBOR', {})
configurations = tbinfo['topo']['properties']['configuration_properties']
exabgp_ips = [configurations['common']['nhipv4'], configurations['common']['nhipv6']]
Expand All @@ -130,7 +130,7 @@ def _verify_prefix_counters_from_neighbor_after_graceful_restart(duthost, bgp_ne
# get neighbor device connected ports
nbr_ports = []
if test_interface.startswith("PortChannel"):
for member in portchannels[test_interface]['members']:
for member in portchannels[test_interface].keys():
nbr_ports.append(dev_nbrs[member]['port'])
test_neighbor_name = dev_nbrs[member]['name']
else:
Expand Down