test: Combine iperf3c and iperf3s into a single DSL command

These two commands in the DSL to run an iperf client and server are always
used together, and some of the parameters must match between them.  The
iperf3s must also be run more or less immediately after iperf3c, since
iperf3c will run a client in the background after a sleep and requires a
server to be running before it will work.

A bunch of things can be made cleaner if we make a single DSL command that
runs both sides of the test.  For now make the combined command work
exactly like the two commands together did, warts and all.

This does lose the ability for the DSL scripts to give additional options
to the iperf3 server, but we weren't using that anyway.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>

1 files changed, 22 insertions, 36 deletions

diff --git a/test/perf/pasta_udp b/test/perf/pasta_udp
index 5f750b5..0555d54 100644
--- a/test/perf/pasta_udp
+++ b/test/perf/pasta_udp
@@ -33,20 +33,16 @@ th	MTU 1500B 4000B 16384B 65535B
 
 tr	UDP throughput over IPv6: ns to host
 ns	ip link set dev lo mtu 1500
-iperf3c	ns ::1 100${i}3 __THREADS__ __OPTS__ -b 3G
-iperf3s	BW host 100${i}3 __THREADS__
+iperf3	BW ns host ::1 100${i}3 __THREADS__ __OPTS__ -b 3G
 bw	__BW__ 1.0 1.5
 ns	ip link set dev lo mtu 4000
-iperf3c	ns ::1 100${i}3 __THREADS__ __OPTS__ -b 3G
-iperf3s	BW host 100${i}3 __THREADS__
+iperf3	BW ns host ::1 100${i}3 __THREADS__ __OPTS__ -b 3G
 bw	__BW__ 1.2 1.8
 ns	ip link set dev lo mtu 16384
-iperf3c	ns ::1 100${i}3 __THREADS__ __OPTS__ -b 10G
-iperf3s	BW host 100${i}3 __THREADS__
+iperf3	BW ns host ::1 100${i}3 __THREADS__ __OPTS__ -b 10G
 bw	__BW__ 5.0 6.0
 ns	ip link set dev lo mtu 65535
-iperf3c	ns ::1 100${i}3 __THREADS__ __OPTS__ -b 15G
-iperf3s	BW host 100${i}3 __THREADS__
+iperf3	BW ns host ::1 100${i}3 __THREADS__ __OPTS__ -b 15G
 bw	__BW__ 7.0 9.0
 
 tl	UDP RR latency over IPv6: ns to host
@@ -61,20 +57,16 @@ lat	__LAT__ 200 150
 
 tr	UDP throughput over IPv4: ns to host
 ns	ip link set dev lo mtu 1500
-iperf3c	ns 127.0.0.1 100${i}3 __THREADS__ __OPTS__ -b 3G
-iperf3s	BW host 100${i}3 __THREADS__
+iperf3	BW ns host 127.0.0.1 100${i}3 __THREADS__ __OPTS__ -b 3G
 bw	__BW__ 1.0 1.5
 ns	ip link set dev lo mtu 4000
-iperf3c	ns 127.0.0.1 100${i}3 __THREADS__ __OPTS__ -b 3G
-iperf3s	BW host 100${i}3 __THREADS__
+iperf3	BW ns host 127.0.0.1 100${i}3 __THREADS__ __OPTS__ -b 3G
 bw	__BW__ 1.2 1.8
 ns	ip link set dev lo mtu 16384
-iperf3c	ns 127.0.0.1 100${i}3 __THREADS__ __OPTS__ -b 10G
-iperf3s	BW host 100${i}3 __THREADS__
+iperf3	BW ns host 127.0.0.1 100${i}3 __THREADS__ __OPTS__ -b 10G
 bw	__BW__ 5.0 6.0
 ns	ip link set dev lo mtu 65535
-iperf3c	ns 127.0.0.1 100${i}3 __THREADS__ __OPTS__ -b 15G
-iperf3s	BW host 100${i}3 __THREADS__
+iperf3	BW ns host 127.0.0.1 100${i}3 __THREADS__ __OPTS__ -b 15G
 bw	__BW__ 7.0 9.0
 
 tl	UDP RR latency over IPv4: ns to host
@@ -91,8 +83,9 @@ tr	UDP throughput over IPv6: host to ns
 bw	-
 bw	-
 bw	-
-iperf3c	host ::1 100${i}2 __THREADS__ __OPTS__ -b 15G
-iperf3s	BW ns 100${i}2 __THREADS__
+#iperf3c	host ::1 100${i}2 __THREADS__ __OPTS__ -b 15G
+#iperf3s	BW ns 100${i}2 __THREADS__
+iperf3	BW host ns ::1 100${i}2 __THREADS__ __OPTS__ -b 15G
 bw	__BW__ 7.0 9.0
 
 tl	UDP RR latency over IPv6: host to ns
