Skip to content

Fix failure with unnumbered BGP neighours and don't report VLAN interfaces as down #339

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

Open
wants to merge 3 commits into
base: 202305
Choose a base branch
from
Open

Fix failure with unnumbered BGP neighours and don't report VLAN interfaces as down #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a88058
Skip unnumbered BGP neighbors instead of failing
lukasstockner May 16, 2022
a1e11f8
Don't report VLAN interfaces as oper_down
lukasstockner Jun 27, 2023
d443ed2
Merge 'a1e11f8' and '7a88058' into 202305
SapphirusBeryl Nov 25, 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
7 changes: 6 additions & 1 deletion src/sonic_ax_impl/mibs/ietf/rfc1213.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,12 @@ def get_oper_status(self, sub_id):
:param sub_id: The 1-based sub-identifier query.
:return: oper state value for the respective sub_id.
"""
return self._get_status(sub_id, "oper_status")
if self.get_oid(sub_id) in self.vlan_oid_name_map:
# VLAN interfaces don't have an operational status, so return admin status for them
key = "admin_status"
else:
key = "oper_status"
return self._get_status(sub_id, key)

def get_mtu(self, sub_id):
"""
Expand Down
8 changes: 7 additions & 1 deletion src/sonic_ax_impl/mibs/vendor/cisco/bgp4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,13 @@ def update_data(self):
neigh_info = self.db_conn[db_index].get_all(mibs.STATE_DB, neigh_key, blocking=False)
if neigh_info:
state = neigh_info['state']
ip = ipaddress.ip_address(neigh_str)
try:
ip = ipaddress.ip_address(neigh_str)
except ValueError:
# In case of unnumbered BGP, the neighbor is an interface.
# That can't be represented here, so just skip the neighbor.
continue

if type(ip) is ipaddress.IPv4Address:
oid_head = (1, 4)
else:
Expand Down
Loading