matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

Merge pull request #17474 from sougata-github-nvidia/rib_ip_protocol_cleanup

Browse source 
zebra: Fix ip protocol route-map issue.
This commit is contained in:
Russ White 2025-01-07 08:45:07 -05:00 committed by GitHub
parent c9c9608c70 86b294698f
commit 7f2be9a595
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/route_types.txt
View file

@ -88,7 +88,7 @@ ZEBRA_ROUTE_VRRP, vrrp, vrrpd, '-', 0, 0, 0, "VRRP", vr
ZEBRA_ROUTE_NHG, zebra, none, '-', 0, 0, 0, "Nexthop Group", none ZEBRA_ROUTE_NHG, zebra, none, '-', 0, 0, 0, "Nexthop Group", none
ZEBRA_ROUTE_SRTE, srte, none, '-', 0, 0, 0, "SR-TE", none ZEBRA_ROUTE_SRTE, srte, none, '-', 0, 0, 0, "SR-TE", none
ZEBRA_ROUTE_TABLE_DIRECT, table-direct, zebra, 't', 1, 1, 1, "Table-Direct", zebra ZEBRA_ROUTE_TABLE_DIRECT, table-direct, zebra, 't', 1, 1, 1, "Table-Direct", zebra
ZEBRA_ROUTE_ALL, wildcard, none, '-', 0, 0, 0, "-", none ZEBRA_ROUTE_ALL, any, none, '-', 0, 0, 0, "-", none
## help strings ## help strings

14
tests/topotests/bgp_suppress_fib/test_bgp_suppress_fib.py
View file

@ -232,6 +232,20 @@ def test_local_vs_non_local():
assert False, "Route 60.0.0.0/24 should not have fibPending" assert False, "Route 60.0.0.0/24 should not have fibPending"
def test_ip_protocol_any_fib_filter():
# "Filtered route of source protocol any should not get installed in fib"
tgen = get_topogen()
if tgen.routers_have_failure():
pytest.skip(tgen.errors)
r2 = tgen.gears["r2"]
r2.vtysh_cmd("conf\nno ip protocol bgp")
r2.vtysh_cmd("conf\nip protocol any route-map LIMIT")
test_bgp_route()
if __name__ == "__main__": if __name__ == "__main__":
args = ["-s"] + sys.argv[1:] args = ["-s"] + sys.argv[1:]
sys.exit(pytest.main(args)) sys.exit(pytest.main(args))

9
zebra/zebra_nb_config.c
View file

@ -3358,9 +3358,6 @@ int lib_vrf_zebra_filter_protocol_create(struct nb_cb_create_args *args)
const char *proto = yang_dnode_get_string(args->dnode, "protocol"); const char *proto = yang_dnode_get_string(args->dnode, "protocol");
int rtype; int rtype;
if (strcasecmp(proto, "any") == 0)
rtype = ZEBRA_ROUTE_MAX;
else
rtype = proto_name2num(proto); rtype = proto_name2num(proto);
if (args->event == NB_EV_VALIDATE) if (args->event == NB_EV_VALIDATE)
@ -3387,9 +3384,6 @@ int lib_vrf_zebra_filter_protocol_destroy(struct nb_cb_destroy_args *args)
yang_afi_safi_identity2value(afi_safi, &afi, &safi); yang_afi_safi_identity2value(afi_safi, &afi, &safi);
if (strcasecmp(proto, "any") == 0)
rtype = ZEBRA_ROUTE_MAX;
else
rtype = proto_name2num(proto); rtype = proto_name2num(proto);
/* deleting an existing entry, it can't be invalid */ /* deleting an existing entry, it can't be invalid */
@ -3418,9 +3412,6 @@ void lib_vrf_zebra_filter_protocol_apply_finish(
yang_afi_safi_identity2value(afi_safi, &afi, &safi); yang_afi_safi_identity2value(afi_safi, &afi, &safi);
if (strcasecmp(proto, "any") == 0)
rtype = ZEBRA_ROUTE_MAX;
else
rtype = proto_name2num(proto); rtype = proto_name2num(proto);
/* finishing apply for a validated entry, it can't be invalid */ /* finishing apply for a validated entry, it can't be invalid */

9
zebra/zebra_routemap.c
View file

@ -114,11 +114,6 @@ static void show_vrf_proto_rm(struct vty *vty, struct zebra_vrf *zvrf,
vty_out(vty, "%-24s : none\n", zebra_route_string(i)); vty_out(vty, "%-24s : none\n", zebra_route_string(i));
} }
if (PROTO_RM_NAME(zvrf, af_type, i))
vty_out(vty, "%-24s : %-10s\n", "any",
PROTO_RM_NAME(zvrf, af_type, i));
else
vty_out(vty, "%-24s : none\n", "any");
} }
static void show_vrf_nht_rm(struct vty *vty, struct zebra_vrf *zvrf, static void show_vrf_nht_rm(struct vty *vty, struct zebra_vrf *zvrf,
@ -1222,8 +1217,8 @@ route_map_result_t zebra_route_map_check(afi_t family, struct route_entry *re,
return RMAP_DENYMATCH; return RMAP_DENYMATCH;
} }
if (!rmap) { if (!rmap) {
rm_name = PROTO_RM_NAME(zvrf, family, ZEBRA_ROUTE_MAX); rm_name = PROTO_RM_NAME(zvrf, family, ZEBRA_ROUTE_ALL);
rmap = PROTO_RM_MAP(zvrf, family, ZEBRA_ROUTE_MAX); rmap = PROTO_RM_MAP(zvrf, family, ZEBRA_ROUTE_ALL);
if (rm_name && !rmap) if (rm_name && !rmap)
return RMAP_DENYMATCH; return RMAP_DENYMATCH;