From 6811d10af7b47f7cca53d9461e4b4d0feea6dfc2 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sun, 14 Apr 2019 22:23:14 +0200 Subject: Rename BSSMAP_Emulation -> RAN_Emulation So far, BSSMAP_Emulation supported only a transport over BSSMAP. However, we soon intend to merge support for RANAP in order to simulate RANAP/Iu connections as well as BSSMAP. Let's start by renaming some of the existing types/functions/ports/modules without introducing any functional changes just yet. Related: OS#2857, OS#2856 Change-Id: Iecbcb0c6c136baad9460eca40606bb4010d8882d --- bsc/BSC_Tests.ttcn | 28 ++++++++++++++-------------- bsc/BSC_Tests_LCLS.ttcn | 18 +++++++++--------- bsc/MSC_ConnectionHandler.ttcn | 24 ++++++++++++------------ bsc/gen_links.sh | 2 +- 4 files changed, 36 insertions(+), 36 deletions(-) (limited to 'bsc') diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 1e89cf36..720669b9 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -24,7 +24,7 @@ import from GSM_Types all; import from IPL4asp_Types all; import from BSSAP_Types all; -import from BSSAP_Adapter all; +import from RAN_Adapter all; import from BSSAP_CodecPort all; import from BSSMAP_Templates all; import from IPA_Emulation all; @@ -82,7 +82,7 @@ type component test_CT extends CTRL_Adapter_CT { var MGCP_Emulation_CT vc_MGCP; port TELNETasp_PT BSCVTY; - var BSSAP_Adapter g_bssap; + var RAN_Adapter g_bssap; /* for old legacy-tests only */ port BSSAP_CODEC_PT BSSAP; @@ -106,7 +106,7 @@ modulepar { /* IP address at which the test binds */ charstring mp_test_ip := "127.0.0.1"; - BSSAP_Configuration mp_bssap_cfg := { + RAN_Configuration mp_bssap_cfg := { transport := BSSAP_TRANSPORT_AoIP, sccp_service_type := "mtp3_itu", sctp_addr := { 23905, "127.0.0.1", 2905, "127.0.0.1" }, @@ -313,10 +313,10 @@ function f_init(integer nr_bts := NUM_BTS, boolean handler_mode := false) runs o T_guard.start; activate(as_Tguard()); - /* Call a function of our 'parent component' BSSAP_Adapter_CT to start the + /* 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_BssmapOps); + f_bssap_init(g_bssap, mp_bssap_cfg, "VirtMSC", MSC_RanOps); f_bssap_start(g_bssap); } else { f_bssap_init(g_bssap, mp_bssap_cfg, "VirtMSC", omit); @@ -1625,10 +1625,10 @@ testcase TC_oml_unknown_unit_id() runs on test_CT { /*********************************************************************** - * "New world" test cases using RSL_Emulation + BSSMAP_Emulation + * "New world" test cases using RSL_Emulation + RAN_Emulation ***********************************************************************/ -import from BSSMAP_Emulation all; +import from RAN_Emulation all; import from RSL_Emulation all; import from MSC_ConnectionHandler all; @@ -1636,7 +1636,7 @@ type function void_fn(charstring id) runs on MSC_ConnHdlr; /* helper function to create and connect a MSC_ConnHdlr component */ private function f_connect_handler(inout MSC_ConnHdlr vc_conn) runs on test_CT { - connect(vc_conn:BSSMAPEM, g_bssap.vc_BSSMAP:PROC); + connect(vc_conn:RAN, g_bssap.vc_RAN:PROC); connect(vc_conn:MGCP_PROC, vc_MGCP:MGCP_PROC); connect(vc_conn:RSL, bts[0].rsl.vc_RSL:CLIENT_PT); connect(vc_conn:RSL_PROC, bts[0].rsl.vc_RSL:RSL_PROC); @@ -1644,7 +1644,7 @@ private function f_connect_handler(inout MSC_ConnHdlr vc_conn) runs on test_CT { connect(vc_conn:RSL1, bts[1].rsl.vc_RSL:CLIENT_PT); connect(vc_conn:RSL1_PROC, bts[1].rsl.vc_RSL:RSL_PROC); } - connect(vc_conn:BSSAP, g_bssap.vc_BSSMAP:CLIENT); + connect(vc_conn:BSSAP, g_bssap.vc_RAN:CLIENT); connect(vc_conn:MGCP, vc_MGCP:MGCP_CLIENT); } @@ -3096,7 +3096,7 @@ private function f_tc_ho_into_this_bsc(charstring id) runs on MSC_ConnHdlr { BSSAP.send(ts_BSSAP_Conn_Req(g_pars.handover.sccp_addr_bsc, g_pars.handover.sccp_addr_msc, f_gen_handover_req())); - BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_CONF_IND); + BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND); /* The RSL Emulation magically accepts the Chan Activ behind the scenes. */ @@ -3168,7 +3168,7 @@ private function f_tc_ho_in_fail_msc_clears(charstring id) runs on MSC_ConnHdlr BSSAP.send(ts_BSSAP_Conn_Req(g_pars.handover.sccp_addr_bsc, g_pars.handover.sccp_addr_msc, f_gen_handover_req())); - BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_CONF_IND); + BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND); /* The RSL Emulation magically accepts the Chan Activ behind the scenes. */ @@ -3253,7 +3253,7 @@ private function f_tc_ho_in_fail_msc_clears_after_ho_detect(charstring id) runs BSSAP.send(ts_BSSAP_Conn_Req(g_pars.handover.sccp_addr_bsc, g_pars.handover.sccp_addr_msc, f_gen_handover_req())); - BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_CONF_IND); + BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND); /* The RSL Emulation magically accepts the Chan Activ behind the scenes. */ @@ -3339,7 +3339,7 @@ private function f_tc_ho_in_fail_no_detect(charstring id) runs on MSC_ConnHdlr { BSSAP.send(ts_BSSAP_Conn_Req(g_pars.handover.sccp_addr_bsc, g_pars.handover.sccp_addr_msc, f_gen_handover_req())); - BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_CONF_IND); + BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND); /* The RSL Emulation magically accepts the Chan Activ behind the scenes. */ @@ -3430,7 +3430,7 @@ private function f_tc_ho_in_fail_no_detect2(charstring id) runs on MSC_ConnHdlr BSSAP.send(ts_BSSAP_Conn_Req(g_pars.handover.sccp_addr_bsc, g_pars.handover.sccp_addr_msc, f_gen_handover_req())); - BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_CONF_IND); + BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND); /* The RSL Emulation magically accepts the Chan Activ behind the scenes. */ diff --git a/bsc/BSC_Tests_LCLS.ttcn b/bsc/BSC_Tests_LCLS.ttcn index 67ccecf8..f2b9b5d7 100644 --- a/bsc/BSC_Tests_LCLS.ttcn +++ b/bsc/BSC_Tests_LCLS.ttcn @@ -24,7 +24,7 @@ import from GSM_Types all; import from IPL4asp_Types all; import from BSSAP_Types all; -import from BSSAP_Adapter all; +import from RAN_Adapter all; import from BSSAP_CodecPort all; import from BSSMAP_Templates all; import from IPA_Emulation all; @@ -51,7 +51,7 @@ import from L3_Templates all; import from GSM_RR_Types all; import from BSSMAP_Templates all; -import from BSSMAP_Emulation all; +import from RAN_Emulation all; import from MSC_ConnectionHandler all; import from BSC_Tests all; @@ -84,7 +84,7 @@ type component LCLS_MSC_ConnHdlr extends MSC_ConnHdlr { /* port type between lcls_test_CT and LCLS_MSC_ConnHdlr */ type port LCLS_InterComp_PT message { /* BSSAP from BSSA_ConnHdlr */ - inout PDU_BSSAP, BSSAP_Conn_Prim, PDU_DTAP_MO, PDU_DTAP_MT, + inout PDU_BSSAP, RAN_Conn_Prim, PDU_DTAP_MO, PDU_DTAP_MT, /* RSL from RSL_DchanHdlr */ RSLDC_ChanRqd, RSL_Message, /* MGCP from MGCP_ConnHdlr */ @@ -101,7 +101,7 @@ type enumerated LclsCompSync { /* forward messages between the RSL/MGCP/BSSAP Emulation and the master component */ private altstep as_lcls_conn_hdlr_proxy() runs on LCLS_MSC_ConnHdlr { var PDU_BSSAP bssap; - var BSSAP_Conn_Prim bssap_p; + var RAN_Conn_Prim bssap_p; var PDU_DTAP_MO dtap_mo; var PDU_DTAP_MT dtap_mt; var MgcpCommand mgcp_cmd; @@ -109,7 +109,7 @@ private altstep as_lcls_conn_hdlr_proxy() runs on LCLS_MSC_ConnHdlr { var RSL_Message rsl_msg; /* from ConnHdlr to master process */ [] BSSAP.receive(PDU_BSSAP:?) -> value bssap { MASTER.send(bssap); } - [] BSSAP.receive(BSSAP_Conn_Prim:?) -> value bssap_p { MASTER.send(bssap_p); } + [] BSSAP.receive(RAN_Conn_Prim:?) -> value bssap_p { MASTER.send(bssap_p); } [] BSSAP.receive(PDU_DTAP_MO:?) -> value dtap_mo { MASTER.send(dtap_mo); } [] BSSAP.receive(PDU_DTAP_MT:?) -> value dtap_mt { MASTER.send(dtap_mt); } [] MGCP.receive(MgcpCommand:?) -> value mgcp_cmd { MASTER.send(mgcp_cmd); } @@ -117,7 +117,7 @@ private altstep as_lcls_conn_hdlr_proxy() runs on LCLS_MSC_ConnHdlr { [] RSL.receive(RSL_Message:?) -> value rsl_msg { MASTER.send(rsl_msg); } /* from master process to ConnHdlr */ [] MASTER.receive(PDU_BSSAP:?) -> value bssap { BSSAP.send(bssap); } - [] MASTER.receive(BSSAP_Conn_Prim:?) -> value bssap_p { BSSAP.send(bssap_p); } + [] MASTER.receive(RAN_Conn_Prim:?) -> value bssap_p { BSSAP.send(bssap_p); } [] MASTER.receive(PDU_DTAP_MO:?) -> value dtap_mo { BSSAP.send(dtap_mo); } [] MASTER.receive(PDU_DTAP_MT:?) -> value dtap_mt { BSSAP.send(dtap_mt); } [] MASTER.receive(MgcpCommand:?) -> value mgcp_cmd { MGCP.send(mgcp_cmd); } @@ -160,7 +160,7 @@ runs on LCLS_MSC_ConnHdlr { /* helper function to create and connect a MSC_ConnHdlr component */ /* FIXME: Why can't we use BSC_Tests.f_connect_andler() ?!? */ private function f_connect_handler(inout LCLS_MSC_ConnHdlr vc_conn) runs on lcls_test_CT { - connect(vc_conn:BSSMAPEM, g_bssap.vc_BSSMAP:PROC); + connect(vc_conn:RAN, g_bssap.vc_RAN:PROC); connect(vc_conn:MGCP_PROC, vc_MGCP:MGCP_PROC); connect(vc_conn:RSL, bts[0].rsl.vc_RSL:CLIENT_PT); connect(vc_conn:RSL_PROC, bts[0].rsl.vc_RSL:RSL_PROC); @@ -168,7 +168,7 @@ private function f_connect_handler(inout LCLS_MSC_ConnHdlr vc_conn) runs on lcls connect(vc_conn:RSL1, bts[1].rsl.vc_RSL:CLIENT_PT); connect(vc_conn:RSL1_PROC, bts[1].rsl.vc_RSL:RSL_PROC); } - connect(vc_conn:BSSAP, g_bssap.vc_BSSMAP:CLIENT); + connect(vc_conn:BSSAP, g_bssap.vc_RAN:CLIENT); connect(vc_conn:MGCP, vc_MGCP:MGCP_CLIENT); } @@ -713,7 +713,7 @@ testcase TC_lcls_connect_clear() runs on lcls_test_CT { } } [] CONN_A.receive(tr_BSSMAP_ClearComplete) { - CONN_A.send(BSSAP_Conn_Prim:MSC_CONN_PRIM_DISC_REQ); + CONN_A.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ); } [] CONN_B.receive(tr_BSSMAP_LclsNotificationSts(LCLS_STS_not_possible_ls)); } diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 96797c94..36e554df 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -6,7 +6,7 @@ import from Osmocom_Types all; import from GSM_Types all; import from SCCPasp_Types all; import from BSSAP_Types all; -import from BSSMAP_Emulation all; +import from RAN_Emulation all; import from BSSMAP_Templates all; import from IPL4asp_Types all; @@ -330,14 +330,14 @@ altstep as_Media() runs on MSC_ConnHdlr { } /* this component represents a single subscriber connection at the MSC. - * There is a 1:1 mapping between SCCP connections and BSSAP_ConnHdlr components. - * We inherit all component variables, ports, functions, ... from BSSAP_ConnHdlr */ -type component MSC_ConnHdlr extends BSSAP_ConnHdlr, RSL_DchanHdlr, MGCP_ConnHdlr { + * There is a 1:1 mapping between SCCP connections and RAN_ConnHdlr components. + * We inherit all component variables, ports, functions, ... from RAN_ConnHdlr */ +type component MSC_ConnHdlr extends RAN_ConnHdlr, RSL_DchanHdlr, MGCP_ConnHdlr { /* SCCP Connecction Identifier for the underlying SCCP connection */ var integer g_sccp_conn_id; - /* procedure port back to our parent (BSSMAP_Emulation_CT) for control */ - port BSSMAPEM_PROC_PT BSSMAPEM; + /* procedure port back to our parent (RAN_Emulation_CT) for control */ + port RAN_PROC_PT RAN; port TELNETasp_PT BSCVTY; var MediaState g_media; @@ -357,10 +357,10 @@ function f_MscConnHdlr_init(integer i, HostName bts, HostName mgw, BSSMAP_FIELD_ } } -/* Callback function from general BSSMAP_Emulation whenever a connectionless +/* Callback function from general RAN_Emulation whenever a connectionless * BSSMAP message arrives. Can retunr a PDU_BSSAP that should be sent in return */ private function UnitdataCallback(PDU_BSSAP bssap) -runs on BSSMAP_Emulation_CT return template PDU_BSSAP { +runs on RAN_Emulation_CT return template PDU_BSSAP { var template PDU_BSSAP resp := omit; /* answer all RESET with a RESET ACK */ @@ -371,8 +371,8 @@ runs on BSSMAP_Emulation_CT return template PDU_BSSAP { return resp; } -const BssmapOps MSC_BssmapOps := { - create_cb := refers(BSSMAP_Emulation.ExpectedCreateCallback), +const RanOps MSC_RanOps := { + create_cb := refers(RAN_Emulation.ExpectedCreateCallback), unitdata_cb := refers(UnitdataCallback), decode_dtap := false, role_ms := false, @@ -387,8 +387,8 @@ const MGCPOps MSC_MGCPOps := { /* register an expect with the BSSMAP core */ private function f_create_bssmap_exp(octetstring l3_enc) runs on MSC_ConnHdlr { - BSSMAPEM.call(BSSMAPEM_register:{l3_enc, self}) { - [] BSSMAPEM.getreply(BSSMAPEM_register:{?, ?}) {}; + RAN.call(RAN_register:{l3_enc, self}) { + [] RAN.getreply(RAN_register:{?, ?}) {}; } } diff --git a/bsc/gen_links.sh b/bsc/gen_links.sh index bf10761f..d8393c32 100755 --- a/bsc/gen_links.sh +++ b/bsc/gen_links.sh @@ -67,7 +67,7 @@ FILES="TELNETasp_PT.cc TELNETasp_PT.hh TELNETasp_PortType.ttcn" gen_links $DIR $FILES DIR=../library -FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn BSSMAP_Emulation.ttcn RLCMAC_CSN1_Types.ttcn GSM_RR_Types.ttcn RSL_Types.ttcn RSL_Emulation.ttcn MGCP_Emulation.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc BSSAP_CodecPort.ttcn BSSAP_Adapter.ttcn Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_EncDec.cc IuUP_Emulation.ttcn SCCP_Templates.ttcn IPA_Testing.ttcn" +FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn RAN_Emulation.ttcn RLCMAC_CSN1_Types.ttcn GSM_RR_Types.ttcn RSL_Types.ttcn RSL_Emulation.ttcn MGCP_Emulation.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc BSSAP_CodecPort.ttcn RAN_Adapter.ttcn Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_EncDec.cc IuUP_Emulation.ttcn SCCP_Templates.ttcn IPA_Testing.ttcn" gen_links $DIR $FILES ignore_pp_results -- cgit v1.2.3