Rewrite tests for CARP in a shell script instead of C

The new shell script enables us to modify/add tests easily.
This commit is contained in:
ozaki-r 2017-01-16 08:18:11 +00:00
parent 28f4c24cc2
commit cc5766bfdd
4 changed files with 172 additions and 228 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: mi,v 1.191 2017/01/07 20:40:08 christos Exp $
# $NetBSD: mi,v 1.192 2017/01/16 08:18:11 ozaki-r Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib comp-sys-usr compatdir
./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile
@ -2237,7 +2237,7 @@
./usr/libdata/debug/usr/tests/net/bpfjit/t_cop.debug tests-net-debug debug,atf,sljit,rump
./usr/libdata/debug/usr/tests/net/bpfjit/t_extmem.debug tests-net-debug debug,atf,sljit,rump
./usr/libdata/debug/usr/tests/net/bpfjit/t_mbuf.debug tests-net-debug debug,atf,sljit,rump
./usr/libdata/debug/usr/tests/net/carp/t_basic.debug tests-net-debug debug,atf,rump
./usr/libdata/debug/usr/tests/net/carp/t_basic.debug tests-net-debug debug,atf,rump,obsolete
./usr/libdata/debug/usr/tests/net/fdpass/fdpass32.debug tests-net-debug debug,atf,compattestfile
./usr/libdata/debug/usr/tests/net/fdpass/fdpass64.debug tests-net-debug debug,atf,compattestfile
./usr/libdata/debug/usr/tests/net/icmp/t_forward.debug tests-net-debug debug,atf,rump

View File

@ -1,13 +1,13 @@
# $NetBSD: Makefile,v 1.5 2016/08/08 14:40:19 pgoyette Exp $
# $NetBSD: Makefile,v 1.6 2017/01/16 08:18:11 ozaki-r Exp $
#
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/net/carp
TESTS_C= t_basic
LDADD+= -lrumpnet_shmif -lrumpnet_netinet -lrumpnet_net -lrumpdev
LDADD+= -lrumpnet -lrump -lrumpuser -lrumpvfs -lpthread
.for name in basic
TESTS_SH+= t_${name}
TESTS_SH_SRC_t_${name}= ../net_common.sh t_${name}.sh
.endfor
.include <bsd.test.mk>

View File

@ -1,221 +0,0 @@
/* $NetBSD: t_basic.c,v 1.6 2017/01/13 21:30:42 christos Exp $ */
/*-
* Copyright (c) 2010 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.
*/
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: t_basic.c,v 1.6 2017/01/13 21:30:42 christos Exp $");
#endif /* not lint */
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/wait.h>
#include <netinet/in.h>
#include <netinet/in_systm.h>
#include <netinet/ip_carp.h>
#include <rump/rump.h>
#include <rump/rump_syscalls.h>
#include <atf-c.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <signal.h>
#include "../config/netconfig.c"
#include "h_macros.h"
static bool oknow = false;
static void
sighnd(int sig)
{
ATF_REQUIRE_EQ(sig, SIGCHLD);
if (oknow)
return;
atf_tc_fail("child died unexpectedly");
}
ATF_TC(handover);
ATF_TC_HEAD(handover, tc)
{
atf_tc_set_md_var(tc, "descr", "check that carp handover works if "
"the master dies");
}
#define THEBUS "buuuuuuus,etherbus"
static void
child(bool master)
{
char ifname[IFNAMSIZ];
struct carpreq cr;
struct ifreq ifr;
const char *carpif;
int s;
/* helps reading carp debug output */
if (master)
carpif = "carp0";
else
carpif = "carp1";
/*
* Should use sysctl, bug debug is dabug.
*/
{
//extern int rumpns_carp_opts[]; /* XXX */
//rumpns_carp_opts[CARPCTL_LOG] = 1;
}
rump_init();
memset(&ifr, 0, sizeof(ifr));
strlcpy(ifr.ifr_name, carpif, sizeof(ifr.ifr_name));
RL(s = rump_sys_socket(PF_INET, SOCK_DGRAM, 0));
RL(rump_sys_ioctl(s, SIOCIFCREATE, &ifr));
netcfg_rump_makeshmif(THEBUS, ifname);
if (master)
netcfg_rump_if(ifname, "10.1.1.1", "255.255.255.0");
else
netcfg_rump_if(ifname, "10.1.1.2", "255.255.255.0");
/* configure the carp interface */
ifr.ifr_data = &cr;
RL(rump_sys_ioctl(s, SIOCGVH, &ifr));
strlcpy(cr.carpr_carpdev, ifname, sizeof(cr.carpr_carpdev));
cr.carpr_vhid = 175;
if (master)
cr.carpr_advskew = 0;
else
cr.carpr_advskew = 200;
cr.carpr_advbase = 1;
strcpy((char *)cr.carpr_key, "s3cret");
RL(rump_sys_ioctl(s, SIOCSVH, &ifr));
netcfg_rump_if(carpif, "10.1.1.100", "255.255.255.0");
/* tassa pause()en enka muuta voi */
pause();
}
ATF_TC_BODY(handover, tc)
{
char ifname[IFNAMSIZ];
pid_t mpid, cpid;
int i, status;
signal(SIGCHLD, sighnd);
/* fork master */
switch (mpid = fork()) {
case -1:
atf_tc_fail_errno("fork failed");
/*NOTREACHED*/
case 0:
child(true);
/*NOTREACHED*/
default:
break;
}
usleep(500000);
/* fork backup */
switch (cpid = fork()) {
case -1:
kill(mpid, SIGKILL);
atf_tc_fail_errno("fork failed");
/*NOTREACHED*/
case 0:
child(false);
/*NOTREACHED*/
default:
break;
}
usleep(500000);
rump_init();
netcfg_rump_makeshmif(THEBUS, ifname);
netcfg_rump_if(ifname, "10.1.1.240", "255.255.255.0");
/* check that the primary addresses are up */
ATF_REQUIRE_EQ(netcfg_rump_pingtest("10.1.1.1", 1000), true);
ATF_REQUIRE_EQ(netcfg_rump_pingtest("10.1.1.2", 1000), true);
/* give carp a while to croak */
sleep(4);
/* check that the shared IP works */
ATF_REQUIRE_EQ(netcfg_rump_pingtest("10.1.1.100", 500), true);
/* KILLING SPREE */
oknow = true;
kill(mpid, SIGKILL);
wait(&status);
usleep(10000); /* just in case */
oknow = false;
/* check that primary is now dead */
ATF_REQUIRE_EQ(netcfg_rump_pingtest("10.1.1.1", 100), false);
/* do it in installments. carp will cluck meanwhile */
for (i = 0; i < 5; i++) {
if (netcfg_rump_pingtest("10.1.1.100", 1000) == true)
break;
}
if (i == 5)
atf_tc_fail("failed to failover");
/* to kill the child */
oknow = true;
kill(cpid, SIGKILL);
/* clean & done */
}
ATF_TP_ADD_TCS(tp)
{
ATF_TP_ADD_TC(tp, handover);
return atf_no_error();
}

