1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00

tests: use villas helper script

This commit is contained in:
Steffen Vogel 2021-09-22 10:42:03 +02:00
parent 8c2d6f770a
commit ce919ad6ce
51 changed files with 163 additions and 270 deletions

View file

@ -27,7 +27,7 @@ set -e
FETCHED_CONF=$(mktemp)
# Start without a configuration
villas-node &
villas node &
PID=$!
# Wait for node to complete init

View file

@ -44,7 +44,7 @@ EOF
ID=$(uuidgen)
# Start VILLASnode instance with local config
villas-node ${CONFIG_FILE} &
villas node ${CONFIG_FILE} &
# Wait for node to complete init
sleep 1

View file

@ -63,7 +63,7 @@ cat > ${CONFIG_FILE} <<EOF
EOF
# Start VILLASnode instance with local config
villas-node ${CONFIG_FILE} &
villas node ${CONFIG_FILE} &
# Wait for node to complete init
sleep 1

View file

@ -63,7 +63,7 @@ cat > ${CONFIG_FILE} <<EOF
EOF
# Start VILLASnode instance with local config
villas-node ${CONFIG_FILE} &
villas node ${CONFIG_FILE} &
# Wait for node to complete init
sleep 1

View file

@ -59,7 +59,7 @@ cat <<EOF > ${LOCAL_CONF}
EOF
# Start with base configuration
villas-node &
villas node &
# Wait for node to complete init
sleep 1

View file

@ -35,7 +35,8 @@ cat > ${CONFIG_FILE} <<EOF
EOF
# Start without a configuration
timeout -s SIGKILL 3 villas-node ${CONFIG_FILE} &
timeout -s SIGKILL 3 \
villas node ${CONFIG_FILE} &
# Wait for node to complete init
sleep 1
@ -45,7 +46,7 @@ curl -sX POST http://localhost:8080/api/v2/shutdown
rm ${CONFIG_FILE}
# Wait returns the return code of villas-node
# Wait returns the return code of villas node
# which will be 0 (success) in case of normal shutdown
# or <>0 (fail) in case the 3 second timeout was reached
wait $!

View file

@ -28,7 +28,7 @@ SCRIPTPATH=$(dirname ${SCRIPT})
LOCAL_CONF=${SCRIPTPATH}/../../etc/loopback.json
# Start VILLASnode instance with local config
villas-node ${LOCAL_CONF} &
villas node ${LOCAL_CONF} &
PID=$!
# Wait for node to complete init

View file

@ -1,6 +1,6 @@
#!/bin/bash
#
# Integration test for villas-compare.
# Integration test for villas compare.
#
# @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
# @copyright 2014-2020, Institute for Automation of Complex Power Systems, EONERC
@ -43,31 +43,31 @@ cat > ${INPUT_FILE} <<EOF
1491095597.545159701(9) -0.587785
EOF
villas-compare ${INPUT_FILE} ${INPUT_FILE}
villas compare ${INPUT_FILE} ${INPUT_FILE}
(( $? == 0 )) || fail 1
head -n-1 ${INPUT_FILE} > ${TEMP_FILE}
villas-compare ${INPUT_FILE} ${TEMP_FILE}
villas compare ${INPUT_FILE} ${TEMP_FILE}
(( $? == 1 )) || fail 2
( head -n-1 ${INPUT_FILE}; echo "1491095597.545159701(55) -0.587785" ) > ${TEMP_FILE}
villas-compare ${INPUT_FILE} ${TEMP_FILE}
villas compare ${INPUT_FILE} ${TEMP_FILE}
(( $? == 2 )) || fail 3
( head -n-1 ${INPUT_FILE}; echo "1491095598.545159701(9) -0.587785" ) > ${TEMP_FILE}
villas-compare ${INPUT_FILE} ${TEMP_FILE}
villas compare ${INPUT_FILE} ${TEMP_FILE}
(( $? == 3 )) || fail 4
( head -n-1 ${INPUT_FILE}; echo "1491095597.545159701(9) -0.587785 -0.587785" ) > ${TEMP_FILE}
villas-compare ${INPUT_FILE} ${TEMP_FILE}
villas compare ${INPUT_FILE} ${TEMP_FILE}
(( $? == 4 )) || fail 5
( head -n-1 ${INPUT_FILE}; echo "1491095597.545159701(9) -1.587785" ) > ${TEMP_FILE}
villas-compare ${INPUT_FILE} ${TEMP_FILE}
villas compare ${INPUT_FILE} ${TEMP_FILE}
(( $? == 5 )) || fail 6
( cat ${INPUT_FILE}; echo "1491095597.545159701(9) -0.587785" ) > ${TEMP_FILE}
villas-compare ${INPUT_FILE} ${TEMP_FILE}
villas compare ${INPUT_FILE} ${TEMP_FILE}
(( $? == 1 )) || fail 7
rm ${INPUT_FILE} ${TEMP_FILE}

View file

@ -1,6 +1,6 @@
#!/bin/bash
#
# Integration test for villas-convert tool
# Integration test for villas convert tool
#
# @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
# @copyright 2014-2020, Institute for Automation of Complex Power Systems, EONERC
@ -30,11 +30,11 @@ INPUT_FILE=$(mktemp)
FORMATS="villas.human csv tsv json"
# Generate test data
villas-signal -v5 -n -l20 mixed > ${INPUT_FILE}
villas signal -v5 -n -l20 mixed > ${INPUT_FILE}
for FORMAT in ${FORMATS}; do
villas-convert -o ${FORMAT} < ${INPUT_FILE} | tee ${TEMP} | \
villas-convert -i ${FORMAT} > ${OUTPUT_FILE}
villas convert -o ${FORMAT} < ${INPUT_FILE} | tee ${TEMP} | \
villas convert -i ${FORMAT} > ${OUTPUT_FILE}
villas-compare ${INPUT_FILE} ${OUTPUT_FILE}
villas compare ${INPUT_FILE} ${OUTPUT_FILE}
done

View file

@ -54,10 +54,10 @@ cat <<EOF > ${EXPECT_FILE}
EOF
# Average over first and third signal (mask = 0b101 = 5)
villas-hook -o offset=0 -o signals=signal0,signal1,signal2,signal3,signal4 average < ${INPUT_FILE} > ${OUTPUT_FILE}
villas hook -o offset=0 -o signals=signal0,signal1,signal2,signal3,signal4 average < ${INPUT_FILE} > ${OUTPUT_FILE}
# Compare only the data values
villas-compare -e 1e-6 ${OUTPUT_FILE} ${EXPECT_FILE}
villas compare ${OUTPUT_FILE} ${EXPECT_FILE}
RC=$?
rm -f ${INPUT_FILE} ${OUTPUT_FILE} ${EXPECT_FILE}

View file

@ -46,10 +46,10 @@ cat <<EOF > ${EXPECT_FILE}
1490500400.676379108(9) -0.587785 -0.587785 -0.587785 -0.587785
EOF
villas-hook -o ratio=3 decimate < ${INPUT_FILE} > ${OUTPUT_FILE}
villas hook -o ratio=3 decimate < ${INPUT_FILE} > ${OUTPUT_FILE}
# Compare only the data values
villas-compare ${OUTPUT_FILE} ${EXPECT_FILE}
villas compare ${OUTPUT_FILE} ${EXPECT_FILE}
RC=$?

