April 2024 - gerrit-log - lists.osmocom.org

[S] Change in osmo-ttcn3-hacks[master]: {SIP,Asterisk}_Tests: Mark all components alive

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36548?usp=email ) Change subject: {SIP,Asterisk}_Tests: Mark all components alive ...................................................................... {SIP,Asterisk}_Tests: Mark all components alive This fixes some dynamic errors occuring due to messages arriving while tests is being torn down. Change-Id: I60642071758ad1203196eddd3bbacb84f4dcf9fb --- M asterisk/Asterisk_Tests.ttcn M library/SIP_Emulation.ttcn M sip/SIP_Tests.ttcn 3 files changed, 16 insertions(+), 4 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn index dab9400..ebf1914 100644 --- a/asterisk/Asterisk_Tests.ttcn +++ b/asterisk/Asterisk_Tests.ttcn @@ -133,7 +133,7 @@ var ConnHdlr vc_conn; var charstring id := testcasename(); - vc_conn := ConnHdlr.create(id); + vc_conn := ConnHdlr.create(id) alive; connect(vc_conn:SIP, vc_SIP:CLIENT); connect(vc_conn:SIP_PROC, vc_SIP:CLIENT_PROC); diff --git a/library/SIP_Emulation.ttcn b/library/SIP_Emulation.ttcn index 4aef536..559b575 100644 --- a/library/SIP_Emulation.ttcn +++ b/library/SIP_Emulation.ttcn @@ -237,7 +237,7 @@ create_cb := refers(SIP_Emulation.ExpectedCreateCallback) }; - ct := SIP_Emulation_CT.create(id); + ct := SIP_Emulation_CT.create(id) alive; map(ct:SIP, system:SIP); ct.start(SIP_Emulation.main(ops, id)); } diff --git a/sip/SIP_Tests.ttcn b/sip/SIP_Tests.ttcn index 4c6be1c..2164ef0 100644 --- a/sip/SIP_Tests.ttcn +++ b/sip/SIP_Tests.ttcn @@ -122,7 +122,7 @@ unitdata_cb := refers(MNCC_Emulation.DummyUnitdataCallback) }; - vc_MNCC := MNCC_Emulation_CT.create(id); + vc_MNCC := MNCC_Emulation_CT.create(id) alive; map(vc_MNCC:MNCC, system:MNCC_CODEC_PT); vc_MNCC.start(MNCC_Emulation.main(ops, id, mp_mncc, true)); } @@ -147,7 +147,7 @@ var ConnHdlr vc_conn; var charstring id := testcasename(); - vc_conn := ConnHdlr.create(id); + vc_conn := ConnHdlr.create(id) alive; connect(vc_conn:SIP, vc_SIP:CLIENT); connect(vc_conn:SIP_PROC, vc_SIP:CLIENT_PROC); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36548?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: I60642071758ad1203196eddd3bbacb84f4dcf9fb Gerrit-Change-Number: 36548 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 2 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: {SIP,Asterisk}_Tests: Mark all components alive

by fixeria

