- gerrit-log - lists.osmocom.org

[S] Change in docker-playground[master]: asterisk: pjsip.conf: Mark templates accordingly
by pespin 10 May '24

10 May '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36650?usp=email ) Change subject: asterisk: pjsip.conf: Mark templates accordingly ...................................................................... asterisk: pjsip.conf: Mark templates accordingly Mark templates as such, in order to remove error messages during asterisk setup when trying to apply the templates (which lack fields such as "username", provided by config sections using the templates). Reference: https://docs.asterisk.org/Fundamentals/Asterisk-Configuration/Asterisk-Conf… Change-Id: Ia132c2e90cf6ee44145ca2e2555cf2dc6c1cfd51 --- M ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf 1 file changed, 18 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified jolly: Looks good to me, but someone else must approve diff --git a/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf b/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf index 39cf9bb..57cab41 100644 --- a/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf +++ b/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf @@ -7,8 +7,7 @@ ;external_media_address=[obfuscated] ;external_signaling_address=[obfuscated] - -[endpoint_phone_template] +[endpoint_phone_template](!) type=endpoint transport=transport-udp context=from-phone @@ -16,11 +15,11 @@ allow=alaw allow=ulaw -[auth_phone_template] +[auth_phone_template](!) type=auth auth_type=userpass -[aor_phone_template] +[aor_phone_template](!) type=aor max_contacts=1 remove_existing=yes -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36650?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia132c2e90cf6ee44145ca2e2555cf2dc6c1cfd51 Gerrit-Change-Number: 36650 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in docker-playground[master]: asterisk: pjsip.conf: Mark templates accordingly
by pespin 10 May '24

10 May '24

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36650?usp=email ) Change subject: asterisk: pjsip.conf: Mark templates accordingly ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36650?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia132c2e90cf6ee44145ca2e2555cf2dc6c1cfd51 Gerrit-Change-Number: 36650 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 10 May 2024 13:34:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-ttcn3-hacks[master]: msc: add TC_gsup_mt_sms_lu_x5 for X5 (LU delay) timer
by fixeria 10 May '24

