- gerrit-log - lists.osmocom.org

[S] Change in osmo-ttcn3-hacks[master]: library/RSL_Emulation: make use of IpaUnitId codec
by fixeria 19 Apr '24

19 Apr '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36611?usp=email ) Change subject: library/RSL_Emulation: make use of IpaUnitId codec ...................................................................... library/RSL_Emulation: make use of IpaUnitId codec Change-Id: I20e1ac35707affc6aab60397a22e33fe2bd1106e --- M library/RSL_Emulation.ttcn 1 file changed, 19 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/11/36611/1 diff --git a/library/RSL_Emulation.ttcn b/library/RSL_Emulation.ttcn index 891e565..17e35ab 100644 --- a/library/RSL_Emulation.ttcn +++ b/library/RSL_Emulation.ttcn @@ -370,9 +370,7 @@ private function f_trx_conn_map_register(integer conn_id, in IpaCcmIdResp id_resp) runs on RSL_Emulation_CT return IpaStreamId { - var template charstring unit_id_fmt := pattern "(\d+)/(\d+)/(\d+)"; - var charstring unit_id; - var integer trx_nr; + var IpaUnitId unit_id; var integer idx; /* Check if we have room for a new connection */ @@ -386,29 +384,21 @@ testcase.stop("IPA IDENTITY RESPONSE contains no unit-id"); } - /* Make sure that IPA unit-id is valid */ - unit_id := oct2char(id_resp[idx].data); - if (not match(unit_id, unit_id_fmt)) { - testcase.stop("IPA unit-id has unknown/unexpected format"); - } + /* Parse IPA unit-id */ + unit_id := dec_IpaUnitId(oct2char(id_resp[idx].data)); - /* Parse transceiver number (site/bts/trx). - * TODO: implement and use declaratice types. */ - unit_id := regexp(unit_id, unit_id_fmt, 2); - trx_nr := str2int(unit_id); - - if (trx_nr >= sizeof(TrxConnMap)) { - testcase.stop("Transceiver #", trx_nr, " does not fit"); - } else if (TrxConnMap[trx_nr] != -1) { - testcase.stop("Transceiver #", trx_nr, " is already connected?!?"); + if (unit_id.trx_id >= sizeof(TrxConnMap)) { + testcase.stop("Transceiver #", unit_id.trx_id, " does not fit"); + } else if (TrxConnMap[unit_id.trx_id] != -1) { + testcase.stop("Transceiver #", unit_id.trx_id, " is already connected?!?"); } /* Finally, store the connection ID */ - log("Mapped TRX#", trx_nr, " to TCP/IP conn_id=", conn_id); - TrxConnMap[trx_nr] := conn_id; + log("Mapped TRX#", unit_id.trx_id, " to TCP/IP conn_id=", conn_id); + TrxConnMap[unit_id.trx_id] := conn_id; TrxConnNum := TrxConnNum + 1; - return f_streamId_by_trx(trx_nr); + return f_streamId_by_trx(unit_id.trx_id); } private function f_trx_conn_map_unregister(integer conn_id) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36611?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I20e1ac35707affc6aab60397a22e33fe2bd1106e Gerrit-Change-Number: 36611 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ttcn3-hacks[master]: bsc: make use of IpaUnitId codec
by fixeria 19 Apr '24

19 Apr '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36612?usp=email ) Change subject: bsc: make use of IpaUnitId codec ...................................................................... bsc: make use of IpaUnitId codec Change-Id: Iaf38fdb0a1c3ada5af6f1a05c7a9008e4eae0727 --- M bsc/BSC_Tests.ttcn 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/12/36612/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 5e4ebbc..8dcff83 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -981,7 +981,7 @@ clnt.vc_IPA := IPA_Emulation_CT.create(clnt.id & "-IPA") alive; clnt.ccm_pars := c_IPA_default_ccm_pars; clnt.ccm_pars.name := "Osmocom TTCN-3 BTS Simulator"; - clnt.ccm_pars.unit_id := int2str(1234 + idx.bts) & "/0/" & int2str(idx.trx); + clnt.ccm_pars.unit_id := enc_IpaUnitId({1234 + idx.bts, 0, idx.trx}); if (handler_mode) { clnt.vc_RSL := RSL_Emulation_CT.create(clnt.id & "-RSL") alive; connect(clnt.vc_RSL:CCHAN_PT, self:RSL_CCHAN[idx.bts]); @@ -3946,7 +3946,7 @@ client.vc_IPA := IPA_Emulation_CT.create(client.id & "-IPA") alive; client.ccm_pars := c_IPA_default_ccm_pars; client.ccm_pars.name := "Osmocom TTCN-3 BTS Simulator"; - client.ccm_pars.unit_id := "99/0/0"; /* value which is unknown at BTS */ + client.ccm_pars.unit_id := enc_IpaUnitId({99, 0, 0}); /* value which is unknown at BTS */ f_ipa_ctrl_start_client(mp_bsc_ip, mp_bsc_ctrl_port); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36612?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iaf38fdb0a1c3ada5af6f1a05c7a9008e4eae0727 Gerrit-Change-Number: 36612 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-ttcn3-hacks[master]: sgsn: TC_sgsn_context_req_in: match PDP Context IE
by fixeria 19 Apr '24

