bgpd: Skip automatically created BGP instances for show CMDs

When using e.g. `adverise-all-vni`, and/or `import vrf ...`, the VRF instance
is created with a default's VRF ASN and tagged as AUTO_VRF. We MUST skip them
here also.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
(cherry picked from commit 03c086866b)
This commit is contained in:
Donatas Abraitis 2024-07-13 23:19:57 +03:00 committed by Mergify
parent 906711c8f6
commit b5db1e7352

View File

@ -12621,6 +12621,9 @@ static void bgp_show_all_instances_summary_vty(struct vty *vty, afi_t afi,
vty_out(vty, "{\n"); vty_out(vty, "{\n");
for (ALL_LIST_ELEMENTS(bm->bgp, node, nnode, bgp)) { for (ALL_LIST_ELEMENTS(bm->bgp, node, nnode, bgp)) {
if (CHECK_FLAG(bgp->vrf_flags, BGP_VRF_AUTO))
continue;
nbr_output = true; nbr_output = true;
if (use_json) { if (use_json) {
if (!is_first) if (!is_first)
@ -16002,6 +16005,9 @@ static void bgp_show_all_instances_neighbors_vty(struct vty *vty,
vty_out(vty, "{\n"); vty_out(vty, "{\n");
for (ALL_LIST_ELEMENTS(bm->bgp, node, nnode, bgp)) { for (ALL_LIST_ELEMENTS(bm->bgp, node, nnode, bgp)) {
if (CHECK_FLAG(bgp->vrf_flags, BGP_VRF_AUTO))
continue;
nbr_output = true; nbr_output = true;
if (use_json) { if (use_json) {
if (!(json = json_object_new_object())) { if (!(json = json_object_new_object())) {
@ -16561,6 +16567,9 @@ static int bgp_show_all_instance_route_leak_vty(struct vty *vty, afi_t afi,
if (bgp->inst_type != BGP_INSTANCE_TYPE_DEFAULT) if (bgp->inst_type != BGP_INSTANCE_TYPE_DEFAULT)
vrf_name = bgp->name; vrf_name = bgp->name;
if (CHECK_FLAG(bgp->vrf_flags, BGP_VRF_AUTO))
continue;
if (use_json) { if (use_json) {
json_vrf = json_object_new_object(); json_vrf = json_object_new_object();
} else { } else {
@ -16651,6 +16660,9 @@ static void bgp_show_all_instances_updgrps_vty(struct vty *vty, afi_t afi,
struct bgp *bgp; struct bgp *bgp;
for (ALL_LIST_ELEMENTS(bm->bgp, node, nnode, bgp)) { for (ALL_LIST_ELEMENTS(bm->bgp, node, nnode, bgp)) {
if (CHECK_FLAG(bgp->vrf_flags, BGP_VRF_AUTO))
continue;
if (!uj) if (!uj)
vty_out(vty, "\nInstance %s:\n", vty_out(vty, "\nInstance %s:\n",
(bgp->inst_type == BGP_INSTANCE_TYPE_DEFAULT) (bgp->inst_type == BGP_INSTANCE_TYPE_DEFAULT)