<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20089">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">RAW_NS: remove usage of mp_nsconfig<br><br>RAW_NS uses module parameter from SGSN_Components. To decouple<br>RAW_NS from SGSN_Component pass the NSConfiguration via f_init_ns_codec()<br><br>Change-Id: Ida8b8a6af815dc11b2ff4c65e19cc5ec25f18ae2<br>---<br>M pcu/PCU_Tests_NS.ttcn<br>M pcu/PCU_Tests_SNS.ttcn<br>M pcu/RAW_NS.ttcn<br>3 files changed, 26 insertions(+), 26 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/89/20089/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pcu/PCU_Tests_NS.ttcn b/pcu/PCU_Tests_NS.ttcn</span><br><span>index f953be4..586b1b1 100644</span><br><span>--- a/pcu/PCU_Tests_NS.ttcn</span><br><span>+++ b/pcu/PCU_Tests_NS.ttcn</span><br><span>@@ -76,7 +76,7 @@</span><br><span> </span><br><span> /* test the NS-RESET procedure */</span><br><span> testcase TC_ns_reset() runs on RAW_Test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_ns_codec();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_ns_codec(mp_nsconfig);</span><br><span> f_init_pcuif();</span><br><span> </span><br><span> </span><br><span>@@ -87,7 +87,7 @@</span><br><span> </span><br><span> /* ensure NS-RESET are re-transmitted */</span><br><span> testcase TC_ns_reset_retrans() runs on RAW_Test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_ns_codec();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_ns_codec(mp_nsconfig);</span><br><span> f_init_pcuif();</span><br><span> </span><br><span> var integer i;</span><br><span>@@ -103,7 +103,7 @@</span><br><span> </span><br><span> /* test the inbound NS-ALIVE procedure after NS-RESET */</span><br><span> testcase TC_ns_alive() runs on RAW_Test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_ns_codec();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_ns_codec(mp_nsconfig);</span><br><span> f_init_pcuif();</span><br><span> </span><br><span> /* Expect inbound NS-RESET procedure */</span><br><span>@@ -118,7 +118,7 @@</span><br><span> </span><br><span> /* Test for NS-RESET after NS-ALIVE timeout */</span><br><span> testcase TC_ns_alive_timeout_reset() runs on RAW_Test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_ns_codec(guard_secs := 100.0);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_ns_codec(mp_nsconfig, guard_secs := 100.0);</span><br><span> f_init_pcuif();</span><br><span> </span><br><span> /* Expect inbound NS-RESET procedure */</span><br><span>@@ -140,7 +140,7 @@</span><br><span> </span><br><span> /* test for NS-RESET/NS-ALIVE/NS-UNBLOCK */</span><br><span> testcase TC_ns_unblock() runs on RAW_Test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_ns_codec();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_ns_codec(mp_nsconfig);</span><br><span> f_init_pcuif();</span><br><span> </span><br><span> /* Expect inbound NS-RESET procedure */</span><br><span>@@ -155,7 +155,7 @@</span><br><span> </span><br><span> /* test for NS-UNBLOCK re-transmissions */</span><br><span> testcase TC_ns_unblock_retrans() runs on RAW_Test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_ns_codec();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_ns_codec(mp_nsconfig);</span><br><span> f_init_pcuif();</span><br><span> </span><br><span> /* Expect inbound NS-RESET procedure */</span><br><span>@@ -174,7 +174,7 @@</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> testcase TC_ns_full_bringup() runs on RAW_Test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_ns_codec();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_ns_codec(mp_nsconfig);</span><br><span> f_init_pcuif();</span><br><span> </span><br><span> /* Expect inbound NS-RESET procedure */</span><br><span>@@ -200,7 +200,7 @@</span><br><span> </span><br><span> /* test outbound (SGSN-originated) NS-BLOCK procedure */</span><br><span> testcase TC_ns_so_block() runs on RAW_Test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_ns_codec();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_ns_codec(mp_nsconfig);</span><br><span> f_init_pcuif();</span><br><span> </span><br><span> /* Expect inbound NS-RESET procedure */</span><br><span>diff --git a/pcu/PCU_Tests_SNS.ttcn b/pcu/PCU_Tests_SNS.ttcn</span><br><span>index dd133a3..e819688 100644</span><br><span>--- a/pcu/PCU_Tests_SNS.ttcn</span><br><span>+++ b/pcu/PCU_Tests_SNS.ttcn</span><br><span>@@ -132,7 +132,7 @@</span><br><span> </span><br><span> /* PCU-originated SNS-SIZE: successful case */</span><br><span> testcase TC_sns_po_size_success() runs on RAW_Test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_ns_codec();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_ns_codec(mp_nsconfig);</span><br><span> f_init_pcuif();</span><br><span> f_incoming_sns_size();</span><br><span> f_sleep(1.0);</span><br><span>@@ -141,7 +141,7 @@</span><br><span> </span><br><span> /* PCU-originated SNS-SIZE: NACK from our side */</span><br><span> testcase TC_sns_po_size_nack() runs on RAW_Test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_ns_codec();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_ns_codec(mp_nsconfig);</span><br><span> f_init_pcuif();</span><br><span> f_incoming_sns_size(NS_CAUSE_PROTOCOL_ERROR_UNSPEIFIED);</span><br><span> /* FIXME: ensure we don't get a SNS-CONFIG */</span><br><span>@@ -152,7 +152,7 @@</span><br><span> </span><br><span> /* PCU-originated SNS-CONFIG: successful case */</span><br><span> testcase TC_sns_po_config_success() runs on RAW_Test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_ns_codec();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_ns_codec(mp_nsconfig);</span><br><span> f_init_pcuif();</span><br><span> f_incoming_sns_size();</span><br><span> f_incoming_sns_config();</span><br><span>@@ -162,7 +162,7 @@</span><br><span> </span><br><span> /* PCU-originated SNS-CONFIG: successful case */</span><br><span> testcase TC_sns_po_config_nack() runs on RAW_Test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_ns_codec();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_ns_codec(mp_nsconfig);</span><br><span> f_init_pcuif();</span><br><span> f_incoming_sns_size();</span><br><span> f_incoming_sns_config(NS_CAUSE_PROTOCOL_ERROR_UNSPEIFIED);</span><br><span>@@ -174,7 +174,7 @@</span><br><span> </span><br><span> /* SGSN-originated SNS-SIZE: successful case */</span><br><span> testcase TC_sns_so_config_success() runs on RAW_Test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_ns_codec();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_ns_codec(mp_nsconfig);</span><br><span> f_init_pcuif();</span><br><span> f_incoming_sns_size();</span><br><span> f_incoming_sns_config();</span><br><span>@@ -199,8 +199,8 @@</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> /* Activate two NS codec ports */</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_ns_codec();</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_ns_codec(1);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_ns_codec(mp_nsconfig);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_ns_codec(mp_nsconfig, 1);</span><br><span> f_init_pcuif();</span><br><span> /* Perform Size + BSS-originated config */</span><br><span> f_incoming_sns_size();</span><br><span>@@ -244,9 +244,9 @@</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> /* Activate two NS codec ports */</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_ns_codec();</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_ns_codec(1);</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_ns_codec(2);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_ns_codec(mp_nsconfig);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_ns_codec(mp_nsconfig, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_ns_codec(mp_nsconfig, 2);</span><br><span> f_init_pcuif();</span><br><span> /* Perform Size + BSS-originated config */</span><br><span> f_incoming_sns_size();</span><br><span>@@ -303,9 +303,9 @@</span><br><span> /* Transmit BVC-RESET before NS-ALIVE of PCU was ACKed: expect no response */</span><br><span> testcase TC_sns_1c1u_so_bvc_reset_too_early() runs on RAW_Test_CT {</span><br><span> /* Activate two NS codec ports */</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_ns_codec();</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_ns_codec(1);</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_ns_codec(2);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_ns_codec(mp_nsconfig);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_ns_codec(mp_nsconfig, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_ns_codec(mp_nsconfig, 2);</span><br><span> f_init_pcuif();</span><br><span> /* Perform Size + BSS-originated config */</span><br><span> f_incoming_sns_size();</span><br><span>@@ -331,7 +331,7 @@</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 style="color: hsl(0, 100%, 40%);">- f_init_ns_codec(2);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_ns_codec(mp_nsconfig, 2);</span><br><span> </span><br><span> f_outgoing_sns_add(idx_add := 2, w_sig := 0, w_user := 1, idx := 0);</span><br><span> </span><br><span>diff --git a/pcu/RAW_NS.ttcn b/pcu/RAW_NS.ttcn</span><br><span>index 4300376..9c31820 100644</span><br><span>--- a/pcu/RAW_NS.ttcn</span><br><span>+++ b/pcu/RAW_NS.ttcn</span><br><span>@@ -38,7 +38,7 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-function f_init_ns_codec(integer idx := 0, float guard_secs := 60.0, integer tc_offset := 0) runs on RAW_NS_CT {</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, integer tc_offset := 0) runs on RAW_NS_CT {</span><br><span> var Result res;</span><br><span> </span><br><span> if (not g_T_guard.running) {</span><br><span>@@ -48,10 +48,10 @@</span><br><span> </span><br><span> if (not isbound(g_nsconfig) or not isbound(g_nsconfig[idx])) {</span><br><span> /* copy most parts from mp_nsconfig */</span><br><span style="color: hsl(0, 100%, 40%);">- g_nsconfig[idx] := mp_nsconfig;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_nsconfig[idx] := ns_config;</span><br><span> /* adjust those parts different for each NS-VC */</span><br><span style="color: hsl(0, 100%, 40%);">- g_nsconfig[idx].nsvci := mp_nsconfig.nsvci + idx;</span><br><span style="color: hsl(0, 100%, 40%);">- g_nsconfig[idx].local_udp_port := mp_nsconfig.local_udp_port + idx + tc_offset;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_nsconfig[idx].nsvci := ns_config.nsvci + idx;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_nsconfig[idx].local_udp_port := ns_config.local_udp_port + idx + tc_offset;</span><br><span> }</span><br><span> </span><br><span> map(self:NSCP[idx], system:NSCP);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20089">change 20089</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/+/20089"/><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: Ida8b8a6af815dc11b2ff4c65e19cc5ec25f18ae2 </div>
<div style="display:none"> Gerrit-Change-Number: 20089 </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>