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

ospf6d: rename the "graceful-restart helper-only" command

Browse Source 
Considering that both the GR helper mode and restarting mode can be
enabled at the same time, the "graceful-restart helper-only" command
can be a bit misleading since it implies that only the helper mode
is enabled. Rename the command to "graceful-restart helper enable"
to clarify what the command does.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
This commit is contained in:
Renato Westphal 2021-09-21 10:40:10 -03:00
parent 598553e34f
commit 6b513b4c92
9 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/user/ospf6d.rst
View File

@ -276,7 +276,7 @@ Graceful Restart
To perform a graceful shutdown, the "graceful-restart prepare ipv6 ospf" To perform a graceful shutdown, the "graceful-restart prepare ipv6 ospf"
EXEC-level command needs to be issued before restarting the ospf6d daemon. EXEC-level command needs to be issued before restarting the ospf6d daemon.
.. clicmd:: graceful-restart helper-only [A.B.C.D] .. clicmd:: graceful-restart helper enable [A.B.C.D]
Configure Graceful Restart (RFC 5187) helper support. Configure Graceful Restart (RFC 5187) helper support.

16
ospf6d/ospf6_gr_helper.c
View File

@ -1019,10 +1019,11 @@ static void show_ospf6_gr_helper_details(struct vty *vty, struct ospf6 *ospf6,
/* Graceful Restart HELPER config Commands */ /* Graceful Restart HELPER config Commands */
DEFPY(ospf6_gr_helper_enable, DEFPY(ospf6_gr_helper_enable,
ospf6_gr_helper_enable_cmd, ospf6_gr_helper_enable_cmd,
"graceful-restart helper-only [A.B.C.D$rtr_id]", "graceful-restart helper enable [A.B.C.D$rtr_id]",
"ospf6 graceful restart\n" "ospf6 graceful restart\n"
"ospf6 GR Helper\n"
"Enable Helper support\n" "Enable Helper support\n"
"Advertisement RouterId\n") "Advertisement Router-ID\n")
{ {
VTY_DECLVAR_CONTEXT(ospf6, ospf6); VTY_DECLVAR_CONTEXT(ospf6, ospf6);
@ -1041,11 +1042,12 @@ DEFPY(ospf6_gr_helper_enable,
DEFPY(ospf6_gr_helper_disable, DEFPY(ospf6_gr_helper_disable,
ospf6_gr_helper_disable_cmd, ospf6_gr_helper_disable_cmd,
"no graceful-restart helper-only [A.B.C.D$rtr_id]", "no graceful-restart helper enable [A.B.C.D$rtr_id]",
NO_STR NO_STR
"ospf6 graceful restart\n" "ospf6 graceful restart\n"
"Disable Helper support\n" "ospf6 GR Helper\n"
"Advertisement RouterId\n") "Enable Helper support\n"
"Advertisement Router-ID\n")
{ {
VTY_DECLVAR_CONTEXT(ospf6, ospf6); VTY_DECLVAR_CONTEXT(ospf6, ospf6);
@ -1354,14 +1356,14 @@ static int ospf6_cfg_write_helper_enable_rtr_walkcb(struct hash_bucket *backet,
struct advRtr *rtr = backet->data; struct advRtr *rtr = backet->data;
struct vty *vty = (struct vty *)arg; struct vty *vty = (struct vty *)arg;
vty_out(vty, " graceful-restart helper-only %pI4\n", &rtr->advRtrAddr); vty_out(vty, " graceful-restart helper enable %pI4\n", &rtr->advRtrAddr);
return HASHWALK_CONTINUE; return HASHWALK_CONTINUE;
} }
int config_write_ospf6_gr_helper(struct vty *vty, struct ospf6 *ospf6) int config_write_ospf6_gr_helper(struct vty *vty, struct ospf6 *ospf6)
{ {
if (ospf6->ospf6_helper_cfg.is_helper_supported) if (ospf6->ospf6_helper_cfg.is_helper_supported)
vty_out(vty, " graceful-restart helper-only\n"); vty_out(vty, " graceful-restart helper enable\n");
if (!ospf6->ospf6_helper_cfg.strict_lsa_check) if (!ospf6->ospf6_helper_cfg.strict_lsa_check)
vty_out(vty, " graceful-restart helper lsa-check-disable\n"); vty_out(vty, " graceful-restart helper lsa-check-disable\n");

2
tests/topotests/ospf6_gr_topo1/rt1/ospf6d.conf
View File

@ -26,5 +26,5 @@ router ospf6
ospf6 router-id 1.1.1.1 ospf6 router-id 1.1.1.1
redistribute connected redistribute connected
graceful-restart grace-period 120 graceful-restart grace-period 120
graceful-restart helper-only graceful-restart helper enable
! !

2
tests/topotests/ospf6_gr_topo1/rt2/ospf6d.conf
View File

@ -31,5 +31,5 @@ interface eth-rt3
router ospf6 router ospf6
ospf6 router-id 2.2.2.2 ospf6 router-id 2.2.2.2
graceful-restart grace-period 120 graceful-restart grace-period 120
graceful-restart helper-only graceful-restart helper enable
! !

2
tests/topotests/ospf6_gr_topo1/rt3/ospf6d.conf
View File

@ -37,5 +37,5 @@ interface eth-rt6
router ospf6 router ospf6
ospf6 router-id 3.3.3.3 ospf6 router-id 3.3.3.3
graceful-restart grace-period 120 graceful-restart grace-period 120
graceful-restart helper-only graceful-restart helper enable
! !

2
tests/topotests/ospf6_gr_topo1/rt4/ospf6d.conf
View File

@ -31,5 +31,5 @@ interface eth-rt5
router ospf6 router ospf6
ospf6 router-id 4.4.4.4 ospf6 router-id 4.4.4.4
graceful-restart grace-period 120 graceful-restart grace-period 120
graceful-restart helper-only graceful-restart helper enable
! !

2
tests/topotests/ospf6_gr_topo1/rt5/ospf6d.conf
View File

@ -25,5 +25,5 @@ interface eth-rt4
router ospf6 router ospf6
ospf6 router-id 5.5.5.5 ospf6 router-id 5.5.5.5
graceful-restart grace-period 120 graceful-restart grace-period 120
graceful-restart helper-only graceful-restart helper enable
! !

2
tests/topotests/ospf6_gr_topo1/rt6/ospf6d.conf
View File

@ -31,5 +31,5 @@ interface eth-rt7
router ospf6 router ospf6
ospf6 router-id 6.6.6.6 ospf6 router-id 6.6.6.6
graceful-restart grace-period 120 graceful-restart grace-period 120
graceful-restart helper-only graceful-restart helper enable
! !

2
tests/topotests/ospf6_gr_topo1/rt7/ospf6d.conf
View File

@ -26,5 +26,5 @@ router ospf6
ospf6 router-id 7.7.7.7 ospf6 router-id 7.7.7.7
redistribute connected redistribute connected
graceful-restart grace-period 120 graceful-restart grace-period 120
graceful-restart helper-only graceful-restart helper enable
! !