fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39974?usp=email )
Change subject: msc: execute more GSUP-over-SMS tests via UTRAN ......................................................................
msc: execute more GSUP-over-SMS tests via UTRAN
Change-Id: Ia3c044ad04561a4ee6dbb4a3fe59fedd3ac79bba Related: 1cd11a05a ("MSC_Tests.ttcn: introduce TC_gsup_mt_multi_part_sms") Related: 8d0d7af27 ("msc: add TC_gsup_mt_sms_lu_delay for X36 (LU delay) timer") Related: e9de1515d ("msc: add TC_gsup_mt_sms_{paging,conn}_timeout") --- M msc/MSC_Tests.ttcn M msc/MSC_Tests_Iu.ttcn M msc/expected-results.xml 3 files changed, 55 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/74/39974/1
diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 492a551..527b71a 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -3176,7 +3176,7 @@
/* Test multi-part MT-SMS over GSUP */ -private function f_tc_gsup_mt_multi_part_sms(charstring id, BSC_ConnHdlrPars pars) +friend function f_tc_gsup_mt_multi_part_sms(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { var SmsParameters spars := valueof(t_SmsPars);
diff --git a/msc/MSC_Tests_Iu.ttcn b/msc/MSC_Tests_Iu.ttcn index 229ebb6..c78b86b 100644 --- a/msc/MSC_Tests_Iu.ttcn +++ b/msc/MSC_Tests_Iu.ttcn @@ -401,6 +401,52 @@ f_vty_config(MSCVTY, "msc", "no sms-over-gsup"); }
+testcase TC_iu_gsup_mt_multi_part_sms() runs on MTC_CT { + var BSC_ConnHdlrPars pars; + var BSC_ConnHdlr vc_conn; + f_init(3); + pars := f_init_pars(1094, ran_idx := 2, ran_is_geran := false); + f_vty_config(MSCVTY, "msc", "sms-over-gsup"); + vc_conn := f_start_handler_with_pars(refers(f_tc_gsup_mt_multi_part_sms), pars); + vc_conn.done; + f_vty_config(MSCVTY, "msc", "no sms-over-gsup"); +} + +testcase TC_iu_gsup_mt_sms_lu_delay() runs on MTC_CT { + var BSC_ConnHdlrPars pars; + var BSC_ConnHdlr vc_conn; + f_init(3); + pars := f_init_pars(1095, ran_idx := 2, ran_is_geran := false); + f_vty_config(MSCVTY, "msc", "sms-over-gsup"); + f_vty_config(MSCVTY, "msc", "timer utran X36 2500"); /* 2.5s */ + vc_conn := f_start_handler_with_pars(refers(f_TC_gsup_mt_sms_lu_delay), pars); + vc_conn.done; + f_vty_config(MSCVTY, "msc", "timer utran X36 0"); + f_vty_config(MSCVTY, "msc", "no sms-over-gsup"); +} + +testcase TC_iu_gsup_mt_sms_paging_timeout() runs on MTC_CT { + var BSC_ConnHdlrPars pars; + var BSC_ConnHdlr vc_conn; + f_init(3); + pars := f_init_pars(1096, ran_idx := 2, ran_is_geran := false); + f_vty_config(MSCVTY, "msc", "sms-over-gsup"); + vc_conn := f_start_handler_with_pars(refers(f_TC_gsup_mt_sms_paging_timeout), pars); + vc_conn.done; + f_vty_config(MSCVTY, "msc", "no sms-over-gsup"); +} + +testcase TC_iu_gsup_mt_sms_conn_timeout() runs on MTC_CT { + var BSC_ConnHdlrPars pars; + var BSC_ConnHdlr vc_conn; + f_init(3); + pars := f_init_pars(1097, ran_idx := 2, ran_is_geran := false); + f_vty_config(MSCVTY, "msc", "sms-over-gsup"); + vc_conn := f_start_handler_with_pars(refers(f_TC_gsup_mt_sms_conn_timeout), pars); + vc_conn.done; + f_vty_config(MSCVTY, "msc", "no sms-over-gsup"); +} + testcase TC_iu_lu_and_mo_ussd_single_request() runs on MTC_CT { var BSC_ConnHdlr vc_conn; f_init(3); @@ -590,6 +636,10 @@ execute( TC_iu_gsup_mt_sms_err() ); execute( TC_iu_gsup_mt_sms_rp_mr() ); execute( TC_iu_gsup_mo_mt_sms_rp_mr() ); + execute( TC_iu_gsup_mt_multi_part_sms() ); + execute( TC_iu_gsup_mt_sms_lu_delay() ); + execute( TC_iu_gsup_mt_sms_paging_timeout() ); + execute( TC_iu_gsup_mt_sms_conn_timeout() );
execute( TC_iu_lu_and_mo_ussd_single_request() ); execute( TC_iu_lu_and_mt_ussd_notification() ); diff --git a/msc/expected-results.xml b/msc/expected-results.xml index ffe85a6..2dc7e97 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -229,6 +229,10 @@ <testcase classname='MSC_Tests_Iu' name='TC_iu_gsup_mt_sms_err' time='MASKED'/> <testcase classname='MSC_Tests_Iu' name='TC_iu_gsup_mt_sms_rp_mr' time='MASKED'/> <testcase classname='MSC_Tests_Iu' name='TC_iu_gsup_mo_mt_sms_rp_mr' time='MASKED'/> + <testcase classname='MSC_Tests_Iu' name='TC_iu_gsup_mt_multi_part_sms' time='MASKED'/> + <testcase classname='MSC_Tests_Iu' name='TC_iu_gsup_mt_sms_lu_delay' time='MASKED'/> + <testcase classname='MSC_Tests_Iu' name='TC_iu_gsup_mt_sms_paging_timeout' time='MASKED'/> + <testcase classname='MSC_Tests_Iu' name='TC_iu_gsup_mt_sms_conn_timeout' time='MASKED'/> <testcase classname='MSC_Tests_Iu' name='TC_iu_lu_and_mo_ussd_single_request' time='MASKED'/> <testcase classname='MSC_Tests_Iu' name='TC_iu_lu_and_mt_ussd_notification' time='MASKED'/> <testcase classname='MSC_Tests_Iu' name='TC_iu_lu_and_mo_ussd_during_mt_call' time='MASKED'/>
-
fixeria