@@ -109,8 +102,9 @@ tr	UDP throughput over IPv4: host to ns
 bw	-
 bw	-
 bw	-
-iperf3c	host 127.0.0.1 100${i}2 __THREADS__ __OPTS__ -b 15G
-iperf3s	BW ns 100${i}2 __THREADS__
+#iperf3c	host 127.0.0.1 100${i}2 __THREADS__ __OPTS__ -b 15G
+#iperf3s	BW ns 100${i}2 __THREADS__
+iperf3	BW host ns 127.0.0.1 100${i}2 __THREADS__ __OPTS__ -b 15G
 bw	__BW__ 7.0 9.0
 
 tl	UDP RR latency over IPv4: host to ns
@@ -139,20 +133,16 @@ th	MTU 1500B 4000B 16384B 65520B
 
 tr	UDP throughput over IPv6: ns to host
 ns	ip link set dev __IFNAME__ mtu 1500
-iperf3c	ns __GW6__%__IFNAME__ 100${i}3 __THREADS__ __OPTS__ -b 2G
-iperf3s	BW host 100${i}3 __THREADS__
+iperf3	BW ns host __GW6__%__IFNAME__ 100${i}3 __THREADS__ __OPTS__ -b 2G
 bw	__BW__ 0.3 0.5
 ns	ip link set dev __IFNAME__ mtu 4000
-iperf3c	ns __GW6__%__IFNAME__ 100${i}3 __THREADS__ __OPTS__ -b 3G
-iperf3s	BW host 100${i}3 __THREADS__
+iperf3	BW ns host __GW6__%__IFNAME__ 100${i}3 __THREADS__ __OPTS__ -b 3G
 bw	__BW__ 0.5 0.8
 ns	ip link set dev __IFNAME__ mtu 16384
-iperf3c	ns __GW6__%__IFNAME__ 100${i}3 __THREADS__ __OPTS__ -b 4G
-iperf3s	BW host 100${i}3 __THREADS__
+iperf3	BW ns host __GW6__%__IFNAME__ 100${i}3 __THREADS__ __OPTS__ -b 4G
 bw	__BW__ 3.0 4.0
 ns	ip link set dev __IFNAME__ mtu 65520
-iperf3c	ns __GW6__%__IFNAME__ 100${i}3 __THREADS__ __OPTS__ -b 6G
-iperf3s	BW host 100${i}3 __THREADS__
+iperf3	BW ns host __GW6__%__IFNAME__ 100${i}3 __THREADS__ __OPTS__ -b 6G
 bw	__BW__ 6.0 7.0
 
 tl	UDP RR latency over IPv6: ns to host
@@ -167,20 +157,16 @@ lat	__LAT__ 200 150
 
 tr	UDP throughput over IPv4: ns to host
 ns	ip link set dev __IFNAME__ mtu 1500
-iperf3c	ns __GW__ 100${i}3 __THREADS__ __OPTS__ -b 2G
-iperf3s	BW host 100${i}3 __THREADS__
+iperf3	BW ns host __GW__ 100${i}3 __THREADS__ __OPTS__ -b 2G
 bw	__BW__ 0.3 0.5
 ns	ip link set dev __IFNAME__ mtu 4000
-iperf3c	ns __GW__ 100${i}3 __THREADS__ __OPTS__ -b 3G
-iperf3s	BW host 100${i}3 __THREADS__
+iperf3	BW ns host __GW__ 100${i}3 __THREADS__ __OPTS__ -b 3G
 bw	__BW__ 0.5 0.8
 ns	ip link set dev __IFNAME__ mtu 16384
-iperf3c	ns __GW__ 100${i}3 __THREADS__ __OPTS__ -b 4G
-iperf3s	BW host 100${i}3 __THREADS__
+iperf3	BW ns host __GW__ 100${i}3 __THREADS__ __OPTS__ -b 4G
 bw	__BW__ 3.0 4.0
 ns	ip link set dev __IFNAME__ mtu 65520
-iperf3c	ns __GW__ 100${i}3 __THREADS__ __OPTS__ -b 6G
-iperf3s	BW host 100${i}3 __THREADS__
+iperf3	BW ns host __GW__ 100${i}3 __THREADS__ __OPTS__ -b 6G
 bw	__BW__ 6.0 7.0
 
 tl	UDP RR latency over IPv4: ns to host