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

pimd: rename the upstream-join-desired command to "show ip pim channel"

Browse source 
This re-naming was needed because the JD state on an upstream is
not just based on channel info i.e. we can have JD=true even if there
is no downstream channel. The "show ip upstream-join-desired" command
will be changed to display that info i.e. upstream's JD state instead
of downstream channel params. The downstream channel params are now
available via "show ip pim channel"

PS: This change maybe reverted if upstream NAKs it. But there is a
pressing need for it to debug some not-so-reproduible problems.

Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
This commit is contained in:
Anuradha Karuppiah 2019-11-15 11:58:27 -08:00
parent b36576e44c
commit 5c9a72ef47
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pimd/pim_cmd.c
View file

@ -2577,7 +2577,7 @@ static void pim_show_upstream(struct pim_instance *pim, struct vty *vty,
} }
} }
static void pim_show_join_desired_helper(struct pim_instance *pim, static void pim_show_channel_helper(struct pim_instance *pim,
struct vty *vty, struct vty *vty,
struct pim_interface *pim_ifp, struct pim_interface *pim_ifp,
struct pim_ifchannel *ch, struct pim_ifchannel *ch,
@ -2636,7 +2636,7 @@ static void pim_show_join_desired_helper(struct pim_instance *pim,
} }
} }
static void pim_show_join_desired(struct pim_instance *pim, struct vty *vty, static void pim_show_channel(struct pim_instance *pim, struct vty *vty,
bool uj) bool uj)
{ {
struct pim_interface *pim_ifp; struct pim_interface *pim_ifp;
@ -2660,7 +2660,7 @@ static void pim_show_join_desired(struct pim_instance *pim, struct vty *vty,
RB_FOREACH (ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb) { RB_FOREACH (ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb) {
/* scan all interfaces */ /* scan all interfaces */
pim_show_join_desired_helper(pim, vty, pim_ifp, ch, pim_show_channel_helper(pim, vty, pim_ifp, ch,
json, uj); json, uj);
} }
} }
@ -4809,14 +4809,14 @@ DEFUN (show_ip_pim_upstream_vrf_all,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN (show_ip_pim_upstream_join_desired, DEFUN (show_ip_pim_channel,
show_ip_pim_upstream_join_desired_cmd, show_ip_pim_channel_cmd,
"show ip pim [vrf NAME] upstream-join-desired [json]", "show ip pim [vrf NAME] channel [json]",
SHOW_STR SHOW_STR
IP_STR IP_STR
PIM_STR PIM_STR
VRF_CMD_HELP_STR VRF_CMD_HELP_STR
"PIM upstream join-desired\n" "PIM downstream channel info\n"
JSON_STR) JSON_STR)
{ {
int idx = 2; int idx = 2;
@ -4826,7 +4826,7 @@ DEFUN (show_ip_pim_upstream_join_desired,
if (!vrf) if (!vrf)
return CMD_WARNING; return CMD_WARNING;
pim_show_join_desired(vrf->info, vty, uj); pim_show_channel(vrf->info, vty, uj);
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -10456,7 +10456,7 @@ void pim_cmd_init(void)
install_element(VIEW_NODE, &show_ip_pim_state_vrf_all_cmd); install_element(VIEW_NODE, &show_ip_pim_state_vrf_all_cmd);
install_element(VIEW_NODE, &show_ip_pim_upstream_cmd); install_element(VIEW_NODE, &show_ip_pim_upstream_cmd);
install_element(VIEW_NODE, &show_ip_pim_upstream_vrf_all_cmd); install_element(VIEW_NODE, &show_ip_pim_upstream_vrf_all_cmd);
install_element(VIEW_NODE, &show_ip_pim_upstream_join_desired_cmd); install_element(VIEW_NODE, &show_ip_pim_channel_cmd);
install_element(VIEW_NODE, &show_ip_pim_upstream_rpf_cmd); install_element(VIEW_NODE, &show_ip_pim_upstream_rpf_cmd);
install_element(VIEW_NODE, &show_ip_pim_rp_cmd); install_element(VIEW_NODE, &show_ip_pim_rp_cmd);
install_element(VIEW_NODE, &show_ip_pim_rp_vrf_all_cmd); install_element(VIEW_NODE, &show_ip_pim_rp_vrf_all_cmd);