fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39906?usp=email ) Change subject: s1gw: fix passing swapped {MME,ENB}_UE_S1AP_ID ...................................................................... s1gw: fix passing swapped {MME,ENB}_UE_S1AP_ID This commit fixes a regression introduced in 64db5053 and makes the following TCs green again: * TC_e_rab_modify_ind_cnf[_multi] * TC_e_rab_modify_req_rsp[_multi] Change-Id: I9b19a82234f547a9e44c9c034492ee4b21892818 Fixes: 64db5053 ("s1gw: ConnHdlr: allow passing {MME,ENB}-UE-S1AP-ID") --- M s1gw/S1GW_ConnHdlr.ttcn M s1gw/S1GW_Tests.ttcn 2 files changed, 11 insertions(+), 11 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/s1gw/S1GW_ConnHdlr.ttcn b/s1gw/S1GW_ConnHdlr.ttcn index 5c9e108..8e01c1f 100644 --- a/s1gw/S1GW_ConnHdlr.ttcn +++ b/s1gw/S1GW_ConnHdlr.ttcn @@ -1104,7 +1104,7 @@ function f_ConnHdlr_erab_setup_req_() runs on ConnHdlr { - f_ConnHdlr_erab_setup_req(g_pars.erabs, g_pars.idx, g_pars.mme_ue_id); + f_ConnHdlr_erab_setup_req(g_pars.erabs, g_pars.mme_ue_id, g_pars.idx); } function f_ConnHdlr_erab_setup_req(inout ERabList erabs, @@ -1139,7 +1139,7 @@ function f_ConnHdlr_erab_setup_rsp_() runs on ConnHdlr { - f_ConnHdlr_erab_setup_rsp(g_pars.erabs, g_pars.idx, g_pars.mme_ue_id); + f_ConnHdlr_erab_setup_rsp(g_pars.erabs, g_pars.mme_ue_id, g_pars.idx); } function f_ConnHdlr_erab_setup_rsp(in ERabList erabs, @@ -1256,7 +1256,7 @@ function f_ConnHdlr_erab_release_cmd_(S1AP_IEs.Cause cause := c_REL_CMD_CAUSE) runs on ConnHdlr { - f_ConnHdlr_erab_release_cmd(g_pars.erabs, g_pars.idx, g_pars.mme_ue_id); + f_ConnHdlr_erab_release_cmd(g_pars.erabs, g_pars.mme_ue_id, g_pars.idx); } function f_ConnHdlr_erab_release_cmd(inout ERabList erabs, @@ -1273,7 +1273,7 @@ function f_ConnHdlr_erab_release_rsp_() runs on ConnHdlr { - f_ConnHdlr_erab_release_rsp(g_pars.erabs, g_pars.idx, g_pars.mme_ue_id); + f_ConnHdlr_erab_release_rsp(g_pars.erabs, g_pars.mme_ue_id, g_pars.idx); } function f_ConnHdlr_erab_release_rsp(inout ERabList erabs, @@ -1288,7 +1288,7 @@ function f_ConnHdlr_erab_release_ind_(S1AP_IEs.Cause cause := c_REL_CMD_CAUSE) runs on ConnHdlr { - f_ConnHdlr_erab_release_ind(g_pars.erabs, g_pars.idx, g_pars.mme_ue_id, cause); + f_ConnHdlr_erab_release_ind(g_pars.erabs, g_pars.mme_ue_id, g_pars.idx, cause); } function f_ConnHdlr_erab_release_ind(inout ERabList erabs, @@ -1305,7 +1305,7 @@ function f_ConnHdlr_initial_ctx_setup_req_() runs on ConnHdlr { - f_ConnHdlr_initial_ctx_setup_req(g_pars.erabs, g_pars.idx, g_pars.mme_ue_id); + f_ConnHdlr_initial_ctx_setup_req(g_pars.erabs, g_pars.mme_ue_id, g_pars.idx); } function f_ConnHdlr_initial_ctx_setup_req(inout ERabList erabs, @@ -1340,7 +1340,7 @@ function f_ConnHdlr_initial_ctx_setup_rsp_() runs on ConnHdlr { - f_ConnHdlr_initial_ctx_setup_rsp(g_pars.erabs, g_pars.idx, g_pars.mme_ue_id); + f_ConnHdlr_initial_ctx_setup_rsp(g_pars.erabs, g_pars.mme_ue_id, g_pars.idx); } function f_ConnHdlr_initial_ctx_setup_rsp(inout ERabList erabs, @@ -1356,7 +1356,7 @@ function f_ConnHdlr_ue_ctx_release_req_(S1AP_IEs.Cause cause := c_REL_CMD_CAUSE) runs on ConnHdlr { - f_ConnHdlr_ue_ctx_release_req(g_pars.erabs, g_pars.idx, g_pars.mme_ue_id, cause); + f_ConnHdlr_ue_ctx_release_req(g_pars.erabs, g_pars.mme_ue_id, g_pars.idx, cause); } function f_ConnHdlr_ue_ctx_release_req(inout ERabList erabs, @@ -1375,7 +1375,7 @@ function f_ConnHdlr_ue_ctx_release_cmd_(S1AP_IEs.Cause cause := c_REL_CMD_CAUSE) runs on ConnHdlr { - f_ConnHdlr_ue_ctx_release_cmd(g_pars.erabs, g_pars.idx, g_pars.mme_ue_id, cause); + f_ConnHdlr_ue_ctx_release_cmd(g_pars.erabs, g_pars.mme_ue_id, g_pars.idx, cause); } function f_ConnHdlr_ue_ctx_release_cmd(inout ERabList erabs, @@ -1401,7 +1401,7 @@ function f_ConnHdlr_ue_ctx_release_compl_() runs on ConnHdlr { - f_ConnHdlr_ue_ctx_release_compl(g_pars.idx, g_pars.mme_ue_id); + f_ConnHdlr_ue_ctx_release_compl(g_pars.mme_ue_id, g_pars.idx); } function f_ConnHdlr_ue_ctx_release_compl(MME_UE_S1AP_ID mme_ue_id, diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index fef8279..e6ce2f4 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -442,7 +442,7 @@ f_PFCPEM_subscribe_seid(erab.pfcp_loc_seid); log("eNB <- [S1GW <- MME]: E-RAB SETUP REQUEST"); - f_ConnHdlr_tx_erab_setup_req({erab}, g_pars.idx, g_pars.mme_ue_id); + f_ConnHdlr_tx_erab_setup_req({erab}, g_pars.mme_ue_id, g_pars.idx); log("UPF <- S1GW: PFCP Session Establishment Request"); var PDU_PFCP req := f_ConnHdlr_rx_session_establish_req(erab); /* store peer's SEID, so that it can be used in outgoing PDUs later */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39906?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: I9b19a82234f547a9e44c9c034492ee4b21892818 Gerrit-Change-Number: 39906 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria &lt;vyanitskiy(a)sysmocom.de&gt; Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria &lt;vyanitskiy(a)sysmocom.de&gt; Gerrit-Reviewer: pespin &lt;pespin(a)sysmocom.de&gt;