Skip to content

[action] [PR:15634] fix: return all BGP neighbors for config reload #15655

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
mssonicbld merged 1 commit into from
Nov 21, 2024
Merged

[action] [PR:15634] fix: return all BGP neighbors for config reload #15655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion tests/common/config_reload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ def _config_reload_cmd_wrapper(cmd, executable):
time.sleep(wait)

if wait_for_bgp:
bgp_neighbors = sonic_host.get_bgp_neighbors_per_asic()
bgp_neighbors = sonic_host.get_bgp_neighbors_per_asic(state="all")
pytest_assert(
wait_until(wait + 120, 10, 0, sonic_host.check_bgp_session_state_all_asics, bgp_neighbors),
"Not all bgp sessions are established after config reload",
Expand Down
12 changes: 7 additions & 5 deletions tests/common/devices/multi_asic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,17 +549,19 @@ def get_bgp_neighbors_per_asic(self, state="established"):
Get a diction of BGP neighbor states

Args:
state: BGP session state, return neighbor IP of sessions that match this state
state: BGP session state, return neighbor IP of sessions that match this state. If state is "all",
return all neighbors regardless of state.
Returns: dictionary {namespace: { (neighbor_ip : info_dict)* }}

"""
bgp_neigh = {}
for asic in self.asics:
bgp_neigh[asic.namespace] = {}
bgp_info = asic.bgp_facts()["ansible_facts"]["bgp_neighbors"]
for k, v in list(bgp_info.items()):
if v["state"] != state:
bgp_info.pop(k)
if state != "all":
for k, v in list(bgp_info.items()):
if v["state"] != state:
bgp_info.pop(k)
bgp_neigh[asic.namespace].update(bgp_info)

return bgp_neigh
Expand Down Expand Up @@ -598,7 +600,7 @@ def check_bgp_session_state_all_asics(self, bgp_neighbors, state="established"):
"""
for asic in self.asics:
if asic.namespace in bgp_neighbors:
neigh_ips = [k.lower() for k, v in list(bgp_neighbors[asic.namespace].items()) if v["state"] == state]
neigh_ips = [k.lower() for k, v in list(bgp_neighbors[asic.namespace].items())]
if not asic.check_bgp_session_state(neigh_ips, state):
return False
return True
Expand Down