From 6d1bd8c28a7b8df89420c5819bd1224d55895811 Mon Sep 17 00:00:00 2001 From: Abhishek N R Date: Wed, 8 Jun 2022 22:49:16 -0700 Subject: [PATCH] pim6d: Moving resuable code to common api for "show pim rpf" command Signed-off-by: Abhishek N R --- pimd/pim6_cmd.c | 48 ++------------------------------------ pimd/pim_cmd.c | 48 ++------------------------------------ pimd/pim_cmd_common.c | 54 +++++++++++++++++++++++++++++++++++++++++++ pimd/pim_cmd_common.h | 2 ++ 4 files changed, 60 insertions(+), 92 deletions(-) diff --git a/pimd/pim6_cmd.c b/pimd/pim6_cmd.c index 77844988ea..f86f3375d5 100644 --- a/pimd/pim6_cmd.c +++ b/pimd/pim6_cmd.c @@ -879,31 +879,7 @@ DEFPY (show_ipv6_pim_rpf, "PIM cached source rpf information\n" 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(); - - pim_show_rpf(pim, vty, json_parent); - - if (json) - vty_json(vty, json_parent); - - return CMD_SUCCESS; + return pim_show_rpf_helper(vrf, vty, !!json); } DEFPY (show_ipv6_pim_rpf_vrf_all, @@ -916,27 +892,7 @@ DEFPY (show_ipv6_pim_rpf_vrf_all, "PIM cached source rpf information\n" 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(); - pim_show_rpf(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_rpf_vrf_all_helper(vty, !!json); } DEFPY (show_ipv6_pim_secondary, diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index 2d6ce24381..53ea54e906 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -3343,31 +3343,7 @@ DEFPY (show_ip_pim_rpf, "PIM cached source rpf information\n" 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(); - - pim_show_rpf(pim, vty, json_parent); - - if (json) - vty_json(vty, json_parent); - - return CMD_SUCCESS; + return pim_show_rpf_helper(vrf, vty, !!json); } DEFPY (show_ip_pim_rpf_vrf_all, @@ -3380,27 +3356,7 @@ DEFPY (show_ip_pim_rpf_vrf_all, "PIM cached source rpf information\n" 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(); - pim_show_rpf(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_rpf_vrf_all_helper(vty, !!json); } DEFPY (show_ip_pim_nexthop, diff --git a/pimd/pim_cmd_common.c b/pimd/pim_cmd_common.c index 668853e988..2807762175 100644 --- a/pimd/pim_cmd_common.c +++ b/pimd/pim_cmd_common.c @@ -3737,3 +3737,57 @@ int pim_no_debug_pim_packets_cmd(const char *hello, const char *joins, return CMD_SUCCESS; } + +int pim_show_rpf_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(); + + pim_show_rpf(pim, vty, json_parent); + + if (json) + vty_json(vty, json_parent); + + return CMD_SUCCESS; +} + +int pim_show_rpf_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(); + pim_show_rpf(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 9644f84e0c..ce81473eb4 100644 --- a/pimd/pim_cmd_common.h +++ b/pimd/pim_cmd_common.h @@ -131,6 +131,8 @@ int pim_debug_pim_packets_cmd(const char *hello, const char *joins, const char *registers, struct vty *vty); int pim_no_debug_pim_packets_cmd(const char *hello, const char *joins, const char *registers, struct vty *vty); +int pim_show_rpf_helper(const char *vrf, struct vty *vty, bool json); +int pim_show_rpf_vrf_all_helper(struct vty *vty, bool json); /* * Special Macro to allow us to get the correct pim_instance; -- 2.39.5