- gerrit-log - lists.osmocom.org

[L] Change in osmo-ttcn3-hacks[master]: Asterisk: Initial AMI support
by osmith 18 Apr '24

18 Apr '24

Attention is currently required from: fixeria, jolly, laforge, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36594?usp=email ) Change subject: Asterisk: Initial AMI support ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36594?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: I2c570e4d04e7ab8c44962cf484e4bbc946209aee Gerrit-Change-Number: 36594 Gerrit-PatchSet: 1 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-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 18 Apr 2024 11:30:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in docker-playground[master]: ttcn3-asterisk: Set Asterisk AMI IP address in Asterisk_Tests
by pespin 18 Apr '24

18 Apr '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36595?usp=email ) Change subject: ttcn3-asterisk: Set Asterisk AMI IP address in Asterisk_Tests ...................................................................... ttcn3-asterisk: Set Asterisk AMI IP address in Asterisk_Tests The Asterisk_tests testsuite recently gained initial AMI support. Configure it with the proper IP address. Depends: osmo-ttcn3-hacks.git Change-Id I2c570e4d04e7ab8c44962cf484e4bbc946209aee Change-Id: Ibb6af1cbfb652214b2fdd2a6eb9a4887c9a9cfb0 --- M ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/95/36595/1 diff --git a/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg b/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg index c8744bb..a734c22 100644 --- a/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg +++ b/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg @@ -5,6 +5,7 @@ [LOGGING] [TESTPORT_PARAMETERS] +*.AMI.CTRL_HOSTNAME := "172.18.11.10" *.SIP.default_local_address := "172.18.11.103" *.SIP.local_sip_port := "5060" *.SIP.default_dest_address := "172.18.11.10" -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36595?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: Ibb6af1cbfb652214b2fdd2a6eb9a4887c9a9cfb0 Gerrit-Change-Number: 36595 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[L] Change in osmo-ttcn3-hacks[master]: Asterisk: Initial AMI support
by pespin 18 Apr '24