View file

@ -36,16 +36,16 @@ F0=50
OPTS="-o f0=${F0} -o rate=${RATE} -o signal=0 -o harmonics=0,1,3,5,7"
villas-signal sine -v1 -l ${NUM_SAMPLES} -f ${F0} -r ${RATE} -n > ${INPUT_FILE}
villas signal sine -v1 -l ${NUM_SAMPLES} -f ${F0} -r ${RATE} -n > ${INPUT_FILE}
villas-hook dp -o inverse=false ${OPTS} < ${INPUT_FILE} > ${OUTPUT_FILE}
villas hook dp -o inverse=false ${OPTS} < ${INPUT_FILE} > ${OUTPUT_FILE}
villas-hook dp -o inverse=true ${OPTS} < ${OUTPUT_FILE} > ${RECON_FILE}
villas hook dp -o inverse=true ${OPTS} < ${OUTPUT_FILE} > ${RECON_FILE}
exit 0
# Compare only the data values
villas-compare ${OUTPUT_FILE} ${EXPECT_FILE}
villas compare ${OUTPUT_FILE} ${EXPECT_FILE}
RC=$?
rm -f ${INPUT_FILE} ${OUTPUT_FILE} ${EXPECT_FILE}

View file

@ -52,10 +52,10 @@ cat <<EOF > ${EXPECT_FILE}
1490500400.676379108(9) -0.587785 -0.587785 -0.587785 -0.587785
EOF
villas-hook drop < ${INPUT_FILE} > ${OUTPUT_FILE}
villas hook drop < ${INPUT_FILE} > ${OUTPUT_FILE}
# Compare only the data values
villas-compare ${OUTPUT_FILE} ${EXPECT_FILE}
villas compare ${OUTPUT_FILE} ${EXPECT_FILE}
RC=$?

View file

@ -49,10 +49,10 @@ cat <<EOF > ${EXPECT_FILE}
1561591855.077804200(8) 0.015231 -0.149670 1.000000 -0.904358 0.904782
EOF
villas-hook gate -o signal=signal2 -o mode=above < ${INPUT_FILE} > ${OUTPUT_FILE}
villas hook gate -o signal=signal2 -o mode=above < ${INPUT_FILE} > ${OUTPUT_FILE}
# Compare only the data values
villas-compare ${OUTPUT_FILE} ${EXPECT_FILE}
villas compare ${OUTPUT_FILE} ${EXPECT_FILE}
RC=$?
rm -f ${INPUT_FILE} ${OUTPUT_FILE} ${EXPECT_FILE}

View file

@ -26,13 +26,13 @@ INPUT_FILE=$(mktemp)
OUTPUT_FILE=$(mktemp)
EXPECT_FILE=$(mktemp)
villas-signal -r 1000 -l 1000 -n sine > ${INPUT_FILE}
villas signal -r 1000 -l 1000 -n sine > ${INPUT_FILE}
awk 'NR % 10 == 2' < ${INPUT_FILE} > ${EXPECT_FILE}
villas-hook -o rate=100 -o mode=origin limit_rate < ${INPUT_FILE} > ${OUTPUT_FILE}
villas hook -o rate=100 -o mode=origin limit_rate < ${INPUT_FILE} > ${OUTPUT_FILE}
# Compare only the data values
villas-compare ${OUTPUT_FILE} ${EXPECT_FILE}
villas compare ${OUTPUT_FILE} ${EXPECT_FILE}
RC=$?

View file

@ -67,14 +67,14 @@ cat <<EOF > ${EXPECT_FILE}
1551015509.701653200+6.430676e+07(9) 0 0.587785 145.000000 9 1551015509.701653
EOF
villas-hook lua -c ${CONFIG_FILE} < ${INPUT_FILE} > ${OUTPUT_FILE}
villas hook lua -c ${CONFIG_FILE} < ${INPUT_FILE} > ${OUTPUT_FILE}
cat ${INPUT_FILE}
echo
cat ${OUTPUT_FILE}
# Compare only the data values
villas-compare -e 1e-6 ${OUTPUT_FILE} ${EXPECT_FILE}
villas compare ${OUTPUT_FILE} ${EXPECT_FILE}
RC=$?
rm -f ${INPUT_FILE} ${OUTPUT_FILE} ${EXPECT_FILE} ${CONFIG_FILE}

View file

@ -101,10 +101,10 @@ cat <<EOF > ${EXPECT_FILE}
1551015509.701653200+6.430638e+07(9) 555.000000 10.000000 1.600000 0.600000 0.900000 9.000000
EOF
villas-hook lua -c ${CONFIG_FILE} < ${INPUT_FILE} > ${OUTPUT_FILE}
villas hook lua -c ${CONFIG_FILE} < ${INPUT_FILE} > ${OUTPUT_FILE}
# Compare only the data values
villas-compare ${OUTPUT_FILE} ${EXPECT_FILE}
villas compare ${OUTPUT_FILE} ${EXPECT_FILE}
RC=$?
rm -f ${INPUT_FILE} ${OUTPUT_FILE} ${EXPECT_FILE} ${CONFIG_FILE}

View file

@ -29,12 +29,12 @@ INPUT_FILE=$(mktemp)
NUM_SAMPLES=${NUM_SAMPLES:-100}
# Prepare some test data
villas-signal -v 1 -r 10 -l ${NUM_SAMPLES} -n random > ${INPUT_FILE}
villas signal -v 1 -r 10 -l ${NUM_SAMPLES} -n random > ${INPUT_FILE}
villas-hook -o format=villas.human -o output=${OUTPUT_FILE1} print > ${OUTPUT_FILE2} < ${INPUT_FILE}
villas hook -o format=villas.human -o output=${OUTPUT_FILE1} print > ${OUTPUT_FILE2} < ${INPUT_FILE}
# Compare only the data values
villas-compare ${OUTPUT_FILE1} ${OUTPUT_FILE2} ${INPUT_FILE}
villas compare ${OUTPUT_FILE1} ${OUTPUT_FILE2} ${INPUT_FILE}
RC=$?
rm -f ${OUTPUT_FILE1} ${OUTPUT_FILE2} ${INPUT_FILE}

View file

@ -54,10 +54,10 @@ cat <<EOF > ${EXPECT_FILE}
1551015509.701653200(9) 0.060849 -0.587785 1.000000 0.600000 145.000000
EOF
villas-hook scale -o scale=100 -o offset=55 -o signal=signal4 < ${INPUT_FILE} > ${OUTPUT_FILE}
villas hook scale -o scale=100 -o offset=55 -o signal=signal4 < ${INPUT_FILE} > ${OUTPUT_FILE}
# Compare only the data values
villas-compare ${OUTPUT_FILE} ${EXPECT_FILE}
villas compare ${OUTPUT_FILE} ${EXPECT_FILE}
RC=$?
rm -f ${INPUT_FILE} ${OUTPUT_FILE} ${EXPECT_FILE}

View file

