Module Name: src
Committed By: kefren
Date: Fri Jul 19 04:00:40 UTC 2013
Modified Files:
src/distrib/sets/lists/tests: mi
src/etc/mtree: NetBSD.dist.tests
src/tests/net: Makefile
Added Files:
src/tests/net/mpls: Makefile t_mpls_fw.sh
Log Message:
Add a couple of basic IP/MPLS forwarding tests
To generate a diff of this commit:
cvs rdiff -u -r1.539 -r1.540 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.96 -r1.97 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.14 -r1.15 src/tests/net/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/net/mpls/Makefile \
src/tests/net/mpls/t_mpls_fw.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.539 src/distrib/sets/lists/tests/mi:1.540
--- src/distrib/sets/lists/tests/mi:1.539 Wed Jul 3 14:01:29 2013
+++ src/distrib/sets/lists/tests/mi Fri Jul 19 04:00:40 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.539 2013/07/03 14:01:29 nakayama Exp $
+# $NetBSD: mi,v 1.540 2013/07/19 04:00:40 kefren Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2597,6 +2597,10 @@
./usr/tests/net/if_loop/Atffile tests-net-tests atf,rump
./usr/tests/net/if_loop/Kyuafile tests-net-tests atf,rump,kyua
./usr/tests/net/if_loop/t_pr tests-net-tests atf,rump
+./usr/tests/net/mpls tests-net-tests
+./usr/tests/net/mpls/Atffile tests-net-tests atf,rump
+./usr/tests/net/mpls/Kyuafile tests-net-tests atf,rump,kyua
+./usr/tests/net/mpls/t_mpls_fw tests-net-tests atf,rump
./usr/tests/net/net tests-net-tests
./usr/tests/net/net/Atffile tests-net-tests atf
./usr/tests/net/net/Kyuafile tests-net-tests atf,kyua
Index: src/etc/mtree/NetBSD.dist.tests
diff -u src/etc/mtree/NetBSD.dist.tests:1.96 src/etc/mtree/NetBSD.dist.tests:1.97
--- src/etc/mtree/NetBSD.dist.tests:1.96 Thu Mar 21 19:17:51 2013
+++ src/etc/mtree/NetBSD.dist.tests Fri Jul 19 04:00:40 2013
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.tests,v 1.96 2013/03/21 19:17:51 christos Exp $
+# $NetBSD: NetBSD.dist.tests,v 1.97 2013/07/19 04:00:40 kefren Exp $
./usr/libdata/debug/usr/tests
./usr/libdata/debug/usr/tests/atf
@@ -302,6 +302,7 @@
./usr/tests/net/icmp
./usr/tests/net/if
./usr/tests/net/if_loop
+./usr/tests/net/mpls
./usr/tests/net/net
./usr/tests/net/npf
./usr/tests/net/route
Index: src/tests/net/Makefile
diff -u src/tests/net/Makefile:1.14 src/tests/net/Makefile:1.15
--- src/tests/net/Makefile:1.14 Wed Jul 3 14:01:29 2013
+++ src/tests/net/Makefile Fri Jul 19 04:00:40 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2013/07/03 14:01:29 nakayama Exp $
+# $NetBSD: Makefile,v 1.15 2013/07/19 04:00:40 kefren 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 npf
+TESTS_SUBDIRS+= bpf bpfilter carp icmp if if_loop mpls npf
.endif
.include <bsd.test.mk>
Added files:
Index: src/tests/net/mpls/Makefile
diff -u /dev/null src/tests/net/mpls/Makefile:1.1
--- /dev/null Fri Jul 19 04:00:40 2013
+++ src/tests/net/mpls/Makefile Fri Jul 19 04:00:40 2013
@@ -0,0 +1,10 @@
+# $NetBSD: Makefile,v 1.1 2013/07/19 04:00:40 kefren Exp $
+#
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/net/mpls
+
+TESTS_SH= t_mpls_fw
+
+.include <bsd.test.mk>
Index: src/tests/net/mpls/t_mpls_fw.sh
diff -u /dev/null src/tests/net/mpls/t_mpls_fw.sh:1.1
--- /dev/null Fri Jul 19 04:00:40 2013
+++ src/tests/net/mpls/t_mpls_fw.sh Fri Jul 19 04:00:40 2013
@@ -0,0 +1,188 @@
+# $NetBSD: t_mpls_fw.sh,v 1.1 2013/07/19 04:00:40 kefren Exp $
+#
+# Copyright (c) 2013 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.
+#
+
+# TEST MPLS encap/decap and forwarding using INET as encapsulated protocol
+# Setup four routers connected like this: R1---R2---R3---R4--
+# Goal is to be able to ping from R1 the outermost interface of R4
+# Disable net.inet.ip.forwarding, enable net.mpls.forwarding
+# Add route on R1 in order to encapsulate into MPLS the IP packets with
+# destination equal to R4 right hand side interface
+# Add MPLS routes on R2 in order to forward frames belonging to that FEC to R3
+# Add MPLS "POP" route on R3 for that FEC, pointing to R4
+# Do the same for the reverse direction (R4 to R1)
+# ping from R1 to R4 right hand side interface
+
+
+RUMP_SERVER1=unix:///tmp/r1
+RUMP_SERVER2=unix:///tmp/r2
+RUMP_SERVER3=unix:///tmp/r3
+RUMP_SERVER4=unix:///tmp/r4
+
+RUMP_FLAGS=\
+"-lrumpnet -lrumpnet_net -lrumpnet_netmpls -lrumpnet_netinet -lrumpnet_shmif"
+
+atf_test_case mplsfw4 cleanup
+mplsfw4_head()
+{
+
+ atf_set "descr" "IP/MPLS forwarding test using PHP"
+ atf_set "require.progs" "rump_server"
+}
+
+startservers()
+{
+
+ ulimit -r 300
+ atf_check -s exit:0 rump_server ${RUMP_FLAGS} ${RUMP_SERVER1}
+ atf_check -s exit:0 rump_server ${RUMP_FLAGS} ${RUMP_SERVER2}
+ atf_check -s exit:0 rump_server ${RUMP_FLAGS} ${RUMP_SERVER3}
+ atf_check -s exit:0 rump_server ${RUMP_FLAGS} ${RUMP_SERVER4}
+}
+
+configservers()
+{
+
+ # Setup the first server
+ export RUMP_SERVER=${RUMP_SERVER1}
+ atf_check -s exit:0 rump.ifconfig shmif0 create
+ atf_check -s exit:0 rump.ifconfig shmif0 linkstr /tmp/shdom1
+ atf_check -s exit:0 rump.ifconfig shmif0 10.0.1.1/24
+ atf_check -s exit:0 rump.ifconfig mpls0 create up
+ atf_check -s exit:0 rump.sysctl -q -w net.mpls.accept=1
+ atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.forwarding=0
+ atf_check -s exit:0 rump.route -q add 10.0.4.0/24 -ifa 10.0.1.1 \
+ -ifp mpls0 -tag 25 -inet 10.0.1.2
+
+ # Setup the second server
+ export RUMP_SERVER=${RUMP_SERVER2}
+ atf_check -s exit:0 rump.ifconfig shmif0 create
+ atf_check -s exit:0 rump.ifconfig shmif0 linkstr /tmp/shdom1
+ atf_check -s exit:0 rump.ifconfig shmif0 10.0.1.2/24
+ atf_check -s exit:0 rump.ifconfig shmif1 create
+ atf_check -s exit:0 rump.ifconfig shmif1 linkstr /tmp/shdom2
+ atf_check -s exit:0 rump.ifconfig shmif1 10.0.2.1/24
+ atf_check -s exit:0 rump.ifconfig mpls0 create up
+ atf_check -s exit:0 rump.sysctl -q -w net.mpls.accept=1
+ atf_check -s exit:0 rump.sysctl -q -w net.mpls.forwarding=1
+ atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.forwarding=0
+ atf_check -s exit:0 rump.route -q add -mpls 25 -tag 30 -inet 10.0.2.2
+ atf_check -s exit:0 rump.route -q add -mpls 27 -tag ${1} -inet 10.0.1.1
+
+ # Setup the third server
+ export RUMP_SERVER=${RUMP_SERVER3}
+ atf_check -s exit:0 rump.ifconfig shmif0 create
+ atf_check -s exit:0 rump.ifconfig shmif0 linkstr /tmp/shdom2
+ atf_check -s exit:0 rump.ifconfig shmif0 10.0.2.2/24
+ atf_check -s exit:0 rump.ifconfig shmif1 create
+ atf_check -s exit:0 rump.ifconfig shmif1 linkstr /tmp/shdom3
+ atf_check -s exit:0 rump.ifconfig shmif1 10.0.3.1/24
+ atf_check -s exit:0 rump.ifconfig mpls0 create up
+ atf_check -s exit:0 rump.sysctl -q -w net.mpls.accept=1
+ atf_check -s exit:0 rump.sysctl -q -w net.mpls.forwarding=1
+ atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.forwarding=0
+ atf_check -s exit:0 rump.route -q add -mpls 30 -tag ${1} -inet 10.0.3.2
+ atf_check -s exit:0 rump.route -q add -mpls 26 -tag 27 -inet 10.0.2.1
+
+ # Setup the fourth server
+ export RUMP_SERVER=${RUMP_SERVER4}
+ atf_check -s exit:0 rump.ifconfig shmif0 create
+ atf_check -s exit:0 rump.ifconfig shmif0 linkstr /tmp/shdom3
+ atf_check -s exit:0 rump.ifconfig shmif0 10.0.3.2/24
+ atf_check -s exit:0 rump.ifconfig shmif1 create
+ atf_check -s exit:0 rump.ifconfig shmif1 linkstr /tmp/shdom4
+ atf_check -s exit:0 rump.ifconfig shmif1 10.0.4.1/24
+ atf_check -s exit:0 rump.ifconfig mpls0 create up
+ atf_check -s exit:0 rump.sysctl -q -w net.mpls.accept=1
+ atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.forwarding=0
+ atf_check -s exit:0 rump.route -q add 10.0.1.0/24 -ifa 10.0.3.2 \
+ -ifp mpls0 -tag 26 -inet 10.0.3.1
+
+ unset RUMP_SERVER
+}
+
+doping()
+{
+
+ export RUMP_SERVER=${RUMP_SERVER1}
+ atf_check -s exit:0 -o match:"64 bytes from 10.0.4.1: icmp_seq=" \
+ rump.ping -n -w 5 10.0.4.1
+ unset RUMP_SERVER
+}
+
+docleanup()
+{
+
+ RUMP_SERVER=${RUMP_SERVER1} rump.halt
+ RUMP_SERVER=${RUMP_SERVER2} rump.halt
+ RUMP_SERVER=${RUMP_SERVER3} rump.halt
+ RUMP_SERVER=${RUMP_SERVER4} rump.halt
+}
+
+mplsfw4_body()
+{
+
+ startservers
+ configservers 3
+ doping
+}
+
+mplsfw4_cleanup()
+{
+
+ docleanup
+}
+
+
+atf_test_case mplsfw4_expl cleanup
+mplsfw4_expl_head()
+{
+
+ atf_set "descr" "IP/MPLS forwarding test using explicit NULL labels"
+ atf_set "require.progs" "rump_server"
+}
+
+mplsfw4_expl_body()
+{
+
+ startservers
+ configservers 0
+ doping
+}
+
+mplsfw4_expl_cleanup()
+{
+
+ docleanup
+}
+
+
+atf_init_test_cases()
+{
+
+ atf_add_test_case mplsfw4
+ atf_add_test_case mplsfw4_expl
+}
