<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13009">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: Move SNS specific functions to PCU_Tests_RAW_SNS.ttcn<br><br>Change-Id: Ie41a21b6f2b95f4aaea84d8b717e96efefb704e3<br>RelateD: OS#3372<br>---<br>M pcu/PCU_Tests_RAW.ttcn<br>M pcu/PCU_Tests_RAW_SNS.ttcn<br>2 files changed, 38 insertions(+), 35 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 eb06088..3640b01 100644</span><br><span>--- a/pcu/PCU_Tests_RAW.ttcn</span><br><span>+++ b/pcu/PCU_Tests_RAW.ttcn</span><br><span>@@ -96,41 +96,6 @@</span><br><span> return nrf.msg;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* 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(0, 100%, 40%);">- var PDU_NS rx;</span><br><span style="color: hsl(0, 100%, 40%);">- /* 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(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* 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(0, 100%, 40%);">- 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(0, 100%, 40%);">- num_v4 := 1, num_v6 := omit)</span><br><span style="color: hsl(0, 100%, 40%);">- ));</span><br><span style="color: hsl(0, 100%, 40%);">- /* 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(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* 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(0, 100%, 40%);">- 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(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* 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(0, 100%, 40%);">- 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(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* perform outbound NS-ALIVE procedure */</span><br><span> function f_outgoing_ns_alive() runs on RAW_NS_CT {</span><br><span> NSCP.send(t_NS_Send(g_ns_conn_id, t_NS_ALIVE));</span><br><span>diff --git a/pcu/PCU_Tests_RAW_SNS.ttcn b/pcu/PCU_Tests_RAW_SNS.ttcn</span><br><span>index fa906a8..a306fe4 100644</span><br><span>--- a/pcu/PCU_Tests_RAW_SNS.ttcn</span><br><span>+++ b/pcu/PCU_Tests_RAW_SNS.ttcn</span><br><span>@@ -3,11 +3,49 @@</span><br><span> import from Osmocom_Types all;</span><br><span> import from PCU_Tests all;</span><br><span> import from PCU_Tests_RAW 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_Types all;</span><br><span> </span><br><span> /**********************************************************************************</span><br><span> * Modern Gb/IP bring-up test cases using IP Sub-Network Service (SNS)</span><br><span> **********************************************************************************/</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* perform inbound SNS-SIZE procedure */</span><br><span style="color: hsl(120, 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%);">+ var PDU_NS rx;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* expect one single SNS-SIZE with RESET flag; one remote v4 EP; no v6 EP */</span><br><span style="color: hsl(120, 100%, 40%);">+ rx := f_ns_exp(tr_SNS_SIZE(mp_nsconfig.nsei, rst_flag := true, max_nsvcs := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ num_v4 := 1, num_v6 := omit));</span><br><span style="color: hsl(120, 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%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* perform outbound SNS-SIZE procedure */</span><br><span style="color: hsl(120, 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%);">+ var PDU_NS rx;</span><br><span style="color: hsl(120, 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%);">+ num_v4 := 1, num_v6 := omit)</span><br><span style="color: hsl(120, 100%, 40%);">+ ));</span><br><span style="color: hsl(120, 100%, 40%);">+ /* expect one single SNS-SIZE with RESET flag; one remote v4 EP; no v6 EP */</span><br><span style="color: hsl(120, 100%, 40%);">+ rx := f_ns_exp(tr_SNS_SIZE_ACK(mp_nsconfig.nsei, cause));</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 inbound SNS-CONFIG procedure */</span><br><span style="color: hsl(120, 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%);">+ var PDU_NS rx;</span><br><span style="color: hsl(120, 100%, 40%);">+ rx := f_ns_exp(tr_SNS_CONFIG(mp_nsconfig.nsei, end_flag := true, v4 := ?));</span><br><span style="color: hsl(120, 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%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* perform outbound SNS-CONFIG procedure */</span><br><span style="color: hsl(120, 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%);">+ var PDU_NS rx;</span><br><span style="color: hsl(120, 100%, 40%);">+ var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(mp_nsconfig.local_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ mp_nsconfig.local_udp_port) }</span><br><span style="color: hsl(120, 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(120, 100%, 40%);">+ rx := f_ns_exp(tr_SNS_CONFIG_ACK(mp_nsconfig.nsei, cause));</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/13009">change 13009</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/13009"/><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: Ie41a21b6f2b95f4aaea84d8b717e96efefb704e3 </div>
<div style="display:none"> Gerrit-Change-Number: 13009 </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>