Module Name:    src
Committed By:   ozaki-r
Date:           Thu Sep 18 15:13:27 UTC 2014

Modified Files:
        src/tests/net: Makefile
Added Files:
        src/tests/net/if_bridge: Makefile t_bridge.sh

Log Message:
Add net/if_bridge test


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/tests/net/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/net/if_bridge/Makefile \
    src/tests/net/if_bridge/t_bridge.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/net/Makefile
diff -u src/tests/net/Makefile:1.17 src/tests/net/Makefile:1.18
--- src/tests/net/Makefile:1.17	Mon Jun 30 21:30:51 2014
+++ src/tests/net/Makefile	Thu Sep 18 15:13:27 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2014/06/30 21:30:51 alnsn Exp $
+# $NetBSD: Makefile,v 1.18 2014/09/18 15:13:27 ozaki-r Exp $
 
 .include <bsd.own.mk>
 
@@ -6,7 +6,7 @@ TESTSDIR=	${TESTSBASE}/net
 
 TESTS_SUBDIRS=		fdpass net route sys
 .if (${MKRUMP} != "no")
-TESTS_SUBDIRS+=		bpf bpfilter carp icmp if if_loop mpls npf
+TESTS_SUBDIRS+=		bpf bpfilter carp icmp if if_bridge if_loop mpls npf
 .if (${MKSLJIT} != "no")
 TESTS_SUBDIRS+=		bpfjit
 .endif

Added files:

