From 3984301417c1433167c9f862c0cf88edb288c8ec Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Sat, 29 Jul 2023 13:22:39 -0400 Subject: [PATCH] tests: isis_te_topo1 can fail occassionally Upstream ( and locally ) this test fails. The adj-sid value being looked for in the testing is a dynamic value that is assigned based upon how the network comes up. The reality is that there is no enforced order of what the adj-sid can be. As such this test looking for this value makes no sense. Let's remove that from the test. Additionally bring the isis hello-interval to 1 down from 3 to make things converge faster. Signed-off-by: Donald Sharp --- tests/topotests/isis_te_topo1/r1/isisd.conf | 6 ++++-- tests/topotests/isis_te_topo1/r2/isisd.conf | 12 ++++++++---- tests/topotests/isis_te_topo1/r3/isisd.conf | 6 ++++-- tests/topotests/isis_te_topo1/r4/isisd.conf | 6 ++++-- .../topotests/isis_te_topo1/reference/ted_step1.json | 2 -- .../isis_te_topo1/reference/ted_step10.json | 2 -- .../topotests/isis_te_topo1/reference/ted_step2.json | 2 -- .../topotests/isis_te_topo1/reference/ted_step3.json | 2 -- .../topotests/isis_te_topo1/reference/ted_step4.json | 2 -- .../topotests/isis_te_topo1/reference/ted_step5.json | 2 -- .../topotests/isis_te_topo1/reference/ted_step6.json | 2 -- .../topotests/isis_te_topo1/reference/ted_step7.json | 2 -- .../topotests/isis_te_topo1/reference/ted_step8.json | 2 -- 13 files changed, 20 insertions(+), 28 deletions(-) diff --git a/tests/topotests/isis_te_topo1/r1/isisd.conf b/tests/topotests/isis_te_topo1/r1/isisd.conf index 938d713ced..faa6c30674 100644 --- a/tests/topotests/isis_te_topo1/r1/isisd.conf +++ b/tests/topotests/isis_te_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/isis_te_topo1/r2/isisd.conf b/tests/topotests/isis_te_topo1/r2/isisd.conf index f389e90762..ed1059157b 100644 --- a/tests/topotests/isis_te_topo1/r2/isisd.conf +++ b/tests/topotests/isis_te_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/isis_te_topo1/r3/isisd.conf b/tests/topotests/isis_te_topo1/r3/isisd.conf index 4920a17c4c..c689e841e2 100644 --- a/tests/topotests/isis_te_topo1/r3/isisd.conf +++ b/tests/topotests/isis_te_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/isis_te_topo1/r4/isisd.conf b/tests/topotests/isis_te_topo1/r4/isisd.conf index 51e9ba6dec..ba522cc878 100644 --- a/tests/topotests/isis_te_topo1/r4/isisd.conf +++ b/tests/topotests/isis_te_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_te_topo1/reference/ted_step1.json b/tests/topotests/isis_te_topo1/reference/ted_step1.json index b70626e85d..85ced4117a 100644 --- a/tests/topotests/isis_te_topo1/reference/ted_step1.json +++ b/tests/topotests/isis_te_topo1/reference/ted_step1.json @@ -256,7 +256,6 @@ }, "segment-routing":[ { - "adj-sid":5001, "flags":"0xb0", "weight":0 } @@ -641,7 +640,6 @@ }, "segment-routing":[ { - "adj-sid":5000, "flags":"0x30", "weight":0 } diff --git a/tests/topotests/isis_te_topo1/reference/ted_step10.json b/tests/topotests/isis_te_topo1/reference/ted_step10.json index f029e5aab0..9348f9c42b 100644 --- a/tests/topotests/isis_te_topo1/reference/ted_step10.json +++ b/tests/topotests/isis_te_topo1/reference/ted_step10.json @@ -354,7 +354,6 @@ }, "segment-routing":[ { - "adj-sid":5001, "flags":"0xb0", "weight":0 } @@ -754,7 +753,6 @@ }, "segment-routing":[ { - "adj-sid":5000, "flags":"0x30", "weight":0 } diff --git a/tests/topotests/isis_te_topo1/reference/ted_step2.json b/tests/topotests/isis_te_topo1/reference/ted_step2.json index aa2bafb15a..a84f4c0101 100644 --- a/tests/topotests/isis_te_topo1/reference/ted_step2.json +++ b/tests/topotests/isis_te_topo1/reference/ted_step2.json @@ -174,7 +174,6 @@ }, "segment-routing":[ { - "adj-sid":5001, "flags":"0xb0", "weight":0 } @@ -477,7 +476,6 @@ }, "segment-routing":[ { - "adj-sid":5000, "flags":"0x30", "weight":0 } diff --git a/tests/topotests/isis_te_topo1/reference/ted_step3.json b/tests/topotests/isis_te_topo1/reference/ted_step3.json index de6d108bb3..fb3cdb98fc 100644 --- a/tests/topotests/isis_te_topo1/reference/ted_step3.json +++ b/tests/topotests/isis_te_topo1/reference/ted_step3.json @@ -258,7 +258,6 @@ }, "segment-routing":[ { - "adj-sid":5001, "flags":"0xb0", "weight":0 } @@ -561,7 +560,6 @@ }, "segment-routing":[ { - "adj-sid":5000, "flags":"0x30", "weight":0 } diff --git a/tests/topotests/isis_te_topo1/reference/ted_step4.json b/tests/topotests/isis_te_topo1/reference/ted_step4.json index de6d108bb3..fb3cdb98fc 100644 --- a/tests/topotests/isis_te_topo1/reference/ted_step4.json +++ b/tests/topotests/isis_te_topo1/reference/ted_step4.json @@ -258,7 +258,6 @@ }, "segment-routing":[ { - "adj-sid":5001, "flags":"0xb0", "weight":0 } @@ -561,7 +560,6 @@ }, "segment-routing":[ { - "adj-sid":5000, "flags":"0x30", "weight":0 } diff --git a/tests/topotests/isis_te_topo1/reference/ted_step5.json b/tests/topotests/isis_te_topo1/reference/ted_step5.json index 7daee99297..edc90c3b9e 100644 --- a/tests/topotests/isis_te_topo1/reference/ted_step5.json +++ b/tests/topotests/isis_te_topo1/reference/ted_step5.json @@ -340,7 +340,6 @@ }, "segment-routing":[ { - "adj-sid":5001, "flags":"0xb0", "weight":0 } @@ -725,7 +724,6 @@ }, "segment-routing":[ { - "adj-sid":5000, "flags":"0x30", "weight":0 } diff --git a/tests/topotests/isis_te_topo1/reference/ted_step6.json b/tests/topotests/isis_te_topo1/reference/ted_step6.json index 289eb1ebc2..ec65972cd8 100644 --- a/tests/topotests/isis_te_topo1/reference/ted_step6.json +++ b/tests/topotests/isis_te_topo1/reference/ted_step6.json @@ -340,7 +340,6 @@ }, "segment-routing":[ { - "adj-sid":5001, "flags":"0xb0", "weight":0 } @@ -726,7 +725,6 @@ }, "segment-routing":[ { - "adj-sid":5000, "flags":"0x30", "weight":0 } diff --git a/tests/topotests/isis_te_topo1/reference/ted_step7.json b/tests/topotests/isis_te_topo1/reference/ted_step7.json index 18eb42fd32..6177008460 100644 --- a/tests/topotests/isis_te_topo1/reference/ted_step7.json +++ b/tests/topotests/isis_te_topo1/reference/ted_step7.json @@ -355,7 +355,6 @@ }, "segment-routing":[ { - "adj-sid":5001, "flags":"0xb0", "weight":0 } @@ -756,7 +755,6 @@ }, "segment-routing":[ { - "adj-sid":5000, "flags":"0x30", "weight":0 } diff --git a/tests/topotests/isis_te_topo1/reference/ted_step8.json b/tests/topotests/isis_te_topo1/reference/ted_step8.json index ede36cf93d..2cf17f77b3 100644 --- a/tests/topotests/isis_te_topo1/reference/ted_step8.json +++ b/tests/topotests/isis_te_topo1/reference/ted_step8.json @@ -355,7 +355,6 @@ }, "segment-routing":[ { - "adj-sid":5001, "flags":"0xb0", "weight":0 } @@ -756,7 +755,6 @@ }, "segment-routing":[ { - "adj-sid":5000, "flags":"0x30", "weight":0 } -- 2.39.5