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>

diff --git a/tests/topotests/bfd_isis_topo1/rt1/isisd.conf b/tests/topotests/bfd_isis_topo1/rt1/isisd.conf
index a5cbdd932e5653d9ed7c009adbb28f48450e6aae..5ae236d6d27f0e55f6fb06b6971e6a831a7f4f08 100644 (file)
--- a/tests/topotests/bfd_isis_topo1/rt1/isisd.conf
+++ b/tests/topotests/bfd_isis_topo1/rt1/isisd.conf
@@ -19,13 +19,13 @@ interface lo
 interface eth-rt2
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis bfd
 !
 interface eth-rt3
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
  isis bfd
 !

diff --git a/tests/topotests/bfd_isis_topo1/rt2/isisd.conf b/tests/topotests/bfd_isis_topo1/rt2/isisd.conf
index b32170d20822c905ba0b331585e475e0fbf900c6..ff99f18550bf68c7d0418d2f92ddb9665e2b7be7 100644 (file)
--- a/tests/topotests/bfd_isis_topo1/rt2/isisd.conf
+++ b/tests/topotests/bfd_isis_topo1/rt2/isisd.conf
@@ -16,13 +16,13 @@ interface lo
 interface eth-rt1
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis bfd
 !
 interface eth-rt5
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
 !
 router isis 1
  lsp-gen-interval 2

diff --git a/tests/topotests/bfd_isis_topo1/rt3/isisd.conf b/tests/topotests/bfd_isis_topo1/rt3/isisd.conf
index b98f249395a85bb490a85d71ac6736cc333b00ce..2ad1b9c2621de993600507a2cf9a6cfe61642a80 100644 (file)
--- a/tests/topotests/bfd_isis_topo1/rt3/isisd.conf
+++ b/tests/topotests/bfd_isis_topo1/rt3/isisd.conf
@@ -16,14 +16,14 @@ interface lo
 interface eth-rt1
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
  isis bfd
 !
 interface eth-rt4
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
 !
 router isis 1
  lsp-gen-interval 2

diff --git a/tests/topotests/bfd_isis_topo1/rt4/isisd.conf b/tests/topotests/bfd_isis_topo1/rt4/isisd.conf
index 6a4b05f2040e5e51885ab98f1b1d9b601f00920f..e170c19a723c0ef8d8eab843d924e09a2e203e56 100644 (file)
--- a/tests/topotests/bfd_isis_topo1/rt4/isisd.conf
+++ b/tests/topotests/bfd_isis_topo1/rt4/isisd.conf
@@ -16,12 +16,12 @@ interface lo
 interface eth-rt3
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
 !
 interface eth-rt5
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
 !
 router isis 1
  lsp-gen-interval 2

diff --git a/tests/topotests/bfd_isis_topo1/rt5/isisd.conf b/tests/topotests/bfd_isis_topo1/rt5/isisd.conf
index ed32b15ea18dd4210d0f8e43560dd503e9b0bd1d..3caaca7b3de43c8960df7ddb4341b3f97514124e 100644 (file)
--- a/tests/topotests/bfd_isis_topo1/rt5/isisd.conf
+++ b/tests/topotests/bfd_isis_topo1/rt5/isisd.conf
@@ -16,12 +16,12 @@ interface lo
 interface eth-rt2
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
 !
 interface eth-rt4
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
 !
 router isis 1
  lsp-gen-interval 2

diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/r1/isisd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r1/isisd.conf
index 1a148f06282c46ca5cf899d6682e2e5a8483be97..435abde330dfa82f200bb0cf21c41ca95c354d87 100644 (file)
--- a/tests/topotests/bgp_snmp_mplsl3vpn/r1/isisd.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/r1/isisd.conf
@@ -9,7 +9,7 @@ interface r1-eth0
   isis circuit-type level-1
   no isis hello padding
   isis hello-interval 1
-  isis hello-multiplier 3
+  isis hello-multiplier 10
   isis network point-to-point
 !
 interface r1-eth1
@@ -18,7 +18,7 @@ interface r1-eth1
   isis circuit-type level-1
   no isis hello padding
   isis hello-interval 1
-  isis hello-multiplier 3
+  isis hello-multiplier 10
   isis network point-to-point
 !
 interface r1-eth2
@@ -27,7 +27,7 @@ interface r1-eth2
   isis circuit-type level-1
   no isis hello padding
   isis hello-interval 1
-  isis hello-multiplier 3
+  isis hello-multiplier 10
   isis network point-to-point
 !
 interface lo

diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/r2/isisd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r2/isisd.conf
index 396797dfb9efed9f1a36acd88ea740ccff6ad360..be5e7f585d8ef11c2fd14c3e01a6c7b4e504e760 100644 (file)
--- a/tests/topotests/bgp_snmp_mplsl3vpn/r2/isisd.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/r2/isisd.conf
@@ -9,7 +9,7 @@ interface r2-eth0
   isis circuit-type level-1
   no isis hello padding
   isis hello-interval 1
-  isis hello-multiplier 3
+  isis hello-multiplier 10
   isis network point-to-point
 !
 interface r2-eth1
@@ -18,7 +18,7 @@ interface r2-eth1
   isis circuit-type level-1
   no isis hello padding
   isis hello-interval 1
-  isis hello-multiplier 3
+  isis hello-multiplier 10
   isis network point-to-point
 !
 interface lo

diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/r3/isisd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r3/isisd.conf
index 9e52fb6820833043aab6dd254b0e97251179c43d..6f3d8ec780e54379dfd1cbeb07dc9e3af97e1b09 100644 (file)
--- a/tests/topotests/bgp_snmp_mplsl3vpn/r3/isisd.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/r3/isisd.conf
@@ -9,7 +9,7 @@ interface r3-eth0
   isis circuit-type level-1
   no isis hello padding
   isis hello-interval 1
-  isis hello-multiplier 3
+  isis hello-multiplier 10
   isis network point-to-point
 !
 interface r3-eth1
@@ -18,7 +18,7 @@ interface r3-eth1
   isis circuit-type level-1
   no isis hello padding
   isis hello-interval 1
-  isis hello-multiplier 3
+  isis hello-multiplier 10
   isis network point-to-point
 !
 interface r3-eth2
@@ -27,7 +27,7 @@ interface r3-eth2
   isis circuit-type level-1
   no isis hello padding
   isis hello-interval 1
-  isis hello-multiplier 3
+  isis hello-multiplier 10
   isis network point-to-point
 !
 interface lo

diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/r4/isisd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r4/isisd.conf
index 8de2cf05c5efe904c12b089751186ed5561b6fd7..7d923b624003dd58230c88cf2ddd484bc73b842c 100644 (file)
--- a/tests/topotests/bgp_snmp_mplsl3vpn/r4/isisd.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/r4/isisd.conf
@@ -9,7 +9,7 @@ interface r4-eth0
   isis circuit-type level-1
   no isis hello padding
   isis hello-interval 1
-  isis hello-multiplier 3
+  isis hello-multiplier 10
   isis network point-to-point
 !
 interface r4-eth1
@@ -18,7 +18,7 @@ interface r4-eth1
   isis circuit-type level-1
   no isis hello padding
   isis hello-interval 1
-  isis hello-multiplier 3
+  isis hello-multiplier 10
   isis network point-to-point
 !
 interface lo

diff --git a/tests/topotests/cspf_topo1/r1/isisd.conf b/tests/topotests/cspf_topo1/r1/isisd.conf
index 788ac5b7ae58a5fd7678e9d4e5ee426101d26308..2dc73291d36d1642c530d57db08e63555c44e60d 100644 (file)
--- a/tests/topotests/cspf_topo1/r1/isisd.conf
+++ b/tests/topotests/cspf_topo1/r1/isisd.conf
@@ -11,14 +11,16 @@ interface r1-eth0
   ip router isis TE
   isis circuit-type level-2-only
   isis network point-to-point
-  isis hello-multiplier 3
+  isis hello-interval 1
+  isis hello-multiplier 10
 !
 interface r1-eth1
   ip router isis TE
   ipv6 router isis TE
   isis circuit-type level-2-only
   isis network point-to-point
-  isis hello-multiplier 3
+  isis hello-interval 1
+  isis hello-multiplier 10
 !
 router isis TE
   net 49.0000.0000.0000.0001.00

diff --git a/tests/topotests/cspf_topo1/r2/isisd.conf b/tests/topotests/cspf_topo1/r2/isisd.conf
index 04df685e9c9599001c6281dfe709887ed55c3234..59bb3be2a1c8fba819f2efe250d3c35b62683d4e 100644 (file)
--- a/tests/topotests/cspf_topo1/r2/isisd.conf
+++ b/tests/topotests/cspf_topo1/r2/isisd.conf
@@ -13,27 +13,31 @@ interface r2-eth0
   ip router isis TE
   isis circuit-type level-2-only
   isis network point-to-point
