[S] Change in osmo-ttcn3-hacks[master]: smf: Fix wrong expect in TC_n11_createSession_pfcp_sess_est_timeout
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/44019?usp=email ) Change subject: smf: Fix wrong expect in TC_n11_createSession_pfcp_sess_est_timeout ...................................................................... smf: Fix wrong expect in TC_n11_createSession_pfcp_sess_est_timeout The UECM registration only happens after full registration towards the UE happens, ie. after PFCP Session Modification procedure. Hence, at this point in the test the UECM is not registered yet and hence needs no deletion. Furthermore, the as_namf_comm_post_n1n2_messages_pdu_sess_establishment_reject() altstep was missing an answer to towards the IUT; add it. Related: https://github.com/open5gs/open5gs/issues/4878 Change-Id: I7636f271d22df2417e57839e03dab62314f8aa24 --- M smf/SMF_Session_CT_5G.ttcn M smf/SMF_Tests.ttcn 2 files changed, 27 insertions(+), 20 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/smf/SMF_Session_CT_5G.ttcn b/smf/SMF_Session_CT_5G.ttcn index d535b53..86aca29 100644 --- a/smf/SMF_Session_CT_5G.ttcn +++ b/smf/SMF_Session_CT_5G.ttcn @@ -573,6 +573,27 @@ } } +/* 3GPP TS 29.518 Table 6.1.3.5.3.1-2 200 OK */ +private function f_namf_comm_N1N2MessageTransferRspData(HTTP2_Msg http2_rx) +runs on SMF_Session_CT { + var template (value) HTTP2_Msg http2_tx; + var octetstring body_enc; + var template (value) N1N2MessageTransferRspData n1n2msg_rsp; + + n1n2msg_rsp := ts_N1N2MessageTransferRspData(cause := ts_N1N2MessageTransferCause(N1_N2_TRANSFER_INITIATED)) + body_enc := f_enc_N1N2MessageTransferRspData(valueof(n1n2msg_rsp)); + + http2_tx := ts_HTTP2_Msg_200_OK(http2_rx.conn_id, + http2_rx.stream_id, + headers := { + ts_HTTP2_Hdr_content_type("application/json; charset=utf-8") + }, + body := ts_HTTP2_Data_frame(http2_rx.stream_id, + end_stream_flag := true, + data := body_enc)); + HTTP2_CONN[HTTP2_CONN_SCP].send(http2_tx); +} + /* 5.2.2.3.1 N1N2MessageTransfer, PDU Session establishment (see clause 4.3.2 of 3GPP TS 23.502) */ altstep as_namf_comm_post_n1n2_messages_pdu_sess_establishment_reject(template (present) GMM_GSM_Cause exp_cause := ?) runs on SMF_Session_CT { @@ -581,10 +602,7 @@ [] as_namf_comm_post_n1n2_messages(http2_rx, parts) { var N1N2MessageTransferReqData n1n2msg_req; var NGAP_IEs.PDUSessionResourceSetupRequestTransfer setup_req_transf; - var template (value) N1N2MessageTransferRspData n1n2msg_rsp; var NG_NAS_DL_SM_Message_Type dl_nas; - var template (value) HTTP2_Msg http2_tx; - var octetstring body_enc; /* Decode 1st part: SBI json: */ f_dec_N1N2MessageTransferReqData(parts[0].data, n1n2msg_req); // TODO: check returned integer. @@ -593,6 +611,10 @@ dl_nas := dec_NG_NAS_DL_SM_Message_Type(parts[1].data); f_ng_nas_handle_session_establishment_reject(dl_nas, exp_cause); setverdict(pass); + + /* Tx answer: */ + f_namf_comm_N1N2MessageTransferRspData(http2_rx); + setverdict(pass); } } @@ -605,10 +627,7 @@ [] as_namf_comm_post_n1n2_messages(http2_rx, parts) { var N1N2MessageTransferReqData n1n2msg_req; var NGAP_IEs.PDUSessionResourceReleaseCommandTransfer rel_cmd_transf; - var template (value) N1N2MessageTransferRspData n1n2msg_rsp; var NG_NAS_DL_SM_Message_Type dl_nas; - var template (value) HTTP2_Msg http2_tx; - var octetstring body_enc; /* Decode 1st part: SBI json: */ f_dec_N1N2MessageTransferReqData(parts[0].data, n1n2msg_req); // TODO: check returned integer. @@ -622,18 +641,7 @@ f_ngap_pdu_handle_PDUSessionResourceReleaseCommandTransfer(rel_cmd_transf); /* Tx answer: */ - n1n2msg_rsp := ts_N1N2MessageTransferRspData(cause := ts_N1N2MessageTransferCause(N1_N2_TRANSFER_INITIATED)) - body_enc := f_enc_N1N2MessageTransferRspData(valueof(n1n2msg_rsp)); - - http2_tx := ts_HTTP2_Msg_200_OK(http2_rx.conn_id, - http2_rx.stream_id, - headers := { - ts_HTTP2_Hdr_content_type("application/json; charset=utf-8") - }, - body := ts_HTTP2_Data_frame(http2_rx.stream_id, - end_stream_flag := true, - data := body_enc)); - HTTP2_CONN[HTTP2_CONN_SCP].send(http2_tx); + f_namf_comm_N1N2MessageTransferRspData(http2_rx); setverdict(pass); } } diff --git a/smf/SMF_Tests.ttcn b/smf/SMF_Tests.ttcn index 14003d2..f093c4a 100644 --- a/smf/SMF_Tests.ttcn +++ b/smf/SMF_Tests.ttcn @@ -874,12 +874,11 @@ /* SMF deregisters on UDM: */ alt { [] as_nudm_sdm_delete_IndividualSubscription() { setverdict(pass); } /* expected incoming msg */ - [] as_namf_comm_post_n1n2_messages_pdu_sess_establishment_reject() { /* Unexpecte msg: */ + [] as_namf_comm_post_n1n2_messages_pdu_sess_establishment_reject() { /* Unexpected msg: */ setverdict(fail, "Received PDU SESS REJ while waiting for UDM! https://github.com/open5gs/open5gs/issues/4878"); repeat; } } - as_nudm_uecm_delete_IndividualSmfRegistration(); /* SMF Rejects the Create Session back to the UE: */ as_namf_comm_post_n1n2_messages_pdu_sess_establishment_reject(cs_GMM_GSM_Cause(omit, int2bit(38 /* Network Failure */, 8))); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/44019?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7636f271d22df2417e57839e03dab62314f8aa24 Gerrit-Change-Number: 44019 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin@sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> Gerrit-Reviewer: laforge <laforge@osmocom.org> Gerrit-Reviewer: pespin <pespin@sysmocom.de>
participants (1)
-
pespin