bgpd, zebra, tests: disable rtadv when bgp instance unconfiguration. #18364
Conversation
This file contains 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
If a peer uses radv for an interface, and bgp instance is removed, then the radv service is not disabled on the interface. Fix this by doing the same at BGP unconfiguration. Like it has been done when a peer is unconfigured, call the radv unregistration before deleting the peer. Fixes: b3a3290 ("bgpd: turn off RAs when numbered peers are deleted") Signed-off-by: Philippe Guibert <[email protected]> Signed-off-by: Dmytro Shytyi <[email protected]>
When configured Graceful-Restart, skipping unconfig notification, similarly as it is done in 95098d9 ("bgpd: Do not send Deconfig/Shutdown message when restarting") Signed-off-by: Dmytro Shytyi <[email protected]>
dmytroshytyi-6WIND
force-pushed
the
rtadv_disable
branch
from
e44a909 to
2455780
Compare
Add to "show interface json" output multiple rtadv parameters. if_dump_vty() calls => hook_call(zebra_if_extra_info, vty, ifp); if_dump_vty_json() now do the same call, with additional parameter: hook_call(zebra_if_extra_info, vty, json_if, ifp); Signed-off-by: Dmytro Shytyi <[email protected]>
Verify the new rtadv "show interface json" fields Signed-off-by: Dmytro Shytyi <[email protected]>
dmytroshytyi-6WIND
force-pushed
the
rtadv_disable
branch
from
2455780 to
92cd26e
Compare
|
ci:rerun |
| #if defined(HAVE_RTADV) | ||
| if (json_if && rtadv->AdvSendAdvertisements) { | ||
| json_object_int_add(json_if, "ndAdvertisedReachableTimeMilliseconds", | ||
| rtadv->AdvReachableTime); |
There was a problem hiding this comment.
Msecs instead of Milliseconds (git grep Msecs on bgpd)
| json_object_int_add(json_if, "ndAdvertisedReachableTimeMilliseconds", | ||
| rtadv->AdvReachableTime); | ||
| json_object_int_add(json_if, "ndAdvertisedRetransmitIntervalMilliseconds", | ||
| rtadv->AdvRetransTimer); |
There was a problem hiding this comment.
Msecs instead of Milliseconds
| interval = rtadv->MaxRtrAdvInterval; | ||
| if (interval % 1000) | ||
| json_object_int_add(json_if, "ndRouterAdvertisementsIntervalMilliseconds", | ||
| interval); |
There was a problem hiding this comment.
Msecs instead of Milliseconds
| else | ||
| json_object_int_add(json_if, "ndRouterAdvertisementsIntervalSeconds", | ||
| interval / 1000); | ||
|
|
| "ndRouterAdvertisementsWithHomeAgentFlagBitSet", | ||
| true); | ||
| if (rtadv->HomeAgentLifetime != -1) | ||
| json_object_int_add(json_if, "homeAgentLifetimeSeconds", |
| "homeAgentLifetimeTracksRaLifetime", true); | ||
|
|
||
| json_object_int_add(json_if, "homeAgenttPreferenceIs", | ||
| rtadv->HomeAgentLifetime); |
There was a problem hiding this comment.
typo: homeAgentPreferenceIs
'homeAgentPreference' is enough
| @@ -1792,6 +1792,65 @@ static int nd_dump_vty(struct vty *vty, struct interface *ifp) | |||
| vty_out(vty, | |||
| " ND router advertisements with Adv. Interval option.\n"); | |||
| } | |||
|
|
|||
| #if defined(HAVE_RTADV) | |||
|
|
||
| if (rtadv->AdvHomeAgentFlag) { | ||
| json_object_boolean_add(json_if, | ||
| "ndRouterAdvertisementsWithHomeAgentFlagBitSet", |
There was a problem hiding this comment.
ndRouterAdvertisementsWithHomeAgentFlagBit is enough
|
|
||
| if (rtadv->AdvDefaultLifetime != -1) | ||
| json_object_int_add(json_if, "ndRouterAdvertisementsLiveForSeconds", | ||
| rtadv->AdvDefaultLifetime); |
There was a problem hiding this comment.
ndRouterAdvertisementsLiveForSecs
|
we appear to have 2 open commits from 6wind in relation to this exact problem. Which one is the one we should be lookiing at? |
I just closed #18328. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
If bgpd instance is removed, then the rtadv is not disabled.
Like it was done when a peer is unconfigured,
do the same at BGP unconfiguration: unregister rtadv before deleting a peer.
Add a rtadv json fields. Create a topotest to check that newly added json fields are present.