Merge pull request #9645 from mjstapp/fix_show_bgp_lu

bgpd: make show bgp labeled-unicast work
This commit is contained in:
Donatas Abraitis 2021-09-22 09:52:09 +03:00 committed by GitHub
commit d24f4b7d84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -11172,6 +11172,10 @@ static int bgp_show(struct vty *vty, struct bgp *bgp, afi_t afi, safi_t safi,
return CMD_WARNING;
}
/* Labeled-unicast routes live in the unicast table. */
if (safi == SAFI_LABELED_UNICAST)
safi = SAFI_UNICAST;
table = bgp->rib[afi][safi];
/* use MPLS and ENCAP specific shows until they are merged */
if (safi == SAFI_MPLS_VPN) {
@ -11184,9 +11188,6 @@ static int bgp_show(struct vty *vty, struct bgp *bgp, afi_t afi, safi_t safi,
output_arg, use_json,
1, NULL, NULL);
}
/* labeled-unicast routes live in the unicast table */
else if (safi == SAFI_LABELED_UNICAST)
safi = SAFI_UNICAST;
return bgp_show_table(vty, bgp, safi, table, type, output_arg, NULL, 1,
NULL, NULL, &json_header_depth, show_flags,