July 2025 - gerrit-log - lists.osmocom.org

[M] Change in osmo-msc[master]: msc: Initial implementation of N-PCSTATE.ind

by pespin

Attention is currently required from: fixeria, laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-msc/+/40630?usp=email ) Change subject: msc: Initial implementation of N-PCSTATE.ind ...................................................................... Patch Set 1: (2 comments) File src/libmsc/sccp_ran.c: https://gerrit.osmocom.org/c/osmo-msc/+/40630/comment/65d9d2aa_d3ad8178?usp… : PS1, Line 74: Nofind > Nofind? Done https://gerrit.osmocom.org/c/osmo-msc/+/40630/comment/ed5b448d_e5a131d3?usp… : PS1, Line 84: LOGP(DMSC, LOGL_DEBUG, "N-PCSTATE ind: affected_pc=%u sp_status=%s remote_sccp_status=%s\n", > Ack, I just used the osmo-bsc func handler as a base, which has the same problem. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/40630?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ice1b2c163b1b0d134fcaa1c8bf543038a35fabdf Gerrit-Change-Number: 40630 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Jul 2025 12:03:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

2 months, 1 week

1
0
0 0

[M] Change in osmo-msc[master]: msc: Initial implementation of N-PCSTATE.ind

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-msc/+/40630?usp=email ) Change subject: msc: Initial implementation of N-PCSTATE.ind ...................................................................... Patch Set 1: (1 comment) File src/libmsc/sccp_ran.c: https://gerrit.osmocom.org/c/osmo-msc/+/40630/comment/d46b1c32_e99ff0c1?usp… : PS1, Line 74: Nofind Nofind? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/40630?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ice1b2c163b1b0d134fcaa1c8bf543038a35fabdf Gerrit-Change-Number: 40630 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 11 Jul 2025 12:02:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

2 months, 1 week

1
0
0 0

