Fix PIMD RPF lookup mode and nexthop tracking #17252
Conversation
frrbot
bot
added
documentation
libfrr
pim
tests
nabahr
force-pushed
the
mcast-mode
branch
3 times, most recently
from
17aaccf
to
3bcc070
Compare
nabahr
force-pushed
the
mcast-mode
branch
2 times, most recently
from
34f41ee
to
74f6819
Compare
|
New mrib tests pass when built with changes from PR #17254. |
Jafaral
changed the title
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
nabahr
force-pushed
the
mcast-mode
branch
3 times, most recently
from
01f34c8
to
953d829
Compare
nabahr
changed the title
Hm. I think this is a little problematic UX-wise because it's a "silent" change users can trip over without noticing. Can we just add a |
Since the rpf lookup mode was moved out of zebra, the command cannot work as it did before these changes. So should this command |
I think that's the only reasonable option, and/or replace it with a stub that prints "this command doesn't exist anymore because it's in pimd now" Now that I think about it… the command can be implemented in |
|
Actually — "duh" — nothing says the command needs to stay in zebra, pimd can just handle it? (Edit: the variant with the IP address parameter — showing the table is probably not doable/sensible from pimd) |
|
Ok, so I believe the best path forward to clean up the MRIB UX:
|
Modified ZEBRA_NEXTHOP_LOOKUP_MRIB to include the SAFI from which to do the lookup. This generalizes the API away from MRIB specifically and allows the user to decide how it should do lookups. Rename ZEBRA_NEXTHOP_LOOKUP_MRIB to ZEBRA_NEXTHOP_LOOKUP now that it is more generalized. This change is in preperation to remove multicast lookup mode completely from zebra. Signed-off-by: Nathan Bahr <nbahr@atcorp.com>
Multicast mode belongs in PIM, so removing it completely from zebra. Modified `show (ip|ipv6) rpf ADDRESS` to always lookup from SAFI_MULTICAST. This means this command is now specific to the multicast table and does not necessarily reflect the PIM RPF lookup, but that should be implemented in PIM instead. Signed-off-by: Nathan Bahr <nbahr@atcorp.com>
nabahr
force-pushed
the
mcast-mode
branch
2 times, most recently
from
e4d9b98
to
5a23a4d
Compare
Add `mrib` flag to existing "show ip route" commands which then use the multicast safi rather than the unicast safi. Updated the vty output to include the AFI and SAFI string when printing the table. Deprecate `show ip rpf` command, aliased to `show ip route mrib`. Removed `show ip rpf A.B.C.D`. Signed-off-by: Nathan Bahr <nbahr@atcorp.com>
Remove use of `ip multicast rpf-lookup-mode` from unrelated tests. Looks like this test was just unlucky enough to pick that command as an example for use here. Just changed it to something less likely to be removed in the future. Update route table output to include AFI SAFI output. Signed-off-by: Nathan Bahr <nbahr@atcorp.com>
Add rpf-lookup-mode MODE vty command under router pim block. Including NB piping and config write. Using the mode still pending. Signed-off-by: Nathan Bahr <nbahr@atcorp.com>
Add prefix length in nexthop response. Apply lookup mode to the sychronous lookups, where we may lookup the MRIB, URIB, or both and make a decision based on the nexthop. Signed-off-by: Nathan Bahr <nbahr@atcorp.com>
Refactor the next hop tracking in PIM to fully support the configured RPF lookup mode. Moved many NHT related functions to pim_nht.h/c NHT now tracks both MRIB and URIB tables and makes nexthop decisions based on the configured lookup mode. Signed-off-by: Nathan Bahr <nbahr@atcorp.com>
Link up the RPF lookup mode changing to a force update to RP's and upstreams registered for nexthop lookup cache updates. Signed-off-by: Nathan Bahr <nbahr@atcorp.com>
Moved `show ip rpf A.B.C.D` command here from zebra, deprecated and aliased to `show ip pim nexthop-lookup`. Allow group to be optional in the lookup command. Only validate group if source is ANY. Documented setting source via RP if not provided. Added new output if ANY source + group lookup is performed and no RP is found for the group. Updated output to include souce and group for lookup. Signed-off-by: Nathan Bahr <nbahr@atcorp.com>
Test mrib overrides and rpf lookup mode changes. Signed-off-by: Nathan Bahr <nbahr@atcorp.com>
Moved it all to PIM section and updated docs for recent changes. Signed-off-by: Nathan Bahr <nbahr@atcorp.com>
Generalized the zapi
ZEBRA_NEXTHOP_LOOKUP_MRIBto justZEBRA_NEXTHOP_LOOKUPand added the safi into the request message.Moved the RPF lookup mode configuration from zebra into pimd.
Now the command
show ip rpf x.x.x.xcommand will just do a lookup against the MRIB, not according to the lookup mode.To do a nexthop lookup according to the lookup mode, use the command
show ip pim nexthop-lookup x.x.x.x y.y.y.ywherex.x.x.xis the source address, andy.y.y.yis the group address, which may affect the lookup.Refactored the PIM zlookup (the synchronous nexthop lookup using
ZEBRA_NEXTHOP_LOOKUP) to take the RPF lookup mode into account, which means we may lookup via the URIB, MRIB, or both.Refactored the PIM next hop tracking and isolated the nexthop lookup and tracking code into pim_nht.h/c.
Now we track in both the MRIB and URIB tables so that decisions about the nexthop based on the RPF lookup mode can be taken into account, and changes to the lookup mode can be reflected immediately without performing additional lookups.
Updated show commands, documentation, and tests. Including a new PIM mrib test to exercise the RPF lookup mode command and verify that NHT is working correctly.