19 Apr '24

Attention is currently required from: fixeria, osmith, pespin. Hello Jenkins Builder, osmith, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36601?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Code-Review+1 by osmith, Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: sgsn: TC_sgsn_context_req_in: match PDP Context IE ...................................................................... sgsn: TC_sgsn_context_req_in: match PDP Context IE Change-Id: I965c0200ea380c55dc0cd8d3f8e5110883ce2646 Related: SYS#6603, OS#6294 --- M library/GTPv1C_Templates.ttcn M sgsn/SGSN_Tests.ttcn 2 files changed, 84 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/01/36601/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36601?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I965c0200ea380c55dc0cd8d3f8e5110883ce2646 Gerrit-Change-Number: 36601 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk: Use Titan TEXT encoder to implement AMI record enc/dec
by fixeria 19 Apr '24

19 Apr '24

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36610?usp=email ) Change subject: asterisk: Use Titan TEXT encoder to implement AMI record enc/dec ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: Nice! -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36610?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If179e45307a7e42b81b28db6ee4b7bf5eeb8b5f1 Gerrit-Change-Number: 36610 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 19 Apr 2024 16:55:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk: Use Titan TEXT encoder to implement AMI record enc/dec
by pespin 19 Apr '24

19 Apr '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36610?usp=email ) Change subject: asterisk: Use Titan TEXT encoder to implement AMI record enc/dec ...................................................................... asterisk: Use Titan TEXT encoder to implement AMI record enc/dec f_ami_wait_for_prompt_str had to be fixed since it was returning content like this: "Response: Success\nMessage: Authentication accepted" Instead, the TEXT encoding expects: "Response: Success\nMessage: Authentication accepted\n" which is actually more in line with proper expectancies. Change-Id: If179e45307a7e42b81b28db6ee4b7bf5eeb8b5f1 --- M asterisk/AMI_Functions.ttcn 1 file changed, 34 insertions(+), 48 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/10/36610/1 diff --git a/asterisk/AMI_Functions.ttcn b/asterisk/AMI_Functions.ttcn index 53a7964..d5139f5 100644 --- a/asterisk/AMI_Functions.ttcn +++ b/asterisk/AMI_Functions.ttcn @@ -32,8 +32,21 @@ type record AMI_Field { charstring key, charstring val +} with { + encode "TEXT" + variant "SEPARATOR(': ', ':\s+')" }; -type set of AMI_Field AMI_Msg; + +type set of AMI_Field AMI_Msg with { + encode "TEXT" + variant "SEPARATOR('\r\n', '(\r\n)|[\n]')" + variant "END('\r\n', '(\r\n)|[\n]')" +}; + +external function enc_AMI_Msg(in AMI_Msg msg) return charstring + with { extension "prototype(convert) encode(TEXT)" } +external function dec_AMI_Msg(in charstring stream) return AMI_Msg + with { extension "prototype(convert) decode(TEXT)" } template (value) AMI_Field ts_AMI_Field(template (value) charstring key, @@ -102,49 +115,6 @@ * Functions: */ -function f_AMI_Field_from_str(charstring str) return AMI_Field { - var AMI_Field field; - /* "each field is a key value pair delineated by a ':'. - * A single space MUST follow the ':' and precede the value. "*/ - var integer pos := f_strstr(str, ": ", 0); - if (pos < 0) { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - log2str("Failed parsing AMI_Field: ", str)); - } - field.key := substr(str, 0, pos); - /* skip ": " */ - pos := pos + 2; - field.val := substr(str, pos, lengthof(str) - pos); - return field; -} - -function f_AMI_Msg_from_str(charstring str) return AMI_Msg { - var AMI_Msg msg := {}; - var Misc_Helpers.ro_charstring lines := f_str_split(str, "\n"); - - for (var integer i := 0; i < lengthof(lines); i := i + 1) { - var charstring line := lines[i]; - var AMI_Field field := f_AMI_Field_from_str(lines[i]); - msg := msg & { field }; - } - return msg; -} - -function f_AMI_Field_to_str(AMI_Field field) return charstring { - return field.key & ": " & field.val; -} - -function f_AMI_Msg_to_str(AMI_Msg msg) return charstring { - var charstring str := ""; - - for (var integer i := 0; i < lengthof(msg); i := i + 1) { - str := str & f_AMI_Field_to_str(msg[i]) & "\r\n"; - } - - str := str & "\r\n"; - return str; -} - private function f_ami_wait_for_prompt_str(TELNETasp_PT pt, charstring log_label := "(?)") return charstring { var charstring rx, buf := ""; @@ -153,7 +123,7 @@ T.start(mp_ami_prompt_timeout); alt { - [] pt.receive(pattern "\n") { }; + [] pt.receive(pattern "\n") { buf := buf & "\n" }; [] pt.receive(charstring:?) -> value rx { buf := buf & rx; repeat }; [] pt.receive(integer:?) -> value fd { if (fd == -1) { @@ -174,7 +144,7 @@ function f_ami_wait_for_prompt(TELNETasp_PT pt, charstring log_label := "(?)") return AMI_Msg { var charstring buf := f_ami_wait_for_prompt_str(pt, log_label); - var AMI_Msg msg := f_AMI_Msg_from_str(buf); + var AMI_Msg msg := dec_AMI_Msg(buf); return msg; } @@ -185,9 +155,9 @@ } function f_ami_transceive_ret(TELNETasp_PT pt, template (value) AMI_Msg tx_msg) return AMI_Msg { - var charstring tx_txt := f_AMI_Msg_to_str(valueof(tx_msg)); + var charstring tx_txt := enc_AMI_Msg(valueof(tx_msg)); var charstring resp_txt := f_ami_transceive_ret_str(pt, tx_txt); - return f_AMI_Msg_from_str(resp_txt); + return dec_AMI_Msg(resp_txt); } function f_ami_transceive_match(TELNETasp_PT pt, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36610?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If179e45307a7e42b81b28db6ee4b7bf5eeb8b5f1 Gerrit-Change-Number: 36610 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[XL] Change in osmo-ttcn3-hacks[master]: IPAd_Tests: add testsuite for an IPAd
by pespin 19 Apr '24

