bsc: Rename s/use_osmux/use_osmux_cn/
That config is used to control the use of osmux between BSC<->MSC. Since we'll add support for Osmux in BTS<->BSC, we want to test that in a separate way. Let's rename it so that we can add a "use_osmux_bts" later on. Change-Id: I3bde4e6772c18043dd763d7747b5dbe40e0da3b8
This commit is contained in:
parent
a2cd893d3d
commit
f967afc2ec
|
@ -632,7 +632,7 @@ type component test_CT extends CTRL_Adapter_CT {
|
|||
var boolean g_initialized := false;
|
||||
|
||||
/* Osmux is enabled through VTY */
|
||||
var boolean g_osmux_enabled := false;
|
||||
var boolean g_osmux_enabled_cn := false;
|
||||
|
||||
/*Configure T(tias) over VTY, seconds */
|
||||
var integer g_bsc_sccp_timer_ias := 7 * 60;
|
||||
|
@ -893,17 +893,17 @@ private function f_legacy_bssap_reset(integer bssap_idx := 0) runs on test_CT {
|
|||
var boolean reset_received := false;
|
||||
timer T := 5.0;
|
||||
BSSAP.send(ts_BSSAP_UNITDATA_req(g_bssap[bssap_idx].sccp_addr_peer, g_bssap[bssap_idx].sccp_addr_own,
|
||||
ts_BSSMAP_Reset(0, g_osmux_enabled)));
|
||||
ts_BSSMAP_Reset(0, g_osmux_enabled_cn)));
|
||||
T.start;
|
||||
alt {
|
||||
[] BSSAP.receive(tr_BSSAP_UNITDATA_ind(g_bssap[bssap_idx].sccp_addr_own, g_bssap[bssap_idx].sccp_addr_peer,
|
||||
tr_BSSMAP_ResetAck(g_osmux_enabled))) {
|
||||
tr_BSSMAP_ResetAck(g_osmux_enabled_cn))) {
|
||||
log("BSSMAP: Received RESET-ACK in response to RESET, we're ready to go!");
|
||||
}
|
||||
[] BSSAP.receive(tr_BSSAP_UNITDATA_ind(?, ?, tr_BSSMAP_Reset(g_osmux_enabled))) -> value ud_ind {
|
||||
[] BSSAP.receive(tr_BSSAP_UNITDATA_ind(?, ?, tr_BSSMAP_Reset(g_osmux_enabled_cn))) -> value ud_ind {
|
||||
log("BSSMAP: Respoding to inbound RESET with RESET-ACK");
|
||||
BSSAP.send(ts_BSSAP_UNITDATA_req(ud_ind.callingAddress, ud_ind.calledAddress,
|
||||
ts_BSSMAP_ResetAck(g_osmux_enabled)));
|
||||
ts_BSSMAP_ResetAck(g_osmux_enabled_cn)));
|
||||
reset_received := true;
|
||||
repeat;
|
||||
}
|
||||
|
@ -1035,15 +1035,15 @@ altstep as_Tguard() runs on test_CT {
|
|||
mtc.stop;
|
||||
}
|
||||
/* always respond with RESET ACK to RESET */
|
||||
[] BSSAP.receive(tr_BSSAP_UNITDATA_ind(?, ?, tr_BSSMAP_Reset(g_osmux_enabled))) -> value ud_ind {
|
||||
[] BSSAP.receive(tr_BSSAP_UNITDATA_ind(?, ?, tr_BSSMAP_Reset(g_osmux_enabled_cn))) -> value ud_ind {
|
||||
BSSAP.send(ts_BSSAP_UNITDATA_req(ud_ind.callingAddress, ud_ind.calledAddress,
|
||||
ts_BSSMAP_ResetAck(g_osmux_enabled)));
|
||||
ts_BSSMAP_ResetAck(g_osmux_enabled_cn)));
|
||||
repeat;
|
||||
}
|
||||
}
|
||||
|
||||
altstep no_bssmap_reset() runs on test_CT {
|
||||
[] BSSAP.receive(tr_BSSAP_UNITDATA_ind(?, ?, tr_BSSMAP_Reset(g_osmux_enabled))) {
|
||||
[] BSSAP.receive(tr_BSSAP_UNITDATA_ind(?, ?, tr_BSSMAP_Reset(g_osmux_enabled_cn))) {
|
||||
setverdict(fail, "unexpected BSSMAP Reset");
|
||||
mtc.stop;
|
||||
}
|
||||
|
@ -1074,7 +1074,7 @@ function f_init_mgcp(charstring id) runs on test_CT {
|
|||
* contains extra IE (OsmuxSupport) and osmo-bsc will handle AssignReq with
|
||||
* OsmuxCID IE.
|
||||
*/
|
||||
private function f_vty_allow_osmux(boolean allow) runs on test_CT {
|
||||
private function f_vty_allow_osmux_cn(boolean allow) runs on test_CT {
|
||||
f_vty_enter_cfg_msc(BSCVTY, 0);
|
||||
if (allow) {
|
||||
f_vty_transceive(BSCVTY, "osmux on");
|
||||
|
@ -1083,7 +1083,7 @@ private function f_vty_allow_osmux(boolean allow) runs on test_CT {
|
|||
}
|
||||
f_vty_transceive(BSCVTY, "exit");
|
||||
f_vty_transceive(BSCVTY, "exit");
|
||||
g_osmux_enabled := allow;
|
||||
g_osmux_enabled_cn := allow;
|
||||
}
|
||||
|
||||
function f_init_vty(charstring id := "foo") runs on test_CT {
|
||||
|
@ -1187,7 +1187,7 @@ private function f_vty_msc_allow_attach(TELNETasp_PT pt, my_BooleanList allow_at
|
|||
* \param handler_mode Start an RSL_Emulation_CT component (true) or not (false).
|
||||
* \param nr_msc Number of virtual MSCs to bring up to connect to osmo-bsc.
|
||||
*/
|
||||
function f_init(integer nr_bts := NUM_BTS, boolean handler_mode := false, boolean allow_osmux := false,
|
||||
function f_init(integer nr_bts := NUM_BTS, boolean handler_mode := false, boolean allow_osmux_cn := false,
|
||||
integer nr_msc := 1, float guard_timeout := 30.0) runs on test_CT {
|
||||
var integer bssap_idx;
|
||||
|
||||
|
@ -1200,7 +1200,7 @@ function f_init(integer nr_bts := NUM_BTS, boolean handler_mode := false, boolea
|
|||
activate(as_Tguard());
|
||||
|
||||
f_init_vty("VirtMSC");
|
||||
f_vty_allow_osmux(allow_osmux);
|
||||
f_vty_allow_osmux_cn(allow_osmux_cn);
|
||||
|
||||
var my_BooleanList allow_attach := { false, false, false };
|
||||
f_init_statsd("VirtMSC", vc_STATSD, mp_test_ip, mp_bsc_statsd_port);
|
||||
|
@ -1216,7 +1216,7 @@ function f_init(integer nr_bts := NUM_BTS, boolean handler_mode := false, boolea
|
|||
* MSC-side BSSAP emulation */
|
||||
if (handler_mode) {
|
||||
var RanOps ranops := MSC_RanOps;
|
||||
ranops.use_osmux := g_osmux_enabled;
|
||||
ranops.use_osmux := g_osmux_enabled_cn;
|
||||
f_ran_adapter_init(g_bssap[bssap_idx], mp_bssap_cfg[bssap_idx], "VirtMSC", ranops);
|
||||
connect(self:SCCPLITE_IPA_CTRL, g_bssap[bssap_idx].vc_RAN:CTRL_CLIENT);
|
||||
f_ran_adapter_start(g_bssap[bssap_idx]);
|
||||
|
@ -2291,9 +2291,9 @@ testcase TC_chan_rel_a_reset() runs on test_CT {
|
|||
IPA_RSL[0][0].clear;
|
||||
|
||||
/* perform BSSAP RESET, expect RESET ACK and DISC.ind on connection */
|
||||
BSSAP.send(ts_BSSAP_UNITDATA_req(g_bssap[0].sccp_addr_peer, g_bssap[0].sccp_addr_own, ts_BSSMAP_Reset(0, g_osmux_enabled)));
|
||||
BSSAP.send(ts_BSSAP_UNITDATA_req(g_bssap[0].sccp_addr_peer, g_bssap[0].sccp_addr_own, ts_BSSMAP_Reset(0, g_osmux_enabled_cn)));
|
||||
interleave {
|
||||
[] BSSAP.receive(tr_BSSAP_UNITDATA_ind(g_bssap[0].sccp_addr_own, g_bssap[0].sccp_addr_peer, tr_BSSMAP_ResetAck(g_osmux_enabled))) { }
|
||||
[] BSSAP.receive(tr_BSSAP_UNITDATA_ind(g_bssap[0].sccp_addr_own, g_bssap[0].sccp_addr_peer, tr_BSSMAP_ResetAck(g_osmux_enabled_cn))) { }
|
||||
[] BSSAP.receive(tr_BSSAP_DISC_ind(dt.sccp_conn_id, ?, ?)) { }
|
||||
}
|
||||
|
||||
|
@ -3559,9 +3559,9 @@ testcase TC_paging_imsi_a_reset() runs on test_CT {
|
|||
f_pageing_helper('001010123456789'H, cid_list, c_BtsId_all);
|
||||
|
||||
/* Perform a BSSMAP Reset and wait for ACK */
|
||||
BSSAP.send(ts_BSSAP_UNITDATA_req(g_bssap[0].sccp_addr_peer, g_bssap[0].sccp_addr_own, ts_BSSMAP_Reset(0, g_osmux_enabled)));
|
||||
BSSAP.send(ts_BSSAP_UNITDATA_req(g_bssap[0].sccp_addr_peer, g_bssap[0].sccp_addr_own, ts_BSSMAP_Reset(0, g_osmux_enabled_cn)));
|
||||
alt {
|
||||
[] BSSAP.receive(tr_BSSAP_UNITDATA_ind(g_bssap[0].sccp_addr_own, g_bssap[0].sccp_addr_peer, tr_BSSMAP_ResetAck(g_osmux_enabled))) { }
|
||||
[] BSSAP.receive(tr_BSSAP_UNITDATA_ind(g_bssap[0].sccp_addr_own, g_bssap[0].sccp_addr_peer, tr_BSSMAP_ResetAck(g_osmux_enabled_cn))) { }
|
||||
[] BSSAP.receive { repeat; }
|
||||
}
|
||||
|
||||
|
@ -4289,8 +4289,8 @@ private function f_TC_assignment_codec(charstring id) runs on MSC_ConnHdlr {
|
|||
}
|
||||
|
||||
private function f_assignment_codec(charstring id, boolean do_perform_clear := true) runs on MSC_ConnHdlr {
|
||||
var PDU_BSSAP ass_cmd := f_gen_ass_req(g_pars.use_osmux);
|
||||
var template PDU_BSSAP exp_compl := f_gen_exp_compl(g_pars.use_osmux);
|
||||
var PDU_BSSAP ass_cmd := f_gen_ass_req(g_pars.use_osmux_cn);
|
||||
var template PDU_BSSAP exp_compl := f_gen_exp_compl(g_pars.use_osmux_cn);
|
||||
|
||||
/* puzzle together the ASSIGNMENT REQ for given codec[s] */
|
||||
if (mp_bssap_cfg[0].transport == BSSAP_TRANSPORT_AoIP) {
|
||||
|
@ -5260,7 +5260,7 @@ testcase TC_assignment_osmux() runs on test_CT {
|
|||
pars.ass_codec_list.codecElements[0].s0_7 := '00000100'B; /* 5,90k */
|
||||
pars.ass_codec_list.codecElements[0].s8_15 := '00000111'B;
|
||||
pars.expect_mr_conf_ie := mr_conf;
|
||||
pars.use_osmux := true;
|
||||
pars.use_osmux_cn := true;
|
||||
|
||||
f_init(1, true, true);
|
||||
f_sleep(1.0);
|
||||
|
@ -10532,8 +10532,8 @@ testcase TC_no_msc() runs on test_CT {
|
|||
*/
|
||||
|
||||
private function f_TC_refuse_mode_modif_to_vamos(charstring id) runs on MSC_ConnHdlr {
|
||||
var PDU_BSSAP ass_cmd := f_gen_ass_req(g_pars.use_osmux);
|
||||
var template PDU_BSSAP exp_compl := f_gen_exp_compl(g_pars.use_osmux);
|
||||
var PDU_BSSAP ass_cmd := f_gen_ass_req(g_pars.use_osmux_cn);
|
||||
var template PDU_BSSAP exp_compl := f_gen_exp_compl(g_pars.use_osmux_cn);
|
||||
|
||||
/* puzzle together the ASSIGNMENT REQ for given codec[s] */
|
||||
if (mp_bssap_cfg[0].transport == BSSAP_TRANSPORT_AoIP) {
|
||||
|
|
|
@ -298,8 +298,8 @@ private function f_verify_dtap() runs on MSC_ConnHdlr
|
|||
|
||||
|
||||
private function f_est_lchan_and_mode_modify_to_vamos() runs on MSC_ConnHdlr {
|
||||
var PDU_BSSAP ass_cmd := f_gen_ass_req(g_pars.use_osmux);
|
||||
var template PDU_BSSAP exp_compl := f_gen_exp_compl(g_pars.use_osmux);
|
||||
var PDU_BSSAP ass_cmd := f_gen_ass_req(g_pars.use_osmux_cn);
|
||||
var template PDU_BSSAP exp_compl := f_gen_exp_compl(g_pars.use_osmux_cn);
|
||||
|
||||
/* puzzle together the ASSIGNMENT REQ for given codec[s] */
|
||||
if (mp_bssap_cfg[0].transport == BSSAP_TRANSPORT_AoIP) {
|
||||
|
|
|
@ -318,7 +318,7 @@ function f_rx_crcx(MgcpCommand mgcp_cmd)
|
|||
int2str(mgcp_conn.sample_rate))),
|
||||
valueof(ts_SDP_ptime(mgcp_conn.ptime)) } ));
|
||||
var template MgcpResponse mgcp_resp;
|
||||
if (g_pars.use_osmux and f_MgcpCmd_contains_par(mgcp_cmd, "X-OSMUX")) {
|
||||
if (g_pars.use_osmux_cn and f_MgcpCmd_contains_par(mgcp_cmd, "X-OSMUX")) {
|
||||
osmux_cid := f_MgcpCmd_extract_osmux_cid(mgcp_cmd);
|
||||
mgcp_resp := ts_CRCX_ACK_osmux(mgcp_cmd.line.trans_id, mgcp_conn.conn_id, osmux_cid, sdp);
|
||||
} else {
|
||||
|
@ -674,7 +674,7 @@ type record TestHdlrParams {
|
|||
uint5_t exp_ms_power_level,
|
||||
boolean exp_ms_power_params,
|
||||
boolean aoip,
|
||||
boolean use_osmux,
|
||||
boolean use_osmux_cn,
|
||||
charstring host_aoip_tla,
|
||||
TestHdlrParamsMSCPool mscpool,
|
||||
boolean media_mgw_offer_ipv6,
|
||||
|
@ -712,7 +712,7 @@ template (value) TestHdlrParams t_def_TestHdlrPars := {
|
|||
exp_ms_power_level := 7, /* calculated from osmo-bsc.cfg "ms max power" */
|
||||
exp_ms_power_params := false,
|
||||
aoip := true,
|
||||
use_osmux := false,
|
||||
use_osmux_cn := false,
|
||||
host_aoip_tla := "1.2.3.4",
|
||||
mscpool := {
|
||||
bssap_idx := 0,
|
||||
|
@ -1506,7 +1506,7 @@ runs on MSC_ConnHdlr {
|
|||
var MgcpEndpoint ep := int2str(cic) & "@mgw"; /* 1: matches value configured in BSC_Tests.ttcn pass in AssignReq */
|
||||
var MgcpCallId call_id := '51234'H;
|
||||
var SDP_attribute_list attributes := { valueof(ts_SDP_ptime(20)) };
|
||||
if (g_pars.use_osmux) {
|
||||
if (g_pars.use_osmux_cn) {
|
||||
cmd := ts_CRCX_osmux(get_next_trans_id(), ep, "sendrecv", call_id, cic);
|
||||
resp := tr_CRCX_ACK_osmux;
|
||||
} else {
|
||||
|
|
Loading…
Reference in New Issue