Skip to content

Commit b97e3dc

Browse files
simonartxavieralmusil
simonartxavier
authored and
almusil
committed
tests: Use M_START_TCPDUMPS.
Replace consecutive M_START_TCPDUMP calls with the M_START_TCPDUMPS macro to parallelize tcpdump startup. Signed-off-by: Xavier Simonart <xsimonar@redhat.com> Signed-off-by: Ales Musil <amusil@redhat.com> (cherry picked from commit 89b290f)
1 parent 5144099 commit b97e3dc

1 file changed

Lines changed: 45 additions & 45 deletions

File tree

‎tests/multinode.at‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1124,8 +1124,8 @@ check multinode_nbctl set logical_switch_port ln-sw1 tag_request=101
11241124

11251125
check multinode_nbctl --wait=hv sync
11261126

1127-
M_START_TCPDUMP([ovn-chassis-1], [-c 2 -neei genev_sys_6081 icmp], [ch1_genev])
1128-
M_START_TCPDUMP([ovn-chassis-1], [-c 2 -neei eth2 icmp], [ch1_eth2])
1127+
M_START_TCPDUMPS([ovn-chassis-1], [-c 2 -neei genev_sys_6081 icmp], [ch1_genev],
1128+
[ovn-chassis-1], [-c 2 -neei eth2 icmp], [ch1_eth2])
11291129

