isisd,tests,doc: Rename hello padding sometimes to hello padding during-adjacency...

Signed-off-by: Diogo Oliveira <14191454+dorDiogo@users.noreply.github.com>

diff --git a/doc/user/isisd.rst b/doc/user/isisd.rst
index 84d6e7bcfa20586888bd6405fcacf79e86b107c8..17e772b5f713b4f02b43adb60173fb2d4ebf102d 100644 (file)
--- a/doc/user/isisd.rst
+++ b/doc/user/isisd.rst
@@ -206,7 +206,7 @@ ISIS interface
 
    Add padding to IS-IS hello packets.
 
-.. clicmd:: isis hello padding sometimes
+.. clicmd:: isis hello padding during-adjacency-formation
 
    Add padding to IS-IS hello packets during adjacency formation only.
 

diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c
index ebf9901c526a2ae902ccda5e55a63b8031cde9d1..6d300236aeb9df616d8bb57c5ed51e0da728cc1f 100644 (file)
--- a/isisd/isis_circuit.c
+++ b/isisd/isis_circuit.c
@@ -1327,9 +1327,9 @@ static int isis_interface_config_write(struct vty *vty)
                                vty_out(vty, " no " PROTO_NAME " hello padding\n");
                                write++;
                                break;
-                       case ISIS_HELLO_PADDING_SOMETIMES:
+                       case ISIS_HELLO_PADDING_DURING_ADJACENCY_FORMATION:
                                vty_out(vty, PROTO_NAME
-                                       " hello padding sometimes\n");
+                                       " hello padding during-adjacency-formation\n");
                                write++;
                                break;
                        case ISIS_HELLO_PADDING_ALWAYS:

