pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38587?usp=email )
(
1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: hnbgw: Rename RAB helper functions to be CS specific ......................................................................
hnbgw: Rename RAB helper functions to be CS specific
Change-Id: If8a97fe847083e95a480006d147ff59be695b713 --- M hnbgw/ConnHdlr.ttcn M hnbgw/HNBGW_Tests.ttcn 2 files changed, 10 insertions(+), 10 deletions(-)
Approvals: pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified
diff --git a/hnbgw/ConnHdlr.ttcn b/hnbgw/ConnHdlr.ttcn index 6168716..cc798e7 100644 --- a/hnbgw/ConnHdlr.ttcn +++ b/hnbgw/ConnHdlr.ttcn @@ -567,7 +567,7 @@ return mgcp_resp; }
-function f_rab_ass_req(inout MgcpParameters pars) runs on ConnHdlr { +function f_rab_ass_req_cs(inout MgcpParameters pars) runs on ConnHdlr { var MgcpCommand mgcp_cmd; var RANAP_PDU tx; var template RAB_SetupOrModifyList rab_sml; @@ -599,7 +599,7 @@ f_rua_expect(tx); }
-friend function f_rab_ass_resp(inout MgcpParameters pars) runs on ConnHdlr { +friend function f_rab_ass_resp_cs(inout MgcpParameters pars) runs on ConnHdlr { var MgcpCommand mgcp_cmd; var RANAP_PDU tx; var template RAB_SetupOrModifiedList rab_smdl; @@ -661,9 +661,9 @@ f_bssap_expect(tx); }
-function f_create_rab(inout MgcpParameters pars) runs on ConnHdlr { - f_rab_ass_req(pars); - f_rab_ass_resp(pars); +function f_create_rab_cs(inout MgcpParameters pars) runs on ConnHdlr { + f_rab_ass_req_cs(pars); + f_rab_ass_resp_cs(pars); }
altstep as_mgcp_dlcx() runs on ConnHdlr { diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 7ba4c6f..6c16cec 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -994,7 +994,7 @@ }; f_statsd_expect(expect);
- f_create_rab(g_pars.mgcp_pars); + f_create_rab_cs(g_pars.mgcp_pars);
expect := { {name := hnb0_ctr_prefix & "ranap.cs.rab_act.req", mtype := "c", min := 1, max := 1}, @@ -1052,7 +1052,7 @@ }; f_statsd_expect(expect);
- f_rab_ass_req(g_pars.mgcp_pars); + f_rab_ass_req_cs(g_pars.mgcp_pars);
/* Send RAB failed list in response */ tx := valueof(ts_RANAP_RabAssResp(rab_fl := ts_RAB_FL(t_RAB_id(23), g_pars.rab_rel_cause))); @@ -1100,7 +1100,7 @@ tx := f_build_initial_ue(g_pars); f_iuh2iu_connect(tx);
- f_create_rab(g_pars.mgcp_pars); + f_create_rab_cs(g_pars.mgcp_pars);
var charstring ctr_name; if (g_pars.rab_rel_cause == valueof(ts_RanapCause_nas_normal)) { @@ -1340,7 +1340,7 @@ tx := f_build_initial_ue(g_pars); f_iuh2iu_connect(tx);
- f_create_rab(g_pars.mgcp_pars); + f_create_rab_cs(g_pars.mgcp_pars);
RUA.send(ts_RANAP_IuReleaseRequest(ts_RanapCause_radio_rab_preempted)); BSSAP.receive(tr_RANAP_IuReleaseRequest(ts_RanapCause_radio_rab_preempted)); @@ -2391,7 +2391,7 @@ tx := f_build_initial_ue(g_pars); f_iuh2iu_connect(tx);
- f_create_rab(g_pars.mgcp_pars); + f_create_rab_cs(g_pars.mgcp_pars);
/* Now send a second RAB Assignment with different subflows and omitting transportLayerInformation. (Assuming * the first RAB Assignment's transportLayerInformation remains in use unchanged.) */