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

Jump to bottom

bgpd: Fix enforce-first-as per peer-group removal (backport #17705) #17709

Closed
wants to merge 2 commits into from
Closed

bgpd: Fix enforce-first-as per peer-group removal (backport #17705) #17709

wants to merge 2 commits into from
+21 −3

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Dec 22, 2024

This is an automatic backport of pull request #17705 done by [Mergify](https://mergify.com).

@ton31337 @mergify
bgpd: Fix enforce-first-as per peer-group removal
311199f 
If we do `no neighbor PG enforce-first-as`, it wasn't working because the flag
was inherited incorrectly for the members of the peer-group.

Fixes: 3224629 ("bgpd: Enable enforce-first-as by default")

Closes: #17702

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
(cherry picked from commit b6dcf61)
@ton31337 @mergify
tests: Check if enforce-first-as is working with peer-groups
ffc4829 
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
(cherry picked from commit 9047ce6)

# Conflicts:
#	tests/topotests/bgp_route_server_client/r1/bgpd.conf
@mergify mergify bot added the conflicts label Dec 22, 2024
@mergify Mergify
Copy link
Author

mergify bot commented Dec 22, 2024

Cherry-pick of 9047ce6 has failed:

On branch mergify/bp/stable/10.1/pr-17705
Your branch is ahead of 'origin/stable/10.1' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 9047ce6d9.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tests/topotests/bgp_route_server_client/r1/bgpd.conf

no changes added to commit (use "git add" and/or "git commit -a")

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

@frrbot frrbot bot added bgp bugfix tests Topotests, make check, etc labels Dec 22, 2024
@mergify mergify bot mentioned this pull request Dec 22, 2024
Merged
@ton31337
Copy link
Member

Will do a manual backport.

@ton31337 ton31337 closed this Dec 22, 2024
@ton31337 ton31337 deleted the mergify/bp/stable/10.1/pr-17705 branch December 22, 2024 09:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
bgp bugfix size/S stable/10.1 tests Topotests, make check, etc
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@ton31337