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.

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

bgpd: Fix for match source-protocol in route-map for redistribute cmd (backport #17362) #17398

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 9, 2024

A redistribute cmd can have a route-map attached to it and adding the match source-protocol to that route-map means BGP to filter which protocol routes to accept among the bunch of routes zebra is sending.

Fixing this since this wasnt implemented earlier.

Ticket :#4119692


This is an automatic backport of pull request #17362 done by Mergify.

A redistribute cmd can have a route-map attached to it and adding the
match source-protocol to that route-map means BGP to filter which
protocol routes to accept among the bunch of routes zebra is sending.

Fixing this since this wasnt implemented earlier.

Ticket :#4119692

Signed-off-by: Donald Sharp <[email protected]>

Signed-off-by: Rajasekar Raja <[email protected]>
(cherry picked from commit 68358c0)

# Conflicts:
#	tests/topotests/bgp_route_map_match_source_protocol/test_bgp_route_map_match_source_protocol.py
Copy link
Author

mergify bot commented Nov 9, 2024

Cherry-pick of 68358c0 has failed:

On branch mergify/bp/stable/10.1/pr-17362
Your branch is up to date with 'origin/stable/10.1'.

You are currently cherry-picking commit 68358c0f92.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   bgpd/bgp_route.c

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tests/topotests/bgp_route_map_match_source_protocol/test_bgp_route_map_match_source_protocol.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts label Nov 9, 2024
@frrbot frrbot bot added the bgp label Nov 9, 2024
@ton31337 ton31337 closed this Nov 9, 2024
@ton31337 ton31337 deleted the mergify/bp/stable/10.1/pr-17362 branch November 9, 2024 20:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants