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

tools: Fix frr-reload for ebgp-multihop TTL reconfiguration. (backport #17946) #17950

Merged
merged 1 commit into from
Jan 29, 2025
Merged

tools: Fix frr-reload for ebgp-multihop TTL reconfiguration. (backport #17946) #17950

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
11 changes: 11 additions & 0 deletions tools/frr-reload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,14 @@ def get_normalized_interface_vrf(line):
return line


def get_normalized_ebgp_multihop_line(line):
obj = re.search(r"(.*)ebgp-multihop\s+255", line)
if obj:
line = obj.group(1) + "ebgp-multihop"

return line


# This dictionary contains a tree of all commands that we know start a
# new multi-line context. All other commands are treated either as
# commands inside a multi-line context or as single-line contexts. This
Expand Down Expand Up @@ -319,6 +327,9 @@ def load_from_file(self, filename):
if ":" in line:
line = get_normalized_mac_ip_line(line)

if "ebgp-multihop" in line:
line = get_normalized_ebgp_multihop_line(line)

# vrf static routes can be added in two ways. The old way is:
#
# "ip route x.x.x.x/x y.y.y.y vrf <vrfname>"
Expand Down
Loading