From e8e85297cae3b920e2f18bc14285fa44e5d30763 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Wed, 14 Apr 2021 10:23:29 +0200 Subject: [PATCH] TT#116100 bin/provide_scenario.sh: dynamic preferences * prefs and configs need to be templates in order to use dynamic values stored at scenario_ids.yml WARNING!!! Change-Id: I3574c2443844655e50d7f0fb6e10b006366aaa11 --- bin/generate_tests.sh | 2 +- bin/provide_scenario.sh | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/bin/generate_tests.sh b/bin/generate_tests.sh index b0168fe5..e2795236 100755 --- a/bin/generate_tests.sh +++ b/bin/generate_tests.sh @@ -73,7 +73,7 @@ if [ ! -x "${BIN_DIR}/generate_test.pl" ]; then exit 3 fi -for t in $(find "${DIR}" -not -regex '.+customtt.tt2' -type f -name '*.tt2' | sort); do +for t in $(find "${DIR}" -not -regex '.+customtt.tt2' -type f -name '*_test.yml.tt2' | sort); do origdir="$(dirname "${t}")" template="$(basename "${t}")" if [ -n "${DEST_DIR}" ] ; then diff --git a/bin/provide_scenario.sh b/bin/provide_scenario.sh index 89e1279e..afa3e312 100755 --- a/bin/provide_scenario.sh +++ b/bin/provide_scenario.sh @@ -174,6 +174,29 @@ delete_voip() { fi } +generate_template() { + local base=$1 + if [ -f "${SCEN_CHECK_DIR}/${base}.tt2" ]; then + if ! "${BIN_DIR}/generate_test.pl" \ + "${SCEN_CHECK_DIR}/${base}.tt2" \ + "${SCEN_CHECK_DIR}/scenario_ids.yml" > "${SCEN_CHECK_DIR}/${base}" + then + echo "Error generating ${base} from template" >&2 + exit 1 + fi + echo "* ${base} generated" + fi +} + +generate_templates() { + local prefs=( "prefs.json" ) + prefs+=( "callforward.yml" ) + + for t in "${prefs[@]}"; do + generate_template "${t}" + done +} + scenario_csv() { local DOMAIN=$1 echo "$(date) - Cleaning csv/reg.xml files" @@ -191,6 +214,8 @@ scenario_csv() { exit 2 fi + generate_templates + if [ -f "${SCEN_CHECK_DIR}/hosts" ]; then echo "$(date) - Setting foreign domains" cat "${SCEN_CHECK_DIR}/hosts" >> /etc/hosts