@ -26,8 +26,8 @@ OUTPUT_FILE=$(mktemp)
OFFSET=100
villas-signal -l ${NUM_SAMPLES} -n random | \
villas-hook -o offset=${OFFSET} shift_seq > ${OUTPUT_FILE}
villas signal -l ${NUM_SAMPLES} -n random | \
villas hook -o offset=${OFFSET} shift_seq > ${OUTPUT_FILE}
# Compare shifted sequence no
diff -u \

View file

@ -29,10 +29,10 @@ NUM_SAMPLES=${NUM_SAMPLES:-10}
OFFSET=-10.0
EPSILON=0.5
villas-signal -l ${NUM_SAMPLES} -r 50 random | \
villas-hook -o offset=${OFFSET} shift_ts | \
villas-hook fix | \
villas-hook -o format=json -o output="${STATS_FILE}" stats > /dev/null
villas signal -l ${NUM_SAMPLES} -r 50 random | \
villas hook -o offset=${OFFSET} shift_ts | \
villas hook fix | \
villas hook -o format=json -o output="${STATS_FILE}" stats > /dev/null
jq .owd ${STATS_FILE}
jq -e ".owd.mean + ${OFFSET} | length < ${EPSILON}" ${STATS_FILE} > /dev/null

View file

@ -28,8 +28,8 @@ SKIP=10
echo ${OUTPUT_FILE}
villas-signal -r 1 -l ${NUM_SAMPLES} -n random | \
villas-hook -o seconds=${SKIP} skip_first > ${OUTPUT_FILE}
villas signal -r 1 -l ${NUM_SAMPLES} -n random | \
villas hook -o seconds=${SKIP} skip_first > ${OUTPUT_FILE}
LINES=$(sed -re '/^#/d' ${OUTPUT_FILE} | wc -l)

View file

@ -26,8 +26,8 @@ OUTPUT_FILE=$(mktemp)
SKIP=50
villas-signal -r 1 -l ${NUM_SAMPLES} -n random | \
villas-hook -o samples=${SKIP} skip_first > ${OUTPUT_FILE}
villas signal -r 1 -l ${NUM_SAMPLES} -n random | \
villas hook -o samples=${SKIP} skip_first > ${OUTPUT_FILE}
LINES=$(sed -re '/^#/d' ${OUTPUT_FILE} | wc -l)

View file

@ -23,8 +23,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
##################################################################################
NODE_TYPES=$(villas-node -C | jq -r '.nodes | join(" ")')
HOOKS_TYPES=$(villas-node -C | jq -r '.["hooks"] | join(" ")')
NODE_TYPES=$(villas node -C | jq -r '.nodes | join(" ")')
HOOKS_TYPES=$(villas node -C | jq -r '.["hooks"] | join(" ")')
CONFIGS=$(find -name '*.conf' -o -name '*.json')

View file

@ -1,6 +1,6 @@
#!/bin/bash
#
# Integration can test using villas-node.
# Integration can test using villas node.
#
# @author Niklas Eiling <niklas.eiling@eonerc.rwth-aachen.de>
# @copyright 2014-2020, Institute for Automation of Complex Power Systems, EONERC
@ -26,10 +26,6 @@
# sudo ip link add dev vcan0 type vcan
# sudo ip link set vcan0 up
SCRIPT=$(realpath $0)
SCRIPTPATH=$(dirname ${SCRIPT})
source ${SCRIPTPATH}/../../tools/villas-helper.sh
CONFIG_FILE=$(mktemp)
INPUT_FILE=$(mktemp)
OUTPUT_FILE=$(mktemp)
@ -117,12 +113,10 @@ nodes = {
EOF
# Generate test data
VILLAS_LOG_PREFIX=$(colorize "[Signal]") \
villas-signal -v ${NUM_VALUES} -l ${NUM_SAMPLES} -n random > ${INPUT_FILE}
villas signal -v ${NUM_VALUES} -l ${NUM_SAMPLES} -n random > ${INPUT_FILE}
# Start node
VILLAS_LOG_PREFIX=$(colorize "[Node] ") \
villas-node ${CONFIG_FILE} &
villas node ${CONFIG_FILE} &
# Wait for node to complete init
sleep 1
@ -131,8 +125,7 @@ candump -n ${NUM_SAMPLES} -T 1000 -L ${CAN_IF} | awk '{print $3}' > ${CAN_OUT_FI
CANDUMP_PID=$!
# Send / Receive data to node
VILLAS_LOG_PREFIX=$(colorize "[Pipe] ") \
villas-pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} can_node1 > ${OUTPUT_FILE} < ${INPUT_FILE} &
villas pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} can_node1 > ${OUTPUT_FILE} < ${INPUT_FILE} &
wait ${CANDUMP_PID}
cat ${CAN_OUT_FILE} | xargs -I % cansend ${CAN_IF} %
@ -144,7 +137,7 @@ sleep 1
kill %1
# Compare data
villas-compare ${INPUT_FILE} ${OUTPUT_FILE}
villas compare ${INPUT_FILE} ${OUTPUT_FILE}
RC=$?
#rm ${CAN_OUT_FILE} ${INPUT_FILE} ${OUTPUT_FILE}

View file

@ -1,6 +1,6 @@
#!/bin/bash
#
# Test hooks in villas-node
# Test hooks in villas node
#
# @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
# @copyright 2014-2020, Institute for Automation of Complex Power Systems, EONERC
@ -22,10 +22,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
##################################################################################
SCRIPT=$(realpath $0)
SCRIPTPATH=$(dirname ${SCRIPT})
source ${SCRIPTPATH}/../../tools/villas-helper.sh
CONFIG_FILE=$(mktemp)
OUTPUT_FILE=$(mktemp)
EXPECT_FILE=$(mktemp)
@ -85,10 +81,10 @@ cat > ${CONFIG_FILE} <<EOF
EOF
# Start node
villas-node ${CONFIG_FILE}
villas node ${CONFIG_FILE}
# Compare only the data values
villas-compare -e 1e-6 ${OUTPUT_FILE} ${EXPECT_FILE}
villas compare ${OUTPUT_FILE} ${EXPECT_FILE}
RC=$?
cat ${OUTPUT_FILE}

View file

