From 824b1d299a32797279ede9275e30c6ad0fbc60ea Mon Sep 17 00:00:00 2001 From: Renato Westphal Date: Tue, 25 Jul 2023 19:50:14 -0300 Subject: [PATCH] tests: increase hello multiplier in TI-LFA topotest In this topotest, the IS-IS hello interval is set to 1 for fast convergence. However, the current hello multiplier of 3 results in a tight IS-IS adjacency holdtime of 3 seconds. This tight timeframe can cause failures when the testing machine is running multiple tests at full capacity. To improve stability under such conditions, this commit raises the hello multiplier to 10, providing a more forgiving holdtime and reducing the likelihood of failures. Signed-off-by: Renato Westphal --- tests/topotests/isis_tilfa_topo1/rt1/isisd.conf | 2 +- .../rt1/step1/show_yang_interface_isis_adjacencies.ref | 4 ++-- tests/topotests/isis_tilfa_topo1/rt2/isisd.conf | 6 +++--- .../rt2/step1/show_yang_interface_isis_adjacencies.ref | 8 ++++---- tests/topotests/isis_tilfa_topo1/rt3/isisd.conf | 6 +++--- .../rt3/step1/show_yang_interface_isis_adjacencies.ref | 8 ++++---- tests/topotests/isis_tilfa_topo1/rt4/isisd.conf | 8 ++++---- .../rt4/step1/show_yang_interface_isis_adjacencies.ref | 8 ++++---- tests/topotests/isis_tilfa_topo1/rt5/isisd.conf | 8 ++++---- .../rt5/step1/show_yang_interface_isis_adjacencies.ref | 8 ++++---- tests/topotests/isis_tilfa_topo1/rt6/isisd.conf | 4 ++-- .../rt6/step1/show_yang_interface_isis_adjacencies.ref | 4 ++-- 12 files changed, 37 insertions(+), 37 deletions(-) diff --git a/tests/topotests/isis_tilfa_topo1/rt1/isisd.conf b/tests/topotests/isis_tilfa_topo1/rt1/isisd.conf index 620523512a..b425bb6b1f 100644 --- a/tests/topotests/isis_tilfa_topo1/rt1/isisd.conf +++ b/tests/topotests/isis_tilfa_topo1/rt1/isisd.conf @@ -17,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 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 d86f9ef658..9c5901b90f 100644 --- 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/rt2/isisd.conf b/tests/topotests/isis_tilfa_topo1/rt2/isisd.conf index 9c4b86208b..546e9222fe 100644 --- a/tests/topotests/isis_tilfa_topo1/rt2/isisd.conf +++ b/tests/topotests/isis_tilfa_topo1/rt2/isisd.conf @@ -16,7 +16,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 +24,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 +32,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 69b6159d62..7d9463dd35 100644 --- 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/rt3/isisd.conf b/tests/topotests/isis_tilfa_topo1/rt3/isisd.conf index 1883575b7b..a41a4c14a9 100644 --- a/tests/topotests/isis_tilfa_topo1/rt3/isisd.conf +++ b/tests/topotests/isis_tilfa_topo1/rt3/isisd.conf @@ -16,7 +16,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 +24,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 +32,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 e75d5fe859..777c749819 100644 --- 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/rt4/isisd.conf b/tests/topotests/isis_tilfa_topo1/rt4/isisd.conf index 94f80d39d5..07ae7dbba1 100644 --- a/tests/topotests/isis_tilfa_topo1/rt4/isisd.conf +++ b/tests/topotests/isis_tilfa_topo1/rt4/isisd.conf @@ -17,7 +17,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 +25,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 +33,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 +41,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 1d2c559588..0ca7a76bd4 100644 --- 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/rt5/isisd.conf b/tests/topotests/isis_tilfa_topo1/rt5/isisd.conf index e83ae9677b..e637f8b3a6 100644 --- a/tests/topotests/isis_tilfa_topo1/rt5/isisd.conf +++ b/tests/topotests/isis_tilfa_topo1/rt5/isisd.conf @@ -17,7 +17,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 +25,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 +33,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 +41,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 f94b09e161..f40b0d353d 100644 --- 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/rt6/isisd.conf b/tests/topotests/isis_tilfa_topo1/rt6/isisd.conf index 462492e909..1bf4acd3cd 100644 --- a/tests/topotests/isis_tilfa_topo1/rt6/isisd.conf +++ b/tests/topotests/isis_tilfa_topo1/rt6/isisd.conf @@ -17,7 +17,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 +25,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 9d4d47b2af..8300ca0b5c 100644 --- 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" } -- 2.39.5