From: Eduardo Ramos Testillano (ert) Date: Tue, 14 Sep 2021 21:31:18 +0000 (+0200) Subject: Fix ADML component test X-Git-Url: https://git.teslayout.com/public/public/public/?a=commitdiff_plain;h=609c79ead77490f99f3f34836b19820999a85169;p=anna.git Fix ADML component test Recent ae-adml-http image refactoring changed the entrypoint omitting ADML arguments, now passed at ct script. Also, nginx proxy will expose ipv6 on same admin port 8074. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 9647c33..fd3d498 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ enable_language(C CXX) # Project version set(VERSION_MAJOR 1) set(VERSION_MINOR 0) -set(VERSION_PATCH 2) +set(VERSION_PATCH 3) # Dynamic libraries not linked to build tree: set(CMAKE_SKIP_RPATH TRUE) diff --git a/docker-images/anna-adml-http/etc/nginx/conf.d/default.conf b/docker-images/anna-adml-http/etc/nginx/conf.d/default.conf index 0471e4f..79bcf12 100644 --- a/docker-images/anna-adml-http/etc/nginx/conf.d/default.conf +++ b/docker-images/anna-adml-http/etc/nginx/conf.d/default.conf @@ -1,6 +1,6 @@ server { listen 8074 http2; - listen [::]:8075 http2; + listen [::]:8074 http2 ipv6only=on; #It is possible to enable another port for pure HTTP11: #listen 8073; #listen [::]:8073; diff --git a/example/diameter/launcher/resources/rest_api/README.md b/example/diameter/launcher/resources/rest_api/README.md index 5eb6dba..098dc85 100644 --- a/example/diameter/launcher/resources/rest_api/README.md +++ b/example/diameter/launcher/resources/rest_api/README.md @@ -39,4 +39,4 @@ This will create the corresponding diameter message representation in two format Go to [ct](./ct) directory and execute: 1. pip3 install -r requirements.txt -2. pytest *-or-* pytest -n (parallel execution) \ No newline at end of file +2. pytest *-or-* pytest -n (parallel execution) diff --git a/example/diameter/launcher/resources/rest_api/ct/ct.sh b/example/diameter/launcher/resources/rest_api/ct/ct.sh index fc69e8f..a6e0d75 100755 --- a/example/diameter/launcher/resources/rest_api/ct/ct.sh +++ b/example/diameter/launcher/resources/rest_api/ct/ct.sh @@ -12,7 +12,8 @@ ENDPOINT=http://localhost:8074 PORT=$(echo ${ENDPOINT} | cut -d: -f3) SVC_NAME=anna-adml-http # Entrypoint arguments (ft/st): -EXTRA_ARGUMENTS= # default is ft (function test: debug traces and traffic logs) +ADML_ARGUMENTS="--services services.xml --cntDir counters --tmDir tm --cntRecordPeriod 60000 --logStatisticSamples none --reconnectionPeriod 10000 --httpServer 0.0.0.0:8000" +#ADML_ARGUMENTS+=" --trace debug" VARIANT=${1:-Release} @@ -52,12 +53,7 @@ then docker kill ${SVC_NAME} &>/dev/null docker kill ${SVC_NAME}-debug &>/dev/null - echo "Optimize for system test (disable traffic logs and set warning level for traces) (y/n) [n]:" - read opt - [ -z "${opt}" ] && opt=n - [ "${opt}" = "y" ] && EXTRA_ARGUMENTS=st - - cid=$(docker run --rm -d -p ${PORT}:${PORT} --name ${cname} anna-adml-http:${version} ${EXTRA_ARGUMENTS} >/dev/null) + cid=$(docker run --rm -d -p ${PORT}:${PORT} --name ${cname} anna-adml-http:${version} ${ADML_ARGUMENTS} >/dev/null) [ $? -ne 0 ] && exit 1 echo "Container id: ${cid} (deployed as '${cname}')" fi