@ -1,6 +1,6 @@
#!/bin/bash
#
# Integration Infiniband test using villas-node.
# Integration Infiniband test using villas node.
#
# @author Dennis Potter <dennis@dennispotter.eu>
# @copyright 2014-2020, Institute for Automation of Complex Power Systems, EONERC
@ -41,10 +41,6 @@ if [[ ! $(lspci | grep Infiniband) ]]; then
fi
SCRIPT=$(realpath $0)
SCRIPTPATH=$(dirname ${SCRIPT})
source ${SCRIPTPATH}/../../tools/villas-helper.sh
CONFIG_FILE=$(mktemp /tmp/ib-configuration-XXXX.conf)
CONFIG_FILE_TARGET=$(mktemp /tmp/ib-configuration-target-XXXX.conf)
INPUT_FILE=$(mktemp)
@ -54,8 +50,7 @@ NUM_SAMPLES=${NUM_SAMPLES:-10}
RC=0
# Generate test data for RC, UC, and UD test
VILLAS_LOG_PREFIX=$(colorize "[Signal]") \
villas-signal -l ${NUM_SAMPLES} -n random > ${INPUT_FILE}
villas signal -l ${NUM_SAMPLES} -n random > ${INPUT_FILE}
# Set config file with a MODE flag
cat > ${CONFIG_FILE} <<EOF
@ -149,8 +144,7 @@ do
sed -i -e 's/MODE/'${MODE}'/g' ${CONFIG_FILE}
# Start receiving node
VILLAS_LOG_PREFIX=$(colorize "[Node] ") \
villas-node ${CONFIG_FILE_TARGET} &
villas node ${CONFIG_FILE_TARGET} &
node_proc=$!
# Wait for node to complete init
@ -163,8 +157,7 @@ do
fi
# Start sending pipe
VILLAS_LOG_PREFIX=$(colorize "[Pipe] ") \
ip netns exec namespace0 villas-pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} ib_node_source >${OUTPUT_FILE} <${DATAFIFO} &
ip netns exec namespace0 villas pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} ib_node_source >${OUTPUT_FILE} <${DATAFIFO} &
node_pipe=$!
# Keep pipe alive
@ -184,7 +177,7 @@ do
kill $node_proc
# Compare data
villas-compare ${INPUT_FILE} ${OUTPUT_FILE}
villas compare ${INPUT_FILE} ${OUTPUT_FILE}
RC=$?
# Exit, if an error occurs

View file

@ -1,6 +1,6 @@
#!/bin/bash
#
# Integration loopback test using villas-node.
# Integration loopback test using villas node.
#
# @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
# @copyright 2014-2020, Institute for Automation of Complex Power Systems, EONERC
@ -22,10 +22,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
##################################################################################
SCRIPT=$(realpath $0)
SCRIPTPATH=$(dirname ${SCRIPT})
source ${SCRIPTPATH}/../../tools/villas-helper.sh
CONFIG_FILE=$(mktemp)
INPUT_FILE=$(mktemp)
OUTPUT_FILE=$(mktemp)
@ -76,19 +72,16 @@ cat > ${CONFIG_FILE} <<EOF
EOF
# Generate test data
VILLAS_LOG_PREFIX=$(colorize "[Signal]") \
villas-signal -l ${NUM_SAMPLES} -n random > ${INPUT_FILE}
villas signal -l ${NUM_SAMPLES} -n random > ${INPUT_FILE}
# Start node
VILLAS_LOG_PREFIX=$(colorize "[Node] ") \
villas-node ${CONFIG_FILE} &
villas node ${CONFIG_FILE} &
# Wait for node to complete init
sleep 1
# Send / Receive data to node
VILLAS_LOG_PREFIX=$(colorize "[Pipe] ") \
villas-pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} node2 > ${OUTPUT_FILE} < ${INPUT_FILE}
villas pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} node2 > ${OUTPUT_FILE} < ${INPUT_FILE}
# Wait for node to handle samples
sleep 1
@ -97,7 +90,7 @@ sleep 1
kill %1
# Compare data
villas-compare ${INPUT_FILE} ${OUTPUT_FILE}
villas compare ${INPUT_FILE} ${OUTPUT_FILE}
RC=$?
rm ${CONFIG_FILE} ${INPUT_FILE} ${OUTPUT_FILE}

View file

@ -1,6 +1,6 @@
#!/bin/bash
#
# Integration loopback test using villas-node.
# Integration loopback test using villas node.
#
# @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
# @copyright 2014-2020, Institute for Automation of Complex Power Systems, EONERC
@ -25,10 +25,6 @@
# Test is broken
exit 99
SCRIPT=$(realpath $0)
SCRIPTPATH=$(dirname ${SCRIPT})
source ${SCRIPTPATH}/../../tools/villas-helper.sh
CONFIG_FILE=$(mktemp)
OUTPUT_FILE1=$(mktemp)
OUTPUT_FILE2=$(mktemp)
@ -73,8 +69,7 @@ EOF
villas signal counter -o 100 -v 1 -l 10 -n > ${EXPECT_FILE}
# Start node
VILLAS_LOG_PREFIX=$(colorize "[Node] ") \
villas-node ${CONFIG_FILE} &
villas node ${CONFIG_FILE} &
P1=$!
sleep 2
@ -83,8 +78,8 @@ kill ${P1}
wait ${P1}
# Compare only the data values
villas-compare ${OUTPUT_FILE1} ${EXPECT_FILE} && \
villas-compare ${OUTPUT_FILE2} ${EXPECT_FILE}
villas compare ${OUTPUT_FILE1} ${EXPECT_FILE} && \
villas compare ${OUTPUT_FILE2} ${EXPECT_FILE}
RC=$?
rm ${CONFIG_FILE} ${EXPECT_FILE} \

View file

@ -1,6 +1,6 @@
#!/bin/bash
#
# Integration loopback test using villas-node.
# Integration loopback test using villas node.
#
# @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
# @copyright 2014-2020, Institute for Automation of Complex Power Systems, EONERC
@ -22,10 +22,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
##################################################################################
SCRIPT=$(realpath $0)
SCRIPTPATH=$(dirname ${SCRIPT})
source ${SCRIPTPATH}/../../tools/villas-helper.sh
CONFIG_FILE=$(mktemp)
OUTPUT_FILE=$(mktemp)
EXPECT_FILE=$(mktemp)
@ -92,11 +88,10 @@ cat > ${CONFIG_FILE} <<EOF
EOF
# Start node
VILLAS_LOG_PREFIX=$(colorize "[Node] ") \
villas-node ${CONFIG_FILE}
villas node ${CONFIG_FILE}
# Compare only the data values
villas-compare ${OUTPUT_FILE} ${EXPECT_FILE}
villas compare ${OUTPUT_FILE} ${EXPECT_FILE}
RC=$?
rm ${CONFIG_FILE} ${OUTPUT_FILE} ${EXPECT_FILE}

View file

@ -1,6 +1,6 @@
#!/bin/bash
#
# Integration loopback test using villas-node.
# Integration loopback test using villas node.
#
# @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
# @copyright 2014-2020, Institute for Automation of Complex Power Systems, EONERC
@ -22,10 +22,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
##################################################################################
SCRIPT=$(realpath $0)
SCRIPTPATH=$(dirname ${SCRIPT})
source ${SCRIPTPATH}/../../tools/villas-helper.sh
CONFIG_FILE=$(mktemp)
STATS_LOG=$(mktemp)
@ -76,8 +72,7 @@ cat > ${CONFIG_FILE} <<EOF
EOF
# Start node
VILLAS_LOG_PREFIX=$(colorize "[Node] ") \
villas-node ${CONFIG_FILE} &
villas node ${CONFIG_FILE} &
PID=$!
sleep 5

View file

@ -1,6 +1,6 @@
#!/bin/bash
#
# Integration loopback test using villas-node.
# Integration loopback test using villas node.
#
# @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
# @copyright 2014-2020, Institute for Automation of Complex Power Systems, EONERC
@ -26,10 +26,6 @@
echo "Test not yet supported"
exit 99
SCRIPT=$(realpath $0)
SCRIPTPATH=$(dirname ${SCRIPT})
source ${SCRIPTPATH}/../../tools/villas-helper.sh
CONFIG_FILE=$(mktemp)
cat > ${CONFIG_FILE} <<EOF
@ -71,5 +67,4 @@ cat > ${CONFIG_FILE} <<EOF
EOF
# Start node
VILLAS_LOG_PREFIX=$(colorize "[Node] ") \
villas-node ${CONFIG_FILE}
villas node ${CONFIG_FILE}

