<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22090">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">RAW_NS: rework NS connection to use NS_Provider<br><br>Previous RAW_NS only supported NS over UDP because<br>it handled the UDP connection on it's own.<br>Because of this there was no cleanup function for the tests<br>because no virtual component were started.<br>Using the new NS_Provider allows to use the same tests over<br>UDP and FR with no changes.<br><br>Change-Id: I8a3b6c72798a75f434f54229fdbfc802cd13967e<br>---<br>D library/RAW_NS.ttcn<br>A library/RAW_NS.ttcnpp<br>M pcu/PCU_Tests.cfg<br>M pcu/PCU_Tests_NS.ttcn<br>M pcu/PCU_Tests_SNS.cfg<br>M pcu/PCU_Tests_SNS.ttcn<br>M pcu/SGSN_Components.ttcn<br>M pcu/gen_links.sh<br>M sgsn/SGSN_Tests_NS.ttcn<br>M sgsn/gen_links.sh<br>10 files changed, 431 insertions(+), 311 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/90/22090/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/RAW_NS.ttcn b/library/RAW_NS.ttcn</span><br><span>deleted file mode 100644</span><br><span>index 7f7b6c4..0000000</span><br><span>--- a/library/RAW_NS.ttcn</span><br><span>+++ /dev/null</span><br><span>@@ -1,238 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-module RAW_NS {</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* Osmocom NS test suite for NS in TTCN-3</span><br><span style="color: hsl(0, 100%, 40%);">- * (C) 2018-2019 Harald Welte <laforge@gnumonks.org></span><br><span style="color: hsl(0, 100%, 40%);">- * All rights reserved.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * Released under the terms of GNU General Public License, Version 2 or</span><br><span style="color: hsl(0, 100%, 40%);">- * (at your option) any later version.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * SPDX-License-Identifier: GPL-2.0-or-later</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-import from General_Types all;</span><br><span style="color: hsl(0, 100%, 40%);">-import from Osmocom_Types all;</span><br><span style="color: hsl(0, 100%, 40%);">-import from Osmocom_Gb_Types all;</span><br><span style="color: hsl(0, 100%, 40%);">-import from NS_CodecPort all;</span><br><span style="color: hsl(0, 100%, 40%);">-import from NS_Types all;</span><br><span style="color: hsl(0, 100%, 40%);">-import from BSSGP_Types all;</span><br><span style="color: hsl(0, 100%, 40%);">-import from NS_CodecPort all;</span><br><span style="color: hsl(0, 100%, 40%);">-import from NS_CodecPort_CtrlFunct all;</span><br><span style="color: hsl(0, 100%, 40%);">-import from NS_Emulation all;</span><br><span style="color: hsl(0, 100%, 40%);">-import from Native_Functions all;</span><br><span style="color: hsl(0, 100%, 40%);">-import from IPL4asp_Types all;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-public type component RAW_NS_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- /* UDP port towards the bottom (IUT) */</span><br><span style="color: hsl(0, 100%, 40%);">- port NS_CODEC_PT NSCP[4];</span><br><span style="color: hsl(0, 100%, 40%);">- var ConnectionId g_ns_conn_id[4] := {-1, -1, -1, -1};</span><br><span style="color: hsl(0, 100%, 40%);">- var NSConfiguration g_nsconfig[4];</span><br><span style="color: hsl(0, 100%, 40%);">- timer g_T_guard;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-public altstep as_Tguard() runs on RAW_NS_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- [] g_T_guard.timeout {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Timeout of T_guard");</span><br><span style="color: hsl(0, 100%, 40%);">- mtc.stop;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-function f_init_ns_codec(NSConfiguration ns_config, integer idx := 0, float guard_secs := 60.0, integer tc_offset := 0) runs on RAW_NS_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- var Result res;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (not g_T_guard.running) {</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(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (not isbound(g_nsconfig) or not isbound(g_nsconfig[idx])) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* copy most parts from mp_nsconfig */</span><br><span style="color: hsl(0, 100%, 40%);">- g_nsconfig[idx] := ns_config;</span><br><span style="color: hsl(0, 100%, 40%);">- /* adjust those parts different for each NS-VC */</span><br><span style="color: hsl(0, 100%, 40%);">- g_nsconfig[idx].nsvc[0].nsvci := ns_config.nsvc[0].nsvci + idx;</span><br><span style="color: hsl(0, 100%, 40%);">- g_nsconfig[idx].nsvc[0].provider.ip.local_udp_port := ns_config.nsvc[0].provider.ip.local_udp_port + idx + tc_offset;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- map(self:NSCP[idx], system:NSCP);</span><br><span style="color: hsl(0, 100%, 40%);">- /* Connect the UDP socket */</span><br><span style="color: hsl(0, 100%, 40%);">- var NSConfiguration nscfg := g_nsconfig[idx];</span><br><span style="color: hsl(0, 100%, 40%);">- var NSVCConfiguration nsvc_cfg := nscfg.nsvc[0];</span><br><span style="color: hsl(0, 100%, 40%);">- log("connecting NSCP[", idx, "] to ", nscfg);</span><br><span style="color: hsl(0, 100%, 40%);">- res := f_IPL4_connect(NSCP[idx], nsvc_cfg.provider.ip.remote_ip, nsvc_cfg.provider.ip.remote_udp_port,</span><br><span style="color: hsl(0, 100%, 40%);">- nsvc_cfg.provider.ip.local_ip, nsvc_cfg.provider.ip.local_udp_port, 0, { udp := {}});</span><br><span style="color: hsl(0, 100%, 40%);">- 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 ", g_nsconfig[idx]);</span><br><span style="color: hsl(0, 100%, 40%);">- mtc.stop;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- g_ns_conn_id[idx] := res.connId;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-public altstep ax_rx_fail_on_any_ns(integer idx := 0) runs on RAW_NS_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- var NS_RecvFrom nrf;</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP[idx].receive(t_NS_RecvFrom(?)) -> value nrf {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Received unexpected NS: ", nrf);</span><br><span style="color: hsl(0, 100%, 40%);">- mtc.stop;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 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 style="color: hsl(0, 100%, 40%);">- var NS_RecvFrom nrf;</span><br><span style="color: hsl(0, 100%, 40%);">- log("f_ns_exp() expecting ", exp_rx);</span><br><span style="color: hsl(0, 100%, 40%);">- /* last activated altstep has the lowest priority */</span><br><span style="color: hsl(0, 100%, 40%);">- var default d := activate(ax_rx_fail_on_any_ns());</span><br><span style="color: hsl(0, 100%, 40%);">- alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP[idx].receive(t_NS_RecvFrom(exp_rx)) -> value nrf { }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- deactivate(d);</span><br><span style="color: hsl(0, 100%, 40%);">- return nrf.msg;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* perform outbound NS-ALIVE procedure */</span><br><span style="color: hsl(0, 100%, 40%);">-function f_outgoing_ns_alive(integer idx := 0) runs on RAW_NS_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_ALIVE));</span><br><span style="color: hsl(0, 100%, 40%);">- alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_ALIVE_ACK));</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP[idx].receive { repeat; }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* perform outbound NS-ALIVE procedure */</span><br><span style="color: hsl(0, 100%, 40%);">-function f_outgoing_ns_alive_no_ack(integer idx := 0, float tout := 10.0) runs on RAW_NS_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- timer T := tout;</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_ALIVE));</span><br><span style="color: hsl(0, 100%, 40%);">- T.start;</span><br><span style="color: hsl(0, 100%, 40%);">- alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_ALIVE_ACK)) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Received unexpected NS-ALIVE ACK");</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP[idx].receive { repeat; }</span><br><span style="color: hsl(0, 100%, 40%);">- [] T.timeout {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(pass);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-function f_outgoing_ns_reset(integer idx := 0, float tout := 10.0) runs on RAW_NS_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- timer T := tout;</span><br><span style="color: hsl(0, 100%, 40%);">- var template PDU_NS reset := ts_NS_RESET(NS_CAUSE_EQUIPMENT_FAILURE, g_nsconfig[idx].nsvc[0].nsvci, g_nsconfig[idx].nsei)</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], reset));</span><br><span style="color: hsl(0, 100%, 40%);">- T.start;</span><br><span style="color: hsl(0, 100%, 40%);">- alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP[idx].receive(t_NS_RecvFrom(ts_NS_RESET_ACK(g_nsconfig[idx].nsvc[0].nsvci, g_nsconfig[idx].nsei))) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(pass);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP[idx].receive { repeat; }</span><br><span style="color: hsl(0, 100%, 40%);">- [] T.timeout {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Failed to receive a RESET ACK");</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* perform outbound NS-BLOCK procedure */</span><br><span style="color: hsl(0, 100%, 40%);">-function f_outgoing_ns_block(NsCause cause, integer idx := 0) runs on RAW_NS_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_BLOCK(cause, g_nsconfig[idx].nsvc[0].nsvci)));</span><br><span style="color: hsl(0, 100%, 40%);">- alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_BLOCK_ACK(g_nsconfig[idx].nsvc[0].nsvci)));</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP[idx].receive { repeat; }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* receive NS-ALIVE and ACK it */</span><br><span style="color: hsl(0, 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(0, 100%, 40%);">- [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_ALIVE)) {</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_ALIVE_ACK));</span><br><span style="color: hsl(0, 100%, 40%);">- if (not oneshot) { repeat; }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* Transmit BSSGP RESET for given BVCI and expect ACK */</span><br><span style="color: hsl(0, 100%, 40%);">-function f_tx_bvc_reset_rx_ack(BssgpBvci bvci, template (omit) BssgpCellId tx_cell_id, template BssgpCellId rx_cell_id,</span><br><span style="color: hsl(0, 100%, 40%);">- integer idx := 0, boolean exp_ack := true)</span><br><span style="color: hsl(0, 100%, 40%);">-runs on RAW_NS_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- var PDU_BSSGP bssgp_tx := valueof(ts_BVC_RESET(BSSGP_CAUSE_NET_SV_CAP_MOD_GT_ZERO_KBPS, bvci,</span><br><span style="color: hsl(0, 100%, 40%);">- tx_cell_id));</span><br><span style="color: hsl(0, 100%, 40%);">- timer T := 5.0;</span><br><span style="color: hsl(0, 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 style="color: hsl(0, 100%, 40%);">- T.start;</span><br><span style="color: hsl(0, 100%, 40%);">- alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [exp_ack] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, 0,</span><br><span style="color: hsl(0, 100%, 40%);">- decmatch tr_BVC_RESET_ACK(bvci, rx_cell_id)))) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(pass);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- [exp_ack] T.timeout {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "No response to BVC-RESET");</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- [not exp_ack] T.timeout {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(pass);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP[idx].receive { repeat; }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* 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, template BssgpCellId rx_cell_id, template (omit) BssgpCellId tx_cell_id,</span><br><span style="color: hsl(0, 100%, 40%);">- boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- var NS_RecvFrom ns_rf;</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, 0,</span><br><span style="color: hsl(0, 100%, 40%);">- decmatch tr_BVC_RESET(?, bvci, rx_cell_id))))</span><br><span style="color: hsl(0, 100%, 40%);">- -> value ns_rf {</span><br><span style="color: hsl(0, 100%, 40%);">- var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.msg.pDU_NS_Unitdata.nS_SDU);</span><br><span style="color: hsl(0, 100%, 40%);">- var PDU_BSSGP bssgp_tx := valueof(ts_BVC_RESET_ACK(bvci, tx_cell_id));</span><br><span style="color: hsl(0, 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 style="color: hsl(0, 100%, 40%);">- if (not oneshot) { repeat; }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* 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, integer idx := 0) runs on RAW_NS_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- var NS_RecvFrom ns_rf;</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, 0,</span><br><span style="color: hsl(0, 100%, 40%);">- decmatch t_BVC_UNBLOCK(bvci))))</span><br><span style="color: hsl(0, 100%, 40%);">- -> value ns_rf {</span><br><span style="color: hsl(0, 100%, 40%);">- var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.msg.pDU_NS_Unitdata.nS_SDU);</span><br><span style="color: hsl(0, 100%, 40%);">- var PDU_BSSGP bssgp_tx := valueof(t_BVC_UNBLOCK_ACK(bvci));</span><br><span style="color: hsl(0, 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 style="color: hsl(0, 100%, 40%);">- if (not oneshot) { repeat; }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* 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, integer idx := 0) runs on RAW_NS_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- var NS_RecvFrom ns_rf;</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, bvci,</span><br><span style="color: hsl(0, 100%, 40%);">- decmatch tr_BVC_FC_BVC)))</span><br><span style="color: hsl(0, 100%, 40%);">- -> value ns_rf {</span><br><span style="color: hsl(0, 100%, 40%);">- var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.msg.pDU_NS_Unitdata.nS_SDU);</span><br><span style="color: hsl(0, 100%, 40%);">- var OCT1 tag := bssgp_rx.pDU_BSSGP_FLOW_CONTROL_BVC.tag.unstructured_Value;</span><br><span style="color: hsl(0, 100%, 40%);">- var PDU_BSSGP bssgp_tx := valueof(t_BVC_FC_BVC_ACK(tag));</span><br><span style="color: hsl(0, 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 style="color: hsl(0, 100%, 40%);">- if (not oneshot) { repeat; }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/**********************************************************************************</span><br><span style="color: hsl(0, 100%, 40%);">- * Classic Gb/IP bring-up test cases using NS-{RESET,BLOCK,UNBLOCK} and no IP-SNS *</span><br><span style="color: hsl(0, 100%, 40%);">- **********************************************************************************/</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* Receive a NS-RESET and ACK it */</span><br><span style="color: hsl(0, 100%, 40%);">-public altstep as_rx_ns_reset_ack(boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- var NS_RecvFrom ns_rf;</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_RESET(NS_CAUSE_OM_INTERVENTION, g_nsconfig[idx].nsvc[0].nsvci,</span><br><span style="color: hsl(0, 100%, 40%);">- g_nsconfig[idx].nsei))) -> value ns_rf {</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_RESET_ACK(g_nsconfig[idx].nsvc[0].nsvci,</span><br><span style="color: hsl(0, 100%, 40%);">- g_nsconfig[idx].nsei)));</span><br><span style="color: hsl(0, 100%, 40%);">- if (not oneshot) { repeat; }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-/* Receive a NS-UNBLOCK and ACK it */</span><br><span style="color: hsl(0, 100%, 40%);">-public altstep as_rx_ns_unblock_ack(boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- var NS_RecvFrom ns_rf;</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP[idx].receive(t_NS_RecvFrom(t_NS_UNBLOCK)) -> value ns_rf {</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], t_NS_UNBLOCK_ACK));</span><br><span style="color: hsl(0, 100%, 40%);">- if (not oneshot) { repeat; }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span>diff --git a/library/RAW_NS.ttcnpp b/library/RAW_NS.ttcnpp</span><br><span>new file mode 100644</span><br><span>index 0000000..1d07086</span><br><span>--- /dev/null</span><br><span>+++ b/library/RAW_NS.ttcnpp</span><br><span>@@ -0,0 +1,263 @@</span><br><span style="color: hsl(120, 100%, 40%);">+module RAW_NS {</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Osmocom NS test suite for NS in TTCN-3</span><br><span style="color: hsl(120, 100%, 40%);">+ * (C) 2018-2019 Harald Welte <laforge@gnumonks.org></span><br><span style="color: hsl(120, 100%, 40%);">+ * All rights reserved.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * Released under the terms of GNU General Public License, Version 2 or</span><br><span style="color: hsl(120, 100%, 40%);">+ * (at your option) any later version.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * SPDX-License-Identifier: GPL-2.0-or-later</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%);">+import from Misc_Helpers all;</span><br><span style="color: hsl(120, 100%, 40%);">+import from General_Types all;</span><br><span style="color: hsl(120, 100%, 40%);">+import from Osmocom_Types all;</span><br><span style="color: hsl(120, 100%, 40%);">+import from Osmocom_Gb_Types all;</span><br><span style="color: hsl(120, 100%, 40%);">+import from NS_CodecPort all;</span><br><span style="color: hsl(120, 100%, 40%);">+import from NS_Emulation all;</span><br><span style="color: hsl(120, 100%, 40%);">+import from NS_Types all;</span><br><span style="color: hsl(120, 100%, 40%);">+import from BSSGP_Types all;</span><br><span style="color: hsl(120, 100%, 40%);">+import from NS_CodecPort all;</span><br><span style="color: hsl(120, 100%, 40%);">+import from NS_CodecPort_CtrlFunct all;</span><br><span style="color: hsl(120, 100%, 40%);">+import from NS_Emulation all;</span><br><span style="color: hsl(120, 100%, 40%);">+import from Native_Functions all;</span><br><span style="color: hsl(120, 100%, 40%);">+import from IPL4asp_Types all;</span><br><span style="color: hsl(120, 100%, 40%);">+import from NS_Provider_IPL4 all;</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef NS_EMULATION_FR</span><br><span style="color: hsl(120, 100%, 40%);">+import from NS_Provider_FR all;</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+public type component RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* UDP port towards the bottom (IUT) */</span><br><span style="color: hsl(120, 100%, 40%);">+ port NS_PROVIDER_PT NSCP[4];</span><br><span style="color: hsl(120, 100%, 40%);">+ var NS_Provider_IPL4_CT vc_NSP_IP[4];</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef NS_EMULATION_FR</span><br><span style="color: hsl(120, 100%, 40%);">+ var NS_Provider_FR_CT vc_NSP_FR[4];</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+ var NSConfiguration g_nsconfig;</span><br><span style="color: hsl(120, 100%, 40%);">+ timer g_T_guard;</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%);">+public altstep as_Tguard() runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] g_T_guard.timeout {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Timeout of T_guard");</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%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+function f_init_ns_codec(NSConfiguration ns_config, integer idx := 0, float guard_secs := 60.0, charstring id := testcasename()) runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var Result res;</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)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ g_nsconfig := ns_config;</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 (ischosen(ns_config.nsvc[idx].provider.ip)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Connect the UDP socket */</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_NSP_IP[idx] := NS_Provider_IPL4_CT.create(id & "-provIP");</span><br><span style="color: hsl(120, 100%, 40%);">+ connect(self:NSCP[idx], vc_NSP_IP[idx]:NSE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_NSP_IP[idx].start(NS_Provider_IPL4.main(ns_config.nsvc[idx], ns_config, id));</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef NS_EMULATION_FR</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (ischosen(ns_config.nsvc[idx].provider.fr)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_NSP_FR[idx] := NS_Provider_FR_CT.create(id & "-provFR");</span><br><span style="color: hsl(120, 100%, 40%);">+ connect(self:NSCP[idx], vc_NSP_FR[idx]:NSE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_NSP_FR[idx].start(NS_Provider_FR.main(ns_config.nsvc[idx], ns_config, id));</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unsupported NS provider");</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%);">+ NSCP[idx].receive(NS_Provider_Evt:{link_status:=NS_PROV_LINK_STATUS_UP});</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%);">+function f_clean_ns_codec() runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (var integer i := 0; i < lengthof(vc_NSP_IP); i := i + 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_NSP_IP[i].stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef NS_EMULATION_FR</span><br><span style="color: hsl(120, 100%, 40%);">+ for (var integer i := 0; i < lengthof(vc_NSP_FR); i := i + 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_NSP_FR[i].stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+#endif NS_EMULATION_FR</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%);">+public altstep ax_rx_fail_on_any_ns(integer idx := 0) runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var PDU_NS nrf;</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[idx].receive(PDU_NS: ?) -> value nrf {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Received unexpected NS: ", nrf);</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%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</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 style="color: hsl(120, 100%, 40%);">+ var PDU_NS nrf;</span><br><span style="color: hsl(120, 100%, 40%);">+ log("f_ns_exp() expecting ", exp_rx);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* last activated altstep has the lowest priority */</span><br><span style="color: hsl(120, 100%, 40%);">+ var default d := activate(ax_rx_fail_on_any_ns());</span><br><span style="color: hsl(120, 100%, 40%);">+ alt {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[idx].receive(PDU_NS: exp_rx) -> value nrf { }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ deactivate(d);</span><br><span style="color: hsl(120, 100%, 40%);">+ return nrf;</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%);">+/* perform outbound NS-ALIVE procedure */</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_ALIVE);</span><br><span style="color: hsl(120, 100%, 40%);">+ alt {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[idx].receive(t_NS_ALIVE_ACK);</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[idx].receive { repeat; }</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 style="color: hsl(120, 100%, 40%);">+/* perform outbound NS-ALIVE procedure */</span><br><span style="color: hsl(120, 100%, 40%);">+function f_outgoing_ns_alive_no_ack(integer idx := 0, float tout := 10.0) runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ timer T := tout;</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(t_NS_ALIVE);</span><br><span style="color: hsl(120, 100%, 40%);">+ T.start;</span><br><span style="color: hsl(120, 100%, 40%);">+ alt {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[idx].receive(t_NS_ALIVE_ACK) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Received unexpected NS-ALIVE ACK");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[idx].receive { repeat; }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] T.timeout {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(pass);</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 style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+function f_outgoing_ns_reset(integer idx := 0, float tout := 10.0) runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ timer T := tout;</span><br><span style="color: hsl(120, 100%, 40%);">+ var template PDU_NS reset := ts_NS_RESET(NS_CAUSE_EQUIPMENT_FAILURE, g_nsconfig.nsvc[idx].nsvci, g_nsconfig.nsei)</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(reset);</span><br><span style="color: hsl(120, 100%, 40%);">+ T.start;</span><br><span style="color: hsl(120, 100%, 40%);">+ alt {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[idx].receive(ts_NS_RESET_ACK(g_nsconfig.nsvc[idx].nsvci, g_nsconfig.nsei)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[idx].receive { repeat; }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] T.timeout {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Failed to receive a RESET ACK");</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 style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* perform outbound NS-BLOCK procedure */</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(ts_NS_BLOCK(cause, g_nsconfig.nsvc[idx].nsvci));</span><br><span style="color: hsl(120, 100%, 40%);">+ alt {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[idx].receive(tr_NS_BLOCK_ACK(g_nsconfig.nsvc[idx].nsvci));</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[idx].receive { repeat; }</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 style="color: hsl(120, 100%, 40%);">+/* perform outbound NS-UNBLOCK procedure */</span><br><span style="color: hsl(120, 100%, 40%);">+function f_outgoing_ns_unblock(integer idx := 0) runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(t_NS_UNBLOCK);</span><br><span style="color: hsl(120, 100%, 40%);">+ alt {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[idx].receive(t_NS_UNBLOCK_ACK);</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[idx].receive { repeat; }</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 style="color: hsl(120, 100%, 40%);">+/* receive NS-ALIVE and ACK it */</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_ALIVE) {</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(t_NS_ALIVE_ACK);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not oneshot) { repeat; }</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 style="color: hsl(120, 100%, 40%);">+/* Transmit BSSGP RESET for given BVCI and expect ACK */</span><br><span style="color: hsl(120, 100%, 40%);">+function f_tx_bvc_reset_rx_ack(BssgpBvci bvci, template (omit) BssgpCellId tx_cell_id, template BssgpCellId rx_cell_id,</span><br><span style="color: hsl(120, 100%, 40%);">+ integer idx := 0, boolean exp_ack := true)</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_BSSGP bssgp_tx := valueof(ts_BVC_RESET(BSSGP_CAUSE_NET_SV_CAP_MOD_GT_ZERO_KBPS, bvci,</span><br><span style="color: hsl(120, 100%, 40%);">+ tx_cell_id));</span><br><span style="color: hsl(120, 100%, 40%);">+ timer T := 5.0;</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx)));</span><br><span style="color: hsl(120, 100%, 40%);">+ T.start;</span><br><span style="color: hsl(120, 100%, 40%);">+ alt {</span><br><span style="color: hsl(120, 100%, 40%);">+ [exp_ack] NSCP[idx].receive(tr_NS_UNITDATA(t_SduCtrlB, 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ decmatch tr_BVC_RESET_ACK(bvci, rx_cell_id))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [exp_ack] T.timeout {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "No response to BVC-RESET");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [not exp_ack] T.timeout {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[idx].receive { repeat; }</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 style="color: hsl(120, 100%, 40%);">+/* Receive a BSSGP RESET for given BVCI and ACK it */</span><br><span style="color: hsl(120, 100%, 40%);">+altstep as_rx_bvc_reset_tx_ack(BssgpBvci bvci, template BssgpCellId rx_cell_id, template (omit) BssgpCellId tx_cell_id,</span><br><span style="color: hsl(120, 100%, 40%);">+ boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var PDU_NS ns_rf;</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[idx].receive(tr_NS_UNITDATA(t_SduCtrlB, 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ decmatch tr_BVC_RESET(?, bvci, rx_cell_id)))</span><br><span style="color: hsl(120, 100%, 40%);">+ -> value ns_rf {</span><br><span style="color: hsl(120, 100%, 40%);">+ var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.pDU_NS_Unitdata.nS_SDU);</span><br><span style="color: hsl(120, 100%, 40%);">+ var PDU_BSSGP bssgp_tx := valueof(ts_BVC_RESET_ACK(bvci, tx_cell_id));</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx)));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not oneshot) { repeat; }</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 style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Receive a BSSGP UNBLOCK for given BVCI and ACK it */</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 style="color: hsl(120, 100%, 40%);">+ var PDU_NS ns_rf;</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[idx].receive(tr_NS_UNITDATA(t_SduCtrlB, 0, decmatch t_BVC_UNBLOCK(bvci))) -> value ns_rf {</span><br><span style="color: hsl(120, 100%, 40%);">+ var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.pDU_NS_Unitdata.nS_SDU);</span><br><span style="color: hsl(120, 100%, 40%);">+ var PDU_BSSGP bssgp_tx := valueof(t_BVC_UNBLOCK_ACK(bvci));</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx)));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not oneshot) { repeat; }</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 style="color: hsl(120, 100%, 40%);">+/* Receive a BSSGP FLOW-CONTROL-BVC and ACK it */</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 style="color: hsl(120, 100%, 40%);">+ var PDU_NS ns_rf;</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[idx].receive(tr_NS_UNITDATA(t_SduCtrlB, bvci,</span><br><span style="color: hsl(120, 100%, 40%);">+ decmatch tr_BVC_FC_BVC))</span><br><span style="color: hsl(120, 100%, 40%);">+ -> value ns_rf {</span><br><span style="color: hsl(120, 100%, 40%);">+ var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.pDU_NS_Unitdata.nS_SDU);</span><br><span style="color: hsl(120, 100%, 40%);">+ var OCT1 tag := bssgp_rx.pDU_BSSGP_FLOW_CONTROL_BVC.tag.unstructured_Value;</span><br><span style="color: hsl(120, 100%, 40%);">+ var PDU_BSSGP bssgp_tx := valueof(t_BVC_FC_BVC_ACK(tag));</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(ts_NS_UNITDATA(t_SduCtrlB, bvci, enc_PDU_BSSGP(bssgp_tx)));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not oneshot) { repeat; }</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 style="color: hsl(120, 100%, 40%);">+/**********************************************************************************</span><br><span style="color: hsl(120, 100%, 40%);">+ * Classic Gb/IP bring-up test cases using NS-{RESET,BLOCK,UNBLOCK} and no IP-SNS *</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%);">+/* Receive a NS-RESET and ACK it */</span><br><span style="color: hsl(120, 100%, 40%);">+public altstep as_rx_ns_reset_ack(boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var PDU_NS ns_rf;</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[idx].receive(tr_NS_RESET(NS_CAUSE_OM_INTERVENTION, g_nsconfig.nsvc[idx].nsvci,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_nsconfig.nsei)) -> value ns_rf {</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(ts_NS_RESET_ACK(g_nsconfig.nsvc[idx].nsvci, g_nsconfig.nsei));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not oneshot) { repeat; }</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%);">+/* Receive a NS-UNBLOCK and ACK it */</span><br><span style="color: hsl(120, 100%, 40%);">+public altstep as_rx_ns_unblock_ack(boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var PDU_NS ns_rf;</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[idx].receive(t_NS_UNBLOCK) -> value ns_rf {</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(t_NS_UNBLOCK_ACK);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not oneshot) { repeat; }</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 style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/pcu/PCU_Tests.cfg b/pcu/PCU_Tests.cfg</span><br><span>index dd6b111..13bedec 100644</span><br><span>--- a/pcu/PCU_Tests.cfg</span><br><span>+++ b/pcu/PCU_Tests.cfg</span><br><span>@@ -22,6 +22,30 @@</span><br><span> }</span><br><span> },</span><br><span> nsvci := 1234</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%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ip := {</span><br><span style="color: hsl(120, 100%, 40%);">+ address_family := AF_INET,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_ip := "127.0.0.1",</span><br><span style="color: hsl(120, 100%, 40%);">+ local_udp_port := 23001,</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "127.0.0.1",</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_udp_port := 22000</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%);">+ nsvci := 1234</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%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ip := {</span><br><span style="color: hsl(120, 100%, 40%);">+ address_family := AF_INET,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_ip := "127.0.0.1",</span><br><span style="color: hsl(120, 100%, 40%);">+ local_udp_port := 23002,</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "127.0.0.1",</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_udp_port := 22000</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%);">+ nsvci := 1234</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span>diff --git a/pcu/PCU_Tests_NS.ttcn b/pcu/PCU_Tests_NS.ttcn</span><br><span>index e782b6e..c4d46d1 100644</span><br><span>--- a/pcu/PCU_Tests_NS.ttcn</span><br><span>+++ b/pcu/PCU_Tests_NS.ttcn</span><br><span>@@ -70,7 +70,7 @@</span><br><span> timer T := tout;</span><br><span> T.start;</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP[idx].receive(t_NS_RecvFrom(ns)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[idx].receive(ns) {</span><br><span> setverdict(fail, "NS-ALIVE from unconfigured (possibly initial) endpoint");</span><br><span> }</span><br><span> [] T.timeout {</span><br><span>@@ -88,6 +88,7 @@</span><br><span> /* Expect inbound NS-RESET procedure */</span><br><span> as_rx_ns_reset_ack(oneshot := true);</span><br><span> setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_clean_ns_codec();</span><br><span> }</span><br><span> </span><br><span> /* ensure NS-RESET are re-transmitted */</span><br><span>@@ -97,13 +98,14 @@</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[0].receive(t_NS_RecvFrom(tr_NS_RESET(NS_CAUSE_OM_INTERVENTION,</span><br><span style="color: hsl(0, 100%, 40%);">- g_nsconfig[0].nsvc[0].nsvci, g_nsconfig[0].nsei)));</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[0].receive(tr_NS_RESET(NS_CAUSE_OM_INTERVENTION,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_nsconfig.nsvc[0].nsvci, g_nsconfig.nsei));</span><br><span> }</span><br><span> </span><br><span> /* Expect inbound NS-RESET procedure */</span><br><span> as_rx_ns_reset_ack(oneshot := true);</span><br><span> setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_clean_ns_codec();</span><br><span> }</span><br><span> </span><br><span> /* test the inbound NS-ALIVE procedure after NS-RESET */</span><br><span>@@ -116,9 +118,10 @@</span><br><span> </span><br><span> alt {</span><br><span> /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP[0].receive(t_NS_RecvFrom(t_NS_ALIVE)) { setverdict(pass); };</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP[0].receive(t_NS_RecvFrom(t_NS_UNBLOCK)) { repeat; }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[0].receive(t_NS_ALIVE) { setverdict(pass); };</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[0].receive(t_NS_UNBLOCK) { repeat; }</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ f_clean_ns_codec();</span><br><span> }</span><br><span> </span><br><span> /* Test for NS-RESET after NS-ALIVE timeout */</span><br><span>@@ -132,15 +135,17 @@</span><br><span> /* wait for at least one NS-ALIVE */</span><br><span> alt {</span><br><span> [] as_rx_alive_tx_ack(oneshot := true) { };</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP[0].receive(t_NS_RecvFrom(t_NS_UNBLOCK)) { repeat; }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[0].receive(t_NS_UNBLOCK) { repeat; }</span><br><span> }</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[0].receive(t_NS_RecvFrom(t_NS_ALIVE)) { repeat; }</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP[0].receive(t_NS_RecvFrom(t_NS_UNBLOCK)) { repeat; }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[0].receive(t_NS_ALIVE) { repeat; }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[0].receive(t_NS_UNBLOCK) { repeat; }</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_clean_ns_codec();</span><br><span> }</span><br><span> </span><br><span> /* test for NS-RESET/NS-ALIVE/NS-UNBLOCK */</span><br><span>@@ -156,6 +161,7 @@</span><br><span> </span><br><span> as_rx_ns_unblock_ack(oneshot := true);</span><br><span> setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_clean_ns_codec();</span><br><span> }</span><br><span> </span><br><span> /* test for NS-UNBLOCK re-transmissions */</span><br><span>@@ -170,11 +176,12 @@</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[0].receive(t_NS_RecvFrom(t_NS_UNBLOCK));</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[0].receive(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> setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_clean_ns_codec();</span><br><span> }</span><br><span> </span><br><span> /* full bring-up of the Gb link for NS and BSSGP layer up to BVC-FC */</span><br><span>@@ -205,6 +212,7 @@</span><br><span> as_rx_bvc_fc_tx_ack(mp_gb_cfg.bvc[0].bvci, oneshot := true);</span><br><span> activate(as_rx_bvc_fc_tx_ack(mp_gb_cfg.bvc[0].bvci));</span><br><span> setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_clean_ns_codec();</span><br><span> }</span><br><span> </span><br><span> /* test outbound (SGSN-originated) NS-BLOCK procedure */</span><br><span>@@ -224,6 +232,7 @@</span><br><span> </span><br><span> f_outgoing_ns_block(NS_CAUSE_EQUIPMENT_FAILURE);</span><br><span> setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_clean_ns_codec();</span><br><span> }</span><br><span> </span><br><span> </span><br><span>diff --git a/pcu/PCU_Tests_SNS.cfg b/pcu/PCU_Tests_SNS.cfg</span><br><span>index e5a08fe..ab589c5 100644</span><br><span>--- a/pcu/PCU_Tests_SNS.cfg</span><br><span>+++ b/pcu/PCU_Tests_SNS.cfg</span><br><span>@@ -21,6 +21,30 @@</span><br><span> }</span><br><span> },</span><br><span> nsvci := 1234</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%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ip := {</span><br><span style="color: hsl(120, 100%, 40%);">+ address_family := AF_INET,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_ip := "127.0.0.1",</span><br><span style="color: hsl(120, 100%, 40%);">+ local_udp_port := 23001,</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "127.0.0.1",</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_udp_port := 22000</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%);">+ nsvci := 1234</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%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ip := {</span><br><span style="color: hsl(120, 100%, 40%);">+ address_family := AF_INET,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_ip := "127.0.0.1",</span><br><span style="color: hsl(120, 100%, 40%);">+ local_udp_port := 23002,</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "127.0.0.1",</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_udp_port := 22000</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%);">+ nsvci := 1234</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span>diff --git a/pcu/PCU_Tests_SNS.ttcn b/pcu/PCU_Tests_SNS.ttcn</span><br><span>index ea78761..ad1858b 100644</span><br><span>--- a/pcu/PCU_Tests_SNS.ttcn</span><br><span>+++ b/pcu/PCU_Tests_SNS.ttcn</span><br><span>@@ -28,18 +28,18 @@</span><br><span> runs on RAW_NS_CT {</span><br><span> log("f_incoming_sns_size(idx=", idx, ")");</span><br><span> var PDU_NS rx;</span><br><span style="color: hsl(0, 100%, 40%);">- var NSVCConfiguration nsvc_cfg := g_nsconfig[idx].nsvc[0];</span><br><span style="color: hsl(120, 100%, 40%);">+ var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[idx];</span><br><span> </span><br><span> if (nsvc_cfg.provider.ip.address_family == AF_INET) {</span><br><span> /* expect one single SNS-SIZE with RESET flag; 4x v4 EP; no v6 EP */</span><br><span style="color: hsl(0, 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%);">+ rx := f_ns_exp(tr_SNS_SIZE(g_nsconfig.nsei, rst_flag := true, max_nsvcs := 8,</span><br><span> num_v4 := 4, num_v6 := omit), idx);</span><br><span> } else {</span><br><span> /* expect one single SNS-SIZE with RESET flag; no v4 EP; 4x v6 EP */</span><br><span style="color: hsl(0, 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%);">+ rx := f_ns_exp(tr_SNS_SIZE(g_nsconfig.nsei, rst_flag := true, max_nsvcs := 8,</span><br><span> num_v4 := omit, num_v6 := 4), idx);</span><br><span> }</span><br><span style="color: hsl(0, 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 style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(ts_SNS_SIZE_ACK(g_nsconfig.nsei, cause));</span><br><span> }</span><br><span> </span><br><span> /* perform outbound SNS-SIZE procedure */</span><br><span>@@ -47,19 +47,19 @@</span><br><span> runs on RAW_NS_CT {</span><br><span> log("f_outgoing_sns_size(idx=", idx, ")");</span><br><span> var PDU_NS rx;</span><br><span style="color: hsl(0, 100%, 40%);">- var NSVCConfiguration nsvc_cfg := g_nsconfig[idx].nsvc[0];</span><br><span style="color: hsl(120, 100%, 40%);">+ var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[idx];</span><br><span> </span><br><span> if (nsvc_cfg.provider.ip.address_family == AF_INET) {</span><br><span style="color: hsl(0, 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 style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(ts_SNS_SIZE(g_nsconfig.nsei, rst_flag := true, max_nsvcs := 1,</span><br><span> num_v4 := 1, num_v6 := omit)</span><br><span style="color: hsl(0, 100%, 40%);">- ));</span><br><span style="color: hsl(120, 100%, 40%);">+ );</span><br><span> } else {</span><br><span style="color: hsl(0, 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 style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(ts_SNS_SIZE(g_nsconfig.nsei, rst_flag := true, max_nsvcs := 1,</span><br><span> num_v4 := omit, num_v6 := 1)</span><br><span style="color: hsl(0, 100%, 40%);">- ));</span><br><span style="color: hsl(120, 100%, 40%);">+ );</span><br><span> }</span><br><span> /* expect one single SNS-SIZE with RESET flag; 4x v4 EP; no v6 EP */</span><br><span style="color: hsl(0, 100%, 40%);">- rx := f_ns_exp(tr_SNS_SIZE_ACK(g_nsconfig[idx].nsei, cause), idx);</span><br><span style="color: hsl(120, 100%, 40%);">+ rx := f_ns_exp(tr_SNS_SIZE_ACK(g_nsconfig.nsei, cause), idx);</span><br><span> }</span><br><span> </span><br><span> /* perform inbound SNS-CONFIG procedure */</span><br><span>@@ -67,18 +67,18 @@</span><br><span> runs on RAW_NS_CT {</span><br><span> log("f_incoming_sns_config(idx=", idx, ")");</span><br><span> var PDU_NS rx;</span><br><span style="color: hsl(0, 100%, 40%);">- var NSVCConfiguration nsvc_cfg := g_nsconfig[idx].nsvc[0];</span><br><span style="color: hsl(120, 100%, 40%);">+ var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[idx];</span><br><span> </span><br><span> if (nsvc_cfg.provider.ip.address_family == AF_INET) {</span><br><span> var template IP4_Elements v4_elem := { tr_SNS_IPv4(nsvc_cfg.provider.ip.remote_ip,</span><br><span> nsvc_cfg.provider.ip.remote_udp_port) };</span><br><span style="color: hsl(0, 100%, 40%);">- rx := f_ns_exp(tr_SNS_CONFIG(g_nsconfig[idx].nsei, end_flag := true, v4 := v4_elem), idx);</span><br><span style="color: hsl(120, 100%, 40%);">+ rx := f_ns_exp(tr_SNS_CONFIG(g_nsconfig.nsei, end_flag := true, v4 := v4_elem), idx);</span><br><span> } else {</span><br><span> var template IP6_Elements v6_elem := { tr_SNS_IPv6(nsvc_cfg.provider.ip.remote_ip,</span><br><span> nsvc_cfg.provider.ip.remote_udp_port) };</span><br><span style="color: hsl(0, 100%, 40%);">- rx := f_ns_exp(tr_SNS_CONFIG(g_nsconfig[idx].nsei, end_flag := true, v6 := v6_elem), idx);</span><br><span style="color: hsl(120, 100%, 40%);">+ rx := f_ns_exp(tr_SNS_CONFIG(g_nsconfig.nsei, end_flag := true, v6 := v6_elem), idx);</span><br><span> }</span><br><span style="color: hsl(0, 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 style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(ts_SNS_CONFIG_ACK(g_nsconfig.nsei, cause));</span><br><span> }</span><br><span> </span><br><span> /* perform outbound SNS-CONFIG procedure */</span><br><span>@@ -86,18 +86,18 @@</span><br><span> runs on RAW_NS_CT {</span><br><span> log("f_outgoing_sns_config(idx=", idx, ")");</span><br><span> var PDU_NS rx;</span><br><span style="color: hsl(0, 100%, 40%);">- var NSVCConfiguration nsvc_cfg := g_nsconfig[idx].nsvc[0];</span><br><span style="color: hsl(120, 100%, 40%);">+ var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[idx];</span><br><span> </span><br><span> if (nsvc_cfg.provider.ip.address_family == AF_INET) {</span><br><span> var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(nsvc_cfg.provider.ip.local_ip,</span><br><span> nsvc_cfg.provider.ip.local_udp_port) }</span><br><span style="color: hsl(0, 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%);">+ NSCP[idx].send(ts_SNS_CONFIG(g_nsconfig.nsei, true, v4));</span><br><span> } else {</span><br><span> var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(nsvc_cfg.provider.ip.local_ip,</span><br><span> nsvc_cfg.provider.ip.local_udp_port) }</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_CONFIG(g_nsconfig[idx].nsei, true, omit, v6)));</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(ts_SNS_CONFIG(g_nsconfig.nsei, true, omit, v6));</span><br><span> }</span><br><span style="color: hsl(0, 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%);">+ rx := f_ns_exp(tr_SNS_CONFIG_ACK(g_nsconfig.nsei, cause), idx);</span><br><span> }</span><br><span> </span><br><span> /* perform outbound SNS-CONFIG procedure (separate endpoints: 1 for control, 1 for user */</span><br><span>@@ -107,19 +107,19 @@</span><br><span> var PDU_NS rx;</span><br><span> </span><br><span> if (mp_nsconfig.nsvc[0].provider.ip.address_family == AF_INET) {</span><br><span style="color: hsl(0, 100%, 40%);">- var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[0].nsvc[0].provider.ip.local_ip,</span><br><span style="color: hsl(0, 100%, 40%);">- g_nsconfig[0].nsvc[0].provider.ip.local_udp_port, 1, 0),</span><br><span style="color: hsl(0, 100%, 40%);">- ts_SNS_IPv4(g_nsconfig[1].nsvc[0].provider.ip.local_ip,</span><br><span style="color: hsl(0, 100%, 40%);">- g_nsconfig[1].nsvc[0].provider.ip.local_udp_port, 0, 1) };</span><br><span style="color: hsl(0, 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%);">+ var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig.nsvc[0].provider.ip.local_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_nsconfig.nsvc[0].provider.ip.local_udp_port, 1, 0),</span><br><span style="color: hsl(120, 100%, 40%);">+ ts_SNS_IPv4(g_nsconfig.nsvc[1].provider.ip.local_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_nsconfig.nsvc[1].provider.ip.local_udp_port, 0, 1) };</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(ts_SNS_CONFIG(g_nsconfig.nsei, true, v4));</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(g_nsconfig[0].nsvc[0].provider.ip.local_ip,</span><br><span style="color: hsl(0, 100%, 40%);">- g_nsconfig[0].nsvc[0].provider.ip.local_udp_port, 1, 0),</span><br><span style="color: hsl(0, 100%, 40%);">- ts_SNS_IPv6(g_nsconfig[1].nsvc[0].provider.ip.local_ip,</span><br><span style="color: hsl(0, 100%, 40%);">- g_nsconfig[1].nsvc[0].provider.ip.local_udp_port, 0, 1) };</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_CONFIG(g_nsconfig[idx].nsei, true, omit, v6)));</span><br><span style="color: hsl(120, 100%, 40%);">+ var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(g_nsconfig.nsvc[0].provider.ip.local_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_nsconfig.nsvc[0].provider.ip.local_udp_port, 1, 0),</span><br><span style="color: hsl(120, 100%, 40%);">+ ts_SNS_IPv6(g_nsconfig.nsvc[1].provider.ip.local_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_nsconfig.nsvc[1].provider.ip.local_udp_port, 0, 1) };</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(ts_SNS_CONFIG(g_nsconfig.nsei, true, omit, v6));</span><br><span> }</span><br><span style="color: hsl(0, 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%);">+ rx := f_ns_exp(tr_SNS_CONFIG_ACK(g_nsconfig.nsei, cause), idx);</span><br><span> }</span><br><span> </span><br><span> /* perform outbound SNS-CONFIG procedure (separate endpoints: 1 for control, 1 for user */</span><br><span>@@ -128,38 +128,38 @@</span><br><span> log("f_outgoing_sns_config_1c1u_separate(idx=", idx, ")");</span><br><span> var PDU_NS rx;</span><br><span> if (mp_nsconfig.nsvc[0].provider.ip.address_family == AF_INET) {</span><br><span style="color: hsl(0, 100%, 40%);">- var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[1].nsvc[0].provider.ip.local_ip,</span><br><span style="color: hsl(0, 100%, 40%);">- g_nsconfig[1].nsvc[0].provider.ip.local_udp_port, 1, 0),</span><br><span style="color: hsl(0, 100%, 40%);">- ts_SNS_IPv4(g_nsconfig[2].nsvc[0].provider.ip.local_ip,</span><br><span style="color: hsl(0, 100%, 40%);">- g_nsconfig[2].nsvc[0].provider.ip.local_udp_port, 0, 1) };</span><br><span style="color: hsl(0, 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%);">+ var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig.nsvc[1].provider.ip.local_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_nsconfig.nsvc[1].provider.ip.local_udp_port, 1, 0),</span><br><span style="color: hsl(120, 100%, 40%);">+ ts_SNS_IPv4(g_nsconfig.nsvc[2].provider.ip.local_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_nsconfig.nsvc[2].provider.ip.local_udp_port, 0, 1) };</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(ts_SNS_CONFIG(g_nsconfig.nsei, true, v4));</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(g_nsconfig[1].nsvc[0].provider.ip.local_ip,</span><br><span style="color: hsl(0, 100%, 40%);">- g_nsconfig[1].nsvc[0].provider.ip.local_udp_port, 1, 0),</span><br><span style="color: hsl(0, 100%, 40%);">- ts_SNS_IPv6(g_nsconfig[2].nsvc[0].provider.ip.local_ip,</span><br><span style="color: hsl(0, 100%, 40%);">- g_nsconfig[2].nsvc[0].provider.ip.local_udp_port, 0, 1) };</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_CONFIG(g_nsconfig[idx].nsei, true, omit, v6)));</span><br><span style="color: hsl(120, 100%, 40%);">+ var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(g_nsconfig.nsvc[1].provider.ip.local_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_nsconfig.nsvc[1].provider.ip.local_udp_port, 1, 0),</span><br><span style="color: hsl(120, 100%, 40%);">+ ts_SNS_IPv6(g_nsconfig.nsvc[2].provider.ip.local_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_nsconfig.nsvc[2].provider.ip.local_udp_port, 0, 1) };</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(ts_SNS_CONFIG(g_nsconfig.nsei, true, omit, v6));</span><br><span> }</span><br><span style="color: hsl(0, 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%);">+ rx := f_ns_exp(tr_SNS_CONFIG_ACK(g_nsconfig.nsei, cause), idx);</span><br><span> }</span><br><span> </span><br><span> function f_outgoing_sns_add(integer idx_add, uint8_t w_sig := 1, uint8_t w_user := 1, integer idx := 0, template (omit) NsCause cause := omit)</span><br><span> runs on RAW_NS_CT {</span><br><span> log("f_outgoing_sns_add(idx_add=", idx_add, ")");</span><br><span> var PDU_NS rx;</span><br><span style="color: hsl(0, 100%, 40%);">- var NSVCConfiguration nsvc_cfg := g_nsconfig[idx_add].nsvc[0];</span><br><span style="color: hsl(120, 100%, 40%);">+ var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[idx_add];</span><br><span> if (nsvc_cfg.provider.ip.address_family == AF_INET) {</span><br><span> var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(nsvc_cfg.provider.ip.local_ip,</span><br><span> nsvc_cfg.provider.ip.local_udp_port,</span><br><span> w_sig, w_user) };</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_ADD(g_nsconfig[idx].nsei, 23, v4)));</span><br><span style="color: hsl(0, 100%, 40%);">- rx := f_ns_exp(tr_SNS_ACK(g_nsconfig[idx].nsei, 23, cause, v4));</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(ts_SNS_ADD(g_nsconfig.nsei, 23, v4));</span><br><span style="color: hsl(120, 100%, 40%);">+ rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 23, cause, v4));</span><br><span> } else {</span><br><span> var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(nsvc_cfg.provider.ip.local_ip,</span><br><span> nsvc_cfg.provider.ip.local_udp_port,</span><br><span> w_sig, w_user) };</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_ADD(g_nsconfig[idx].nsei, 23, omit, v6)));</span><br><span style="color: hsl(0, 100%, 40%);">- rx := f_ns_exp(tr_SNS_ACK(g_nsconfig[idx].nsei, 23, cause, omit, v6));</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(ts_SNS_ADD(g_nsconfig.nsei, 23, omit, v6));</span><br><span style="color: hsl(120, 100%, 40%);">+ rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 23, cause, omit, v6));</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -167,19 +167,19 @@</span><br><span> runs on RAW_NS_CT {</span><br><span> log("f_outgoing_sns_del(idx_del=", idx_del, ")");</span><br><span> var PDU_NS rx;</span><br><span style="color: hsl(0, 100%, 40%);">- var NSVCConfiguration nsvc_cfg := g_nsconfig[idx_del].nsvc[0];</span><br><span style="color: hsl(120, 100%, 40%);">+ var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[idx_del];</span><br><span> if (nsvc_cfg.provider.ip.address_family == AF_INET) {</span><br><span> var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(nsvc_cfg.provider.ip.local_ip,</span><br><span> nsvc_cfg.provider.ip.local_udp_port,</span><br><span> w_sig, w_user) };</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_DEL(g_nsconfig[idx].nsei, 24, omit, v4)));</span><br><span style="color: hsl(0, 100%, 40%);">- rx := f_ns_exp(tr_SNS_ACK(g_nsconfig[idx].nsei, 24, omit, v4));</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(ts_SNS_DEL(g_nsconfig.nsei, 24, omit, v4));</span><br><span style="color: hsl(120, 100%, 40%);">+ rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 24, omit, v4));</span><br><span> } else {</span><br><span> var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(nsvc_cfg.provider.ip.local_ip,</span><br><span> nsvc_cfg.provider.ip.local_udp_port,</span><br><span> w_sig, w_user) };</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_DEL(g_nsconfig[idx].nsei, 24, omit, omit, v6)));</span><br><span style="color: hsl(0, 100%, 40%);">- rx := f_ns_exp(tr_SNS_ACK(g_nsconfig[idx].nsei, 24, omit, omit, v6));</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(ts_SNS_DEL(g_nsconfig.nsei, 24, omit, omit, v6));</span><br><span style="color: hsl(120, 100%, 40%);">+ rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 24, omit, omit, v6));</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -187,19 +187,19 @@</span><br><span> runs on RAW_NS_CT {</span><br><span> log("f_outgoing_sns_chg_weight(idx_chg=", idx_chg, ")");</span><br><span> var PDU_NS rx;</span><br><span style="color: hsl(0, 100%, 40%);">- var NSVCConfiguration nsvc_cfg := g_nsconfig[idx_chg].nsvc[0];</span><br><span style="color: hsl(120, 100%, 40%);">+ var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[idx_chg];</span><br><span> if (nsvc_cfg.provider.ip.address_family == AF_INET) {</span><br><span> var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(nsvc_cfg.provider.ip.local_ip,</span><br><span> nsvc_cfg.provider.ip.local_udp_port,</span><br><span> w_sig, w_user) };</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_CHG_WEIGHT(g_nsconfig[idx].nsei, 25, v4)));</span><br><span style="color: hsl(0, 100%, 40%);">- rx := f_ns_exp(tr_SNS_ACK(g_nsconfig[idx].nsei, 25, omit, v4));</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(ts_SNS_CHG_WEIGHT(g_nsconfig.nsei, 25, v4));</span><br><span style="color: hsl(120, 100%, 40%);">+ rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 25, omit, v4));</span><br><span> } else {</span><br><span> var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(nsvc_cfg.provider.ip.local_ip,</span><br><span> nsvc_cfg.provider.ip.local_udp_port,</span><br><span> w_sig, w_user) };</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_CHG_WEIGHT(g_nsconfig[idx].nsei, 25, omit, v6)));</span><br><span style="color: hsl(0, 100%, 40%);">- rx := f_ns_exp(tr_SNS_ACK(g_nsconfig[idx].nsei, 25, omit, omit, v6));</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[idx].send(ts_SNS_CHG_WEIGHT(g_nsconfig.nsei, 25, omit, v6));</span><br><span style="color: hsl(120, 100%, 40%);">+ rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 25, omit, omit, v6));</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -214,6 +214,7 @@</span><br><span> f_incoming_sns_size();</span><br><span> f_sleep(1.0);</span><br><span> setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_clean_ns_codec();</span><br><span> }</span><br><span> </span><br><span> /* PCU-originated SNS-SIZE: NACK from our side */</span><br><span>@@ -225,6 +226,7 @@</span><br><span> /* FIXME: ensure we get re-transmitted SNS-SIZE attempts */</span><br><span> f_sleep(10.0);</span><br><span> setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_clean_ns_codec();</span><br><span> }</span><br><span> </span><br><span> /* PCU-originated SNS-CONFIG: successful case */</span><br><span>@@ -235,6 +237,7 @@</span><br><span> f_incoming_sns_config();</span><br><span> f_sleep(1.0);</span><br><span> setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_clean_ns_codec();</span><br><span> }</span><br><span> </span><br><span> /* PCU-originated SNS-CONFIG: successful case */</span><br><span>@@ -246,6 +249,7 @@</span><br><span> /* FIXME: ensure we get re-transmitted SNS-CONFIG attempts */</span><br><span> f_sleep(10.0);</span><br><span> setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_clean_ns_codec();</span><br><span> }</span><br><span> </span><br><span> </span><br><span>@@ -272,6 +276,7 @@</span><br><span> as_rx_bvc_fc_tx_ack(mp_gb_cfg.bvc[0].bvci, oneshot := true);</span><br><span> activate(as_rx_bvc_fc_tx_ack(mp_gb_cfg.bvc[0].bvci));</span><br><span> setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_clean_ns_codec();</span><br><span> }</span><br><span> </span><br><span> private function f_sns_bringup_1c1u(boolean sgsn_originated_reset := false) runs on RAW_Test_CT {</span><br><span>@@ -327,6 +332,7 @@</span><br><span> testcase TC_sns_1c1u() runs on RAW_Test_CT {</span><br><span> f_sns_bringup_1c1u();</span><br><span> setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_clean_ns_codec();</span><br><span> }</span><br><span> </span><br><span> private function f_sns_bringup_1c1u_separate(boolean sgsn_originated_reset := false) runs on RAW_Test_CT {</span><br><span>@@ -387,6 +393,7 @@</span><br><span> testcase TC_sns_1c1u_separate() runs on RAW_Test_CT {</span><br><span> f_sns_bringup_1c1u_separate();</span><br><span> setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_clean_ns_codec();</span><br><span> }</span><br><span> </span><br><span> /* Test full IP-SNS bring-up with two NS-VCs, one sig-only and one user-only and use</span><br><span>@@ -394,6 +401,7 @@</span><br><span> testcase TC_sns_1c1u_so_bvc_reset() runs on RAW_Test_CT {</span><br><span> f_sns_bringup_1c1u_separate(sgsn_originated_reset := true);</span><br><span> setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_clean_ns_codec();</span><br><span> }</span><br><span> </span><br><span> /* Transmit BVC-RESET before NS-ALIVE of PCU was ACKed: expect no response */</span><br><span>@@ -420,6 +428,7 @@</span><br><span> /* Transmit BVC-RESET and expect no ACK*/</span><br><span> f_tx_bvc_reset_rx_ack(0, omit, omit, idx := 1, exp_ack := false);</span><br><span> f_tx_bvc_reset_rx_ack(mp_gb_cfg.bvc[0].bvci, omit, mp_gb_cfg.bvc[0].cell_id, idx := 1, exp_ack := false);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_clean_ns_codec();</span><br><span> }</span><br><span> </span><br><span> /* Test adding new IP endpoints at runtime */</span><br><span>@@ -437,6 +446,7 @@</span><br><span> </span><br><span> f_outgoing_ns_alive(2);</span><br><span> setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_clean_ns_codec();</span><br><span> }</span><br><span> </span><br><span> /* Test adding an already present IP endpoint at runtime */</span><br><span>@@ -445,6 +455,7 @@</span><br><span> </span><br><span> f_outgoing_sns_add(idx_add := 0, w_sig := 0, w_user := 1, idx := 0, cause := NS_CAUSE_PROTOCOL_ERROR_UNSPEIFIED);</span><br><span> setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_clean_ns_codec();</span><br><span> }</span><br><span> </span><br><span> /* Test deleting IP endpoints at runtime */</span><br><span>@@ -454,6 +465,7 @@</span><br><span> f_outgoing_sns_del(idx_del := 1, w_sig := 0, w_user := 1, idx := 0);</span><br><span> /* FIXME: ensure we don't receive anything on just-deleted NS-VC anymore */</span><br><span> setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_clean_ns_codec();</span><br><span> }</span><br><span> </span><br><span> /* Test changing weights at runtime */</span><br><span>@@ -463,6 +475,7 @@</span><br><span> /* change w_user from 1 to 200 */</span><br><span> f_outgoing_sns_chg_weight(idx_chg := 1, w_sig := 0, w_user := 200, idx := 0);</span><br><span> setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_clean_ns_codec();</span><br><span> }</span><br><span> </span><br><span> import from PCUIF_Types all;</span><br><span>@@ -485,6 +498,7 @@</span><br><span> tr_PCUIF_DATA_REQ(bts_nr:=0, trx_nr:=0, ts_nr:=0, block_nr:=?, fn:=?,</span><br><span> sapi:=PCU_IF_SAPI_AGCH, data:=?)));</span><br><span> setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_clean_ns_codec();</span><br><span> }</span><br><span> </span><br><span> </span><br><span>diff --git a/pcu/SGSN_Components.ttcn b/pcu/SGSN_Components.ttcn</span><br><span>index 18f3992..08d9231 100644</span><br><span>--- a/pcu/SGSN_Components.ttcn</span><br><span>+++ b/pcu/SGSN_Components.ttcn</span><br><span>@@ -55,6 +55,30 @@</span><br><span> }</span><br><span> },</span><br><span> nsvci := 0</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%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ip := {</span><br><span style="color: hsl(120, 100%, 40%);">+ address_family := AF_INET,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_udp_port := 23001,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_ip := "127.0.0.1",</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_udp_port := 21000,</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "127.0.0.1"</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%);">+ nsvci := 0</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%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ip := {</span><br><span style="color: hsl(120, 100%, 40%);">+ address_family := AF_INET,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_udp_port := 23002,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_ip := "127.0.0.1",</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_udp_port := 21000,</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "127.0.0.1"</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%);">+ nsvci := 0</span><br><span> }</span><br><span> }</span><br><span> };</span><br><span>diff --git a/pcu/gen_links.sh b/pcu/gen_links.sh</span><br><span>index a33cb27..c2a8189 100755</span><br><span>--- a/pcu/gen_links.sh</span><br><span>+++ b/pcu/gen_links.sh</span><br><span>@@ -54,7 +54,7 @@</span><br><span> FILES+="NS_Provider_IPL4.ttcn NS_Emulation.ttcnpp NS_CodecPort.ttcn NS_CodecPort_CtrlFunct.ttcn NS_CodecPort_CtrlFunctDef.cc "</span><br><span> FILES+="BSSGP_Emulation.ttcnpp Osmocom_Gb_Types.ttcn "</span><br><span> FILES+="LLC_Templates.ttcn L3_Templates.ttcn L3_Common.ttcn "</span><br><span style="color: hsl(0, 100%, 40%);">-FILES+="PCUIF_Types.ttcn PCUIF_CodecPort.ttcn RAW_NS.ttcn "</span><br><span style="color: hsl(120, 100%, 40%);">+FILES+="PCUIF_Types.ttcn PCUIF_CodecPort.ttcn RAW_NS.ttcnpp "</span><br><span> gen_links $DIR $FILES</span><br><span> </span><br><span> ignore_pp_results</span><br><span>diff --git a/sgsn/SGSN_Tests_NS.ttcn b/sgsn/SGSN_Tests_NS.ttcn</span><br><span>index cce32cc..1715404 100644</span><br><span>--- a/sgsn/SGSN_Tests_NS.ttcn</span><br><span>+++ b/sgsn/SGSN_Tests_NS.ttcn</span><br><span>@@ -23,31 +23,31 @@</span><br><span> </span><br><span> testcase TC_NS_connect_reset() runs on RAW_Test_CT {</span><br><span> f_init_vty();</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_ns_codec(mp_nsconfig[0], guard_secs := 10.0, tc_offset := 10);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_ns_codec(mp_nsconfig[0], guard_secs := 10.0);</span><br><span> f_vty_config(SGSNVTY, "ns", "encapsulation udp use-reset-block-unblock enabled");</span><br><span> </span><br><span> /* Send a NS-ALIVE */</span><br><span> f_outgoing_ns_reset();</span><br><span> </span><br><span> f_sleep(1.0);</span><br><span style="color: hsl(0, 100%, 40%);">- f_cleanup();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_clean_ns_codec();</span><br><span> }</span><br><span> </span><br><span> testcase TC_NS_connect_alive() runs on RAW_Test_CT {</span><br><span> f_init_vty();</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_ns_codec(mp_nsconfig[0], guard_secs := 10.0, tc_offset := 20);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_ns_codec(mp_nsconfig[0], guard_secs := 10.0);</span><br><span> f_vty_config(SGSNVTY, "ns", "encapsulation udp use-reset-block-unblock disabled");</span><br><span> </span><br><span> /* Send a NS-ALIVE */</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP[0].send(t_NS_Send(g_ns_conn_id[0], t_NS_ALIVE));</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP[0].send(t_NS_ALIVE);</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP[0].receive(t_NS_RecvFrom(t_NS_ALIVE_ACK));</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP[0].receive(t_NS_RecvFrom(tr_NS_STATUS(*))) { setverdict(fail); }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[0].receive(t_NS_ALIVE_ACK);</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP[0].receive(tr_NS_STATUS(*)) { setverdict(fail); }</span><br><span> [] NSCP[0].receive { repeat; }</span><br><span> }</span><br><span> </span><br><span> f_sleep(1.0);</span><br><span style="color: hsl(0, 100%, 40%);">- f_cleanup();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_clean_ns_codec();</span><br><span> }</span><br><span> </span><br><span> control {</span><br><span>diff --git a/sgsn/gen_links.sh b/sgsn/gen_links.sh</span><br><span>index 47baa54..78cda26 100755</span><br><span>--- a/sgsn/gen_links.sh</span><br><span>+++ b/sgsn/gen_links.sh</span><br><span>@@ -92,7 +92,7 @@</span><br><span> FILES+="RAN_Emulation.ttcnpp RAN_Adapter.ttcnpp SCCP_Templates.ttcn "</span><br><span> # IPA_Emulation + dependencies</span><br><span> FILES+="IPA_Types.ttcn IPA_Emulation.ttcnpp IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc Native_Functions.ttcn Native_FunctionDefs.cc GSUP_Types.ttcn GSUP_Emulation.ttcn "</span><br><span style="color: hsl(0, 100%, 40%);">-FILES+="GTP_CodecPort.ttcn GTP_CodecPort_CtrlFunct.ttcn GTP_CodecPort_CtrlFunctDef.cc GTP_Emulation.ttcn GTP_Templates.ttcn IPCP_Types.ttcn RAW_NS.ttcn "</span><br><span style="color: hsl(120, 100%, 40%);">+FILES+="GTP_CodecPort.ttcn GTP_CodecPort_CtrlFunct.ttcn GTP_CodecPort_CtrlFunctDef.cc GTP_Emulation.ttcn GTP_Templates.ttcn IPCP_Types.ttcn RAW_NS.ttcnpp "</span><br><span> gen_links $DIR $FILES</span><br><span> </span><br><span> ignore_pp_results</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22090">change 22090</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/c/osmo-ttcn3-hacks/+/22090"/><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-Change-Id: I8a3b6c72798a75f434f54229fdbfc802cd13967e </div>
<div style="display:none"> Gerrit-Change-Number: 22090 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>