165
tests/net/carp/t_basic.sh Normal file
View File

@ -0,0 +1,165 @@
# $NetBSD: t_basic.sh,v 1.1 2017/01/16 08:18:11 ozaki-r Exp $
#
# Copyright (c) 2017 Internet Initiative Japan 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.
#
SOCK_CLIENT=unix://carp_client
SOCK_MASTER=unix://carp_master
SOCK_BACKUP=unix://carp_backup
BUS=bus_carp
IP_CLIENT=10.1.1.240
IP_MASTER=10.1.1.1
IP_BACKUP=10.1.1.2
IP_CARP=10.1.1.100
TIMEOUT=3
atf_test_case carp_handover cleanup
carp_handover_head()
{
atf_set "descr" "Tests for CARP handover"
atf_set "require.progs" "rump_server"
}
setup_carp()
{
local sock=$1
local master=$2
local carpif= ip= advskew=
if $master; then
carpif=carp0
ip=$IP_MASTER
advskew=0
else
carpif=carp1
ip=$IP_BACKUP
advskew=200
fi
export RUMP_SERVER=$sock
atf_check -s exit:0 rump.ifconfig $carpif create
atf_check -s exit:0 rump.ifconfig shmif0 $ip/24 up
atf_check -s exit:0 rump.ifconfig $carpif \
vhid 175 advskew $advskew advbase 1 pass s3cret \
$IP_CARP netmask 255.255.255.0
atf_check -s exit:0 rump.ifconfig -w 10
}
wait_handover()
{
local i=0
export RUMP_SERVER=$SOCK_CLIENT
while [ $i -ne 5 ]; do
$DEBUG && echo "Trying ping $IP_CARP"
rump.ping -n -w 1 -c 1 $IP_CARP >/dev/null
if [ $? = 0 ]; then
$DEBUG && echo "Passed ping $IP_CARP"
break;
fi
$DEBUG && echo "Failed ping $IP_CARP"
i=$((i + 1))
done
if [ $i -eq 5 ]; then
atf_fail "Failed to failover (5 sec)"
fi
}
carp_handover_body()
{
rump_server_start $SOCK_CLIENT
rump_server_start $SOCK_MASTER
rump_server_start $SOCK_BACKUP
rump_server_add_iface $SOCK_CLIENT shmif0 $BUS
rump_server_add_iface $SOCK_MASTER shmif0 $BUS
rump_server_add_iface $SOCK_BACKUP shmif0 $BUS
setup_carp $SOCK_MASTER true
setup_carp $SOCK_BACKUP false
export RUMP_SERVER=$SOCK_CLIENT
atf_check -s exit:0 rump.ifconfig shmif0 $IP_CLIENT/24 up
atf_check -s exit:0 rump.ifconfig -w 10
# Check that the primary addresses are up
atf_check -s exit:0 -o ignore \
rump.ping -n -w $TIMEOUT -c 1 $IP_MASTER
atf_check -s exit:0 -o ignore \
rump.ping -n -w $TIMEOUT -c 1 $IP_BACKUP
# Give carp a while to croak
sleep 4
# Check state
export RUMP_SERVER=$SOCK_MASTER
$DEBUG && rump.ifconfig
atf_check -s exit:0 -o match:'carp: MASTER carpdev shmif0' \
rump.ifconfig carp0
export RUMP_SERVER=$SOCK_BACKUP
$DEBUG && rump.ifconfig
atf_check -s exit:0 -o match:'carp: BACKUP carpdev shmif0' \
rump.ifconfig carp1
export RUMP_SERVER=$SOCK_CLIENT
# Check that the shared IP works
atf_check -s exit:0 -o ignore \
rump.ping -n -w $TIMEOUT -c 1 $IP_CARP
# KILLING SPREE
env RUMP_SERVER=$SOCK_MASTER rump.halt
sleep 1
# Check that primary is now dead
atf_check -s not-exit:0 -o ignore \
rump.ping -n -w $TIMEOUT -c 1 $IP_MASTER
# Do it in installments. carp will cluck meanwhile
wait_handover
# Check state
export RUMP_SERVER=$SOCK_BACKUP
$DEBUG && rump.ifconfig
atf_check -s exit:0 -o match:'carp: MASTER carpdev shmif0' \
rump.ifconfig carp1
}
carp_handover_cleanup()
{
$DEBUG && dump
cleanup
}
atf_init_test_cases()
{
atf_add_test_case carp_handover
}