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

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>

diff --git a/doc/user/ospf6d.rst b/doc/user/ospf6d.rst
index ede2144107e42378c8998af2d9ff90fc507f6116..f9f514f6c588e60b9ef6439aae3351c4afd763da 100644 (file)
--- a/doc/user/ospf6d.rst
+++ b/doc/user/ospf6d.rst
@@ -276,7 +276,7 @@ Graceful Restart
    To perform a graceful shutdown, the "graceful-restart prepare ipv6 ospf"
    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.

diff --git a/ospf6d/ospf6_gr_helper.c b/ospf6d/ospf6_gr_helper.c
index 4522bd2619ff32e095954b8957a48c6716f10740..ad8998b1edc0043837f4e0d5bc54eb375e15ecef 100644 (file)
--- a/ospf6d/ospf6_gr_helper.c
+++ b/ospf6d/ospf6_gr_helper.c
@@ -1019,10 +1019,11 @@ static void show_ospf6_gr_helper_details(struct vty *vty, struct ospf6 *ospf6,
 /* Graceful Restart HELPER  config Commands */
 DEFPY(ospf6_gr_helper_enable,
       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 GR Helper\n"
       "Enable Helper support\n"
-      "Advertisement RouterId\n")
+      "Advertisement Router-ID\n")
 {
        VTY_DECLVAR_CONTEXT(ospf6, ospf6);
 
@@ -1041,11 +1042,12 @@ DEFPY(ospf6_gr_helper_enable,
 
 DEFPY(ospf6_gr_helper_disable,
       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
       "ospf6 graceful restart\n"
-      "Disable Helper support\n"
-      "Advertisement RouterId\n")
+      "ospf6 GR Helper\n"
+      "Enable Helper support\n"
+      "Advertisement Router-ID\n")
 {
        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 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;
 }
 
 int config_write_ospf6_gr_helper(struct vty *vty, struct ospf6 *ospf6)
 {
        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)
                vty_out(vty, " graceful-restart helper lsa-check-disable\n");

diff --git a/tests/topotests/ospf6_gr_topo1/rt1/ospf6d.conf b/tests/topotests/ospf6_gr_topo1/rt1/ospf6d.conf
index 1ee1189766100a020b4c56036cc34cdd4ee61018..9e2ad298a34e016afac8d7591bd30c79cec3e804 100644 (file)
--- a/tests/topotests/ospf6_gr_topo1/rt1/ospf6d.conf
+++ b/tests/topotests/ospf6_gr_topo1/rt1/ospf6d.conf
@@ -26,5 +26,5 @@ router ospf6
  ospf6 router-id 1.1.1.1
  redistribute connected
  graceful-restart grace-period 120
- graceful-restart helper-only
+ graceful-restart helper enable
 !

diff --git a/tests/topotests/ospf6_gr_topo1/rt2/ospf6d.conf b/tests/topotests/ospf6_gr_topo1/rt2/ospf6d.conf
index 6cd8d1a8e37f3392b154b8d02db7522c43fb8ac7..cfa875834493188e4b184f77d700a72258d9e61e 100644 (file)
--- a/tests/topotests/ospf6_gr_topo1/rt2/ospf6d.conf
+++ b/tests/topotests/ospf6_gr_topo1/rt2/ospf6d.conf
@@ -31,5 +31,5 @@ interface eth-rt3
 router ospf6
  ospf6 router-id 2.2.2.2
  graceful-restart grace-period 120
- graceful-restart helper-only
+ graceful-restart helper enable
 !

diff --git a/tests/topotests/ospf6_gr_topo1/rt3/ospf6d.conf b/tests/topotests/ospf6_gr_topo1/rt3/ospf6d.conf
index 6a63d8f78813abfb163eba83844804b7d9917e88..f33f14f34f530c1470f09e680b0e1c425c3c31c8 100644 (file)
--- a/tests/topotests/ospf6_gr_topo1/rt3/ospf6d.conf
+++ b/tests/topotests/ospf6_gr_topo1/rt3/ospf6d.conf
@@ -37,5 +37,5 @@ interface eth-rt6
 router ospf6
  ospf6 router-id 3.3.3.3
  graceful-restart grace-period 120
- graceful-restart helper-only
+ graceful-restart helper enable
 !

diff --git a/tests/topotests/ospf6_gr_topo1/rt4/ospf6d.conf b/tests/topotests/ospf6_gr_topo1/rt4/ospf6d.conf
index dff33d409408d0b83b828419224b128ad2ce6f70..301eb57e7dcafb9e851c0d636df259068773d58b 100644 (file)
--- a/tests/topotests/ospf6_gr_topo1/rt4/ospf6d.conf
+++ b/tests/topotests/ospf6_gr_topo1/rt4/ospf6d.conf
@@ -31,5 +31,5 @@ interface eth-rt5
 router ospf6
  ospf6 router-id 4.4.4.4
  graceful-restart grace-period 120
- graceful-restart helper-only
+ graceful-restart helper enable
 !

diff --git a/tests/topotests/ospf6_gr_topo1/rt5/ospf6d.conf b/tests/topotests/ospf6_gr_topo1/rt5/ospf6d.conf
index 49c3a8b86fe373599be3baf7ec70223937444c13..254fea75fce11634a750bdf31c1b49f9edeff00b 100644 (file)
--- a/tests/topotests/ospf6_gr_topo1/rt5/ospf6d.conf
+++ b/tests/topotests/ospf6_gr_topo1/rt5/ospf6d.conf
@@ -25,5 +25,5 @@ interface eth-rt4
 router ospf6
  ospf6 router-id 5.5.5.5
  graceful-restart grace-period 120
- graceful-restart helper-only
+ graceful-restart helper enable
 !

diff --git a/tests/topotests/ospf6_gr_topo1/rt6/ospf6d.conf b/tests/topotests/ospf6_gr_topo1/rt6/ospf6d.conf
index 5d6d3280b956ddcd2b1b4230a3471989c9795dd9..b1feb1ac573042dff23896d047f14f18b0ddca46 100644 (file)
--- a/tests/topotests/ospf6_gr_topo1/rt6/ospf6d.conf
+++ b/tests/topotests/ospf6_gr_topo1/rt6/ospf6d.conf
@@ -31,5 +31,5 @@ interface eth-rt7
 router ospf6
  ospf6 router-id 6.6.6.6
  graceful-restart grace-period 120
- graceful-restart helper-only
+ graceful-restart helper enable
 !

diff --git a/tests/topotests/ospf6_gr_topo1/rt7/ospf6d.conf b/tests/topotests/ospf6_gr_topo1/rt7/ospf6d.conf
index f504fba4de19722eb64f1d667b585adfe8687a38..d032741d1a66e615df6eca15a6456d0663e4aa1a 100644 (file)
--- a/tests/topotests/ospf6_gr_topo1/rt7/ospf6d.conf
+++ b/tests/topotests/ospf6_gr_topo1/rt7/ospf6d.conf
@@ -26,5 +26,5 @@ router ospf6
  ospf6 router-id 7.7.7.7
  redistribute connected
  graceful-restart grace-period 120
- graceful-restart helper-only
+ graceful-restart helper enable
 !