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

pim6d: Moving reusable code to common api for "show mroute summary" command

Browse source 
Signed-off-by: Abhishek N R <abnr@vmware.com>
This commit is contained in:
Abhishek N R 2022-06-09 04:53:12 -07:00
parent 1c1077c200
commit 789d0ec4de
4 changed files with 63 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
pimd/pim6_cmd.c
View file

@ -1433,31 +1433,7 @@ DEFPY (show_ipv6_mroute_summary,
"Summary of all mroutes\n" "Summary of all mroutes\n"
JSON_STR) JSON_STR)
{ {
struct pim_instance *pim; return pim_show_mroute_summary_helper(vrf, vty, !!json);
struct vrf *v;
json_object *json_parent = NULL;
v = vrf_lookup_by_name(vrf ? vrf : VRF_DEFAULT_NAME);
if (!v)
return CMD_WARNING;
pim = pim_get_pim_instance(v->vrf_id);
if (!pim) {
vty_out(vty, "%% Unable to find pim instance\n");
return CMD_WARNING;
}
if (json)
json_parent = json_object_new_object();
show_mroute_summary(pim, vty, json_parent);
if (json)
vty_json(vty, json_parent);
return CMD_SUCCESS;
} }
DEFPY (show_ipv6_mroute_summary_vrf_all, DEFPY (show_ipv6_mroute_summary_vrf_all,
@ -1470,30 +1446,7 @@ DEFPY (show_ipv6_mroute_summary_vrf_all,
"Summary of all mroutes\n" "Summary of all mroutes\n"
JSON_STR) JSON_STR)
{ {
struct vrf *vrf; return pim_show_mroute_summary_vrf_all_helper(vty, !!json);
json_object *json_parent = NULL;
json_object *json_vrf = NULL;
if (json)
json_parent = json_object_new_object();
RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
if (!json)
vty_out(vty, "VRF: %s\n", vrf->name);
else
json_vrf = json_object_new_object();
show_mroute_summary(vrf->info, vty, json_vrf);
if (json)
json_object_object_add(json_parent, vrf->name,
json_vrf);
}
if (json)
vty_json(vty, json_parent);
return CMD_SUCCESS;
} }
DEFPY (clear_ipv6_pim_statistics, DEFPY (clear_ipv6_pim_statistics,

51
pimd/pim_cmd.c
View file

@ -3433,31 +3433,7 @@ DEFPY (show_ip_mroute_summary,
"Summary of all mroutes\n" "Summary of all mroutes\n"
JSON_STR) JSON_STR)
{ {
struct pim_instance *pim; return pim_show_mroute_summary_helper(vrf, vty, !!json);
struct vrf *v;
json_object *json_parent = NULL;
v = vrf_lookup_by_name(vrf ? vrf : VRF_DEFAULT_NAME);
if (!v)
return CMD_WARNING;
pim = pim_get_pim_instance(v->vrf_id);
if (!pim) {
vty_out(vty, "%% Unable to find pim instance\n");
return CMD_WARNING;
}
if (json)
json_parent = json_object_new_object();
show_mroute_summary(pim, vty, json_parent);
if (json)
vty_json(vty, json_parent);
return CMD_SUCCESS;
} }
DEFPY (show_ip_mroute_summary_vrf_all, DEFPY (show_ip_mroute_summary_vrf_all,
@ -3470,30 +3446,7 @@ DEFPY (show_ip_mroute_summary_vrf_all,
"Summary of all mroutes\n" "Summary of all mroutes\n"
JSON_STR) JSON_STR)
{ {
struct vrf *vrf; return pim_show_mroute_summary_vrf_all_helper(vty, !!json);
json_object *json_parent = NULL;
json_object *json_vrf = NULL;
if (json)
json_parent = json_object_new_object();
RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
if (!json)
vty_out(vty, "VRF: %s\n", vrf->name);
else
json_vrf = json_object_new_object();
show_mroute_summary(vrf->info, vty, json_vrf);
if (json)
json_object_object_add(json_parent, vrf->name,
json_vrf);
}
if (json)
vty_json(vty, json_parent);
return CMD_SUCCESS;
} }
DEFUN (show_ip_rib, DEFUN (show_ip_rib,

57
pimd/pim_cmd_common.c
View file

@ -4291,3 +4291,60 @@ int pim_show_mroute_count_vrf_all_helper(struct vty *vty, bool json)
return CMD_SUCCESS; return CMD_SUCCESS;
} }
int pim_show_mroute_summary_helper(const char *vrf, struct vty *vty, bool json)
{
struct pim_instance *pim;
struct vrf *v;
json_object *json_parent = NULL;
v = vrf_lookup_by_name(vrf ? vrf : VRF_DEFAULT_NAME);
if (!v)
return CMD_WARNING;
pim = pim_get_pim_instance(v->vrf_id);
if (!pim) {
vty_out(vty, "%% Unable to find pim instance\n");
return CMD_WARNING;
}
if (json)
json_parent = json_object_new_object();
show_mroute_summary(pim, vty, json_parent);
if (json)
vty_json(vty, json_parent);
return CMD_SUCCESS;
}
int pim_show_mroute_summary_vrf_all_helper(struct vty *vty, bool json)
{
struct vrf *vrf;
json_object *json_parent = NULL;
json_object *json_vrf = NULL;
if (json)
json_parent = json_object_new_object();
RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
if (!json)
vty_out(vty, "VRF: %s\n", vrf->name);
else
json_vrf = json_object_new_object();
show_mroute_summary(vrf->info, vty, json_vrf);
if (json)
json_object_object_add(json_parent, vrf->name,
json_vrf);
}
if (json)
vty_json(vty, json_parent);
return CMD_SUCCESS;
}

2
pimd/pim_cmd_common.h
View file

@ -160,6 +160,8 @@ int pim_show_mroute_helper(const char *vrf, struct vty *vty, pim_addr s_or_g,
int pim_show_mroute_vrf_all_helper(struct vty *vty, bool fill, bool json); int pim_show_mroute_vrf_all_helper(struct vty *vty, bool fill, bool json);
int pim_show_mroute_count_helper(const char *vrf, struct vty *vty, bool json); int pim_show_mroute_count_helper(const char *vrf, struct vty *vty, bool json);
int pim_show_mroute_count_vrf_all_helper(struct vty *vty, bool json); int pim_show_mroute_count_vrf_all_helper(struct vty *vty, bool json);
int pim_show_mroute_summary_helper(const char *vrf, struct vty *vty, bool json);
int pim_show_mroute_summary_vrf_all_helper(struct vty *vty, bool json);
/* /*
* Special Macro to allow us to get the correct pim_instance; * Special Macro to allow us to get the correct pim_instance;