[S] Change in osmo-hnbgw[master]: sigtran: Log N-PCSTATE.ind PC with configured format

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40638?usp=email ) Change subject: sigtran: Log N-PCSTATE.ind PC with configured format ...................................................................... sigtran: Log N-PCSTATE.ind PC with configured format Change-Id: I4049853a9eb4b0df5d998e18464ad27c47fdc942 --- M src/osmo-hnbgw/hnbgw_sccp.c 1 file changed, 7 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/38/40638/1 diff --git a/src/osmo-hnbgw/hnbgw_sccp.c b/src/osmo-hnbgw/hnbgw_sccp.c index ed58b78..2020f40 100644 --- a/src/osmo-hnbgw/hnbgw_sccp.c +++ b/src/osmo-hnbgw/hnbgw_sccp.c @@ -201,8 +201,9 @@ bool disconnected; struct osmo_ss7_instance *cs7 = hsu->ss7; - LOGP(DCN, LOGL_DEBUG, "N-PCSTATE ind: affected_pc=%u sp_status=%s remote_sccp_status=%s\n", - pcst->affected_pc, osmo_sccp_sp_status_name(pcst->sp_status), + LOGP(DCN, LOGL_DEBUG, "N-PCSTATE ind: affected_pc=%u=%s sp_status=%s remote_sccp_status=%s\n", + pcst->affected_pc, osmo_ss7_pointcode_print(cs7, pcst->affected_pc), + osmo_sccp_sp_status_name(pcst->sp_status), osmo_sccp_rem_sccp_status_name(pcst->remote_sccp_status)); /* If we don't care about that point-code, ignore PCSTATE. */ @@ -267,16 +268,16 @@ if (disconnected && cnlink_is_conn_ready(cnlink)) { LOG_CNLINK(cnlink, DCN, LOGL_NOTICE, - "now unreachable: N-PCSTATE ind: pc=%u sp_status=%s remote_sccp_status=%s\n", - pcst->affected_pc, + "now unreachable: N-PCSTATE ind: pc=%u=%s sp_status=%s remote_sccp_status=%s\n", + pcst->affected_pc, osmo_ss7_pointcode_print(cs7, pcst->affected_pc), osmo_sccp_sp_status_name(pcst->sp_status), osmo_sccp_rem_sccp_status_name(pcst->remote_sccp_status)); /* A previously usable cnlink has disconnected. Kick it back to DISC state. */ cnlink_set_disconnected(cnlink); } else if (connected && !cnlink_is_conn_ready(cnlink)) { LOG_CNLINK(cnlink, DCN, LOGL_NOTICE, - "now available: N-PCSTATE ind: pc=%u sp_status=%s remote_sccp_status=%s\n", - pcst->affected_pc, + "now available: N-PCSTATE ind: pc=%u=%s sp_status=%s remote_sccp_status=%s\n", + pcst->affected_pc, osmo_ss7_pointcode_print(cs7, pcst->affected_pc), osmo_sccp_sp_status_name(pcst->sp_status), osmo_sccp_rem_sccp_status_name(pcst->remote_sccp_status)); /* A previously unusable cnlink has become reachable. Trigger immediate RANAP RESET -- we would resend a -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40638?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I4049853a9eb4b0df5d998e18464ad27c47fdc942 Gerrit-Change-Number: 40638 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 months, 1 week

1
0
0 0

[S] Change in osmo-bsc[master]: sigtran: Log N-PCSTATE.ind PC with configured format

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/40637?usp=email ) Change subject: sigtran: Log N-PCSTATE.ind PC with configured format ...................................................................... sigtran: Log N-PCSTATE.ind PC with configured format Change-Id: I9b55beec418e1c136531422cb23dae55fe422b9e --- M src/osmo-bsc/osmo_bsc_sigtran.c 1 file changed, 7 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/37/40637/1 diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c index 8abeeb6..42e9a38 100644 --- a/src/osmo-bsc/osmo_bsc_sigtran.c +++ b/src/osmo-bsc/osmo_bsc_sigtran.c @@ -212,8 +212,9 @@ bool connected; bool disconnected; - LOGP(DMSC, LOGL_DEBUG, "N-PCSTATE ind: affected_pc=%u sp_status=%s remote_sccp_status=%s\n", - pcst->affected_pc, osmo_sccp_sp_status_name(pcst->sp_status), + LOGP(DMSC, LOGL_DEBUG, "N-PCSTATE ind: affected_pc=%u=%s sp_status=%s remote_sccp_status=%s\n", + pcst->affected_pc, osmo_ss7_pointcode_print(cs7, pcst->affected_pc), + osmo_sccp_sp_status_name(pcst->sp_status), osmo_sccp_rem_sccp_status_name(pcst->remote_sccp_status)); /* If we don't care about that point-code, ignore PCSTATE. */ @@ -276,16 +277,16 @@ if (disconnected && a_reset_conn_ready(msc)) { LOGP(DMSC, LOGL_NOTICE, - "(msc%d) now unreachable: N-PCSTATE ind: pc=%u sp_status=%s remote_sccp_status=%s\n", - msc->nr, pcst->affected_pc, + "(msc%d) now unreachable: N-PCSTATE ind: pc=%u=%s sp_status=%s remote_sccp_status=%s\n", + msc->nr, pcst->affected_pc, osmo_ss7_pointcode_print(cs7, pcst->affected_pc), osmo_sccp_sp_status_name(pcst->sp_status), osmo_sccp_rem_sccp_status_name(pcst->remote_sccp_status)); /* A previously usable MSC has disconnected. Kick the BSSMAP back to DISC state. */ bssmap_reset_set_disconnected(msc->a.bssmap_reset); } else if (connected && !a_reset_conn_ready(msc)) { LOGP(DMSC, LOGL_NOTICE, - "(msc%d) now available: N-PCSTATE ind: pc=%u sp_status=%s remote_sccp_status=%s\n", - msc->nr, pcst->affected_pc, + "(msc%d) now available: N-PCSTATE ind: pc=%u=%s sp_status=%s remote_sccp_status=%s\n", + msc->nr, pcst->affected_pc, osmo_ss7_pointcode_print(cs7, pcst->affected_pc), osmo_sccp_sp_status_name(pcst->sp_status), osmo_sccp_rem_sccp_status_name(pcst->remote_sccp_status)); /* A previously unusable MSC has become reachable. Trigger immediate BSSMAP RESET -- we would resend a -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/40637?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9b55beec418e1c136531422cb23dae55fe422b9e Gerrit-Change-Number: 40637 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 months, 1 week

1
0
0 0

[M] Change in osmo-msc[master]: msc: Initial implementation of N-PCSTATE.ind

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-msc/+/40630?usp=email ) Change subject: msc: Initial implementation of N-PCSTATE.ind ...................................................................... Patch Set 1: (1 comment) File src/libmsc/sccp_ran.c: https://gerrit.osmocom.org/c/osmo-msc/+/40630/comment/791783a0_0dec76a7?usp… : PS1, Line 84: LOGP(DMSC, LOGL_DEBUG, "N-PCSTATE ind: affected_pc=%u sp_status=%s remote_sccp_status=%s\n", > as usual, please print pointcodes in the user-configured point-code format, not [just?] as integer. Ack, I just used the osmo-bsc func handler as a base, which has the same problem. I'll submit a fix for osmo-bsc too. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/40630?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ice1b2c163b1b0d134fcaa1c8bf543038a35fabdf Gerrit-Change-Number: 40630 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 10 Jul 2025 19:57:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

2 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: msc: Introduce test TC_stat_bsc_sctp_disconnected

by pespin

Attention is currently required from: fixeria, laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40636?usp=email ) Change subject: msc: Introduce test TC_stat_bsc_sctp_disconnected ...................................................................... Patch Set 1: (2 comments) File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40636/comment/e1621850_0da2… : PS1, Line 7699: disconnect > Why you're connecting and disconnecting this port several times? […] In here is not yet relevant, but I'm following the same as done already in bsc-test, because usually vc_STATSD:STATSD_PROC is plugged into the BSC_ConnHdlr when it is run, so here I disconnect to avoid collisions if later we add such connection in this testsuite too. File msc/expected-results.xml: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40636/comment/fa528389_fdfa… : PS1, Line 2: 228 > You're adding 2 new testcase items, so `227 + 2 = 229`. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40636?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4cf30ea09cb1d1286bd5ab6975f3f27e39b9c183 Gerrit-Change-Number: 40636 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Jul 2025 19:57:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

2 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: msc: Introduce test TC_stat_bsc_sctp_disconnected

by pespin

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40636?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: msc: Introduce test TC_stat_bsc_sctp_disconnected ...................................................................... msc: Introduce test TC_stat_bsc_sctp_disconnected Related: OS#5917 Depends: osmo-msc.git Change-Id Ice1b2c163b1b0d134fcaa1c8bf543038a35fabdf Change-Id: I4cf30ea09cb1d1286bd5ab6975f3f27e39b9c183 --- M msc/MSC_Tests.default M msc/MSC_Tests.ttcn M msc/MSC_Tests_Iu.ttcn M msc/expected-results.xml 4 files changed, 196 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/36/40636/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40636?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4cf30ea09cb1d1286bd5ab6975f3f27e39b9c183 Gerrit-Change-Number: 40636 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

2 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: RAN_Emulation: Fix handling of IMSI in RANAP Paging

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40634?usp=email ) Change subject: RAN_Emulation: Fix handling of IMSI in RANAP Paging ...................................................................... RAN_Emulation: Fix handling of IMSI in RANAP Paging The IMSI in RANAP Paging messages is encoded in octetstring BCD format. We need to decode it before using it, since we use plain hexstrings everywhere in the module to manage IMSIs. Take the chance to clean up and improve logging on related lines, both for BSSAP and RANAP. Change-Id: Ia892a52bad41a4e331703bbab438d8c811b2025e --- M library/Osmocom_Types.ttcn M library/RAN_Emulation.ttcnpp 2 files changed, 24 insertions(+), 7 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/Osmocom_Types.ttcn b/library/Osmocom_Types.ttcn index a7e37e6..690535c 100644 --- a/library/Osmocom_Types.ttcn +++ b/library/Osmocom_Types.ttcn @@ -265,6 +265,22 @@ return ret; } +function imsi_oct2hex(octetstring imsi) return hexstring { + var hexstring ret := ''H + var integer i; + + /* swap nibbles and skip F */ + for (i := 0; i < lengthof(imsi); i := i+1) { + var hexstring h := oct2hex(imsi[i]); + if (h[0] == 'F'H) { + ret := ret & h[1]; + } else { + ret := ret & h[1] & h[0]; + } + } + return ret; +} + function f_pad_oct(octetstring str, integer len, OCT1 pad) return octetstring { var integer strlen := lengthof(str); for (var integer i := 0; i < len-strlen; i := i+1) { diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp index 9401ed6..4e28ab2 100644 --- a/library/RAN_Emulation.ttcnpp +++ b/library/RAN_Emulation.ttcnpp @@ -565,18 +565,19 @@ runs on RAN_Emulation_CT return template PDU_BSSAP { if (match(bssap, tr_BSSMAP_Paging)) { var RAN_ConnHdlr client := null; - var template OCT4 tmsi := omit; + var hexstring imsi := bssap.pdu.bssmap.paging.iMSI.digits; + var template (omit) OCT4 tmsi := omit; if (ispresent(bssap.pdu.bssmap.paging.tMSI)) { tmsi := bssap.pdu.bssmap.paging.tMSI.tmsiOctets; } - client := f_imsi_table_find(bssap.pdu.bssmap.paging.iMSI.digits, tmsi); + client := f_imsi_table_find(imsi, tmsi); if (client != null) { log("CommonBssmapUnitdataCallback: IMSI/TMSI found in table, dispatching to ", client); CLIENT.send(bssap) to client; return omit; } - log("CommonBssmapUnitdataCallback: IMSI/TMSI not found in table"); + log("CommonBssmapUnitdataCallback: IMSI=", imsi, ", TMSI=", tmsi, " not found in table"); } else { log("CommonBssmapUnitdataCallback: Not a paging message"); } @@ -719,8 +720,8 @@ if (match(ranap, tr_RANAP_Paging(?, ?))) { var RAN_ConnHdlr client := null; /* extract IMSI and (if present) TMSI */ - var IMSI imsi := ranap.initiatingMessage.value_.paging.protocolIEs[1].value_.permanentNAS_UE_ID.iMSI; - var template OCT4 tmsi := omit; + var hexstring imsi := imsi_oct2hex(ranap.initiatingMessage.value_.paging.protocolIEs[1].value_.permanentNAS_UE_ID.iMSI); + var template (omit) OCT4 tmsi := omit; if (lengthof(ranap.initiatingMessage.value_.paging.protocolIEs) > 2 and ranap.initiatingMessage.value_.paging.protocolIEs[2].id == id_TemporaryUE_ID) { var TemporaryUE_ID ue_id; @@ -731,14 +732,14 @@ tmsi := ue_id.p_TMSI; } } - client := f_imsi_table_find(oct2hex(imsi), tmsi); + client := f_imsi_table_find(imsi, tmsi); if (client != null) { log("CommonRanapUnitdataCallback: IMSI/TMSI found in table, dispatching to ", client); CLIENT.send(ranap) to client; return omit; } - log("CommonRanapUnitdataCallback: IMSI/TMSI not found in table"); + log("CommonRanapUnitdataCallback: IMSI=", imsi, ", TMSI=", tmsi, " not found in table"); } else if (match(ranap, tr_RANAP_ResetResource(?, ?, ?))) { /* extract IuSigConId */ if (lengthof(ranap.initiatingMessage.value_.resetResource.protocolIEs) > 2 and -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40634?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: Ia892a52bad41a4e331703bbab438d8c811b2025e Gerrit-Change-Number: 40634 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: msc: Add suport to obtain statsd output

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40635?usp=email ) Change subject: msc: Add suport to obtain statsd output ...................................................................... msc: Add suport to obtain statsd output It will be used in a follow-up commit introducing a new test. Change-Id: I66ffb278a7ddff975e43f72d9ec6b323705f720c --- M msc/MSC_Tests.default M msc/MSC_Tests.ttcn M msc/README.md M msc/gen_links.sh M msc/osmo-msc.cfg M msc/regen_makefile.sh 6 files changed, 42 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/msc/MSC_Tests.default b/msc/MSC_Tests.default index 98bf299..34954bd 100644 --- a/msc/MSC_Tests.default +++ b/msc/MSC_Tests.default @@ -22,6 +22,15 @@ *.MSCVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" *.MSCVTY.CTRL_DETECT_CONNECTION_ESTABLISHMENT_RESULT := "yes" *.MSCVTY.PROMPT1 := "OsmoMSC> " +*.STATSVTY.CTRL_MODE := "client" +*.STATSVTY.CTRL_HOSTNAME := "127.0.0.1" +*.STATSVTY.CTRL_PORTNUM := "4254" +*.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 := "OsmoMSC> " [MODULE_PARAMETERS] diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 22b6608..1ba52d9 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -78,6 +78,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 SS_Types all; import from SS_Templates all; import from USSD_Helpers all; @@ -90,7 +95,7 @@ /* Needed for SGsAP SMS */ import from MobileL3_SMS_Types all; -type component MTC_CT extends CTRL_Adapter_CT { +type component MTC_CT extends CTRL_Adapter_CT, StatsD_ConnHdlr { var boolean g_initialized := false; var RAN_Adapter g_bssap[NUM_BSC]; @@ -108,6 +113,10 @@ /* VTY to MSC */ port TELNETasp_PT MSCVTY; + /* StatsD */ + var StatsD_Checker_CT vc_STATSD; + var float g_statd_timeout := 5.0; + /* A port to directly send BSSAP messages. This port is used for * tests that require low level access to sen arbitrary BSSAP * messages. Run f_init_bssap_direct() to connect and initialize */ @@ -129,6 +138,8 @@ charstring mp_msc_ip := "127.0.0.1"; integer mp_msc_ctrl_port := 4255; integer mp_msc_vty_port := 4254; + /* port number to which to listen for STATSD metrics */ + integer mp_msc_statsd_port := 8125; /* local parameters of emulated HLR */ boolean mp_mm_info := false; @@ -137,6 +148,11 @@ charstring mp_mgw_ip := "127.0.0.1"; integer mp_mgw_port := 2427; + /* Address where we listen for STATSD metrics */ + charstring mp_local_statsd_ip := "127.0.0.1"; + charstring mp_statsd_prefix := "TTCN3."; + + charstring mp_msc_mncc := "/tmp/mncc"; integer mp_msc_smpp_port := 2775; @@ -357,6 +373,8 @@ f_init_sgsap("MSC_Test"); } + f_init_statsd("MSC_Test", vc_STATSD, mp_local_statsd_ip, mp_msc_statsd_port, g_statd_timeout); + } /* Initialize for a direct connection to BSSAP. This function is an alternative diff --git a/msc/README.md b/msc/README.md index d79303b..d411b0c 100644 --- a/msc/README.md +++ b/msc/README.md @@ -9,6 +9,7 @@ * SMPP (emulates ESME side) * VTY * CTRL + * StatsD {% dot msc_tests.svg digraph G { @@ -21,6 +22,7 @@ ATS -> MSC [label="SMPP",style="dashed"]; ATS -> MSC [label="CTRL"]; ATS -> MSC [label="VTY"]; + MSC -> ATS [label="StatsD"]; MSC -> ATS [label="GSUP"]; MSC -> ATS [label="MGCP"]; ATS -> STP [label="A BSSAP\nSCCP/M3UA"]; diff --git a/msc/gen_links.sh b/msc/gen_links.sh index 63d90fc..f18c2f8 100755 --- a/msc/gen_links.sh +++ b/msc/gen_links.sh @@ -103,6 +103,7 @@ FILES+="SS_Templates.ttcn SCCP_Templates.ttcn USSD_Helpers.ttcn " FILES+="SGsAP_Templates.ttcn SGsAP_CodecPort.ttcn SGsAP_CodecPort_CtrlFunct.ttcn SGsAP_CodecPort_CtrlFunctDef.cc SGsAP_Emulation.ttcn DNS_Helpers.ttcn " FILES+="SCTP_Templates.ttcn " +FILES+="StatsD_Types.ttcn StatsD_CodecPort.ttcn StatsD_CodecPort_CtrlFunct.ttcn StatsD_CodecPort_CtrlFunctdef.cc StatsD_Checker.ttcnpp " gen_links $DIR $FILES gen_links_finish diff --git a/msc/osmo-msc.cfg b/msc/osmo-msc.cfg index 61b03cf..9b52896 100644 --- a/msc/osmo-msc.cfg +++ b/msc/osmo-msc.cfg @@ -34,7 +34,15 @@ logging level vlr debug logging level iucs debug ! -stats interval 5 +stats interval 0 +stats reporter statsd + prefix TTCN3 + level subscriber + remote-ip 127.0.0.1 + remote-port 8125 + flush-period 1 + mtu 1024 + enable ! line vty no login diff --git a/msc/regen_makefile.sh b/msc/regen_makefile.sh index b254f9d..7f897a5 100755 --- a/msc/regen_makefile.sh +++ b/msc/regen_makefile.sh @@ -23,6 +23,7 @@ SGsAP_CodecPort_CtrlFunctDef.cc SMPP_CodecPort_CtrlFunctDef.cc SMPP_EncDec.cc + StatsD_CodecPort_CtrlFunctdef.cc SS_EncDec.cc TCCConversion.cc TCCEncoding.cc @@ -41,6 +42,7 @@ -DRAN_EMULATION_CTRL -DRAN_EMULATION_MGCP -DRAN_EMULATION_RANAP + -DSTATSD_HAVE_VTY -DUSE_MTP3_DISTRIBUTOR " -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40635?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: I66ffb278a7ddff975e43f72d9ec6b323705f720c Gerrit-Change-Number: 40635 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: msc: Introduce test TC_stat_bsc_sctp_disconnected

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40636?usp=email ) Change subject: msc: Introduce test TC_stat_bsc_sctp_disconnected ...................................................................... Patch Set 1: (2 comments) File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40636/comment/77f0a16e_dcb7… : PS1, Line 7699: disconnect Why you're connecting and disconnecting this port several times? Why not connecting just once and keeping it connected? File msc/expected-results.xml: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40636/comment/43ca2c51_19a3… : PS1, Line 2: 228 You're adding 2 new testcase items, so `227 + 2 = 229`. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40636?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4cf30ea09cb1d1286bd5ab6975f3f27e39b9c183 Gerrit-Change-Number: 40636 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Jul 2025 19:54:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

2 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2025