10 May '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36772?usp=email ) Change subject: msc: add TC_gsup_mt_sms_lu_x5 for X5 (LU delay) timer ...................................................................... msc: add TC_gsup_mt_sms_lu_x5 for X5 (LU delay) timer Change-Id: I74fa174ea649adb2112c8e471c0e339a2197a08d Related: osmo-msc.git Ic519cab55d65e47b2636124427dab1a1d80fab78 Related: SYS#6913 --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn M msc/expected-results.xml 3 files changed, 78 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/72/36772/1 diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 658923e..056a3c0 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -833,7 +833,8 @@ } } -function f_perform_lu(template (omit) MobileIdentityLV use_mi := omit) +function f_perform_lu(template (omit) MobileIdentityLV use_mi := omit, + boolean expect_clear := true) runs on BSC_ConnHdlr { var MobileIdentityLV mi; if (istemplatekind(use_mi, "omit")) { @@ -866,8 +867,11 @@ f_msc_lu_hlr(); f_mm_imei(); as_accept_reject_lu(g_pars.net.expect_attach_success); - /* FIXME: there could be pending SMS or other common procedures by the MSC, let's ignore them */ - f_expect_clear(verify_vlr_cell_id := g_pars.net.expect_attach_success); + + /* there could be pending SMS or other common procedures by the MSC */ + if (expect_clear) { + f_expect_clear(verify_vlr_cell_id := g_pars.net.expect_attach_success); + } setverdict(pass); } diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 09004e8..1f9bfc4 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -3279,6 +3279,64 @@ f_vty_config(MSCVTY, "msc", "sms-over-gsup"); vc_conn := f_start_handler_with_pars(refers(f_tc_gsup_mt_multi_part_sms), pars); vc_conn.done; + Tf_vty_config(MSCVTY, "msc", "no sms-over-gsup"); +} + +/* Test X5 (LU delay) timer allowing to deliver MT SMS over the same connection */ +friend function f_TC_gsup_mt_sms_lu_x5(charstring id, BSC_ConnHdlrPars pars) +runs on BSC_ConnHdlr { + var SmsParameters spars := valueof(t_SmsPars); + + f_init_handler(pars); + + /* We need to inspect GSUP activity */ + f_create_gsup_expect(hex2str(g_pars.imsi)); + + /* Perform location update */ + f_perform_lu(expect_clear := false); + + /* Register an 'expect' for given IMSI (+TMSI) */ + f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); + + var template GSUP_PDU mt_forwardSM_res := tr_GSUP_MT_FORWARD_SM_RES( + imsi := g_pars.imsi, + /* NOTE: MSC should assign RP-MR itself */ + sm_rp_mr := ? + ); + + f_sleep(0.5); + + /* Submit a MT SMS on GSUP */ + f_gsup_forwardSM_req(spars); + + /* Wait for MT SMS on DTAP */ + f_mt_sms_expect(spars); + + /* Send RP-ACK and expect MT-forwardSM-Res on GSUP */ + f_mt_sms_send_rp_ack(spars); + alt { + [] GSUP.receive(mt_forwardSM_res) { + log("RX MT-forwardSM-Res (RP-ACK)"); + setverdict(pass); + } + [] GSUP.receive { + setverdict(fail, "Rx unexpected GSUP message"); + mtc.stop; + } + } + + f_expect_clear(); +} +testcase TC_gsup_mt_sms_lu_x5() runs on MTC_CT { + var BSC_ConnHdlrPars pars; + var BSC_ConnHdlr vc_conn; + f_init(); + pars := f_init_pars(92); + f_vty_config(MSCVTY, "msc", "sms-over-gsup"); + f_vty_config(MSCVTY, "msc", "timer geran x5 2"); + vc_conn := f_start_handler_with_pars(refers(f_TC_gsup_mt_sms_lu_x5), pars); + vc_conn.done; + f_vty_config(MSCVTY, "msc", "timer geran x5 0"); f_vty_config(MSCVTY, "msc", "no sms-over-gsup"); } @@ -7434,6 +7492,7 @@ execute( TC_gsup_mt_sms_rp_mr() ); execute( TC_gsup_mo_mt_sms_rp_mr() ); execute( TC_gsup_mt_multi_part_sms() ); + execute( TC_gsup_mt_sms_lu_x5() ); execute( TC_lu_and_mo_ussd_single_request() ); execute( TC_lu_and_mt_ussd_notification() ); diff --git a/msc/expected-results.xml b/msc/expected-results.xml index aad96a7..d5a9462 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -80,6 +80,7 @@ <testcase classname='MSC_Tests' name='TC_gsup_mt_sms_rp_mr' time='MASKED'/> <testcase classname='MSC_Tests' name='TC_gsup_mo_mt_sms_rp_mr' time='MASKED'/> <testcase classname='MSC_Tests' name='TC_gsup_mt_multi_part_sms' time='MASKED'/> + <testcase classname='MSC_Tests' name='TC_gsup_mt_sms_lu_x5' time='MASKED'/> <testcase classname='MSC_Tests' name='TC_lu_and_mo_ussd_single_request' time='MASKED'/> <testcase classname='MSC_Tests' name='TC_lu_and_mt_ussd_notification' time='MASKED'/> <testcase classname='MSC_Tests' name='TC_lu_and_mo_ussd_during_mt_call' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36772?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: I74fa174ea649adb2112c8e471c0e339a2197a08d Gerrit-Change-Number: 36772 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in docker-playground[master]: asterisk: pjsip.conf: Mark templates accordingly
by jolly 10 May '24

10 May '24

Attention is currently required from: dexter, pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36650?usp=email ) Change subject: asterisk: pjsip.conf: Mark templates accordingly ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36650?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia132c2e90cf6ee44145ca2e2555cf2dc6c1cfd51 Gerrit-Change-Number: 36650 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 10 May 2024 13:02:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in docker-playground[master]: asterisk: manager.conf: Give more permissions to AMI user
by jolly 10 May '24

