<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13097">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">PCU: Split RAW_PCU_CT from RAW_NS_CT<br><br>Let's split the PCUIF-side component from the NS-side component<br>and create a new RAW_Test_CT which derives from both.<br><br>Change-Id: I15021c5dea16e39a530d8d9080e37a7f2a6c4fa7<br>---<br>M pcu/PCU_Tests_RAW.ttcn<br>M pcu/PCU_Tests_RAW_SNS.ttcn<br>2 files changed, 24 insertions(+), 19 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 397e895..923b086 100644</span><br><span>--- a/pcu/PCU_Tests_RAW.ttcn</span><br><span>+++ b/pcu/PCU_Tests_RAW.ttcn</span><br><span>@@ -34,12 +34,17 @@</span><br><span> var ConnectionId g_ns_conn_id[4] := {-1, -1, -1, -1};</span><br><span> var NSConfiguration g_nsconfig[4];</span><br><span> timer g_T_guard;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+type component RAW_PCU_CT {</span><br><span> /* PCUIF (we emulate the BTS part) */</span><br><span> port PCUIF_CODEC_PT PCU;</span><br><span> var ConnectionId g_pcu_conn_id := -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+type component RAW_Test_CT extends RAW_NS_CT, RAW_PCU_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> private altstep as_Tguard() runs on RAW_NS_CT {</span><br><span> [] g_T_guard.timeout {</span><br><span> setverdict(fail, "Timeout of T_guard");</span><br><span>@@ -47,7 +52,7 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-function f_init_pcuif() runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+function f_init_pcuif() runs on RAW_PCU_CT {</span><br><span> map(self:PCU, system:PCU);</span><br><span> </span><br><span> /* Connect the Unix Domain Socket */</span><br><span>@@ -202,7 +207,7 @@</span><br><span> }</span><br><span> </span><br><span> /* test the NS-RESET procedure */</span><br><span style="color: hsl(0, 100%, 40%);">-testcase TC_ns_reset() runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_ns_reset() runs on RAW_Test_CT {</span><br><span> f_init_ns_codec();</span><br><span> f_init_pcuif();</span><br><span> </span><br><span>@@ -213,7 +218,7 @@</span><br><span> }</span><br><span> </span><br><span> /* ensure NS-RESET are re-transmitted */</span><br><span style="color: hsl(0, 100%, 40%);">-testcase TC_ns_reset_retrans() runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_ns_reset_retrans() runs on RAW_Test_CT {</span><br><span> f_init_ns_codec();</span><br><span> f_init_pcuif();</span><br><span> </span><br><span>@@ -229,7 +234,7 @@</span><br><span> }</span><br><span> </span><br><span> /* test the inbound NS-ALIVE procedure after NS-RESET */</span><br><span style="color: hsl(0, 100%, 40%);">-testcase TC_ns_alive() runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_ns_alive() runs on RAW_Test_CT {</span><br><span> f_init_ns_codec();</span><br><span> f_init_pcuif();</span><br><span> </span><br><span>@@ -242,7 +247,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Test for NS-RESET after NS-ALIVE timeout */</span><br><span style="color: hsl(0, 100%, 40%);">-testcase TC_ns_alive_timeout_reset() runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_ns_alive_timeout_reset() runs on RAW_Test_CT {</span><br><span> f_init_ns_codec(guard_secs := 100.0);</span><br><span> f_init_pcuif();</span><br><span> </span><br><span>@@ -260,7 +265,7 @@</span><br><span> }</span><br><span> </span><br><span> /* test for NS-RESET/NS-ALIVE/NS-UNBLOCK */</span><br><span style="color: hsl(0, 100%, 40%);">-testcase TC_ns_unblock() runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_ns_unblock() runs on RAW_Test_CT {</span><br><span> f_init_ns_codec();</span><br><span> f_init_pcuif();</span><br><span> </span><br><span>@@ -276,7 +281,7 @@</span><br><span> }</span><br><span> </span><br><span> /* test for NS-UNBLOCK re-transmissions */</span><br><span style="color: hsl(0, 100%, 40%);">-testcase TC_ns_unblock_retrans() runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_ns_unblock_retrans() runs on RAW_Test_CT {</span><br><span> f_init_ns_codec();</span><br><span> f_init_pcuif();</span><br><span> </span><br><span>@@ -296,7 +301,7 @@</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 style="color: hsl(0, 100%, 40%);">-testcase TC_ns_full_bringup() runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_ns_full_bringup() runs on RAW_Test_CT {</span><br><span> f_init_ns_codec();</span><br><span> f_init_pcuif();</span><br><span> </span><br><span>@@ -323,7 +328,7 @@</span><br><span> }</span><br><span> </span><br><span> /* test outbound (SGSN-originated) NS-BLOCK procedure */</span><br><span style="color: hsl(0, 100%, 40%);">-testcase TC_ns_so_block() runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_ns_so_block() runs on RAW_Test_CT {</span><br><span> f_init_ns_codec();</span><br><span> f_init_pcuif();</span><br><span> </span><br><span>diff --git a/pcu/PCU_Tests_RAW_SNS.ttcn b/pcu/PCU_Tests_RAW_SNS.ttcn</span><br><span>index 2369b04..5a370d9 100644</span><br><span>--- a/pcu/PCU_Tests_RAW_SNS.ttcn</span><br><span>+++ b/pcu/PCU_Tests_RAW_SNS.ttcn</span><br><span>@@ -105,7 +105,7 @@</span><br><span> </span><br><span> </span><br><span> /* PCU-originated SNS-SIZE: successful case */</span><br><span style="color: hsl(0, 100%, 40%);">-testcase TC_sns_po_size_success() runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_sns_po_size_success() runs on RAW_Test_CT {</span><br><span> f_init_ns_codec();</span><br><span> f_init_pcuif();</span><br><span> f_incoming_sns_size();</span><br><span>@@ -114,7 +114,7 @@</span><br><span> }</span><br><span> </span><br><span> /* PCU-originated SNS-SIZE: NACK from our side */</span><br><span style="color: hsl(0, 100%, 40%);">-testcase TC_sns_po_size_nack() runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_sns_po_size_nack() runs on RAW_Test_CT {</span><br><span> f_init_ns_codec();</span><br><span> f_init_pcuif();</span><br><span> f_incoming_sns_size(NS_CAUSE_PROTOCOL_ERROR_UNSPEIFIED);</span><br><span>@@ -125,7 +125,7 @@</span><br><span> }</span><br><span> </span><br><span> /* PCU-originated SNS-CONFIG: successful case */</span><br><span style="color: hsl(0, 100%, 40%);">-testcase TC_sns_po_config_success() runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_sns_po_config_success() runs on RAW_Test_CT {</span><br><span> f_init_ns_codec();</span><br><span> f_init_pcuif();</span><br><span> f_incoming_sns_size();</span><br><span>@@ -135,7 +135,7 @@</span><br><span> }</span><br><span> </span><br><span> /* PCU-originated SNS-CONFIG: successful case */</span><br><span style="color: hsl(0, 100%, 40%);">-testcase TC_sns_po_config_nack() runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_sns_po_config_nack() runs on RAW_Test_CT {</span><br><span> f_init_ns_codec();</span><br><span> f_init_pcuif();</span><br><span> f_incoming_sns_size();</span><br><span>@@ -147,7 +147,7 @@</span><br><span> </span><br><span> </span><br><span> /* SGSN-originated SNS-SIZE: successful case */</span><br><span style="color: hsl(0, 100%, 40%);">-testcase TC_sns_so_config_success() runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_sns_so_config_success() runs on RAW_Test_CT {</span><br><span> f_init_ns_codec();</span><br><span> f_init_pcuif();</span><br><span> f_incoming_sns_size();</span><br><span>@@ -171,7 +171,7 @@</span><br><span> setverdict(pass);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-private function f_sns_bringup_1c1u() runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_sns_bringup_1c1u() runs on RAW_Test_CT {</span><br><span> /* Activate two NS codec ports */</span><br><span> f_init_ns_codec();</span><br><span> f_init_ns_codec(1);</span><br><span>@@ -206,13 +206,13 @@</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 */</span><br><span style="color: hsl(0, 100%, 40%);">-testcase TC_sns_1c1u() runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_sns_1c1u() runs on RAW_Test_CT {</span><br><span> f_sns_bringup_1c1u();</span><br><span> setverdict(pass);</span><br><span> }</span><br><span> </span><br><span> /* Test adding new IP endpoints at runtime */</span><br><span style="color: hsl(0, 100%, 40%);">-testcase TC_sns_add() runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_sns_add() runs on RAW_Test_CT {</span><br><span> f_sns_bringup_1c1u();</span><br><span> </span><br><span> /* crate another NS codec port on the tester side */</span><br><span>@@ -230,7 +230,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Test deleting IP endpoints at runtime */</span><br><span style="color: hsl(0, 100%, 40%);">-testcase TC_sns_del() runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_sns_del() runs on RAW_Test_CT {</span><br><span> f_sns_bringup_1c1u();</span><br><span> </span><br><span> f_outgoing_sns_del(idx_del := 1, w_sig := 0, w_user := 1, idx := 0);</span><br><span>@@ -239,7 +239,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Test changing weights at runtime */</span><br><span style="color: hsl(0, 100%, 40%);">-testcase TC_sns_chg_weight() runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_sns_chg_weight() runs on RAW_Test_CT {</span><br><span> f_sns_bringup_1c1u();</span><br><span> </span><br><span> /* change w_user from 1 to 200 */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13097">change 13097</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/13097"/><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: I15021c5dea16e39a530d8d9080e37a7f2a6c4fa7 </div>
<div style="display:none"> Gerrit-Change-Number: 13097 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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>