lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40651?usp=email )
Change subject: BSSGP_ConnHdlr: f_service_request: allow to define if a Service Accept is expected ......................................................................
BSSGP_ConnHdlr: f_service_request: allow to define if a Service Accept is expected
A SecurityModeCommand is defined as an implicit Service Accept when the UE is in PMM_IDLE (meaning, having no Iu signalling connection)
Change-Id: I5c190db28263c530a8eea188bf570a58eaffdd4d --- M sgsn/BSSGP_ConnHdlr.ttcn M sgsn/SGSN_Tests_Iu.ttcn 2 files changed, 3 insertions(+), 2 deletions(-)
Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve
diff --git a/sgsn/BSSGP_ConnHdlr.ttcn b/sgsn/BSSGP_ConnHdlr.ttcn index aea981c..f976135 100644 --- a/sgsn/BSSGP_ConnHdlr.ttcn +++ b/sgsn/BSSGP_ConnHdlr.ttcn @@ -758,6 +758,7 @@ template (value) OCT2 pdp_status := '0000'O, boolean exp_ggsn_pdp_del := false, boolean expect_auth := false, + boolean expect_service_acc := true, integer ran_index := 0, float Tval := 5.0) runs on BSSGP_ConnHdlr { timer T := Tval; @@ -790,7 +791,7 @@ }
alt { - [] as_service_request(exp_service_acc := true, ran_index := ran_index) { setverdict(pass); } + [] as_service_request(exp_service_acc := expect_service_acc, ran_index := ran_index) { setverdict(pass); } [not expect_auth] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_GMM_AUTH_REQ)) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Service Request: Unexpected GMM Auth Req"); diff --git a/sgsn/SGSN_Tests_Iu.ttcn b/sgsn/SGSN_Tests_Iu.ttcn index e84869f..6e8b5b6 100644 --- a/sgsn/SGSN_Tests_Iu.ttcn +++ b/sgsn/SGSN_Tests_Iu.ttcn @@ -138,7 +138,7 @@ /* first perform regular attach */ f_gmm_attach(umts_aka_challenge := true, force_gsm_sres := false, ran_index := 3);
- f_service_request(apars, service_type := SERVICE_TYPE_Signalling, ran_index := 3); + f_service_request(apars, service_type := SERVICE_TYPE_Signalling, expect_service_acc := false, ran_index := 3);
f_pdp_ctx_act(apars, ran_index := 3);