Skip to content

fix(nrc): enable AFIs regardless of GracefulRestart setting #1993

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

Closed
rkojedzinszky wants to merge 1 commit into from
Closed

fix(nrc): enable AFIs regardless of GracefulRestart setting #1993

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 27 additions & 27 deletions pkg/controllers/routing/bgp_peers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,38 +123,38 @@ func (nrc *NetworkRoutingController) syncInternalPeers() {
DeferralTime: uint32(nrc.bgpGracefulRestartDeferralTime.Seconds()),
LocalRestarting: true,
}
}

// We choose to only peer using the protocol of the node's primary IP
if targetNode.IsIPv4Capable() {
afiSafi := gobgpapi.AfiSafi{
Config: &gobgpapi.AfiSafiConfig{
Family: &gobgpapi.Family{Afi: gobgpapi.Family_AFI_IP, Safi: gobgpapi.Family_SAFI_UNICAST},
Enabled: true,
},
MpGracefulRestart: &gobgpapi.MpGracefulRestart{
Config: &gobgpapi.MpGracefulRestartConfig{
Enabled: true,
},
State: &gobgpapi.MpGracefulRestartState{},
// We choose to only peer using the protocol of the node's primary IP
if targetNode.IsIPv4Capable() {
afiSafi := gobgpapi.AfiSafi{
Config: &gobgpapi.AfiSafiConfig{
Family: &gobgpapi.Family{Afi: gobgpapi.Family_AFI_IP, Safi: gobgpapi.Family_SAFI_UNICAST},
Enabled: true,
},
MpGracefulRestart: &gobgpapi.MpGracefulRestart{
Config: &gobgpapi.MpGracefulRestartConfig{
Enabled: nrc.bgpGracefulRestart,
},
}
n.AfiSafis = append(n.AfiSafis, &afiSafi)
State: &gobgpapi.MpGracefulRestartState{},
},
}
if targetNode.IsIPv6Capable() {
afiSafi := gobgpapi.AfiSafi{
Config: &gobgpapi.AfiSafiConfig{
Family: &gobgpapi.Family{Afi: gobgpapi.Family_AFI_IP6, Safi: gobgpapi.Family_SAFI_UNICAST},
Enabled: true,
},
MpGracefulRestart: &gobgpapi.MpGracefulRestart{
Config: &gobgpapi.MpGracefulRestartConfig{
Enabled: true,
},
State: &gobgpapi.MpGracefulRestartState{},
n.AfiSafis = append(n.AfiSafis, &afiSafi)
}
if targetNode.IsIPv6Capable() {
afiSafi := gobgpapi.AfiSafi{
Config: &gobgpapi.AfiSafiConfig{
Family: &gobgpapi.Family{Afi: gobgpapi.Family_AFI_IP6, Safi: gobgpapi.Family_SAFI_UNICAST},
Enabled: true,
},
MpGracefulRestart: &gobgpapi.MpGracefulRestart{
Config: &gobgpapi.MpGracefulRestartConfig{
Enabled: nrc.bgpGracefulRestart,
},
}
n.AfiSafis = append(n.AfiSafis, &afiSafi)
State: &gobgpapi.MpGracefulRestartState{},
},
}
n.AfiSafis = append(n.AfiSafis, &afiSafi)
}

// we are rr-server peer with other rr-client with reflection enabled
Expand Down