Index: src/tests/net/if_bridge/Makefile
diff -u /dev/null src/tests/net/if_bridge/Makefile:1.1
--- /dev/null	Thu Sep 18 15:13:27 2014
+++ src/tests/net/if_bridge/Makefile	Thu Sep 18 15:13:27 2014
@@ -0,0 +1,10 @@
+# $NetBSD: Makefile,v 1.1 2014/09/18 15:13:27 ozaki-r Exp $
+#
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/net/if_bridge
+
+TESTS_SH=	t_bridge
+
+.include <bsd.test.mk>
Index: src/tests/net/if_bridge/t_bridge.sh
diff -u /dev/null src/tests/net/if_bridge/t_bridge.sh:1.1
--- /dev/null	Thu Sep 18 15:13:27 2014
+++ src/tests/net/if_bridge/t_bridge.sh	Thu Sep 18 15:13:27 2014
@@ -0,0 +1,312 @@
+#! /usr/bin/atf-sh
+#	$NetBSD: t_bridge.sh,v 1.1 2014/09/18 15:13:27 ozaki-r Exp $
+#
+# Copyright (c) 2014 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+inetserver="rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_bridge -lrumpnet_shmif"
+inet6server="rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_netinet6 -lrumpnet_bridge -lrumpnet_shmif"
+
+SOCK1=unix://commsock1
+SOCK2=unix://commsock2
+SOCK3=unix://commsock3
+IP1=10.0.0.1
+IP2=10.0.0.2
+IP61=fc00::1
+IP62=fc00::2
+
+atf_test_case basic cleanup
+atf_test_case basic6 cleanup
+
+basic_head()
+{
+	atf_set "descr" "Does simple if_bridge tests"
+	atf_set "require.progs" "rump_server"
+}
+
+basic6_head()
+{
+	atf_set "descr" "Does simple if_bridge tests (IPv6)"
+	atf_set "require.progs" "rump_server"
+}
+
+setup_endpoint()
+{
+	sock=${1}
+	addr=${2}
+	bus=${3}
+	mode=${4}
+
+	export RUMP_SERVER=${sock}
+	atf_check -s exit:0 rump.ifconfig shmif0 create
+	atf_check -s exit:0 rump.ifconfig shmif0 linkstr ${bus}
+	if [ $mode = "ipv6" ]; then
+		atf_check -s exit:0 rump.ifconfig shmif0 inet6 ${addr}
+	else
+		atf_check -s exit:0 rump.ifconfig shmif0 inet ${addr} netmask 0xffffff00
+	fi
+
+	atf_check -s exit:0 rump.ifconfig shmif0 up
+	rump.ifconfig shmif0
+}
+
+test_endpoint()
+{
+	sock=${1}
+	addr=${2}
+	bus=${3}
+	mode=${4}
+
+	export RUMP_SERVER=${sock}
+	atf_check -s exit:0 -o match:shmif0 rump.ifconfig
+	if [ $mode = "ipv6" ]; then
+		export LD_PRELOAD=/usr/lib/librumphijack.so
+		atf_check -s exit:0 -o ignore ping6 -n -c 1 ${addr}
+		unset LD_PRELOAD
+	else
+		atf_check -s exit:0 -o ignore rump.ping -n -w 1 -c 1 ${addr}
+	fi
+}
+
+show_endpoint()
+{
+	sock=${1}
+
+	export RUMP_SERVER=${sock}
+	rump.ifconfig -v shmif0
+}
+
+test_setup()
+{
+	test_endpoint $SOCK1 $IP1 bus1 ipv4
+	test_endpoint $SOCK3 $IP2 bus2 ipv4
+
+	export RUMP_SERVER=$SOCK2
+	atf_check -s exit:0 -o match:shmif0 rump.ifconfig
+	atf_check -s exit:0 -o match:shmif1 rump.ifconfig
+}
+
+test_setup6()
+{
+	test_endpoint $SOCK1 $IP61 bus1 ipv6
+	test_endpoint $SOCK3 $IP62 bus2 ipv6
+
+	export RUMP_SERVER=$SOCK2
+	atf_check -s exit:0 -o match:shmif0 rump.ifconfig
+	atf_check -s exit:0 -o match:shmif1 rump.ifconfig
+}
+
+setup_bridge_server()
+{
+	export RUMP_SERVER=$SOCK2
+	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 up
+
+	atf_check -s exit:0 rump.ifconfig shmif1 create
+	atf_check -s exit:0 rump.ifconfig shmif1 linkstr bus2
+	atf_check -s exit:0 rump.ifconfig shmif1 up
+}
+
+setup()
+{
+	atf_check -s exit:0 ${inetserver} $SOCK1
+	atf_check -s exit:0 ${inetserver} $SOCK2
+	atf_check -s exit:0 ${inetserver} $SOCK3
+
+	setup_endpoint $SOCK1 $IP1 bus1 ipv4
+	setup_endpoint $SOCK3 $IP2 bus2 ipv4
+	setup_bridge_server
+}
+
+setup6()
+{
+	atf_check -s exit:0 ${inet6server} $SOCK1
+	atf_check -s exit:0 ${inet6server} $SOCK2
+	atf_check -s exit:0 ${inet6server} $SOCK3
+
+	setup_endpoint $SOCK1 $IP61 bus1 ipv6
+	setup_endpoint $SOCK3 $IP62 bus2 ipv6
+	setup_bridge_server
+}
+
+setup_bridge()
+{
+	export RUMP_SERVER=$SOCK2
+	atf_check -s exit:0 rump.ifconfig bridge0 create
+	atf_check -s exit:0 rump.ifconfig bridge0 up
+
+	export LD_PRELOAD=/usr/lib/librumphijack.so
+	atf_check -s exit:0 /sbin/brconfig bridge0 add shmif0
+	atf_check -s exit:0 /sbin/brconfig bridge0 add shmif1
+	/sbin/brconfig bridge0
+	unset LD_PRELOAD
+	rump.ifconfig shmif0
+	rump.ifconfig shmif1
+}
+
+teardown_bridge()
+{
+	export RUMP_SERVER=$SOCK2
+	export LD_PRELOAD=/usr/lib/librumphijack.so
+	/sbin/brconfig bridge0
+	atf_check -s exit:0 /sbin/brconfig bridge0 delete shmif0
+	atf_check -s exit:0 /sbin/brconfig bridge0 delete shmif1
+	/sbin/brconfig bridge0
+	unset LD_PRELOAD
+	rump.ifconfig shmif0
+	rump.ifconfig shmif1
+}
+
+test_setup_bridge()
+{
+	export RUMP_SERVER=$SOCK2
+	export LD_PRELOAD=/usr/lib/librumphijack.so
+	atf_check -s exit:0 -o match:shmif0 /sbin/brconfig bridge0
+	atf_check -s exit:0 -o match:shmif1 /sbin/brconfig bridge0
+	/sbin/brconfig bridge0
+	unset LD_PRELOAD
+}
+
+cleanup()
+{
+	env RUMP_SERVER=$SOCK1 rump.halt
+	env RUMP_SERVER=$SOCK2 rump.halt
+	env RUMP_SERVER=$SOCK3 rump.halt
+}
+
+dump_bus()
+{
+	/usr/bin/shmif_dumpbus -p - bus1 2>/dev/null| /usr/sbin/tcpdump -n -e -r -
+	/usr/bin/shmif_dumpbus -p - bus2 2>/dev/null| /usr/sbin/tcpdump -n -e -r -
+}
+
+down_up_interfaces()
+{
+	export RUMP_SERVER=$SOCK1
+	rump.ifconfig shmif0 down
+	rump.ifconfig shmif0 up
+	export RUMP_SERVER=$SOCK3
+	rump.ifconfig shmif0 down
+	rump.ifconfig shmif0 up
+}
+
+test_ping_failure()
+{
+	export RUMP_SERVER=$SOCK1
+	atf_check -s not-exit:0 -o ignore rump.ping -q -n -w 1 -c 1 $IP2
+	export RUMP_SERVER=$SOCK3
+	atf_check -s not-exit:0 -o ignore rump.ping -q -n -w 1 -c 1 $IP1
+}
+
+test_ping_success()
+{
+	export RUMP_SERVER=$SOCK1
+	rump.ifconfig -v shmif0
+	atf_check -s exit:0 -o ignore rump.ping -q -n -w 1 -c 1 $IP2
+	rump.ifconfig -v shmif0
+
+	export RUMP_SERVER=$SOCK3
+	rump.ifconfig -v shmif0
+	atf_check -s exit:0 -o ignore rump.ping -q -n -w 1 -c 1 $IP1
+	rump.ifconfig -v shmif0
+}
+
+test_ping6_failure()
+{
+	export LD_PRELOAD=/usr/lib/librumphijack.so
+	export RUMP_SERVER=$SOCK1
+	atf_check -s not-exit:0 -o ignore ping6 -q -n -c 1 $IP62
+	export RUMP_SERVER=$SOCK3
+	atf_check -s not-exit:0 -o ignore ping6 -q -n -c 1 $IP61
+	unset LD_PRELOAD
+}
+
+test_ping6_success()
+{
+	export RUMP_SERVER=$SOCK1
+	rump.ifconfig -v shmif0
+	export LD_PRELOAD=/usr/lib/librumphijack.so
+	atf_check -s exit:0 -o ignore ping6 -q -n -c 1 $IP62
+	unset LD_PRELOAD
+	rump.ifconfig -v shmif0
+
+	export RUMP_SERVER=$SOCK3
+	rump.ifconfig -v shmif0
+	export LD_PRELOAD=/usr/lib/librumphijack.so
+	atf_check -s exit:0 -o ignore ping6 -q -n -c 1 $IP61
+	unset LD_PRELOAD
+	rump.ifconfig -v shmif0
+}
+
+basic_body()
+{
+	setup
+	test_setup
+
+	setup_bridge
+	test_setup_bridge
+
+	test_ping_success
+
+	teardown_bridge
+	test_ping_failure
+}
+
+basic6_body()
+{
+	setup6
+	test_setup6
+
+	# TODO: enable once ping6 implements timeout feature
+	#test_ping6_failure
+
+	setup_bridge
+	test_setup_bridge
+
+	test_ping6_success
+
+	teardown_bridge
+	# TODO: enable once ping6 implements timeout feature
+	#test_ping6_failure
+}
+
+basic_cleanup()
+{
+	dump_bus
+	cleanup
+}
+
+basic6_cleanup()
+{
+	dump_bus
+	cleanup
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case basic
+	atf_add_test_case basic6
+}

Reply via email to