tests: Convert isis to use 1 and 10 for hello/multiplier

Current isis tests use a variety of hello timers as well
as hello-multiplier, let's modify all of the isis test
cases to use 1 and 10.  This cleans up some spurious test
failures I was seeing locally.  As an example without
these changes running isis_tilfa_topo1 2r6 times I would
see 5-10 test failures now I am seeing ~2 test failures.

In any event part of the problem was that some tests were
not fully converged when looking at them under heavy
system load.  Changing this to 1/10 gives us 10 chances
to see the incoming packet.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>

18 files changed, 68 insertions, 51 deletions

diff --git a/tests/topotests/isis_sr_topo1/rt1/isisd.conf b/tests/topotests/isis_sr_topo1/rt1/isisd.conf
index ed09753d20..ef8d4275c2 100644
--- a/tests/topotests/isis_sr_topo1/rt1/isisd.conf
+++ b/tests/topotests/isis_sr_topo1/rt1/isisd.conf
@@ -16,7 +16,8 @@ interface lo
 interface eth-sw1
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
 !
 router isis 1
  lsp-gen-interval 2
diff --git a/tests/topotests/isis_sr_topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref
index 26f0dffa7a..9c5901b90f 100644
--- a/tests/topotests/isis_sr_topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref
@@ -11,14 +11,14 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0003",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 64,
                   "state": "up"
                 },
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0002",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 64,
                   "state": "up"
                 }
diff --git a/tests/topotests/isis_sr_topo1/rt2/isisd.conf b/tests/topotests/isis_sr_topo1/rt2/isisd.conf
index 9b8efe40e9..e65ec81a3c 100644
--- a/tests/topotests/isis_sr_topo1/rt2/isisd.conf
+++ b/tests/topotests/isis_sr_topo1/rt2/isisd.conf
@@ -15,19 +15,22 @@ interface lo
 interface eth-sw1
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
 !
 interface eth-rt4-1
  ip router isis 1
  ipv6 router isis 1
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
 !
 interface eth-rt4-2
  ip router isis 1
  ipv6 router isis 1
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
 !
 router isis 1
  lsp-gen-interval 2
diff --git a/tests/topotests/isis_sr_topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref
index 07f43e5999..5e46ddf728 100644
--- a/tests/topotests/isis_sr_topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref
@@ -11,7 +11,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0004",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -30,7 +30,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0004",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -49,14 +49,14 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0003",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 64,
                   "state": "up"
                 },
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0001",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 64,
                   "state": "up"
                 }
diff --git a/tests/topotests/isis_sr_topo1/rt3/isisd.conf b/tests/topotests/isis_sr_topo1/rt3/isisd.conf
index ded8bd1576..e7b8d942cc 100644
--- a/tests/topotests/isis_sr_topo1/rt3/isisd.conf
+++ b/tests/topotests/isis_sr_topo1/rt3/isisd.conf
@@ -15,19 +15,22 @@ interface lo
 interface eth-sw1
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
 !
 interface eth-rt5-1
  ip router isis 1
  ipv6 router isis 1
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
 !
 interface eth-rt5-2
  ip router isis 1
  ipv6 router isis 1
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
 !
 router isis 1
  lsp-gen-interval 2
diff --git a/tests/topotests/isis_sr_topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref
index 7fa6f5cf47..a284240d24 100644
--- a/tests/topotests/isis_sr_topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref
@@ -11,7 +11,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0005",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -30,7 +30,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0005",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -49,14 +49,14 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0001",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 64,
                   "state": "up"
                 },
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0002",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 64,
                   "state": "up"
                 }
diff --git a/tests/topotests/isis_sr_topo1/rt4/isisd.conf b/tests/topotests/isis_sr_topo1/rt4/isisd.conf
index ba9704531c..92ea1ea3d9 100644
--- a/tests/topotests/isis_sr_topo1/rt4/isisd.conf
+++ b/tests/topotests/isis_sr_topo1/rt4/isisd.conf
@@ -16,25 +16,29 @@ interface eth-rt2-1
  ip router isis 1
  ipv6 router isis 1
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
 !
 interface eth-rt2-2
  ip router isis 1
  ipv6 router isis 1
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
 !
 interface eth-rt5
  ip router isis 1
  ipv6 router isis 1
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
 !
 interface eth-rt6
  ip router isis 1
  ipv6 router isis 1
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
 !
 router isis 1
  lsp-gen-interval 2