diff --git a/isisd/isis_circuit.h b/isisd/isis_circuit.h
index 58aa28195fda9fa6a62074f5ad042fb50074306f..df977893eecf9b03c204fa8d7357133ac1787db0 100644 (file)
--- a/isisd/isis_circuit.h
+++ b/isisd/isis_circuit.h
@@ -69,7 +69,7 @@ struct isis_circuit_arg {
 enum isis_hello_padding {
        ISIS_HELLO_PADDING_ALWAYS,
        ISIS_HELLO_PADDING_DISABLED,
-       ISIS_HELLO_PADDING_SOMETIMES
+       ISIS_HELLO_PADDING_DURING_ADJACENCY_FORMATION
 };
 
 struct isis_circuit {

diff --git a/isisd/isis_cli.c b/isisd/isis_cli.c
index f430ded7458a5e2712bad607dbf3f067f26d1ff1..69636e6efc1df82331b9ba16afe5013e968c5cb3 100644 (file)
--- a/isisd/isis_cli.c
+++ b/isisd/isis_cli.c
@@ -2240,7 +2240,7 @@ void cli_show_ip_isis_threeway_shake(struct vty *vty,
  * XPath: /frr-interface:lib/interface/frr-isisd:isis/hello/padding
  */
 DEFPY_YANG(isis_hello_padding, isis_hello_padding_cmd,
-          "[no] isis hello padding [sometimes]$padding_type",
+          "[no] isis hello padding [during-adjacency-formation]$padding_type",
           NO_STR
           "IS-IS routing protocol\n"
           "Type of padding for IS-IS hello packets\n"
@@ -2266,8 +2266,8 @@ void cli_show_ip_isis_hello_padding(struct vty *vty,
        if (hello_padding_type == ISIS_HELLO_PADDING_DISABLED)
                vty_out(vty, " no");
        vty_out(vty, " isis hello padding");
-       if (hello_padding_type == ISIS_HELLO_PADDING_SOMETIMES)
-               vty_out(vty, " sometimes");
+       if (hello_padding_type == ISIS_HELLO_PADDING_DURING_ADJACENCY_FORMATION)
+               vty_out(vty, " during-adjacency-formation");
        vty_out(vty, "\n");
 }
 

diff --git a/isisd/isis_misc.c b/isisd/isis_misc.c
index 7c6d600362f397873aa9230c3e4c656eff18f650..95d24036ec534f900abf913ca013cddc07a5c6c7 100644 (file)
--- a/isisd/isis_misc.c
+++ b/isisd/isis_misc.c
@@ -299,8 +299,8 @@ const char *isis_hello_padding2string(int hello_padding_type)
        switch (hello_padding_type) {
        case ISIS_HELLO_PADDING_DISABLED:
                return "no";
-       case ISIS_HELLO_PADDING_SOMETIMES:
-               return "sometimes";
+       case ISIS_HELLO_PADDING_DURING_ADJACENCY_FORMATION:
+               return "during-adjacency-formation";
        case ISIS_HELLO_PADDING_ALWAYS:
                return "yes";
        }

diff --git a/isisd/isis_pdu.c b/isisd/isis_pdu.c
index 9ddc427c136b8c15b88f5a65937d40edaff7c6a4..f659f3abc346f7540675b5d689de02470c1c6232 100644 (file)
--- a/isisd/isis_pdu.c
+++ b/isisd/isis_pdu.c
@@ -1966,7 +1966,8 @@ int send_hello(struct isis_circuit *circuit, int level)
 
        bool should_pad_hello =
                circuit->pad_hellos == ISIS_HELLO_PADDING_ALWAYS ||
-               (circuit->pad_hellos == ISIS_HELLO_PADDING_SOMETIMES &&
+               (circuit->pad_hellos ==
+                        ISIS_HELLO_PADDING_DURING_ADJACENCY_FORMATION &&
                 circuit->upadjcount[0] + circuit->upadjcount[1] == 0);
 
        if (isis_pack_tlvs(tlvs, circuit->snd_stream, len_pointer,

diff --git a/isisd/isis_snmp.c b/isisd/isis_snmp.c
index b4ae063639bd419bef934dd6e30169bb78f5dba7..e0bcb180b0155c4f7700cbe8a845c58120cc35f9 100644 (file)
--- a/isisd/isis_snmp.c
+++ b/isisd/isis_snmp.c
@@ -2162,7 +2162,8 @@ static uint8_t *isis_snmp_find_circ(struct variable *v, oid *name,
                 * return false if lan hellos must be padded
                 */
                if (circuit->pad_hellos == ISIS_HELLO_PADDING_ALWAYS ||
-                   (circuit->pad_hellos == ISIS_HELLO_PADDING_SOMETIMES &&
+                   (circuit->pad_hellos ==
+                            ISIS_HELLO_PADDING_DURING_ADJACENCY_FORMATION &&
                     circuit->upadjcount[0] + circuit->upadjcount[1] == 0))
                        return SNMP_INTEGER(ISIS_SNMP_TRUTH_VALUE_FALSE);
 

diff --git a/tests/topotests/isis_topo1/test_isis_topo1.py b/tests/topotests/isis_topo1/test_isis_topo1.py
index 5e660ef9e1efc53fb2cbd7e9b83baeff441d87f8..48e9d5336fdf3095be86d6dc1d7dbffc6bcc6020 100644 (file)
--- a/tests/topotests/isis_topo1/test_isis_topo1.py
+++ b/tests/topotests/isis_topo1/test_isis_topo1.py
@@ -572,9 +572,9 @@ def test_isis_advertise_passive_only():
     assert result is True, result
 
 
-def test_isis_hello_padding_sometimes():
+def test_isis_hello_padding_during_adjacency_formation():
     """Check that IIH packets is only padded when adjacency is still being formed
-    when isis hello padding sometimes is configured
+    when isis hello padding during-adjacency-formation is configured
     """
     tgen = get_topogen()
     net = get_topogen().net
@@ -582,7 +582,7 @@ def test_isis_hello_padding_sometimes():
     if tgen.routers_have_failure():
         pytest.skip(tgen.errors)
 
-    logger.info("Testing isis hello padding sometimes behavior")
+    logger.info("Testing isis hello padding during-adjacency-formation behavior")
     r3 = tgen.gears["r3"]
 
     # Reduce hello-multiplier to make the adjacency go down faster.
@@ -599,7 +599,7 @@ def test_isis_hello_padding_sometimes():
         """
         configure
         interface r1-eth0
-            isis hello padding sometimes
+            isis hello padding during-adjacency-formation
         end
         debug isis adj-packets
         """

diff --git a/yang/frr-isisd.yang b/yang/frr-isisd.yang
index f2927339ad08aad8d458feb08cf938b58018cf02..c072be45d98970396775ca0c070629c7e57e0dd9 100644 (file)
--- a/yang/frr-isisd.yang
+++ b/yang/frr-isisd.yang
@@ -128,7 +128,7 @@ module frr-isisd {
         description
           "Do not add any padding to hello packets.";
       } 
-      enum "sometimes" {
+      enum "during-adjacency-formation" {
         value 2;
         description
           "Add padding to hello packets during adjacency formation only.";