Change in docker-playground[master]: ttcn3-pcu-test: Change config to support statsd

[daniel]

daniel has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20228 )

Change subject: ttcn3-pcu-test: Change config to support statsd
......................................................................

ttcn3-pcu-test: Change config to support statsd

Change-Id: I2779cdb4ec7cac891aa86e3fefa739e61f867691
Depends: osmo-ttcn3-hacks.git Change-Id I90964b32fa11ed2582afc5fb56bd302b06606f86
Related: SYS#4877
---
M ttcn3-pcu-test/PCU_Tests.cfg
M ttcn3-pcu-test/jenkins-sns.sh
M ttcn3-pcu-test/jenkins.sh
M ttcn3-pcu-test/osmo-pcu.cfg
4 files changed, 26 insertions(+), 1 deletion(-)

Approvals:
  pespin: Looks good to me, but someone else must approve
  daniel: Looks good to me, approved; Verified



diff --git a/ttcn3-pcu-test/PCU_Tests.cfg b/ttcn3-pcu-test/PCU_Tests.cfg
index 92f5d8a..89c997e 100644
--- a/ttcn3-pcu-test/PCU_Tests.cfg
+++ b/ttcn3-pcu-test/PCU_Tests.cfg
@@ -7,9 +7,13 @@
 [TESTPORT_PARAMETERS]
 *.PCUVTY.CTRL_HOSTNAME := "172.18.13.101"
 *.PCUVTY.PROMPT1 := "OsmoPCU> "
+*.STATSVTY.CTRL_HOSTNAME := "172.18.13.101"
+*.STATSVTY.PROMPT1 := "OsmoPCU> "
+
 
 [MODULE_PARAMETERS]
 PCU_Tests.mp_pcu_sock_path := "/data/unix/pcu_bts"
+PCU_Tests.mp_pcu_statsd_ip := "172.18.13.10"
 SGSN_Components.mp_nsconfig := {
 	address_family := AF_INET,
 	local_ip := "172.18.13.10",
@@ -20,6 +24,7 @@
 	nsei := 1234
 }
 Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoPCU";
+StatsD_Checker.mp_enable_stats := true;
 
 [MAIN_CONTROLLER]
 
diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh
index 8930885..ebc0614 100755
--- a/ttcn3-pcu-test/jenkins-sns.sh
+++ b/ttcn3-pcu-test/jenkins-sns.sh
@@ -24,6 +24,11 @@
 	# PCUIFv10 is not yet supported in the latest release
 	sed "/\[MODULE_PARAMETERS\]/ a PCUIF_Types.mp_pcuif_version := 9;" \
 		-i "$VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg"
+
+	# Disable stats testing until libosmocore release > 1.4.0
+	sed -i "s/^StatsD_Checker.mp_enable_stats.*/StatsD_Checker.mp_enable_stats := false;/" $VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg
+	sed -i "s/stats interval 0//" $VOL_BASE_DIR/pcu/osmo-pcu.cfg
+	sed -i "s/flush-period 1//" $VOL_BASE_DIR/pcu/osmo-pcu.cfg
 fi
 
 echo Starting container with PCU
diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh
index 3e0d816..5701c2c 100755
--- a/ttcn3-pcu-test/jenkins.sh
+++ b/ttcn3-pcu-test/jenkins.sh
@@ -24,6 +24,11 @@
 	# PCUIFv10 is not yet supported in the latest release
 	sed "/\[MODULE_PARAMETERS\]/ a PCUIF_Types.mp_pcuif_version := 9;" \
 		-i "$VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg"
+
+	# Disable stats testing until libosmocore release > 1.4.0
+	sed -i "s/^StatsD_Checker.mp_enable_stats.*/StatsD_Checker.mp_enable_stats := false;/" $VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg
+	sed -i "s/stats interval 0//" $VOL_BASE_DIR/pcu/osmo-pcu.cfg
+	sed -i "s/flush-period 1//" $VOL_BASE_DIR/pcu/osmo-pcu.cfg
 fi
 
 echo Starting container with PCU
diff --git a/ttcn3-pcu-test/osmo-pcu.cfg b/ttcn3-pcu-test/osmo-pcu.cfg
index 326ad59..733cebe 100644
--- a/ttcn3-pcu-test/osmo-pcu.cfg
+++ b/ttcn3-pcu-test/osmo-pcu.cfg
@@ -11,7 +11,17 @@
  logging print file basename last
  logging print extended-timestamp 1
  logging level set-all debug
-
+!
+stats interval 0
+stats reporter statsd
+ prefix TTCN3
+ level subscriber
+ remote-ip 172.18.13.10
+ remote-port 8125
+ flush-period 1
+ mtu 1024
+ enable
+!
 line vty
  no login
  bind 172.18.13.101

-- 
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20228
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I2779cdb4ec7cac891aa86e3fefa739e61f867691
Gerrit-Change-Number: 20228
Gerrit-PatchSet: 2
Gerrit-Owner: daniel <dwillmann at sysmocom.de>
Gerrit-Reviewer: daniel <dwillmann at sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200925/695dc76e/attachment.htm>