-  isis hello-multiplier 3
+  isis hello-interval 1
+  isis hello-multiplier 10
 !
 interface r2-eth1
   ip router isis TE
   ipv6 router isis TE
   isis circuit-type level-2-only
   isis network point-to-point
-  isis hello-multiplier 3
+  isis hello-interval 1
+  isis hello-multiplier 10
 !
 interface r2-eth2
   ip router isis TE
   ipv6 router isis TE
   isis circuit-type level-2-only
   isis network point-to-point
-  isis hello-multiplier 3
+  isis hello-interval 1
+  isis hello-multiplier 10
 !
 interface r2-eth3
   ip router isis TE
   isis circuit-type level-2-only
   isis network point-to-point
-  isis hello-multiplier 3
+  isis hello-interval 1
+  isis hello-multiplier 10
 !
 router isis TE
   net 49.0000.0000.0000.0002.00

diff --git a/tests/topotests/cspf_topo1/r3/isisd.conf b/tests/topotests/cspf_topo1/r3/isisd.conf
index 9db82c7b2b5c77c98b82f6a8d460b7cda1bb1cd0..7d3e4de92121e636969a373fc93cc1ffecef1b4b 100644 (file)
--- a/tests/topotests/cspf_topo1/r3/isisd.conf
+++ b/tests/topotests/cspf_topo1/r3/isisd.conf
@@ -14,13 +14,15 @@ interface r3-eth0
   ipv6 router isis TE
   isis circuit-type level-2-only
   isis network point-to-point
-  isis hello-multiplier 3
+  isis hello-interval 1
+  isis hello-multiplier 10
 !
 interface r3-eth1
   ipv6 router isis TE
   isis circuit-type level-2-only
   isis network point-to-point
-  isis hello-multiplier 3
+  isis hello-interval 1
+  isis hello-multiplier 10
 !
 !
 router isis TE

diff --git a/tests/topotests/cspf_topo1/r4/isisd.conf b/tests/topotests/cspf_topo1/r4/isisd.conf
index c5c4d4e0565ed4b098c4717a4e2d84072b853762..674b7387cc74dc57ded4b95318dc4e67aa63c5ba 100644 (file)
--- a/tests/topotests/cspf_topo1/r4/isisd.conf
+++ b/tests/topotests/cspf_topo1/r4/isisd.conf
@@ -15,13 +15,15 @@ interface r4-eth0
  ip router isis TE
  isis circuit-type level-2-only
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
 !
 interface r4-eth1
  ipv6 router isis TE
  isis circuit-type level-2-only
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
 !
 !
 router isis TE

diff --git a/tests/topotests/isis_lfa_topo1/rt1/isisd.conf b/tests/topotests/isis_lfa_topo1/rt1/isisd.conf
index 833cd66cedd387ab35cae1218caa41621d8a1a35..fc81df02cb8ccd603559a2546d09da10ff1d0f2a 100644 (file)
--- a/tests/topotests/isis_lfa_topo1/rt1/isisd.conf
+++ b/tests/topotests/isis_lfa_topo1/rt1/isisd.conf
@@ -14,32 +14,37 @@ interface lo
 interface eth-rt2
  ipv6 router isis 1
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis fast-reroute lfa
 !
 interface eth-rt3
  ipv6 router isis 1
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis fast-reroute lfa
 !
 interface eth-rt4
  ipv6 router isis 1
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis fast-reroute lfa
 !
 interface eth-rt5
  ipv6 router isis 1
  isis metric 20
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis fast-reroute lfa
 !
 interface eth-rt6
  ipv6 router isis 1
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis fast-reroute lfa
 !
 router isis 1

diff --git a/tests/topotests/isis_lfa_topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_lfa_topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref
index d8a7c5a9c4841193c5dba8c43cc6d88f49e35658..92dd7b5e68bd497bf380ae637dc0d080c341d949 100644 (file)
--- a/tests/topotests/isis_lfa_topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_lfa_topo1/rt1/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.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.0005",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -87,7 +87,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_lfa_topo1/rt2/isisd.conf b/tests/topotests/isis_lfa_topo1/rt2/isisd.conf
index 42dee00e6083e1d767a42969b1b68c8a048b5fc8..6981692add187e1d82d940922e1baba13c7b0440 100644 (file)
--- a/tests/topotests/isis_lfa_topo1/rt2/isisd.conf
+++ b/tests/topotests/isis_lfa_topo1/rt2/isisd.conf
@@ -14,21 +14,24 @@ interface lo
 interface eth-rt1
  ipv6 router isis 1
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis fast-reroute lfa
 !
 interface eth-rt3
  ipv6 router isis 1
  isis metric 5
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis fast-reroute lfa
 !
 interface eth-rt7
  ipv6 router isis 1
  isis metric 5
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis fast-reroute lfa
 !
 router isis 1

diff --git a/tests/topotests/isis_lfa_topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_lfa_topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref
index 681c5222ad302b9036b6f116004432b9efffaa1a..236a41d42644073c17f9995d54d9b705c862c23a 100644 (file)
--- a/tests/topotests/isis_lfa_topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_lfa_topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref
@@ -11,7 +11,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0001",
-                  "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.0007",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }

diff --git a/tests/topotests/isis_lfa_topo1/rt3/isisd.conf b/tests/topotests/isis_lfa_topo1/rt3/isisd.conf
index 9dd813cff606b8708bc0be516c58024a4cccba7c..e3ddb0984b5f207ee83db2fc71d343b4f6d6d6bc 100644 (file)
--- a/tests/topotests/isis_lfa_topo1/rt3/isisd.conf
+++ b/tests/topotests/isis_lfa_topo1/rt3/isisd.conf
@@ -14,20 +14,23 @@ interface lo
 interface eth-rt1
  ipv6 router isis 1
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis fast-reroute lfa
 !
 interface eth-rt2
  ipv6 router isis 1
  isis metric 5
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis fast-reroute lfa
 !
 interface eth-rt7
  ipv6 router isis 1
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis fast-reroute lfa
 !
 router isis 1

diff --git a/tests/topotests/isis_lfa_topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_lfa_topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref
index 1495e32284366be76c53a138aec2903b46f5b27a..290ebb96cfe86b364d2627e9687c7023489e0bb0 100644 (file)
--- a/tests/topotests/isis_lfa_topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_lfa_topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref
@@ -11,7 +11,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0001",
-                  "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.0007",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }

diff --git a/tests/topotests/isis_lfa_topo1/rt4/isisd.conf b/tests/topotests/isis_lfa_topo1/rt4/isisd.conf
index 7500ff8d7b84db557d7738c90e3d407cad605aa3..4db5c8ed057de404684b69b4c88dae904d0df189 100644 (file)
--- a/tests/topotests/isis_lfa_topo1/rt4/isisd.conf
+++ b/tests/topotests/isis_lfa_topo1/rt4/isisd.conf
@@ -14,14 +14,16 @@ interface lo
 interface eth-rt1
  ipv6 router isis 1
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis fast-reroute lfa
 !
 interface eth-rt7
  ipv6 router isis 1
  isis metric 15
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis fast-reroute lfa
 !
 router isis 1

diff --git a/tests/topotests/isis_lfa_topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_lfa_topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref
index d8cd565b5bbf4eef39ec6c73338b08219284cde4..1f99ad120c7e6c7d13201a579d44a1ed832e04eb 100644 (file)
--- a/tests/topotests/isis_lfa_topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_lfa_topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref
@@ -11,7 +11,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0001",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -30,7 +30,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0007",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }

diff --git a/tests/topotests/isis_lfa_topo1/rt5/isisd.conf b/tests/topotests/isis_lfa_topo1/rt5/isisd.conf
index 5e022e9ad88e6ae2e54477173db8ea10461f02f9..1206a4e51f82c913df33bd4fd17ceb45003c2212 100644 (file)
--- a/tests/topotests/isis_lfa_topo1/rt5/isisd.conf
+++ b/tests/topotests/isis_lfa_topo1/rt5/isisd.conf
@@ -15,13 +15,15 @@ interface eth-rt1
  ipv6 router isis 1
  isis metric 20
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis fast-reroute lfa
 !
 interface eth-rt7
  ipv6 router isis 1
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis fast-reroute lfa
 !
 router isis 1

