Skip to content

Commit

Permalink
zebra: add nexthop-group prefix-list in show command
Browse files Browse the repository at this point in the history 
The 'show nexthop-group id' command has a detail parameter.
This parameter will help displaying the list of prefixes
that protocol daemon is registered with.

> r1# show nexthop-group rib bgp  detail
> ID: 71428582 (bgp)
>      RefCnt: 2
>      Uptime: 00:07:54
>      VRF: default(IPv4)
>      Valid, Installed
>      Depends: (41)
>         via 192.0.2.6 (vrf default) (recursive), label 6000, weight 1
>            via 172.31.0.3, r1-eth1 (vrf default), label 16006/6000, weight 1
>      Prefix list:
>        192.0.2.9/32, afi IPv4, safi unicast, table 101 (vrf vrf1)
>
> r1# show nexthop-group rib bgp  detail  json
> [..]
>   "71428582":{
>     "type":"bgp",
>     "refCount":2,
>     "uptime":"00:05:42",
>     "vrf":"default",
>     "afi":"IPv4",
>     "valid":true,
>     "installed":true,
>     "depends":[
>       41
>     ],
> [..]
>     "prefixList":[
>       {
>         "prefix":"192.0.2.9/32",
>         "afi":"IPv4",
>         "safi":"unicast",
>         "table":101,
>         "vrfId":7,
>         "vrfName":"vrf1"
>       }
>     ]
>   },

Signed-off-by: Philippe Guibert <[email protected]>
  • Loading branch information
@pguibert6WIND
pguibert6WIND committed Oct 8, 2024
1 parent 54d3731 commit f267bff
Showing 1 changed file with 66 additions and 15 deletions.
81 changes: 66 additions & 15 deletions zebra/zebra_vty.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1160,7 +1160,45 @@ DEFPY (show_ip_nht,
return CMD_SUCCESS;
}

