Skip to content

Commit 47859fc

Browse files
ipspaceipspace
committed
Use shared warnings and wait times in LAG and MPLS/VPN tests
1 parent 1e900bd commit 47859fc

File tree

12 files changed

+77
-41
lines changed

12 files changed

+77
-41
lines changed

‎tests/integration/lag/01-l3-lag.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ message: |
22
The device under is a router with a L3 LAG link connected to a FRR device. The
33
FRR device should be able to ping the loopback interface of DUT.
44
5+
defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
6+
57
groups:
68
probes:
79
device: eos
@@ -29,7 +31,7 @@ links:
2931
validate:
3032
lag:
3133
description: Check LAG link with DUT
32-
wait: 10
34+
wait: lacp_setup
3335
wait_msg: Waiting for LAG to start
3436
nodes: [ x1, x2 ]
3537
devices: [ eos ]
@@ -41,6 +43,7 @@ validate:
4143
ping:
4244
description: Initial IPv4 ping
4345
nodes: [ x1 ]
46+
wait: ping
4447
exec:
4548
eos: ping x2
4649
valid: |

‎tests/integration/lag/02-lag-vlan-trunk.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ message: |
22
The device under test is a layer-2 switch connected with a LAG VLAN trunk to
33
another layer-2 switch. Host in the same VLAN should be able to ping each
44
other.
5+
6+
defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
7+
58
groups:
69
_auto_create: true
710
hosts:

‎tests/integration/lag/03-l3-lag-passive.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ message: |
33
establish an OSPF-over-VLAN adjacency with an Arista EOS device using active
44
LACP. but not with another Arista EOS device using passive LACP.
55
6+
defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
7+
68
groups:
79
switches:
810
members: [ dut, x1, x2 ]
@@ -32,13 +34,13 @@ validate:
3234
adj_x1:
3335
description: Check OSPF adjacencies on X1
3436
wait_msg: Waiting for OSPF adjacency process to complete
35-
wait: 30
37+
wait: ospfv2_adj_lan
3638
nodes: [ x1 ]
3739
plugin: ospf_neighbor(nodes.dut.ospf.router_id)
3840

3941
lag_x2:
4042
description: Check LAG ports on X2
41-
wait: 10
43+
wait: lacp_setup
4244
wait_msg: Waiting for LAG to start
4345
nodes: [ x2 ]
4446
devices: [ eos ]
@@ -47,8 +49,10 @@ validate:
4749
show: port-channel | json
4850
valid: >-
4951
not portChannels['Port-Channel1'].activePorts
52+
stop_on_error: True
5053

5154
adj_x2:
5255
description: Check OSPF adjacencies on X2
56+
wait: ospfv2_adj_lan
5357
nodes: [ x2 ]
5458
plugin: ospf_neighbor(nodes.dut.ospf.router_id,present=False)

‎tests/integration/lag/04-lag-vlan-routed-trunk.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ message: |
33
another router. Hosts should be able to ping each other.
44
55
On routers, this case tests routed subinterfaces on a port-channel interface
6+
7+
defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
8+
69
groups:
710
_auto_create: true
811
hosts:
@@ -32,12 +35,12 @@ validate:
3235
adj:
3336
description: Check OSPF adjacencies
3437
wait_msg: Waiting for OSPF adjacency process to complete
35-
wait: 60
38+
wait: ospfv2_adj_lan
3639
nodes: [ xr ]
3740
plugin: ospf_neighbor(nodes.dut.ospf.router_id)
3841
ping_v1:
3942
description: Pinging H2 from H1 on VLAN v1
4043
nodes: [ h1 ]
4144
wait_msg: Waiting for STP and OSPF to do their job
42-
wait: 15
45+
wait: ping_long
4346
plugin: ping('h2')

‎tests/integration/mpls/01-ldp-p.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ message: |
44
P-router and a PE-router, and performs label switching. The validation test
55
checks end-to-end connectivity across a BGP-free MPLS core.
66
7+
defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
8+
79
bgp.advertise_loopback: false
810