11301130
M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ping -q -c 3 -i 0.3 -w 2 10.0.0.4 | FORMAT_PING], \
11311131
[0], [dnl
@@ -1144,8 +1144,8 @@ m_as ovn-chassis-1 killall tcpdump
11441144
rm -f *.tcpdump
11451145
rm -f *.stderr
11461146

1147-
M_START_TCPDUMP([ovn-chassis-1], [-c 2 -neei genev_sys_6081 icmp], [ch1_genev])
1148-
M_START_TCPDUMP([ovn-chassis-1], [-c 2 -neei eth2 icmp], [ch1_eth2])
1147+
M_START_TCPDUMPS([ovn-chassis-1], [-c 2 -neei genev_sys_6081 icmp], [ch1_genev],
1148+
[ovn-chassis-1], [-c 2 -neei eth2 icmp], [ch1_eth2])
11491149

11501150
M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ping -q -c 3 -i 0.3 -w 2 20.0.0.3 | FORMAT_PING], \
11511151
[0], [dnl
@@ -1169,8 +1169,8 @@ m_as ovn-chassis-1 killall tcpdump
11691169
rm -f *.tcpdump
11701170
rm -f *.stderr
11711171

1172-
M_START_TCPDUMP([ovn-chassis-1], [-c 2 -neei genev_sys_6081 icmp], [ch1_genev])
1173-
M_START_TCPDUMP([ovn-chassis-1], [-c 2 -neei eth2 icmp], [ch1_eth2])
1172+
M_START_TCPDUMPS([ovn-chassis-1], [-c 2 -neei genev_sys_6081 icmp], [ch1_genev],
1173+
[ovn-chassis-1], [-c 2 -neei eth2 icmp], [ch1_eth2])
11741174

11751175
M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ping -q -c 3 -i 0.3 -w 2 10.0.0.4 | FORMAT_PING], \
11761176
[0], [dnl
@@ -1189,8 +1189,8 @@ m_as ovn-chassis-1 killall tcpdump
11891189
rm -f *.tcpdump
11901190
rm -f *.stderr
11911191

1192-
M_START_TCPDUMP([ovn-chassis-1], [-c 2 -neei genev_sys_6081 icmp], [ch1_genev])
1193-
M_START_TCPDUMP([ovn-chassis-1], [-c 2 -neei eth2 icmp], [ch1_eth2])
1192+
M_START_TCPDUMPS([ovn-chassis-1], [-c 2 -neei genev_sys_6081 icmp], [ch1_genev],
1193+
[ovn-chassis-1], [-c 2 -neei eth2 icmp], [ch1_eth2])
11941194

11951195
M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ping -q -c 3 -i 0.3 -w 2 20.0.0.3 | FORMAT_PING], \
11961196
[0], [dnl
@@ -1213,8 +1213,8 @@ rm -f *.stderr
12131213
check multinode_nbctl --wait=hv lsp-del ln-sw1
12141214
# Traffic from sw0p1 to sw1p1 should be tunneled.
12151215

1216-
M_START_TCPDUMP([ovn-chassis-1], [-c 2 -neei genev_sys_6081 icmp], [ch1_genev])
1217-
M_START_TCPDUMP([ovn-chassis-1], [-c 2 -neei eth2 icmp], [ch1_eth2])
1216+
M_START_TCPDUMPS([ovn-chassis-1], [-c 2 -neei genev_sys_6081 icmp], [ch1_genev],
1217+
[ovn-chassis-1], [-c 2 -neei eth2 icmp], [ch1_eth2])
12181218

12191219
M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ping -q -c 3 -i 0.3 -w 2 20.0.0.3 | FORMAT_PING], \
12201220
[0], [dnl
@@ -1245,9 +1245,9 @@ m_as ovn-gw-1 ip netns exec sw0-p10 ip link set sw0-p10 address 32:31:8c:da:64:4
12451245
# sw0p1 -> br-int -> localnet port (vlan tagged 100) -> br-ex -> eth2 of ovn-chassis-1 to
12461246
# eth2 of ovn-gw-1 -> br-ex -> sw0-p10
12471247

1248-
M_START_TCPDUMP([ovn-chassis-1], [-c 2 -neei genev_sys_6081 icmp], [ch1_genev])
1249-
M_START_TCPDUMP([ovn-chassis-1], [-c 2 -neei eth2 icmp], [ch1_eth2])
1250-
M_START_TCPDUMP([ovn-gw-1], [-c 2 -neei eth2 icmp], [gw1_eth2])
1248+
M_START_TCPDUMPS([ovn-chassis-1], [-c 2 -neei genev_sys_6081 icmp], [ch1_genev],
1249+
[ovn-chassis-1], [-c 2 -neei eth2 icmp], [ch1_eth2],
1250+
[ovn-gw-1], [-c 2 -neei eth2 icmp], [gw1_eth2])
12511251

12521252
M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ping -q -c 3 -i 0.3 -w 2 10.0.0.10 | FORMAT_PING], \
12531253
[0], [dnl
@@ -1283,12 +1283,12 @@ check multinode_nbctl --wait=hv lr-nat-add lr0 dnat_and_snat 172.20.0.110 10.0.0
12831283
# -> ln-public -> br-ex -> eth2 -> ovn-chassis-1 -> br-ex -> ln-public -> br-int ->
12841284
# -> DNAT 172.20.0.110 to 10.0.0.3 -> sw0-p1 with src ip 172.20.0.100 and dst ip 10.0.0.3.
12851285

1286-
M_START_TCPDUMP([ovn-chassis-2], [-c 2 -neei genev_sys_6081 icmp], [ch2_genev])
1287-
M_START_TCPDUMP([ovn-chassis-2], [-c 2 -neei eth2 icmp], [ch2_eth2])
1288-
M_START_TCPDUMP([ovn-gw-1], [-c 2 -neei genev_sys_6081 icmp], [gw1_geneve])
1289-
M_START_TCPDUMP([ovn-gw-1], [-c 2 -neei eth2 icmp], [gw1_eth2])
1290-
M_START_TCPDUMP([ovn-chassis-1], [-c 2 -neei genev_sys_6081 icmp], [ch1_genev])
1291-
M_START_TCPDUMP([ovn-chassis-1], [-c 2 -neei eth2 icmp], [ch1_eth2])
1286+
M_START_TCPDUMPS([ovn-chassis-2], [-c 2 -neei genev_sys_6081 icmp], [ch2_genev],
1287+
[ovn-chassis-2], [-c 2 -neei eth2 icmp], [ch2_eth2],
1288+
[ovn-gw-1], [-c 2 -neei genev_sys_6081 icmp], [gw1_geneve],
1289+
[ovn-gw-1], [-c 2 -neei eth2 icmp], [gw1_eth2],
1290+
[ovn-chassis-1], [-c 2 -neei genev_sys_6081 icmp], [ch1_genev],
1291+
[ovn-chassis-1], [-c 2 -neei eth2 icmp], [ch1_eth2])
12921292

12931293
M_NS_CHECK_EXEC([ovn-chassis-2], [sw1p1], [ping -q -c 3 -i 0.3 -w 2 172.20.0.110 | FORMAT_PING], \
12941294
[0], [dnl
@@ -1334,12 +1334,12 @@ check multinode_nbctl --wait=hv lr-nat-add lr0 dnat_and_snat 172.20.0.110 10.0.0
13341334
# sw1-p1 in ovn-chassis-2 -> tunnel -> ovn-gw-1 -> In ovn-gw-1 SNAT 20.0.0.3 to 172.20.0.100 ->
13351335
# DNAT 172.20.0.110 -> 10.0.0.3 -> tunnel -> ovn-chassis-1 -> br-int -> sw0p1
13361336

1337-
M_START_TCPDUMP([ovn-chassis-2], [-c 2 -neei genev_sys_6081 icmp], [ch2_genev])
1338-
M_START_TCPDUMP([ovn-chassis-2], [-c 2 -neei eth2 icmp], [ch2_eth2])
1339-
M_START_TCPDUMP([ovn-gw-1], [-c 4 -neei genev_sys_6081 icmp], [gw1_geneve])
1340-
M_START_TCPDUMP([ovn-gw-1], [-c 4 -neei eth2 icmp], [gw1_eth2])
1341-
M_START_TCPDUMP([ovn-chassis-1], [-c 2 -neei genev_sys_6081 icmp], [ch1_genev])
1342-
M_START_TCPDUMP([ovn-chassis-1], [-c 2 -neei eth2 icmp], [ch1_eth2])
1337+
M_START_TCPDUMPS([ovn-chassis-2], [-c 2 -neei genev_sys_6081 icmp], [ch2_genev],
1338+
[ovn-chassis-2], [-c 2 -neei eth2 icmp], [ch2_eth2],
1339+
[ovn-gw-1], [-c 4 -neei genev_sys_6081 icmp], [gw1_geneve],
1340+
[ovn-gw-1], [-c 4 -neei eth2 icmp], [gw1_eth2],
1341+
[ovn-chassis-1], [-c 2 -neei genev_sys_6081 icmp], [ch1_genev],
1342+
[ovn-chassis-1], [-c 2 -neei eth2 icmp], [ch1_eth2])
13431343

13441344
M_NS_CHECK_EXEC([ovn-chassis-2], [sw1p1], [ping -q -c 3 -i 0.3 -w 2 172.20.0.110 | FORMAT_PING], \
13451345
[0], [dnl
@@ -2535,8 +2535,8 @@ M_NS_CHECK_EXEC([ovn-chassis-1], [external], [ping -q -c 5 -i 0.3 -w 2 10:200::2
25352535

25362536
M_NS_CHECK_EXEC([ovn-chassis-1], [mgmt], [ip a a 172.16.100.2/24 dev mgmt])
25372537
M_NS_DAEMONIZE([ovn-chassis-1], [pod10], [nc -e /bin/cat -v -l -o server.log 10.100.200.10 2324], [pod10.pid])
2538-
M_START_TCPDUMP([ovn-chassis-1], [-neei pod10-p ip], [pod10])
2539-
M_START_TCPDUMP([ovn-chassis-1], [-neei mgmt-p ip], [mgmt])
2538+
M_START_TCPDUMPS([ovn-chassis-1], [-neei pod10-p ip], [pod10],
2539+
[ovn-chassis-1], [-neei mgmt-p ip], [mgmt])
25402540

25412541
m_as ovn-chassis-1 sh -c 'echo -e "Hello\nHello" > msg.expected'
25422542
check m_as ovn-chassis-1 ovn-nbctl --policy="src-ip" lr-route-add tr 10.100.200.0/24 10.100.200.11
@@ -2666,14 +2666,14 @@ done
26662666

26672667
m_wait_for_ports_up
26682668

2669-
M_START_TCPDUMP([ovn-chassis-1], [-neei genev_sys_6081 arp or ip], [ch1_genev])
2670-
M_START_TCPDUMP([ovn-chassis-1], [-neei migrator-p arp or ip], [ch1_migrator])
2671-
M_START_TCPDUMP([ovn-chassis-2], [-neei genev_sys_6081 arp or ip], [ch2_genev])
2672-
for i in 1 2 3; do
2673-
M_START_TCPDUMP([ovn-chassis-${i}], [-neei sw0-port${i}-p arp or ip], [ch${i}_sw0-port${i}])
2674-
done
2675-
M_START_TCPDUMP([ovn-chassis-3], [-neei genev_sys_6081 arp or ip], [ch3_genev])
2676-
M_START_TCPDUMP([ovn-chassis-3], [-neei migrator-p arp or ip], [ch3_migrator])
2669+
M_START_TCPDUMPS([ovn-chassis-1], [-neei genev_sys_6081 arp or ip], [ch1_genev],
2670+
[ovn-chassis-1], [-neei migrator-p arp or ip], [ch1_migrator],
2671+
[ovn-chassis-2], [-neei genev_sys_6081 arp or ip], [ch2_genev],
2672+
[ovn-chassis-1], [-neei sw0-port1-p arp or ip], [ch1_sw0-port1],
2673+
[ovn-chassis-2], [-neei sw0-port2-p arp or ip], [ch2_sw0-port2],
2674+
[ovn-chassis-3], [-neei sw0-port3-p arp or ip], [ch3_sw0-port3],
2675+
[ovn-chassis-3], [-neei genev_sys_6081 arp or ip], [ch3_genev],
2676+
[ovn-chassis-3], [-neei migrator-p arp or ip], [ch3_migrator])
26772677

26782678
AS_BOX([Migration with vifs])
26792679
for i in 1 2 3; do
@@ -3322,14 +3322,14 @@ check multinode_nbctl --wait=hv sync
33223322

33233323
start_tcpdump() {
33243324
echo "$(date +%H:%M:%S.%03N) Starting tcpdump"
3325-
M_START_TCPDUMP([ovn-chassis-1], [-neei hv1-vif1-p], [ch1])
3326-
M_START_TCPDUMP([ovn-chassis-2], [-neei eth2], [ch2])
3327-
M_START_TCPDUMP([ovn-gw-1], [-neei eth2], [gw1])
3328-
M_START_TCPDUMP([ovn-gw-1], [-neei eth2 -Q out], [gw1_out])
3329-
M_START_TCPDUMP([ovn-gw-2], [-neei eth2], [gw2])
3330-
M_START_TCPDUMP([ovn-gw-2], [-neei eth2 -Q out], [gw2_out])
3331-
M_START_TCPDUMP([ovn-gw-3], [-neei eth2], [gw3])
3332-
M_START_TCPDUMP([ovn-gw-3], [-neei eth2 -Q out], [gw3_out])
3325+
M_START_TCPDUMPS([ovn-chassis-1], [-neei hv1-vif1-p], [ch1],
3326+
[ovn-chassis-2], [-neei eth2], [ch2],
3327+
[ovn-gw-1], [-neei eth2], [gw1],
3328+
[ovn-gw-1], [-neei eth2 -Q out], [gw1_out],
3329+
[ovn-gw-2], [-neei eth2], [gw2],
3330+
[ovn-gw-2], [-neei eth2 -Q out], [gw2_out],
3331+
[ovn-gw-3], [-neei eth2], [gw3],
3332+
[ovn-gw-3], [-neei eth2 -Q out], [gw3_out])
33333333
}
33343334

33353335
stop_tcpdump() {
@@ -5278,8 +5278,8 @@ M_START_L4_SERVER([ovn-chassis-2], [ls1p3], [192.168.1.3], [10880], [ls1p3], [ls
52785278
# Capture traffic to verify load balancing occurs locally without east-west traffic
52795279
for i in {1..2}; do
52805280
node_name="ovn-chassis-$i"
5281-
M_START_TCPDUMP([$node_name], [-c 2 -neei genev_sys_6081 port 10880], [ch${i}_genev])
5282-
M_START_TCPDUMP([$node_name], [-c 2 -neei eth2 port 10880], [ch${i}_eth2])
5281+
M_START_TCPDUMPS([$node_name], [-c 2 -neei genev_sys_6081 port 10880], [ch${i}_genev],
5282+
[$node_name], [-c 2 -neei eth2 port 10880], [ch${i}_eth2])
52835283
done
52845284

52855285
AT_CHECK([m_as ovn-gw-1 /bin/bash -c 'for i in $(seq 500); \

0 commit comments

Comments
 (0)