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

Change in osmo-ttcn3-hacks[master]: pgw: Add T_guard

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27661 ) Change subject: pgw: Add T_guard ...................................................................... pgw: Add T_guard Change-Id: I9dce4aee4a0b1181bb7dc1a53fb254e6d17cf22e --- M pgw/PGW_Tests.ttcn 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/61/27661/1 diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index d9f4979..a65ca43 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -40,6 +40,16 @@ var DIAMETER_Emulation_CT vc_DIAMETER; port DIAMETER_PT DIAMETER_UNIT; port DIAMETEREM_PROC_PT DIAMETER_PROC; + /* global test case guard timer (actual timeout value is set in f_init()) */ + timer T_guard; +} + +/* global altstep for global guard timer; */ +altstep as_Tguard() runs on PGW_Test_CT { + [] T_guard.timeout { + setverdict(fail, "Timeout of T_guard"); + mtc.stop; + } } /* per-session component; we typically have 1..N per testcase */ @@ -138,7 +148,10 @@ f_diameter_wait_capability(DIAMETER_UNIT); } -private function f_init() runs on PGW_Test_CT { +private function f_init(float guard_timeout := 60.0) runs on PGW_Test_CT { + T_guard.start(guard_timeout); + activate(as_Tguard()); + var Gtp2EmulationCfg cfg := { gtpc_bind_ip := mp_local_hostname_c, gtpc_bind_port := GTP2C_PORT, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27661 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: I9dce4aee4a0b1181bb7dc1a53fb254e6d17cf22e Gerrit-Change-Number: 27661 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-ci[master]: jobs: Add ttcn3-pgw-test jenkins job

by fixeria

Attention is currently required from: osmith, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27660 ) Change subject: jobs: Add ttcn3-pgw-test jenkins job ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27660 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I363a7a8eb524abfeb45c81603c29cea96f86a787 Gerrit-Change-Number: 27660 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 07 Apr 2022 16:46:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-ci[master]: jobs: Add ttcn3-pgw-test jenkins job

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/27660 ) Change subject: jobs: Add ttcn3-pgw-test jenkins job ...................................................................... jobs: Add ttcn3-pgw-test jenkins job Change-Id: I363a7a8eb524abfeb45c81603c29cea96f86a787 --- M jobs/ttcn3-testsuites.yml 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/60/27660/1 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index 5fb994d..89915a2 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -154,6 +154,11 @@ blocking: "^(ttcn3|TTCN3-.*)-fr-test.*" timer: 40 10 * * * node: hdlc + - ttcn3-pgw-test: + blocking: "^(ttcn3|TTCN3-.*)-pgw-test.*" + timer: 00 14 * * * + description: | + Test open5gs-smfd + open5gs-upfd PGW main. # debian-stretch latest stable - nplab-m3ua-test-latest: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27660 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I363a7a8eb524abfeb45c81603c29cea96f86a787 Gerrit-Change-Number: 27660 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: octsim: initial commit

by laforge

Attention is currently required from: Hoernchen. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27341 ) Change subject: octsim: initial commit ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27341/comment/23d0a5ea_3a62… PS1, Line 7: octsim: initial commit there could be some more commitlog explaining what this is about. yes, somehow octsim related, but what/when/how are those tests used, maybe a link to the octsim product page (not everyone looking at osmocom ttcn3 tests might know it) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27341 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: Iada6422d694eb5fc862477c8b43b8642c8d96692 Gerrit-Change-Number: 27341 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Thu, 07 Apr 2022 14:21:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: assignment_fsm: always update RTP info

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27657 ) Change subject: assignment_fsm: always update RTP info ...................................................................... assignment_fsm: always update RTP info When the assignment succeeds, the assignment_request has taken effect and whatever it requested should now be in effect. Hence copy the new RTP information from the assignment_request to the conn's storage indicating what is currently used, always, not only when lchan_changed == true. The RTP information may have changed also from a Mode Modify where the lchan stays the same but changes its mode of use, e.g. from signalling to voice. When there is no RTP involved, this data is zero or empty, so there is no harm in copying it, always. Related: SYS#5916 Change-Id: I0788d1f013b8f820f559b6ed58a5f9bb8a02e0b4 --- M src/osmo-bsc/assignment_fsm.c 1 file changed, 6 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index c7fc335..7deca65 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -287,13 +287,12 @@ * the MGW endpoint right away. If successful, the conn continues to use the endpoint. */ conn->assignment.created_ci_for_msc = NULL; - if (lchan_changed) { - /* New RTP information is now accepted */ - conn->user_plane.msc_assigned_cic = conn->assignment.req.msc_assigned_cic; - osmo_strlcpy(conn->user_plane.msc_assigned_rtp_addr, conn->assignment.req.msc_rtp_addr, - sizeof(conn->user_plane.msc_assigned_rtp_addr)); - conn->user_plane.msc_assigned_rtp_port = conn->assignment.req.msc_rtp_port; - } + /* New RTP information is now accepted. If there is no RTP stream, this information is zero / empty. Either way + * store the result of this assignment. */ + conn->user_plane.msc_assigned_cic = conn->assignment.req.msc_assigned_cic; + osmo_strlcpy(conn->user_plane.msc_assigned_rtp_addr, conn->assignment.req.msc_rtp_addr, + sizeof(conn->user_plane.msc_assigned_rtp_addr)); + conn->user_plane.msc_assigned_rtp_port = conn->assignment.req.msc_rtp_port; assignment_count_result(CTR_ASSIGNMENT_COMPLETED); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27657 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0788d1f013b8f820f559b6ed58a5f9bb8a02e0b4 Gerrit-Change-Number: 27657 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: assignment_fsm: always mark MGCP ci as completed

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27656 ) Change subject: assignment_fsm: always mark MGCP ci as completed ...................................................................... assignment_fsm: always mark MGCP ci as completed When the assignment fails, we roll back the MSC side RTP endpoint at the MGW that may have been created before the failure occured. On success, we clear the mgcp_ci pointer so it is not rolled back. Always clear this, not only when lchan_changed == true. That is because a channel Mode Modify may also have added a voice stream that should retain the newly created RTP endpoint at the MGW. If no voice stream is involved, the pointer should already be NULL. There is no reason to have a condition for clearing this pointer. Just always clear it. This fixes all voice calls that modify a TCH lchan from signalling-only to voice mode. Before this patch, their MSC side RTP endpoint was DLCX'd right on assignment success. In particular, this fixes Emergency Calls (which usually get a TCH lchan assigned right from the start, and hence do a Mode Modify to add voice). Related: SYS#5916 Change-Id: I5ab10ee7fd9c5d7608e8a06893881d990943feed --- M src/osmo-bsc/assignment_fsm.c 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 8d5e841..c7fc335 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -283,11 +283,11 @@ } } - if (lchan_changed) { - /* Rembered this only for error handling: should assignment fail, assignment_reset() will release - * the MGW endpoint right away. If successful, the conn continues to use the endpoint. */ - conn->assignment.created_ci_for_msc = NULL; + /* Rembered this only for error handling: should assignment fail, assignment_reset() will release + * the MGW endpoint right away. If successful, the conn continues to use the endpoint. */ + conn->assignment.created_ci_for_msc = NULL; + if (lchan_changed) { /* New RTP information is now accepted */ conn->user_plane.msc_assigned_cic = conn->assignment.req.msc_assigned_cic; osmo_strlcpy(conn->user_plane.msc_assigned_rtp_addr, conn->assignment.req.msc_rtp_addr, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5ab10ee7fd9c5d7608e8a06893881d990943feed Gerrit-Change-Number: 27656 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: assignment_fsm: always update RTP info

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27657 ) Change subject: assignment_fsm: always update RTP info ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27657 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0788d1f013b8f820f559b6ed58a5f9bb8a02e0b4 Gerrit-Change-Number: 27657 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 07 Apr 2022 14:19:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: assignment_fsm: always mark MGCP ci as completed

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27656 ) Change subject: assignment_fsm: always mark MGCP ci as completed ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5ab10ee7fd9c5d7608e8a06893881d990943feed Gerrit-Change-Number: 27656 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 07 Apr 2022 14:19:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: add TC_emerg_call_and_lcs_loc_req

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27659 ) Change subject: bsc: add TC_emerg_call_and_lcs_loc_req ...................................................................... bsc: add TC_emerg_call_and_lcs_loc_req An emergency call often comes with a Location Request. Make sure osmo-bsc handles it well. Related: SYS#5916 Change-Id: I95037374c45943cb14401bc48f16a39c2fcbe1f5 --- M bsc/BSC_Tests.ttcn M library/BSSMAP_Templates.ttcn 2 files changed, 104 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index cce8837..a2add34 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -10093,6 +10093,105 @@ f_shutdown_helper(); } +private function f_tc_emerg_call_and_lcs_loc_req(charstring id) runs on MSC_ConnHdlr +{ + /* Make sure the CHAN RQD indicates an emergency call (0b101xxxxx). The difference is that osmo-bsc directly + * assigns a TCH lchan and establishing voice for the emergency call will use Mode Modify, not reassignment to + * another lchan. */ + g_pars.ra := 'b7'O; + f_assignment_emerg_setup(); + + var PDU_BSSAP emerg_setup_data_ind_bssap; + timer T := 3.0; + T.start; + alt { + [] BSSAP.receive(tr_BSSAP_DTAP) -> value emerg_setup_data_ind_bssap { + var PDU_ML3_MS_NW verify_emerg_setup; + verify_emerg_setup := dec_PDU_ML3_MS_NW(emerg_setup_data_ind_bssap.pdu.dtap); + if (not isbound(verify_emerg_setup.msgs.cc.emergencySetup)) { + setverdict(fail, "no emergency setup"); + } + } + [] BSSAP.receive { + setverdict(fail, "unexpected BSSAP message!"); + } + [] T.timeout { + setverdict(fail, "timeout waiting for EMERGENCY SETUP!"); + } + } + + /* Here would usually be a CC Call Proceeding from the MSC, but what does the BSC care about DTAP. */ + + /* Do a Location Request in-between the CC call setup */ + f_bssap_le_register_imsi(g_pars.imsi, omit); + BSSAP.send(valueof(ts_BSSMAP_Perform_Location_Request(ts_BSSMAP_Imsi(g_pars.imsi), + ts_CellId_CGI('262'H, '42'H, 23, 42)))); + BSSAP_LE.receive(tr_BSSMAP_LE_PerfLocReq(BSSMAP_LE_LOC_INFO_CURRENT_GEOGRAPHIC_LOC, ?, ?)); + /* SMLC got the TA from the BSC, now responds with geo information data. */ + BSSAP_LE.send(ts_BSSMAP_LE_PerfLocResp(gad_ell_point_unc_circle, omit)); + BSSAP_LE.receive(BSSAP_LE_Conn_Prim:CONN_PRIM_DISC_IND); + BSSAP.receive(tr_BSSMAP_Perform_Location_Response(tr_BSSMAP_IE_LocationEstimate(gad_ell_point_unc_circle))); + + /* Go on with voice call assignment */ + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); + + /* Below speechOrDataIndicator and codecList are copied from an emergency call captured during tests. + * They seem a bit weird (AMR-WB, and the order differ between speechId_DataIndicator and the codecList), but + * seems a good idea to see how osmo-bsc reacts to this. */ + ass_cmd.pdu.bssmap.assignmentRequest.channelType := { + elementIdentifier := '0B'O, /* overwritten */ + lengthIndicator := 0, /* overwritten */ + speechOrDataIndicator := '0001'B, /* speech */ + spare1_4 := '0000'B, + channelRateAndType := ChRate_TCHForH_Fpref, + speechId_DataIndicator := 'c2918105'O + }; + ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ + ts_CodecHR, ts_CodecAMR_WB, ts_CodecEFR, ts_CodecFR})); + + f_rslem_dchan_queue_enable(); + + var ExpectCriteria mgcpcrit := { + connid := omit, + endpoint := omit, + transid := omit + }; + f_create_mgcp_expect(mgcpcrit); + + BSSAP.send(ass_cmd); + + var AssignmentState st := valueof(ts_AssignmentStateInit); + st.voice_call := true; + st.is_assignment := false; + alt { + [] as_modify(st); + [] as_Media(); + [st.modify_done] BSSAP.receive(exp_compl) { + setverdict(pass); + } + } + + /* Voice call carries on ... */ + f_sleep(2.0); + + setverdict(pass); + f_perform_clear(); +} + +testcase TC_emerg_call_and_lcs_loc_req() runs on test_CT { + var MSC_ConnHdlr vc_conn; + var TestHdlrParams pars := f_gen_test_hdlr_pars(); + + f_init(1, true); + f_sleep(1.0); + f_vty_allow_emerg_msc(true); + f_vty_allow_emerg_bts(true, 0); + vc_conn := f_start_handler(refers(f_tc_emerg_call_and_lcs_loc_req), pars); + vc_conn.done; + f_shutdown_helper(); +} + /* Attempt Complete Layer 3 without any MSC available (OS#4832) */ private function f_tc_no_msc(charstring id) runs on MSC_ConnHdlr { f_MscConnHdlr_init(g_pars.media_nr, "127.0.0.2", "127.0.0.3", FR_AMR); @@ -11466,6 +11565,7 @@ execute( TC_lcs_loc_req_for_idle_ms_no_pag_resp() ); execute( TC_cm_service_during_lcs_loc_req() ); execute( TC_ho_during_lcs_loc_req() ); + execute( TC_emerg_call_and_lcs_loc_req() ); } execute( TC_no_msc() ); diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn index 376cea6..87099b6 100644 --- a/library/BSSMAP_Templates.ttcn +++ b/library/BSSMAP_Templates.ttcn @@ -599,6 +599,10 @@ s0_7 := '00111111'B, s8_15 := '00000111'B /* S6 - S7 and S11 – S15 are reserved and coded with zeroes */ } +template (value) BSSMAP_FIELD_CodecElement ts_CodecAMR_WB modifies ts_CodecBase := { + codecType := FR_AMR_WB, + s0_7 := '00000001'B +} template BSSMAP_IE_SpeechCodecList ts_BSSMAP_IE_CodecList(template BSSMAP_FIELD_CodecElements elem) := { elementIdentifier := '7D'O, lengthIndicator := 0, /* overwritten */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27659 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: I95037374c45943cb14401bc48f16a39c2fcbe1f5 Gerrit-Change-Number: 27659 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: as_Media_mgw: fail on DLCX

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27658 ) Change subject: bsc: as_Media_mgw: fail on DLCX ...................................................................... bsc: as_Media_mgw: fail on DLCX as_Media_mgw() is used to establish a voice stream. If a DLCX happens as part of that, that should be flagged as a problem. In fact the Mode Modify test with current osmo-bsc does exhibit a DLCX right upon the Assignment Complete message, which is a bug fixed in I5ab10ee7fd9c5d7608e8a06893881d990943feed. This patch now correctly flags this as a failure. In the two tests TC_ho_in_fail_no_detect, TC_ho_in_fail_no_detect2 the expected failure causes expected DLCX, so exempt those. Related: SYS#5916 Change-Id: I0633f60f09d58802f6be0238ef41a632d93a4327 --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn 2 files changed, 16 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 4683dc7..cce8837 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -6553,7 +6553,7 @@ f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit}); f_MscConnHdlr_init(g_pars.media_nr, "127.0.0.2", "127.0.0.3", FR_AMR); - activate(as_Media()); + activate(as_Media(fail_on_dlcx := false)); BSSAP.send(ts_BSSAP_Conn_Req(g_pars.sccp_addr_bsc, g_pars.sccp_addr_msc, f_gen_handover_req())); @@ -6643,7 +6643,7 @@ f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit}); f_MscConnHdlr_init(g_pars.media_nr, "127.0.0.2", "127.0.0.3", FR_AMR); - activate(as_Media()); + activate(as_Media(fail_on_dlcx := false)); BSSAP.send(ts_BSSAP_Conn_Req(g_pars.sccp_addr_bsc, g_pars.sccp_addr_msc, f_gen_handover_req())); diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index db2e9ef..06f9ebe 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -373,7 +373,7 @@ /* altstep for handling of MGCP media related commands. Activated by as_Media() to test * MGW level media handling */ -altstep as_Media_mgw(boolean norepeat := false) runs on MSC_ConnHdlr { +altstep as_Media_mgw(boolean norepeat := false, boolean fail_on_dlcx := true) runs on MSC_ConnHdlr { var MgcpCommand mgcp_cmd; var template MgcpResponse mgcp_resp; var MGCP_RecvFrom mrf; @@ -383,6 +383,9 @@ var template MgcpMessage msg_mdcx := { command := tr_MDCX } + var template MgcpMessage msg_dlcx := { + command := tr_DLCX + } var template MgcpMessage msg_resp; [g_pars.aoip] MGCP.receive(tr_CRCX) -> value mgcp_cmd { @@ -422,13 +425,21 @@ repeat; } } + + [fail_on_dlcx and g_pars.aoip] MGCP.receive(tr_DLCX) { + setverdict(fail, "Unexpected DLCX received"); + } + + [fail_on_dlcx and not g_pars.aoip] MGCP_MULTI.receive(tr_MGCP_RecvFrom_any(msg_dlcx)) { + setverdict(fail, "Unexpected DLCX received"); + } } /* Altsteps for handling of media related commands. Can be activated by a given * test case if it expects to see media related handling (i.e. voice calls) */ -altstep as_Media() runs on MSC_ConnHdlr { +altstep as_Media(boolean fail_on_dlcx := true) runs on MSC_ConnHdlr { [] as_Media_ipacc(); - [] as_Media_mgw(); + [] as_Media_mgw(fail_on_dlcx := fail_on_dlcx); } type port Coord_PT message -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27658 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: I0633f60f09d58802f6be0238ef41a632d93a4327 Gerrit-Change-Number: 27658 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2022