Attention is currently required from: jolly, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36548?usp=email ) Change subject: {SIP,Asterisk}_Tests: Mark all components alive ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36548?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: I60642071758ad1203196eddd3bbacb84f4dcf9fb Gerrit-Change-Number: 36548 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 10 Apr 2024 17:57:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk: Introduce tests TC_internal_call_all_*registered

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36549?usp=email ) Change subject: asterisk: Introduce tests TC_internal_call_all_*registered ...................................................................... asterisk: Introduce tests TC_internal_call_all_*registered Related: SYS#6782 Change-Id: Id06dedb3aac4f31f06281661391bf50640f6369a --- M asterisk/Asterisk_Tests.ttcn M asterisk/expected-results.xml M library/SIP_Templates.ttcn 3 files changed, 232 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/49/36549/1 diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn index 6ca05c1..93593ad 100644 --- a/asterisk/Asterisk_Tests.ttcn +++ b/asterisk/Asterisk_Tests.ttcn @@ -37,7 +37,9 @@ } with { extension "internal" }; private const charstring COORD_CMD_REGISTERED := "COORD_CMD_REGISTERED"; private const charstring COORD_CMD_START := "COORD_CMD_START"; +private const charstring COORD_CMD_PICKUP := "COORD_CMD_PICKUP"; private const charstring COORD_CMD_CALL_ESTABLISHED := "COORD_CMD_CALL_ESTABLISHED"; +private const charstring COORD_CMD_CALL_CANCELLED := "COORD_CMD_CALL_CANCELLED"; private const charstring COORD_CMD_HANGUP := "COORD_CMD_HANGUP"; type component test_CT { @@ -54,6 +56,9 @@ port Coord_PT COORD; } +type record of ConnHdlr ConnHdlrList; + +const charstring broadcast_sip_extension := "0500"; type record ConnHdlrPars { float t_guard, @@ -70,6 +75,7 @@ Contact local_contact, CallPars cp optional } +type record of ConnHdlrPars ConnHdlrParsList; template (value) ConnHdlrPars t_Pars(charstring user, charstring display_name := "Anonymous", @@ -103,11 +109,22 @@ function f_init_ConnHdlrPars(integer idx := 1) runs on test_CT return ConnHdlrPars { var template (value) CallPars cp := t_CallPars(idx := idx); - var template (value) ConnHdlrPars pars := t_Pars("0" & int2str(500 + idx), + var template (value) ConnHdlrPars pars := t_Pars("0" & int2str(str2int(broadcast_sip_extension) + idx), cp := cp); return valueof(pars); } +type record CallParsMT { + /* Whether to wait for COORD.receive(COORD_CMD_PICKUP) before accepting the call. */ + boolean wait_coord_cmd_pickup, + /* Whether to expect CANCEL instead of ACK as answer to our OK */ + boolean exp_cancel +} +private template (value) CallParsMT t_CallParsMT := { + wait_coord_cmd_pickup := false, + exp_cancel := false +} + type record CallPars { SipAddr calling optional, SipAddr called optional, @@ -122,7 +139,8 @@ charstring local_rtp_addr, uint16_t local_rtp_port, - SDP_Message peer_sdp optional + SDP_Message peer_sdp optional, + CallParsMT mt } private template (value) CallPars t_CallPars(integer idx := 1, @@ -137,7 +155,8 @@ sip_body := omit, local_rtp_addr := mp_local_sip_host, local_rtp_port := 1234 + 2*idx, - peer_sdp := omit + peer_sdp := omit, + mt := t_CallParsMT } function f_init() runs on test_CT { @@ -444,8 +463,24 @@ g_pars.cp.sip_seq_nr := g_pars.cp.sip_seq_nr + 1; } +private function f_ConnHdlr_parse_initial_SIP_INVITE(PDU_SIP_Request rx_sip_req) runs on ConnHdlr +{ + f_SDP_decodeMessage(rx_sip_req.messageBody, g_pars.cp.peer_sdp); + log("Rx Initial MT INVITE decoded SDP: ", g_pars.cp.peer_sdp); + + /* Obtain params: */ + g_pars.cp.sip_call_id := rx_sip_req.msgHeader.callId.callid; + g_pars.cp.from_addr := valueof(ts_SipAddr_from_Addr_Union(rx_sip_req.msgHeader.fromField.addressField, + rx_sip_req.msgHeader.fromField.fromParams)); + g_pars.cp.to_addr := valueof(ts_SipAddr_from_Addr_Union(rx_sip_req.msgHeader.toField.addressField, + rx_sip_req.msgHeader.toField.toParams)); + g_pars.cp.to_addr.params := f_sip_param_set(g_pars.cp.to_addr.params, "tag", f_sip_rand_tag()); + g_pars.cp.sip_seq_nr := rx_sip_req.msgHeader.cSeq.seqNumber; +} + /* Peer is calling us, accept it: */ -private altstep as_SIP_mt_call_accept(boolean exp_update_to_direct_rtp := true, boolean fail_others := true) runs on ConnHdlr +private altstep as_SIP_mt_call_accept(boolean exp_update_to_direct_rtp := true, + boolean fail_others := true) runs on ConnHdlr { var template (present) PDU_SIP_Request exp_req := tr_SIP_INVITE(f_tr_SipUrl_opt_defport(g_pars.local_sip_url_ext), @@ -461,17 +496,8 @@ var Via via; var charstring tx_sdp; - f_SDP_decodeMessage(g_rx_sip_req.messageBody, g_pars.cp.peer_sdp); - log("Rx Initial MT INVITE decoded SDP: ", g_pars.cp.peer_sdp); - /* Obtain params: */ - g_pars.cp.sip_call_id := g_rx_sip_req.msgHeader.callId.callid; - g_pars.cp.from_addr := valueof(ts_SipAddr_from_Addr_Union(g_rx_sip_req.msgHeader.fromField.addressField, - g_rx_sip_req.msgHeader.fromField.fromParams)); - g_pars.cp.to_addr := valueof(ts_SipAddr_from_Addr_Union(g_rx_sip_req.msgHeader.toField.addressField, - g_rx_sip_req.msgHeader.toField.toParams)); - g_pars.cp.to_addr.params := f_sip_param_set(g_pars.cp.to_addr.params, "tag", f_sip_rand_tag()); - g_pars.cp.sip_seq_nr := g_rx_sip_req.msgHeader.cSeq.seqNumber; + f_ConnHdlr_parse_initial_SIP_INVITE(g_rx_sip_req); via := g_rx_sip_req.msgHeader.via; @@ -483,6 +509,10 @@ g_pars.cp.sip_seq_nr); SIP.send(tx_resp); + if (g_pars.cp.mt.wait_coord_cmd_pickup) { + COORD.receive(COORD_CMD_PICKUP); + } + /* Tx 200 OK */ tx_sdp := f_gen_sdp(); tx_resp := ts_SIP_Response(g_pars.cp.sip_call_id, @@ -515,6 +545,71 @@ } +/* Peer is calling us, but cancells it during ringing: */ +private altstep as_SIP_mt_call_cancelled(boolean fail_others := true) runs on ConnHdlr +{ + var template (present) PDU_SIP_Request exp_req := + tr_SIP_INVITE(f_tr_SipUrl_opt_defport(g_pars.local_sip_url_ext), + ?, + f_tr_From(g_pars.cp.calling), + g_pars.cp.called, + tr_Via_from(f_tr_HostPort(mp_remote_sip_host, mp_remote_sip_port)), + ?, ?); + 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 Via via; + var template (present) SipAddr exp_to_addr; + var charstring tx_sdp; + + /* Obtain params: */ + f_ConnHdlr_parse_initial_SIP_INVITE(g_rx_sip_req); + via := g_rx_sip_req.msgHeader.via; + + + /* Tx 180 Ringing */ + tx_resp := ts_SIP_Response_Ringing(g_pars.cp.sip_call_id, + g_pars.cp.from_addr, + g_pars.cp.to_addr, + via, + g_pars.cp.sip_seq_nr); + SIP.send(tx_resp); + + if (g_pars.cp.mt.wait_coord_cmd_pickup) { + COORD.receive(COORD_CMD_PICKUP); + } + + /* Wait for CANCEL */ + /* Cancel may come even before we send Ringing, hence To's "tag" + * may not be known by peer, so g_pars.to_addr can't be used here: */ + exp_to_addr := ts_SipAddr_from_Addr_Union(g_rx_sip_req.msgHeader.toField.addressField, + g_rx_sip_req.msgHeader.toField.toParams); + exp_req := tr_SIP_CANCEL(f_tr_SipUrl_opt_defport(g_pars.local_sip_url_ext), + g_pars.cp.sip_call_id, + g_pars.cp.from_addr, + exp_to_addr, + f_tr_Via_response(via), + g_pars.cp.sip_seq_nr, *); + as_SIP_expect_req(exp_req); + + /* Tx 200 OK */ + tx_sdp := f_gen_sdp(); + tx_resp := ts_SIP_Response(g_pars.cp.sip_call_id, + g_pars.cp.from_addr, + g_pars.cp.to_addr, + "CANCEL", 200, + g_pars.cp.sip_seq_nr, + "OK", + via, + body := omit); + SIP.send(tx_resp); + } + [fail_others] as_SIP_fail_resp(sip_expect_str); + [fail_others] as_SIP_fail_req(sip_expect_str); + +} + /* New INVITE arrives after MT call is established. Accept it: */ private altstep as_SIP_exp_call_update(template (present) integer exp_seq_nr := ?, boolean fail_others := true) runs on ConnHdlr { @@ -681,6 +776,13 @@ f_SIP_register(); COORD.send(COORD_CMD_REGISTERED); + if (g_pars.cp.mt.exp_cancel) { + as_SIP_mt_call_cancelled(); + COORD.send(COORD_CMD_CALL_CANCELLED); + setverdict(pass); + return; + } + as_SIP_mt_call_accept(); COORD.send(COORD_CMD_CALL_ESTABLISHED); @@ -720,6 +822,9 @@ [] COORD.receive(COORD_CMD_CALL_ESTABLISHED) from vc_conn[1]; } + /* Call on-going */ + f_sleep(1.0); + COORD.send(COORD_CMD_HANGUP) to vc_conn[0]; @@ -727,6 +832,87 @@ vc_conn[1].done; } +/* One of the users calls (INVITE) shared extension, which makes all other user + * equipments ring (INVITE). The first one to pick up the call (OK 200) gets the + * call established (ACK), others get a CANCEL event. */ +private function TC_internal_call_all_Nregistered(integer num_conns := 2) runs on test_CT { + //var ConnHdlrParsList pars := {}; + var ConnHdlrList vc_conn_list := {}; + const integer vc_conn_mo_idx := 0; /* Index of MO leg in vc_conn_list */ + const integer vc_conn_mt_idx := 1; /* Index of MT leg in vc_conn_list, peer picking up first the call */ + var SipAddr broadcast_sip_record; + var ConnHdlrPars pars_mo; + + f_init(); + + broadcast_sip_record := valueof(ts_SipAddr(ts_HostPort(mp_local_sip_host), + ts_UserInfo(broadcast_sip_extension))); + + for (var integer i := 0; i < num_conns; i := i + 1) { + var ConnHdlrPars pars; + var ConnHdlr vc_conn; + pars := f_init_ConnHdlrPars(idx := i + 1); + if (i == vc_conn_mo_idx) { /* MO */ + pars.cp.calling := pars.registrar_sip_record; + pars.cp.called := broadcast_sip_record; + vc_conn := f_start_handler(refers(f_TC_internal_call_mo), pars); + pars_mo := pars; + } else { /* MT */ + pars.cp.calling := pars_mo.registrar_sip_record; + pars.cp.called := pars.local_sip_record; + pars.cp.mt.wait_coord_cmd_pickup := true; + if (i != vc_conn_mt_idx) { + /* Only first MT picking up (OK 200 INVITE) will be ACKed, others CANCELed: */ + pars.cp.mt.exp_cancel := true; + } + vc_conn := f_start_handler(refers(f_TC_internal_call_mt), pars); + } + vc_conn_list := vc_conn_list & { vc_conn }; + } + + /* Wait all users are registered: */ + for (var integer i := 0; i < num_conns; i := i + 1) { + /* Note: "from vc_conn_list[i]" can't be used since they may arrive from components in any order: */ + COORD.receive(COORD_CMD_REGISTERED); + } + + /* Ask MO user to start the call: */ + COORD.send(COORD_CMD_START) to vc_conn_list[vc_conn_mo_idx]; + + /* 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]; + } + } + + /* Call on-going */ + f_sleep(1.0); + + COORD.send(COORD_CMD_HANGUP) to vc_conn_list[vc_conn_mo_idx]; + + for (var integer i := 0; i < num_conns; i := i + 1) { + vc_conn_list[i].done; + } +} +testcase TC_internal_call_all_2registered() runs on test_CT { + TC_internal_call_all_Nregistered(2); +} +testcase TC_internal_call_all_3registered() runs on test_CT { + TC_internal_call_all_Nregistered(3); +} +testcase TC_internal_call_all_4registered() runs on test_CT { + TC_internal_call_all_Nregistered(4); +} + testcase TC_selftest() runs on test_CT { f_sip_digest_selftest(); setverdict(pass); @@ -735,6 +921,9 @@ control { execute( TC_internal_registration() ); execute( TC_internal_call_momt() ); + execute( TC_internal_call_all_2registered() ); + execute( TC_internal_call_all_3registered() ); + execute( TC_internal_call_all_4registered() ); } } diff --git a/asterisk/expected-results.xml b/asterisk/expected-results.xml index 3eb9c8f..745a4d7 100644 --- a/asterisk/expected-results.xml +++ b/asterisk/expected-results.xml @@ -2,4 +2,7 @@ <testsuite name='Titan' tests='9' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> <testcase classname='Asterisk_Tests' name='TC_internal_registration' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_internal_call_momt' time='MASKED'/> + <testcase classname='Asterisk_Tests' name='TC_internal_call_all_2registered' time='MASKED'/> + <testcase classname='Asterisk_Tests' name='TC_internal_call_all_3registered' time='MASKED'/> + <testcase classname='Asterisk_Tests' name='TC_internal_call_all_4registered' time='MASKED'/> </testsuite> diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn index 9a9b44c..be07196 100644 --- a/library/SIP_Templates.ttcn +++ b/library/SIP_Templates.ttcn @@ -677,6 +677,22 @@ payload := omit } +template (present) PDU_SIP_Request +tr_SIP_CANCEL(template (present) SipUrl uri, + template (present) CallidString call_id, + template (present) SipAddr from_addr, + template (present) SipAddr to_addr, + template (present) Via via, + template (present) integer seq_nr, + template charstring body := *) := { + requestLine := tr_SIP_ReqLine(CANCEL_E, uri), + msgHeader := tr_SIP_msgh_std(call_id, from_addr, to_addr, *, + via, + "CANCEL", *, seq_nr), + messageBody := body, + payload := omit +} + template (value) PDU_SIP_Response ts_SIP_Response(template (value) CallidString call_id, template (value) SipAddr from_addr, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36549?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: Id06dedb3aac4f31f06281661391bf50640f6369a Gerrit-Change-Number: 36549 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 2 months

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: asterisk: Introduce test TC_internal_call_momt

by osmith

Attention is currently required from: fixeria, jolly, laforge, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36547?usp=email ) Change subject: asterisk: Introduce test TC_internal_call_momt ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36547?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: Ic5827a3e94b06fbc57f6405bf0f0aa6598c5d1fe Gerrit-Change-Number: 36547 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-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: Wed, 10 Apr 2024 12:04:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: asterisk: Introduce test TC_internal_call_momt

by pespin

Attention is currently required from: fixeria, jolly, laforge, osmith. Hello Jenkins Builder, fixeria, jolly, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36547?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Code-Review+1 by osmith, Verified+1 by Jenkins Builder Change subject: asterisk: Introduce test TC_internal_call_momt ...................................................................... asterisk: Introduce test TC_internal_call_momt Lots of infrastructure added to allow call establishment and hang up between 2 users connected to Asterisk. SIP_Tests is updated to accomodate for necessary changes in SIP_Templates used by Asterisk_Templates. Change-Id: Ic5827a3e94b06fbc57f6405bf0f0aa6598c5d1fe Related: SYS#6782 --- M asterisk/Asterisk_Tests.ttcn M asterisk/expected-results.xml M library/SIP_Templates.ttcn M sip/SIP_Tests.ttcn 4 files changed, 727 insertions(+), 110 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/47/36547/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36547?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: Ic5827a3e94b06fbc57f6405bf0f0aa6598c5d1fe Gerrit-Change-Number: 36547 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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 2 months

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: asterisk: Introduce test TC_internal_call_momt

