diff options
116 files changed, 356 insertions, 263 deletions
diff --git a/tests/topotests/bfd_bgp_cbit_topo3/r1/bgpd.conf b/tests/topotests/bfd_bgp_cbit_topo3/r1/bgpd.conf index d30c32043e..f8ad1f3a66 100644 --- a/tests/topotests/bfd_bgp_cbit_topo3/r1/bgpd.conf +++ b/tests/topotests/bfd_bgp_cbit_topo3/r1/bgpd.conf @@ -3,7 +3,7 @@ router bgp 101 bgp router-id 10.254.254.1 no bgp ebgp-requires-policy no bgp network import-check - timers bgp 8 24 + timers bgp 3 10 bgp graceful-restart neighbor 2001:db8:4::1 remote-as 102 neighbor 2001:db8:4::1 timers 3 10 diff --git a/tests/topotests/bfd_bgp_cbit_topo3/r3/bgpd.conf b/tests/topotests/bfd_bgp_cbit_topo3/r3/bgpd.conf index 22f0650d0d..42953a075c 100644 --- a/tests/topotests/bfd_bgp_cbit_topo3/r3/bgpd.conf +++ b/tests/topotests/bfd_bgp_cbit_topo3/r3/bgpd.conf @@ -3,7 +3,7 @@ router bgp 102 bgp router-id 10.254.254.3 no bgp ebgp-requires-policy no bgp network import-check - timers bgp 20 60 + timers bgp 3 10 bgp graceful-restart ! simulate NSF machine bgp graceful-restart preserve-fw-state diff --git a/tests/topotests/bfd_bgp_cbit_topo3/test_bfd_bgp_cbit_topo3.py b/tests/topotests/bfd_bgp_cbit_topo3/test_bfd_bgp_cbit_topo3.py index 475c4b1aa1..906687d1cd 100644 --- a/tests/topotests/bfd_bgp_cbit_topo3/test_bfd_bgp_cbit_topo3.py +++ b/tests/topotests/bfd_bgp_cbit_topo3/test_bfd_bgp_cbit_topo3.py @@ -129,6 +129,14 @@ def test_bfd_loss_intermediate(): if tgen.routers_have_failure(): pytest.skip(tgen.errors) + r1 = tgen.gears["r1"] + expected = { "as":101, "peers":{ "2001:db8:4::1": { "state":"Established" } } } + test_func = partial(topotest.router_json_cmp, r1, "show bgp ipv6 uni summ json", expected) + _, result = topotest.run_and_expect(test_func, None, count=60, wait=1) + assertmsg ='"r1" has not established bgp peering yet' + assert result is None, assertmsg + + #assert False logger.info("removing IPv6 address from r2 to simulate loss of connectivity") # Disable r2-eth0 ipv6 address cmd = 'vtysh -c "configure terminal" -c "interface r2-eth1" -c "no ipv6 address 2001:db8:4::2/64"' diff --git a/tests/topotests/bfd_isis_topo1/rt1/isisd.conf b/tests/topotests/bfd_isis_topo1/rt1/isisd.conf index a5cbdd932e..5ae236d6d2 100644 --- 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 b32170d208..ff99f18550 100644 --- 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 b98f249395..2ad1b9c262 100644 --- 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 6a4b05f204..e170c19a72 100644 --- 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 ed32b15ea1..3caaca7b3d 100644 --- 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 1a148f0628..435abde330 100644 --- 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 396797dfb9..be5e7f585d 100644 --- 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 9e52fb6820..6f3d8ec780 100644 --- 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 8de2cf05c5..7d923b6240 100644 --- 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 788ac5b7ae..2dc73291d3 100644 --- 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 04df685e9c..59bb3be2a1 100644 --- 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 9db82c7b2b..7d3e4de921 100644 --- 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 c5c4d4e056..674b7387cc 100644 --- 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 833cd66ced..fc81df02cb 100644 --- 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 d8a7c5a9c4..92dd7b5e68 100644 --- 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 42dee00e60..6981692add 100644 --- 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 681c5222ad..236a41d426 100644 --- 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 9dd813cff6..e3ddb0984b 100644 --- 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 1495e32284..290ebb96cf 100644 --- 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 7500ff8d7b..4db5c8ed05 100644 --- 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 d8cd565b5b..1f99ad120c 100644 --- 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 5e022e9ad8..1206a4e51f 100644 --- 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 d8cd565b5b..1f99ad120c 100644 --- 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 d262e8a564..2ba9e49919 100644 --- 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 d8cd565b5b..1f99ad120c 100644 --- 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 c2061236c3..060be2bf6d 100644 --- 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 d8a7c5a9c4..92dd7b5e68 100644 --- 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 fc004e429b..51bf7e60a5 100644 --- 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 26f0dffa7a..9c5901b90f 100644 --- 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 d01720f4f0..96c9f33dae 100644 --- 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 c70b44e1c9..b56fe12368 100644 --- 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 a8d589678a..c3354f2e68 100644 --- 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 6950086b1e..279d4dc131 100644 --- 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 2d30790f29..f1627e7547 100644 --- 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 233180ceb8..39ee61211a 100644 --- 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 263c3f9478..41241590d1 100644 --- 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 f939a6abff..a6f08c2eb2 100644 --- 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 505604ef33..b66f40e9ee 100644 --- 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 b4e8c23189..f5d9aa70cb 100644 --- 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 f7f0a95e1c..c96d0b1374 100644 --- 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 3fe2b798a0..4c5a31d16c 100644 --- 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 6595052fab..27203375c1 100644 --- 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 a029b7140f..1139d9df41 100644 --- 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 86aa6b1f46..980bd5d9f0 100644 --- 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 e4fc9cdd4c..82ba9cb56e 100644 --- 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 81319e4264..ea859ffa3b 100644 --- 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 1f48671e74..5acfa95a13 100644 --- 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 7675f777a7..237784280a 100644 --- 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 5503baa58c..090e89628f 100644 --- 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 8655e7434a..3901ccaefe 100644 --- 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 d77af81d7c..f7a52bc79d 100644 --- 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 cbf25504ef..c102b1b22b 100644 --- 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 b6bba0c1c3..a7933888cc 100644 --- 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 f051a68e21..312a6df228 100644 --- 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 644e656bfd..c287e8a5da 100644 --- 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 1ab200fbd8..c040ce200b 100644 --- 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 54cc37711e..6cf87d44fb 100644 --- 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 fc8660cfa6..87a259696d 100644 --- 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 10dc9812a4..6645542db9 100644 --- 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 4ca45a8ad9..04e925e482 100644 --- 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 89eab274c7..dabb9986df 100644 --- 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 3d5ac20451..3a94af7e0d 100644 --- 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 ba214c92c1..553e72cb2d 100644 --- 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 482d8152c2..8d89612b5c 100644 --- 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 851c6da019..e5f72a7713 100644 --- 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 4cc54f318c..1a66d18ee1 100644 --- 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 8fec87b929..bfa988305b 100644 --- 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 ed09753d20..ef8d4275c2 100644 --- a/tests/topotests/isis_sr_topo1/rt1/isisd.conf +++ b/tests/topotests/isis_sr_topo1/rt1/isisd.conf @@ -16,7 +16,8 @@ interface lo interface eth-sw1 ip router isis 1 ipv6 router isis 1 - isis hello-multiplier 3 + isis hello-interval 1 + isis hello-multiplier 10 ! router isis 1 lsp-gen-interval 2 diff --git a/tests/topotests/isis_sr_topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref index 26f0dffa7a..9c5901b90f 100644 --- a/tests/topotests/isis_sr_topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref +++ b/tests/topotests/isis_sr_topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref @@ -11,14 +11,14 @@ { "neighbor-sys-type": "level-1", "neighbor-sysid": "0000.0000.0003", - "hold-timer": 9, + "hold-timer": 10, "neighbor-priority": 64, "state": "up" }, { "neighbor-sys-type": "level-1", "neighbor-sysid": "0000.0000.0002", - "hold-timer": 9, + "hold-timer": 10, "neighbor-priority": 64, "state": "up" } diff --git a/tests/topotests/isis_sr_topo1/rt2/isisd.conf b/tests/topotests/isis_sr_topo1/rt2/isisd.conf index 9b8efe40e9..e65ec81a3c 100644 --- a/tests/topotests/isis_sr_topo1/rt2/isisd.conf +++ b/tests/topotests/isis_sr_topo1/rt2/isisd.conf @@ -15,19 +15,22 @@ interface lo interface eth-sw1 ip router isis 1 ipv6 router isis 1 - isis hello-multiplier 3 + isis hello-interval 1 + isis hello-multiplier 10 ! interface eth-rt4-1 ip router isis 1 ipv6 router isis 1 isis network point-to-point - isis hello-multiplier 3 + isis hello-interval 1 + isis hello-multiplier 10 ! interface eth-rt4-2 ip router isis 1 ipv6 router isis 1 isis network point-to-point - isis hello-multiplier 3 + isis hello-interval 1 + isis hello-multiplier 10 ! router isis 1 lsp-gen-interval 2 diff --git a/tests/topotests/isis_sr_topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref index 07f43e5999..5e46ddf728 100644 --- a/tests/topotests/isis_sr_topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref +++ b/tests/topotests/isis_sr_topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref @@ -11,7 +11,7 @@ { "neighbor-sys-type": "level-1", "neighbor-sysid": "0000.0000.0004", - "hold-timer": 9, + "hold-timer": 10, "neighbor-priority": 0, "state": "up" } @@ -30,7 +30,7 @@ { "neighbor-sys-type": "level-1", "neighbor-sysid": "0000.0000.0004", - "hold-timer": 9, + "hold-timer": 10, "neighbor-priority": 0, "state": "up" } @@ -49,14 +49,14 @@ { "neighbor-sys-type": "level-1", "neighbor-sysid": "0000.0000.0003", - "hold-timer": 9, + "hold-timer": 10, "neighbor-priority": 64, "state": "up" }, { "neighbor-sys-type": "level-1", "neighbor-sysid": "0000.0000.0001", - "hold-timer": 9, + "hold-timer": 10, "neighbor-priority": 64, "state": "up" } diff --git a/tests/topotests/isis_sr_topo1/rt3/isisd.conf b/tests/topotests/isis_sr_topo1/rt3/isisd.conf index ded8bd1576..e7b8d942cc 100644 --- a/tests/topotests/isis_sr_topo1/rt3/isisd.conf +++ b/tests/topotests/isis_sr_topo1/rt3/isisd.conf @@ -15,19 +15,22 @@ interface lo interface eth-sw1 ip router isis 1 ipv6 router isis 1 - isis hello-multiplier 3 + isis hello-interval 1 + isis hello-multiplier 10 ! interface eth-rt5-1 ip router isis 1 ipv6 router isis 1 isis network point-to-point - isis hello-multiplier 3 + isis hello-interval 1 + isis hello-multiplier 10 ! interface eth-rt5-2 ip router isis 1 ipv6 router isis 1 isis network point-to-point - isis hello-multiplier 3 + isis hello-interval 1 + isis hello-multiplier 10 ! router isis 1 lsp-gen-interval 2 diff --git a/tests/topotests/isis_sr_topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref index 7fa6f5cf47..a284240d24 100644 --- a/tests/topotests/isis_sr_topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref +++ b/tests/topotests/isis_sr_topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref @@ -11,7 +11,7 @@ { "neighbor-sys-type": "level-1", "neighbor-sysid": "0000.0000.0005", - "hold-timer": 9, + "hold-timer": 10, "neighbor-priority": 0, "state": "up" } @@ -30,7 +30,7 @@ { "neighbor-sys-type": "level-1", "neighbor-sysid": "0000.0000.0005", - "hold-timer": 9, + "hold-timer": 10, "neighbor-priority": 0, "state": "up" } @@ -49,14 +49,14 @@ { "neighbor-sys-type": "level-1", "neighbor-sysid": "0000.0000.0001", - "hold-timer": 9, + "hold-timer": 10, "neighbor-priority": 64, "state": "up" }, { "neighbor-sys-type": "level-1", "neighbor-sysid": "0000.0000.0002", - "hold-timer": 9, + "hold-timer": 10, "neighbor-priority": 64, "state": "up" } diff --git a/tests/topotests/isis_sr_topo1/rt4/isisd.conf b/tests/topotests/isis_sr_topo1/rt4/isisd.conf index ba9704531c..92ea1ea3d9 100644 --- a/tests/topotests/isis_sr_topo1/rt4/isisd.conf +++ b/tests/topotests/isis_sr_topo1/rt4/isisd.conf @@ -16,25 +16,29 @@ interface eth-rt2-1 ip router isis 1 ipv6 router isis 1 isis network point-to-point - isis hello-multiplier 3 + isis hello-interval 1 + isis hello-multiplier 10 ! interface eth-rt2-2 ip router isis 1 ipv6 router isis 1 isis network point-to-point - isis hello-multiplier 3 + isis hello-interval 1 + isis hello-multiplier 10 ! interface eth-rt5 ip router isis 1 ipv6 router isis 1 isis network point-to-point - isis hello-multiplier 3 + isis hello-interval 1 + isis hello-multiplier 10 ! interface eth-rt6 ip router isis 1 ipv6 router isis 1 isis network point-to-point - isis hello-multiplier 3 + isis hello-interval 1 + isis hello-multiplier 10 ! router isis 1 lsp-gen-interval 2 diff --git a/tests/topotests/isis_sr_topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref index 2eb64b6fc9..0ca7a76bd4 100644 --- a/tests/topotests/isis_sr_topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref +++ b/tests/topotests/isis_sr_topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref @@ -11,7 +11,7 @@ { "neighbor-sys-type": "level-1", "neighbor-sysid": "0000.0000.0002", - "hold-timer": 9, + "hold-timer": 10, "neighbor-priority": 0, "state": "up" } @@ -30,7 +30,7 @@ { "neighbor-sys-type": "level-1", "neighbor-sysid": "0000.0000.0002", - "hold-timer": 9, + "hold-timer": 10, "neighbor-priority": 0, "state": "up" } @@ -49,7 +49,7 @@ { "neighbor-sys-type": "level-1", "neighbor-sysid": "0000.0000.0005", - "hold-timer": 9, + "hold-timer": 10, "neighbor-priority": 0, "state": "up" } @@ -68,7 +68,7 @@ { "neighbor-sys-type": "level-1", "neighbor-sysid": "0000.0000.0006", - "hold-timer": 9, + "hold-timer": 10, "neighbor-priority": 0, "state": "up" } diff --git a/tests/topotests/isis_sr_topo1/rt4/step2/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt4/step2/show_yang_interface_isis_adjacencies.ref index be1e00b8a2..52682fffca 100644 --- a/tests/topotests/isis_sr_topo1/rt4/step2/show_yang_interface_isis_adjacencies.ref +++ b/tests/topotests/isis_sr_topo1/rt4/step2/show_yang_interface_isis_adjacencies.ref @@ -11,7 +11,7 @@ { "neighbor-sys-type": "level-1", "neighbor-sysid": "0000.0000.0002", - "hold-timer": 9, + "hold-timer": 10, "neighbor-priority": 0, "state": "up" } @@ -30,7 +30,7 @@ { "neighbor-sys-type": "level-1", "neighbor-sysid": "0000.0000.0002", - "hold-timer": 9, + "hold-timer": 10, "neighbor-priority": 0, "state": "up" } @@ -49,7 +49,7 @@ { "neighbor-sys-type": "level-1", "neighbor-sysid": "0000.0000.0006", - "hold-timer": 9, + "hold-timer": 10, "neighbor-priority": 0, "state": "up" } diff --git a/tests/topotests/isis_sr_topo1/rt4/step3/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt4/step3/show_yang_interface_isis_adjacencies.ref index bcade1ca90..a2e920cba2 100644 --- a/tests/topotests/isis_sr_topo1/rt4/step3/show_yang_interface_isis_adjacencies.ref +++ b/tests/topotests/isis_sr_topo1/rt4/step3/show_yang_interface_isis_adjacencies.ref @@ -11,7 +11,7 @@ { "neighbor-sys-type": "level-1", "neighbor-sysid": "0000.0000.0002", - "hold-timer": 9, + "hold-timer": 10, "neighbor-priority": 0, "state": "up" } @@ -30,7 +30,7 @@ { "neighbor-sys-type": "level-1", "neighbor-sysid": "0000.0000.0002", - "hold-timer": 9, + "hold-timer": 10, "neighbor-priority": 0, "state": "up" } diff --git a/tests/topotests/isis_sr_topo1/rt5/isisd.conf b/tests/topotests/isis_sr_topo1/rt5/isisd.conf index 3fe7bdf1b2..de604d71f4 100644 --- a/tests/topotests/isis_sr_topo1/rt5/isisd.conf +++ b/tests/topotests/isis_sr_topo1/rt5/isisd.conf @@ -16,25 +16,29 @@ interface eth-rt3-1 ip router isis 1 ipv6 router isis 1 isis network point-to-point - isis hello-multiplier 3 + isis hello-interval 1 + isis hello-multiplier 10 ! interface eth-rt3-2 ip router isis 1 ipv6 router isis 1 isis network point-to-point - isis hello-multiplier 3 + isis hello-interval 1 + isis hello-multiplier 10 ! interface eth-rt4 ip router isis 1 ipv6 router isis 1 isis network point-to-point - isis hello-multiplier 3 + isis hello-interval 1 + isis hello-multiplier 10 ! interface eth-rt6 ip router isis 1 ipv6 router isis 1 isis network point-to-point - isis hello-multiplier 3 + isis hello-interval 1 + isis hello-multiplier 10 ! router isis 1 lsp-gen-interval 2 diff --git a/tests/topotests/isis_sr_topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref index 1ff8c2cd4e..f40b0d353d 100644 --- a/tests/topotests/isis_sr_topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref +++ b/tests/topotests/isis_sr_topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref @@ -11,7 +11,7 @@ { "neighbor-sys-type": "level-1", "neighbor-sysid": "0000.0000.0003", - "hold-timer": 9, + "hold-timer": 10, "neighbor-priority": 0, "state": "up" } @@ -30,7 +30,7 @@ { "neighbor-sys-type": "level-1", "neighbor-sysid": "0000.0000.0003", - "hold-timer": 9, + "hold-timer": 10, "neighbor-priority": 0, "state": "up" } @@ -49,7 +49,7 @@ { "neighbor-sys-type": "level-1", "neighbor-sysid": "0000.0000.0004", - "hold-timer": 9, + "hold-timer": 10, "neighbor-priority": 0, "state": "up" } @@ -68,7 +68,7 @@ { "neighbor-sys-type": "level-1", "neighbor-sysid": "0000.0000.0006", - "hold-timer": 9, + "hold-timer": 10, "neighbor-priority": 0, "state": "up" } diff --git a/tests/topotests/isis_sr_topo1/rt5/step2/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt5/step2/show_yang_interface_isis_adjacencies.ref index d9ac0a8d00..153e8661a0 100644 --- a/tests/topotests/isis_sr_topo1/rt5/step2/show_yang_interface_isis_adjacencies.ref +++ b/tests/topotests/isis_sr_topo1/rt5/step2/show_yang_interface_isis_adjacencies.ref @@ -11,7 +11,7 @@ { "neighbor-sys-type": "level-1", "neighbor-sysid": "0000.0000.0003", - "hold-timer": 9, + "hold-timer": 10, "neighbor-priority": 0, "state": "up" } @@ -30,7 +30,7 @@ { "neighbor-sys-type": "level-1", "neighbor-sysid": "0000.0000.0003", - "hold-timer": 9, + "hold-timer": 10, "neighbor-priority": 0, "state": "up" } @@ -49,7 +49,7 @@ { "neighbor-sys-type": "level-1", "neighbor-sysid": "0000.0000.0006", - "hold-timer": 9, + "hold-timer": 10, "neighbor-priority": 0, "state": "up" } diff --git a/tests/topotests/isis_sr_topo1/rt5/step3/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt5/step3/show_yang_interface_isis_adjacencies.ref index 0b8e6ba5b9..2008d8467f 100644 --- a/tests/topotests/isis_sr_topo1/rt5/step3/show_yang_interface_isis_adjacencies.ref +++ b/tests/topotests/isis_sr_topo1/rt5/step3/show_yang_interface_isis_adjacencies.ref @@ -11,7 +11,7 @@ { "neighbor-sys-type": "level-1", "neighbor-sysid": "0000.0000.0003", - "hold-timer": 9, + "hold-timer": 10, "neighbor-priority": 0, "state": "up" } @@ -30,7 +30,7 @@ { "neighbor-sys-type": "level-1", "neighbor-sysid": "0000.0000.0003", - "hold-timer": 9, + "hold-timer": 10, "neighbor-priority": 0, "state": "up" } diff --git a/tests/topotests/isis_sr_topo1/rt5/step4/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt5/step4/show_yang_interface_isis_adjacencies.ref index d9ac0a8d00..153e8661a0 100644 --- a/tests/topotests/isis_sr_topo1/rt5/step4/show_yang_interface_isis_adjacencies.ref +++ b/tests/topotests/isis_sr_topo1/rt5/step4/show_yang_interface_isis_adjacencies.ref @@ -11,7 +11,7 @@ { "neighbor-sys-type": "level-1", "neighbor-sysid": "0000.0000.0003", - "hold-timer": 9, + "hold-timer": 10, "neighbor-priority": 0, "state": "up" } @@ -30,7 +30,7 @@ { "neighbor-sys-type": "level-1", "neighbor-sysid": "0000.0000.0003", - "hold-timer": 9, + "hold-timer": 10, "neighbor-priority": 0, "state": "up" } @@ -49,7 +49,7 @@ { "neighbor-sys-type": "level-1", "neighbor-sysid": "0000.0000.0006", - "hold-timer": 9, + "hold-timer": 10, "neighbor-priority": 0, "state": "up" } diff --git a/tests/topotests/isis_sr_topo1/rt6/isisd.conf b/tests/topotests/isis_sr_topo1/rt6/isisd.conf index e7a7e2dfd4..b96a2c6e1e 100644 --- a/tests/topotests/isis_sr_topo1/rt6/isisd.conf +++ b/tests/topotests/isis_sr_topo1/rt6/isisd.conf @@ -16,13 +16,15 @@ interface eth-rt4 ip router isis 1 ipv6 router isis 1 isis network point-to-point - isis hello-multiplier 3 + isis hello-interval 1 + isis hello-multiplier 10 ! interface eth-rt5 ip router isis 1 ipv6 router isis 1 isis network point-to-point - isis hello-multiplier 3 + isis hello-interval 1 + isis hello-multiplier 10 ! router isis 1 lsp-gen-interval 2 diff --git a/tests/topotests/isis_sr_topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref index 734832358f..8300ca0b5c 100644 --- a/tests/topotests/isis_sr_topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref +++ b/tests/topotests/isis_sr_topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref @@ -11,7 +11,7 @@ { "neighbor-sys-type": "level-1", "neighbor-sysid": "0000.0000.0004", - "hold-timer": 9, + "hold-timer": 10, "neighbor-priority": 0, "state": "up" } @@ -30,7 +30,7 @@ { "neighbor-sys-type": "level-1", "neighbor-sysid": "0000.0000.0005", - "hold-timer": 9, + "hold-timer": 10, "neighbor-priority": 0, "state": "up" } diff --git a/tests/topotests/isis_sr_topo1/test_isis_sr_topo1.py b/tests/topotests/isis_sr_topo1/test_isis_sr_topo1.py index 40b87e3a9e..9a4085ab55 100644 --- a/tests/topotests/isis_sr_topo1/test_isis_sr_topo1.py +++ b/tests/topotests/isis_sr_topo1/test_isis_sr_topo1.py @@ -987,7 +987,7 @@ def test_isis_adjacencies_step12(): 'vtysh -c "conf t" -c "interface eth-rt5" -c "isis network point-to-point"' ) tgen.net["rt4"].cmd( - 'vtysh -c "conf t" -c "interface eth-rt5" -c "isis hello-multiplier 3"' + 'vtysh -c "conf t" -c "interface eth-rt5" -c "isis hello-interval 1" -c "isis hello-multiplier 10"' ) tgen.net["rt6"].cmd( 'vtysh -c "conf t" -c "router isis 1" -c "segment-routing global-block 16000 23999"' 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 } diff --git a/tests/topotests/isis_tilfa_topo1/rt1/isisd.conf b/tests/topotests/isis_tilfa_topo1/rt1/isisd.conf index b425bb6b1f..1218ed350f 100644 --- 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 diff --git a/tests/topotests/isis_tilfa_topo1/rt1/zebra.conf b/tests/topotests/isis_tilfa_topo1/rt1/zebra.conf index 37b3f27cae..4de9d8c69f 100644 --- 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 546e9222fe..aed69713e1 100644 --- 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 diff --git a/tests/topotests/isis_tilfa_topo1/rt2/zebra.conf b/tests/topotests/isis_tilfa_topo1/rt2/zebra.conf index f9ac098f4f..f2975f6a9a 100644 --- 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 a41a4c14a9..d2f01e4595 100644 --- 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 diff --git a/tests/topotests/isis_tilfa_topo1/rt3/zebra.conf b/tests/topotests/isis_tilfa_topo1/rt3/zebra.conf index 441c9a3aca..7ffdcd60a4 100644 --- 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 07ae7dbba1..c1117b5d1b 100644 --- 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 diff --git a/tests/topotests/isis_tilfa_topo1/rt4/zebra.conf b/tests/topotests/isis_tilfa_topo1/rt4/zebra.conf index a2569aa51f..644885efd2 100644 --- 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 e637f8b3a6..3678ff9074 100644 --- 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 diff --git a/tests/topotests/isis_tilfa_topo1/rt5/zebra.conf b/tests/topotests/isis_tilfa_topo1/rt5/zebra.conf index f62cc8ffd3..424c85ef82 100644 --- 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 1bf4acd3cd..9d3b464726 100644 --- 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 diff --git a/tests/topotests/isis_tilfa_topo1/rt6/zebra.conf b/tests/topotests/isis_tilfa_topo1/rt6/zebra.conf index 4d51d3df84..94fed46cca 100644 --- 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 1a148f0628..435abde330 100644 --- 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 diff --git a/tests/topotests/zebra_netlink/test_zebra_netlink.py b/tests/topotests/zebra_netlink/test_zebra_netlink.py index 5a30f79279..522c390c39 100644 --- a/tests/topotests/zebra_netlink/test_zebra_netlink.py +++ b/tests/topotests/zebra_netlink/test_zebra_netlink.py @@ -22,7 +22,6 @@ from lib import topotest from lib.topogen import Topogen, TopoRouter from lib.topolog import logger - pytestmark = [pytest.mark.sharpd] @@ -68,6 +67,10 @@ def test_zebra_netlink_batching(tgen): # Reduce the size of the buffer to hit the limit. r1.vtysh_cmd("conf t\nzebra kernel netlink batch-tx-buf 256 256") + entry = {"r1-eth0": {"addresses": ["192.168.1.1/24"]}} + ok = topotest.router_json_cmp_retry(r1, "show int brief json", entry, False, 30) + assert ok, '"r1" Address not installed yet' + count = 100 r1.vtysh_cmd("sharp install routes 2.1.3.7 nexthop 192.168.1.1 " + str(count)) diff --git a/tests/topotests/zebra_seg6_route/test_zebra_seg6_route.py b/tests/topotests/zebra_seg6_route/test_zebra_seg6_route.py index 1d01263d9a..4b462a51e5 100755 --- a/tests/topotests/zebra_seg6_route/test_zebra_seg6_route.py +++ b/tests/topotests/zebra_seg6_route/test_zebra_seg6_route.py @@ -86,7 +86,7 @@ def test_zebra_seg6local_routes(): ) logger.info("CHECK {} {} {}".format(dest, nh, sid)) test_func = partial(check, r1, dest, manifest["out"]) - success, result = topotest.run_and_expect(test_func, None, count=5, wait=1) + success, result = topotest.run_and_expect(test_func, None, count=20, wait=1) assert result is None, "Failed" |