<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13010">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">PCU: Prepare for having multiple Gb connections on tester side<br><br>Change-Id: I6de4832bda18b36873f57986a34ba8082af2c853<br>Related: OS#3372<br>---<br>M pcu/PCU_Tests_RAW.ttcn<br>M pcu/PCU_Tests_RAW_SNS.ttcn<br>2 files changed, 94 insertions(+), 62 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn</span><br><span>index 3640b01..397e895 100644</span><br><span>--- a/pcu/PCU_Tests_RAW.ttcn</span><br><span>+++ b/pcu/PCU_Tests_RAW.ttcn</span><br><span>@@ -30,8 +30,9 @@</span><br><span> </span><br><span> type component RAW_NS_CT {</span><br><span> /* UDP port towards the bottom (IUT) */</span><br><span style="color: hsl(0, 100%, 40%);">- port NS_CODEC_PT NSCP;</span><br><span style="color: hsl(0, 100%, 40%);">- var ConnectionId g_ns_conn_id := -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ port NS_CODEC_PT NSCP[4];</span><br><span style="color: hsl(120, 100%, 40%);">+ var ConnectionId g_ns_conn_id[4] := {-1, -1, -1, -1};</span><br><span style="color: hsl(120, 100%, 40%);">+ var NSConfiguration g_nsconfig[4];</span><br><span> timer g_T_guard;</span><br><span> </span><br><span> /* PCUIF (we emulate the BTS part) */</span><br><span>@@ -67,28 +68,41 @@</span><br><span> PCU.send(t_SD_PCUIF(g_pcu_conn_id, info_ind));</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-function f_init_ns_codec(float guard_secs := 60.0) runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+function f_init_ns_codec(integer idx := 0, float guard_secs := 60.0) runs on RAW_NS_CT {</span><br><span> var Result res;</span><br><span style="color: hsl(0, 100%, 40%);">- map(self:NSCP, system:NSCP);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not g_T_guard.running) {</span><br><span style="color: hsl(120, 100%, 40%);">+ g_T_guard.start(guard_secs);</span><br><span style="color: hsl(120, 100%, 40%);">+ activate(as_Tguard());</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not isbound(g_nsconfig) or not isbound(g_nsconfig[idx])) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* copy most parts from mp_nsconfig */</span><br><span style="color: hsl(120, 100%, 40%);">+ g_nsconfig[idx] := mp_nsconfig;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* adjust those parts different for each NS-VC */</span><br><span style="color: hsl(120, 100%, 40%);">+ g_nsconfig[idx].nsvci := mp_nsconfig.nsvci + idx;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_nsconfig[idx].local_udp_port := mp_nsconfig.local_udp_port + idx;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ map(self:NSCP[idx], system:NSCP);</span><br><span> /* Connect the UDP socket */</span><br><span style="color: hsl(0, 100%, 40%);">- res := f_IPL4_connect(NSCP, mp_nsconfig.remote_ip, mp_nsconfig.remote_udp_port,</span><br><span style="color: hsl(0, 100%, 40%);">- mp_nsconfig.local_ip, mp_nsconfig.local_udp_port, </span><br><span style="color: hsl(0, 100%, 40%);">- 0, { udp := {}});</span><br><span style="color: hsl(120, 100%, 40%);">+ log("connecting NSCP[", idx, "] to ", g_nsconfig[idx]);</span><br><span style="color: hsl(120, 100%, 40%);">+ res := f_IPL4_connect(NSCP[idx], g_nsconfig[idx].remote_ip, g_nsconfig[idx].remote_udp_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_nsconfig[idx].local_ip, g_nsconfig[idx].local_udp_port, 0, { udp := {}});</span><br><span> if (not ispresent(res.connId)) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Could not connect NS UDP socket, check your configuration");</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Could not connect NS UDP socket, check your configuration ", g_nsconfig[idx]);</span><br><span> mtc.stop;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- g_ns_conn_id := res.connId;</span><br><span style="color: hsl(0, 100%, 40%);">- g_T_guard.start(guard_secs);</span><br><span style="color: hsl(0, 100%, 40%);">- activate(as_Tguard());</span><br><span style="color: hsl(120, 100%, 40%);">+ g_ns_conn_id[idx] := res.connId;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-function f_ns_exp(template PDU_NS exp_rx) runs on RAW_NS_CT return PDU_NS {</span><br><span style="color: hsl(120, 100%, 40%);">+function f_ns_exp(template PDU_NS exp_rx, integer idx := 0) runs on RAW_NS_CT return PDU_NS {</span><br><span> var NS_RecvFrom nrf;</span><br><span> log("f_ns_exp() expecting ", exp_rx);</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP.receive(t_NS_RecvFrom(exp_rx)) -> value nrf { }</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP.receive {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[idx].receive(t_NS_RecvFrom(exp_rx)) -> value nrf { }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[idx].receive {</span><br><span> setverdict(fail, "Received unexpected NS: ", nrf);</span><br><span> mtc.stop;</span><br><span> }</span><br><span>@@ -97,69 +111,69 @@</span><br><span> }</span><br><span> </span><br><span> /* perform outbound NS-ALIVE procedure */</span><br><span style="color: hsl(0, 100%, 40%);">-function f_outgoing_ns_alive() runs on RAW_NS_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP.send(t_NS_Send(g_ns_conn_id, t_NS_ALIVE));</span><br><span style="color: hsl(120, 100%, 40%);">+function f_outgoing_ns_alive(integer idx := 0) runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_ALIVE));</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP.receive(t_NS_RecvFrom(t_NS_ALIVE_ACK));</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP.receive { repeat; }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_ALIVE_ACK));</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[idx].receive { repeat; }</span><br><span> }</span><br><span> }</span><br><span> </span><br><span> /* perform outbound NS-BLOCK procedure */</span><br><span style="color: hsl(0, 100%, 40%);">-function f_outgoing_ns_block(NsCause cause) runs on RAW_NS_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP.send(t_NS_Send(g_ns_conn_id, ts_NS_BLOCK(cause, mp_nsconfig.nsvci)));</span><br><span style="color: hsl(120, 100%, 40%);">+function f_outgoing_ns_block(NsCause cause, integer idx := 0) runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_BLOCK(cause, g_nsconfig[idx].nsvci)));</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP.receive(t_NS_RecvFrom(tr_NS_BLOCK_ACK(mp_nsconfig.nsvci)));</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP.receive { repeat; }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_BLOCK_ACK(g_nsconfig[idx].nsvci)));</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[idx].receive { repeat; }</span><br><span> }</span><br><span> }</span><br><span> </span><br><span> /* receive NS-ALIVE and ACK it */</span><br><span style="color: hsl(0, 100%, 40%);">-altstep as_rx_alive_tx_ack(boolean oneshot := false) runs on RAW_NS_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP.receive(t_NS_RecvFrom(t_NS_ALIVE)) {</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP.send(t_NS_Send(g_ns_conn_id, t_NS_ALIVE_ACK));</span><br><span style="color: hsl(120, 100%, 40%);">+altstep as_rx_alive_tx_ack(boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_ALIVE)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_ALIVE_ACK));</span><br><span> if (not oneshot) { repeat; }</span><br><span> }</span><br><span> }</span><br><span> </span><br><span> /* Receive a BSSGP RESET for given BVCI and ACK it */</span><br><span style="color: hsl(0, 100%, 40%);">-altstep as_rx_bvc_reset_tx_ack(BssgpBvci bvci, boolean oneshot := false) runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+altstep as_rx_bvc_reset_tx_ack(BssgpBvci bvci, boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT {</span><br><span> var NS_RecvFrom ns_rf;</span><br><span> /* FIXME: nail down received cell_id in match */</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP.receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, 0,</span><br><span> decmatch tr_BVC_RESET(?, bvci, ?))))</span><br><span> -> value ns_rf {</span><br><span> var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.msg.pDU_NS_Unitdata.nS_SDU);</span><br><span> var PDU_BSSGP bssgp_tx := valueof(ts_BVC_RESET_ACK(bvci, mp_gb_cfg.cell_id));</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP.send(t_NS_Send(g_ns_conn_id, ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx))));</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx))));</span><br><span> if (not oneshot) { repeat; }</span><br><span> }</span><br><span> }</span><br><span> </span><br><span> </span><br><span> /* Receive a BSSGP UNBLOCK for given BVCI and ACK it */</span><br><span style="color: hsl(0, 100%, 40%);">-altstep as_rx_bvc_unblock_tx_ack(BssgpBvci bvci, boolean oneshot := false) runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+altstep as_rx_bvc_unblock_tx_ack(BssgpBvci bvci, boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT {</span><br><span> var NS_RecvFrom ns_rf;</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP.receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, 0,</span><br><span> decmatch t_BVC_UNBLOCK(bvci))))</span><br><span> -> value ns_rf {</span><br><span> var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.msg.pDU_NS_Unitdata.nS_SDU);</span><br><span> var PDU_BSSGP bssgp_tx := valueof(t_BVC_UNBLOCK_ACK(bvci));</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP.send(t_NS_Send(g_ns_conn_id, ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx))));</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx))));</span><br><span> if (not oneshot) { repeat; }</span><br><span> }</span><br><span> }</span><br><span> </span><br><span> /* Receive a BSSGP FLOW-CONTROL-BVC and ACK it */</span><br><span style="color: hsl(0, 100%, 40%);">-altstep as_rx_bvc_fc_tx_ack(BssgpBvci bvci, boolean oneshot := false) runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+altstep as_rx_bvc_fc_tx_ack(BssgpBvci bvci, boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT {</span><br><span> var NS_RecvFrom ns_rf;</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP.receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, bvci,</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, bvci,</span><br><span> decmatch tr_BVC_FC_BVC)))</span><br><span> -> value ns_rf {</span><br><span> var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.msg.pDU_NS_Unitdata.nS_SDU);</span><br><span> var OCT1 tag := bssgp_rx.pDU_BSSGP_FLOW_CONTROL_BVC.tag.unstructured_Value;</span><br><span> var PDU_BSSGP bssgp_tx := valueof(t_BVC_FC_BVC_ACK(tag));</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP.send(t_NS_Send(g_ns_conn_id, ts_NS_UNITDATA(t_SduCtrlB, bvci, enc_PDU_BSSGP(bssgp_tx))));</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, bvci, enc_PDU_BSSGP(bssgp_tx))));</span><br><span> if (not oneshot) { repeat; }</span><br><span> }</span><br><span> }</span><br><span>@@ -169,19 +183,20 @@</span><br><span> **********************************************************************************/</span><br><span> </span><br><span> /* Receive a NS-RESET and ACK it */</span><br><span style="color: hsl(0, 100%, 40%);">-private altstep as_rx_ns_reset_ack(boolean oneshot := false) runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+private altstep as_rx_ns_reset_ack(boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT {</span><br><span> var NS_RecvFrom ns_rf;</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP.receive(t_NS_RecvFrom(tr_NS_RESET(NS_CAUSE_OM_INTERVENTION, mp_nsconfig.nsvci,</span><br><span style="color: hsl(0, 100%, 40%);">- mp_nsconfig.nsei))) -> value ns_rf {</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP.send(t_NS_Send(g_ns_conn_id, ts_NS_RESET_ACK(mp_nsconfig.nsvci, mp_nsconfig.nsei)));</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_RESET(NS_CAUSE_OM_INTERVENTION, g_nsconfig[idx].nsvci,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_nsconfig[idx].nsei))) -> value ns_rf {</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_RESET_ACK(g_nsconfig[idx].nsvci,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_nsconfig[idx].nsei)));</span><br><span> if (not oneshot) { repeat; }</span><br><span> }</span><br><span> }</span><br><span> /* Receive a NS-UNBLOCK and ACK it */</span><br><span style="color: hsl(0, 100%, 40%);">-private altstep as_rx_ns_unblock_ack(boolean oneshot := false) runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+private altstep as_rx_ns_unblock_ack(boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT {</span><br><span> var NS_RecvFrom ns_rf;</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP.receive(t_NS_RecvFrom(t_NS_UNBLOCK)) -> value ns_rf {</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP.send(t_NS_Send(g_ns_conn_id, t_NS_UNBLOCK_ACK));</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_UNBLOCK)) -> value ns_rf {</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_UNBLOCK_ACK));</span><br><span> if (not oneshot) { repeat; }</span><br><span> }</span><br><span> }</span><br><span>@@ -204,8 +219,8 @@</span><br><span> </span><br><span> var integer i;</span><br><span> for (i := 0; i < 3; i := i+1) {</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP.receive(t_NS_RecvFrom(tr_NS_RESET(NS_CAUSE_OM_INTERVENTION,</span><br><span style="color: hsl(0, 100%, 40%);">- mp_nsconfig.nsvci, mp_nsconfig.nsei)));</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[0].receive(t_NS_RecvFrom(tr_NS_RESET(NS_CAUSE_OM_INTERVENTION,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_nsconfig[0].nsvci, g_nsconfig[0].nsei)));</span><br><span> }</span><br><span> </span><br><span> /* Expect inbound NS-RESET procedure */</span><br><span>@@ -228,19 +243,19 @@</span><br><span> </span><br><span> /* Test for NS-RESET after NS-ALIVE timeout */</span><br><span> testcase TC_ns_alive_timeout_reset() runs on RAW_NS_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_ns_codec(100.0);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_ns_codec(guard_secs := 100.0);</span><br><span> f_init_pcuif();</span><br><span> </span><br><span> /* Expect inbound NS-RESET procedure */</span><br><span> as_rx_ns_reset_ack(oneshot := true);</span><br><span> </span><br><span> /* wait for at least one NS-ALIVE */</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP.receive(t_NS_RecvFrom(t_NS_ALIVE));</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[0].receive(t_NS_RecvFrom(t_NS_ALIVE));</span><br><span> </span><br><span> /* wait for NS-RESET to re-appear, ignoring any NS-ALIVE until then */</span><br><span> alt {</span><br><span> [] as_rx_ns_reset_ack(oneshot := true) { setverdict(pass); }</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP.receive(t_NS_RecvFrom(t_NS_ALIVE)) { repeat; }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[0].receive(t_NS_RecvFrom(t_NS_ALIVE)) { repeat; }</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -273,7 +288,7 @@</span><br><span> activate(as_rx_alive_tx_ack());</span><br><span> </span><br><span> /* wait for first NS-UNBLOCK, don't respond */</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP.receive(t_NS_RecvFrom(t_NS_UNBLOCK));</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[0].receive(t_NS_RecvFrom(t_NS_UNBLOCK));</span><br><span> </span><br><span> /* wait for re-transmission of NS-UNBLOCK */</span><br><span> as_rx_ns_unblock_ack(oneshot := true);</span><br><span>diff --git a/pcu/PCU_Tests_RAW_SNS.ttcn b/pcu/PCU_Tests_RAW_SNS.ttcn</span><br><span>index a306fe4..3e4ef2c 100644</span><br><span>--- a/pcu/PCU_Tests_RAW_SNS.ttcn</span><br><span>+++ b/pcu/PCU_Tests_RAW_SNS.ttcn</span><br><span>@@ -12,40 +12,57 @@</span><br><span> **********************************************************************************/</span><br><span> </span><br><span> /* perform inbound SNS-SIZE procedure */</span><br><span style="color: hsl(0, 100%, 40%);">-function f_incoming_sns_size(template (omit) NsCause cause := omit) runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+function f_incoming_sns_size(template (omit) NsCause cause := omit, integer idx := 0)</span><br><span style="color: hsl(120, 100%, 40%);">+runs on RAW_NS_CT {</span><br><span> var PDU_NS rx;</span><br><span> /* expect one single SNS-SIZE with RESET flag; one remote v4 EP; no v6 EP */</span><br><span style="color: hsl(0, 100%, 40%);">- rx := f_ns_exp(tr_SNS_SIZE(mp_nsconfig.nsei, rst_flag := true, max_nsvcs := ?,</span><br><span style="color: hsl(0, 100%, 40%);">- num_v4 := 1, num_v6 := omit));</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP.send(t_NS_Send(g_ns_conn_id, ts_SNS_SIZE_ACK(mp_nsconfig.nsei, cause)));</span><br><span style="color: hsl(120, 100%, 40%);">+ rx := f_ns_exp(tr_SNS_SIZE(g_nsconfig[idx].nsei, rst_flag := true, max_nsvcs := 8,</span><br><span style="color: hsl(120, 100%, 40%);">+ num_v4 := 4, num_v6 := omit), idx);</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_SIZE_ACK(g_nsconfig[idx].nsei, cause)));</span><br><span> }</span><br><span> </span><br><span> /* perform outbound SNS-SIZE procedure */</span><br><span style="color: hsl(0, 100%, 40%);">-function f_outgoing_sns_size(template (omit) NsCause cause := omit) runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+function f_outgoing_sns_size(template (omit) NsCause cause := omit, integer idx:= 0)</span><br><span style="color: hsl(120, 100%, 40%);">+runs on RAW_NS_CT {</span><br><span> var PDU_NS rx;</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP.send(t_NS_Send(g_ns_conn_id, ts_SNS_SIZE(mp_nsconfig.nsei, rst_flag := true, max_nsvcs := 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_SIZE(g_nsconfig[idx].nsei, rst_flag := true, max_nsvcs := 1,</span><br><span> num_v4 := 1, num_v6 := omit)</span><br><span> ));</span><br><span> /* expect one single SNS-SIZE with RESET flag; one remote v4 EP; no v6 EP */</span><br><span style="color: hsl(0, 100%, 40%);">- rx := f_ns_exp(tr_SNS_SIZE_ACK(mp_nsconfig.nsei, cause));</span><br><span style="color: hsl(120, 100%, 40%);">+ rx := f_ns_exp(tr_SNS_SIZE_ACK(g_nsconfig[idx].nsei, cause), idx);</span><br><span> }</span><br><span> </span><br><span> /* perform inbound SNS-CONFIG procedure */</span><br><span style="color: hsl(0, 100%, 40%);">-function f_incoming_sns_config(template (omit) NsCause cause := omit) runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+function f_incoming_sns_config(template (omit) NsCause cause := omit, integer idx := 0)</span><br><span style="color: hsl(120, 100%, 40%);">+runs on RAW_NS_CT {</span><br><span> var PDU_NS rx;</span><br><span style="color: hsl(0, 100%, 40%);">- rx := f_ns_exp(tr_SNS_CONFIG(mp_nsconfig.nsei, end_flag := true, v4 := ?));</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP.send(t_NS_Send(g_ns_conn_id, ts_SNS_CONFIG_ACK(mp_nsconfig.nsei, cause)));</span><br><span style="color: hsl(120, 100%, 40%);">+ rx := f_ns_exp(tr_SNS_CONFIG(g_nsconfig[idx].nsei, end_flag := true, v4 := ?), idx);</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_CONFIG_ACK(g_nsconfig[idx].nsei, cause)));</span><br><span> }</span><br><span> </span><br><span> /* perform outbound SNS-CONFIG procedure */</span><br><span style="color: hsl(0, 100%, 40%);">-function f_outgoing_sns_config(template (omit) NsCause cause := omit) runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+function f_outgoing_sns_config(template (omit) NsCause cause := omit, integer idx := 0)</span><br><span style="color: hsl(120, 100%, 40%);">+runs on RAW_NS_CT {</span><br><span> var PDU_NS rx;</span><br><span style="color: hsl(0, 100%, 40%);">- var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(mp_nsconfig.local_ip,</span><br><span style="color: hsl(0, 100%, 40%);">- mp_nsconfig.local_udp_port) }</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP.send(t_NS_Send(g_ns_conn_id, ts_SNS_CONFIG(mp_nsconfig.nsei, true, v4)));</span><br><span style="color: hsl(0, 100%, 40%);">- rx := f_ns_exp(tr_SNS_CONFIG_ACK(mp_nsconfig.nsei, cause));</span><br><span style="color: hsl(120, 100%, 40%);">+ var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[idx].local_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_nsconfig[idx].local_udp_port) }</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_CONFIG(g_nsconfig[idx].nsei, true, v4)));</span><br><span style="color: hsl(120, 100%, 40%);">+ rx := f_ns_exp(tr_SNS_CONFIG_ACK(g_nsconfig[idx].nsei, cause), idx);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* perform outbound SNS-CONFIG procedure (separate endpoints: 1 for control, 1 for user */</span><br><span style="color: hsl(120, 100%, 40%);">+function f_outgoing_sns_config_1c1u(template (omit) NsCause cause := omit, integer idx := 0)</span><br><span style="color: hsl(120, 100%, 40%);">+runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var PDU_NS rx;</span><br><span style="color: hsl(120, 100%, 40%);">+ var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[0].local_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_nsconfig[0].local_udp_port, 1, 0),</span><br><span style="color: hsl(120, 100%, 40%);">+ ts_SNS_IPv4(g_nsconfig[1].local_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_nsconfig[1].local_udp_port, 0, 1) };</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_CONFIG(g_nsconfig[idx].nsei, true, v4)));</span><br><span style="color: hsl(120, 100%, 40%);">+ rx := f_ns_exp(tr_SNS_CONFIG_ACK(g_nsconfig[idx].nsei, cause), idx);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* PCU-originated SNS-SIZE: successful case */</span><br><span> testcase TC_sns_po_size_success() runs on RAW_NS_CT {</span><br><span> f_init_ns_codec();</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13010">change 13010</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/13010"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: I6de4832bda18b36873f57986a34ba8082af2c853 </div>
<div style="display:none"> Gerrit-Change-Number: 13010 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>