Skip to content

Fix handling of optional fields in get_bgp_peer function #3565

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

Closed
matofeder wants to merge 2 commits into from
Closed

Fix handling of optional fields in get_bgp_peer function #3565

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b44ecd7
Fix handling of optional fields in get_bgp_peer function
matofeder Oct 3, 2024
2445807
Merge branch 'sonic-net:master' into fix_bgp_peer
matofeder Oct 3, 2024
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 scripts/ipintutil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ def get_bgp_peer():
data = config_db.get_table('BGP_NEIGHBOR')

for neighbor_ip in data.keys():
local_addr = data[neighbor_ip]['local_addr']
neighbor_name = data[neighbor_ip]['name']
local_addr = data[neighbor_ip].get('local_addr', "")
Copy link
Copy Markdown
Contributor

@bradh352 bradh352 Dec 22, 2024

Choose a reason for hiding this comment

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

might be better to just put the whole block inside the for loop inside:

try:
    ...
except KeyError:
  pass

Your current solution adds a blank entry to bgp_peer which doesn't do anything for us...

Should probably also put a comment that this get_bgp_peer is for retrieving manually specified BGP peers only, not BGP Unnumbered peers (like when specifying an interface)

neighbor_name = data[neighbor_ip].get('name', "")
bgp_peer.setdefault(local_addr, [neighbor_name, neighbor_ip])
return bgp_peer

Expand Down