10 May '24

Attention is currently required from: pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36651?usp=email ) Change subject: asterisk: manager.conf: Give more permissions to AMI user ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36651?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia77a9d88758f648a5539dbc7511b75c20fe7dd6b Gerrit-Change-Number: 36651 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 10 May 2024 13:01:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in ...osmo_dia2gsup[master]: contrib/systemd: run as osmocom user
by osmith 10 May '24

10 May '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/36771?usp=email ) Change subject: contrib/systemd: run as osmocom user ...................................................................... contrib/systemd: run as osmocom user Run the systemd service as osmocom user and group instead of root. Set the StateDirectory and WorkingDirectory like we have it in other Osmocom service files. Remove the ExecStartPre mkdir, as the directory now gets created by postinst. Related: OS#4107 Change-Id: I2c0c7f4b98300b3b0bb5b95013b51b6b60625b95 --- M contrib/systemd/osmo_dia2gsup.service A debian/postinst 2 files changed, 49 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo_dia2gsup refs/changes/71/36771/1 diff --git a/contrib/systemd/osmo_dia2gsup.service b/contrib/systemd/osmo_dia2gsup.service index 2ef737c..e3d092e 100644 --- a/contrib/systemd/osmo_dia2gsup.service +++ b/contrib/systemd/osmo_dia2gsup.service @@ -7,8 +7,11 @@ [Service] Type=simple Restart=always +StateDirectory=osmo_dia2gsup +WorkingDirectory=%S/osmo_dia2gsup +User=osmocom +Group=osmocom Environment="HOME=/var/lib/osmo_dia2gsup" -ExecStartPre=/usr/bin/mkdir -p /var/lib/osmo_dia2gsup ExecStart=/usr/bin/osmo-dia2gsup foreground RestartSec=2 diff --git a/debian/postinst b/debian/postinst new file mode 100644 index 0000000..f9f64c8 --- /dev/null +++ b/debian/postinst @@ -0,0 +1,30 @@ +#!/bin/sh -e +case "$1" in + configure) + # Create the osmocom group and user (if it doesn't exist yet) + if ! getent group osmocom >/dev/null; then + groupadd --system osmocom + fi + if ! getent passwd osmocom >/dev/null; then + useradd \ + --system \ + --gid osmocom \ + --home-dir /var/lib/osmocom \ + --shell /sbin/nologin \ + --comment "Open Source Mobile Communications" \ + osmocom + fi + + # Fix permissions of previous (root-owned) install (OS#4107) + chown osmocom:osmocom /etc/osmocom/osmo_dia2gsup.service + chmod 0660 /etc/osmocom/osmo_dia2gsup.service + chown root:osmocom /etc/osmocom + chmod 2775 /etc/osmocom + mkdir -p /var/lib/osmo_dia2gsup + chown -R osmocom:osmocom /var/lib/osmo_dia2gsup + ;; +esac + +# dh_installdeb(1) will replace this with shell code automatically +# generated by other debhelper scripts. +#DEBHELPER# -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/36771?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I2c0c7f4b98300b3b0bb5b95013b51b6b60625b95 Gerrit-Change-Number: 36771 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk: Implement AMI_Adapter using IPL4 instead of TELNET
by osmith 10 May '24

