proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 03:53:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9307 from SaiGomathiN/sai-nht

Browse Source 
pimd: json support for nexthop
This commit is contained in:
Donatas Abraitis 2022-07-06 12:32:48 +03:00 committed by GitHub
commit 7650a8d638
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 92 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pimd/pim6_cmd.c
View File

@ -1072,14 +1072,15 @@ DEFPY (show_ipv6_pim_neighbor_vrf_all,
DEFPY (show_ipv6_pim_nexthop, DEFPY (show_ipv6_pim_nexthop,
show_ipv6_pim_nexthop_cmd, show_ipv6_pim_nexthop_cmd,
"show ipv6 pim [vrf NAME] nexthop", "show ipv6 pim [vrf NAME] nexthop [json$json]",
SHOW_STR SHOW_STR
IPV6_STR IPV6_STR
PIM_STR PIM_STR
VRF_CMD_HELP_STR VRF_CMD_HELP_STR
"PIM cached nexthop rpf information\n") "PIM cached nexthop rpf information\n"
JSON_STR)
{ {
return pim_show_nexthop_cmd_helper(vrf, vty); return pim_show_nexthop_cmd_helper(vrf, vty, !!json);
} }
DEFPY (show_ipv6_pim_nexthop_lookup, DEFPY (show_ipv6_pim_nexthop_lookup,

7
pimd/pim_cmd.c
View File

@ -2782,14 +2782,15 @@ DEFPY (show_ip_pim_rpf_vrf_all,
DEFPY (show_ip_pim_nexthop, DEFPY (show_ip_pim_nexthop,
show_ip_pim_nexthop_cmd, show_ip_pim_nexthop_cmd,
"show ip pim [vrf NAME] nexthop", "show ip pim [vrf NAME] nexthop [json$json]",
SHOW_STR SHOW_STR
IP_STR IP_STR
PIM_STR PIM_STR
VRF_CMD_HELP_STR VRF_CMD_HELP_STR
"PIM cached nexthop rpf information\n") "PIM cached nexthop rpf information\n"
JSON_STR)
{ {
return pim_show_nexthop_cmd_helper(vrf, vty); return pim_show_nexthop_cmd_helper(vrf, vty, !!json);
} }
DEFPY (show_ip_pim_nexthop_lookup, DEFPY (show_ip_pim_nexthop_lookup,

98
pimd/pim_cmd_common.c
View File

@ -2635,36 +2635,90 @@ void ip_pim_ssm_show_group_range(struct pim_instance *pim, struct vty *vty,
vty_out(vty, "SSM group range : %s\n", range_str); vty_out(vty, "SSM group range : %s\n", range_str);
} }
struct pnc_cache_walk_data { struct vty_pnc_cache_walk_data {
struct vty *vty; struct vty *vty;
struct pim_instance *pim; struct pim_instance *pim;
}; };
static int pim_print_pnc_cache_walkcb(struct hash_bucket *bucket, void *arg) struct json_pnc_cache_walk_data {
json_object *json_obj;
struct pim_instance *pim;
};
static int pim_print_vty_pnc_cache_walkcb(struct hash_bucket *bucket, void *arg)
{ {
struct pim_nexthop_cache *pnc = bucket->data; struct pim_nexthop_cache *pnc = bucket->data;
struct pnc_cache_walk_data *cwd = arg; struct vty_pnc_cache_walk_data *cwd = arg;
struct vty *vty = cwd->vty; struct vty *vty = cwd->vty;
struct pim_instance *pim = cwd->pim; struct pim_instance *pim = cwd->pim;
struct nexthop *nh_node = NULL; struct nexthop *nh_node = NULL;
ifindex_t first_ifindex; ifindex_t first_ifindex;
struct interface *ifp = NULL; struct interface *ifp = NULL;
char buf[PREFIX_STRLEN];
for (nh_node = pnc->nexthop; nh_node; nh_node = nh_node->next) { for (nh_node = pnc->nexthop; nh_node; nh_node = nh_node->next) {
first_ifindex = nh_node->ifindex; first_ifindex = nh_node->ifindex;
pim_addr rpf_addr = pim_addr_from_prefix(&pnc->rpf.rpf_addr);
ifp = if_lookup_by_index(first_ifindex, pim->vrf->vrf_id); ifp = if_lookup_by_index(first_ifindex, pim->vrf->vrf_id);
vty_out(vty, "%-15s ", vty_out(vty, "%-15pPAs ", &rpf_addr);
inet_ntop(AF_INET, &pnc->rpf.rpf_addr.u.prefix4, buf,
sizeof(buf)));
vty_out(vty, "%-16s ", ifp ? ifp->name : "NULL"); vty_out(vty, "%-16s ", ifp ? ifp->name : "NULL");
#if PIM_IPV == 4
vty_out(vty, "%pI4 ", &nh_node->gate.ipv4); vty_out(vty, "%pI4 ", &nh_node->gate.ipv4);
#else
vty_out(vty, "%pI6 ", &nh_node->gate.ipv6);
#endif
vty_out(vty, "\n"); vty_out(vty, "\n");
} }
return CMD_SUCCESS; return CMD_SUCCESS;
} }
static int pim_print_json_pnc_cache_walkcb(struct hash_bucket *backet,
void *arg)
{
struct pim_nexthop_cache *pnc = backet->data;
struct json_pnc_cache_walk_data *cwd = arg;
struct pim_instance *pim = cwd->pim;
struct nexthop *nh_node = NULL;
ifindex_t first_ifindex;
struct interface *ifp = NULL;
char addr_str[PIM_ADDRSTRLEN];
json_object *json_row = NULL;
json_object *json_ifp = NULL;
json_object *json_arr = NULL;
for (nh_node = pnc->nexthop; nh_node; nh_node = nh_node->next) {
pim_addr rpf_addr;
first_ifindex = nh_node->ifindex;
rpf_addr = pim_addr_from_prefix(&pnc->rpf.rpf_addr);
ifp = if_lookup_by_index(first_ifindex, pim->vrf->vrf_id);
snprintfrr(addr_str, sizeof(addr_str), "%pPAs", &rpf_addr);
json_object_object_get_ex(cwd->json_obj, addr_str, &json_row);
if (!json_row) {
json_row = json_object_new_object();
json_object_string_addf(json_row, "address", "%pPAs",
&rpf_addr);
json_object_object_addf(cwd->json_obj, json_row,
"%pPAs", &rpf_addr);
json_arr = json_object_new_array();
json_object_object_add(json_row, "nexthops", json_arr);
}
json_ifp = json_object_new_object();
json_object_string_add(json_ifp, "interface",
ifp ? ifp->name : "NULL");
#if PIM_IPV == 4
json_object_string_addf(json_ifp, "nexthop", "%pI4",
&nh_node->gate.ipv4);
#else
json_object_string_addf(json_ifp, "nexthop", "%pI6",
&nh_node->gate.ipv6);
#endif
json_object_array_add(json_arr, json_ifp);
}
return CMD_SUCCESS;
}
int pim_show_nexthop_lookup_cmd_helper(const char *vrf, struct vty *vty, int pim_show_nexthop_lookup_cmd_helper(const char *vrf, struct vty *vty,
pim_addr source, pim_addr group) pim_addr source, pim_addr group)
{ {
@ -2718,7 +2772,7 @@ int pim_show_nexthop_lookup_cmd_helper(const char *vrf, struct vty *vty,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
int pim_show_nexthop_cmd_helper(const char *vrf, struct vty *vty) int pim_show_nexthop_cmd_helper(const char *vrf, struct vty *vty, bool uj)
{ {
struct vrf *v; struct vrf *v;
@ -2727,23 +2781,35 @@ int pim_show_nexthop_cmd_helper(const char *vrf, struct vty *vty)
if (!v) if (!v)
return CMD_WARNING; return CMD_WARNING;
pim_show_nexthop(v->info, vty); pim_show_nexthop(v->info, vty, uj);
return CMD_SUCCESS; return CMD_SUCCESS;
} }
void pim_show_nexthop(struct pim_instance *pim, struct vty *vty) void pim_show_nexthop(struct pim_instance *pim, struct vty *vty, bool uj)
{ {
struct pnc_cache_walk_data cwd; struct vty_pnc_cache_walk_data cwd;
struct json_pnc_cache_walk_data jcwd;
cwd.vty = vty; cwd.vty = vty;
cwd.pim = pim; cwd.pim = pim;
vty_out(vty, "Number of registered addresses: %lu\n", jcwd.pim = pim;
pim->rpf_hash->count);
vty_out(vty, "Address Interface Nexthop\n");
vty_out(vty, "---------------------------------------------\n");
hash_walk(pim->rpf_hash, pim_print_pnc_cache_walkcb, &cwd); if (uj) {
jcwd.json_obj = json_object_new_object();
} else {
vty_out(vty, "Number of registered addresses: %lu\n",
pim->rpf_hash->count);
vty_out(vty, "Address Interface Nexthop\n");
vty_out(vty, "---------------------------------------------\n");
}
if (uj) {
hash_walk(pim->rpf_hash, pim_print_json_pnc_cache_walkcb,
&jcwd);
vty_json(vty, jcwd.json_obj);
} else
hash_walk(pim->rpf_hash, pim_print_vty_pnc_cache_walkcb, &cwd);
} }
int pim_show_neighbors_cmd_helper(const char *vrf, struct vty *vty, int pim_show_neighbors_cmd_helper(const char *vrf, struct vty *vty,

4
pimd/pim_cmd_common.h
View File

@ -107,8 +107,8 @@ void ip_pim_ssm_show_group_range(struct pim_instance *pim, struct vty *vty,
bool uj); bool uj);
int pim_show_nexthop_lookup_cmd_helper(const char *vrf, struct vty *vty, int pim_show_nexthop_lookup_cmd_helper(const char *vrf, struct vty *vty,
pim_addr source, pim_addr group); pim_addr source, pim_addr group);
int pim_show_nexthop_cmd_helper(const char *vrf, struct vty *vty); int pim_show_nexthop_cmd_helper(const char *vrf, struct vty *vty, bool uj);
void pim_show_nexthop(struct pim_instance *pim, struct vty *vty); void pim_show_nexthop(struct pim_instance *pim, struct vty *vty, bool uj);
int pim_show_neighbors_cmd_helper(const char *vrf, struct vty *vty, int pim_show_neighbors_cmd_helper(const char *vrf, struct vty *vty,
const char *json, const char *interface); const char *json, const char *interface);
int pim_show_neighbors_vrf_all_cmd_helper(struct vty *vty, const char *json, int pim_show_neighbors_vrf_all_cmd_helper(struct vty *vty, const char *json,