pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40680?usp=email ) Change subject: smlc: Add suport to obtain statsd output ...................................................................... smlc: Add suport to obtain statsd output It will be used in a follow-up commit introducing a new test. Change-Id: I52813397890a85326a85b3580fd605f9ac10a26d --- M smlc/SMLC_Tests.default M smlc/SMLC_Tests.ttcn M smlc/gen_links.sh M smlc/osmo-smlc.cfg M smlc/regen_makefile.sh 5 files changed, 40 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve diff --git a/smlc/SMLC_Tests.default b/smlc/SMLC_Tests.default index 485d215..4fa1adc 100644 --- a/smlc/SMLC_Tests.default +++ b/smlc/SMLC_Tests.default @@ -12,6 +12,15 @@ *.SMLCVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" *.SMLCVTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes" *.SMLCVTY.PROMPT1 := "OsmoSMLC> " +*.STATSVTY.CTRL_MODE := "client" +*.STATSVTY.CTRL_HOSTNAME := "127.0.0.1" +*.STATSVTY.CTRL_PORTNUM := "4271" +*.STATSVTY.CTRL_LOGIN_SKIPPED := "yes" +*.STATSVTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes" +*.STATSVTY.CTRL_READMODE := "buffered" +*.STATSVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" +*.STATSVTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes" +*.STATSVTY.PROMPT1 := "OsmoSMLC> " [MODULE_PARAMETERS] Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoSMLC"; diff --git a/smlc/SMLC_Tests.ttcn b/smlc/SMLC_Tests.ttcn index 2a50666..7bd7c26 100644 --- a/smlc/SMLC_Tests.ttcn +++ b/smlc/SMLC_Tests.ttcn @@ -43,6 +43,11 @@ import from SCCP_Templates all; +import from StatsD_Types all; +import from StatsD_CodecPort all; +import from StatsD_CodecPort_CtrlFunct all; +import from StatsD_Checker all; + import from SCCPasp_Types all; import from BSC_ConnectionHandler all; @@ -54,12 +59,16 @@ { "foo:bar", 0 } }; -type component test_CT extends CTRL_Adapter_CT { +type component test_CT extends CTRL_Adapter_CT, StatsD_ConnHdlr { var BSSAP_LE_Adapter g_bssap_le[NUM_BSC]; port BSSAP_LE_CODEC_PT BSSAP_LE; port TELNETasp_PT SMLCVTY; + /* StatsD */ + var StatsD_Checker_CT vc_STATSD; + var float g_statd_timeout := 5.0; + /* are we initialized yet */ var boolean g_initialized := false; @@ -86,6 +95,10 @@ /* IP address at which the test binds */ charstring mp_test_ip := "127.0.0.1"; + /* port number to which to listen for STATSD metrics */ + integer mp_statsd_port := 8125; + charstring mp_statsd_prefix := "TTCN3."; + BSSAP_LE_Configurations mp_bssap_le_cfg := { { sccp_service_type := "mtp3_itu", @@ -178,6 +191,8 @@ f_bssap_le_adapter_init(g_bssap_le[bssap_le_idx], mp_bssap_le_cfg[bssap_le_idx], "VirtBSC", BSC_BssapLeOps); f_bssap_le_adapter_start(g_bssap_le[bssap_le_idx]); } + + f_init_statsd("SMLC_Test", vc_STATSD, mp_test_ip, mp_statsd_port, g_statd_timeout); } function f_init_vty(charstring id := "foo") runs on test_CT { diff --git a/smlc/gen_links.sh b/smlc/gen_links.sh index 4aeedd8..3308a0b 100755 --- a/smlc/gen_links.sh +++ b/smlc/gen_links.sh @@ -69,6 +69,7 @@ DIR=../library FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn BSSAP_LE_Types.ttcn RAN_Emulation.ttcnpp RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn GSM_RR_Types.ttcn RSL_Types.ttcn RSL_Emulation.ttcn MGCP_Emulation.ttcn SDP_Templates.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc BSSAP_CodecPort.ttcn RAN_Adapter.ttcnpp Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_EncDec.cc IuUP_Emulation.ttcn SCCP_Templates.ttcn IPA_Testing.ttcn GSM_SystemInformation.ttcn GSM_RestOctets.ttcn " FILES+="BSSAP_LE_CodecPort.ttcn BSSAP_LE_Emulation.ttcn BSSAP_LE_Adapter.ttcn BSSLAP_Types.ttcn BSSMAP_LE_Templates.ttcn " +FILES+="StatsD_Types.ttcn StatsD_CodecPort.ttcn StatsD_CodecPort_CtrlFunct.ttcn StatsD_CodecPort_CtrlFunctdef.cc StatsD_Checker.ttcnpp " gen_links $DIR $FILES diff --git a/smlc/osmo-smlc.cfg b/smlc/osmo-smlc.cfg index d25c873..d034e9d 100644 --- a/smlc/osmo-smlc.cfg +++ b/smlc/osmo-smlc.cfg @@ -10,11 +10,21 @@ logging print extended-timestamp 1 logging print file basename last logging level set-all debug - +! +stats interval 0 +stats reporter statsd + prefix TTCN3 + level subscriber + remote-ip 127.0.0.203 + remote-port 8125 + flush-period 1 + mtu 1024 + enable +! line vty no login bind 0.0.0.0 - +! cs7 instance 0 point-code 0.23.6 asp asp-clnt-Lb-0 2905 2905 m3ua diff --git a/smlc/regen_makefile.sh b/smlc/regen_makefile.sh index ed37dac..c8e5e23 100755 --- a/smlc/regen_makefile.sh +++ b/smlc/regen_makefile.sh @@ -16,6 +16,7 @@ RTP_EncDec.cc SCTPasp_PT.cc SDP_EncDec.cc + StatsD_CodecPort_CtrlFunctdef.cc TCCConversion.cc TCCInterface.cc TELNETasp_PT.cc @@ -29,6 +30,7 @@ -DRAN_EMULATION_BSSAP -DRAN_EMULATION_MGCP -DRAN_EMULATION_CTRL + -DSTATSD_HAVE_VTY -DUSE_MTP3_DISTRIBUTOR " -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40680?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I52813397890a85326a85b3580fd605f9ac10a26d Gerrit-Change-Number: 40680 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>