911
groups:
@@ -42,21 +44,21 @@ defaults.devices.vptx.netlab_validate.ping.wait: 30
4244
validate:
4345
ospf:
4446
description: Check OSPF sessions with DUT (wait up to 30 seconds)
45-
wait: 30
47+
wait: ospfv2_adj_p2p
4648
wait_msg: Waiting for OSPF adjacency
4749
nodes: [ pe1, p2 ]
4850
plugin: ospf_neighbor(nodes.dut.ospf.router_id)
4951
stop_on_error: true
5052
ibgp:
5153
description: Check IBGP session
52-
wait: 40
54+
wait: ibgp_session
5355
wait_msg: Waiting for IBGP sessions to start
5456
nodes: [ pe2 ]
5557
plugin: bgp_neighbor(node.bgp.neighbors,'pe1')
5658
stop_on_error: true
5759
ldp:
5860
description: Check LDP session
59-
wait: 30
61+
wait: ldp_adj
6062
wait_msg: Waiting for LDP to start
6163
nodes: [ pe1, p2 ]
6264
show:
@@ -66,6 +68,6 @@ validate:
6668
ping:
6769
description: Ping-based end-to-end reachability test
6870
wait_msg: We might have to wait a bit longer
69-
wait: 10
71+
wait: ping_long
7072
nodes: [ h1 ]
7173
plugin: ping('h2')

‎tests/integration/mpls/02-ldp-pe.yml‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ message:
66
The validation test checks end-to-end connectivity across a BGP-free MPLS core
77
between a set of linux hosts attached to the PE-routers.
88

9+
defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
10+
911
groups:
1012
_auto_create: True
1113
hosts:
@@ -37,17 +39,22 @@ links:
3739
h2:
3840
ospf: false
3941

42+
defaults.devices.vptx.netlab_validate:
43+
ospf.wait: 40
44+
ldp.wait: 40
45+
ibgp.wait: 40
46+
4047
validate:
4148
ospf:
4249
description: Check OSPF sessions with DUT (wait up to 30 seconds)
43-
wait: 30
50+
wait: ospfv2_adj_p2p
4451
wait_msg: Waiting for OSPF adjacency
4552
nodes: [ p1 ]
4653
plugin: ospf_neighbor(nodes.dut.ospf.router_id)
4754
stop_on_error: true
4855
ldp:
4956
description: Check LDP session
50-
wait: 30
57+
wait: ldp_adj
5158
wait_msg: Waiting for LDP to start
5259
nodes: [ p1 ]
5360
show:
@@ -56,14 +63,14 @@ validate:
5663
neighbors[0].state == 'OPERATIONAL'
5764
ibgp:
5865
description: Check IBGP session
59-
wait: 40
66+
wait: ibgp_session
6067
wait_msg: Waiting for IBGP sessions to start
6168
nodes: [ pe2 ]
6269
plugin: bgp_neighbor(node.bgp.neighbors,'dut')
6370
stop_on_error: true
6471
ping:
6572
description: Ping-based end-to-end reachability test
6673
wait_msg: We might have to wait a bit longer
67-
wait: 10
74+
wait: ping_long
6875
nodes: [ h1 ]
6976
plugin: ping('h2')

‎tests/integration/mpls/10-vpn-connected.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ message: |
66
routes with another PE-router. The connected subnets must be redistributed
77
into VPNv4 AF for the end-to-end connectivity test to work.
88
9+
defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
10+
911
groups:
1012
_auto_create: True
1113
hosts:
@@ -43,14 +45,14 @@ defaults.devices.vptx.netlab_validate.pe_ibgp.wait: 240
4345
validate:
4446
pe_ospf:
4547
description: Check OSPF sessions with DUT (wait up to 30 seconds)
46-
wait: 30
48+
wait: ospfv2_adj_p2p
4749
wait_msg: Waiting for OSPF adjacency
4850
nodes: [ p1 ]
4951
plugin: ospf_neighbor(nodes.dut.ospf.router_id)
5052
stop_on_error: true
5153
ldp:
5254
description: Check LDP session
53-
wait: 30
55+
wait: ldp_adj
5456
wait_msg: Waiting for LDP to start
5557
nodes: [ p1 ]
5658
show:
@@ -59,7 +61,7 @@ validate:
5961
neighbors[0].state == 'OPERATIONAL'
6062
pe_ibgp:
6163
description: Check IBGP session between PE-routers
62-
wait: 40
64+
wait: ibgp_session
6365
wait_msg: Waiting for IBGP sessions to start
6466
nodes: [ pe2 ]
6567
plugin: bgp_neighbor(node.bgp.neighbors,'dut')
@@ -72,13 +74,13 @@ validate:
7274
ping_red:
7375
description: Ping-based end-to-end reachability test (VRF red)
7476
wait_msg: We might have to wait a bit longer
75-
wait: 10
77+
wait: ping_long
7678
nodes: [ h1 ]
7779
plugin: ping('h2')
7880
ping_blue:
7981
description: Ping-based end-to-end reachability test (VRF blue)
8082
wait_msg: We might have to wait a bit longer
81-
wait: 10
83+
wait: ping_long
8284
nodes: [ h3 ]
8385
plugin: ping('h4')
8486
ping_inter:

