From 334d2f8c3d30ef565fde12f0bd76d08aecb4e837 Mon Sep 17 00:00:00 2001 From: Abhishek N R Date: Thu, 9 Jun 2022 04:04:14 -0700 Subject: [PATCH] pim6d: Moving reusable code to common api for "show ip/ipv6 multicast count" command Signed-off-by: Abhishek N R --- pimd/pim6_cmd.c | 49 ++------------------------------------ pimd/pim_cmd.c | 49 ++------------------------------------ pimd/pim_cmd_common.c | 55 +++++++++++++++++++++++++++++++++++++++++++ pimd/pim_cmd_common.h | 3 +++ 4 files changed, 62 insertions(+), 94 deletions(-) diff --git a/pimd/pim6_cmd.c b/pimd/pim6_cmd.c index e9d90b104d..4476b8b103 100644 --- a/pimd/pim6_cmd.c +++ b/pimd/pim6_cmd.c @@ -1353,31 +1353,7 @@ DEFPY (show_ipv6_multicast_count, VRF_CMD_HELP_STR JSON_STR) { - 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_multicast_interfaces(pim, vty, json_parent); - - if (json) - vty_json(vty, json_parent); - - return CMD_SUCCESS; + return pim_show_multicast_count_helper(vrf, vty, !!json); } DEFPY (show_ipv6_multicast_count_vrf_all, @@ -1390,28 +1366,7 @@ DEFPY (show_ipv6_multicast_count_vrf_all, VRF_CMD_HELP_STR JSON_STR) { - 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_multicast_interfaces(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; + return pim_show_multicast_count_vrf_all_helper(vty, !!json); } DEFPY (show_ipv6_mroute, diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index 1766bd1fae..dc36471f69 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -3341,31 +3341,7 @@ DEFPY (show_ip_multicast_count, VRF_CMD_HELP_STR JSON_STR) { - 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_multicast_interfaces(pim, vty, json_parent); - - if (json) - vty_json(vty, json_parent); - - return CMD_SUCCESS; + return pim_show_multicast_count_helper(vrf, vty, !!json); } DEFPY (show_ip_multicast_count_vrf_all, @@ -3378,28 +3354,7 @@ DEFPY (show_ip_multicast_count_vrf_all, VRF_CMD_HELP_STR JSON_STR) { - 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_multicast_interfaces(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; + return pim_show_multicast_count_vrf_all_helper(vty, !!json); } DEFPY (show_ip_mroute, diff --git a/pimd/pim_cmd_common.c b/pimd/pim_cmd_common.c index 7a05118677..e5052dfe9a 100644 --- a/pimd/pim_cmd_common.c +++ b/pimd/pim_cmd_common.c @@ -4115,3 +4115,58 @@ int pim_show_multicast_vrf_all_helper(struct vty *vty) return CMD_SUCCESS; } + +int pim_show_multicast_count_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_multicast_interfaces(pim, vty, json_parent); + + if (json) + vty_json(vty, json_parent); + + return CMD_SUCCESS; +} + +int pim_show_multicast_count_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_multicast_interfaces(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; +} diff --git a/pimd/pim_cmd_common.h b/pimd/pim_cmd_common.h index ceba2f2b41..a7fbefb862 100644 --- a/pimd/pim_cmd_common.h +++ b/pimd/pim_cmd_common.h @@ -152,6 +152,9 @@ int pim_show_state_vrf_all_helper(struct vty *vty, const char *s_or_g_str, const char *g_str, bool json); int pim_show_multicast_helper(const char *vrf, struct vty *vty); int pim_show_multicast_vrf_all_helper(struct vty *vty); +int pim_show_multicast_count_helper(const char *vrf, struct vty *vty, + bool json); +int pim_show_multicast_count_vrf_all_helper(struct vty *vty, bool json); /* * Special Macro to allow us to get the correct pim_instance; -- 2.39.5