diff --git a/tests/topotests/isis_lfa_topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_lfa_topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref
index d8cd565b5bbf4eef39ec6c73338b08219284cde4..1f99ad120c7e6c7d13201a579d44a1ed832e04eb 100644 (file)
--- a/tests/topotests/isis_lfa_topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_lfa_topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref
@@ -11,7 +11,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0001",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -30,7 +30,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0007",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }

diff --git a/tests/topotests/isis_lfa_topo1/rt6/isisd.conf b/tests/topotests/isis_lfa_topo1/rt6/isisd.conf
index d262e8a56402153105ee695f4bdcfd808e9805da..2ba9e4991960905e127cfeb463a0a6cfef9ebfe2 100644 (file)
--- a/tests/topotests/isis_lfa_topo1/rt6/isisd.conf
+++ b/tests/topotests/isis_lfa_topo1/rt6/isisd.conf
@@ -14,13 +14,15 @@ interface lo
 interface eth-rt1
  ipv6 router isis 1
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis fast-reroute lfa
 !
 interface eth-rt7
  ipv6 router isis 1
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis fast-reroute lfa
 !
 router isis 1

diff --git a/tests/topotests/isis_lfa_topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_lfa_topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref
index d8cd565b5bbf4eef39ec6c73338b08219284cde4..1f99ad120c7e6c7d13201a579d44a1ed832e04eb 100644 (file)
--- a/tests/topotests/isis_lfa_topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_lfa_topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref
@@ -11,7 +11,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0001",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -30,7 +30,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0007",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }

diff --git a/tests/topotests/isis_lfa_topo1/rt7/isisd.conf b/tests/topotests/isis_lfa_topo1/rt7/isisd.conf
index c2061236c381ff566d9b184d41ec8b7e08a00b40..060be2bf6d08481bc5a4fe000de9fa5f69d9a066 100644 (file)
--- a/tests/topotests/isis_lfa_topo1/rt7/isisd.conf
+++ b/tests/topotests/isis_lfa_topo1/rt7/isisd.conf
@@ -15,32 +15,37 @@ interface eth-rt2
  ipv6 router isis 1
  isis metric 5
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis fast-reroute lfa
 !
 interface eth-rt3
  ipv6 router isis 1
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis fast-reroute lfa
 !
 interface eth-rt4
  ipv6 router isis 1
  isis metric 15
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis fast-reroute lfa
 !
 interface eth-rt5
  ipv6 router isis 1
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis fast-reroute lfa
 !
 interface eth-rt6
  ipv6 router isis 1
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis fast-reroute lfa
 !
 router isis 1

diff --git a/tests/topotests/isis_lfa_topo1/rt7/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_lfa_topo1/rt7/step1/show_yang_interface_isis_adjacencies.ref
index d8a7c5a9c4841193c5dba8c43cc6d88f49e35658..92dd7b5e68bd497bf380ae637dc0d080c341d949 100644 (file)
--- a/tests/topotests/isis_lfa_topo1/rt7/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_lfa_topo1/rt7/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.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.0005",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -87,7 +87,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_lsp_bits_topo1/rt1/isisd.conf b/tests/topotests/isis_lsp_bits_topo1/rt1/isisd.conf
index fc004e429b62b89e7ffc0c95d8e68cd2449f7be3..51bf7e60a5d5417f2ca9942f8627e136e8c72a0d 100644 (file)
--- a/tests/topotests/isis_lsp_bits_topo1/rt1/isisd.conf
+++ b/tests/topotests/isis_lsp_bits_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
  isis priority 100
 !
 router isis 1

diff --git a/tests/topotests/isis_lsp_bits_topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_lsp_bits_topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref
index 26f0dffa7ae24197ecdef2e26f0cbccabcdd269f..9c5901b90ff1ade838c6d7872d696e0669a801dd 100644 (file)
--- a/tests/topotests/isis_lsp_bits_topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_lsp_bits_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_lsp_bits_topo1/rt2/isisd.conf b/tests/topotests/isis_lsp_bits_topo1/rt2/isisd.conf
index d01720f4f06d66a6d0374f2c9ec2838c00f4c57f..96c9f33dae4e3cac81dcc33f78db6c7a8435e5f1 100644 (file)
--- a/tests/topotests/isis_lsp_bits_topo1/rt2/isisd.conf
+++ b/tests/topotests/isis_lsp_bits_topo1/rt2/isisd.conf
@@ -15,13 +15,15 @@ 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
  ip router isis 2
  ipv6 router isis 2
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
 !
 router isis 1
  net 49.0000.0000.0000.0002.00

diff --git a/tests/topotests/isis_lsp_bits_topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_lsp_bits_topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref
index c70b44e1c912dc0ce3313e6ae7bb67d8a0a6cda5..b56fe1236848cc469b26876e5fb266dbefb506c3 100644 (file)
--- a/tests/topotests/isis_lsp_bits_topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_lsp_bits_topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref
@@ -11,7 +11,7 @@
                 {
                   "neighbor-sys-type": "level-1-2",
                   "neighbor-sysid": "0000.0000.0004",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -30,21 +30,21 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0001",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 100,
                   "state": "up"
                 },
                 {
                   "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-2",
                   "neighbor-sysid": "0000.0000.0003",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 64,
                   "state": "up"
                 }

diff --git a/tests/topotests/isis_lsp_bits_topo1/rt3/isisd.conf b/tests/topotests/isis_lsp_bits_topo1/rt3/isisd.conf
index a8d589678a730bb974077ec33f47bb812259c2a1..c3354f2e68c3d4820f1faf730e1983dbce0f3e2b 100644 (file)
--- a/tests/topotests/isis_lsp_bits_topo1/rt3/isisd.conf
+++ b/tests/topotests/isis_lsp_bits_topo1/rt3/isisd.conf
@@ -15,13 +15,15 @@ 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
  ip router isis 2
  ipv6 router isis 2
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
 !
 router isis 1
  net 49.0000.0000.0000.0003.00

