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

Merge pull request #16075 from anlancs/ospfd/fix-cmd-instance

Browse source 
ospfd: add instance id for one command
This commit is contained in:
Donald Sharp 2024-05-28 13:06:43 -04:00 committed by GitHub
parent 447e7be0e4 b212c4d076
commit cccb0cd805
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/user/ospfd.rst
View file

@ -987,7 +987,7 @@ Showing Information
User can get that information as JSON format when ``json`` keyword User can get that information as JSON format when ``json`` keyword
at the end of cli is presented. at the end of cli is presented.
.. clicmd:: show ip ospf graceful-restart helper [detail] [json] .. clicmd:: show ip ospf [{(1-65535)|vrf <NAME|all>}] graceful-restart helper [detail] [json]
Displays the Graceful Restart Helper details including helper Displays the Graceful Restart Helper details including helper
config changes. config changes.

15
ospfd/ospf_vty.c
View file

@ -10755,10 +10755,11 @@ DEFUN (ospf_route_aggregation_timer,
DEFPY (show_ip_ospf_gr_helper, DEFPY (show_ip_ospf_gr_helper,
show_ip_ospf_gr_helper_cmd, show_ip_ospf_gr_helper_cmd,
"show ip ospf [vrf <NAME|all>] graceful-restart helper [detail] [json]", "show ip ospf [{(1-65535)$instance|vrf <NAME|all>}] graceful-restart helper [detail] [json]",
SHOW_STR SHOW_STR
IP_STR IP_STR
"OSPF information\n" "OSPF information\n"
"Instance ID\n"
VRF_CMD_HELP_STR VRF_CMD_HELP_STR
"All VRFs\n" "All VRFs\n"
"OSPF Graceful Restart\n" "OSPF Graceful Restart\n"
@ -10779,8 +10780,20 @@ DEFPY (show_ip_ospf_gr_helper,
int inst = 0; int inst = 0;
bool detail = false; bool detail = false;
if (instance && instance != ospf_instance)
return CMD_NOT_MY_INSTANCE;
ospf = ospf_lookup_instance(instance);
if (!ospf || !ospf->oi_running)
return CMD_SUCCESS;
OSPF_FIND_VRF_ARGS(argv, argc, idx_vrf, vrf_name, all_vrf); OSPF_FIND_VRF_ARGS(argv, argc, idx_vrf, vrf_name, all_vrf);
if (instance && vrf_name) {
vty_out(vty, "%% VRF is not supported in instance mode\n");
return CMD_WARNING;
}
if (argv_find(argv, argc, "detail", &idx)) if (argv_find(argv, argc, "detail", &idx))
detail = true; detail = true;