static void show_nexthop_group_out(struct vty *vty, struct nhg_hash_entry *nhe,
struct show_nhe_prefix_list_context {
struct vty *vty;
json_object *json;
};

static void show_nhe_prefix_proto_nhgs_entry(struct hash_bucket *bucket, void *data)
{
struct vty *vty;
json_object *json = NULL;
json_object *json_entry = NULL;
struct nhg_prefix_proto_nhgs *entry = bucket->data;
struct show_nhe_prefix_list_context *ctx = data;
struct vrf *vrf;

vty = ctx->vty;
json = ctx->json;
if (json) {
json_entry = json_object_new_object();
json_object_string_addf(json_entry, "prefix", "%pFX", &entry->prefix);
if (entry->prefix.family == AF_INET6 && entry->src_prefix.family != AF_UNSPEC)
json_object_string_addf(json_entry, "srcPrefix", "%pFX", &entry->src_prefix);
json_object_string_add(json_entry, "afi", afi2str(entry->afi));
json_object_string_add(json_entry, "safi", safi2str(entry->safi));
json_object_int_add(json_entry, "table", entry->table_id);
json_object_int_add(json_entry, "vrfId", entry->vrf_id);
json_object_string_add(json_entry, "vrfName", vrf_id_to_name(entry->vrf_id));
json_object_array_add(json, json_entry);
} else if (vty) {
vrf = vrf_lookup_by_id(entry->vrf_id);

vty_out(vty, " %pFX", &entry->prefix);
if (entry->prefix.family == AF_INET6 && entry->src_prefix.family != AF_UNSPEC)
vty_out(vty, ", src %pFX", &entry->src_prefix);
vty_out(vty, ", afi %s, safi %s, table %d (vrf %s)\n", afi2str(entry->afi),
safi2str(entry->safi), entry->table_id, VRF_LOGNAME(vrf));
}
}

static void show_nexthop_group_out(struct vty *vty, struct nhg_hash_entry *nhe, bool detail,
json_object *json_nhe_hdr)
{
struct nexthop *nexthop = NULL;
Expand All @@ -1175,7 +1213,8 @@ static void show_nexthop_group_out(struct vty *vty, struct nhg_hash_entry *nhe,
json_object *json = NULL;
json_object *json_backup_nexthop_array = NULL;
json_object *json_backup_nexthops = NULL;

json_object *json_prefix_list = NULL;
struct show_nhe_prefix_list_context ctx;

uptime2str(nhe->uptime, up_str, sizeof(up_str));

Expand All @@ -1196,7 +1235,6 @@ static void show_nexthop_group_out(struct vty *vty, struct nhg_hash_entry *nhe,
json_object_string_add(json, "vrf",
vrf_id_to_name(nhe->vrf_id));
json_object_string_add(json, "afi", afi2str(nhe->afi));

} else {
vty_out(vty, "ID: %u (%s)\n", nhe->id,
zebra_route_string(nhe->type));
Expand Down Expand Up @@ -1411,17 +1449,29 @@ static void show_nexthop_group_out(struct vty *vty, struct nhg_hash_entry *nhe,

if (json_nhe_hdr)
json_object_object_addf(json_nhe_hdr, json, "%u", nhe->id);

if (detail && nhe->id >= ZEBRA_NHG_PROTO_LOWER) {
if (json)
json_prefix_list = json_object_new_array();
else
vty_out(vty, " Prefix list:\n");
ctx.vty = vty;
ctx.json = json_prefix_list;
hash_iterate(nhe->prefix_proto_nhgs, show_nhe_prefix_proto_nhgs_entry, &ctx);
if (json)
json_object_object_add(json, "prefixList", json_prefix_list);
}
}

static int show_nexthop_group_id_cmd_helper(struct vty *vty, uint32_t id,
static int show_nexthop_group_id_cmd_helper(struct vty *vty, uint32_t id, bool detail,
json_object *json)
{
struct nhg_hash_entry *nhe = NULL;

nhe = zebra_nhg_lookup_id(id);

if (nhe)
show_nexthop_group_out(vty, nhe, json);
show_nexthop_group_out(vty, nhe, detail, json);
else {
if (json)
vty_json(vty, json);
Expand All @@ -1445,6 +1495,7 @@ struct nhe_show_context {
afi_t afi;
int type;
json_object *json;
bool detail;
};

static int nhe_show_walker(struct hash_bucket *bucket, void *arg)
Expand All @@ -1463,15 +1514,14 @@ static int nhe_show_walker(struct hash_bucket *bucket, void *arg)
if (ctx->type && nhe->type != ctx->type)
goto done;

show_nexthop_group_out(ctx->vty, nhe, ctx->json);
show_nexthop_group_out(ctx->vty, nhe, ctx->detail, ctx->json);

done:
return HASHWALK_CONTINUE;
}

static void show_nexthop_group_cmd_helper(struct vty *vty,
struct zebra_vrf *zvrf, afi_t afi,
int type, json_object *json)
static void show_nexthop_group_cmd_helper(struct vty *vty, struct zebra_vrf *zvrf, afi_t afi,
int type, bool detail, json_object *json)
{
struct nhe_show_context ctx;

Expand All @@ -1480,6 +1530,7 @@ static void show_nexthop_group_cmd_helper(struct vty *vty,
ctx.vrf_id = zvrf->vrf->vrf_id;
ctx.type = type;
ctx.json = json;
ctx.detail = detail;

hash_walk(zrouter.nhgs_id, nhe_show_walker, &ctx);
}
Expand All @@ -1499,7 +1550,7 @@ static void if_nexthop_group_dump_vty(struct vty *vty, struct interface *ifp)
}

vty_out(vty, " ");
show_nexthop_group_out(vty, rb_node_dep->nhe, NULL);
show_nexthop_group_out(vty, rb_node_dep->nhe, false, NULL);
}
}

Expand Down Expand Up @@ -1539,7 +1590,7 @@ DEFPY (show_interface_nexthop_group,

DEFPY(show_nexthop_group,
show_nexthop_group_cmd,
"show nexthop-group rib <(0-4294967295)$id|[singleton <ip$v4|ipv6$v6>] [<kernel|zebra|bgp|sharp>$type_str] [vrf <NAME$vrf_name|all$vrf_all>]> [json]",
"show nexthop-group rib <(0-4294967295)$id|[singleton <ip$v4|ipv6$v6>] [<kernel|zebra|bgp|sharp>$type_str] [vrf <NAME$vrf_name|all$vrf_all>]> [detail$detail] [json]",
SHOW_STR
"Show Nexthop Groups\n"
"RIB information\n"
Expand All @@ -1552,6 +1603,7 @@ DEFPY(show_nexthop_group,
"Border Gateway Protocol (BGP)\n"
"Super Happy Advanced Routing Protocol (SHARP)\n"
VRF_FULL_CMD_HELP_STR
"Show detailed information\n"
JSON_STR)
{

Expand All @@ -1566,7 +1618,7 @@ DEFPY(show_nexthop_group,
json = json_object_new_object();

if (id)
return show_nexthop_group_id_cmd_helper(vty, id, json);
return show_nexthop_group_id_cmd_helper(vty, id, !!detail, json);

if (v4)
afi = AFI_IP;
Expand Down Expand Up @@ -1604,8 +1656,7 @@ DEFPY(show_nexthop_group,
else
vty_out(vty, "VRF: %s\n", vrf->name);

show_nexthop_group_cmd_helper(vty, zvrf, afi, type,
json_vrf);
show_nexthop_group_cmd_helper(vty, zvrf, afi, type, !!detail, json_vrf);
if (uj)
json_object_object_add(json, vrf->name,
json_vrf);
Expand All @@ -1631,7 +1682,7 @@ DEFPY(show_nexthop_group,
return CMD_WARNING;
}

show_nexthop_group_cmd_helper(vty, zvrf, afi, type, json);
show_nexthop_group_cmd_helper(vty, zvrf, afi, type, !!detail, json);

if (uj)
vty_json(vty, json);
Expand Down

0 comments on commit f267bff

Please sign in to comment.