diff --git a/tests/topotests/isis_lsp_bits_topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_lsp_bits_topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref
index 6950086b1ed765cc9a63ddee6e1661e53d4875c5..279d4dc13105d217975994c7415ef04ee4edcb7f 100644 (file)
--- a/tests/topotests/isis_lsp_bits_topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_lsp_bits_topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref
@@ -11,7 +11,7 @@
                 {
                   "neighbor-sys-type": "level-1-2",
                   "neighbor-sysid": "0000.0000.0005",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -30,14 +30,14 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0001",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 100,
                   "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_lsp_bits_topo1/rt4/isisd.conf b/tests/topotests/isis_lsp_bits_topo1/rt4/isisd.conf
index 2d30790f29dbaffb4b52057230cd5b1e66107bab..f1627e75473be24eeb271c10ae65109f9aae99ac 100644 (file)
--- a/tests/topotests/isis_lsp_bits_topo1/rt4/isisd.conf
+++ b/tests/topotests/isis_lsp_bits_topo1/rt4/isisd.conf
@@ -16,19 +16,22 @@ interface eth-rt2
  ip router isis 2
  ipv6 router isis 2
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
 !
 interface eth-rt5
  ip router isis 4
  ipv6 router isis 4
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
 !
 interface eth-rt6
  ip router isis 4
  ipv6 router isis 4
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
 !
 router isis 2
  net 49.0002.0000.0000.0004.00

diff --git a/tests/topotests/isis_lsp_bits_topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_lsp_bits_topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref
index 233180ceb8c3838ee8ba1c73ce3e12777ada0bb8..39ee61211a905756a36948874ee9eb9df2318fd0 100644 (file)
--- a/tests/topotests/isis_lsp_bits_topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_lsp_bits_topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref
@@ -11,7 +11,7 @@
                 {
                   "neighbor-sys-type": "level-1-2",
                   "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-2",
                   "neighbor-sysid": "0000.0000.0005",
-                  "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_lsp_bits_topo1/rt5/isisd.conf b/tests/topotests/isis_lsp_bits_topo1/rt5/isisd.conf
index 263c3f947848dbfcc55dc411cb1453b98d947848..41241590d14cb078afd6016568f6ef22d3037492 100644 (file)
--- a/tests/topotests/isis_lsp_bits_topo1/rt5/isisd.conf
+++ b/tests/topotests/isis_lsp_bits_topo1/rt5/isisd.conf
@@ -16,19 +16,22 @@ interface eth-rt3
  ip router isis 2
  ipv6 router isis 2
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
 !
 interface eth-rt4
  ip router isis 4
  ipv6 router isis 4
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
 !
 interface eth-rt6
  ip router isis 4
  ipv6 router isis 4
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
 !
 router isis 2
  net 49.0002.0000.0000.0005.00

diff --git a/tests/topotests/isis_lsp_bits_topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_lsp_bits_topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref
index f939a6abffd901b98abda6f758d9e5e5292187b8..a6f08c2eb2ae428d3fbd49d25e63262e59e619a5 100644 (file)
--- a/tests/topotests/isis_lsp_bits_topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_lsp_bits_topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref
@@ -11,7 +11,7 @@
                 {
                   "neighbor-sys-type": "level-1-2",
                   "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-2",
                   "neighbor-sysid": "0000.0000.0004",
-                  "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_lsp_bits_topo1/rt6/isisd.conf b/tests/topotests/isis_lsp_bits_topo1/rt6/isisd.conf
index 505604ef33f6f8e9992bb2dd83005ef651babc0e..b66f40e9ee64774f97a36d9faa2c4e3baff6ecdb 100644 (file)
--- a/tests/topotests/isis_lsp_bits_topo1/rt6/isisd.conf
+++ b/tests/topotests/isis_lsp_bits_topo1/rt6/isisd.conf
@@ -16,13 +16,15 @@ interface eth-rt4
  ip router isis 4
  ipv6 router isis 4
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
 !
 interface eth-rt5
  ip router isis 4
  ipv6 router isis 4
  isis network point-to-point
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
 !
 router isis 4
  net 49.0004.0000.0000.0006.00

diff --git a/tests/topotests/isis_lsp_bits_topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_lsp_bits_topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref
index b4e8c231891e1dd89bb5deb0e8a2dd556c01536d..f5d9aa70cb2a8c521151e7df129207046462cf5c 100644 (file)
--- a/tests/topotests/isis_lsp_bits_topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_lsp_bits_topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref
@@ -11,7 +11,7 @@
                 {
                   "neighbor-sys-type": "level-1-2",
                   "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-2",
                   "neighbor-sysid": "0000.0000.0005",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }

diff --git a/tests/topotests/isis_rlfa_topo1/rt1/isisd.conf b/tests/topotests/isis_rlfa_topo1/rt1/isisd.conf
index f7f0a95e1c28b3ff3b53c477d4142d9e02e3c3c6..c96d0b1374757b99503a13d9e7a78ffaa70d68de 100644 (file)
--- a/tests/topotests/isis_rlfa_topo1/rt1/isisd.conf
+++ b/tests/topotests/isis_rlfa_topo1/rt1/isisd.conf
@@ -15,7 +15,8 @@ interface lo
 interface eth-rt2
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis network point-to-point
  isis fast-reroute lfa
  isis fast-reroute remote-lfa tunnel mpls-ldp
@@ -23,7 +24,8 @@ interface eth-rt2
 interface eth-rt3
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis network point-to-point
  isis fast-reroute lfa
  isis fast-reroute remote-lfa tunnel mpls-ldp

diff --git a/tests/topotests/isis_rlfa_topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_rlfa_topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref
index 3fe2b798a0414abae8965aa813afaa1872efcd1e..4c5a31d16c262b7be6de14f8f1f855965a5ce614 100644 (file)
--- a/tests/topotests/isis_rlfa_topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_rlfa_topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref
@@ -11,7 +11,7 @@
                 {
                   "neighbor-sys-type": "level-1-2",
                   "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-2",
                   "neighbor-sysid": "0000.0000.0003",
-                  "hold-timer": 9,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }

diff --git a/tests/topotests/isis_rlfa_topo1/rt2/isisd.conf b/tests/topotests/isis_rlfa_topo1/rt2/isisd.conf
index 6595052fab5d268a8d0c1ae35bb36338a64bb9af..27203375c1504fd9d68160ee212cb7c12c0adb72 100644 (file)
--- a/tests/topotests/isis_rlfa_topo1/rt2/isisd.conf
+++ b/tests/topotests/isis_rlfa_topo1/rt2/isisd.conf
@@ -15,13 +15,15 @@ interface lo
 interface eth-rt1
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis network point-to-point
 !
 interface eth-rt4
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis network point-to-point
 !
 router isis 1

diff --git a/tests/topotests/isis_rlfa_topo1/rt3/isisd.conf b/tests/topotests/isis_rlfa_topo1/rt3/isisd.conf
index a029b7140f3b82b171e1bc0ce2c7a235cf106fb6..1139d9df41ad4b35f494a66da3de1383c2cbc7eb 100644 (file)
--- a/tests/topotests/isis_rlfa_topo1/rt3/isisd.conf
+++ b/tests/topotests/isis_rlfa_topo1/rt3/isisd.conf
@@ -15,13 +15,15 @@ interface lo
 interface eth-rt1
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis network point-to-point
 !
 interface eth-rt5
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis network point-to-point
 !
 router isis 1

diff --git a/tests/topotests/isis_rlfa_topo1/rt4/isisd.conf b/tests/topotests/isis_rlfa_topo1/rt4/isisd.conf
index 86aa6b1f46f7cea10f113076e49266235068ca6a..980bd5d9f01a1be27a40aaa55e7ac3cd298458a1 100644 (file)
--- a/tests/topotests/isis_rlfa_topo1/rt4/isisd.conf
+++ b/tests/topotests/isis_rlfa_topo1/rt4/isisd.conf
@@ -15,13 +15,15 @@ interface lo
 interface eth-rt2
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis network point-to-point
 !
 interface eth-rt6
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis network point-to-point
 !
 router isis 1

diff --git a/tests/topotests/isis_rlfa_topo1/rt5/isisd.conf b/tests/topotests/isis_rlfa_topo1/rt5/isisd.conf
index e4fc9cdd4c49346a204d27fbf4e81410b484e643..82ba9cb56e51296efb97d0183cc53adcc6849341 100644 (file)
--- a/tests/topotests/isis_rlfa_topo1/rt5/isisd.conf
+++ b/tests/topotests/isis_rlfa_topo1/rt5/isisd.conf
@@ -15,13 +15,15 @@ interface lo
 interface eth-rt3
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis network point-to-point
 !
 interface eth-rt7
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis network point-to-point
 !
 router isis 1

diff --git a/tests/topotests/isis_rlfa_topo1/rt6/isisd.conf b/tests/topotests/isis_rlfa_topo1/rt6/isisd.conf
index 81319e4264328fbd274a7d443d1c236b1c02b6ec..ea859ffa3be8f89e475fc0be0fc195816a35693d 100644 (file)
--- a/tests/topotests/isis_rlfa_topo1/rt6/isisd.conf
+++ b/tests/topotests/isis_rlfa_topo1/rt6/isisd.conf
@@ -15,13 +15,15 @@ interface lo
 interface eth-rt4
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis network point-to-point
 !
 interface eth-rt8
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis network point-to-point
 !
 router isis 1

diff --git a/tests/topotests/isis_rlfa_topo1/rt7/isisd.conf b/tests/topotests/isis_rlfa_topo1/rt7/isisd.conf
index 1f48671e7441a428514788855a17f32eb62164d2..5acfa95a13150cfaed0924390254ce8c779e4176 100644 (file)
--- a/tests/topotests/isis_rlfa_topo1/rt7/isisd.conf
+++ b/tests/topotests/isis_rlfa_topo1/rt7/isisd.conf
@@ -15,13 +15,15 @@ interface lo
 interface eth-rt5
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis network point-to-point
 !
 interface eth-rt8
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis network point-to-point
 !
 router isis 1

diff --git a/tests/topotests/isis_rlfa_topo1/rt8/isisd.conf b/tests/topotests/isis_rlfa_topo1/rt8/isisd.conf
index 7675f777a78c17ec4e63f45b7f86f5ea221e4ccb..237784280a973fdf894605d7540fed561aac05f7 100644 (file)
--- a/tests/topotests/isis_rlfa_topo1/rt8/isisd.conf
+++ b/tests/topotests/isis_rlfa_topo1/rt8/isisd.conf
@@ -15,13 +15,15 @@ interface lo
 interface eth-rt6
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis network point-to-point
 !
 interface eth-rt7
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ isis hello-interval 1
+ isis hello-multiplier 10
  isis network point-to-point
 !
 router isis 1

diff --git a/tests/topotests/isis_sr_flex_algo_topo1/rt1/isisd.conf b/tests/topotests/isis_sr_flex_algo_topo1/rt1/isisd.conf
index 5503baa58ca969100e5d0d85658770a4b0cb71fc..090e89628f8e3efa5bc0538ed8ed33c963f62c11 100644 (file)
--- a/tests/topotests/isis_sr_flex_algo_topo1/rt1/isisd.conf
+++ b/tests/topotests/isis_sr_flex_algo_topo1/rt1/isisd.conf
@@ -23,13 +23,13 @@ interface lo
 interface eth-rt2
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
 !
 interface eth-rt3
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
 !
 router isis 1

diff --git a/tests/topotests/isis_sr_flex_algo_topo1/rt2/isisd.conf b/tests/topotests/isis_sr_flex_algo_topo1/rt2/isisd.conf
index 8655e7434a865fb86b290b3ea32d181d78c6a2f7..3901ccaefe7e959975a4be99e5fb4645bea23c1e 100644 (file)
--- a/tests/topotests/isis_sr_flex_algo_topo1/rt2/isisd.conf
+++ b/tests/topotests/isis_sr_flex_algo_topo1/rt2/isisd.conf
@@ -23,13 +23,13 @@ interface lo
 interface eth-rt1
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
 !
 interface eth-rt3
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
 !
 router isis 1

diff --git a/tests/topotests/isis_sr_flex_algo_topo1/rt3/isisd.conf b/tests/topotests/isis_sr_flex_algo_topo1/rt3/isisd.conf
index d77af81d7cac8afde85787a88b8500c76617904e..f7a52bc79d1d962b98ceaaa1c93934822447677c 100644 (file)
--- a/tests/topotests/isis_sr_flex_algo_topo1/rt3/isisd.conf
+++ b/tests/topotests/isis_sr_flex_algo_topo1/rt3/isisd.conf
@@ -23,13 +23,13 @@ interface lo
 interface eth-rt1
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
 !
 interface eth-rt2
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
 !
 router isis 1

diff --git a/tests/topotests/isis_sr_flex_algo_topo2/rt0/isisd.conf b/tests/topotests/isis_sr_flex_algo_topo2/rt0/isisd.conf
index cbf25504ef4de4947e85981b8024b1b0e25a2f80..c102b1b22b79e175292b29e1525b996daff6c1f4 100644 (file)
--- a/tests/topotests/isis_sr_flex_algo_topo2/rt0/isisd.conf
+++ b/tests/topotests/isis_sr_flex_algo_topo2/rt0/isisd.conf
@@ -16,13 +16,13 @@ interface lo
 !
 interface eth-rt1
  ip router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
  isis circuit-type level-1
 !
 interface eth-rt5
  ip router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
  isis circuit-type level-1
 !

diff --git a/tests/topotests/isis_sr_flex_algo_topo2/rt1/isisd.conf b/tests/topotests/isis_sr_flex_algo_topo2/rt1/isisd.conf
index b6bba0c1c38e4535e35324913c1cce266224ee82..a7933888cc71a1f54a23a12b375b2e9974fee58a 100644 (file)
--- a/tests/topotests/isis_sr_flex_algo_topo2/rt1/isisd.conf
+++ b/tests/topotests/isis_sr_flex_algo_topo2/rt1/isisd.conf
@@ -16,25 +16,25 @@ interface lo
 !
 interface eth-rt0
  ip router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
  isis circuit-type level-1
 !
 interface eth-rt2
  ip router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
  isis circuit-type level-1
 !
 interface eth-rt4
  ip router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
  isis circuit-type level-1
 !
 interface eth-rt5
  ip router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
  isis circuit-type level-1
 !

diff --git a/tests/topotests/isis_sr_flex_algo_topo2/rt2/isisd.conf b/tests/topotests/isis_sr_flex_algo_topo2/rt2/isisd.conf
index f051a68e21d4fa179297240981dbd76349e6e109..312a6df2284ace2f04d779679e4773923f0b0c03 100644 (file)
--- a/tests/topotests/isis_sr_flex_algo_topo2/rt2/isisd.conf
+++ b/tests/topotests/isis_sr_flex_algo_topo2/rt2/isisd.conf
@@ -16,19 +16,19 @@ interface lo
 !
 interface eth-rt1
  ip router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
  isis circuit-type level-1
 !
 interface eth-rt3
  ip router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
  isis circuit-type level-1
 !
 interface eth-rt6
  ip router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
  isis circuit-type level-1
 !

diff --git a/tests/topotests/isis_sr_flex_algo_topo2/rt3/isisd.conf b/tests/topotests/isis_sr_flex_algo_topo2/rt3/isisd.conf
index 644e656bfd13755b7841620bd429e7fdf8a1e0a6..c287e8a5da6cabe61aee3b852b2d7f40f77f32a1 100644 (file)
--- a/tests/topotests/isis_sr_flex_algo_topo2/rt3/isisd.conf
+++ b/tests/topotests/isis_sr_flex_algo_topo2/rt3/isisd.conf
@@ -16,25 +16,25 @@ interface lo
 !
 interface eth-rt2
  ip router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
  isis circuit-type level-1
 !
 interface eth-rt4
  ip router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
  isis circuit-type level-1
 !
 interface eth-rt7
  ip router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
  isis circuit-type level-1
 !
 interface eth-rt9
  ip router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
  isis circuit-type level-1
 !

diff --git a/tests/topotests/isis_sr_flex_algo_topo2/rt4/isisd.conf b/tests/topotests/isis_sr_flex_algo_topo2/rt4/isisd.conf
index 1ab200fbd89dace2f6882f27866ed35f3b069690..c040ce200b21e7843d7d5b445527d60aa58a18fe 100644 (file)
--- a/tests/topotests/isis_sr_flex_algo_topo2/rt4/isisd.conf
+++ b/tests/topotests/isis_sr_flex_algo_topo2/rt4/isisd.conf
@@ -16,19 +16,19 @@ interface lo
 !
 interface eth-rt1
  ip router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
  isis circuit-type level-1
 !
 interface eth-rt3
  ip router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
  isis circuit-type level-1
 !
 interface eth-rt8
  ip router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
  isis circuit-type level-1
 !

diff --git a/tests/topotests/isis_sr_flex_algo_topo2/rt5/isisd.conf b/tests/topotests/isis_sr_flex_algo_topo2/rt5/isisd.conf
index 54cc37711eec691d96c705efc37e6baea02e0bdf..6cf87d44fb5f8b4fc0e1095aea05eee796fe8554 100644 (file)
--- a/tests/topotests/isis_sr_flex_algo_topo2/rt5/isisd.conf
+++ b/tests/topotests/isis_sr_flex_algo_topo2/rt5/isisd.conf
@@ -16,25 +16,25 @@ interface lo
 !
 interface eth-rt0
  ip router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
  isis circuit-type level-1
 !
 interface eth-rt1
  ip router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
  isis circuit-type level-1
 !
 interface eth-rt6
  ip router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
  isis circuit-type level-1
 !
 interface eth-rt8
  ip router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
  isis circuit-type level-1
 !

diff --git a/tests/topotests/isis_sr_flex_algo_topo2/rt6/isisd.conf b/tests/topotests/isis_sr_flex_algo_topo2/rt6/isisd.conf
index fc8660cfa6af6e69faa59f963f7065ad0be52482..87a259696d9aa62fef3d5b66a227e816bc24fe5a 100644 (file)
--- a/tests/topotests/isis_sr_flex_algo_topo2/rt6/isisd.conf
+++ b/tests/topotests/isis_sr_flex_algo_topo2/rt6/isisd.conf
@@ -16,19 +16,19 @@ interface lo
 !
 interface eth-rt2
  ip router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
  isis circuit-type level-1
 !
 interface eth-rt5
  ip router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
  isis circuit-type level-1
 !
 interface eth-rt7
  ip router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
  isis circuit-type level-1
 !

diff --git a/tests/topotests/isis_sr_flex_algo_topo2/rt7/isisd.conf b/tests/topotests/isis_sr_flex_algo_topo2/rt7/isisd.conf
index 10dc9812a40875dfce3074d7e5968c99e46743c1..6645542db9b345a4fb7d84c4ecb17b78871dbc62 100644 (file)
--- a/tests/topotests/isis_sr_flex_algo_topo2/rt7/isisd.conf
+++ b/tests/topotests/isis_sr_flex_algo_topo2/rt7/isisd.conf
@@ -16,25 +16,25 @@ interface lo
 !
 interface eth-rt3
  ip router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
  isis circuit-type level-1
 !
 interface eth-rt6
  ip router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
  isis circuit-type level-1
 !
 interface eth-rt8
  ip router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
  isis circuit-type level-1
 !
 interface eth-rt9
  ip router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
  isis circuit-type level-1
 !

diff --git a/tests/topotests/isis_sr_flex_algo_topo2/rt8/isisd.conf b/tests/topotests/isis_sr_flex_algo_topo2/rt8/isisd.conf
index 4ca45a8ad97bca23613fd7062600650a50645052..04e925e4820e5dc8b445c1e01561d61d8feafc7f 100644 (file)
--- a/tests/topotests/isis_sr_flex_algo_topo2/rt8/isisd.conf
+++ b/tests/topotests/isis_sr_flex_algo_topo2/rt8/isisd.conf
@@ -14,19 +14,19 @@ interface lo
 !
 interface eth-rt4
  ip router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
  isis circuit-type level-1
 !
 interface eth-rt5
  ip router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
  isis circuit-type level-1
 !
 interface eth-rt7
  ip router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
  isis circuit-type level-1
 !

diff --git a/tests/topotests/isis_sr_flex_algo_topo2/rt9/isisd.conf b/tests/topotests/isis_sr_flex_algo_topo2/rt9/isisd.conf
index 89eab274c7729edc41fdbab59364ab4184e77705..dabb9986dffe53b87d5f476618f5d213fee43c30 100644 (file)
--- a/tests/topotests/isis_sr_flex_algo_topo2/rt9/isisd.conf
+++ b/tests/topotests/isis_sr_flex_algo_topo2/rt9/isisd.conf
@@ -16,13 +16,13 @@ interface lo
 !
 interface eth-rt3
  ip router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
  isis circuit-type level-1
 !
 interface eth-rt7
  ip router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis network point-to-point
  isis circuit-type level-1
 !

diff --git a/tests/topotests/isis_sr_te_topo1/rt1/isisd.conf b/tests/topotests/isis_sr_te_topo1/rt1/isisd.conf
index 3d5ac204515b6467e4f1c6ff615f26c0a546eaa0..3a94af7e0d78880f884c46c5f5336c87f609f02d 100644 (file)
--- a/tests/topotests/isis_sr_te_topo1/rt1/isisd.conf
+++ b/tests/topotests/isis_sr_te_topo1/rt1/isisd.conf
@@ -16,7 +16,7 @@ interface lo
 interface eth-sw1
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
 !
 router isis 1
  net 49.0000.0000.0000.0001.00

diff --git a/tests/topotests/isis_sr_te_topo1/rt2/isisd.conf b/tests/topotests/isis_sr_te_topo1/rt2/isisd.conf
index ba214c92c105c47249d6f7bc7d44711df299df1a..553e72cb2df26d6fc3d58720d2125aadadabc92f 100644 (file)
--- a/tests/topotests/isis_sr_te_topo1/rt2/isisd.conf
+++ b/tests/topotests/isis_sr_te_topo1/rt2/isisd.conf
@@ -15,19 +15,19 @@ interface lo
 interface eth-sw1
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ 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-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-multiplier 10
 !
 router isis 1
  net 49.0000.0000.0000.0002.00

diff --git a/tests/topotests/isis_sr_te_topo1/rt3/isisd.conf b/tests/topotests/isis_sr_te_topo1/rt3/isisd.conf
index 482d8152c224096bbc459e98ec2fc2dbc1970c7b..8d89612b5cb4512c340184f9ad386c8621d57d40 100644 (file)
--- a/tests/topotests/isis_sr_te_topo1/rt3/isisd.conf
+++ b/tests/topotests/isis_sr_te_topo1/rt3/isisd.conf
@@ -15,19 +15,19 @@ interface lo
 interface eth-sw1
  ip router isis 1
  ipv6 router isis 1
- isis hello-multiplier 3
+ 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-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-multiplier 10
 !
 router isis 1
  net 49.0000.0000.0000.0003.00

diff --git a/tests/topotests/isis_sr_te_topo1/rt4/isisd.conf b/tests/topotests/isis_sr_te_topo1/rt4/isisd.conf
index 851c6da01933a8d32ec60c15b902c52305c95afb..e5f72a77133eeb4397343d43b6522a7b2754505a 100644 (file)
--- a/tests/topotests/isis_sr_te_topo1/rt4/isisd.conf
+++ b/tests/topotests/isis_sr_te_topo1/rt4/isisd.conf
@@ -16,25 +16,25 @@ interface eth-rt2-1
  ip router isis 1
  ipv6 router isis 1
  isis network point-to-point
- isis hello-multiplier 3
+ 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-multiplier 10
 !
 interface eth-rt5
  ip router isis 1
  ipv6 router isis 1
  isis network point-to-point
- isis hello-multiplier 3
+ 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-multiplier 10
 !
 router isis 1
  net 49.0000.0000.0000.0004.00

diff --git a/tests/topotests/isis_sr_te_topo1/rt5/isisd.conf b/tests/topotests/isis_sr_te_topo1/rt5/isisd.conf
index 4cc54f318c0c6f8bb50ce261bbad822bb6ad3c7b..1a66d18ee1f6b05ecbd21cc11684fcb09318be9e 100644 (file)
--- a/tests/topotests/isis_sr_te_topo1/rt5/isisd.conf
+++ b/tests/topotests/isis_sr_te_topo1/rt5/isisd.conf
@@ -16,25 +16,25 @@ interface eth-rt3-1
  ip router isis 1
  ipv6 router isis 1
  isis network point-to-point
- isis hello-multiplier 3
+ 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-multiplier 10
 !
 interface eth-rt4
  ip router isis 1
  ipv6 router isis 1
  isis network point-to-point
- isis hello-multiplier 3
+ 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-multiplier 10
 !
 router isis 1
  net 49.0000.0000.0000.0005.00

diff --git a/tests/topotests/isis_sr_te_topo1/rt6/isisd.conf b/tests/topotests/isis_sr_te_topo1/rt6/isisd.conf
index 8fec87b92912e03c5fd682fd8507acce9ea04acb..bfa988305be5ec8a2f22fc2ccfee267d37157f37 100644 (file)
--- a/tests/topotests/isis_sr_te_topo1/rt6/isisd.conf
+++ b/tests/topotests/isis_sr_te_topo1/rt6/isisd.conf
@@ -16,13 +16,13 @@ interface eth-rt4
  ip router isis 1
  ipv6 router isis 1
  isis network point-to-point
- isis hello-multiplier 3
+ 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-multiplier 10
 !
 router isis 1
  net 49.0000.0000.0000.0006.00

diff --git a/tests/topotests/isis_sr_topo1/rt1/isisd.conf b/tests/topotests/isis_sr_topo1/rt1/isisd.conf
index ed09753d201904acb0713cd81e54ed84ceff8c90..ef8d4275c2a3eae77bb5e69a4df011752b7cdf2a 100644 (file)
--- 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 26f0dffa7ae24197ecdef2e26f0cbccabcdd269f..9c5901b90ff1ade838c6d7872d696e0669a801dd 100644 (file)
--- 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 9b8efe40e9b5bc3ffd8ea4acac96d5e79722ae9d..e65ec81a3c52a08854643d3b93ac26cecafd0cde 100644 (file)
--- 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 07f43e599928db93706fd17b76ffe5c92c549263..5e46ddf728195a4ba219942a06f8425c35667f9c 100644 (file)
--- 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 ded8bd15766e12c755f0927960fcf04033923002..e7b8d942ccca409ca62067c18c651002d447c177 100644 (file)
--- 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 7fa6f5cf476a3a278a871e39f77123ab7598e291..a284240d24f7925aa31dfd3d97f4de7058dd59f9 100644 (file)
--- 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 ba9704531c77d5ab59fb8721b4f577fe14a47069..92ea1ea3d9d3005ed0d9e41f1f151723d12098c4 100644 (file)
--- 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 2eb64b6fc98dd42fd2cef1f9dca1c7eb4b5f578c..0ca7a76bd44d57c204e0359edd3994653495adde 100644 (file)
--- 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 be1e00b8a259a3fb9a145cb07be1c6b61fccc4f8..52682fffca5b943fa180c2357a3a0e1619b2a88e 100644 (file)
--- 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 bcade1ca908538b9b7f3f7db5c4af337230836da..a2e920cba2e6dbe1ba95a444007197a44825353c 100644 (file)
--- 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 3fe7bdf1b21720eb77733831f89b85a6d251df1b..de604d71f4c951a7641c69473c363c78bf73bf30 100644 (file)
--- 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 1ff8c2cd4e77f6616905c1aa048756f52e05368d..f40b0d353d7a389c3f3df8f88d8da381d04dcf16 100644 (file)
--- 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 d9ac0a8d004589ad2d5b54803e642deea31151e8..153e8661a00da10e8e72fc2179147ddd76dba701 100644 (file)
--- 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 0b8e6ba5b94fb71adbd11f95fa6f6876d8ca9139..2008d8467f919558da5bbbfcb9369dca6775e016 100644 (file)
--- 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 d9ac0a8d004589ad2d5b54803e642deea31151e8..153e8661a00da10e8e72fc2179147ddd76dba701 100644 (file)
--- 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 e7a7e2dfd4d1dc593a9182bd8c4667d75abb1069..b96a2c6e1e1cd1c743b55b3a70ca9ba9de5efb2b 100644 (file)
--- 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 734832358f70cca20a5a590ed89cfe08fecf30bd..8300ca0b5cd861282123511aace96e36969c3630 100644 (file)
--- 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 40b87e3a9e8de478e62c6e43c1ca1a6d8def5e3f..9a4085ab5593be2b25f5bf1b6d71bc8531119e70 100644 (file)
--- 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"'

diff --git a/tests/topotests/isis_tilfa_topo1/rt1/isisd.conf b/tests/topotests/isis_tilfa_topo1/rt1/isisd.conf
index 620523512aaef71be1b5f116b8021db89d7d87a7..1218ed350f8ee88f4229749f9d3ba0619de258ed 100644 (file)
--- a/tests/topotests/isis_tilfa_topo1/rt1/isisd.conf
+++ b/tests/topotests/isis_tilfa_topo1/rt1/isisd.conf
@@ -7,6 +7,7 @@ log file isisd.log
 ! debug isis spf-events
 ! debug isis sr-events
 ! debug isis lsp-gen
+! debug isis ti-lfa
 !
 interface lo
  ip router isis 1
@@ -17,7 +18,7 @@ interface eth-sw1
  ip router isis 1
  ipv6 router isis 1
  isis hello-interval 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis priority 100
  isis fast-reroute ti-lfa
 !

diff --git a/tests/topotests/isis_tilfa_topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_tilfa_topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref
index d86f9ef658d2d9b50857673d04847222c2fea9be..9c5901b90ff1ade838c6d7872d696e0669a801dd 100644 (file)
--- a/tests/topotests/isis_tilfa_topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_tilfa_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": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 64,
                   "state": "up"
                 },
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0002",
-                  "hold-timer": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 64,
                   "state": "up"
                 }

diff --git a/tests/topotests/isis_tilfa_topo1/rt1/zebra.conf b/tests/topotests/isis_tilfa_topo1/rt1/zebra.conf
index 37b3f27cae7e158b44f8a28251cfeb5194013161..4de9d8c69f5d75e7eea207a614a6287b6312261d 100644 (file)
--- a/tests/topotests/isis_tilfa_topo1/rt1/zebra.conf
+++ b/tests/topotests/isis_tilfa_topo1/rt1/zebra.conf
@@ -5,6 +5,7 @@ hostname rt1
 ! debug zebra kernel
 ! debug zebra packet
 ! debug zebra mpls
+! debug zebra rib detail
 !
 interface lo
  ip address 1.1.1.1/32

diff --git a/tests/topotests/isis_tilfa_topo1/rt2/isisd.conf b/tests/topotests/isis_tilfa_topo1/rt2/isisd.conf
index 9c4b86208b007f7855095a10d26e0150abce4784..aed69713e1831815b966ef5e77c7478d227ad78e 100644 (file)
--- a/tests/topotests/isis_tilfa_topo1/rt2/isisd.conf
+++ b/tests/topotests/isis_tilfa_topo1/rt2/isisd.conf
@@ -6,6 +6,7 @@ log file isisd.log
 ! debug isis spf-events
 ! debug isis sr-events
 ! debug isis lsp-gen
+! debug isis ti-lfa
 !
 interface lo
  ip router isis 1
@@ -16,7 +17,7 @@ interface eth-sw1
  ip router isis 1
  ipv6 router isis 1
  isis hello-interval 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis fast-reroute ti-lfa
 !
 interface eth-rt4-1
@@ -24,7 +25,7 @@ interface eth-rt4-1
  ipv6 router isis 1
  isis network point-to-point
  isis hello-interval 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis fast-reroute ti-lfa
 !
 interface eth-rt4-2
@@ -32,7 +33,7 @@ interface eth-rt4-2
  ipv6 router isis 1
  isis network point-to-point
  isis hello-interval 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis fast-reroute ti-lfa
 !
 router isis 1

diff --git a/tests/topotests/isis_tilfa_topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_tilfa_topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref
index 69b6159d624052ad5d69f22242fa76af85c6bb24..7d9463dd358f5ca74487197a2b7f83337c45c14b 100644 (file)
--- a/tests/topotests/isis_tilfa_topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_tilfa_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": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -30,7 +30,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0004",
-                  "hold-timer": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -49,14 +49,14 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0001",
-                  "hold-timer": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 100,
                   "state": "up"
                 },
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0003",
-                  "hold-timer": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 64,
                   "state": "up"
                 }