View file

@ -1,6 +1,6 @@
#!/bin/bash
#
# Integration loopback test for villas-pipe.
# Integration loopback test for villas pipe.
#
# @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
# @copyright 2014-2020, Institute for Automation of Complex Power Systems, EONERC
@ -22,10 +22,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
##################################################################################
SCRIPT=$(realpath $0)
SCRIPTPATH=$(dirname ${SCRIPT})
source ${SCRIPTPATH}/../../tools/villas-helper.sh
CONFIG_FILE=$(mktemp)
INPUT_FILE=$(mktemp)
OUTPUT_FILE=$(mktemp)
@ -33,7 +29,7 @@ OUTPUT_FILE=$(mktemp)
NUM_SAMPLES=${NUM_SAMPLES:-100}
# Generate test data
villas-signal -l ${NUM_SAMPLES} -n random > ${INPUT_FILE}
villas signal -l ${NUM_SAMPLES} -n random > ${INPUT_FILE}
FORMAT="protobuf"
VECTORIZE="10"
@ -65,10 +61,10 @@ cat > ${CONFIG_FILE} << EOF
}
EOF
villas-pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} node1 > ${OUTPUT_FILE} < ${INPUT_FILE}
villas pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} node1 > ${OUTPUT_FILE} < ${INPUT_FILE}
# Compare data
villas-compare ${CMPFLAGS} ${INPUT_FILE} ${OUTPUT_FILE}
villas compare ${CMPFLAGS} ${INPUT_FILE} ${OUTPUT_FILE}
RC=$?
rm ${OUTPUT_FILE} ${INPUT_FILE} ${CONFIG_FILE}

View file

@ -1,6 +1,6 @@
#!/bin/bash
#
# Integration loopback test for villas-pipe.
# Integration loopback test for villas pipe.
#
# @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
# @copyright 2014-2020, Institute for Automation of Complex Power Systems, EONERC
@ -22,9 +22,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
##################################################################################
SCRIPT=$(realpath $0)
SCRIPTPATH=$(dirname ${SCRIPT})
source ${SCRIPTPATH}/../../tools/villas-helper.sh
CONFIG_FILE=$(mktemp)
INPUT_FILE=$(mktemp)
@ -33,7 +30,7 @@ OUTPUT_FILE=$(mktemp)
NUM_SAMPLES=${NUM_SAMPLES:-100}
# Generate test data
villas-signal -l ${NUM_SAMPLES} -n random > ${INPUT_FILE}
villas signal -l ${NUM_SAMPLES} -n random > ${INPUT_FILE}
FORMAT="villas.human"
@ -50,10 +47,10 @@ cat > ${CONFIG_FILE} << EOF
}
EOF
villas-pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} node1 > ${OUTPUT_FILE} < ${INPUT_FILE}
villas pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} node1 > ${OUTPUT_FILE} < ${INPUT_FILE}
# Compare data
villas-compare ${INPUT_FILE} ${OUTPUT_FILE}
villas compare ${INPUT_FILE} ${OUTPUT_FILE}
RC=$?
rm ${OUTPUT_FILE} ${INPUT_FILE} ${CONFIG_FILE}

View file

@ -1,6 +1,6 @@
#!/bin/bash
#
# Integration loopback test for villas-pipe.
# Integration loopback test for villas pipe.
#
# @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
# @copyright 2014-2020, Institute for Automation of Complex Power Systems, EONERC
@ -50,12 +50,12 @@ cat > ${CONFIG_FILE} << EOF
EOF
# Generate test data
villas-signal -l ${NUM_SAMPLES} -n random > ${INPUT_FILE}
villas signal -l ${NUM_SAMPLES} -n random > ${INPUT_FILE}
villas-pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} node1 > ${OUTPUT_FILE} < ${INPUT_FILE}
villas pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} node1 > ${OUTPUT_FILE} < ${INPUT_FILE}
# Compare data
villas-compare ${INPUT_FILE} ${OUTPUT_FILE}
villas compare ${INPUT_FILE} ${OUTPUT_FILE}
RC=$?
rm ${OUTPUT_FILE} ${INPUT_FILE} ${CONFIG_FILE} ${NODE_FILE}

View file

@ -1,6 +1,6 @@
#!/bin/bash
#
# Integration loopback test for villas-pipe.
# Integration loopback test for villas pipe.
#
# @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
# @copyright 2014-2020, Institute for Automation of Complex Power Systems, EONERC
@ -22,10 +22,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
##################################################################################
SCRIPT=$(realpath $0)
SCRIPTPATH=$(dirname ${SCRIPT})
source ${SCRIPTPATH}/../../tools/villas-helper.sh
CONFIG_FILE=$(mktemp)
INPUT_FILE=$(mktemp)
OUTPUT_FILE=$(mktemp)
@ -33,7 +29,7 @@ OUTPUT_FILE=$(mktemp)
NUM_SAMPLES=${NUM_SAMPLES:-100}
# Generate test data
villas-signal -l ${NUM_SAMPLES} -v 4 -n random > ${INPUT_FILE}
villas signal -l ${NUM_SAMPLES} -v 4 -n random > ${INPUT_FILE}
cat > ${CONFIG_FILE} << EOF
{
@ -65,10 +61,10 @@ cat > ${CONFIG_FILE} << EOF
}
EOF
villas-pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} node1 > ${OUTPUT_FILE} < ${INPUT_FILE}
villas pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} node1 > ${OUTPUT_FILE} < ${INPUT_FILE}
# Compare data
villas-compare -T ${INPUT_FILE} ${OUTPUT_FILE}
villas compare -T ${INPUT_FILE} ${OUTPUT_FILE}
RC=$?
rm ${OUTPUT_FILE} ${INPUT_FILE} ${CONFIG_FILE}

View file

@ -1,6 +1,6 @@
#!/bin/bash
#
# Integration loopback test for villas-pipe.
# Integration loopback test for villas pipe.
#
# @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
# @copyright 2014-2020, Institute for Automation of Complex Power Systems, EONERC
@ -39,12 +39,12 @@ cat > ${CONFIG_FILE} << EOF
EOF
# Generate test data
villas-signal -v 5 -l ${NUM_SAMPLES} -n mixed > ${INPUT_FILE}
villas signal -v 5 -l ${NUM_SAMPLES} -n mixed > ${INPUT_FILE}
villas-pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} node1 > ${OUTPUT_FILE} < ${INPUT_FILE}
villas pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} node1 > ${OUTPUT_FILE} < ${INPUT_FILE}
# Compare data
villas-compare ${INPUT_FILE} ${OUTPUT_FILE}
villas compare ${INPUT_FILE} ${OUTPUT_FILE}
RC=$?
rm ${OUTPUT_FILE} ${INPUT_FILE} ${CONFIG_FILE}

View file

