---
test/lib/setup | 8 +++++---
test/migrate/bidirectional | 15 ++++++++++++++-
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/test/lib/setup b/test/lib/setup
index 97b4487a..933b81e3 100755
--- a/test/lib/setup
+++ b/test/lib/setup
@@ -308,7 +308,6 @@ setup_two_guests() {
# setup_migrate() - Set up two namespace, run qemu, passt/passt-repair in both
setup_migrate() {
context_setup_host host
- context_setup_host mon
context_setup_host pasta_1
context_setup_host pasta_2
@@ -330,8 +329,11 @@ setup_migrate() {
# Option 1: send stuff via spliced path in pasta
# context_run_bg pasta_1 "./pasta ${__opts} --trace -l /tmp/pasta1.log -P
${STATESETUP}/pasta_1.pid -t 10001,10002 -T 10003 -u 10001,10002 -U 10003 --config-net
${NSTOOL} hold ${STATESETUP}/ns1.hold"
# Option 2: send stuff via tap (--map-guest-addr) instead (useful to see capture of full
migration)
- context_run_bg pasta_1 "./pasta ${__opts} --trace -l /tmp/pasta1.log -P
${STATESETUP}/pasta_1.pid -t 10001,10002,10004 -T 10003 -u 10001,10002,10004 -U 10003
--map-guest-addr 169.254.1.1 --config-net ${NSTOOL} hold ${STATESETUP}/ns1.hold"
- context_setup_nstool passt_1 ${STATESETUP}/ns1.hold
+ context_run_bg pasta_1 "strace -o ${LOGDIR}/pasta_1.strace ./pasta ${__opts}
--trace -l /tmp/pasta1.log -P ${STATESETUP}/pasta_1.pid -t 10001,10002,10004 -T 10003 -u
10001,10002,10004 -U 10003 --map-guest-addr 169.254.1.1 --config-net ${NSTOOL} hold
${STATESETUP}/ns1.hold"
+
+ context_setup_nstool mon ${STATESETUP}/ns1.hold
+
+ context_setup_nstool passt_1 ${STATESETUP}/ns1.hold
context_setup_nstool passt_repair_1 ${STATESETUP}/ns1.hold
context_setup_nstool passt_2 ${STATESETUP}/ns1.hold
diff --git a/test/migrate/bidirectional b/test/migrate/bidirectional
index cd686e0c..47af2dcd 100644
--- a/test/migrate/bidirectional
+++ b/test/migrate/bidirectional
@@ -14,6 +14,9 @@
g1tools ip jq dhclient socat cat
htools ip jq
+mon echo "Before everything"
+mon ss --tcp -a -n
+
test Interface name
g1out IFNAME1 ip -j link show | jq -rM '.[] | select(.link_type ==
"ether").ifname'
hout HOST_IFNAME ip -j -4 route show|jq -rM '[.[] | select(.dst ==
"default").dev] | .[0]'
@@ -34,6 +37,9 @@ hostb socat -u TCP4-LISTEN:10006 OPEN:msg,create,trunc
guest1b socat -u TCP4-LISTEN:10001 OPEN:msg,create,trunc
sleep 1
+mon echo "Servers active"
+mon ss --tcp -a -n
+
guest1b socat -u UNIX-RECV:proxy.sock,null-eof TCP4:169.254.1.1:10006
hostb socat -u UNIX-RECV:__STATESETUP__/proxy.sock,null-eof TCP4:__ADDR1__:10001
sleep 1
@@ -41,9 +47,16 @@ guest1 printf "Hello from guest 1" | socat -u STDIN
UNIX:proxy.sock
host printf "Dear guest 1," | socat -u STDIN UNIX:__STATESETUP__/proxy.sock
sleep 1
+mon echo "pre-migrate"
+mon ss --tcp -a -n
+
mon echo "migrate tcp:0:20005" | socat -u STDIN
UNIX:__STATESETUP__/qemu_1_mon.sock
-sleep 1
+sleep 5
+
+mon echo "post-migrate"
+mon ss --tcp -a -n
+
guest2 printf " and from guest 2" | socat -u STDIN UNIX:proxy.sock,shut-null
host printf " you are now guest 2" | socat -u STDIN
UNIX:__STATESETUP__/proxy.sock,shut-null
--
2.48.1