diff --git a/tests/topotests/isis_tilfa_topo1/rt2/zebra.conf b/tests/topotests/isis_tilfa_topo1/rt2/zebra.conf
index f9ac098f4f87f8bd33711df8b54c6fec8b0522e5..f2975f6a9a2f991e9546864befff0a176f3cbd57 100644 (file)
--- a/tests/topotests/isis_tilfa_topo1/rt2/zebra.conf
+++ b/tests/topotests/isis_tilfa_topo1/rt2/zebra.conf
@@ -5,6 +5,7 @@ hostname rt2
 ! debug zebra kernel
 ! debug zebra packet
 ! debug zebra mpls
+! debug zebra rib detail
 !
 interface lo
  ip address 2.2.2.2/32

diff --git a/tests/topotests/isis_tilfa_topo1/rt3/isisd.conf b/tests/topotests/isis_tilfa_topo1/rt3/isisd.conf
index 1883575b7b36b9535be6d94e89e740d3aa9fafec..d2f01e459514498a2143e318e491d577b02db189 100644 (file)
--- a/tests/topotests/isis_tilfa_topo1/rt3/isisd.conf
+++ b/tests/topotests/isis_tilfa_topo1/rt3/isisd.conf
@@ -6,6 +6,7 @@ log file isisd.log
 ! debug isis spf-events
 ! debug isis sr-events
 ! debug isis lsp-gen
