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

pimd: added no ip msdp mesh-group <word>

Browse Source 
Issue: no ip msdp mesh-group <word> source command
deleting the mesh group, which might be used by the member.

Solution: no ip msdp mesh-group <word> source command, deletes
the mesh-group source.
Add a new cli command "no ip msdp mesh-group <word>" to delete
the mesh group.

Signed-off-by: Sarita Patra <saritap@vmware.com>
This commit is contained in:
Sarita Patra 2020-03-16 13:41:46 -07:00
parent f61182b931
commit 34d86eff8e
3 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/user/pim.rst
View File

@ -158,6 +158,11 @@ Certain signals have special meanings to *pimd*.
urib-only urib-only
Lookup in the Unicast Rib only. Lookup in the Unicast Rib only.
.. index:: no ip msdp mesh-group [WORD]
.. clicmd:: no ip msdp mesh-group [WORD]
Delete multicast source discovery protocol mesh-group
.. index:: ip igmp generate-query-once [version (2-3)] .. index:: ip igmp generate-query-once [version (2-3)]
.. clicmd:: ip igmp generate-query-once [version (2-3)] .. clicmd:: ip igmp generate-query-once [version (2-3)]

24
pimd/pim_cmd.c
View File

@ -9634,11 +9634,25 @@ DEFUN (no_ip_msdp_mesh_group_source,
"mesh group local address\n") "mesh group local address\n")
{ {
PIM_DECLVAR_CONTEXT(vrf, pim); PIM_DECLVAR_CONTEXT(vrf, pim);
if (argc == 7)
return ip_no_msdp_mesh_group_cmd_worker(pim, vty, argv[6]->arg); return ip_no_msdp_mesh_group_source_cmd_worker(pim, vty, argv[4]->arg);
}
DEFUN (no_ip_msdp_mesh_group,
no_ip_msdp_mesh_group_cmd,
"no ip msdp mesh-group [WORD]",
NO_STR
IP_STR
CFG_MSDP_STR
"Delete MSDP mesh-group\n"
"mesh group name")
{
PIM_DECLVAR_CONTEXT(vrf, pim);
if (argc == 5)
return ip_no_msdp_mesh_group_cmd_worker(pim, vty, argv[4]->arg);
else else
return ip_no_msdp_mesh_group_source_cmd_worker(pim, vty, return ip_no_msdp_mesh_group_cmd_worker(pim, vty, NULL);
argv[4]->arg);
} }
static void print_empty_json_obj(struct vty *vty) static void print_empty_json_obj(struct vty *vty)
@ -11024,6 +11038,8 @@ void pim_cmd_init(void)
install_element(VRF_NODE, &ip_msdp_mesh_group_source_cmd); install_element(VRF_NODE, &ip_msdp_mesh_group_source_cmd);
install_element(CONFIG_NODE, &no_ip_msdp_mesh_group_source_cmd); install_element(CONFIG_NODE, &no_ip_msdp_mesh_group_source_cmd);
install_element(VRF_NODE, &no_ip_msdp_mesh_group_source_cmd); install_element(VRF_NODE, &no_ip_msdp_mesh_group_source_cmd);
install_element(CONFIG_NODE, &no_ip_msdp_mesh_group_cmd);
install_element(VRF_NODE, &no_ip_msdp_mesh_group_cmd);
install_element(VIEW_NODE, &show_ip_msdp_peer_detail_cmd); install_element(VIEW_NODE, &show_ip_msdp_peer_detail_cmd);
install_element(VIEW_NODE, &show_ip_msdp_peer_detail_vrf_all_cmd); install_element(VIEW_NODE, &show_ip_msdp_peer_detail_vrf_all_cmd);
install_element(VIEW_NODE, &show_ip_msdp_sa_detail_cmd); install_element(VIEW_NODE, &show_ip_msdp_sa_detail_cmd);

4
pimd/pim_msdp.c
View File

@ -1286,7 +1286,9 @@ enum pim_msdp_err pim_msdp_mg_del(struct pim_instance *pim,
struct pim_msdp_mg *mg = pim->msdp.mg; struct pim_msdp_mg *mg = pim->msdp.mg;
struct pim_msdp_mg_mbr *mbr; struct pim_msdp_mg_mbr *mbr;
if (!mg || strcmp(mg->mesh_group_name, mesh_group_name)) { if (!mg
|| (mesh_group_name
&& strcmp(mg->mesh_group_name, mesh_group_name))) {
return PIM_MSDP_ERR_NO_MG; return PIM_MSDP_ERR_NO_MG;
} }