Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test sponging #14112

Merged
merged 5 commits into from
Jul 31, 2023
Merged

Test sponging #14112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b0e3fcf
tests: zebra_netlink ensure the address is installed
donaldsharp Jul 28, 2023
3984301
tests: isis_te_topo1 can fail occassionally
donaldsharp Jul 29, 2023
e566e56
tests: Fix zebra_seg6_route to give more time for routes to be installed
donaldsharp Jul 29, 2023
940ac2a
tests: bfd_bgp_cbit_topo3 allow bgp to converge before testing
donaldsharp Jul 29, 2023
15bf9ba
tests: Convert isis to use 1 and 10 for hello/multiplier
donaldsharp Jul 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/topotests/bfd_bgp_cbit_topo3/r1/bgpd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/topotests/bfd_bgp_cbit_topo3/r3/bgpd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions tests/topotests/bfd_bgp_cbit_topo3/test_bfd_bgp_cbit_topo3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"'
Expand Down
4 changes: 2 additions & 2 deletions tests/topotests/bfd_isis_topo1/rt1/isisd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
!
Expand Down
4 changes: 2 additions & 2 deletions tests/topotests/bfd_isis_topo1/rt2/isisd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/topotests/bfd_isis_topo1/rt3/isisd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/topotests/bfd_isis_topo1/rt4/isisd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/topotests/bfd_isis_topo1/rt5/isisd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions tests/topotests/bgp_snmp_mplsl3vpn/r1/isisd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/topotests/bgp_snmp_mplsl3vpn/r2/isisd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions tests/topotests/bgp_snmp_mplsl3vpn/r3/isisd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/topotests/bgp_snmp_mplsl3vpn/r4/isisd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 4 additions & 2 deletions tests/topotests/cspf_topo1/r1/isisd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 8 additions & 4 deletions tests/topotests/cspf_topo1/r2/isisd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions tests/topotests/cspf_topo1/r3/isisd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions tests/topotests/cspf_topo1/r4/isisd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 10 additions & 5 deletions tests/topotests/isis_lfa_topo1/rt1/isisd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions tests/topotests/isis_lfa_topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand All @@ -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"
}
Expand All @@ -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"
}
Expand All @@ -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"
}
Expand All @@ -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"
}
Expand Down
Loading