From 8142944b3988e11e623b83a677b310aa54db3bc5 Mon Sep 17 00:00:00 2001 From: Marvin Klimke Date: Mon, 25 Feb 2019 15:06:27 +0100 Subject: [PATCH 1/4] properly delete temp config files in rtp tests --- tests/integration/pipe-loopback-rtp-dual.sh | 2 +- tests/integration/pipe-loopback-rtp-tbf.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integration/pipe-loopback-rtp-dual.sh b/tests/integration/pipe-loopback-rtp-dual.sh index 6de543ea5..180365129 100755 --- a/tests/integration/pipe-loopback-rtp-dual.sh +++ b/tests/integration/pipe-loopback-rtp-dual.sh @@ -128,7 +128,7 @@ villas-pipe ${CONFIG_FILE_SRC} rtp_node > ${OUTPUT_FILE} villas-test-cmp ${CMPFLAGS} ${INPUT_FILE} ${OUTPUT_FILE} RC=$? -rm ${OUTPUT_FILE} ${INPUT_FILE} ${CONFIG_FILE} +rm ${OUTPUT_FILE} ${INPUT_FILE} ${CONFIG_FILE_SRC} ${CONFIG_FILE_DEST} kill $PID diff --git a/tests/integration/pipe-loopback-rtp-tbf.sh b/tests/integration/pipe-loopback-rtp-tbf.sh index 45bb5cb41..168a5616f 100755 --- a/tests/integration/pipe-loopback-rtp-tbf.sh +++ b/tests/integration/pipe-loopback-rtp-tbf.sh @@ -134,7 +134,7 @@ villas-pipe ${CONFIG_FILE_SRC} rtp_node > ${OUTPUT_FILE} villas-test-cmp ${CMPFLAGS} ${INPUT_FILE} ${OUTPUT_FILE} RC=$? -rm ${OUTPUT_FILE} ${INPUT_FILE} ${CONFIG_FILE} +rm ${OUTPUT_FILE} ${INPUT_FILE} ${CONFIG_FILE_SRC} ${CONFIG_FILE_DEST} kill $PID exit $RC From 4cf457e8a8aadf307b9a4bd11f4230ef69d5c626 Mon Sep 17 00:00:00 2001 From: Marvin Klimke Date: Mon, 25 Feb 2019 17:05:28 +0100 Subject: [PATCH 2/4] rtp: add first approach to test script with remote server support this script should perspectively start a villas-node instance on a remote server and send samples to this server, which saves it to a file that tranferred back afterwards. --- tests/integration/pipe-loopback-rtp-remote.sh | 145 ++++++++++++++++++ 1 file changed, 145 insertions(+) create mode 100644 tests/integration/pipe-loopback-rtp-remote.sh diff --git a/tests/integration/pipe-loopback-rtp-remote.sh b/tests/integration/pipe-loopback-rtp-remote.sh new file mode 100644 index 000000000..d81137ff6 --- /dev/null +++ b/tests/integration/pipe-loopback-rtp-remote.sh @@ -0,0 +1,145 @@ +#!/bin/bash +# +# Integration loopback test for villas-pipe. +# +# @author Steffen Vogel +# @author Marvin Klimke +# @copyright 2014-2019, Institute for Automation of Complex Power Systems, EONERC +# @license GNU General Public License (version 3) +# +# VILLASnode +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +################################################################################## + +if [ -n "${CI}" ]; then + echo "RTP tests are not ready yet" + exit 99 +fi + +LOCAL_ADDR=137.226.133.195 +REMOTE_ADDR=157.230.251.200 +REMOTE_USER=root + +REMOTE=ssh ${REMOTE_USER}@${REMOTE_ADDR} + +export 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) +OUTPUT_FILE=$(mktemp) + +FORMAT="villas.binary" +VECTORIZE="1" + +RATE=100 +NUM_SAMPLES=100 + +cat > ${CONFIG_FILE_SRC} << EOF +{ + "logging" : { + "level" : "debug" + }, + "nodes" : { + "rtp_node" : { + "type" : "rtp", + "format" : "${FORMAT}", + "vectorize" : ${VECTORIZE}, + "rate" : ${RATE}, + "rtcp" : { + "enabled" : true, + "mode" : "aimd", + "throttle_mode" : "decimate" + }, + "aimd" : { + "a" : 10, + "b" : 0.5 + }, + "in" : { + "address" : "0.0.0.0:12002", + "signals" : { + "count" : 5, + "type" : "float" + } + }, + "out" : { + "address" : "${REMOTE_ADDR}:12000" + } + } + } +} +EOF + +# UDP ports: 33434 - 33534 + +${REMOTE} cat > ${CONFIG_FILE_DEST} << EOF +{ + "logging" : { + "level" : "debug" + }, + "nodes" : { + "rtp_node" : { + "type" : "rtp", + "format" : "${FORMAT}", + "vectorize" : ${VECTORIZE}, + "rate" : ${RATE}, + "rtcp": { + "enabled" : true, + "mode" : "aimd", + "throttle_mode" : "decimate" + }, + "aimd" : { + "a" : 10, + "b" : 0.5 + }, + "in" : { + "address" : "0.0.0.0:12000", + "signals" : { + "count" : 5, + "type" : "float" + } + }, + "out" : { + "address" : "${LOCAL_ADDR}:12002" + } + } + } +} +EOF + +${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 > ${OUTPUT_FILE} + +scp ${REMOTE_USER}@${REMOTE_ADDR}:${OUTPUT_FILE} ${OUTPUT_FILE} + +# Compare data +villas-test-cmp ${CMPFLAGS} ${INPUT_FILE} ${OUTPUT_FILE} +RC=$? + +rm ${INPUT_FILE} ${OUTPUT_FILE} ${CONFIG_FILE_SRC} +${REMOTE} rm ${OUTPUT_FILE} ${CONFIG_FILE_DEST} + +kill ${PID} + +exit $RC From 3873847de0e97e62933c2c77a3a06bbb41aab373 Mon Sep 17 00:00:00 2001 From: Marvin Klimke Date: Tue, 12 Mar 2019 16:46:28 +0100 Subject: [PATCH 3/4] rtp: adapt test script to work with remote server --- tests/integration/pipe-loopback-rtp-remote.sh | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/tests/integration/pipe-loopback-rtp-remote.sh b/tests/integration/pipe-loopback-rtp-remote.sh index d81137ff6..597208b57 100644 --- a/tests/integration/pipe-loopback-rtp-remote.sh +++ b/tests/integration/pipe-loopback-rtp-remote.sh @@ -31,10 +31,10 @@ fi LOCAL_ADDR=137.226.133.195 REMOTE_ADDR=157.230.251.200 REMOTE_USER=root - REMOTE=ssh ${REMOTE_USER}@${REMOTE_ADDR} -export PATH=/projects/villas/node/build/src:${PATH} +PATH=/projects/villas/node/build/src:${PATH} +REMOTE PATH=/projects/villas/node/build/src:${PATH} SCRIPT=$(realpath $0) SCRIPTPATH=$(dirname ${SCRIPT}) @@ -72,14 +72,14 @@ cat > ${CONFIG_FILE_SRC} << EOF "b" : 0.5 }, "in" : { - "address" : "0.0.0.0:12002", + "address" : "0.0.0.0:33466", "signals" : { "count" : 5, "type" : "float" } }, "out" : { - "address" : "${REMOTE_ADDR}:12000" + "address" : "${REMOTE_ADDR}:33464" } } } @@ -88,7 +88,7 @@ EOF # UDP ports: 33434 - 33534 -${REMOTE} cat > ${CONFIG_FILE_DEST} << EOF +cat > ${CONFIG_FILE_DEST} << EOF { "logging" : { "level" : "debug" @@ -109,27 +109,29 @@ ${REMOTE} cat > ${CONFIG_FILE_DEST} << EOF "b" : 0.5 }, "in" : { - "address" : "0.0.0.0:12000", + "address" : "0.0.0.0:33464", "signals" : { "count" : 5, "type" : "float" } }, "out" : { - "address" : "${LOCAL_ADDR}:12002" + "address" : "${LOCAL_ADDR}:33466" } } } } 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} & PID=$! sleep 1 villas-signal mixed -v 5 -r ${RATE} -l ${NUM_SAMPLES} | tee ${INPUT_FILE} | \ -villas-pipe ${CONFIG_FILE_SRC} rtp_node > ${OUTPUT_FILE} +villas-pipe ${CONFIG_FILE_SRC} rtp_node scp ${REMOTE_USER}@${REMOTE_ADDR}:${OUTPUT_FILE} ${OUTPUT_FILE} @@ -137,7 +139,7 @@ scp ${REMOTE_USER}@${REMOTE_ADDR}:${OUTPUT_FILE} ${OUTPUT_FILE} villas-test-cmp ${CMPFLAGS} ${INPUT_FILE} ${OUTPUT_FILE} RC=$? -rm ${INPUT_FILE} ${OUTPUT_FILE} ${CONFIG_FILE_SRC} +rm ${INPUT_FILE} ${OUTPUT_FILE} ${CONFIG_FILE_DEST} ${CONFIG_FILE_SRC} ${REMOTE} rm ${OUTPUT_FILE} ${CONFIG_FILE_DEST} kill ${PID} From 0d4ab5949b901a328ecffa0c62396dab6b07e1ed Mon Sep 17 00:00:00 2001 From: Marvin Klimke Date: Tue, 12 Mar 2019 17:00:23 +0100 Subject: [PATCH 4/4] rtp: small fixes to remote test script, still need to resolve broken pipe problem --- tests/integration/pipe-loopback-rtp-remote.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 tests/integration/pipe-loopback-rtp-remote.sh diff --git a/tests/integration/pipe-loopback-rtp-remote.sh b/tests/integration/pipe-loopback-rtp-remote.sh old mode 100644 new mode 100755 index 597208b57..6419d56f6 --- a/tests/integration/pipe-loopback-rtp-remote.sh +++ b/tests/integration/pipe-loopback-rtp-remote.sh @@ -31,10 +31,10 @@ fi LOCAL_ADDR=137.226.133.195 REMOTE_ADDR=157.230.251.200 REMOTE_USER=root -REMOTE=ssh ${REMOTE_USER}@${REMOTE_ADDR} +REMOTE="ssh ${REMOTE_USER}@${REMOTE_ADDR}" PATH=/projects/villas/node/build/src:${PATH} -REMOTE PATH=/projects/villas/node/build/src:${PATH} +${REMOTE} PATH=/projects/villas/node/build/src:${PATH} SCRIPT=$(realpath $0) SCRIPTPATH=$(dirname ${SCRIPT}) @@ -131,7 +131,7 @@ PID=$! sleep 1 villas-signal mixed -v 5 -r ${RATE} -l ${NUM_SAMPLES} | tee ${INPUT_FILE} | \ -villas-pipe ${CONFIG_FILE_SRC} rtp_node + villas-pipe ${CONFIG_FILE_SRC} rtp_node scp ${REMOTE_USER}@${REMOTE_ADDR}:${OUTPUT_FILE} ${OUTPUT_FILE}