10 May '24

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755?usp=email ) Change subject: asterisk: Implement AMI_Adapter using IPL4 instead of TELNET ...................................................................... Patch Set 3: (2 comments) File asterisk/AMI_Functions.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755/comment/6e3011c2_87f0… PS3, Line 260: /* TEXT Enc/dec is not happy with values containing "; ", get rid of them: : * "AppData: 5,0502: Call pjsip endpoint from 0501\r\n" */ : var integer pos := f_strstr(patched_txt, "AppData: ", 0); : if (pos >= 0) { : var integer pos_end := f_strstr(patched_txt, "\r\n", pos) + lengthof("\r\n"); : var charstring to_remove := substr(patched_txt, pos, pos_end - pos); : patched_txt := f_str_replace(patched_txt, to_remove, ""); : } > It's removing the full line "AppData: 5,0502: Call pjsip endpoint from 0501\r\n", since we don't nee […] ah thanks for explaining! could you update the comment, mention ": " and that it just removes the whole line? that would make it much clearer https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755/comment/fec411c2_0fd1… PS3, Line 480: log("AMI_Msg decoded: ", msg); > That's more like a playground to test stuff interactively (recompile, test, etc. […] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755?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: Icaf2860c1dd4befa4498f0d176cfadf26cfa8d1d Gerrit-Change-Number: 36755 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 10 May 2024 12:58:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: Misc_Helpers.ttcn: Add some more string handling API helpers
by pespin 10 May '24

10 May '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36754?usp=email ) Change subject: Misc_Helpers.ttcn: Add some more string handling API helpers ...................................................................... Misc_Helpers.ttcn: Add some more string handling API helpers These are currently used by code in AMI_Functions doing some workaround for TEXT decoder limitations. They can be merged independently now since anyway they are totally generic and may be useful for future users. Change-Id: I3d6da125a10807b7a2f3ecad8145a046a322c7d6 --- M library/Misc_Helpers.ttcn 1 file changed, 40 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/library/Misc_Helpers.ttcn b/library/Misc_Helpers.ttcn index 805254a..a742b0b 100644 --- a/library/Misc_Helpers.ttcn +++ b/library/Misc_Helpers.ttcn @@ -79,6 +79,31 @@ return count; } +/* Return true if str ends exactly with token: */ +function f_str_endswith(charstring str, charstring token) return boolean +{ + if (lengthof(str) < lengthof(token)) { + return false; + } + var charstring str_end := substr(str, lengthof(str) - lengthof(token), lengthof(token)); + return str_end == token; +} + +/* Replace all matches of token "find" with "repl" in "str" */ +function f_str_replace(charstring str, charstring find, charstring repl) return charstring +{ + var integer pos := f_strstr(str, find, 0); + if (pos < 0) { + return str; + } + var charstring prefix := substr(str, 0, pos); + var integer suffix_pos := pos + lengthof(find); + var charstring suffix := substr(str, suffix_pos, lengthof(str) - suffix_pos); + + var charstring new_str := prefix & repl & f_str_replace(suffix, find, repl); + return new_str; +} + type record of charstring ro_charstring; function f_str_split(charstring str, charstring delim := "\n") return ro_charstring { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36754?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: I3d6da125a10807b7a2f3ecad8145a046a322c7d6 Gerrit-Change-Number: 36754 Gerrit-PatchSet: 2 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk: Introduce AMI_Adapter_CT
by pespin 10 May '24