+! debug isis ti-lfa
 !
 interface lo
  ip router isis 1
@@ -16,7 +17,7 @@ interface eth-sw1
  ip router isis 1
  ipv6 router isis 1
  isis hello-interval 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis fast-reroute ti-lfa
 !
 interface eth-rt5-1
@@ -24,7 +25,7 @@ interface eth-rt5-1
  ipv6 router isis 1
  isis network point-to-point
  isis hello-interval 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis fast-reroute ti-lfa
 !
 interface eth-rt5-2
@@ -32,7 +33,7 @@ interface eth-rt5-2
  ipv6 router isis 1
  isis network point-to-point
  isis hello-interval 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis fast-reroute ti-lfa
 !
 router isis 1

diff --git a/tests/topotests/isis_tilfa_topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_tilfa_topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref
index e75d5fe859bd5b04da51f328893e1cc366b18968..777c749819700277b3ee66e5d042178598adcb4f 100644 (file)
--- a/tests/topotests/isis_tilfa_topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_tilfa_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": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -30,7 +30,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0005",
-                  "hold-timer": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -49,14 +49,14 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0001",
-                  "hold-timer": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 100,
                   "state": "up"
                 },
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0002",
-                  "hold-timer": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 64,
                   "state": "up"
                 }

diff --git a/tests/topotests/isis_tilfa_topo1/rt3/zebra.conf b/tests/topotests/isis_tilfa_topo1/rt3/zebra.conf
index 441c9a3acae41d29f5df68ec6f9c17871bbe8dd9..7ffdcd60a41a9515ee6d316efb22e49359e581c2 100644 (file)
--- a/tests/topotests/isis_tilfa_topo1/rt3/zebra.conf
+++ b/tests/topotests/isis_tilfa_topo1/rt3/zebra.conf
@@ -5,6 +5,7 @@ hostname rt3
 ! debug zebra kernel
 ! debug zebra packet
 ! debug zebra mpls
