<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/14121">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">msc: Introduce Osmux infra and one test for osmo-msc<br><br>Change-Id: Ibcb82d1a2d570c6c0ad0c3b6504bffe2244eccd9<br>---<br>M library/MGCP_Templates.ttcn<br>M msc/BSC_ConnectionHandler.ttcn<br>M msc/MSC_Tests.ttcn<br>3 files changed, 127 insertions(+), 24 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/21/14121/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/MGCP_Templates.ttcn b/library/MGCP_Templates.ttcn</span><br><span>index fe2863d..056e390 100644</span><br><span>--- a/library/MGCP_Templates.ttcn</span><br><span>+++ b/library/MGCP_Templates.ttcn</span><br><span>@@ -198,6 +198,7 @@</span><br><span> }</span><br><span> </span><br><span> template MgcpResponse ts_MDCX_ACK(MgcpTransId trans_id, MgcpConnectionId conn_id, template SDP_Message sdp := omit) := ts_CRCX_ACK(trans_id, conn_id, sdp);</span><br><span style="color: hsl(120, 100%, 40%);">+ template MgcpResponse ts_MDCX_ACK_osmux(MgcpTransId trans_id, MgcpConnectionId conn_id, MgcpOsmuxCID osmux_cid, template SDP_Message sdp := omit) := ts_CRCX_ACK_osmux(trans_id, conn_id, osmux_cid, sdp);</span><br><span> </span><br><span> /* have a function that generates a template, rather than a template in order to handle</span><br><span> * optional parameters */</span><br><span>diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn</span><br><span>index 796b0ce..f83407a 100644</span><br><span>--- a/msc/BSC_ConnectionHandler.ttcn</span><br><span>+++ b/msc/BSC_ConnectionHandler.ttcn</span><br><span>@@ -83,7 +83,8 @@</span><br><span> boolean gsup_enable,</span><br><span> integer ran_idx,</span><br><span> boolean use_umts_aka,</span><br><span style="color: hsl(0, 100%, 40%);">- boolean ran_is_geran</span><br><span style="color: hsl(120, 100%, 40%);">+ boolean ran_is_geran,</span><br><span style="color: hsl(120, 100%, 40%);">+ boolean use_osmux</span><br><span> };</span><br><span> </span><br><span> /* get a one-octet bitmaks of supported algorithms based on Classmark information */</span><br><span>@@ -172,9 +173,9 @@</span><br><span> </span><br><span> log("BSSMAP_BscUnitdataCallback");</span><br><span> /* answer all RESET with RESET ACK */</span><br><span style="color: hsl(0, 100%, 40%);">- if (match(bssap, tr_BSSMAP_Reset)){</span><br><span style="color: hsl(120, 100%, 40%);">+ if (match(bssap, tr_BSSMAP_Reset(g_ran_ops.use_osmux))){</span><br><span> log("BSSMAP_BscUnitdataCallback: Responding to RESET with RESET-ACK");</span><br><span style="color: hsl(0, 100%, 40%);">- resp := ts_BSSMAP_ResetAck;</span><br><span style="color: hsl(120, 100%, 40%);">+ resp := ts_BSSMAP_ResetAck(g_ran_ops.use_osmux);</span><br><span> }</span><br><span> </span><br><span> /* FIXME: Handle paging, etc. */</span><br><span>@@ -187,7 +188,7 @@</span><br><span> </span><br><span> log("RANAP_RncUnitdataCallback");</span><br><span> /* answer all RESET with RESET ACK */</span><br><span style="color: hsl(0, 100%, 40%);">- if (match(ranap, tr_RANAP_Reset)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (match(ranap, tr_RANAP_Reset())) {</span><br><span> log("RANAP_RncUnitdataCallback: Responding to RESET with RESET-ACK");</span><br><span> var CN_DomainIndicator dom;</span><br><span> dom := ranap.initiatingMessage.value_.Reset.protocolIEs[1].value_.cN_DomainIndicator;</span><br><span>@@ -209,6 +210,7 @@</span><br><span> decode_dtap := true,</span><br><span> role_ms := true,</span><br><span> protocol := RAN_PROTOCOL_BSSAP,</span><br><span style="color: hsl(120, 100%, 40%);">+ use_osmux := false,</span><br><span> sccp_addr_local := omit,</span><br><span> sccp_addr_peer := omit</span><br><span> }</span><br><span>@@ -592,7 +594,9 @@</span><br><span> MgcpCallId mgcp_call_id optional, /* MGCP Call ID; CallAgent allocated */</span><br><span> MgcpEndpoint mgcp_ep optional /* MGCP Endpoint, CallAgent or MGW allocated */,</span><br><span> MgcpConnectionId mgcp_connection_id_bss, /* MGCP Connection ID BSS Side */</span><br><span style="color: hsl(0, 100%, 40%);">- MgcpConnectionId mgcp_connection_id_mss /* MGCP Connection ID MSS Side */</span><br><span style="color: hsl(120, 100%, 40%);">+ MgcpConnectionId mgcp_connection_id_mss, /* MGCP Connection ID MSS Side */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ boolean use_osmux /* MSC is expected to use Osmux for this call */</span><br><span> }</span><br><span> </span><br><span> template (value) CallParameters t_CallParams(hexstring called, integer tid) := {</span><br><span>@@ -617,7 +621,8 @@</span><br><span> mgcp_call_id := omit,</span><br><span> mgcp_ep := omit,</span><br><span> mgcp_connection_id_bss := '0'H,//</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_connection_id_mss := '0'H //</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_connection_id_mss := '0'H,//</span><br><span style="color: hsl(120, 100%, 40%);">+ use_osmux := false</span><br><span> };</span><br><span> </span><br><span> /* Allocate a call reference and send SETUP via MNCC to MSC */</span><br><span>@@ -642,6 +647,9 @@</span><br><span> runs on BSC_ConnHdlr {</span><br><span> var MNCC_PDU mncc;</span><br><span> var MgcpCommand mgcp_cmd;</span><br><span style="color: hsl(120, 100%, 40%);">+ var template MgcpResponse mgcp_resp;</span><br><span style="color: hsl(120, 100%, 40%);">+ var MgcpOsmuxCID osmux_cid;</span><br><span style="color: hsl(120, 100%, 40%);">+ var PDU_BSSAP bssap;</span><br><span> </span><br><span> f_ran_register_imsi(g_pars.imsi, g_pars.tmsi);</span><br><span> </span><br><span>@@ -681,8 +689,19 @@</span><br><span> { valueof(ts_SDP_rtpmap(cpars.rtp_payload_type,</span><br><span> cpars.rtp_sdp_format)),</span><br><span> valueof(ts_SDP_ptime(20)) }));</span><br><span style="color: hsl(0, 100%, 40%);">- var template MgcpResponse mgcp_resp;</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_resp := ts_CRCX_ACK(mgcp_cmd.line.trans_id, cpars.mgcp_connection_id_bss, sdp);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cpars.use_osmux) {</span><br><span style="color: hsl(120, 100%, 40%);">+ osmux_cid := f_MgcpCmd_extract_osmux_cid(mgcp_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmux_cid != -1) { /* we expect MSC to use wildcard here */</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "MSC using unexpected CID " & int2str(osmux_cid) & " != -1");</span><br><span style="color: hsl(120, 100%, 40%);">+ mtc.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ osmux_cid := 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_resp := ts_CRCX_ACK_osmux(mgcp_cmd.line.trans_id, cpars.mgcp_connection_id_bss, osmux_cid, sdp);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_resp := ts_CRCX_ACK(mgcp_cmd.line.trans_id, cpars.mgcp_connection_id_bss, sdp);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> f_mgcp_par_append(mgcp_resp.params, ts_MgcpParSpecEP(cpars.mgcp_ep));</span><br><span> MGCP.send(mgcp_resp);</span><br><span> }</span><br><span>@@ -706,15 +725,30 @@</span><br><span> }</span><br><span> </span><br><span> /* expect the MSC to trigger a BSSMAP ASSIGNMENT */</span><br><span style="color: hsl(0, 100%, 40%);">- [] BSSAP.receive(tr_BSSMAP_AssignmentReq(omit, tla_ass)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] BSSAP.receive(tr_BSSMAP_AssignmentReq(omit, tla_ass)) -> value bssap {</span><br><span> var BSSMAP_IE_AoIP_TransportLayerAddress tla;</span><br><span> var BSSMAP_IE_SpeechCodec codec;</span><br><span style="color: hsl(120, 100%, 40%);">+ var BSSMAP_IE_Osmo_OsmuxCID osmuxCID;</span><br><span> log("f_mt_call_complete 6");</span><br><span> </span><br><span> tla := valueof(ts_BSSMAP_IE_AoIP_TLA4(f_inet_addr(cpars.bss_rtp_ip), cpars.bss_rtp_port));</span><br><span> codec := valueof(ts_BSSMAP_IE_SpeechCodec({ts_CodecFR}));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- BSSAP.send(ts_BSSMAP_AssignmentComplete(omit, tla, codec));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cpars.use_osmux) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not ispresent(bssap.pdu.bssmap.assignmentRequest.osmuxCID)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "MSC sent AssignReq without expected OsmuxCID IE");</span><br><span style="color: hsl(120, 100%, 40%);">+ mtc.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ osmuxCID := valueof(ts_OsmuxCID(0));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cpars.use_osmux and not match(bssap.pdu.bssmap.assignmentRequest.osmuxCID, osmuxCID)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "MSC sent AssignReq without expected OsmuxCID IE");</span><br><span style="color: hsl(120, 100%, 40%);">+ mtc.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ bssap := valueof(ts_BSSMAP_AssignmentComplete(omit, tla, codec, osmuxCID));</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ bssap := valueof(ts_BSSMAP_AssignmentComplete(omit, tla, codec));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ BSSAP.send(bssap);</span><br><span> </span><br><span> BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_CC_CONNECT(cpars.transaction_id)));</span><br><span> }</span><br><span>@@ -736,8 +770,18 @@</span><br><span> { int2str(cpars.rtp_payload_type) },</span><br><span> { valueof(ts_SDP_rtpmap(cpars.rtp_payload_type,</span><br><span> cpars.rtp_sdp_format)),</span><br><span style="color: hsl(0, 100%, 40%);">- valueof(ts_SDP_ptime(20)) }));</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP.send(ts_MDCX_ACK(mgcp_cmd.line.trans_id, cpars.mgcp_connection_id_mss, sdp));</span><br><span style="color: hsl(120, 100%, 40%);">+ valueof(ts_SDP_ptime(20)) }));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cpars.use_osmux) {</span><br><span style="color: hsl(120, 100%, 40%);">+ osmux_cid := f_MgcpCmd_extract_osmux_cid(mgcp_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmux_cid != 0) { /* we expect MSC to use specific CID here */</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "MSC using unexpected CID " & int2str(osmux_cid) & " != 0");</span><br><span style="color: hsl(120, 100%, 40%);">+ mtc.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_resp := ts_MDCX_ACK_osmux(mgcp_cmd.line.trans_id, cpars.mgcp_connection_id_bss, osmux_cid, sdp);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_resp := ts_MDCX_ACK(mgcp_cmd.line.trans_id, cpars.mgcp_connection_id_mss, sdp);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ MGCP.send(mgcp_resp);</span><br><span> }</span><br><span> </span><br><span> /* MDCX setting up the CN side remote RTP address received from MNCC CONNECT */</span><br><span>@@ -806,7 +850,10 @@</span><br><span> </span><br><span> var MNCC_PDU mncc;</span><br><span> var MgcpCommand mgcp_cmd;</span><br><span style="color: hsl(120, 100%, 40%);">+ var template MgcpResponse mgcp_resp;</span><br><span> var boolean respond_to_dlcx;</span><br><span style="color: hsl(120, 100%, 40%);">+ var PDU_BSSAP bssap;</span><br><span style="color: hsl(120, 100%, 40%);">+ var MgcpOsmuxCID osmux_cid;</span><br><span> </span><br><span> if (cpars.emergency) {</span><br><span> f_establish_fully(EST_TYPE_EMERG_CALL);</span><br><span>@@ -846,6 +893,10 @@</span><br><span> cpars.mgcp_ep := mgcp_cmd.line.ep;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (cpars.use_osmux) {</span><br><span style="color: hsl(120, 100%, 40%);">+ osmux_cid := f_MgcpCmd_extract_osmux_cid(mgcp_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> var SDP_Message sdp := valueof(ts_SDP(cpars.mgw_rtp_ip_bss, cpars.mgw_rtp_ip_bss,</span><br><span> hex2str(cpars.mgcp_call_id), "42",</span><br><span> cpars.mgw_rtp_port_bss,</span><br><span>@@ -854,8 +905,17 @@</span><br><span> cpars.rtp_sdp_format)),</span><br><span> valueof(ts_SDP_ptime(20)) }));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- var template MgcpResponse mgcp_resp;</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_resp := ts_CRCX_ACK(mgcp_cmd.line.trans_id, cpars.mgcp_connection_id_bss, sdp);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cpars.use_osmux) {</span><br><span style="color: hsl(120, 100%, 40%);">+ osmux_cid := f_MgcpCmd_extract_osmux_cid(mgcp_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmux_cid != -1) { /* we expect MSC to use wildcard here */</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "MSC using unexpected CID " & int2str(osmux_cid) & " != -1");</span><br><span style="color: hsl(120, 100%, 40%);">+ mtc.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ osmux_cid := 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_resp := ts_CRCX_ACK_osmux(mgcp_cmd.line.trans_id, cpars.mgcp_connection_id_bss, osmux_cid, sdp);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_resp := ts_CRCX_ACK(mgcp_cmd.line.trans_id, cpars.mgcp_connection_id_bss, sdp);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> f_mgcp_par_append(mgcp_resp.params, ts_MgcpParSpecEP(cpars.mgcp_ep));</span><br><span> MGCP.send(mgcp_resp);</span><br><span> }</span><br><span>@@ -870,14 +930,30 @@</span><br><span> MNCC.send(ts_MNCC_ALERT_req(cpars.mncc_callref));</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- //[g_pars.ran_is_geran] BSSAP.receive(tr_BSSMAP_AssignmentReq(omit, tla_ass)) {</span><br><span style="color: hsl(0, 100%, 40%);">- [] BSSAP.receive(tr_BSSMAP_AssignmentReq(omit, tla_ass)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ //[g_pars.ran_is_geran] BSSAP.receive(tr_BSSMAP_AssignmentReq(omit, tla_ass)) -> value bssap {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] BSSAP.receive(tr_BSSMAP_AssignmentReq(omit, tla_ass)) -> value bssap {</span><br><span> log("f_mo_call_establish 4: rx Assignment Request");</span><br><span> var BSSMAP_IE_AoIP_TransportLayerAddress tla;</span><br><span> var BSSMAP_IE_SpeechCodec codec;</span><br><span style="color: hsl(120, 100%, 40%);">+ var BSSMAP_IE_Osmo_OsmuxCID osmuxCID;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> tla := valueof(ts_BSSMAP_IE_AoIP_TLA4(f_inet_addr(cpars.bss_rtp_ip), cpars.bss_rtp_port));</span><br><span> codec := valueof(ts_BSSMAP_IE_SpeechCodec({ts_CodecFR}));</span><br><span style="color: hsl(0, 100%, 40%);">- BSSAP.send(ts_BSSMAP_AssignmentComplete(omit, tla, codec));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cpars.use_osmux) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not ispresent(bssap.pdu.bssmap.assignmentRequest.osmuxCID)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "MSC sent AssignReq without expected OsmuxCID IE");</span><br><span style="color: hsl(120, 100%, 40%);">+ mtc.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ osmuxCID := valueof(ts_OsmuxCID(0));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cpars.use_osmux and not match(bssap.pdu.bssmap.assignmentRequest.osmuxCID, osmuxCID)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "MSC sent AssignReq without expected OsmuxCID IE");</span><br><span style="color: hsl(120, 100%, 40%);">+ mtc.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ bssap := valueof(ts_BSSMAP_AssignmentComplete(omit, tla, codec, osmuxCID));</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ bssap := valueof(ts_BSSMAP_AssignmentComplete(omit, tla, codec));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ BSSAP.send(bssap);</span><br><span> }</span><br><span> /*</span><br><span> [!g_pars.ran_is_geran] BSSAP.receive(tr_RANAP_RabAssReq(rab_sml)) {</span><br><span>@@ -895,7 +971,18 @@</span><br><span> { valueof(ts_SDP_rtpmap(cpars.rtp_payload_type,</span><br><span> cpars.rtp_sdp_format)),</span><br><span> valueof(ts_SDP_ptime(20)) }));</span><br><span style="color: hsl(0, 100%, 40%);">- MGCP.send(ts_MDCX_ACK(mgcp_cmd.line.trans_id, cpars.mgcp_connection_id_mss, sdp));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cpars.use_osmux) {</span><br><span style="color: hsl(120, 100%, 40%);">+ osmux_cid := f_MgcpCmd_extract_osmux_cid(mgcp_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmux_cid != 0) { /* we expect MSC to use specific CID here */</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "MSC using unexpected CID " & int2str(osmux_cid) & " != 0");</span><br><span style="color: hsl(120, 100%, 40%);">+ mtc.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_resp := ts_MDCX_ACK_osmux(mgcp_cmd.line.trans_id, cpars.mgcp_connection_id_bss, osmux_cid, sdp);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_resp := ts_MDCX_ACK(mgcp_cmd.line.trans_id, cpars.mgcp_connection_id_mss, sdp);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ MGCP.send(mgcp_resp);</span><br><span> }</span><br><span> </span><br><span> /* Second MGCP CRCX (this time for MSS/CN side) */</span><br><span>diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn</span><br><span>index b64b872..0d6083e 100644</span><br><span>--- a/msc/MSC_Tests.ttcn</span><br><span>+++ b/msc/MSC_Tests.ttcn</span><br><span>@@ -275,7 +275,7 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-function f_init(integer num_bsc := 1, boolean sgsap := false, boolean gsup := true) runs on MTC_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+function f_init(integer num_bsc := 1, boolean sgsap := false, boolean gsup := true, boolean osmux := false) runs on MTC_CT {</span><br><span> </span><br><span> if (g_initialized == true) {</span><br><span> return;</span><br><span>@@ -288,7 +288,9 @@</span><br><span> </span><br><span> for (var integer i := 0; i < num_bsc; i := i + 1) {</span><br><span> if (isbound(mp_bssap_cfg[i])) {</span><br><span style="color: hsl(0, 100%, 40%);">- f_ran_adapter_init(g_bssap[i], mp_bssap_cfg[i], "MSC_Test_" & int2str(i), BSC_RanOps);</span><br><span style="color: hsl(120, 100%, 40%);">+ var RanOps ranops := BSC_RanOps;</span><br><span style="color: hsl(120, 100%, 40%);">+ ranops.use_osmux := osmux;</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ran_adapter_init(g_bssap[i], mp_bssap_cfg[i], "MSC_Test_" & int2str(i), ranops);</span><br><span> f_ran_adapter_start(g_bssap[i]);</span><br><span> } else {</span><br><span> testcase.stop("missing BSSAP configuration");</span><br><span>@@ -334,7 +336,7 @@</span><br><span> </span><br><span> /* FIXME: move into BSC_ConnectionHandler? */</span><br><span> function f_init_pars(integer imsi_suffix, boolean sgsap := false, boolean gsup := true, integer ran_idx := 0,</span><br><span style="color: hsl(0, 100%, 40%);">- boolean ran_is_geran := true)</span><br><span style="color: hsl(120, 100%, 40%);">+ boolean ran_is_geran := true, boolean use_osmux := false)</span><br><span> runs on MTC_CT return BSC_ConnHdlrPars {</span><br><span> var BSC_ConnHdlrNetworkPars net_pars := {</span><br><span> kc_support := '0A'O, /* A5/1 and A5/3 enabled */</span><br><span>@@ -364,7 +366,8 @@</span><br><span> gsup_enable := gsup,</span><br><span> ran_idx := ran_idx,</span><br><span> use_umts_aka := false,</span><br><span style="color: hsl(0, 100%, 40%);">- ran_is_geran := ran_is_geran</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_is_geran := ran_is_geran,</span><br><span style="color: hsl(120, 100%, 40%);">+ use_osmux := use_osmux</span><br><span> };</span><br><span> if (not ran_is_geran) {</span><br><span> pars.use_umts_aka := true;</span><br><span>@@ -407,9 +410,9 @@</span><br><span> return vc_conn;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-function f_start_handler(void_fn fn, integer imsi_suffix, integer ran_idx := 0, boolean ran_is_geran := true)</span><br><span style="color: hsl(120, 100%, 40%);">+function f_start_handler(void_fn fn, integer imsi_suffix, integer ran_idx := 0, boolean ran_is_geran := true, boolean use_osmux := false)</span><br><span> runs on MTC_CT return BSC_ConnHdlr {</span><br><span style="color: hsl(0, 100%, 40%);">- return f_start_handler_with_pars(fn, f_init_pars(imsi_suffix, ran_idx := ran_idx, ran_is_geran := ran_is_geran));</span><br><span style="color: hsl(120, 100%, 40%);">+ return f_start_handler_with_pars(fn, f_init_pars(imsi_suffix, ran_idx := ran_idx, ran_is_geran := ran_is_geran, use_osmux := use_osmux));</span><br><span> }</span><br><span> </span><br><span> private function f_tc_lu_imsi_noauth_tmsi(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr {</span><br><span>@@ -1711,6 +1714,7 @@</span><br><span> cpars.bss_rtp_port := 1110;</span><br><span> cpars.mgcp_connection_id_bss := '10004'H;</span><br><span> cpars.mgcp_connection_id_mss := '10005'H;</span><br><span style="color: hsl(120, 100%, 40%);">+ cpars.use_osmux := pars.use_osmux;</span><br><span> </span><br><span> /* Note: This is an optional parameter. When the call-agent (MSC) does</span><br><span> * supply a full endpoint name this setting will be overwritten. */</span><br><span>@@ -1727,6 +1731,15 @@</span><br><span> vc_conn.done;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_lu_and_mt_call_osmux() runs on MTC_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var BSC_ConnHdlr vc_conn;</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init(1, false, true, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_config(MSCVTY, "msc", "osmux on");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_conn := f_start_handler(refers(f_tc_lu_and_mt_call), 39, 0, true, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_conn.done;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Test MO Call SETUP with DTMF */</span><br><span> private function f_tc_mo_setup_dtmf_dup(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr {</span><br><span> f_init_handler(pars);</span><br><span>@@ -5303,6 +5316,8 @@</span><br><span> execute( TC_lu_imsi_auth_tmsi_encr_3_1_log_msc_debug() );</span><br><span> execute( TC_gsup_mt_multi_part_sms() );</span><br><span> execute( TC_mo_cc_bssmap_clear() );</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_lu_and_mt_call_osmux() );</span><br><span> }</span><br><span> </span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14121">change 14121</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/14121"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ibcb82d1a2d570c6c0ad0c3b6504bffe2244eccd9 </div>
<div style="display:none"> Gerrit-Change-Number: 14121 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>