by pespin

Attention is currently required from: fixeria, jolly, laforge, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36547?usp=email ) Change subject: asterisk: Introduce test TC_internal_call_momt ...................................................................... Patch Set 3: (3 comments) File asterisk/Asterisk_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36547/comment/f90d06cb_64b2… PS2, Line 103: type record CallParsComputed > maybe explain in the commit msg the reasoning for merging CallParsComputed to CallPars? The reasoning is most of the stuff was not yet used, as I initially took what exited in SIP_Templates for reference 😊 So think of it as if it was not there before. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36547/comment/36b3d6f6_d5a7… PS2, Line 193: log2str(g_name & ": Received unexpected SIP Req message := ", sip_req)); > maybe also print "vs exp :=" here, like in as_SIP_fail_resp? ACK thanks, I forgot to add it while refactoring my patch prior submitting. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36547/comment/e727b3bf_97ef… PS2, Line 236: }; */ > do you want to keep this? I'll leave it for now, it may help in doing more fain-grained matching in the future, but we don't need it for now. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36547?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: Ic5827a3e94b06fbc57f6405bf0f0aa6598c5d1fe Gerrit-Change-Number: 36547 Gerrit-PatchSet: 3 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 10 Apr 2024 12:03:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: {SIP,Asterisk}_Tests: Mark all components alive

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36548?usp=email ) Change subject: {SIP,Asterisk}_Tests: Mark all components alive ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: thanks for splitting this out as extra commit, this makes it easier to review -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36548?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: I60642071758ad1203196eddd3bbacb84f4dcf9fb Gerrit-Change-Number: 36548 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 10 Apr 2024 11:48:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: asterisk: Introduce test TC_internal_call_momt

