RAN_Adapter: Rename functions from f_bssap_* to f_ran_adapter_*

Change-Id: I73818247f1dfc71c8ece11660e6c18f5f153d186
This commit is contained in:
Harald Welte 2019-04-23 17:18:48 +02:00
parent 2fce7887f4
commit 3ca0ce13b2
3 changed files with 10 additions and 10 deletions

View File

@ -316,12 +316,12 @@ function f_init(integer nr_bts := NUM_BTS, boolean handler_mode := false) runs o
/* Call a function of our 'parent component' RAN_Adapter_CT to start the
* MSC-side BSSAP emulation */
if (handler_mode) {
f_bssap_init(g_bssap, mp_bssap_cfg, "VirtMSC", MSC_RanOps);
f_bssap_start(g_bssap);
f_ran_adapter_init(g_bssap, mp_bssap_cfg, "VirtMSC", MSC_RanOps);
f_ran_adapter_start(g_bssap);
} else {
f_bssap_init(g_bssap, mp_bssap_cfg, "VirtMSC", omit);
f_ran_adapter_init(g_bssap, mp_bssap_cfg, "VirtMSC", omit);
connect(self:BSSAP, g_bssap.vc_SCCP:SCCP_SP_PORT);
f_bssap_start(g_bssap);
f_ran_adapter_start(g_bssap);
f_legacy_bssap_reset();
}

View File

@ -76,7 +76,7 @@ private function init_pars(inout RAN_Adapter ba, in RAN_Configuration cfg) {
}
function f_bssap_init(inout RAN_Adapter ba, in RAN_Configuration cfg, charstring id,
function f_ran_adapter_init(inout RAN_Adapter ba, in RAN_Configuration cfg, charstring id,
template RanOps ops) {
init_pars(ba, cfg);
ops.sccp_addr_local := ba.sccp_addr_own;
@ -157,7 +157,7 @@ function f_bssap_init(inout RAN_Adapter ba, in RAN_Configuration cfg, charstring
}
function f_bssap_start(inout RAN_Adapter ba) {
function f_ran_adapter_start(inout RAN_Adapter ba) {
ba.vc_SCCP.start(SCCPStart(ba.sccp_pars));
}

View File

@ -277,8 +277,8 @@ function f_init(integer num_bsc := 1, boolean sgsap := false, boolean gsup := tr
for (var integer i := 0; i < num_bsc; i := i + 1) {
if (isbound(mp_bssap_cfg[i])) {
f_bssap_init(g_bssap[i], mp_bssap_cfg[i], "MSC_Test_" & int2str(i), BSC_RanOps);
f_bssap_start(g_bssap[i]);
f_ran_adapter_init(g_bssap[i], mp_bssap_cfg[i], "MSC_Test_" & int2str(i), BSC_RanOps);
f_ran_adapter_start(g_bssap[i]);
} else {
testcase.stop("missing BSSAP configuration");
}
@ -311,7 +311,7 @@ function f_init(integer num_bsc := 1, boolean sgsap := false, boolean gsup := tr
* to f_init() when the high level functions of the BSC_ConnectionHandler are
* not needed. */
function f_init_bssap_direct() runs on MTC_CT {
f_bssap_init(g_bssap[0], mp_bssap_cfg[0], "MSC_Test", omit);
f_ran_adapter_init(g_bssap[0], mp_bssap_cfg[0], "MSC_Test", omit);
connect(g_bssap[0].vc_SCCP:SCCP_SP_PORT, self:BSSAP_DIRECT);
/* Start guard timer and activate it as default */
@ -1860,7 +1860,7 @@ testcase TC_cr_before_reset() runs on MTC_CT {
var boolean reset_ack_seen := false;
f_init_bssap_direct();
f_bssap_start(g_bssap[0]);
f_ran_adapter_start(g_bssap[0]);
f_sleep(3.0);