@ -1,6 +1,6 @@
#!/bin/bash
#
# Integration loopback test for villas-pipe.
# Integration loopback test for villas pipe.
#
# @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
# @copyright 2014-2020, Institute for Automation of Complex Power Systems, EONERC
@ -22,10 +22,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
##################################################################################
SCRIPT=$(realpath $0)
SCRIPTPATH=$(dirname ${SCRIPT})
source ${SCRIPTPATH}/../../tools/villas-helper.sh
CONFIG_FILE=$(mktemp)
INPUT_FILE=$(mktemp)
OUTPUT_FILE=$(mktemp)
@ -33,7 +29,7 @@ OUTPUT_FILE=$(mktemp)
NUM_SAMPLES=${NUM_SAMPLES:-100}
# Generate test data
villas-signal -l ${NUM_SAMPLES} -n random > ${INPUT_FILE}
villas signal -l ${NUM_SAMPLES} -n random > ${INPUT_FILE}
FORMAT="protobuf"
VECTORIZE="10"
@ -62,10 +58,10 @@ cat > ${CONFIG_FILE} << EOF
}
EOF
villas-pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} node1 > ${OUTPUT_FILE} < ${INPUT_FILE}
villas pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} node1 > ${OUTPUT_FILE} < ${INPUT_FILE}
# Compare data
villas-compare ${INPUT_FILE} ${OUTPUT_FILE}
villas compare ${INPUT_FILE} ${OUTPUT_FILE}
RC=$?
rm ${OUTPUT_FILE} ${INPUT_FILE} ${CONFIG_FILE}

View file

@ -1,6 +1,6 @@
#!/bin/bash
#
# Integration loopback test for villas-pipe.
# Integration loopback test for villas pipe.
#
# @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
# @copyright 2014-2020, Institute for Automation of Complex Power Systems, EONERC
@ -22,10 +22,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
##################################################################################
SCRIPT=$(realpath $0)
SCRIPTPATH=$(dirname ${SCRIPT})
source ${SCRIPTPATH}/../../tools/villas-helper.sh
CONFIG_FILE=$(mktemp)
INPUT_FILE=$(mktemp)
OUTPUT_FILE=$(mktemp)
@ -33,7 +29,7 @@ OUTPUT_FILE=$(mktemp)
NUM_SAMPLES=${NUM_SAMPLES:-100}
# Generate test data
villas-signal -v 5 -l ${NUM_SAMPLES} -n mixed > ${INPUT_FILE}
villas signal -v 5 -l ${NUM_SAMPLES} -n mixed > ${INPUT_FILE}
FORMAT="protobuf"
VECTORIZE="10"
@ -63,10 +59,10 @@ cat > ${CONFIG_FILE} << EOF
}
EOF
villas-pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} node1 > ${OUTPUT_FILE} < ${INPUT_FILE}
villas pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} node1 > ${OUTPUT_FILE} < ${INPUT_FILE}
# Compare data
villas-compare ${CMPFLAGS} ${INPUT_FILE} ${OUTPUT_FILE}
villas compare ${CMPFLAGS} ${INPUT_FILE} ${OUTPUT_FILE}
RC=$?
rm ${OUTPUT_FILE} ${INPUT_FILE} ${CONFIG_FILE}

View file

@ -1,6 +1,6 @@
#!/bin/bash
#
# Integration loopback test for villas-pipe.
# Integration loopback test for villas pipe.
#
# @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
# @author Marvin Klimke <marvin.klimke@rwth-aachen.de>
@ -29,10 +29,6 @@ if [ -n "${CI}" ]; then
exit 99
fi
SCRIPT=$(realpath $0)
SCRIPTPATH=$(dirname ${SCRIPT})
source ${SCRIPTPATH}/../../tools/villas-helper.sh
CONFIG_FILE_SRC=$(mktemp)
CONFIG_FILE_DEST=$(mktemp)
INPUT_FILE=$(mktemp)
@ -114,19 +110,16 @@ cat > ${CONFIG_FILE_DEST} << EOF
}
EOF
VILLAS_LOG_PREFIX="[DEST] " \
villas-pipe -l ${NUM_SAMPLES} ${CONFIG_FILE_DEST} rtp_node > ${OUTPUT_FILE} &
villas pipe -l ${NUM_SAMPLES} ${CONFIG_FILE_DEST} rtp_node > ${OUTPUT_FILE} &
PID=$!
sleep 1
VILLAS_LOG_PREFIX="[SIGN] " \
villas-signal mixed -v 5 -r ${RATE} -l ${NUM_SAMPLES} | tee ${INPUT_FILE} | \
VILLAS_LOG_PREFIX="[SRC] " \
villas-pipe ${CONFIG_FILE_SRC} rtp_node > ${OUTPUT_FILE}
villas signal mixed -v 5 -r ${RATE} -l ${NUM_SAMPLES} | tee ${INPUT_FILE} | \
villas pipe ${CONFIG_FILE_SRC} rtp_node > ${OUTPUT_FILE}
# Compare data
villas-compare ${CMPFLAGS} ${INPUT_FILE} ${OUTPUT_FILE}
villas compare ${CMPFLAGS} ${INPUT_FILE} ${OUTPUT_FILE}
RC=$?
rm ${OUTPUT_FILE} ${INPUT_FILE} ${CONFIG_FILE_SRC} ${CONFIG_FILE_DEST}

View file

@ -1,6 +1,6 @@
#!/bin/bash
#
# Integration loopback test for villas-pipe.
# Integration loopback test for villas pipe.
#
# @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
# @author Marvin Klimke <marvin.klimke@rwth-aachen.de>
@ -37,10 +37,6 @@ REMOTE="ssh ${REMOTE_USER}@${REMOTE_ADDR}"
PATH=/projects/villas/node/build/src:${PATH}
${REMOTE} PATH=/projects/villas/node/build/src:${PATH}
SCRIPT=$(realpath $0)
SCRIPTPATH=$(dirname ${SCRIPT})
source ${SCRIPTPATH}/../../tools/integration-tests-helper.sh
CONFIG_FILE_SRC=$(mktemp)
CONFIG_FILE_DEST=$(mktemp)
INPUT_FILE=$(mktemp)
@ -126,18 +122,18 @@ EOF
scp ${CONFIG_FILE_DEST} ${REMOTE_USER}@${REMOTE_ADDR}:${CONFIG_FILE_DEST}
${REMOTE} villas-pipe -l ${NUM_SAMPLES} ${CONFIG_FILE_DEST} rtp_node > ${OUTPUT_FILE} &
${REMOTE} villas pipe -l ${NUM_SAMPLES} ${CONFIG_FILE_DEST} rtp_node > ${OUTPUT_FILE} &
PID=$!
sleep 1
villas-signal mixed -v 5 -r ${RATE} -l ${NUM_SAMPLES} | tee ${INPUT_FILE} | \
villas-pipe ${CONFIG_FILE_SRC} rtp_node
villas signal mixed -v 5 -r ${RATE} -l ${NUM_SAMPLES} | tee ${INPUT_FILE} | \
villas pipe ${CONFIG_FILE_SRC} rtp_node
scp ${REMOTE_USER}@${REMOTE_ADDR}:${OUTPUT_FILE} ${OUTPUT_FILE}
# Compare data
villas-compare ${CMPFLAGS} ${INPUT_FILE} ${OUTPUT_FILE}
villas compare ${CMPFLAGS} ${INPUT_FILE} ${OUTPUT_FILE}
RC=$?
rm ${INPUT_FILE} ${OUTPUT_FILE} ${CONFIG_FILE_DEST} ${CONFIG_FILE_SRC}

