From 3ca0ce13b253fdc3bb9b52f1f0d19f829c68100f Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Tue, 23 Apr 2019 17:18:48 +0200 Subject: [PATCH] RAN_Adapter: Rename functions from f_bssap_* to f_ran_adapter_* Change-Id: I73818247f1dfc71c8ece11660e6c18f5f153d186 --- bsc/BSC_Tests.ttcn | 8 ++++---- library/RAN_Adapter.ttcnpp | 4 ++-- msc/MSC_Tests.ttcn | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 720669b9a..fb43d5e8d 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -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(); } diff --git a/library/RAN_Adapter.ttcnpp b/library/RAN_Adapter.ttcnpp index 43b4988a6..a96c6ef23 100644 --- a/library/RAN_Adapter.ttcnpp +++ b/library/RAN_Adapter.ttcnpp @@ -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)); } diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 9a37fb086..b2503b7e6 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -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);