10 May '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36711?usp=email ) ( 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: asterisk: Introduce AMI_Adapter_CT ...................................................................... asterisk: Introduce AMI_Adapter_CT This allows to keep string handling totally internal to the AMI_Adapter component, which also means now the CLIENT port acts asynchronously on full AMI messages. This allows for instance using activated altsteps to ignore events or answer to them. Change-Id: Ibf230d2302fecf443f34e1c4d4acfd4802f4cc79 --- M asterisk/AMI_Functions.ttcn M asterisk/Asterisk_Tests.ttcn 2 files changed, 126 insertions(+), 48 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/asterisk/AMI_Functions.ttcn b/asterisk/AMI_Functions.ttcn index 72420e1..6e0b8d0 100644 --- a/asterisk/AMI_Functions.ttcn +++ b/asterisk/AMI_Functions.ttcn @@ -167,6 +167,58 @@ tr_AMI_Field_ActionId(action_id) ); + +/*********************** + * Adapter: + ***********************/ + +type port AMI_Msg_PT message { + inout AMI_Msg; +} with { extension "internal" }; + +type component AMI_Adapter_CT { + port TELNETasp_PT AMI; + port AMI_Msg_PT CLIENT; +} + +function f_AMI_Adapter_main() runs on AMI_Adapter_CT { + var AMI_Msg msg; + + var charstring rx, buf := ""; + var integer fd; + + map(self:AMI, system:AMI); + + while (true) { + + alt { + [] AMI.receive(pattern "\n") { + buf := buf & "\n"; + msg := dec_AMI_Msg(buf); + buf := ""; + CLIENT.send(msg); + }; + [] AMI.receive(charstring:?) -> value rx { + buf := buf & rx; + }; + [] AMI.receive(integer:?) -> value fd { + if (fd == -1) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "AMI Telnet Connection Failure: " & int2str(fd)); + } else { + /* telnet connection succeeded */ + } + } + [] CLIENT.receive(AMI_Msg:?) -> value msg { + /* TODO: in the future, queue Action if there's already one Action in transit, to fullfill AMI requirements. */ + var charstring tx_txt := enc_AMI_Msg(msg); + AMI.send(tx_txt); + } + } + } +} + + /* * Functions: */ @@ -223,62 +275,66 @@ return field.val; } -private function f_ami_wait_for_prompt_str(TELNETasp_PT pt, charstring log_label := "(?)") -return charstring { - var charstring rx, buf := ""; - var integer fd; +function f_ami_transceive_ret(AMI_Msg_PT pt, template (value) AMI_Msg tx_msg, float rx_timeout := 10.0) return AMI_Msg { + var AMI_Msg rx_msg; timer T; - T.start(mp_ami_prompt_timeout); + T.start(rx_timeout); + pt.send(tx_msg); alt { - [] pt.receive(pattern "\n") { buf := buf & "\n" }; - [] pt.receive(charstring:?) -> value rx { buf := buf & rx; repeat }; - [] pt.receive(integer:?) -> value fd { - if (fd == -1) { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - "AMI Telnet Connection Failure: " & log_label); - } else { - repeat; /* telnet connection succeeded */ - } - } + [] pt.receive(AMI_Msg:?) -> value rx_msg; [] T.timeout { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - "AMI Timeout for prompt: " & log_label); - }; + log2str("AMI Response timeout: ", tx_msg)); + } } T.stop; - return buf; + return rx_msg; + } -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 := dec_AMI_Msg(buf); - return msg; -} - -/* send a AMI command and obtain response until prompt is received */ -private function f_ami_transceive_ret_str(TELNETasp_PT pt, charstring tx) return charstring { - pt.send(tx); - return f_ami_wait_for_prompt_str(pt, tx); -} - -function f_ami_transceive_ret(TELNETasp_PT pt, template (value) AMI_Msg tx_msg) return AMI_Msg { - var charstring tx_txt := enc_AMI_Msg(valueof(tx_msg)); - var charstring resp_txt := f_ami_transceive_ret_str(pt, tx_txt); - return dec_AMI_Msg(resp_txt); -} - -function f_ami_transceive_match(TELNETasp_PT pt, - template (value) AMI_Msg tx_msg, - template (present) AMI_Msg exp_ret := ?) { - var AMI_Msg ret := f_ami_transceive_ret(pt, tx_msg); - if (not match(ret, exp_ret)) { +private altstep as_ami_rx_fail(AMI_Msg_PT pt, template AMI_Msg exp_msg := *) +{ + var AMI_Msg msg; + [] pt.receive(AMI_Msg:?) -> value msg { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - log2str("Non-matching AMI response: ", ret, " vs exp: ", exp_ret)); + log2str("Received unexpected AMI message := ", msg, "\nvs exp := ", exp_msg)); } } -function f_ami_transceive_match_response_success(TELNETasp_PT pt, +altstep as_ami_expect_msg(AMI_Msg_PT pt, template (present) AMI_Msg msg_expect, boolean fail_others := true) +{ + [] pt.receive(msg_expect); + [fail_others] as_ami_rx_fail(pt, msg_expect); +} + +function f_ami_transceive_match(AMI_Msg_PT pt, + template (value) AMI_Msg tx_msg, + template (present) AMI_Msg exp_ret := ?, + boolean fail_others := true, + float rx_timeout := 10.0) return AMI_Msg { + var AMI_Msg rx_msg; + timer T; + + T.start(rx_timeout); + pt.send(tx_msg); + alt { + [] pt.receive(exp_ret) -> value rx_msg; + [not fail_others] pt.receive(AMI_Msg:?) -> value rx_msg { + log("AMI: Ignoring Rx msg ", rx_msg); + repeat; + } + [fail_others] as_ami_rx_fail(pt, exp_ret); + [] T.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("AMI Response timeout: ", tx_msg)); + } + } + T.stop; + return rx_msg; +} + +function f_ami_transceive_match_response_success(AMI_Msg_PT pt, template (value) AMI_Msg tx_msg) { var template (present) AMI_Msg exp_resp; var template (omit) charstring action_id := f_ami_msg_get_value(valueof(tx_msg), AMI_FIELD_ACTION_ID); @@ -290,11 +346,11 @@ f_ami_transceive_match(pt, tx_msg, exp_resp); } -function f_ami_action_login(TELNETasp_PT pt, charstring username, charstring secret) { +function f_ami_action_login(AMI_Msg_PT pt, charstring username, charstring secret) { f_ami_transceive_match_response_success(pt, ts_AMI_Action_Login(username, secret)); } -function f_ami_action_PJSIPRegister(TELNETasp_PT pt, charstring register) { +function f_ami_action_PJSIPRegister(AMI_Msg_PT pt, charstring register) { var charstring reg_action_id := f_gen_action_id(); f_ami_transceive_match_response_success(pt, ts_AMI_Action_PJSIPRegister(register, reg_action_id)); } diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn index c94f97f..d2fc0d5 100644 --- a/asterisk/Asterisk_Tests.ttcn +++ b/asterisk/Asterisk_Tests.ttcn @@ -49,7 +49,9 @@ /* Manages the IMS server Asterisk connects to: */ var SIP_Emulation_CT vc_IMS; - port TELNETasp_PT AMI; + /* Connection towards Asterisk AMI iface: */ + var AMI_Adapter_CT vc_AMI; + port AMI_Msg_PT AMI_CLIENT; port Coord_PT COORD; port IMSCoord_PT IMS_COORD; @@ -70,8 +72,13 @@ /* Initialize connection towards Asterisk AMI */ private function f_init_ami() runs on test_CT { - map(self:AMI, system:AMI); - f_ami_action_login(AMI, mp_ami_user, mp_ami_secret); + var charstring id := "Asterisk_Tests_AMI_EMU"; + vc_AMI := AMI_Adapter_CT.create(id); + connect(self:AMI_CLIENT, vc_AMI:CLIENT); + vc_AMI.start(f_AMI_Adapter_main()); + + + f_ami_action_login(AMI_CLIENT, mp_ami_user, mp_ami_secret); } /* Local SIP UAs */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36711?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: Ibf230d2302fecf443f34e1c4d4acfd4802f4cc79 Gerrit-Change-Number: 36711 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk: Implement AMI_Adapter using IPL4 instead of TELNET
by pespin 10 May '24

10 May '24

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755?usp=email ) Change subject: asterisk: Implement AMI_Adapter using IPL4 instead of TELNET ...................................................................... Patch Set 3: (1 comment) File asterisk/AMI_Functions.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755/comment/e98ef540_60d2… PS3, Line 480: log("AMI_Msg decoded: ", msg); > add some sort of assert / check at the end, that the decode lead to the expected result? That's more like a playground to test stuff interactively (recompile, test, etc.) not something really being run during usual testsuite. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755?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: Icaf2860c1dd4befa4498f0d176cfadf26cfa8d1d Gerrit-Change-Number: 36755 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 10 May 2024 12:54:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log