View file

@ -1,6 +1,6 @@
#!/bin/bash
#
# Integration loopback test for villas-pipe.
# Integration loopback test for villas pipe.
#
# @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
# @author Marvin Klimke <marvin.klimke@rwth-aachen.de>
@ -29,10 +29,6 @@ if [ -n "${CI}" ]; then
exit 99
fi
SCRIPT=$(realpath $0)
SCRIPTPATH=$(dirname ${SCRIPT})
source ${SCRIPTPATH}/../../tools/villas-helper.sh
CONFIG_FILE_SRC=$(mktemp)
CONFIG_FILE_DEST=$(mktemp)
INPUT_FILE=$(mktemp)
@ -118,21 +114,16 @@ tc qdisc add dev lo root handle 4000 prio bands 4 priomap 1 2 2 2 1 2 0 0 1 1 1
tc qdisc add dev lo parent 4000:3 tbf rate 40kbps burst 32kbit latency 200ms #peakrate 40kbps mtu 1000 minburst 1520
tc filter add dev lo protocol ip handle 123 fw flowid 4000:3
#exit
VILLAS_LOG_PREFIX="[DEST] " \
villas-pipe -l ${NUM_SAMPLES} ${CONFIG_FILE_DEST} rtp_node > ${OUTPUT_FILE} &
villas pipe -l ${NUM_SAMPLES} ${CONFIG_FILE_DEST} rtp_node > ${OUTPUT_FILE} &
PID=$!
sleep 1
VILLAS_LOG_PREFIX="[SIGN] " \
villas-signal mixed -v ${NUM_VALUES} -r ${RATE} -l ${NUM_SAMPLES} | tee ${INPUT_FILE} | \
VILLAS_LOG_PREFIX="[SRC] " \
villas-pipe ${CONFIG_FILE_SRC} rtp_node > ${OUTPUT_FILE}
villas signal mixed -v ${NUM_VALUES} -r ${RATE} -l ${NUM_SAMPLES} | tee ${INPUT_FILE} | \
villas pipe ${CONFIG_FILE_SRC} rtp_node > ${OUTPUT_FILE}
# Compare data
villas-compare ${CMPFLAGS} ${INPUT_FILE} ${OUTPUT_FILE}
villas compare ${CMPFLAGS} ${INPUT_FILE} ${OUTPUT_FILE}
RC=$?
rm ${OUTPUT_FILE} ${INPUT_FILE} ${CONFIG_FILE_SRC} ${CONFIG_FILE_DEST}

View file

@ -1,6 +1,6 @@
#!/bin/bash
#
# Integration loopback test for villas-pipe.
# Integration loopback test for villas pipe.
#
# @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
# @copyright 2014-2020, Institute for Automation of Complex Power Systems, EONERC
@ -28,10 +28,6 @@ if [ -n "${CI}" ]; then
exit 99
fi
SCRIPT=$(realpath $0)
SCRIPTPATH=$(dirname ${SCRIPT})
source ${SCRIPTPATH}/../../tools/villas-helper.sh
CONFIG_FILE=$(mktemp)
INPUT_FILE=$(mktemp)
OUTPUT_FILE=$(mktemp)
@ -81,11 +77,11 @@ cat > ${CONFIG_FILE} << EOF
}
EOF
villas-signal mixed -v 5 -r ${RATE} -l ${NUM_SAMPLES} | tee ${INPUT_FILE} | \
villas-pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} node1 > ${OUTPUT_FILE}
villas signal mixed -v 5 -r ${RATE} -l ${NUM_SAMPLES} | tee ${INPUT_FILE} | \
villas pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} node1 > ${OUTPUT_FILE}
# Compare data
villas-compare ${CMPFLAGS} ${INPUT_FILE} ${OUTPUT_FILE}
villas compare ${CMPFLAGS} ${INPUT_FILE} ${OUTPUT_FILE}
RC=$?
rm ${OUTPUT_FILE} ${INPUT_FILE} ${CONFIG_FILE}

View file

@ -1,6 +1,6 @@
#!/bin/bash
#
# Integration loopback test for villas-pipe.
# Integration loopback test for villas pipe.
#
# @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
# @copyright 2014-2020, Institute for Automation of Complex Power Systems, EONERC
@ -52,12 +52,12 @@ cat > ${CONFIG_FILE} << EOF
EOF
# Generate test data
villas-signal -l ${NUM_SAMPLES} -v ${SIGNAL_COUNT} -n random > ${INPUT_FILE}
villas signal -l ${NUM_SAMPLES} -v ${SIGNAL_COUNT} -n random > ${INPUT_FILE}
villas-pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} node1 > ${OUTPUT_FILE} < ${INPUT_FILE}
villas pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} node1 > ${OUTPUT_FILE} < ${INPUT_FILE}
# Compare data
villas-compare ${INPUT_FILE} ${OUTPUT_FILE}
villas compare ${INPUT_FILE} ${OUTPUT_FILE}
RC=$?
if (( ${RC} != 0 )); then

View file

@ -1,6 +1,6 @@
#!/bin/bash
#
# Integration loopback test for villas-pipe.
# Integration loopback test for villas pipe.
#
# @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
# @copyright 2014-2020, Institute for Automation of Complex Power Systems, EONERC
@ -54,12 +54,12 @@ cat > ${CONFIG_FILE} << EOF
EOF
# Generate test data
villas-signal -l ${NUM_SAMPLES} -n random > ${INPUT_FILE}
villas signal -l ${NUM_SAMPLES} -n random > ${INPUT_FILE}
villas-pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} node1 > ${OUTPUT_FILE} < ${INPUT_FILE}
villas pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} node1 > ${OUTPUT_FILE} < ${INPUT_FILE}
# Compare data
villas-compare ${INPUT_FILE} ${OUTPUT_FILE}
villas compare ${INPUT_FILE} ${OUTPUT_FILE}
RC=$?
rm ${OUTPUT_FILE} ${INPUT_FILE} ${CONFIG_FILE}

View file

@ -1,6 +1,6 @@
#!/bin/bash
#
# Integration loopback test for villas-pipe.
# Integration loopback test for villas pipe.
#
# @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
# @copyright 2014-2020, Institute for Automation of Complex Power Systems, EONERC
@ -61,11 +61,11 @@ cat > ${CONFIG_FILE} << EOF
EOF
# Generate test data
villas-signal -l ${NUM_SAMPLES} -n random > ${INPUT_FILE}
villas signal -l ${NUM_SAMPLES} -n random > ${INPUT_FILE}
villas-pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} node1 > ${OUTPUT_FILE} < ${INPUT_FILE}
villas pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} node1 > ${OUTPUT_FILE} < ${INPUT_FILE}
# Check network emulation characteristics
villas-hook -o verbose stats < ${OUTPUT_FILE} > /dev/null
villas hook -o verbose stats < ${OUTPUT_FILE} > /dev/null
rm ${OUTPUT_FILE} ${INPUT_FILE} ${CONFIG_FILE}

View file