‎tests/integration/mpls/11-vpn-cs.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ message: |
66
succeed if the simple MPLS/VPN test and the VRF Common Services test succeded
77
unless you have to configure some weird nerd knobs to make it work.
88
9+
defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
10+
911
groups:
1012
_auto_create: True
1113
hosts:
@@ -48,14 +50,14 @@ defaults.devices.vptx.netlab_validate.pe_ibgp.wait: 240
4850
validate:
4951
pe_ospf:
5052
description: Check OSPF sessions with DUT (wait up to 30 seconds)
51-
wait: 30
53+
wait: ospfv2_adj_p2p
5254
wait_msg: Waiting for OSPF adjacency
5355
nodes: [ p1 ]
5456
plugin: ospf_neighbor(nodes.dut.ospf.router_id)
5557
stop_on_error: true
5658
ldp:
5759
description: Check LDP session
58-
wait: 30
60+
wait: ldp_adj
5961
wait_msg: Waiting for LDP to start
6062
nodes: [ p1 ]
6163
show:
@@ -64,15 +66,15 @@ validate:
6466
neighbors[0].state == 'OPERATIONAL'
6567
pe_ibgp:
6668
description: Check IBGP session between PE-routers
67-
wait: 40
69+
wait: ibgp_session
6870
wait_msg: Waiting for IBGP sessions to start
6971
nodes: [ pe2 ]
7072
plugin: bgp_neighbor(node.bgp.neighbors,'dut')
7173
stop_on_error: true
7274
ping_cs:
7375
description: Ping-based end-to-end reachability test (common services)
7476
wait_msg: We might have to wait a bit longer
75-
wait: 20
77+
wait: ping_long
7678
nodes: [ h1, h2, h3 ]
7779
plugin: ping('ch')
7880
ping_inter:

‎tests/integration/mpls/12-vpn-bgp.yml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ message: |
99
The validation tests check BGP prefixes on the CE-routers and perform
1010
end-to-end connectivity tests between CE-router loopbacks.
1111
12+
defaults.sources.extra: [ ../wait_times.yml, ../warnings.yml ]
13+
1214
groups:
1315
_auto_create: True
1416
ce_probes:
@@ -54,14 +56,14 @@ defaults.devices.vptx.netlab_validate:
5456
validate:
5557
pe_ospf:
5658
description: Check OSPF sessions with DUT (wait up to 30 seconds)
57-
wait: 30
59+
wait: ospfv2_adj_p2p
5860
wait_msg: Waiting for OSPF adjacency
5961
nodes: [ p1 ]
6062
plugin: ospf_neighbor(nodes.dut.ospf.router_id)
6163
stop_on_error: true
6264
ldp:
6365
description: Check LDP session
64-
wait: 30
66+
wait: ldp_adj
6567
wait_msg: Waiting for LDP to start
6668
nodes: [ p1 ]
6769
show:
@@ -70,7 +72,7 @@ validate:
7072
neighbors[0].state == 'OPERATIONAL'
7173
pe_ibgp:
7274
description: Check IBGP session between PE-routers
73-
wait: 40
75+
wait: ibgp_session
7476
wait_msg: Waiting for IBGP sessions to start
7577
nodes: [ pe2 ]
7678
plugin: bgp_neighbor(node.bgp.neighbors,'dut')
@@ -82,26 +84,26 @@ validate:
8284
stop_on_error: true
8385
ce_ebgp:
8486
description: Check PE-CE EBGP session
85-
wait: 10
87+
wait: ebgp_session
8688
wait_msg: Waiting for EBGP sessions to start
8789
nodes: [ ce1 ]
8890
plugin: bgp_neighbor(node.bgp.neighbors,'dut')
8991
stop_on_error: true
9092
pfx_ce1:
9193
description: Check CE2 BGP prefix on CE1
92-
wait: 10
94+
wait: bgp_scan_long
9395
wait_msg: Waiting for DUT to propagate CE2 prefix to CE1
9496
nodes: [ ce1 ]
9597
plugin: bgp_prefix(nodes.ce2.loopback.ipv4)
9698
pfx_ce2:
9799
description: Check CE1 BGP prefix on CE2
98-
wait: 10
100+
wait: bgp_scan_long
99101
wait_msg: Waiting for DUT to propagate CE1 prefix to VPNv4 AF
100102
nodes: [ ce2 ]
101103
plugin: bgp_prefix(nodes.ce1.loopback.ipv4)
102104
ping:
103105
description: Ping-based end-to-end reachability test
104106
wait_msg: Waiting for end-to-end MPLS path
105-
wait: 10
107+
wait: ping
106108
nodes: [ ce1 ]
107109
plugin: ping('ce2',src=node.loopback.ipv4)

0 commit comments

Comments
 (0)