19 Apr '24

Attention is currently required from: dexter, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229?usp=email ) Change subject: IPAd_Tests: add testsuite for an IPAd ...................................................................... Patch Set 3: (1 comment) File ipad/IPAd_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229/comment/7d086b52_f220… PS1, Line 445: for (i := 0; i < sizeof(esipa_res.getBoundProfilePackageResponseEsipa.getBoundProfilePackageOkEsipa.boundProfilePackage.firstSequenceOf87); i := i + 1) { > I do not know if this looks much nicer ;-/ […] lol. But at least you have it once, not 6 times. So your eyes only need to do the large line parsing once. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic9ea8c69e56a2e8ddf0f506861ece6d40cbcb06d Gerrit-Change-Number: 36229 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 19 Apr 2024 14:09:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in osmo-ttcn3-hacks[master]: SGP32Definitions_Templates: add new set of templates to support rollback
by pespin 19 Apr '24

19 Apr '24

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36609?usp=email ) Change subject: SGP32Definitions_Templates: add new set of templates to support rollback ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: I wonder why do we need one encoding function for each message. Couldn't we have a generic "message" structure/union holding all the others, and then have 1 enc and 1 dec functions? That's how most of the other procols work usually. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36609?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6db76afb102bf011655b7dbca9cff07b8116eb8d Gerrit-Change-Number: 36609 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 19 Apr 2024 14:07:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: SGP32Definitions_Templates: add template tr_provideEimPackageResult_e...
by pespin 19 Apr '24

19 Apr '24

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36608?usp=email ) Change subject: SGP32Definitions_Templates: add template tr_provideEimPackageResult_ePRAndNotif ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36608?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I86231f0e9dcef90abf60757cc55895863ad2b1b3 Gerrit-Change-Number: 36608 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 19 Apr 2024 14:05:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: SGP32Definitions_Templates: rename tx_provideEimPackageResultResponse
by pespin 19 Apr '24

19 Apr '24

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36607?usp=email ) Change subject: SGP32Definitions_Templates: rename tx_provideEimPackageResultResponse ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36607?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I68536eec6d04364efdbbbd5205788cf5c8ab3028 Gerrit-Change-Number: 36607 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 19 Apr 2024 14:05:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: SGP32Definitions_Templates: use enable instead of configureAutoEnable...
by pespin 19 Apr '24

19 Apr '24

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36606?usp=email ) Change subject: SGP32Definitions_Templates: use enable instead of configureAutoEnable PSMO ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36606?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia364d5f6d510545988dc88cacdd15a2c03cc5d8b Gerrit-Change-Number: 36606 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 19 Apr 2024 14:05:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log