18 Apr '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36594?usp=email ) Change subject: Asterisk: Initial AMI support ...................................................................... Asterisk: Initial AMI support Introduce config and functions around TELNETasp_PT to implement an AMI interface client to interact with Asterisk. So far only the "Action: Login" case is implemented. Change-Id: I2c570e4d04e7ab8c44962cf484e4bbc946209aee --- A asterisk/AMI_Functions.ttcn M asterisk/Asterisk_Tests.default M asterisk/Asterisk_Tests.ttcn M asterisk/gen_links.sh M asterisk/regen_makefile.sh 5 files changed, 257 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/94/36594/1 diff --git a/asterisk/AMI_Functions.ttcn b/asterisk/AMI_Functions.ttcn new file mode 100644 index 0000000..53a7964 --- /dev/null +++ b/asterisk/AMI_Functions.ttcn @@ -0,0 +1,212 @@ +/* Asterisk's AMI interface functions in TTCN-3 + * (C) 2024 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Author: Pau Espin Pedrol <pespin(a)sysmocom.de> + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +/* + * https://docs.asterisk.org/Configuration/Interfaces/Asterisk-Manager-Interfa… + */ +module AMI_Functions { + +import from Misc_Helpers all; +import from TELNETasp_PortType all; +import from Osmocom_Types all; +import from TCCConversion_Functions all; +import from Socket_API_Definitions all; + +modulepar { + float mp_ami_prompt_timeout := 10.0; +} + +const charstring AMI_FIELD_ACTION := "Action"; +const charstring AMI_FIELD_USERNAME := "Username"; +const charstring AMI_FIELD_SECRET := "Secret"; +const charstring AMI_FIELD_RESPONSE := "Response"; + +type record AMI_Field { + charstring key, + charstring val +}; +type set of AMI_Field AMI_Msg; + +template (value) AMI_Field +ts_AMI_Field(template (value) charstring key, + template (value) charstring val) := { + key := key, + val := val +}; + +template (present) AMI_Field +tr_AMI_Field(template (present) charstring key := ?, + template (present) charstring val := ?) := { + key := key, + val := val +}; + +/* + * Field Templates: + */ + +template (value) AMI_Field +ts_AMI_Field_Action(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_ACTION, val); +template (value) AMI_Field +ts_AMI_Field_Username(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_USERNAME, val); +template (value) AMI_Field +ts_AMI_Field_Secret(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_SECRET, val); + +template (present) AMI_Field +tr_AMI_Field_Action(template (present) charstring val := ?) := tr_AMI_Field(AMI_FIELD_ACTION, val); +template (present) AMI_Field +tr_AMI_Field_Username(template (present) charstring val := ?) := tr_AMI_Field(AMI_FIELD_USERNAME, val); +template (present) AMI_Field +tr_AMI_Field_Secret(template (present) charstring val := ?) := tr_AMI_Field(AMI_FIELD_SECRET, val); +template (present) AMI_Field +tr_AMI_Field_Response(template (present) charstring val := ?) := tr_AMI_Field(AMI_FIELD_RESPONSE, val); + + +template (present) AMI_Field +tr_AMI_Field_ResponseSuccess := tr_AMI_Field(AMI_FIELD_RESPONSE, "Success"); + + +/* + * Message Templates: + */ + +template (value) AMI_Msg +ts_AMI_Action_Login(charstring username, charstring secret) := { + ts_AMI_Field_Action("Login"), + ts_AMI_Field_Username(username), + ts_AMI_Field_Secret(secret) +}; + +template (present) AMI_Msg +tr_AMI_Action_Login(template(present) charstring username := ?, + template(present) charstring secret := ?) := superset( + tr_AMI_Field_Action("Login"), + tr_AMI_Field_Username(username), + tr_AMI_Field_Secret(secret) +); + +template (present) AMI_Msg +tr_AMI_Response_Success := superset( + tr_AMI_Field_ResponseSuccess +); + +/* + * 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 := ""; + var integer fd; + timer T; + + T.start(mp_ami_prompt_timeout); + alt { + [] pt.receive(pattern "\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 */ + } + } + [] T.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "AMI Timeout for prompt: " & log_label); + }; + } + T.stop; + return buf; +} + +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); + 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 := f_AMI_Msg_to_str(valueof(tx_msg)); + var charstring resp_txt := f_ami_transceive_ret_str(pt, tx_txt); + return f_AMI_Msg_from_str(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)) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Non-matching AMI response: ", ret, " vs exp: ", exp_ret)); + } +} + +function f_ami_transceive_match_response_success(TELNETasp_PT pt, + template (value) AMI_Msg tx_msg) { + f_ami_transceive_match(pt, tx_msg, tr_AMI_Response_Success); +} + +function f_ami_action_login(TELNETasp_PT pt, charstring username, charstring secret) { + f_ami_transceive_match_response_success(pt, ts_AMI_Action_Login(username, secret)); +} + +} diff --git a/asterisk/Asterisk_Tests.default b/asterisk/Asterisk_Tests.default index a2fda0f..0996545 100644 --- a/asterisk/Asterisk_Tests.default +++ b/asterisk/Asterisk_Tests.default @@ -4,13 +4,24 @@ mtc.FileMask := ERROR | WARNING | PARALLEL | VERDICTOP; [TESTPORT_PARAMETERS] +*.*.DEBUG := "yes" +*.AMI.PROMPT1 := "Asterisk Call Manager/9.0.0\n" +*.AMI.PROMPT2 := "\n" +#*.AMI.REGEX_PROMPT1 := "^Asterisk Call Manager.*$" +*.AMI.CTRL_MODE := "client" +*.AMI.CTRL_HOSTNAME := "127.0.0.1" +*.AMI.CTRL_PORTNUM := "5038" +*.AMI.CTRL_LOGIN_SKIPPED := "yes" +*.AMI.CTRL_DETECT_SERVER_DISCONNECTED := "yes" +*.AMI.CTRL_READMODE := "buffered" +*.AMI.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" +*.AMI.CTRL_CRLF := "yes" *.SIP.local_sip_port := "5060" *.SIP.default_local_address := "127.0.0.2" *.SIP.default_sip_protocol := "UDP" *.SIP.default_dest_port := "5060" *.SIP.default_dest_address := "127.0.0.1" - [MODULE_PARAMETERS] [MAIN_CONTROLLER] diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn index 151041d..c883bac 100644 --- a/asterisk/Asterisk_Tests.ttcn +++ b/asterisk/Asterisk_Tests.ttcn @@ -16,6 +16,8 @@ import from Osmocom_Types all; import from Native_Functions all; import from Misc_Helpers all; +import from TELNETasp_PortType all; +import from AMI_Functions all; import from SDP_Types all; import from SDP_Templates all; @@ -29,6 +31,10 @@ integer mp_local_sip_port := 5060; charstring mp_remote_sip_host := "127.0.0.1"; integer mp_remote_sip_port := 5060; + + /* Asterisk AMI: */ + charstring mp_ami_user := "test_user"; + charstring mp_ami_secret := "1234"; } type port Coord_PT message @@ -44,6 +50,7 @@ type component test_CT { var SIP_Emulation_CT vc_SIP; + port TELNETasp_PT AMI; port Coord_PT COORD; } @@ -159,7 +166,14 @@ mt := t_CallParsMT } +/* 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); +} + function f_init() runs on test_CT { + f_init_ami(); f_init_sip(vc_SIP, "Asterisk_Test"); log("end of f_init"); } diff --git a/asterisk/gen_links.sh b/asterisk/gen_links.sh index 7394b64..97df3a2 100755 --- a/asterisk/gen_links.sh +++ b/asterisk/gen_links.sh @@ -18,6 +18,10 @@ FILES="IPL4asp_Functions.ttcn IPL4asp_PT.cc IPL4asp_PT.hh IPL4asp_PortType.ttcn IPL4asp_Types.ttcn IPL4asp_discovery.cc IPL4asp_protocol_L234.hh" gen_links $DIR $FILES +DIR=$BASEDIR/titan.TestPorts.TELNETasp/src +FILES="TELNETasp_PT.cc TELNETasp_PT.hh TELNETasp_PortType.ttcn" +gen_links $DIR $FILES + DIR=$BASEDIR/titan.ProtocolModules.SDP/src FILES="SDP_EncDec.cc SDP_Types.ttcn SDP_parse_.tab.c SDP_parse_.tab.h SDP_parse_parser.h SDP_parser.l SDP_parser.y lex.SDP_parse_.c" diff --git a/asterisk/regen_makefile.sh b/asterisk/regen_makefile.sh index 3cd0a66..1aa18ae 100755 --- a/asterisk/regen_makefile.sh +++ b/asterisk/regen_makefile.sh @@ -15,6 +15,7 @@ TCCConversion.cc TCCInterface.cc TCCOpenSecurity.cc + TELNETasp_PT.cc " ../regen-makefile.sh -e $NAME $FILES -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36594?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: I2c570e4d04e7ab8c44962cf484e4bbc946209aee Gerrit-Change-Number: 36594 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in docker-playground[master]: ttcn3-hnbgw: Apply latest changes to 'with-pfcp' scenario
by pespin 18 Apr '24

18 Apr '24

Attention is currently required from: daniel, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36590?usp=email ) Change subject: ttcn3-hnbgw: Apply latest changes to 'with-pfcp' scenario ...................................................................... Patch Set 2: (4 comments) Commit Message: https://gerrit.osmocom.org/c/docker-playground/+/36590/comment/de6191fe_fe4… PS1, Line 12: Fixes: 6de89a5fb529928ce9b7b3320e0ca2e3e568d458 > > A commit hash should be "Related:", and "Fixes:" is for redmine issues, right?? […] Done Patchset: PS2: All tests passed now. File ttcn3-hnbgw-test/with-pfcp/HNBGW_Tests.cfg: https://gerrit.osmocom.org/c/docker-playground/+/36590/comment/312975ba_efc… PS1, Line 120: + > Thanks, I'll fix it. […] Done File ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg: https://gerrit.osmocom.org/c/docker-playground/+/36590/comment/efc4f529_ec1… PS1, Line 26: + > Ack Done -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36590?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: Ie02a0754a6ca985e60e08f1f171f532b6cc16264 Gerrit-Change-Number: 36590 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <daniel(a)totalueberwachung.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: daniel <daniel(a)totalueberwachung.de> Gerrit-Comment-Date: Thu, 18 Apr 2024 10:18:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in docker-playground[master]: ttcn3-hnbgw: Apply latest changes to 'with-pfcp' scenario
by osmith 18 Apr '24

18 Apr '24

Attention is currently required from: daniel, neels, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36590?usp=email ) Change subject: ttcn3-hnbgw: Apply latest changes to 'with-pfcp' scenario ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36590?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: Ie02a0754a6ca985e60e08f1f171f532b6cc16264 Gerrit-Change-Number: 36590 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <daniel(a)totalueberwachung.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <daniel(a)totalueberwachung.de> Gerrit-Comment-Date: Thu, 18 Apr 2024 10:15:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in docker-playground[master]: ttcn3-hnbgw: Apply latest changes to 'with-pfcp' scenario
by pespin 18 Apr '24

18 Apr '24

Attention is currently required from: daniel, neels, osmith. Hello Jenkins Builder, daniel, fixeria, neels, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/36590?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review-1 by neels, Verified+1 by Jenkins Builder Change subject: ttcn3-hnbgw: Apply latest changes to 'with-pfcp' scenario ...................................................................... ttcn3-hnbgw: Apply latest changes to 'with-pfcp' scenario Recent commits applied changes to the default scenario, but forgot to apply them to the 'with-pfcp' subdir. Fixes: 6de89a5fb529928ce9b7b3320e0ca2e3e568d458 Fixes: 3736d31fc0314cb5d39c707374eecdcfe33241c9 Fixes: 0bdbcd6815358a7b1c4b0bb4575a585c45a01e57 Fixes: 2c22a96355b8e057dbd85ac1922ae84cc63f8b1e Fixes: d3711e67103691171d7ed3e224c050e78c1f5bc4 Change-Id: Ie02a0754a6ca985e60e08f1f171f532b6cc16264 --- M ttcn3-hnbgw-test/with-pfcp/HNBGW_Tests.cfg M ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg 2 files changed, 35 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/90/36590/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36590?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: Ie02a0754a6ca985e60e08f1f171f532b6cc16264 Gerrit-Change-Number: 36590 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <daniel(a)totalueberwachung.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: daniel <daniel(a)totalueberwachung.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-ttcn3-hacks[master]: sgsn: derive altsteps from f_routing_area_update()
by fixeria 18 Apr '24

18 Apr '24

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36588?usp=email ) Change subject: sgsn: derive altsteps from f_routing_area_update() ...................................................................... sgsn: derive altsteps from f_routing_area_update() Change-Id: I7d5ec9c42a37a5746c36745ac738fd77e1632675 Related: SYS#6603, OS#6294 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 57 insertions(+), 26 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index b8b5735..92b744f 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -2630,46 +2630,67 @@ f_cleanup(); } -friend function f_routing_area_update(RoutingAreaIdentificationV old_ra, integer ran_index := 0) runs on BSSGP_ConnHdlr { +friend altstep as_routing_area_update_gb(integer ran_index := 0) runs on BSSGP_ConnHdlr { var PDU_L3_SGSN_MS l3_mt; - var PDU_DTAP_PS_MT mt; - var template (omit) OCT4 p_tmsi := omit; - if (is_iu(ran_index)) { - p_tmsi := g_pars.p_tmsi; - } - /* then send RAU */ - f_send_l3(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, old_ra, false, omit, omit, p_tmsi), ran_index); - alt { - [is_gb(ran_index)] BSSGP[ran_index].receive(tr_GMM_RAU_ACCEPT) -> value l3_mt { + [] BSSGP[ran_index].receive(tr_GMM_RAU_ACCEPT) -> value l3_mt { f_process_rau_accept(l3_mt.msgs.gprs_mm.routingAreaUpdateAccept, ran_index); f_send_l3(ts_GMM_RAU_COMPL, ran_index); setverdict(pass); } - [is_iu(ran_index)] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_GMM_RAU_ACCEPT)) -> value mt { + [] BSSGP[ran_index].receive(tr_GMM_RAU_REJECT) { + setverdict(fail, "Unexpected RAU Reject"); + mtc.stop; + } +} +friend altstep as_routing_area_update_iu(integer ran_index := 0) runs on BSSGP_ConnHdlr { + var PDU_DTAP_PS_MT mt; + + [] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_GMM_RAU_ACCEPT)) -> value mt { f_process_rau_accept(mt.dtap.msgs.gprs_mm.routingAreaUpdateAccept, ran_index); f_send_l3(ts_GMM_RAU_COMPL, ran_index); setverdict(pass); } - - [is_gb(ran_index)] BSSGP[ran_index].receive(tr_GMM_RAU_REJECT) { + [] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_GMM_RAU_REJECT)) { setverdict(fail, "Unexpected RAU Reject"); mtc.stop; } - [is_iu(ran_index)] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_GMM_RAU_REJECT)) { - setverdict(fail, "Unexpected RAU Reject"); - mtc.stop; - } + [] BSSAP.receive(tr_RANAP_SecurityModeCmd(uia_algs := ?, + uia_key := oct2bit(g_pars.vec.ik), + key_sts := ?)) { + var IntegrityProtectionAlgorithm uia_chosen := 0; /* 0 = standard_UMTS_integrity_algorithm_UIA1 */ + BSSAP.send(ts_RANAP_SecurityModeComplete(uia_chosen)); + BSSAP.receive(tr_RANAP_CommonId(imsi_hex2oct(g_pars.imsi))) + repeat; + } +} +friend altstep as_routing_area_update(integer ran_index := 0) runs on BSSGP_ConnHdlr { + [is_gb(ran_index)] as_routing_area_update_gb(ran_index); + [is_iu(ran_index)] as_routing_area_update_iu(ran_index); +} - [is_iu(ran_index)] BSSAP.receive(tr_RANAP_SecurityModeCmd(uia_algs := ?, uia_key := oct2bit(g_pars.vec.ik), - key_sts := ?)) { - var IntegrityProtectionAlgorithm uia_chosen := 0; /* 0 = standard_UMTS_integrity_algorithm_UIA1 */ - BSSAP.send(ts_RANAP_SecurityModeComplete(uia_chosen)); - BSSAP.receive(tr_RANAP_CommonId(imsi_hex2oct(g_pars.imsi))) - repeat; - } +friend function f_routing_area_update(RoutingAreaIdentificationV old_ra, + GprsUpdateType upd_type := GPRS_UPD_T_RA, + integer ran_index := 0, + float Tval := 2.0) runs on BSSGP_ConnHdlr { + var template (omit) OCT4 p_tmsi := omit; + timer T := Tval; + + if (is_iu(ran_index)) { + p_tmsi := g_pars.p_tmsi; + } + + f_send_l3(ts_GMM_RAU_REQ(f_mi_get_lv(), upd_type, old_ra, p_tmsi := p_tmsi), ran_index); + + T.start; + alt { + [] as_routing_area_update(ran_index) { setverdict(pass); } [is_gb(ran_index)] BSSGP[ran_index].receive { repeat; } [is_iu(ran_index)] BSSAP.receive { repeat; } + [] T.timeout { + setverdict(fail, "Timeout completing the RAU procedure"); + mtc.stop; + } } } @@ -2706,14 +2727,14 @@ f_TC_attach(id); log("attach complete sending rau"); - f_routing_area_update(g_pars.ra, 0); + f_routing_area_update(g_pars.ra); log("rau complete unregistering"); f_bssgp_client_unregister(g_pars.imsi); f_bssgp_client_register(g_pars.imsi, g_pars.tlli, BSSGP_PROC[1]); log("sending second RAU via different RA"); - f_routing_area_update(f_cellid_to_RAI(g_pars.bssgp_cell_id[1]), 1); + f_routing_area_update(f_cellid_to_RAI(g_pars.bssgp_cell_id[1]), ran_index := 1); f_detach_mo(c_GMM_DTT_MO_GPRS, true, true, 1); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36588?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: I7d5ec9c42a37a5746c36745ac738fd77e1632675 Gerrit-Change-Number: 36588 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-ttcn3-hacks[master]: library: cosmetic: fix code formatting
by fixeria 18 Apr '24

18 Apr '24

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36585?usp=email ) Change subject: library: cosmetic: fix code formatting ...................................................................... library: cosmetic: fix code formatting Change-Id: Ic87f6e8dcb8e507d21082f28217c015ff2e5204b Related: SYS#6603, OS#6294 --- M library/GTPv1C_CodecPort.ttcn 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/library/GTPv1C_CodecPort.ttcn b/library/GTPv1C_CodecPort.ttcn index 956a674..bf14723 100644 --- a/library/GTPv1C_CodecPort.ttcn +++ b/library/GTPv1C_CodecPort.ttcn @@ -28,7 +28,7 @@ /* Decoded GTP1C (Control Plane), used in send and receive direction */ type record Gtp1cUnitdata { - Gtp1cPeer peer, + Gtp1cPeer peer, PDU_GTPC gtpc } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36585?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: Ic87f6e8dcb8e507d21082f28217c015ff2e5204b Gerrit-Change-Number: 36585 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-ttcn3-hacks[master]: library: GTPv1C add ts_MM_ContextGSM
by fixeria 18 Apr '24

18 Apr '24

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36586?usp=email ) Change subject: library: GTPv1C add ts_MM_ContextGSM ...................................................................... library: GTPv1C add ts_MM_ContextGSM Change-Id: I483fdd0dee6e0ee92fcee798d8e85a80d1e0be8b Related: SYS#6603, OS#6294 --- M library/GTPv1C_Templates.ttcn 1 file changed, 34 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/GTPv1C_Templates.ttcn b/library/GTPv1C_Templates.ttcn index 4a0c8b2..dcb8e60 100644 --- a/library/GTPv1C_Templates.ttcn +++ b/library/GTPv1C_Templates.ttcn @@ -338,6 +338,30 @@ } /* 7.7.28 MM Context */ + template (value) MM_Context ts_MM_ContextGSM(template (value) OCT8 kc, + template (value) BIT3 cksn := '000'B, + template (value) BIT3 gea := '000'B) := { + type_gtpc := '81'O, + context := { + mmcontGSM := { + lengthf := 0, /* overwritten */ + cksn := cksn, + spare := '00000'B, + usedCipher := gea, + noofVectors := 0, + security := '00'B, /* XXX */ + kc := kc, + triplet := ''O, + drx_par := '0000'O, + msNetW_cap_length := 0, /* overwritten */ + msNetw_cap := omit, + containerLength := 0, /* overwritten */ + container := omit, + access_restriction_data_length := 0, + access_restriction_data := omit + } + } + } template (value) MM_Context ts_MM_ContextUMTS(template (value) OCT16 ck, template (value) OCT16 ik) := { type_gtpc := '81'O, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36586?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: I483fdd0dee6e0ee92fcee798d8e85a80d1e0be8b Gerrit-Change-Number: 36586 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-ttcn3-hacks[master]: sgsn: fix unused param in f_routing_area_update()
by fixeria 18 Apr '24

18 Apr '24

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36587?usp=email ) Change subject: sgsn: fix unused param in f_routing_area_update() ...................................................................... sgsn: fix unused param in f_routing_area_update() Change-Id: I582b2836eba3188cfd4c640b1febbd25c50001e0 Related: SYS#6603, OS#6294 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 12 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 64ba981..b8b5735 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -2630,7 +2630,7 @@ f_cleanup(); } -friend function f_routing_area_update(RoutingAreaIdentificationV ra, integer ran_index := 0) runs on BSSGP_ConnHdlr { +friend function f_routing_area_update(RoutingAreaIdentificationV old_ra, integer ran_index := 0) runs on BSSGP_ConnHdlr { var PDU_L3_SGSN_MS l3_mt; var PDU_DTAP_PS_MT mt; var template (omit) OCT4 p_tmsi := omit; @@ -2639,7 +2639,7 @@ p_tmsi := g_pars.p_tmsi; } /* then send RAU */ - f_send_l3(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, g_pars.ra, false, omit, omit, p_tmsi), ran_index); + f_send_l3(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, old_ra, false, omit, omit, p_tmsi), ran_index); alt { [is_gb(ran_index)] BSSGP[ran_index].receive(tr_GMM_RAU_ACCEPT) -> value l3_mt { f_process_rau_accept(l3_mt.msgs.gprs_mm.routingAreaUpdateAccept, ran_index); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36587?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: I582b2836eba3188cfd4c640b1febbd25c50001e0 Gerrit-Change-Number: 36587 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

2026

2025

2024

2023

2022

gerrit-log