@ -1,6 +1,6 @@
#!/bin/bash
#
# Integration loopback test for villas-pipe.
# Integration loopback test for villas pipe.
#
# @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
# @copyright 2014-2020, Institute for Automation of Complex Power Systems, EONERC
@ -22,10 +22,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
##################################################################################
SCRIPT=$(realpath $0)
SCRIPTPATH=$(dirname ${SCRIPT})
source ${SCRIPTPATH}/../../tools/villas-helper.sh
CONFIG_FILE=$(mktemp)
INPUT_FILE=$(mktemp)
OUTPUT_FILE=$(mktemp)
@ -35,7 +31,7 @@ NUM_SAMPLES=${NUM_SAMPLES:-100}
NUM_VALUES=${NUM_VALUES:-4}
# Generate test data
villas-signal -v ${NUM_VALUES} -l ${NUM_SAMPLES} -n random > ${INPUT_FILE}
villas signal -v ${NUM_VALUES} -l ${NUM_SAMPLES} -n random > ${INPUT_FILE}
for FORMAT in villas.human gtnet.fake protobuf; do
for LAYER in udp ip eth unix; do
@ -97,7 +93,7 @@ cat > ${CONFIG_FILE} << EOF
}
EOF
villas-pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} node1 < ${INPUT_FILE} > ${OUTPUT_FILE}
villas pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} node1 < ${INPUT_FILE} > ${OUTPUT_FILE}
# Ignore timestamp and seqeunce no if in raw format
if ! villas_format_supports_header $FORMAT; then
@ -105,7 +101,7 @@ if ! villas_format_supports_header $FORMAT; then
fi
# Compare data
villas-compare ${CMPFLAGS} ${INPUT_FILE} ${OUTPUT_FILE}
villas compare ${CMPFLAGS} ${INPUT_FILE} ${OUTPUT_FILE}
RC=$?
if (( ${RC} != 0 )); then

View file

@ -1,6 +1,6 @@
#!/bin/bash
#
# Integration loopback test for villas-pipe.
# Integration loopback test for villas pipe.
#
# @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
# @copyright 2014-2020, Institute for Automation of Complex Power Systems, EONERC
@ -25,10 +25,6 @@
# Test is broken
exit 99
SCRIPT=$(realpath $0)
SCRIPTPATH=$(dirname ${SCRIPT})
source ${SCRIPTPATH}/../../tools/villas-helper.sh
CONFIG_FILE=$(mktemp)
CONFIG_FILE2=$(mktemp)
INPUT_FILE=$(mktemp)
@ -64,21 +60,18 @@ cat > ${CONFIG_FILE2} << EOF
EOF
# Generate test data
VILLAS_LOG_PREFIX=$(colorize "[Signal]") \
villas-signal -l ${NUM_SAMPLES} -n random > ${INPUT_FILE}
villas signal -l ${NUM_SAMPLES} -n random > ${INPUT_FILE}
VILLAS_LOG_PREFIX=$(colorize "[Recv] ") \
villas-pipe -r -l ${NUM_SAMPLES} ${CONFIG_FILE2} node2 | tee ${OUTPUT_FILE} &
villas pipe -r -l ${NUM_SAMPLES} ${CONFIG_FILE2} node2 | tee ${OUTPUT_FILE} &
sleep 1
VILLAS_LOG_PREFIX=$(colorize "[Send] ") \
villas-pipe -s ${CONFIG_FILE} node1 < <(sleep 1; cat ${INPUT_FILE})
villas pipe -s ${CONFIG_FILE} node1 < <(sleep 1; cat ${INPUT_FILE})
wait $!
# Compare data
villas-compare ${INPUT_FILE} ${OUTPUT_FILE}
villas compare ${INPUT_FILE} ${OUTPUT_FILE}
RC=$?
rm ${OUTPUT_FILE} ${INPUT_FILE} ${CONFIG_FILE} ${CONFIG_FILE2}

View file

@ -1,6 +1,6 @@
#!/bin/bash
#
# Integration loopback test for villas-pipe.
# Integration loopback test for villas pipe.
#
# @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
# @copyright 2014-2020, Institute for Automation of Complex Power Systems, EONERC
@ -22,10 +22,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
##################################################################################
SCRIPT=$(realpath $0)
SCRIPTPATH=$(dirname ${SCRIPT})
source ${SCRIPTPATH}/../../tools/villas-helper.sh
CONFIG_FILE=$(mktemp)
INPUT_FILE=$(mktemp)
OUTPUT_FILE=$(mktemp)
@ -33,7 +29,7 @@ OUTPUT_FILE=$(mktemp)
NUM_SAMPLES=${NUM_SAMPLES:-10}
# Generate test data
villas-signal -l ${NUM_SAMPLES} -n -v 5 random > ${INPUT_FILE}
villas signal -l ${NUM_SAMPLES} -n -v 5 random > ${INPUT_FILE}
VECTORIZE="10"
FORMAT="protobuf"
@ -62,10 +58,10 @@ cat > ${CONFIG_FILE} << EOF
}
EOF
villas-pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} node1 > ${OUTPUT_FILE} < ${INPUT_FILE}
villas pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} node1 > ${OUTPUT_FILE} < ${INPUT_FILE}
# Compare data
villas-compare ${INPUT_FILE} ${OUTPUT_FILE}
villas compare ${INPUT_FILE} ${OUTPUT_FILE}
RC=$?
rm ${OUTPUT_FILE} ${INPUT_FILE} ${CONFIG_FILE}

View file

@ -25,11 +25,6 @@
# Test is broken
exit 99
SCRIPT=$(realpath $0)
SCRIPTPATH=$(dirname ${SCRIPT})
SRCDIR=$(realpath ${SCRIPTPATH}/../..)
source ${SRCDIR}/tools/villas-helper.sh
CONFIG_FILE=$(mktemp)
INPUT_FILE=$(mktemp)
OUTPUT_FILE=$(mktemp)
@ -41,7 +36,7 @@ NUM_SAMPLES=${NUM_SAMPLES:-20}
NUM_VALUES=${NUM_VALUES:-5}
# Generate test data
villas-signal -l ${NUM_SAMPLES} -v ${NUM_VALUES} -n random > ${INPUT_FILE}
villas signal -l ${NUM_SAMPLES} -v ${NUM_VALUES} -n random > ${INPUT_FILE}
case ${LAYER} in
unix)
@ -89,13 +84,13 @@ fi
sleep 1
villas-pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} py-client > ${OUTPUT_FILE} < ${INPUT_FILE}
villas pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} py-client > ${OUTPUT_FILE} < ${INPUT_FILE}
kill ${CPID}
wait ${CPID}
# Compare data
villas-compare ${CMPFLAGS} ${INPUT_FILE} ${OUTPUT_FILE}
villas compare ${CMPFLAGS} ${INPUT_FILE} ${OUTPUT_FILE}
RC=$?
rm ${CONFIG_FILE} ${INPUT_FILE} ${OUTPUT_FILE}

View file

@ -40,5 +40,5 @@ for CONFIG in ${CONFIGS}; do
fi
echo "=== Testing config: ${CONFIG}"
villas-test-config -c ${CONFIG}
villas test-config -c ${CONFIG}
done