by osmith

Attention is currently required from: fixeria, jolly, laforge, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36547?usp=email ) Change subject: asterisk: Introduce test TC_internal_call_momt ...................................................................... Patch Set 3: Code-Review+1 (3 comments) File asterisk/Asterisk_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36547/comment/1a309a15_7b92… PS2, Line 103: type record CallParsComputed maybe explain in the commit msg the reasoning for merging CallParsComputed to CallPars? https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36547/comment/d2cf2cdb_c4e2… PS2, Line 193: log2str(g_name & ": Received unexpected SIP Req message := ", sip_req)); maybe also print "vs exp :=" here, like in as_SIP_fail_resp? https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36547/comment/05fe4c9b_e605… PS2, Line 236: }; */ do you want to keep this? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36547?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: Ic5827a3e94b06fbc57f6405bf0f0aa6598c5d1fe Gerrit-Change-Number: 36547 Gerrit-PatchSet: 3 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: Wed, 10 Apr 2024 11:47:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: {SIP,Asterisk}_Tests: Mark all components alive

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36548?usp=email ) Change subject: {SIP,Asterisk}_Tests: Mark all components alive ...................................................................... {SIP,Asterisk}_Tests: Mark all components alive This fixes some dynamic errors occuring due to messages arriving while tests is being torn down. Change-Id: I60642071758ad1203196eddd3bbacb84f4dcf9fb --- M asterisk/Asterisk_Tests.ttcn M library/SIP_Emulation.ttcn M sip/SIP_Tests.ttcn 3 files changed, 16 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/48/36548/1 diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn index dab9400..ebf1914 100644 --- a/asterisk/Asterisk_Tests.ttcn +++ b/asterisk/Asterisk_Tests.ttcn @@ -133,7 +133,7 @@ var ConnHdlr vc_conn; var charstring id := testcasename(); - vc_conn := ConnHdlr.create(id); + vc_conn := ConnHdlr.create(id) alive; connect(vc_conn:SIP, vc_SIP:CLIENT); connect(vc_conn:SIP_PROC, vc_SIP:CLIENT_PROC); diff --git a/library/SIP_Emulation.ttcn b/library/SIP_Emulation.ttcn index 4aef536..559b575 100644 --- a/library/SIP_Emulation.ttcn +++ b/library/SIP_Emulation.ttcn @@ -237,7 +237,7 @@ create_cb := refers(SIP_Emulation.ExpectedCreateCallback) }; - ct := SIP_Emulation_CT.create(id); + ct := SIP_Emulation_CT.create(id) alive; map(ct:SIP, system:SIP); ct.start(SIP_Emulation.main(ops, id)); } diff --git a/sip/SIP_Tests.ttcn b/sip/SIP_Tests.ttcn index 4c6be1c..2164ef0 100644 --- a/sip/SIP_Tests.ttcn +++ b/sip/SIP_Tests.ttcn @@ -122,7 +122,7 @@ unitdata_cb := refers(MNCC_Emulation.DummyUnitdataCallback) }; - vc_MNCC := MNCC_Emulation_CT.create(id); + vc_MNCC := MNCC_Emulation_CT.create(id) alive; map(vc_MNCC:MNCC, system:MNCC_CODEC_PT); vc_MNCC.start(MNCC_Emulation.main(ops, id, mp_mncc, true)); } @@ -147,7 +147,7 @@ var ConnHdlr vc_conn; var charstring id := testcasename(); - vc_conn := ConnHdlr.create(id); + vc_conn := ConnHdlr.create(id) alive; connect(vc_conn:SIP, vc_SIP:CLIENT); connect(vc_conn:SIP_PROC, vc_SIP:CLIENT_PROC); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36548?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: I60642071758ad1203196eddd3bbacb84f4dcf9fb Gerrit-Change-Number: 36548 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 2 months

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: asterisk: Introduce test TC_internal_call_momt

by pespin

Attention is currently required from: fixeria, jolly, laforge, osmith. Hello Jenkins Builder, fixeria, jolly, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36547?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: asterisk: Introduce test TC_internal_call_momt ...................................................................... asterisk: Introduce test TC_internal_call_momt Lots of infrastructure added to allow call establishment and hang up between 2 users connected to Asterisk. SIP_Tests is updated to accomodate for necessary changes in SIP_Templates used by Asterisk_Templates. Change-Id: Ic5827a3e94b06fbc57f6405bf0f0aa6598c5d1fe Related: SYS#6782 --- M asterisk/Asterisk_Tests.ttcn M asterisk/expected-results.xml M library/SIP_Emulation.ttcn M library/SIP_Templates.ttcn M sip/SIP_Tests.ttcn 5 files changed, 731 insertions(+), 114 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/47/36547/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36547?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: Ic5827a3e94b06fbc57f6405bf0f0aa6598c5d1fe Gerrit-Change-Number: 36547 Gerrit-PatchSet: 2 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2024