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 remote-as with peer-group (backport #17542) #17694

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Dec 20, 2024

Closes #17541


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

Previously AS_UNSPECIFIED was treated as 0, but with now it's 1 after renumbering
peer_asn_type enum.

Fixes: 0dfe256 ("bgpd: Implement neighbor X remote-as auto")

Signed-off-by: Donatas Abraitis <[email protected]>
(cherry picked from commit e57fb32)
Signed-off-by: Donatas Abraitis <[email protected]>
(cherry picked from commit 6f1ad10)

# Conflicts:
#	tests/topotests/bgp_peer_group/r1/frr.conf
#	tests/topotests/bgp_peer_group/test_bgp_peer-group.py
Copy link
Author

mergify bot commented Dec 20, 2024

Cherry-pick of 6f1ad10 has failed:

On branch mergify/bp/stable/10.1/pr-17542
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 6f1ad10d9.
  (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:
	new file:   tests/topotests/bgp_peer_group/r4/frr.conf

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   tests/topotests/bgp_peer_group/r1/frr.conf
	both modified:   tests/topotests/bgp_peer_group/test_bgp_peer-group.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 Dec 20, 2024
@frrbot frrbot bot added bgp bugfix tests Topotests, make check, etc labels Dec 20, 2024
@ton31337 ton31337 closed this Dec 20, 2024
@ton31337 ton31337 deleted the mergify/bp/stable/10.1/pr-17542 branch December 20, 2024 14:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant