lists.osmocom.org
Sign In Sign Up
Manage this list Sign In Sign Up

Keyboard Shortcuts

Thread View

  • j: Next unread message
  • k: Previous unread message
  • j a: Jump to all threads
  • j l: Jump to MailingList overview

gerrit-log

Thread Start a new thread
Download
Threads by month
  • ----- 2026 -----
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2025 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2024 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2023 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2022 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
gerrit-log@lists.osmocom.org

July 2024

  • 1 participants
  • 1379 discussions
[M] Change in osmo-ttcn3-hacks[master]: asterisk: Introduce test TC_ims_call_mo_holdswitchresume_mo
by pespin 16 Jul '24

16 Jul '24
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37513?usp=email ) Change subject: asterisk: Introduce test TC_ims_call_mo_holdswitchresume_mo ...................................................................... asterisk: Introduce test TC_ims_call_mo_holdswitchresume_mo Related: SYS#7003 Change-Id: I80ec326524501a2f0784291250e3d5fad6b04378 --- M asterisk/Asterisk_Tests.ttcn M asterisk/expected-results.xml 2 files changed, 100 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/13/37513/1 diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn index a97f2a4..8269c9f 100644 --- a/asterisk/Asterisk_Tests.ttcn +++ b/asterisk/Asterisk_Tests.ttcn @@ -237,6 +237,29 @@ f_TC_internal_hangup_call_mo_unregister(); setverdict(pass); } +private function f_TC_internal_call_mo_with_holdswitchresume(charstring id) runs on SIPConnHdlr { + var CallPars cp0; + f_TC_internal_register_establish_call_mo(); + f_sleep(1.0); + f_SIP_do_call_hold(); + + /* Backup state of 1st call params: */ + cp0 := g_pars.cp; + g_pars.cp.called := valueof(ts_SipAddr(ts_HostPort(g_pars.remote_sip_host), + ts_UserInfo("123456"))); + COORD.receive(COORD_CMD_START); + f_SIP_mo_call_setup(exp_update_to_direct_rtp := false); + log ("SIP: 2nd call ongoing"); + COORD.send(COORD_CMD_CALL_ESTABLISHED); + COORD.receive(COORD_CMD_HANGUP); + f_SIP_do_call_hangup(); + + /* Restore 1s call metadata before hanging it up here: */ + g_pars.cp := cp0; + f_SIP_do_call_resume(); + f_TC_internal_hangup_call_mo_unregister(); + setverdict(pass); +} private function f_TC_internal_call_mo_rejected(charstring id) runs on SIPConnHdlr { f_SIP_register(); COORD.send(COORD_CMD_REGISTERED); @@ -791,6 +814,33 @@ as_IMS_exp_call_resume(); f_TC_ims_call_mo_IMS_ConnHdlr_hangup_call_unregister(); } +private function f_TC_ims_call_mo_IMS_ConnHdlr_with_holdswitchresume(charstring id) runs on IMS_ConnHdlr { + var IMS_ConnHdlrSubscrPars subscr0; + var Addr_Union called_addr; + + f_TC_ims_call_mo_IMS_ConnHdlr_register_establish_call(); + + called_addr := g_pars.subscr.cp.called.addr; + called_addr.nameAddr.addrSpec.userInfo := valueof(ts_UserInfo("123456")); + f_create_sip_expect(valueof(ts_SipUrl_from_Addr_Union(called_addr))); + + as_IMS_exp_call_hold(); + + /* Backup state of 1st call subscriber: */ + subscr0 := g_pars.subscr; + g_pars.subscr.cp.called.addr := called_addr; + as_IMS_mo_call_accept(); + COORD.send(COORD_CMD_CALL_ESTABLISHED); + log ("IMS: 2nd call ongoing"); + + as_IMS_exp_call_hangup(g_pars.subscr.cp.sip_seq_nr + 1); + COORD.send(IMS_COORD_CMD_CALL_FINISHED); + /* Restore 1s call metadata before hanging it up here: */ + g_pars.subscr := subscr0; + + as_IMS_exp_call_resume(); + f_TC_ims_call_mo_IMS_ConnHdlr_hangup_call_unregister(); +} private function f_TC_ims_call_mo_IMS_ConnHdlr_2nd_mt_rejected(charstring id) runs on IMS_ConnHdlr { var IMS_ConnHdlrSubscrPars subscr0; var default d_trying, d_ringing, d_sessprog; @@ -895,6 +945,44 @@ ims_fn := refers(f_TC_ims_call_mo_IMS_ConnHdlr_with_holdresume)); } +/* Test a 2nd call initiated from a local SIP UA towards IMS after having HOLD the 1st one. */ +private function call_established_fn_holdswitchresume(SIPConnHdlrPars sip_pars, IMS_ConnHdlrPars ims_pars) runs on test_CT { + var AMI_Msg ami_msg; + var charstring old_asterisk_chan_name := g_asterisk_chan_name; /* backup */ + COORD.send(COORD_CMD_START); + + IMS_COORD.receive(IMS_COORD_CMD_CALL_TRYING); + ami_msg := f_ami_wait_rx_msg(AMI_CLIENT, + tr_AMI_Event_Newchannel(mp_volte_ims_outbound_registration), + fail_others := false); + g_asterisk_chan_name := valueof(f_ami_msg_get_value(ami_msg, AMI_FIELD_CHANNEL)); + f_ami_action_DedicatedBearerStatus(AMI_CLIENT, + g_asterisk_chan_name, + "Up", fail_others := false); + + COORD.receive(COORD_CMD_CALL_ESTABLISHED); + IMS_COORD.receive(COORD_CMD_CALL_ESTABLISHED); + /* 2nd call ongoing */ + log ("test_CT: 2nd call ongoing"); + f_sleep(1.0); + /* Tear down 2nd call: */ + COORD.send(COORD_CMD_HANGUP); + IMS_COORD.receive(IMS_COORD_CMD_CALL_FINISHED); + + /* Notify network released 2nd dedicated bearer: */ + AMI_CLIENT.clear; + f_ami_action_DedicatedBearerStatus(AMI_CLIENT, + g_asterisk_chan_name, + "Down", fail_others := false); + + g_asterisk_chan_name := old_asterisk_chan_name; /* restore */ +} +testcase TC_ims_call_mo_holdswitchresume_mo() runs on test_CT { + f_TC_ims_call_mo(call_established_cb := refers(call_established_fn_holdswitchresume), + sip_fn := refers(f_TC_internal_call_mo_with_holdswitchresume), + ims_fn := refers(f_TC_ims_call_mo_IMS_ConnHdlr_with_holdswitchresume)); +} + /* Test a 2nd call initiated from a local SIP UA towards IMS is rejected with * 503 Service Unavailable if IMS endpoint is already busy in a call. */ private function call_established_fn_2ndrejected(SIPConnHdlrPars sip_pars, IMS_ConnHdlrPars ims_pars) runs on test_CT { @@ -1175,6 +1263,7 @@ execute( TC_ims_call_mo_session_timer() ); execute( TC_ims_call_mo_noprecondition() ); execute( TC_ims_call_mo_holdresume_mo() ); + execute( TC_ims_call_mo_holdswitchresume_mo() ); execute( TC_ims_call_mo_2nd_mo_rejected() ); execute( TC_ims_call_mo_2nd_mt_rejected() ); execute( TC_ims_call_mt() ); diff --git a/asterisk/expected-results.xml b/asterisk/expected-results.xml index dd665e4..5a99ea3 100644 --- a/asterisk/expected-results.xml +++ b/asterisk/expected-results.xml @@ -18,6 +18,7 @@ <testcase classname='Asterisk_Tests' name='TC_ims_call_mo_session_timer' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_ims_call_mo_noprecondition' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_ims_call_mo_holdresume_mo' time='MASKED'/> + <testcase classname='Asterisk_Tests' name='TC_ims_call_mo_holdswitchresume_mo' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_ims_call_mo_2nd_mo_rejected' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_ims_call_mo_2nd_mt_rejected' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_ims_call_mt' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37513?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: I80ec326524501a2f0784291250e3d5fad6b04378 Gerrit-Change-Number: 37513 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange
1 0
0 0
[S] Change in docker-playground[master]: ttcn3-asterisk: pjsip.conf: Update config name s/ims_aka/volte/g
by pespin 16 Jul '24

16 Jul '24
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/37512?usp=email ) Change subject: ttcn3-asterisk: pjsip.conf: Update config name s/ims_aka/volte/g ...................................................................... ttcn3-asterisk: pjsip.conf: Update config name s/ims_aka/volte/g The config key was renamed today, so update the tests to avoid failing reading the config file. Change-Id: I29d8ecb0f514de4745de22711234b0d514b2eb39 --- M ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf 1 file changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/12/37512/1 diff --git a/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf b/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf index bd33845..b735388 100644 --- a/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf +++ b/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf @@ -95,7 +95,7 @@ retry_interval=30 fatal_retry_interval=30 expiration=600000 -ims_aka=yes +volte=yes contact_user=volte_ims imei=35876110-027790-0 endpoint=volte_ims @@ -113,7 +113,7 @@ aors=volte_ims rewrite_contact=yes direct_media=no -ims_aka=yes +volte=yes 100rel=peer_supported moh_passthrough=yes -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37512?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: I29d8ecb0f514de4745de22711234b0d514b2eb39 Gerrit-Change-Number: 37512 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange
1 0
0 0
[M] Change in osmo-ttcn3-hacks[master]: asterisk: MO internal call: Expect direct rtp re-INVITE
by pespin 16 Jul '24

16 Jul '24
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37489?usp=email ) Change subject: asterisk: MO internal call: Expect direct rtp re-INVITE ...................................................................... asterisk: MO internal call: Expect direct rtp re-INVITE Change-Id: I4ac602865cf0c18036b411acff4562322b32933b --- M asterisk/Asterisk_Tests.ttcn M asterisk/SIP_ConnectionHandler.ttcn 2 files changed, 70 insertions(+), 6 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn index 9b5bb11..71d3576 100644 --- a/asterisk/Asterisk_Tests.ttcn +++ b/asterisk/Asterisk_Tests.ttcn @@ -213,7 +213,7 @@ COORD.send(COORD_CMD_REGISTERED); COORD.receive(COORD_CMD_START); - f_SIP_mo_call_setup(); + f_SIP_mo_call_setup(exp_update_to_direct_rtp := g_pars.cp.exp_update_to_direct_rtp); COORD.send(COORD_CMD_CALL_ESTABLISHED); } private function f_TC_internal_hangup_call_mo_unregister() runs on SIPConnHdlr { @@ -271,7 +271,7 @@ if (g_pars.cp.exp_update_to_direct_rtp) { /* Once MO hangs up, Asterisk updates us to point RTP to it: */ - as_SIP_exp_call_update(g_pars.cp.sip_seq_nr + 1); + as_SIP_exp_mt_call_update(g_pars.cp.sip_seq_nr + 1); } as_SIP_exp_call_hangup(g_pars.cp.sip_seq_nr + 1); @@ -716,6 +716,7 @@ private function f_ims_call_mo_configure(inout SIPConnHdlrPars sip_pars, inout IMS_ConnHdlrPars ims_pars, charstring tgt_ext_msisdn := "90829") runs on test_CT { + sip_pars.cp.exp_update_to_direct_rtp := false; sip_pars.cp.calling := sip_pars.registrar_sip_record; sip_pars.cp.called := valueof(ts_SipAddr(ts_HostPort(sip_pars.remote_sip_host), ts_UserInfo(tgt_ext_msisdn))); diff --git a/asterisk/SIP_ConnectionHandler.ttcn b/asterisk/SIP_ConnectionHandler.ttcn index 49fa04c..c3d955a 100644 --- a/asterisk/SIP_ConnectionHandler.ttcn +++ b/asterisk/SIP_ConnectionHandler.ttcn @@ -467,7 +467,8 @@ } function f_SIP_mo_call_setup(template (present) integer exp_status_code := 200, - template (present) charstring exp_reason := "OK") runs on SIPConnHdlr + template (present) charstring exp_reason := "OK", + boolean exp_update_to_direct_rtp := false) runs on SIPConnHdlr { var template (value) PDU_SIP_Request req; var template (present) PDU_SIP_Response exp; @@ -545,9 +546,62 @@ g_pars.cp.sip_seq_nr, omit); SIP.send(req); + + if (exp_update_to_direct_rtp) { + /* Asterisk will now update the session to connect us to MT directly: */ + /* Via is not kept since anyway "branch" will change upon following INVITE. */ + as_SIP_exp_mo_call_update(?); + } + g_pars.cp.sip_seq_nr := g_pars.cp.sip_seq_nr + 1; } +/* New (re-)INVITE arrives after MO call is established. Accept it: */ +altstep as_SIP_exp_mo_call_update(template (present) integer exp_seq_nr := ?, boolean fail_others := true) runs on SIPConnHdlr +{ + var template (present) PDU_SIP_Request exp_req := + tr_SIP_INVITE(f_tr_SipUrl_opt_defport(g_pars.local_sip_url_ext), + ?, + tr_From(tr_Addr_Union_from_val(g_pars.cp.called.addr), *), + tr_To(tr_Addr_Union_from_val(g_pars.cp.calling.addr), *), + tr_Via_from(f_tr_HostPort(g_pars.remote_sip_host, g_pars.remote_sip_port)), + exp_seq_nr, + body := ?); + var charstring sip_expect_str := log2str(exp_req); + + [] SIP.receive(exp_req) -> value g_rx_sip_req { + var template (value) PDU_SIP_Response tx_resp; + var charstring tx_sdp; + + f_SDP_decodeMessage(g_rx_sip_req.messageBody, g_pars.cp.peer_sdp); + log("Rx Update MO INVITE decoded SDP: ", g_pars.cp.peer_sdp); + + /* Tx 200 OK */ + tx_sdp := f_gen_sdp(); + tx_resp := ts_SIP_Response(g_rx_sip_req.msgHeader.callId.callid, + g_rx_sip_req.msgHeader.fromField, + g_rx_sip_req.msgHeader.toField, + "INVITE", 200, + g_rx_sip_req.msgHeader.cSeq.seqNumber, + "OK", + g_rx_sip_req.msgHeader.via, + body := tx_sdp); + SIP.send(tx_resp); + + /* Wait for ACK */ + exp_req := tr_SIP_ACK(f_tr_SipUrl_opt_defport(g_pars.local_sip_url_ext), + g_rx_sip_req.msgHeader.callId.callid, + g_rx_sip_req.msgHeader.fromField, + g_rx_sip_req.msgHeader.toField, + f_tr_Via_response(g_rx_sip_req.msgHeader.via), + g_rx_sip_req.msgHeader.cSeq.seqNumber, + *); + as_SIP_expect_req(exp_req); + } + [fail_others] as_SIP_fail_resp(sip_expect_str); + [fail_others] as_SIP_fail_req(sip_expect_str); +} + private function f_ConnHdlr_parse_initial_SIP_INVITE(PDU_SIP_Request rx_sip_req) runs on SIPConnHdlr { f_SDP_decodeMessage(rx_sip_req.messageBody, g_pars.cp.peer_sdp); @@ -621,7 +675,7 @@ if (exp_update_to_direct_rtp) { /* Asterisk will now update the session to connect us to MO directly: */ /* Via is not kept since anyway "branch" will change upon following INVITE. */ - as_SIP_exp_call_update(g_pars.cp.sip_seq_nr + 1); + as_SIP_exp_mt_call_update(g_pars.cp.sip_seq_nr + 1); } } [fail_others] as_SIP_fail_resp(sip_expect_str); @@ -694,7 +748,7 @@ } /* New INVITE arrives after MT call is established. Accept it: */ -altstep as_SIP_exp_call_update(template (present) integer exp_seq_nr := ?, boolean fail_others := true) runs on SIPConnHdlr +altstep as_SIP_exp_mt_call_update(template (present) integer exp_seq_nr := ?, boolean fail_others := true) runs on SIPConnHdlr { var template (present) PDU_SIP_Request exp_req := tr_SIP_INVITE(f_tr_SipUrl_opt_defport(g_pars.local_sip_url_ext), @@ -760,7 +814,7 @@ via := g_pars.local_via; via.viaBody[0].viaParams := f_sip_param_set(via.viaBody[0].viaParams, "branch", branch_value); - /* Transmit ACK */ + /* Transmit BYE */ req := ts_SIP_BYE(g_pars.cp.sip_call_id, g_pars.cp.from_addr, g_pars.cp.to_addr, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37489?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: I4ac602865cf0c18036b411acff4562322b32933b Gerrit-Change-Number: 37489 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged
1 0
0 0
[M] Change in osmo-ttcn3-hacks[master]: ttcn3-asterisk: Introduce test TC_ims_call_mo_2nd_mt_rejected
by pespin 16 Jul '24

16 Jul '24
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37481?usp=email ) Change subject: ttcn3-asterisk: Introduce test TC_ims_call_mo_2nd_mt_rejected ...................................................................... ttcn3-asterisk: Introduce test TC_ims_call_mo_2nd_mt_rejected Change-Id: Id6577d0e9137c86855469904d347e95b5bcfa4a7 --- M asterisk/Asterisk_Tests.ttcn M asterisk/IMS_ConnectionHandler.ttcn M asterisk/expected-results.xml 3 files changed, 101 insertions(+), 3 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn index 00b6edb..9b5bb11 100644 --- a/asterisk/Asterisk_Tests.ttcn +++ b/asterisk/Asterisk_Tests.ttcn @@ -787,14 +787,37 @@ as_IMS_exp_call_resume(); f_TC_ims_call_mo_IMS_ConnHdlr_hangup_call_unregister(); } +private function f_TC_ims_call_mo_IMS_ConnHdlr_2nd_mt_rejected(charstring id) runs on IMS_ConnHdlr { + var IMS_ConnHdlrSubscrPars subscr0; + var default d_trying, d_ringing, d_sessprog; + var Via via; + + /* Establish 1st (MO) call */ + f_TC_ims_call_mo_IMS_ConnHdlr_register_establish_call(); + + /* Backup state of 1st call subscriber: */ + subscr0 := g_pars.subscr; + /* Initiate second (MT) call: */ + f_IMS_mt_call_rejected(486, "Busy Here"); + /* Leave some time for last ACK from IMS to arrive to Asterisk */ + f_sleep(1.0); + /* Restore 1s call metadata before hanging it up here: */ + g_pars.subscr := subscr0; + COORD.send(IMS_COORD_CMD_CALL_REJECTED); + + f_TC_ims_call_mo_IMS_ConnHdlr_hangup_call_unregister(); +} type function call_established_fn(SIPConnHdlrPars sip_pars, IMS_ConnHdlrPars ims_pars) runs on test_CT; -private function call_established_fn_sleep(SIPConnHdlrPars sip_pars, IMS_ConnHdlrPars ims_pars) runs on test_CT { +private function call_established_fn_sleep1(SIPConnHdlrPars sip_pars, IMS_ConnHdlrPars ims_pars) runs on test_CT { f_sleep(1.0); } +private function call_established_fn_wait_ims_coord_cmd_call_rejected(SIPConnHdlrPars sip_pars, IMS_ConnHdlrPars ims_pars) runs on test_CT { + IMS_COORD.receive(IMS_COORD_CMD_CALL_REJECTED); +} private function f_TC_ims_call_mo(boolean use_precondition_ext := true, boolean use_session_timer := false, - call_established_fn call_established_cb := refers(call_established_fn_sleep), + call_established_fn call_established_cb := refers(call_established_fn_sleep1), void_fn sip_fn := refers(f_TC_internal_call_mo), ims_void_fn ims_fn := refers(f_TC_ims_call_mo_IMS_ConnHdlr)) runs on test_CT { var SIPConnHdlrPars sip_pars; @@ -887,7 +910,14 @@ f_TC_ims_call_mo(call_established_cb := refers(call_established_fn_2ndrejected)); } -/* Test SIP registration of local clients */ +/* Test a 2nd call initiated from IMS towards Astierisk is rejected with + * 486 Busy Here if IMS endpoint is already busy in a call. */ +testcase TC_ims_call_mo_2nd_mt_rejected() runs on test_CT { + f_TC_ims_call_mo(call_established_cb := refers(call_established_fn_wait_ims_coord_cmd_call_rejected), + ims_fn := refers(f_TC_ims_call_mo_IMS_ConnHdlr_2nd_mt_rejected)); +} + +/* Test MT call initiated by IMS */ private function f_TC_ims_call_mt_IMS_ConnHdlr(charstring id) runs on IMS_ConnHdlr { f_create_sip_expect(valueof(ts_SipUrl_from_Addr_Union(g_pars.subscr.registrar_sip_record.addr))); as_IMS_register(); @@ -1005,6 +1035,7 @@ execute( TC_ims_call_mo_noprecondition() ); execute( TC_ims_call_mo_holdresume_mo() ); execute( TC_ims_call_mo_2nd_mo_rejected() ); + execute( TC_ims_call_mo_2nd_mt_rejected() ); execute( TC_ims_call_mt() ); execute( TC_ims_call_mt_noprecondition() ); } diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index d4c9da2..878b44e 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -48,6 +48,7 @@ const charstring IMS_COORD_CMD_CALL_ESTABLISHED := "IMS_COORD_CMD_CALL_ESTABLISHED"; const charstring IMS_COORD_CMD_HANGUP := "IMS_COORD_CMD_HANGUP"; const charstring IMS_COORD_CMD_CALL_FINISHED := "IMS_COORD_CMD_CALL_FINISHED"; +const charstring IMS_COORD_CMD_CALL_REJECTED := "IMS_COORD_CMD_CALL_REJECTED"; const charstring IMS_COORD_CMD_CALL_TRYING := "IMS_COORD_CMD_CALL_TRYING"; const charstring IMS_COORD_CMD_CALL_SESSION_PROGRESS := "IMS_COORD_CMD_CALL_SESSION_PROGRESS"; const charstring IMS_COORD_CMD_CALL_SESSION_REFRESH := "IMS_COORD_CMD_CALL_SESSION_REFRESH"; @@ -1379,6 +1380,62 @@ g_pars.subscr.cp.sip_seq_nr := g_pars.subscr.cp.sip_seq_nr + 1; } +/* IMS Core starts a call towards the peer and gets rejected. */ +function f_IMS_mt_call_rejected(template (present) integer exp_status_code := 486, + template (present) charstring exp_reason := "Busy Here") runs on IMS_ConnHdlr +{ + var template (value) PDU_SIP_Request req; + var template (present) PDU_SIP_Response exp; + var default d_trying, d_ringing, d_sessprog; + var Via via; + + g_pars.subscr.cp.from_addr := valueof(ts_From(g_pars.subscr.cp.calling.addr, g_pars.subscr.cp.calling.params)); + g_pars.subscr.cp.from_addr.fromParams := f_sip_param_set(g_pars.subscr.cp.from_addr.fromParams, "tag", f_sip_rand_tag()); + g_pars.subscr.cp.to_addr := valueof(ts_To(g_pars.subscr.cp.called.addr, g_pars.subscr.cp.called.params)); + via := f_IMS_gen_new_Via(); + f_IMS_mt_call_tx_invite(via); + + /* Conditionally match and accept 100 Trying. */ + exp := tr_SIP_Response_Trying(g_pars.subscr.cp.sip_call_id, + ?, ?, + f_tr_Via_response(via), + g_pars.subscr.cp.sip_seq_nr, "INVITE"); + d_trying := activate(as_SIP_ignore_resp(exp)); + /* Conditionally match and accept 183 Session Progress. */ + exp := tr_SIP_Response_SessionProgress(g_pars.subscr.cp.sip_call_id, + ?, ?, + f_tr_Via_response(via), + g_pars.subscr.cp.sip_seq_nr, "INVITE"); + d_sessprog := activate(as_SIP_ignore_resp(exp)); + + /* Wait for 486 Busy Here (INVITE) answer */ + exp := tr_SIP_Response(g_pars.subscr.cp.sip_call_id, + ?, ?, + f_tr_Via_response(via), + *, + "INVITE", exp_status_code, + g_pars.subscr.cp.sip_seq_nr, exp_reason, + body := omit); + as_SIP_expect_resp(exp, fail_others := false); + + deactivate(d_sessprog); + deactivate(d_trying); + + /* Update To with the tags received from peer: */ + g_pars.subscr.cp.to_addr := g_rx_sip_resp.msgHeader.toField; + + /* Transmit ACK */ + req := ts_SIP_ACK(ts_SipUrl_from_Addr_Union(g_pars.subscr.cp.called.addr), + g_pars.subscr.cp.sip_call_id, + g_pars.subscr.cp.from_addr, + g_pars.subscr.cp.to_addr, + via, + g_pars.subscr.cp.sip_seq_nr, + omit); + SIP.send(req); + g_pars.subscr.cp.sip_seq_nr := g_pars.subscr.cp.sip_seq_nr + 1; +} + /* Tx BYE: */ function f_IMS_do_call_hangup() runs on IMS_ConnHdlr { diff --git a/asterisk/expected-results.xml b/asterisk/expected-results.xml index 21f0ed4..ddc50a5 100644 --- a/asterisk/expected-results.xml +++ b/asterisk/expected-results.xml @@ -19,6 +19,7 @@ <testcase classname='Asterisk_Tests' name='TC_ims_call_mo_noprecondition' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_ims_call_mo_holdresume_mo' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_ims_call_mo_2nd_mo_rejected' time='MASKED'/> + <testcase classname='Asterisk_Tests' name='TC_ims_call_mo_2nd_mt_rejected' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_ims_call_mt' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_ims_call_mt_noprecondition' time='MASKED'/> </testsuite> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37481?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: Id6577d0e9137c86855469904d347e95b5bcfa4a7 Gerrit-Change-Number: 37481 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged
1 0
0 0
[S] Change in osmo-ttcn3-hacks[master]: asterisk: sip: Fail rx unexpected msg during unregister
by pespin 16 Jul '24

16 Jul '24
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37490?usp=email ) Change subject: asterisk: sip: Fail rx unexpected msg during unregister ...................................................................... asterisk: sip: Fail rx unexpected msg during unregister Change-Id: Ibcf65b22925e990e4d13661204eaba1b471b6a5d --- M asterisk/SIP_ConnectionHandler.ttcn 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/asterisk/SIP_ConnectionHandler.ttcn b/asterisk/SIP_ConnectionHandler.ttcn index c3d955a..5f76ad2 100644 --- a/asterisk/SIP_ConnectionHandler.ttcn +++ b/asterisk/SIP_ConnectionHandler.ttcn @@ -350,6 +350,7 @@ via.viaBody[0].viaParams := f_sip_param_set(via.viaBody[0].viaParams, "branch", branch_value); from_addr.fromParams := f_sip_param_set(from_addr.fromParams, "tag", f_sip_rand_tag()); + SIP.clear; SIP.send(ts_SIP_REGISTER(g_pars.registrar_sip_req_uri, g_pars.registrar_sip_call_id, from_addr, @@ -416,6 +417,8 @@ g_pars.registrar_sip_seq_nr, "OK"); as_SIP_expect_resp(exp); } + [] as_SIP_fail_resp("(un)REGISTER 200 OK"); + [] as_SIP_fail_req("(un)REGISTER 200 OK"); } /* Prepare for next use: */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37490?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: Ibcf65b22925e990e4d13661204eaba1b471b6a5d Gerrit-Change-Number: 37490 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged
1 0
0 0
[S] Change in osmo-ttcn3-hacks[master]: asterisk: TC_internal_call_all_Nregistered: Answer Cancel when received
by pespin 16 Jul '24

16 Jul '24
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37491?usp=email ) Change subject: asterisk: TC_internal_call_all_Nregistered: Answer Cancel when received ...................................................................... asterisk: TC_internal_call_all_Nregistered: Answer Cancel when received Otherwise CANCEL is not answered until the MO+MT SIP UAs have fully established the call, which causes Asterisk to retransmit the CANCEL several times. Change-Id: I72e9ecaf58156f3fe62c4fb2d8c74c82ab16aa78 --- M asterisk/Asterisk_Tests.ttcn 1 file changed, 23 insertions(+), 7 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn index 71d3576..916339a 100644 --- a/asterisk/Asterisk_Tests.ttcn +++ b/asterisk/Asterisk_Tests.ttcn @@ -373,16 +373,19 @@ /* Make sure the desired MT is the one picking up first the call: */ COORD.send(COORD_CMD_PICKUP) to vc_conn_list[vc_conn_mt_idx]; - interleave { - [] COORD.receive(COORD_CMD_CALL_ESTABLISHED) from vc_conn_list[vc_conn_mo_idx]; - [] COORD.receive(COORD_CMD_CALL_ESTABLISHED) from vc_conn_list[vc_conn_mt_idx]; - } - - /* Pick up from other phone calls and expect CANCEL: */ for (var integer i := 0; i < num_conns; i := i + 1) { if (i != vc_conn_mo_idx and i != vc_conn_mt_idx) { COORD.send(COORD_CMD_PICKUP) to vc_conn_list[i]; - COORD.receive(COORD_CMD_CALL_CANCELLED) from vc_conn_list[i]; + } + } + + /* Pick up from other phone calls and expect CANCEL: */ + var boolean wait_mo := true, wait_mt := true; + for (var integer i := 0; i < num_conns; i := i + 1) { + alt { + [wait_mo] COORD.receive(COORD_CMD_CALL_ESTABLISHED) from vc_conn_list[vc_conn_mo_idx] { wait_mo := false }; + [wait_mt] COORD.receive(COORD_CMD_CALL_ESTABLISHED) from vc_conn_list[vc_conn_mt_idx] { wait_mt := false }; + [] COORD.receive(COORD_CMD_CALL_CANCELLED); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37491?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: I72e9ecaf58156f3fe62c4fb2d8c74c82ab16aa78 Gerrit-Change-Number: 37491 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged
1 0
0 0
[M] Change in osmo-ttcn3-hacks[master]: asterisk: Introduce test TC_ims_call_mt_no_local_uas_registered
by pespin 16 Jul '24

16 Jul '24
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37492?usp=email ) Change subject: asterisk: Introduce test TC_ims_call_mt_no_local_uas_registered ...................................................................... asterisk: Introduce test TC_ims_call_mt_no_local_uas_registered Change-Id: Ibf7ecfe67f90df060b0ae87f394424566ad0fed4 --- M asterisk/Asterisk_Tests.ttcn M asterisk/expected-results.xml 2 files changed, 72 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn index 916339a..d202c05 100644 --- a/asterisk/Asterisk_Tests.ttcn +++ b/asterisk/Asterisk_Tests.ttcn @@ -1019,6 +1019,67 @@ f_TC_ims_call_mt(false); } +/* Validate incoming IMS MT call is rejected if no UAs are registered, hence not available. */ +private function f_TC_ims_call_mt_IMS_ConnHdlr_603_Decline(charstring id) runs on IMS_ConnHdlr { + f_create_sip_expect(valueof(ts_SipUrl_from_Addr_Union(g_pars.subscr.registrar_sip_record.addr))); + as_IMS_register(); + COORD.send(IMS_COORD_CMD_REGISTERED); + setverdict(pass); + + COORD.receive(IMS_COORD_CMD_START); + f_IMS_mt_call_rejected(603, "Decline"); + setverdict(pass); + COORD.send(IMS_COORD_CMD_CALL_REJECTED); + + as_IMS_unregister(); +} +testcase TC_ims_call_mt_no_local_uas_registered() runs on test_CT { + var IMS_ConnHdlrPars ims_pars; + var IMS_ConnHdlr vc_conn_ims; + var AMI_Msg ami_msg; + const charstring c_ext_msisdn := "90829"; + + f_init(); + + ims_pars := f_init_IMS_ConnHdlrPars(); + + ims_pars.subscr.cp.calling := valueof(ts_SipAddr(ts_HostPort(ims_pars.realm), + ts_UserInfo(c_ext_msisdn))); + ims_pars.subscr.cp.called := valueof(ts_SipAddr(ts_HostPort(ims_pars.realm), + ts_UserInfo(ims_pars.subscr.msisdn))); + + vc_conn_ims := f_start_handler_IMS(refers(f_TC_ims_call_mt_IMS_ConnHdlr_603_Decline), ims_pars); + + f_AMI_IMS_register(ims_pars); + IMS_COORD.receive(IMS_COORD_CMD_REGISTERED) from vc_conn_ims; + + IMS_COORD.send(IMS_COORD_CMD_START) to vc_conn_ims; + + ami_msg := f_ami_wait_rx_msg(AMI_CLIENT, + tr_AMI_Event_Newchannel(mp_volte_ims_outbound_registration), + fail_others := false); + g_asterisk_chan_name := valueof(f_ami_msg_get_value(ami_msg, AMI_FIELD_CHANNEL)); + + f_ami_action_DedicatedBearerStatus(AMI_CLIENT, + g_asterisk_chan_name, + "Up", fail_others := false); + + /* Notify network released dedicated bearer: */ + IMS_COORD.receive(IMS_COORD_CMD_CALL_REJECTED) from vc_conn_ims; + AMI_CLIENT.clear; + f_ami_action_DedicatedBearerStatus(AMI_CLIENT, + g_asterisk_chan_name, + "Down", fail_others := false); + + /* Trigger unregistration: */ + f_sleep(1.0); + AMI_CLIENT.clear; + f_AMI_IMS_unregister(ims_pars); + + vc_conn_ims.done; + f_shutdown(); +} + control { execute( TC_internal_registration() ); execute( TC_internal_call_momt() ); @@ -1042,6 +1103,7 @@ execute( TC_ims_call_mo_2nd_mt_rejected() ); execute( TC_ims_call_mt() ); execute( TC_ims_call_mt_noprecondition() ); + execute( TC_ims_call_mt_no_local_uas_registered() ); } } diff --git a/asterisk/expected-results.xml b/asterisk/expected-results.xml index ddc50a5..3be281c 100644 --- a/asterisk/expected-results.xml +++ b/asterisk/expected-results.xml @@ -22,4 +22,5 @@ <testcase classname='Asterisk_Tests' name='TC_ims_call_mo_2nd_mt_rejected' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_ims_call_mt' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_ims_call_mt_noprecondition' time='MASKED'/> + <testcase classname='Asterisk_Tests' name='TC_ims_call_mt_no_local_uas_registered' time='MASKED'/> </testsuite> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37492?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: Ibf7ecfe67f90df060b0ae87f394424566ad0fed4 Gerrit-Change-Number: 37492 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged
1 0
0 0
[M] Change in osmo-ttcn3-hacks[master]: asterisk: Introduce test TC_ims_call_mt_local_uas_inacall
by pespin 16 Jul '24

16 Jul '24
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37493?usp=email ) Change subject: asterisk: Introduce test TC_ims_call_mt_local_uas_inacall ...................................................................... asterisk: Introduce test TC_ims_call_mt_local_uas_inacall Change-Id: I8a407993f37d18a0bf4c96f5228c0b5ce696053a --- M asterisk/Asterisk_Tests.ttcn M asterisk/expected-results.xml 2 files changed, 87 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn index d202c05..a97f2a4 100644 --- a/asterisk/Asterisk_Tests.ttcn +++ b/asterisk/Asterisk_Tests.ttcn @@ -1080,6 +1080,82 @@ f_shutdown(); } +/* Validate incoming IMS MT call is rejected if no UAs are available due to being busy in an internall call. */ +testcase TC_ims_call_mt_local_uas_inacall() runs on test_CT { + var SIPConnHdlrPars sip_pars[2]; + var IMS_ConnHdlrPars ims_pars; + var SIPConnHdlr vc_conn_sip[2]; + var IMS_ConnHdlr vc_conn_ims; + var AMI_Msg ami_msg; + const charstring c_ext_msisdn := "90829"; + + f_init(); + + sip_pars[0] := f_init_ConnHdlrPars(idx := 1); + sip_pars[1] := f_init_ConnHdlrPars(idx := 2); + ims_pars := f_init_IMS_ConnHdlrPars(); + + sip_pars[0].cp.calling := sip_pars[0].registrar_sip_record; + sip_pars[0].cp.called := sip_pars[1].registrar_sip_record; + + sip_pars[1].cp.calling := sip_pars[0].registrar_sip_record; + sip_pars[1].cp.called := sip_pars[1].local_sip_record; + + ims_pars.subscr.cp.calling := valueof(ts_SipAddr(ts_HostPort(ims_pars.realm), + ts_UserInfo(c_ext_msisdn))); + ims_pars.subscr.cp.called := valueof(ts_SipAddr(ts_HostPort(ims_pars.realm), + ts_UserInfo(ims_pars.subscr.msisdn))); + + vc_conn_sip[0] := f_start_handler(refers(f_TC_internal_call_mo), sip_pars[0]); + vc_conn_sip[1] := f_start_handler(refers(f_TC_internal_call_mt), sip_pars[1]); + + vc_conn_ims := f_start_handler_IMS(refers(f_TC_ims_call_mt_IMS_ConnHdlr_603_Decline), ims_pars); + f_AMI_IMS_register(ims_pars); + + interleave { + [] COORD.receive(COORD_CMD_REGISTERED) from vc_conn_sip[0]; + [] COORD.receive(COORD_CMD_REGISTERED) from vc_conn_sip[1]; + [] IMS_COORD.receive(IMS_COORD_CMD_REGISTERED) from vc_conn_ims; + } + + COORD.send(COORD_CMD_START) to vc_conn_sip[0]; + + interleave { + [] COORD.receive(COORD_CMD_CALL_ESTABLISHED) from vc_conn_sip[0]; + [] COORD.receive(COORD_CMD_CALL_ESTABLISHED) from vc_conn_sip[1]; + } + + /* Call on-going, now IMS MT call is attempted: */ + f_sleep(1.0); + IMS_COORD.send(IMS_COORD_CMD_START) to vc_conn_ims; + ami_msg := f_ami_wait_rx_msg(AMI_CLIENT, + tr_AMI_Event_Newchannel(mp_volte_ims_outbound_registration), + fail_others := false); + g_asterisk_chan_name := valueof(f_ami_msg_get_value(ami_msg, AMI_FIELD_CHANNEL)); + f_ami_action_DedicatedBearerStatus(AMI_CLIENT, + g_asterisk_chan_name, + "Up", fail_others := false); + IMS_COORD.receive(IMS_COORD_CMD_CALL_REJECTED) from vc_conn_ims; + AMI_CLIENT.clear; + f_ami_action_DedicatedBearerStatus(AMI_CLIENT, + g_asterisk_chan_name, + "Down", fail_others := false); + + + COORD.send(COORD_CMD_HANGUP) to vc_conn_sip[0]; + COORD.receive(COORD_CMD_CALL_FINISHED) from vc_conn_sip[1]; + + COORD.send(COORD_CMD_UNREGISTER) to vc_conn_sip[0]; + COORD.send(COORD_CMD_UNREGISTER) to vc_conn_sip[1]; + AMI_CLIENT.clear; + f_AMI_IMS_unregister(ims_pars); + + vc_conn_sip[0].done; + vc_conn_sip[1].done; + vc_conn_ims.done; + f_shutdown(); +} + control { execute( TC_internal_registration() ); execute( TC_internal_call_momt() ); @@ -1104,6 +1180,7 @@ execute( TC_ims_call_mt() ); execute( TC_ims_call_mt_noprecondition() ); execute( TC_ims_call_mt_no_local_uas_registered() ); + execute( TC_ims_call_mt_local_uas_inacall() ); } } diff --git a/asterisk/expected-results.xml b/asterisk/expected-results.xml index 3be281c..dd665e4 100644 --- a/asterisk/expected-results.xml +++ b/asterisk/expected-results.xml @@ -23,4 +23,5 @@ <testcase classname='Asterisk_Tests' name='TC_ims_call_mt' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_ims_call_mt_noprecondition' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_ims_call_mt_no_local_uas_registered' time='MASKED'/> + <testcase classname='Asterisk_Tests' name='TC_ims_call_mt_local_uas_inacall' time='MASKED'/> </testsuite> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37493?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: I8a407993f37d18a0bf4c96f5228c0b5ce696053a Gerrit-Change-Number: 37493 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged
1 0
0 0
[S] Change in osmo-ttcn3-hacks[master]: asterisk: Move Via generation to helper function
by pespin 16 Jul '24

16 Jul '24
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37479?usp=email ) Change subject: asterisk: Move Via generation to helper function ...................................................................... asterisk: Move Via generation to helper function Change-Id: Id49222928980e1fc5ab006719688b4fa0849d391 --- M asterisk/IMS_ConnectionHandler.ttcn 1 file changed, 24 insertions(+), 17 deletions(-) Approvals: pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index 3e4e3e9..6a1328d 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -1107,6 +1107,19 @@ [fail_others] as_SIP_fail_req(sip_expect_str); } +private function f_IMS_gen_new_Via() runs on IMS_ConnHdlr return Via +{ + var charstring branch_value; + var Via via := g_pars.local_via; + + branch_value := f_sip_gen_branch(f_sip_Addr_Union_to_str(g_pars.subscr.cp.from_addr.addressField), + f_sip_Addr_Union_to_str(valueof(g_pars.subscr.cp.to_addr.addressField)), + g_pars.subscr.cp.sip_call_id, + g_pars.subscr.cp.sip_seq_nr); + via.viaBody[0].viaParams := f_sip_param_set(via.viaBody[0].viaParams, "branch", branch_value); + return via; +} + /* IMS Core starts a call towards the peer: 3GPP TS 24.229 5.1.3.1 */ function f_IMS_mt_call_setup() runs on IMS_ConnHdlr { @@ -1122,7 +1135,6 @@ var OptionTag_List supported_list := {}; var charstring tx_sdp; var default d_trying, d_ringing; - var charstring branch_value; var Contact calling_contact, called_contact; var integer sip_seq_nr; @@ -1132,12 +1144,7 @@ g_pars.subscr.cp.to_addr := valueof(ts_To(g_pars.subscr.cp.called.addr, g_pars.subscr.cp.called.params)); from_addr_exp := tr_From(tr_Addr_Union_from_val(g_pars.subscr.cp.from_addr.addressField), *); to_addr_exp := tr_To(tr_Addr_Union_from_val(g_pars.subscr.cp.to_addr.addressField), *); - branch_value := f_sip_gen_branch(f_sip_Addr_Union_to_str(g_pars.subscr.cp.from_addr.addressField), - f_sip_Addr_Union_to_str(valueof(g_pars.subscr.cp.to_addr.addressField)), - g_pars.subscr.cp.sip_call_id, - g_pars.subscr.cp.sip_seq_nr); - via := g_pars.local_via; - via.viaBody[0].viaParams := f_sip_param_set(via.viaBody[0].viaParams, "branch", branch_value); + via := f_IMS_gen_new_Via(); calling_contact := valueof(ts_Contact({ ts_ContactAddress(g_pars.subscr.cp.calling.addr, omit) @@ -1359,16 +1366,7 @@ { var template (value) PDU_SIP_Request req; var template (present) PDU_SIP_Response exp_resp; - var Via via; - var charstring branch_value; - - branch_value := f_sip_gen_branch(f_sip_Addr_Union_to_str(g_pars.subscr.cp.from_addr.addressField), - f_sip_Addr_Union_to_str(valueof(g_pars.subscr.cp.to_addr.addressField)), - g_pars.subscr.cp.sip_call_id, - g_pars.subscr.cp.sip_seq_nr); - - via := g_pars.local_via; - via.viaBody[0].viaParams := f_sip_param_set(via.viaBody[0].viaParams, "branch", branch_value); + var Via via := f_IMS_gen_new_Via(); /* Transmit ACK */ req := ts_SIP_BYE(g_pars.subscr.cp.sip_call_id, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37479?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: Id49222928980e1fc5ab006719688b4fa0849d391 Gerrit-Change-Number: 37479 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged
1 0
0 0
[M] Change in osmo-ttcn3-hacks[master]: asterisk: TC_ims_call_mo_2nd_mo_rejected
by pespin 16 Jul '24

16 Jul '24
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37476?usp=email ) Change subject: asterisk: TC_ims_call_mo_2nd_mo_rejected ...................................................................... asterisk: TC_ims_call_mo_2nd_mo_rejected Related: SYS#7003 Change-Id: I7764e29e8df11ad65366642f83ebe922488bf128 --- M asterisk/Asterisk_Tests.ttcn M asterisk/SIP_ConnectionHandler.ttcn M asterisk/expected-results.xml 3 files changed, 87 insertions(+), 23 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn index c6ac698..00b6edb 100644 --- a/asterisk/Asterisk_Tests.ttcn +++ b/asterisk/Asterisk_Tests.ttcn @@ -237,6 +237,18 @@ f_TC_internal_hangup_call_mo_unregister(); setverdict(pass); } +private function f_TC_internal_call_mo_rejected(charstring id) runs on SIPConnHdlr { + f_SIP_register(); + COORD.send(COORD_CMD_REGISTERED); + + COORD.receive(COORD_CMD_START); + f_SIP_mo_call_setup(503, "Service Unavailable"); + COORD.send(COORD_CMD_CALL_FINISHED); + + COORD.receive(COORD_CMD_UNREGISTER); + f_SIP_unregister(); + setverdict(pass); +} private function f_TC_internal_call_mt(charstring id) runs on SIPConnHdlr { @@ -702,15 +714,15 @@ f_shutdown(); } -private function f_ims_call_mo_configure(inout SIPConnHdlrPars sip_pars, inout IMS_ConnHdlrPars ims_pars) runs on test_CT { - const charstring c_ext_msisdn := "90829"; +private function f_ims_call_mo_configure(inout SIPConnHdlrPars sip_pars, inout IMS_ConnHdlrPars ims_pars, + charstring tgt_ext_msisdn := "90829") runs on test_CT { sip_pars.cp.calling := sip_pars.registrar_sip_record; sip_pars.cp.called := valueof(ts_SipAddr(ts_HostPort(sip_pars.remote_sip_host), - ts_UserInfo(c_ext_msisdn))); + ts_UserInfo(tgt_ext_msisdn))); ims_pars.subscr.cp.calling := valueof(ts_SipAddr(ts_HostPort(ims_pars.realm), ts_UserInfo(ims_pars.subscr.msisdn))); ims_pars.subscr.cp.called := valueof(ts_SipAddr(ts_HostPort(ims_pars.realm), - ts_UserInfo(c_ext_msisdn))); + ts_UserInfo(tgt_ext_msisdn))); } private function f_ims_call_mo_establish(inout SIPConnHdlr vc_conn_sip, inout IMS_ConnHdlr vc_conn_ims) runs on test_CT { @@ -776,7 +788,13 @@ f_TC_ims_call_mo_IMS_ConnHdlr_hangup_call_unregister(); } +type function call_established_fn(SIPConnHdlrPars sip_pars, IMS_ConnHdlrPars ims_pars) runs on test_CT; +private function call_established_fn_sleep(SIPConnHdlrPars sip_pars, IMS_ConnHdlrPars ims_pars) runs on test_CT { + f_sleep(1.0); +} + private function f_TC_ims_call_mo(boolean use_precondition_ext := true, boolean use_session_timer := false, + call_established_fn call_established_cb := refers(call_established_fn_sleep), void_fn sip_fn := refers(f_TC_internal_call_mo), ims_void_fn ims_fn := refers(f_TC_ims_call_mo_IMS_ConnHdlr)) runs on test_CT { var SIPConnHdlrPars sip_pars; @@ -815,7 +833,7 @@ if (use_session_timer) { IMS_COORD.receive(IMS_COORD_CMD_CALL_SESSION_REFRESH); } - f_sleep(1.0); + call_established_cb.apply(sip_pars, ims_pars); COORD.send(COORD_CMD_HANGUP) to vc_conn_sip; IMS_COORD.receive(IMS_COORD_CMD_CALL_FINISHED) from vc_conn_ims; @@ -850,6 +868,25 @@ ims_fn := refers(f_TC_ims_call_mo_IMS_ConnHdlr_with_holdresume)); } +/* Test a 2nd call initiated from a local SIP UA towards IMS is rejected with + * 503 Service Unavailable if IMS endpoint is already busy in a call. */ +private function call_established_fn_2ndrejected(SIPConnHdlrPars sip_pars, IMS_ConnHdlrPars ims_pars) runs on test_CT { + var SIPConnHdlrPars sip_pars2; + var SIPConnHdlr vc_conn_sip2; + sip_pars2 := f_init_ConnHdlrPars(idx := 2); + f_ims_call_mo_configure(sip_pars2, ims_pars, tgt_ext_msisdn := "88888888"); + vc_conn_sip2 := f_start_handler(refers(f_TC_internal_call_mo_rejected), sip_pars2); + + COORD.receive(COORD_CMD_REGISTERED) from vc_conn_sip2; + COORD.send(COORD_CMD_START) to vc_conn_sip2; + COORD.receive(COORD_CMD_CALL_FINISHED) from vc_conn_sip2; + COORD.send(COORD_CMD_UNREGISTER) to vc_conn_sip2; + vc_conn_sip2.done; +} +testcase TC_ims_call_mo_2nd_mo_rejected() runs on test_CT { + f_TC_ims_call_mo(call_established_cb := refers(call_established_fn_2ndrejected)); +} + /* Test SIP registration of local clients */ private function f_TC_ims_call_mt_IMS_ConnHdlr(charstring id) runs on IMS_ConnHdlr { f_create_sip_expect(valueof(ts_SipUrl_from_Addr_Union(g_pars.subscr.registrar_sip_record.addr))); @@ -967,6 +1004,7 @@ execute( TC_ims_call_mo_session_timer() ); execute( TC_ims_call_mo_noprecondition() ); execute( TC_ims_call_mo_holdresume_mo() ); + execute( TC_ims_call_mo_2nd_mo_rejected() ); execute( TC_ims_call_mt() ); execute( TC_ims_call_mt_noprecondition() ); } diff --git a/asterisk/SIP_ConnectionHandler.ttcn b/asterisk/SIP_ConnectionHandler.ttcn index ad76296..49fa04c 100644 --- a/asterisk/SIP_ConnectionHandler.ttcn +++ b/asterisk/SIP_ConnectionHandler.ttcn @@ -423,29 +423,16 @@ return g_rx_sip_resp; } -function f_SIP_mo_call_setup() runs on SIPConnHdlr +private function f_SIP_mo_call_tx_invite(Via via) runs on SIPConnHdlr { var template (value) PDU_SIP_Request req; + var charstring tx_sdp := f_gen_sdp(); var template (present) PDU_SIP_Response exp; var template (present) From from_addr_exp; var template (present) To to_addr_exp; - var Via via; - var charstring tx_sdp := f_gen_sdp(); - var default d_trying, d_ringing, d_sessprog; - var charstring branch_value; - /* RFC 3261 8.1.1.3 From */ - g_pars.cp.from_addr := valueof(ts_From(g_pars.cp.calling.addr, g_pars.cp.calling.params)); - g_pars.cp.from_addr.fromParams := f_sip_param_set(g_pars.cp.from_addr.fromParams, "tag", f_sip_rand_tag()); - g_pars.cp.to_addr := valueof(ts_To(g_pars.cp.called.addr, g_pars.cp.called.params)); from_addr_exp := tr_From(tr_Addr_Union_from_val(g_pars.cp.from_addr.addressField), *); to_addr_exp := tr_To(tr_Addr_Union_from_val(g_pars.cp.to_addr.addressField), *); - branch_value := f_sip_gen_branch(f_sip_Addr_Union_to_str(g_pars.cp.from_addr.addressField), - f_sip_Addr_Union_to_str(valueof(g_pars.cp.to_addr.addressField)), - g_pars.cp.sip_call_id, - g_pars.cp.sip_seq_nr); - via := g_pars.local_via; - via.viaBody[0].viaParams := f_sip_param_set(via.viaBody[0].viaParams, "branch", branch_value); req := ts_SIP_INVITE(g_pars.cp.sip_call_id, g_pars.cp.from_addr, @@ -477,6 +464,34 @@ g_pars.cp.sip_seq_nr := g_pars.cp.sip_seq_nr + 1; f_sip_Request_inc_seq_nr(req); SIP.send(req); +} + +function f_SIP_mo_call_setup(template (present) integer exp_status_code := 200, + template (present) charstring exp_reason := "OK") runs on SIPConnHdlr +{ + var template (value) PDU_SIP_Request req; + var template (present) PDU_SIP_Response exp; + var template (present) From from_addr_exp; + var template (present) To to_addr_exp; + var Via via; + var charstring tx_sdp := f_gen_sdp(); + var default d_trying, d_ringing, d_sessprog; + var charstring branch_value; + + /* RFC 3261 8.1.1.3 From */ + g_pars.cp.from_addr := valueof(ts_From(g_pars.cp.calling.addr, g_pars.cp.calling.params)); + g_pars.cp.from_addr.fromParams := f_sip_param_set(g_pars.cp.from_addr.fromParams, "tag", f_sip_rand_tag()); + g_pars.cp.to_addr := valueof(ts_To(g_pars.cp.called.addr, g_pars.cp.called.params)); + from_addr_exp := tr_From(tr_Addr_Union_from_val(g_pars.cp.from_addr.addressField), *); + to_addr_exp := tr_To(tr_Addr_Union_from_val(g_pars.cp.to_addr.addressField), *); + branch_value := f_sip_gen_branch(f_sip_Addr_Union_to_str(g_pars.cp.from_addr.addressField), + f_sip_Addr_Union_to_str(valueof(g_pars.cp.to_addr.addressField)), + g_pars.cp.sip_call_id, + g_pars.cp.sip_seq_nr); + via := g_pars.local_via; + via.viaBody[0].viaParams := f_sip_param_set(via.viaBody[0].viaParams, "branch", branch_value); + + f_SIP_mo_call_tx_invite(via); /* Conditionally match and accept 100 Trying. */ exp := tr_SIP_Response_Trying(g_pars.cp.sip_call_id, @@ -509,9 +524,9 @@ to_addr_exp, f_tr_Via_response(via), *, - "INVITE", 200, - g_pars.cp.sip_seq_nr, "OK", - body := ?); + "INVITE", exp_status_code, + g_pars.cp.sip_seq_nr, exp_reason, + body := *); as_SIP_expect_resp(exp, fail_others := false); deactivate(d_trying); diff --git a/asterisk/expected-results.xml b/asterisk/expected-results.xml index 1819072..21f0ed4 100644 --- a/asterisk/expected-results.xml +++ b/asterisk/expected-results.xml @@ -18,6 +18,7 @@ <testcase classname='Asterisk_Tests' name='TC_ims_call_mo_session_timer' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_ims_call_mo_noprecondition' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_ims_call_mo_holdresume_mo' time='MASKED'/> + <testcase classname='Asterisk_Tests' name='TC_ims_call_mo_2nd_mo_rejected' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_ims_call_mt' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_ims_call_mt_noprecondition' time='MASKED'/> </testsuite> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37476?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: I7764e29e8df11ad65366642f83ebe922488bf128 Gerrit-Change-Number: 37476 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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
0 0
  • ← Newer
  • 1
  • ...
  • 78
  • 79
  • 80
  • 81
  • 82
  • 83
  • 84
  • ...
  • 138
  • Older →

HyperKitty Powered by HyperKitty version 1.3.12.