aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2019-11-28 01:09:47 +0100
committerNeels Hofmeyr <neels@hofmeyr.de>2019-11-28 01:47:10 +0100
commitfc04c92447f6441a6892f3d6ae4e0da0a22c8a74 (patch)
tree25285099755a7c8474d4259315d9423b6c804edd
parent310cb61df34b4529b56ca30586f3cb03dacaf584 (diff)
msc: expect only one Paging on GERAN
After discussion on this thread: http://lists.osmocom.org/pipermail/openbsc/2019-November/013058.html Do not expect repeated Paging on GERAN. Pending clarification on 3G, still expect repeated Paging on Iu, though we are not 100% certain that this is indeed required. Fixes MSC_Tests.TC_lu_and_mt_sms_paging_repeated, but not MSC_Tests_Iu.TC_iu_lu_and_mt_sms_paging_repeated Change-Id: Ie914ea88f31ac158f4bd1700143bbe728dd05e0b
-rw-r--r--msc/MSC_Tests.ttcn30
1 files changed, 28 insertions, 2 deletions
diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index 1a16dbf1..c4d407a5 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -2030,11 +2030,37 @@ friend function f_tc_lu_and_mt_sms_paging_repeated(charstring id, BSC_ConnHdlrPa
f_vty_sms_send(hex2str(pars.imsi), "2342", "Hello SMS");
+ f_logp("Expecting first Paging");
/* MSC->BSC: expect PAGING from MSC */
f_expect_paging();
- /* MSC->BSC: expect PAGING from MSC */
- f_expect_paging();
+ if (g_pars.ran_is_geran) {
+ f_logp("GERAN: expect no further Paging");
+ } else {
+ f_logp("UTRAN: expect more Paging");
+ }
+
+ timer T := 5.0;
+ T.start;
+ alt {
+ [g_pars.ran_is_geran] BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi)) {
+ setverdict(fail, "GERAN should not repeat Paging, but received a second Paging");
+ mtc.stop;
+ }
+ [not g_pars.ran_is_geran] BSSAP.receive(tr_RANAP_Paging(cs_domain, imsi_hex2oct(g_pars.imsi))) {
+ f_logp("UTRAN: second Paging received, as expected");
+ setverdict(pass);
+ }
+ [] T.timeout {
+ if (g_pars.ran_is_geran) {
+ f_logp("GERAN: No further Paging received, as expected");
+ setverdict(pass);
+ } else {
+ setverdict(fail, "UTRAN: Expected a second Paging");
+ mtc.stop;
+ }
+ }
+ }
/* Establish DTAP / BSSAP / SCCP connection */
f_establish_fully(EST_TYPE_PAG_RESP);