diff options
-rw-r--r-- | ttcn3-bsc-test/BSC_Tests.cfg | 2 | ||||
-rwxr-xr-x | ttcn3-bsc-test/jenkins-sccplite.sh | 7 | ||||
-rwxr-xr-x | ttcn3-bsc-test/jenkins.sh | 7 | ||||
-rw-r--r-- | ttcn3-bsc-test/osmo-bsc.cfg | 10 | ||||
-rw-r--r-- | ttcn3-bsc-test/pre-mscpool-osmo-bsc.cfg | 11 | ||||
-rw-r--r-- | ttcn3-bsc-test/sccplite/BSC_Tests.cfg | 2 | ||||
-rw-r--r-- | ttcn3-bsc-test/sccplite/osmo-bsc.cfg | 10 |
7 files changed, 46 insertions, 3 deletions
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_bts0 := { '001'H, '01'H, 1, 0 }; 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 @@ cp sccplite/osmo-bsc.cfg $VOL_BASE_DIR/bsc/ 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 @@ if [ "$IMAGE_SUFFIX" = "latest" ]; then 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 @@ log stderr 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 @@ log stderr 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 @@ BSC_Tests.mp_bssap_cfg := { 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 @@ log stderr 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 |