[M] Change in osmo-ttcn3-hacks[master]: s1gw: Rename functions to include s1ap information
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37945?usp=email )
Change subject: s1gw: Rename functions to include s1ap information ......................................................................
s1gw: Rename functions to include s1ap information
Change-Id: Ic4b06712f3222bada71ff5ca8a6c65ec9c92ae1e --- M s1gw/ConnHdlr.ttcn M s1gw/S1AP_Server.ttcn M s1gw/S1GW_Tests.ttcn 3 files changed, 25 insertions(+), 25 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/45/37945/1
diff --git a/s1gw/ConnHdlr.ttcn b/s1gw/ConnHdlr.ttcn index 12c7414..071b69d 100644 --- a/s1gw/ConnHdlr.ttcn +++ b/s1gw/ConnHdlr.ttcn @@ -73,7 +73,7 @@ }
-function f_ConnHdlr_connect(charstring local_addr, charstring remote_addr) runs on ConnHdlr { +function f_ConnHdlr_s1ap_connect(charstring local_addr, charstring remote_addr) runs on ConnHdlr { var Result res; timer T;
@@ -104,7 +104,7 @@ } }
-function f_ConnHdlr_disconnect() runs on ConnHdlr { +function f_ConnHdlr_s1ap_disconnect() runs on ConnHdlr { var Result res;
S1AP_CodecPort_CtrlFunct.f_IPL4_close(S1AP_ENB, g_s1ap_conn_id, @@ -117,7 +117,7 @@ log("eNB connection closed"); }
-function f_ConnHdlr_expect_shutdown() runs on ConnHdlr { +function f_ConnHdlr_s1ap_expect_shutdown() runs on ConnHdlr { S1AP_ENB.receive(tr_SctpShutDownEvent(g_s1ap_conn_id)); S1AP_ENB.receive(tr_SctpAssocChange(SCTP_SHUTDOWN_COMP, g_s1ap_conn_id)); S1AP_ENB.receive(PortEvent:{connClosed := ?}); @@ -182,7 +182,7 @@ } }
-function f_ConnHdlr_setup(Global_ENB_ID genb_id, float Tval := 5.0) runs on ConnHdlr { +function f_ConnHdlr_s1ap_setup(Global_ENB_ID genb_id, float Tval := 5.0) runs on ConnHdlr { var S1AP_PDU pdu; timer T;
diff --git a/s1gw/S1AP_Server.ttcn b/s1gw/S1AP_Server.ttcn index 904f106..5bd83a4 100644 --- a/s1gw/S1AP_Server.ttcn +++ b/s1gw/S1AP_Server.ttcn @@ -325,21 +325,21 @@ inout S1APSRV_close_conn; } with { extension "internal" };
-function f_ConnHdlr_register(Global_ENB_ID genb_id) +function f_ConnHdlr_s1ap_register(Global_ENB_ID genb_id) runs on S1APSRV_ConnHdlr { S1AP_PROC.call(S1APSRV_register:{self, genb_id}) { [] S1AP_PROC.getreply(S1APSRV_register:{?, ?}) { }; } }
-function f_ConnHdlr_unregister(Global_ENB_ID genb_id) +function f_ConnHdlr_s1ap_unregister(Global_ENB_ID genb_id) runs on S1APSRV_ConnHdlr { S1AP_PROC.call(S1APSRV_unregister:{self, genb_id}) { [] S1AP_PROC.getreply(S1APSRV_unregister:{?, ?}) { }; } }
-function f_ConnHdlr_close_conn(Global_ENB_ID genb_id) +function f_ConnHdlr_s1ap_close_conn(Global_ENB_ID genb_id) runs on S1APSRV_ConnHdlr { S1AP_PROC.call(S1APSRV_close_conn:{self, genb_id}) { [] S1AP_PROC.getreply(S1APSRV_close_conn:{?, ?}) { }; diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index 9448ed5..257ca96 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -116,14 +116,14 @@
function f_TC_setup(charstring id) runs on ConnHdlr { f_ConnHdlr_register_pfcp(); - f_ConnHdlr_register(g_pars.genb_id); + f_ConnHdlr_s1ap_register(g_pars.genb_id);
- f_ConnHdlr_connect(mp_enb_bind_ip, mp_s1gw_enb_ip); - f_ConnHdlr_setup(g_pars.genb_id); + f_ConnHdlr_s1ap_connect(mp_enb_bind_ip, mp_s1gw_enb_ip); + f_ConnHdlr_s1ap_setup(g_pars.genb_id); f_sleep(0.5); /* keep the connection idle for some time */ - f_ConnHdlr_disconnect(); + f_ConnHdlr_s1ap_disconnect();
- f_ConnHdlr_unregister(g_pars.genb_id); + f_ConnHdlr_s1ap_unregister(g_pars.genb_id); } testcase TC_setup() runs on test_CT { var ConnHdlrPars pars := valueof(t_ConnHdlrPars); @@ -154,18 +154,18 @@ /* MME terminates connection, expect S1GW to terminate the eNB connection */ function f_TC_conn_term_by_mme(charstring id) runs on ConnHdlr { f_ConnHdlr_register_pfcp(); - f_ConnHdlr_register(g_pars.genb_id); + f_ConnHdlr_s1ap_register(g_pars.genb_id);
- f_ConnHdlr_connect(mp_enb_bind_ip, mp_s1gw_enb_ip); - f_ConnHdlr_setup(g_pars.genb_id); + f_ConnHdlr_s1ap_connect(mp_enb_bind_ip, mp_s1gw_enb_ip); + f_ConnHdlr_s1ap_setup(g_pars.genb_id); f_sleep(0.5); /* keep the connection idle for some time */
/* MME (S1AP_Server_CT) terminates connection */ - f_ConnHdlr_close_conn(g_pars.genb_id); + f_ConnHdlr_s1ap_close_conn(g_pars.genb_id); /* expect our eNB connection to be released gracefully */ - f_ConnHdlr_expect_shutdown(); + f_ConnHdlr_s1ap_expect_shutdown();
- f_ConnHdlr_unregister(g_pars.genb_id); + f_ConnHdlr_s1ap_unregister(g_pars.genb_id); } testcase TC_conn_term_by_mme() runs on test_CT { var ConnHdlrPars pars := valueof(t_ConnHdlrPars); @@ -182,9 +182,9 @@ function f_TC_conn_term_mme_unavail(charstring id) runs on ConnHdlr { f_ConnHdlr_register_pfcp(); /* establish an eNB connection to the S1GW */ - f_ConnHdlr_connect(mp_enb_bind_ip, mp_s1gw_enb_ip); + f_ConnHdlr_s1ap_connect(mp_enb_bind_ip, mp_s1gw_enb_ip); /* expect our eNB connection to be released gracefully */ - f_ConnHdlr_expect_shutdown(); + f_ConnHdlr_s1ap_expect_shutdown(); setverdict(pass); } testcase TC_conn_term_mme_unavail() runs on test_CT { @@ -204,9 +204,9 @@ var S1AP_PDU pdu;
f_ConnHdlr_register_pfcp(); - f_ConnHdlr_register(g_pars.genb_id); - f_ConnHdlr_connect(mp_enb_bind_ip, mp_s1gw_enb_ip); - f_ConnHdlr_setup(g_pars.genb_id); + f_ConnHdlr_s1ap_register(g_pars.genb_id); + f_ConnHdlr_s1ap_connect(mp_enb_bind_ip, mp_s1gw_enb_ip); + f_ConnHdlr_s1ap_setup(g_pars.genb_id);
log("eNB <- [S1GW] <- MME: E-RAB SETUP REQUEST"); var template (value) E_RABToBeSetupListBearerSUReq items_req; @@ -259,8 +259,8 @@ items_res := ts_S1AP_RABSetupListBearerSURes(item_res); f_ConnHdlr_rx_s1ap_from_enb(pdu, tr_S1AP_RABSetupRsp(mme_id, enb_id, items_res));
- f_ConnHdlr_disconnect(); - f_ConnHdlr_unregister(g_pars.genb_id); + f_ConnHdlr_s1ap_disconnect(); + f_ConnHdlr_s1ap_unregister(g_pars.genb_id); } testcase TC_e_rab_setup() runs on test_CT { var ConnHdlrPars pars := valueof(t_ConnHdlrPars);
-
pespin