+! debug zebra rib detail
 !
 interface lo
  ip address 3.3.3.3/32

diff --git a/tests/topotests/isis_tilfa_topo1/rt4/isisd.conf b/tests/topotests/isis_tilfa_topo1/rt4/isisd.conf
index 94f80d39d5135602313bff0c012ea72fe1f1b37d..c1117b5d1bd896b8629ddf3a8760ee6daf4eaee0 100644 (file)
--- a/tests/topotests/isis_tilfa_topo1/rt4/isisd.conf
+++ b/tests/topotests/isis_tilfa_topo1/rt4/isisd.conf
@@ -6,6 +6,7 @@ log file isisd.log
 ! debug isis spf-events
 ! debug isis sr-events
 ! debug isis lsp-gen
+! debug isis ti-lfa
 !
 interface lo
  ip router isis 1
@@ -17,7 +18,7 @@ interface eth-rt2-1
  ipv6 router isis 1
  isis network point-to-point
  isis hello-interval 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis fast-reroute ti-lfa
 !
 interface eth-rt2-2
@@ -25,7 +26,7 @@ interface eth-rt2-2
  ipv6 router isis 1
  isis network point-to-point
  isis hello-interval 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis fast-reroute ti-lfa
 !
 interface eth-rt5
@@ -33,7 +34,7 @@ interface eth-rt5
  ipv6 router isis 1
  isis network point-to-point
  isis hello-interval 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis fast-reroute ti-lfa
 !
 interface eth-rt6
@@ -41,7 +42,7 @@ interface eth-rt6
  ipv6 router isis 1
  isis network point-to-point
  isis hello-interval 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis fast-reroute ti-lfa
 !
 router isis 1

diff --git a/tests/topotests/isis_tilfa_topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_tilfa_topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref
index 1d2c559588096713f46cb3faea35364b7152a4b3..0ca7a76bd44d57c204e0359edd3994653495adde 100644 (file)
--- a/tests/topotests/isis_tilfa_topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_tilfa_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": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -30,7 +30,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0002",
-                  "hold-timer": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -49,7 +49,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0005",
-                  "hold-timer": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -68,7 +68,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0006",
-                  "hold-timer": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }

diff --git a/tests/topotests/isis_tilfa_topo1/rt4/zebra.conf b/tests/topotests/isis_tilfa_topo1/rt4/zebra.conf
index a2569aa51ff0d7452130d52bec33db570eb231a4..644885efd2b093dcad7b446cf64223453945ad11 100644 (file)
--- a/tests/topotests/isis_tilfa_topo1/rt4/zebra.conf
+++ b/tests/topotests/isis_tilfa_topo1/rt4/zebra.conf
@@ -5,6 +5,7 @@ hostname rt4
 ! debug zebra kernel
 ! debug zebra packet
 ! debug zebra mpls
+! debug zebra rib detail
 !
 interface lo
  ip address 4.4.4.4/32

diff --git a/tests/topotests/isis_tilfa_topo1/rt5/isisd.conf b/tests/topotests/isis_tilfa_topo1/rt5/isisd.conf
index e83ae9677b1d3e613c19b5517a5a9a71a4be0ed6..3678ff9074df3ce41b9ae5aa7e0a58fe92383f67 100644 (file)
--- a/tests/topotests/isis_tilfa_topo1/rt5/isisd.conf
+++ b/tests/topotests/isis_tilfa_topo1/rt5/isisd.conf
@@ -6,6 +6,7 @@ log file isisd.log
 ! debug isis spf-events
 ! debug isis sr-events
 ! debug isis lsp-gen
+! debug isis ti-lfa
 !
 interface lo
  ip router isis 1
@@ -17,7 +18,7 @@ interface eth-rt3-1
  ipv6 router isis 1
  isis network point-to-point
  isis hello-interval 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis fast-reroute ti-lfa
 !
 interface eth-rt3-2
@@ -25,7 +26,7 @@ interface eth-rt3-2
  ipv6 router isis 1
  isis network point-to-point
  isis hello-interval 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis fast-reroute ti-lfa
 !
 interface eth-rt4
@@ -33,7 +34,7 @@ interface eth-rt4
  ipv6 router isis 1
  isis network point-to-point
  isis hello-interval 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis fast-reroute ti-lfa
 !
 interface eth-rt6
@@ -41,7 +42,7 @@ interface eth-rt6
  ipv6 router isis 1
  isis network point-to-point
  isis hello-interval 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis fast-reroute ti-lfa
 !
 router isis 1

diff --git a/tests/topotests/isis_tilfa_topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_tilfa_topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref
index f94b09e1613b67c44a9336b6b27a6ba0dc82dd5d..f40b0d353d7a389c3f3df8f88d8da381d04dcf16 100644 (file)
--- a/tests/topotests/isis_tilfa_topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_tilfa_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": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -30,7 +30,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0003",
-                  "hold-timer": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -49,7 +49,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0004",
-                  "hold-timer": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -68,7 +68,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0006",
-                  "hold-timer": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }

diff --git a/tests/topotests/isis_tilfa_topo1/rt5/zebra.conf b/tests/topotests/isis_tilfa_topo1/rt5/zebra.conf
index f62cc8ffd31dfa1a0c0e687532712850201364ba..424c85ef8294e90352f76df00bac902034f6aff3 100644 (file)
--- a/tests/topotests/isis_tilfa_topo1/rt5/zebra.conf
+++ b/tests/topotests/isis_tilfa_topo1/rt5/zebra.conf
@@ -5,6 +5,7 @@ hostname rt5
 ! debug zebra kernel
 ! debug zebra packet
 ! debug zebra mpls
+! debug zebra rib detail
 !
 interface lo
  ip address 5.5.5.5/32

diff --git a/tests/topotests/isis_tilfa_topo1/rt6/isisd.conf b/tests/topotests/isis_tilfa_topo1/rt6/isisd.conf
index 462492e9095087b4882cea32cd138ed268ffa6c0..9d3b464726d4301e077e45d4bda32bcbe1942c9a 100644 (file)
--- a/tests/topotests/isis_tilfa_topo1/rt6/isisd.conf
+++ b/tests/topotests/isis_tilfa_topo1/rt6/isisd.conf
@@ -6,6 +6,7 @@ log file isisd.log
 ! debug isis spf-events
 ! debug isis sr-events
 ! debug isis lsp-gen
+! debug isis ti-lfa
 !
 interface lo
  ip router isis 1
@@ -17,7 +18,7 @@ interface eth-rt4
  ipv6 router isis 1
  isis network point-to-point
  isis hello-interval 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis fast-reroute ti-lfa
 !
 interface eth-rt5
@@ -25,7 +26,7 @@ interface eth-rt5
  ipv6 router isis 1
  isis network point-to-point
  isis hello-interval 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis fast-reroute ti-lfa
 !
 router isis 1

diff --git a/tests/topotests/isis_tilfa_topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_tilfa_topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref
index 9d4d47b2afd1126b22aea4a8779562c57e272338..8300ca0b5cd861282123511aace96e36969c3630 100644 (file)
--- a/tests/topotests/isis_tilfa_topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_tilfa_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": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -30,7 +30,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0005",
-                  "hold-timer": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }

diff --git a/tests/topotests/isis_tilfa_topo1/rt6/zebra.conf b/tests/topotests/isis_tilfa_topo1/rt6/zebra.conf
index 4d51d3df84c206f7ce1a1818aa84ab2cec69ef0d..94fed46cca1900fdd75614685c667eae03223634 100644 (file)
--- a/tests/topotests/isis_tilfa_topo1/rt6/zebra.conf
+++ b/tests/topotests/isis_tilfa_topo1/rt6/zebra.conf
@@ -5,6 +5,7 @@ hostname rt6
 ! debug zebra kernel
 ! debug zebra packet
 ! debug zebra mpls
+! debug zebra rib detail
 !
 interface lo
  ip address 6.6.6.6/32

diff --git a/tests/topotests/simple_snmp_test/r1/isisd.conf b/tests/topotests/simple_snmp_test/r1/isisd.conf
index 1a148f06282c46ca5cf899d6682e2e5a8483be97..435abde330dfa82f200bb0cf21c41ca95c354d87 100644 (file)
--- a/tests/topotests/simple_snmp_test/r1/isisd.conf
+++ b/tests/topotests/simple_snmp_test/r1/isisd.conf
@@ -9,7 +9,7 @@ interface r1-eth0
   isis circuit-type level-1
   no isis hello padding
   isis hello-interval 1
-  isis hello-multiplier 3
+  isis hello-multiplier 10
   isis network point-to-point
 !
 interface r1-eth1
@@ -18,7 +18,7 @@ interface r1-eth1
   isis circuit-type level-1
   no isis hello padding
   isis hello-interval 1
-  isis hello-multiplier 3
+  isis hello-multiplier 10
   isis network point-to-point
 !
 interface r1-eth2
@@ -27,7 +27,7 @@ interface r1-eth2
   isis circuit-type level-1
   no isis hello padding
   isis hello-interval 1
-  isis hello-multiplier 3
+  isis hello-multiplier 10
   isis network point-to-point
 !
 interface lo