This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
daniel gerrit-no-reply at lists.osmocom.orgdaniel has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19583 ) Change subject: Update bsc tester config to enable stats testing ...................................................................... Update bsc tester config to enable stats testing Change-Id: I6ed591cdc4d3108547eda2a1755ae6f6cef2b4d2 Related: SYS#4877 Depends: I8526b645dc4af59adcc1855699421a026f505c1d (osmo-ttcn3-hacks) --- M ttcn3-bsc-test/BSC_Tests.cfg M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/jenkins.sh M ttcn3-bsc-test/osmo-bsc.cfg M ttcn3-bsc-test/pre-mscpool-osmo-bsc.cfg M ttcn3-bsc-test/sccplite/BSC_Tests.cfg M ttcn3-bsc-test/sccplite/osmo-bsc.cfg 7 files changed, 46 insertions(+), 3 deletions(-) Approvals: daniel: Looks good to me, approved; Verified diff --git a/ttcn3-bsc-test/BSC_Tests.cfg b/ttcn3-bsc-test/BSC_Tests.cfg index fab146d..9aef82a 100644 --- a/ttcn3-bsc-test/BSC_Tests.cfg +++ b/ttcn3-bsc-test/BSC_Tests.cfg @@ -7,6 +7,7 @@ [TESTPORT_PARAMETERS] *.BSCVTY.CTRL_HOSTNAME := "172.18.2.20" +*.STATSVTY.CTRL_HOSTNAME := "172.18.2.20" [MODULE_PARAMETERS] BSC_Tests.mp_bsc_ip := "172.18.2.20"; @@ -51,6 +52,7 @@ BSC_Tests_CBSP.mp_cgi_bts1 := { '001'H, '01'H, 1, 1 }; BSC_Tests_CBSP.mp_cgi_bts2 := { '001'H, '01'H, 2, 1 }; BSC_Tests_CBSP.mp_cgi_bts3 := { '001'H, '01'H, 3, 3 }; +StatsD_Checker.mp_enable_stats := true; [MAIN_CONTROLLER] diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh index ee4417c..f49474b 100755 --- a/ttcn3-bsc-test/jenkins-sccplite.sh +++ b/ttcn3-bsc-test/jenkins-sccplite.sh @@ -18,6 +18,13 @@ network_create 12 +# Disable stats testing until libosmocore release > 1.4.0 +if [ "$IMAGE_SUFFIX" = "latest" ]; then + sed -i "s/^StatsD_Checker.mp_enable_stats.*/StatsD_Checker.mp_enable_stats := false;/" $VOL_BASE_DIR/bsc-tester/BSC_Tests.cfg + sed -i "s/stats interval 0//" $VOL_BASE_DIR/bsc/osmo-bsc.cfg + sed -i "s/flush-period 1//" $VOL_BASE_DIR/bsc/osmo-bsc.cfg +fi + echo Starting container with BSC docker run --rm \ --network $NET_NAME --ip 172.18.12.20 \ diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh index 0218a8f..2319b9c 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -24,6 +24,13 @@ cp pre-mscpool-osmo-bsc.cfg $VOL_BASE_DIR/bsc/osmo-bsc.cfg fi +# Disable stats testing until libosmocore release > 1.4.0 +if [ "$IMAGE_SUFFIX" = "latest" ]; then + sed -i "s/^StatsD_Checker.mp_enable_stats.*/StatsD_Checker.mp_enable_stats := false;/" $VOL_BASE_DIR/bsc-tester/BSC_Tests.cfg + sed -i "s/stats interval 0//" $VOL_BASE_DIR/bsc/osmo-bsc.cfg + sed -i "s/flush-period 1//" $VOL_BASE_DIR/bsc/osmo-bsc.cfg +fi + network_create 2 echo Starting container with STP diff --git a/ttcn3-bsc-test/osmo-bsc.cfg b/ttcn3-bsc-test/osmo-bsc.cfg index 13e7f60..bce5941 100644 --- a/ttcn3-bsc-test/osmo-bsc.cfg +++ b/ttcn3-bsc-test/osmo-bsc.cfg @@ -45,7 +45,15 @@ logging level lm3ua notice logging level lmgcp notice ! -stats interval 5 +stats interval 0 +stats reporter statsd + prefix TTCN3 + level subscriber + remote-ip 172.18.2.203 + remote-port 8125 + flush-period 1 + mtu 1024 + enable ! line vty no login diff --git a/ttcn3-bsc-test/pre-mscpool-osmo-bsc.cfg b/ttcn3-bsc-test/pre-mscpool-osmo-bsc.cfg index 3aa61d0..2ced140 100644 --- a/ttcn3-bsc-test/pre-mscpool-osmo-bsc.cfg +++ b/ttcn3-bsc-test/pre-mscpool-osmo-bsc.cfg @@ -34,7 +34,16 @@ logging level lm3ua notice logging level lmgcp notice ! -stats interval 5 +stats interval 0 +stats reporter statsd + prefix TTCN3 + level subscriber + remote-ip 172.18.2.203 + remote-port 8125 + flush-period 1 + mtu 1024 + enable +! ! line vty no login diff --git a/ttcn3-bsc-test/sccplite/BSC_Tests.cfg b/ttcn3-bsc-test/sccplite/BSC_Tests.cfg index 5e0485c..519de4b 100644 --- a/ttcn3-bsc-test/sccplite/BSC_Tests.cfg +++ b/ttcn3-bsc-test/sccplite/BSC_Tests.cfg @@ -7,6 +7,7 @@ [TESTPORT_PARAMETERS] *.BSCVTY.CTRL_HOSTNAME := "172.18.12.20" +*.STATSVTY.CTRL_HOSTNAME := "172.18.12.20" [MODULE_PARAMETERS] BSC_Tests.mp_bsc_ip := "172.18.12.20"; @@ -25,6 +26,7 @@ rctx := 0 } }; +StatsD_Checker.mp_enable_stats := true; [MAIN_CONTROLLER] diff --git a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg index 8d52884..2e349a4 100644 --- a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg +++ b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg @@ -34,7 +34,15 @@ logging level lm3ua notice logging level lmgcp notice ! -stats interval 5 +stats interval 0 +stats reporter statsd + prefix TTCN3 + level subscriber + remote-ip 172.18.12.203 + remote-port 8125 + flush-period 1 + mtu 1024 + enable ! line vty no login -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19583 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6ed591cdc4d3108547eda2a1755ae6f6cef2b4d2 Gerrit-Change-Number: 19583 Gerrit-PatchSet: 5 Gerrit-Owner: daniel <dwillmann at sysmocom.de> Gerrit-Reviewer: daniel <dwillmann at sysmocom.de> Gerrit-Reviewer: laforge <laforge at osmocom.org> Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200813/d31223f6/attachment.htm>