osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32365 ) Change subject: bsc: TC_assignment_csd: test all transp data rates ...................................................................... bsc: TC_assignment_csd: test all transp data rates Related: OS#4393 Change-Id: I9a5f0e630fefcafb1b26eabba73de7e76d9e7e5d --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn 2 files changed, 50 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/65/32365/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index e60c342..edd54bc 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1869,7 +1869,7 @@ ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelTypeCSD); ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecCSData})); - ass_cmd.pdu.bssmap.assignmentRequest.channelType.speechId_DataIndicator := GSM0808_DATA_RATE_TRANSP_4k8; + ass_cmd.pdu.bssmap.assignmentRequest.channelType.speechId_DataIndicator := g_pars.speech_data_ind; f_establish_fully(ass_cmd, exp_compl); @@ -1879,10 +1879,11 @@ f_perform_clear(); } -testcase TC_assignment_csd_t_4k8() runs on test_CT { +private function f_tc_assignment_csd_test_CT(OCT1 speech_data_ind) runs on test_CT { var MSC_ConnHdlr vc_conn; var TestHdlrParams pars := f_gen_test_hdlr_pars(); pars.encr := valueof(t_EncrParams('01'O, f_rnd_octstring(8))); + pars.speech_data_ind := speech_data_ind; f_init(1, true); f_sleep(1.0); @@ -1890,6 +1891,33 @@ vc_conn.done; f_shutdown_helper(); } +testcase TC_assignment_csd_t_32k0() runs on test_CT { + f_tc_assignment_csd_test_CT(GSM0808_DATA_RATE_TRANSP_32k0); +} +testcase TC_assignment_csd_t_28k8() runs on test_CT { + f_tc_assignment_csd_test_CT(GSM0808_DATA_RATE_TRANSP_28k8); +} +testcase TC_assignment_csd_t_14k4() runs on test_CT { + f_tc_assignment_csd_test_CT(GSM0808_DATA_RATE_TRANSP_14k4); +} +testcase TC_assignment_csd_t_9k6() runs on test_CT { + f_tc_assignment_csd_test_CT(GSM0808_DATA_RATE_TRANSP_9k6); +} +testcase TC_assignment_csd_t_4k8() runs on test_CT { + f_tc_assignment_csd_test_CT(GSM0808_DATA_RATE_TRANSP_4k8); +} +testcase TC_assignment_csd_t_2k4() runs on test_CT { + f_tc_assignment_csd_test_CT(GSM0808_DATA_RATE_TRANSP_2k4); +} +testcase TC_assignment_csd_t_1k2() runs on test_CT { + f_tc_assignment_csd_test_CT(GSM0808_DATA_RATE_TRANSP_1k2); +} +testcase TC_assignment_csd_t_600() runs on test_CT { + f_tc_assignment_csd_test_CT(GSM0808_DATA_RATE_TRANSP_600); +} +testcase TC_assignment_csd_t_1200_75() runs on test_CT { + f_tc_assignment_csd_test_CT(GSM0808_DATA_RATE_TRANSP_1200_75); +} testcase TC_assignment_ctm() runs on test_CT { var template PDU_BSSAP exp_fail := tr_BSSMAP_AssignmentFail; @@ -12362,7 +12390,15 @@ /* Assignment related */ execute( TC_assignment_cic_only() ); if (Misc_Helpers.f_osmo_repo_is("nightly")) { /* osmo-bsc > 1.10.0 */ + execute( TC_assignment_csd_t_32k0() ); + execute( TC_assignment_csd_t_28k8() ); + execute( TC_assignment_csd_t_14k4() ); + execute( TC_assignment_csd_t_9k6() ); execute( TC_assignment_csd_t_4k8() ); + execute( TC_assignment_csd_t_2k4() ); + execute( TC_assignment_csd_t_1k2() ); + execute( TC_assignment_csd_t_600() ); + execute( TC_assignment_csd_t_1200_75() ); } else { execute( TC_assignment_csd() ); } diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index fa7cd84..9e32ed3 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -785,7 +785,8 @@ boolean inter_bsc_ho_in__ho_req_in_initial_sccp_cr, boolean ignore_mgw_mdcx, boolean fail_on_dlcx, - boolean ignore_ipa_media + boolean ignore_ipa_media, + OCT1 speech_data_ind }; /* Note: Do not use valueof() to get a value of this template, use -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32365 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: I9a5f0e630fefcafb1b26eabba73de7e76d9e7e5d Gerrit-Change-Number: 32365 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange