pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35411?usp=email ) Change subject: S1AP_Emulation: Fix UeContextReleaseCmd not forwarded to users ...................................................................... S1AP_Emulation: Fix UeContextReleaseCmd not forwarded to users We still want to forward it to the user so that it can: 1- validate the IUT sent the message 2- answer with a UeContextReleaseComplete The f_assoc_id_by_s1ap_ids() function is modified to avoir a Dynamic test error if the enb_ue_id is omit, which can happen if UeContextRleaseCmd used choice "MME UE S1AP ID". Change-Id: Iaf6a775d1cbc4f85f185bb26a0da1e5c9a4167a2 --- M library/S1AP_Emulation.ttcn 1 file changed, 22 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/library/S1AP_Emulation.ttcn b/library/S1AP_Emulation.ttcn index 401a26e..7d91c36 100644 --- a/library/S1AP_Emulation.ttcn +++ b/library/S1AP_Emulation.ttcn @@ -201,7 +201,8 @@ runs on S1AP_Emulation_CT return integer { var integer i; for (i := 0; i < sizeof(S1apAssociationTable); i := i+1) { - if (match(S1apAssociationTable[i].enb_ue_s1ap_id, enb_id)) { + if (istemplatekind(enb_id, "omit") or + match(S1apAssociationTable[i].enb_ue_s1ap_id, enb_id)) { if (istemplatekind(mme_id, "omit")) { return i; } else { @@ -484,8 +485,6 @@ if (isvalue(resp)) { S1AP.send(t_S1AP_Send(g_s1ap_conn_id, valueof(resp))); } - } else if (match(mrf.msg, tr_S1AP_UeContextReleaseCmd)) { - handle_S1AP_UeContextReleaseCmd(mrf.msg); } else { /* Ue-related S1AP message */ /* obtain MME + ENB UE S1AP ID */ @@ -520,6 +519,9 @@ f_s1ap_id_table_add(vc_conn, mme_ue_id, valueof(enb_ue_id)); S1AP_CLIENT.send(mrf.msg) to vc_conn; } + if (match(mrf.msg, tr_S1AP_UeContextReleaseCmd)) { + handle_S1AP_UeContextReleaseCmd(mrf.msg); + } } } [] S1AP.receive(tr_SctpAssocChange) { } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35411?usp=email 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: Iaf6a775d1cbc4f85f185bb26a0da1e5c9a4167a2 Gerrit-Change-Number: 35411 Gerrit-PatchSet: 1 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> Gerrit-MessageType: merged