aboutgitcodebugslistschat
path: root/test/lib/setup
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2022-09-26 20:43:39 +1000
committerStefano Brivio <sbrivio@redhat.com>2022-09-29 12:21:13 +0200
commit0a15b467d4d15eddef0d290aa5b251e30c8b467a (patch)
tree61b8f5796a32f33194f622a4048e69724d03e3c6 /test/lib/setup
parent5b899dce7a9dd77d0e20f3d4f46a743dd5657169 (diff)
downloadpasst-0a15b467d4d15eddef0d290aa5b251e30c8b467a.tar
passt-0a15b467d4d15eddef0d290aa5b251e30c8b467a.tar.gz
passt-0a15b467d4d15eddef0d290aa5b251e30c8b467a.tar.bz2
passt-0a15b467d4d15eddef0d290aa5b251e30c8b467a.tar.lz
passt-0a15b467d4d15eddef0d290aa5b251e30c8b467a.tar.xz
passt-0a15b467d4d15eddef0d290aa5b251e30c8b467a.tar.zst
passt-0a15b467d4d15eddef0d290aa5b251e30c8b467a.zip
test: Use --config-net for namespace setup
The setup functions for passt_in_ns and two_guests perform some fairly slow dhclient calls to configure the network in the namespace before starting the guest. This isn't really part of the tests, just necessary for the operations later. We can simplify and speed this up a bit by using pasta's '--config-net' option to configure the networking for us. As a bonus this means we have at least a minimal test of the --config-net option itself. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Diffstat (limited to 'test/lib/setup')
-rwxr-xr-xtest/lib/setup17
1 files changed, 3 insertions, 14 deletions
diff --git a/test/lib/setup b/test/lib/setup
index 774c586..071e11d 100755
--- a/test/lib/setup
+++ b/test/lib/setup
@@ -132,7 +132,7 @@ setup_passt_in_ns() {
[ ${DEBUG} -eq 1 ] && __opts="${__opts} -d"
[ ${TRACE} -eq 1 ] && __opts="${__opts} --trace"
- context_run_bg pasta "./pasta ${__opts} -t 10001,10002,10011,10012 -T 10003,10013 -u 10001,10002,10011,10012 -U 10003,10013 -P ${STATESETUP}/pasta.pid ${NSHOLDER} ${STATESETUP}/ns.hold hold"
+ context_run_bg pasta "./pasta ${__opts} -t 10001,10002,10011,10012 -T 10003,10013 -u 10001,10002,10011,10012 -U 10003,10013 -P ${STATESETUP}/pasta.pid --config-net ${NSHOLDER} ${STATESETUP}/ns.hold hold"
wait_for [ -f "${STATESETUP}/pasta.pid" ]
__ns_pid=$(${NSHOLDER} ${STATESETUP}/ns.hold pid)
@@ -140,11 +140,6 @@ setup_passt_in_ns() {
context_setup_nsenter ns "-t ${__ns_pid} -U -n -p --preserve-credentials"
context_setup_nsenter passt "-t ${__ns_pid} -U -n -p --preserve-credentials"
- __ifname=$(context_run ns "ip -j link show | jq -rM '.[] | select(.link_type == \"ether\").ifname'")
- context_run ns "/sbin/dhclient -4 --no-pid ${__ifname}"
- sleep 2
- context_run ns "/sbin/dhclient -6 --no-pid ${__ifname}"
-
__opts=
[ ${PCAP} -eq 1 ] && __opts="${__opts} -p ${LOGDIR}/passt_in_pasta.pcap"
[ ${DEBUG} -eq 1 ] && __opts="${__opts} -d"
@@ -201,7 +196,7 @@ setup_two_guests() {
[ ${PCAP} -eq 1 ] && __opts="${__opts} -p ${LOGDIR}/pasta_1.pcap"
[ ${DEBUG} -eq 1 ] && __opts="${__opts} -d"
[ ${TRACE} -eq 1 ] && __opts="${__opts} --trace"
- context_run_bg pasta_1 "./pasta ${__opts} -P ${STATESETUP}/pasta_1.pid -t 10001,10002 -T 10003,10004 -u 10001,10002 -U 10003,10004 ${NSHOLDER} ${STATESETUP}/ns1.hold hold"
+ context_run_bg pasta_1 "./pasta ${__opts} -P ${STATESETUP}/pasta_1.pid -t 10001,10002 -T 10003,10004 -u 10001,10002 -U 10003,10004 --config-net ${NSHOLDER} ${STATESETUP}/ns1.hold hold"
__ns1_pid=$(${NSHOLDER} ${STATESETUP}/ns1.hold pid)
context_setup_nsenter passt_1 -U -n -p --preserve-credentials -t ${__ns1_pid}
@@ -209,7 +204,7 @@ setup_two_guests() {
[ ${PCAP} -eq 1 ] && __opts="${__opts} -p ${LOGDIR}/pasta_2.pcap"
[ ${DEBUG} -eq 1 ] && __opts="${__opts} -d"
[ ${TRACE} -eq 1 ] && __opts="${__opts} --trace"
- context_run_bg pasta_2 "./pasta ${__opts} -P ${STATESETUP}/pasta_2.pid -t 10004,10005 -T 10003,10001 -u 10004,10005 -U 10003,10001 ${NSHOLDER} ${STATESETUP}/ns2.hold hold"
+ context_run_bg pasta_2 "./pasta ${__opts} -P ${STATESETUP}/pasta_2.pid -t 10004,10005 -T 10003,10001 -u 10004,10005 -U 10003,10001 --config-net ${NSHOLDER} ${STATESETUP}/ns2.hold hold"
__ns2_pid=$(${NSHOLDER} ${STATESETUP}/ns2.hold pid)
context_setup_nsenter passt_2 -U -n -p --preserve-credentials -t ${__ns2_pid}
@@ -218,12 +213,6 @@ setup_two_guests() {
__ifname="$(context_run qemu_1 "ip -j link show | jq -rM '.[] | select(.link_type == \"ether\").ifname'")"
- context_run qemu_1 "/sbin/dhclient -4 --no-pid ${__ifname}"
- context_run qemu_2 "/sbin/dhclient -4 --no-pid ${__ifname}"
- sleep 2
- context_run qemu_1 "/sbin/dhclient -6 --no-pid ${__ifname}"
- context_run qemu_2 "/sbin/dhclient -6 --no-pid ${__ifname}"
-
__opts=
[ ${PCAP} -eq 1 ] && __opts="${__opts} -p ${LOGDIR}/passt_1.pcap"
[ ${DEBUG} -eq 1 ] && __opts="${__opts} -d"