diff --git a/tests/topotests/isis_sr_topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref
index 2eb64b6fc9..0ca7a76bd4 100644
--- a/tests/topotests/isis_sr_topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref
@@ -11,7 +11,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0002",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -30,7 +30,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0002",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -49,7 +49,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0005",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -68,7 +68,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0006",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
diff --git a/tests/topotests/isis_sr_topo1/rt4/step2/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt4/step2/show_yang_interface_isis_adjacencies.ref
index be1e00b8a2..52682fffca 100644
--- a/tests/topotests/isis_sr_topo1/rt4/step2/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step2/show_yang_interface_isis_adjacencies.ref
@@ -11,7 +11,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0002",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -30,7 +30,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0002",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -49,7 +49,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0006",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
diff --git a/tests/topotests/isis_sr_topo1/rt4/step3/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt4/step3/show_yang_interface_isis_adjacencies.ref
index bcade1ca90..a2e920cba2 100644
--- a/tests/topotests/isis_sr_topo1/rt4/step3/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step3/show_yang_interface_isis_adjacencies.ref
@@ -11,7 +11,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0002",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -30,7 +30,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0002",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
diff --git a/tests/topotests/isis_sr_topo1/rt5/isisd.conf b/tests/topotests/isis_sr_topo1/rt5/isisd.conf
index 3fe7bdf1b2..de604d71f4 100644
--- a/tests/topotests/isis_sr_topo1/rt5/isisd.conf
+++ b/tests/topotests/isis_sr_topo1/rt5/isisd.conf
@@ -16,25 +16,29 @@ interface eth-rt3-1
  ip router isis 1
  ipv6 router isis 1
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
 !
 interface eth-rt3-2
  ip router isis 1
  ipv6 router isis 1
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
 !
 interface eth-rt4
  ip router isis 1
  ipv6 router isis 1
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
 !
 interface eth-rt6
  ip router isis 1
  ipv6 router isis 1
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
 !
 router isis 1
  lsp-gen-interval 2
diff --git a/tests/topotests/isis_sr_topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref
index 1ff8c2cd4e..f40b0d353d 100644
--- a/tests/topotests/isis_sr_topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref
@@ -11,7 +11,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0003",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -30,7 +30,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0003",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -49,7 +49,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0004",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -68,7 +68,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0006",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
diff --git a/tests/topotests/isis_sr_topo1/rt5/step2/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt5/step2/show_yang_interface_isis_adjacencies.ref
index d9ac0a8d00..153e8661a0 100644
--- a/tests/topotests/isis_sr_topo1/rt5/step2/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step2/show_yang_interface_isis_adjacencies.ref
@@ -11,7 +11,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0003",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -30,7 +30,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0003",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -49,7 +49,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0006",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
diff --git a/tests/topotests/isis_sr_topo1/rt5/step3/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt5/step3/show_yang_interface_isis_adjacencies.ref
index 0b8e6ba5b9..2008d8467f 100644
--- a/tests/topotests/isis_sr_topo1/rt5/step3/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step3/show_yang_interface_isis_adjacencies.ref
@@ -11,7 +11,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0003",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -30,7 +30,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0003",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
diff --git a/tests/topotests/isis_sr_topo1/rt5/step4/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt5/step4/show_yang_interface_isis_adjacencies.ref
index d9ac0a8d00..153e8661a0 100644
--- a/tests/topotests/isis_sr_topo1/rt5/step4/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step4/show_yang_interface_isis_adjacencies.ref
@@ -11,7 +11,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0003",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -30,7 +30,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0003",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -49,7 +49,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0006",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
diff --git a/tests/topotests/isis_sr_topo1/rt6/isisd.conf b/tests/topotests/isis_sr_topo1/rt6/isisd.conf
index e7a7e2dfd4..b96a2c6e1e 100644
--- a/tests/topotests/isis_sr_topo1/rt6/isisd.conf
+++ b/tests/topotests/isis_sr_topo1/rt6/isisd.conf
@@ -16,13 +16,15 @@ interface eth-rt4
  ip router isis 1
  ipv6 router isis 1
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
 !
 interface eth-rt5
  ip router isis 1
  ipv6 router isis 1
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
 !
 router isis 1
  lsp-gen-interval 2
diff --git a/tests/topotests/isis_sr_topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref
index 734832358f..8300ca0b5c 100644
--- a/tests/topotests/isis_sr_topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref
@@ -11,7 +11,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0004",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -30,7 +30,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0005",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
diff --git a/tests/topotests/isis_sr_topo1/test_isis_sr_topo1.py b/tests/topotests/isis_sr_topo1/test_isis_sr_topo1.py
index 40b87e3a9e..9a4085ab55 100644
--- a/tests/topotests/isis_sr_topo1/test_isis_sr_topo1.py
+++ b/tests/topotests/isis_sr_topo1/test_isis_sr_topo1.py
@@ -987,7 +987,7 @@ def test_isis_adjacencies_step12():
         'vtysh -c "conf t" -c "interface eth-rt5" -c "isis network point-to-point"'
     )
     tgen.net["rt4"].cmd(
-        'vtysh -c "conf t" -c "interface eth-rt5" -c "isis hello-multiplier 3"'
+        'vtysh -c "conf t" -c "interface eth-rt5" -c "isis hello-interval 1" -c "isis hello-multiplier 10"'
     )
     tgen.net["rt6"].cmd(
         'vtysh -c "conf t" -c "router isis 1" -c "segment-routing global-block 16000 23999"'