Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/tests/net Share rump_server start/stop and interface creatio...
details: https://anonhg.NetBSD.org/src/rev/a75aa097ad42
branches: trunk
changeset: 349136:a75aa097ad42
user: ozaki-r <ozaki-r%NetBSD.org@localhost>
date: Fri Nov 25 08:51:16 2016 +0000
description:
Share rump_server start/stop and interface creation/destruction functions
The common functions store socks of rump_servers, interfaces of rump_servers
and buses that intefaces connect and allow to destroy them with common
functions without specifying which socks, interfaces and buses we should
destroy.
This change reduces lots of similar setup/cleanup codes.
diffstat:
tests/net/arp/t_arp.sh | 92 +++++++-------------
tests/net/arp/t_dad.sh | 58 ++----------
tests/net/icmp/t_icmp6_redirect.sh | 37 +++-----
tests/net/icmp/t_icmp_redirect.sh | 47 ++--------
tests/net/if_bridge/t_bridge.sh | 72 +++++++--------
tests/net/if_gif/t_gif.sh | 32 ++-----
tests/net/if_tap/Makefile | 7 +-
tests/net/if_tap/t_tap.sh | 47 +++++-----
tests/net/mcast/Makefile | 7 +-
tests/net/mcast/t_mcast.sh | 16 +--
tests/net/ndp/t_dad.sh | 75 ++++------------
tests/net/ndp/t_ndp.sh | 76 +++++------------
tests/net/ndp/t_ra.sh | 29 ++---
tests/net/net/t_forwarding.sh | 65 ++++----------
tests/net/net/t_ipaddress.sh | 38 ++++----
tests/net/net/t_ipv6_lifetime.sh | 25 +----
tests/net/net/t_mtudisc.sh | 50 +---------
tests/net/net/t_mtudisc6.sh | 42 +-------
tests/net/net/t_ping6_opts.sh | 63 ++++---------
tests/net/net_common.sh | 161 ++++++++++++++++++++++++++++++++++++-
tests/net/route/t_flags.sh | 41 ++-------
tests/net/route/t_flags6.sh | 25 +----
tests/net/route/t_route.sh | 73 +++++-----------
23 files changed, 485 insertions(+), 693 deletions(-)
diffs (truncated from 2658 to 300 lines):
diff -r 57d3c2dd691c -r a75aa097ad42 tests/net/arp/t_arp.sh
--- a/tests/net/arp/t_arp.sh Fri Nov 25 08:10:50 2016 +0000
+++ b/tests/net/arp/t_arp.sh Fri Nov 25 08:51:16 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: t_arp.sh,v 1.21 2016/11/24 09:07:09 ozaki-r Exp $
+# $NetBSD: t_arp.sh,v 1.22 2016/11/25 08:51:16 ozaki-r Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -25,9 +25,6 @@
# POSSIBILITY OF SUCH DAMAGE.
#
-inetlib="-lrumpnet_shmif -lrumpnet_tap -lrumpnet -lrumpnet_net -lrumpnet_netinet"
-inetserver="rump_server $inetlib -lrumpdev"
-
SOCKSRC=unix://commsock1
SOCKDST=unix://commsock2
IP4SRC=10.0.1.1
@@ -105,9 +102,9 @@
setup_dst_server()
{
+
+ rump_server_add_iface $SOCKDST shmif0 bus1
export RUMP_SERVER=$SOCKDST
- atf_check -s exit:0 rump.ifconfig shmif0 create
- atf_check -s exit:0 rump.ifconfig shmif0 linkstr bus1
atf_check -s exit:0 rump.ifconfig shmif0 inet $IP4DST/24
atf_check -s exit:0 rump.ifconfig shmif0 up
atf_check -s exit:0 rump.ifconfig -w 10
@@ -126,8 +123,7 @@
atf_check -s exit:0 -o ignore rump.sysctl -w net.inet.arp.keep=$keep
# Setup an interface
- atf_check -s exit:0 rump.ifconfig shmif0 create
- atf_check -s exit:0 rump.ifconfig shmif0 linkstr bus1
+ rump_server_add_iface $SOCKSRC shmif0 bus1
atf_check -s exit:0 rump.ifconfig shmif0 inet $IP4SRC/24
atf_check -s exit:0 rump.ifconfig shmif0 up
atf_check -s exit:0 rump.ifconfig -w 10
@@ -144,8 +140,8 @@
local arp_keep=$1
local bonus=2
- atf_check -s exit:0 ${inetserver} $SOCKSRC
- atf_check -s exit:0 ${inetserver} $SOCKDST
+ rump_server_start $SOCKSRC
+ rump_server_start $SOCKDST
setup_dst_server
setup_src_server $arp_keep
@@ -171,12 +167,16 @@
arp_cache_expiration_5s_body()
{
+
test_cache_expiration 5
+ rump_server_destroy_ifaces
}
arp_cache_expiration_10s_body()
{
+
test_cache_expiration 10
+ rump_server_destroy_ifaces
}
arp_command_body()
@@ -184,8 +184,8 @@
local arp_keep=5
local bonus=2
- atf_check -s exit:0 ${inetserver} $SOCKSRC
- atf_check -s exit:0 ${inetserver} $SOCKDST
+ rump_server_start $SOCKSRC
+ rump_server_start $SOCKDST
setup_dst_server
setup_src_server $arp_keep
@@ -256,7 +256,7 @@
$DEBUG && rump.arp -n -a
#atf_check -s not-exit:0 -e ignore rump.arp -n 10.0.1.10
- return 0
+ rump_server_destroy_ifaces
}
make_pkt_str_arpreq()
@@ -272,12 +272,12 @@
{
local pkt=
- atf_check -s exit:0 ${inetserver} $SOCKSRC
+ rump_server_start $SOCKSRC
+
export RUMP_SERVER=$SOCKSRC
# Setup an interface
- atf_check -s exit:0 rump.ifconfig shmif0 create
- atf_check -s exit:0 rump.ifconfig shmif0 linkstr bus1
+ rump_server_add_iface $SOCKSRC shmif0 bus1
atf_check -s exit:0 rump.ifconfig shmif0 inet 10.0.0.1/24
atf_check -s exit:0 rump.ifconfig shmif0 inet 10.0.0.2/24 alias
atf_check -s exit:0 rump.ifconfig shmif0 up
@@ -303,6 +303,8 @@
atf_check -s not-exit:0 -x "cat ./out |grep -q '$pkt'"
pkt=$(make_pkt_str_arpreq 10.0.0.4 10.0.0.4)
atf_check -s not-exit:0 -x "cat ./out |grep -q '$pkt'"
+
+ rump_server_destroy_ifaces
}
arp_cache_overwriting_body()
@@ -310,8 +312,8 @@
local arp_keep=5
local bonus=2
- atf_check -s exit:0 ${inetserver} $SOCKSRC
- atf_check -s exit:0 ${inetserver} $SOCKDST
+ rump_server_start $SOCKSRC
+ rump_server_start $SOCKDST
setup_dst_server
setup_src_server $arp_keep
@@ -340,7 +342,7 @@
atf_check -s exit:0 -o match:'b2:a0:20:00:00:ff' rump.arp -n 10.0.1.10
$DEBUG && rump.arp -n -a
- return 0
+ rump_server_destroy_ifaces
}
make_pkt_str_arprep()
@@ -368,8 +370,8 @@
local opts= title= flags=
local type=$1
- atf_check -s exit:0 ${inetserver} $SOCKSRC
- atf_check -s exit:0 ${inetserver} $SOCKDST
+ rump_server_start $SOCKSRC
+ rump_server_start $SOCKDST tap
setup_dst_server
setup_src_server $arp_keep
@@ -466,12 +468,14 @@
{
test_proxy_arp pub
+ rump_server_destroy_ifaces
}
arp_proxy_arp_pubproxy_body()
{
test_proxy_arp pubproxy
+ rump_server_destroy_ifaces
}
arp_link_activation_body()
@@ -479,8 +483,8 @@
local arp_keep=5
local bonus=2
- atf_check -s exit:0 ${inetserver} $SOCKSRC
- atf_check -s exit:0 ${inetserver} $SOCKDST
+ rump_server_start $SOCKSRC
+ rump_server_start $SOCKDST
setup_dst_server
setup_src_server $arp_keep
@@ -510,6 +514,8 @@
pkt=$(make_pkt_str_arpreq $IP4SRC $IP4SRC)
atf_check -s exit:0 -x \
"cat ./out |grep '$pkt' |grep -q 'b2:a1:00:00:00:02'"
+
+ rump_server_destroy_ifaces
}
arp_static_body()
@@ -517,8 +523,8 @@
local arp_keep=5
local macaddr_src=
- atf_check -s exit:0 ${inetserver} $SOCKSRC
- atf_check -s exit:0 ${inetserver} $SOCKDST
+ rump_server_start $SOCKSRC
+ rump_server_start $SOCKDST
setup_dst_server
setup_src_server $arp_keep
@@ -534,37 +540,8 @@
# Test receiving an ARP request with the static ARP entry (as spa/sha)
export RUMP_SERVER=$SOCKSRC
atf_check -s exit:0 -o ignore rump.ping -n -w 1 -c 1 $IP4DST
-}
-cleanup()
-{
- env RUMP_SERVER=$SOCKSRC rump.halt
- env RUMP_SERVER=$SOCKDST rump.halt
-}
-
-dump_src()
-{
- export RUMP_SERVER=$SOCKSRC
- rump.netstat -nr
- rump.arp -n -a
- rump.ifconfig
- $HIJACKING dmesg
-}
-
-dump_dst()
-{
- export RUMP_SERVER=$SOCKDST
- rump.netstat -nr
- rump.arp -n -a
- rump.ifconfig
- $HIJACKING dmesg
-}
-
-dump()
-{
- dump_src
- dump_dst
- shmif_dumpbus -p - bus1 2>/dev/null| tcpdump -n -e -r -
+ rump_server_destroy_ifaces
}
arp_cache_expiration_5s_cleanup()
@@ -587,9 +564,8 @@
arp_garp_cleanup()
{
- $DEBUG && dump_src
- $DEBUG && shmif_dumpbus -p - bus1 2>/dev/null| tcpdump -n -e -r -
- env RUMP_SERVER=$SOCKSRC rump.halt
+ $DEBUG && dump
+ cleanup
}
arp_cache_overwriting_cleanup()
diff -r 57d3c2dd691c -r a75aa097ad42 tests/net/arp/t_dad.sh
--- a/tests/net/arp/t_dad.sh Fri Nov 25 08:10:50 2016 +0000
+++ b/tests/net/arp/t_dad.sh Fri Nov 25 08:51:16 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: t_dad.sh,v 1.12 2016/11/24 11:34:51 ozaki-r Exp $
+# $NetBSD: t_dad.sh,v 1.13 2016/11/25 08:51:16 ozaki-r Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -25,9 +25,6 @@
# POSSIBILITY OF SUCH DAMAGE.
#
-inetserver="rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_shmif"
-inetserver="${inetserver} -lrumpdev"
-
SOCKLOCAL=unix://commsock1
SOCKPEER=unix://commsock2
@@ -53,10 +50,9 @@
local sock=$1
local ip=$2
- export RUMP_SERVER=$sock
+ rump_server_add_iface $sock shmif0 bus1
- atf_check -s exit:0 rump.ifconfig shmif0 create
- atf_check -s exit:0 rump.ifconfig shmif0 linkstr bus1
+ export RUMP_SERVER=$sock
atf_check -s exit:0 rump.ifconfig shmif0 inet $ip/24
atf_check -s exit:0 rump.ifconfig shmif0 up
atf_check -s exit:0 rump.ifconfig -w 10
@@ -77,11 +73,11 @@
{
local pkt=
- atf_check -s exit:0 ${inetserver} $SOCKLOCAL
+ rump_server_start $SOCKLOCAL
+ rump_server_add_iface $SOCKLOCAL shmif0 bus1
+
export RUMP_SERVER=$SOCKLOCAL
- atf_check -s exit:0 rump.ifconfig shmif0 create
- atf_check -s exit:0 rump.ifconfig shmif0 linkstr bus1
atf_check -s exit:0 rump.ifconfig shmif0 inet 10.0.0.1/24
atf_check -s exit:0 rump.ifconfig shmif0 inet 10.0.0.2/24 alias
$DEBUG && rump.ifconfig shmif0
@@ -148,6 +144,8 @@
atf_check -s exit:0 -x "cat ./out |grep -q '$pkt'"
# The new address left tentative
atf_check -s not-exit:0 -x "rump.ifconfig shmif0 |grep 10.0.0.3 |grep -iq tentative"
+
+ rump_server_destroy_ifaces
}
dad_duplicated_body()
@@ -156,8 +154,8 @@
local localip2=10.0.1.11
Home |
Main Index |
Thread Index |
Old Index