Merged
Conversation
Changes AFI SAFI configuration to:
* Use consolidated logic for AFI SAFI configuration for both internal
peers and external peers
* Configure AFI SAFI regardless of GracefulRestart enablement
* This is important because by default GoBGP only configures a default
AFI SAFI configuration for the address family of its configured
peering IP. Which means that previously dual-stack configurations
that did not enable GracefulRestart would not work (see: #1992)
catherinetcai
approved these changes
Jan 26, 2026
| NeighborAddress: "192.168.1.1", | ||
| PeerAsn: 65000, | ||
| }, | ||
| AfiSafis: nil, |
Collaborator
There was a problem hiding this comment.
Nit: Did you just add the nil here just to be more explicit? Feel free to ignore, I figured that with the test name and the comment explaining this, it's probably fine to not explicitly set it since it's going to be nil anyway.
Collaborator
Author
There was a problem hiding this comment.
Yeah, I figured someone looking for the name of the test would look around for a nil reference.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Replaces: #1993 - Fixes: #1992
Thanks to @rkojedzinszky for finding this bug and providing the initial fix in #1993.
I made this PR because I wanted to unify the BGP AFI/SAFI configuration a bit more between the two sets of peering functions. Additionally, I also wanted to add unit testing to ensure that we don't get this issue again in the future via regression.
This also retains the previous functionality a bit better where the graceful restart property is not set at all rather than set with Enabled = false. The functionality should be the same, but may not be completely equivalent.