Skip to content

net/frr: move peer group policy into address families - #5646

Open
Monviech wants to merge 1 commit into
masterfrom
frr-try-to-fix-those-peergroups
Open

net/frr: move peer group policy into address families#5646
Monviech wants to merge 1 commit into
masterfrom
frr-try-to-fix-those-peergroups

Conversation

@Monviech

Copy link
Copy Markdown
Member

Important notices

Before you submit a pull request, we ask you kindly to acknowledge the following:

If AI was used, please disclose:

  • Model used: ChatGPT 5.5
  • Extent of AI involvement: Creating Macros out of reused logic

Describe the problem

Peer groups gained an explicit address family selector, but only the activation command was rendered inside the selected address-family block. Policy-related settings such as prefix-lists, route-maps, next-hop-self and default-originate were still emitted in the global peer group section.

This caused IPv6-only peer groups to be activated under IPv6 while their policy configuration was generated outside of the IPv6 address-family context, where it would not apply as expected.

Move these AF-scoped peer group settings into the address-family loop and keep only session-level settings in the global peer group block. Add small helpers for prefix-list and route-map attachment rendering so the same logic can be shared between normal neighbors and peer groups.

Fixes: #5506

Peer groups gained an explicit address family selector, but only the
activation command was rendered inside the selected address-family block.
Policy-related settings such as prefix-lists, route-maps, next-hop-self
and default-originate were still emitted in the global peer group section.

This caused IPv6-only peer groups to be activated under IPv6 while their
policy configuration was generated outside of the IPv6 address-family
context, where it would not apply as expected.

Move these AF-scoped peer group settings into the address-family loop and
keep only session-level settings in the global peer group block. Add small
helpers for prefix-list and route-map attachment rendering so the same
logic can be shared between normal neighbors and peer groups.
@Monviech
Monviech requested a review from AdSchellevis August 18, 2026 09:22
@Monviech Monviech self-assigned this Aug 18, 2026
@Monviech Monviech added the feature Adding new functionality label Aug 18, 2026
@Monviech

Copy link
Copy Markdown
Member Author

Asked for feedback here:
#5506 (comment)

But I also tested the change myself and it looks good.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

feature Adding new functionality

Development

Successfully merging this pull request may close these issues.

os-frr: IPv6 neighbor group not properly generated in config

1 participant