osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32364 ) Change subject: bsc: TC_assignment_csd: split into two tests ...................................................................... bsc: TC_assignment_csd: split into two tests Prepare to test multiple data rates by splitting the test for the old behavior (CSD not implemented) from the code that tests a specific data rate. Related: OS#4393 Change-Id: I052685d36d9fc794502b6fe2c444b95ebac8dfc4 --- M bsc/BSC_Tests.ttcn 1 file changed, 39 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/64/32364/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index aa627b7..e60c342 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1849,6 +1849,18 @@ return dt; } +/* Test for CSD assignment failure as it is not implemented, drop after + * osmo-bsc > 1.10.0 in favor of TC_assignment_csd_t_4k8 etc. below. */ +testcase TC_assignment_csd() runs on test_CT { + var template PDU_BSSAP exp_fail := tr_BSSMAP_AssignmentFail; + var PDU_BSSAP ass_cmd := f_gen_ass_req(); + ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelTypeCSD); + //exp_fail.pdu.bssmap.assignmentFailure.cause.causeValue := int2bit(enum2int(GSM0808_CAUSE_REQ_CODEC_TYPE_OR_CONFIG_UNAVAIL), 7); + var DchanTuple dt := f_assignment_exp(ass_cmd, exp_fail, "BSC accepted Assignment for CSD"); + f_perform_clear_test_ct(dt); + f_shutdown_helper(); +} + private function f_tc_assignment_csd(charstring id) runs on MSC_ConnHdlr { var template PDU_BSSAP exp_compl := f_gen_exp_compl(); var PDU_BSSAP ass_cmd := f_gen_ass_req(); @@ -1867,24 +1879,15 @@ f_perform_clear(); } -testcase TC_assignment_csd() runs on test_CT { - if (Misc_Helpers.f_osmo_repo_is("nightly")) { /* osmo-bsc > 1.10.0 */ - var MSC_ConnHdlr vc_conn; - var TestHdlrParams pars := f_gen_test_hdlr_pars(); - pars.encr := valueof(t_EncrParams('01'O, f_rnd_octstring(8))); +testcase TC_assignment_csd_t_4k8() 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))); - f_init(1, true); - f_sleep(1.0); - vc_conn := f_start_handler(refers(f_tc_assignment_csd), pars); - vc_conn.done; - } else { - var template PDU_BSSAP exp_fail := tr_BSSMAP_AssignmentFail; - var PDU_BSSAP ass_cmd := f_gen_ass_req(); - ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelTypeCSD); - //exp_fail.pdu.bssmap.assignmentFailure.cause.causeValue := int2bit(enum2int(GSM0808_CAUSE_REQ_CODEC_TYPE_OR_CONFIG_UNAVAIL), 7); - var DchanTuple dt := f_assignment_exp(ass_cmd, exp_fail, "BSC accepted Assignment for CSD"); - f_perform_clear_test_ct(dt); - } + f_init(1, true); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_tc_assignment_csd), pars); + vc_conn.done; f_shutdown_helper(); } @@ -12358,7 +12361,11 @@ /* Assignment related */ execute( TC_assignment_cic_only() ); - execute( TC_assignment_csd() ); + if (Misc_Helpers.f_osmo_repo_is("nightly")) { /* osmo-bsc > 1.10.0 */ + execute( TC_assignment_csd_t_4k8() ); + } else { + execute( TC_assignment_csd() ); + } execute( TC_assignment_ctm() ); execute( TC_assignment_sign() ); if (mp_bssap_cfg[0].transport == BSSAP_TRANSPORT_AoIP) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32364 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: I052685d36d9fc794502b6fe2c444b95ebac8dfc4 Gerrit-Change-Number: 32364 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange