<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18029">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BTS: refactor f_get_si3(), so it can be used to get SI4<br><br>This is needed for the follow up change(s) verifying the GPRS<br>indicator in the Rest Octets of RR System Information Type 4.<br><br>Change-Id: I540b43bbe886f8ca3e9a7eb49a4d30d391d45f49<br>Signed-off-by: Vadim Yanitskiy <axilirator@gmail.com><br>Related: OS#3075<br>---<br>M bts/BTS_Tests.ttcn<br>1 file changed, 15 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn</span><br><span>index 4466ad4..bd6785e 100644</span><br><span>--- a/bts/BTS_Tests.ttcn</span><br><span>+++ b/bts/BTS_Tests.ttcn</span><br><span>@@ -4899,7 +4899,8 @@</span><br><span> }</span><br><span> </span><br><span> /* Ensure that GPRS capability is not advertised before PCU socket conncet */</span><br><span style="color: hsl(0, 100%, 40%);">-private function f_get_si3(L1CTL_PT pt) runs on test_CT return SystemInformationType3 {</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_get_si(L1CTL_PT pt, RrMessageType si_type)</span><br><span style="color: hsl(120, 100%, 40%);">+runs on test_CT return SystemInformation {</span><br><span> var L1ctlDlMessage l1_dl;</span><br><span> var SystemInformation si;</span><br><span> timer T := 5.0;</span><br><span>@@ -4912,7 +4913,7 @@</span><br><span> repeat;</span><br><span> }</span><br><span> si := dec_SystemInformation(l1_dl.payload.data_ind.payload)</span><br><span style="color: hsl(0, 100%, 40%);">- if (not ischosen(si.payload.si3)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (si.header.message_type != si_type) {</span><br><span> repeat;</span><br><span> }</span><br><span> }</span><br><span>@@ -4920,10 +4921,11 @@</span><br><span> repeat;</span><br><span> }</span><br><span> [] T.timeout {</span><br><span style="color: hsl(0, 100%, 40%);">- Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for SI3");</span><br><span style="color: hsl(120, 100%, 40%);">+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,</span><br><span style="color: hsl(120, 100%, 40%);">+ log2str("Timeout waiting for ", si_type));</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- return si.payload.si3;</span><br><span style="color: hsl(120, 100%, 40%);">+ return si;</span><br><span> }</span><br><span> </span><br><span> private function f_si3_has_gprs_indicator(RestOctets ro) return boolean {</span><br><span>@@ -4932,7 +4934,7 @@</span><br><span> }</span><br><span> </span><br><span> testcase TC_pcu_socket_noconnect_nosi3gprs() runs on test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- var SystemInformationType3 si3;</span><br><span style="color: hsl(120, 100%, 40%);">+ var SystemInformation si;</span><br><span> timer T := 5.0;</span><br><span> </span><br><span> /* don't call f_init() as this would connect PCU socket */</span><br><span>@@ -4951,8 +4953,8 @@</span><br><span> </span><br><span> f_sleep(2.0);</span><br><span> L1CTL.clear;</span><br><span style="color: hsl(0, 100%, 40%);">- si3 := f_get_si3(L1CTL);</span><br><span style="color: hsl(0, 100%, 40%);">- if (f_si3_has_gprs_indicator(si3.rest_octets)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ si := f_get_si(L1CTL, SYSTEM_INFORMATION_TYPE_3);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (f_si3_has_gprs_indicator(si.payload.si3.rest_octets)) {</span><br><span> setverdict(fail, "SI3 indicates GPRS even before PCU socket connected");</span><br><span> } else {</span><br><span> setverdict(pass);</span><br><span>@@ -4962,7 +4964,7 @@</span><br><span> </span><br><span> /* Ensure that GPRS capability is advertised after PCU socket connect */</span><br><span> testcase TC_pcu_socket_connect_si3gprs() runs on test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- var SystemInformationType3 si3;</span><br><span style="color: hsl(120, 100%, 40%);">+ var SystemInformation si;</span><br><span> </span><br><span> /* this (among other things) establishes the first connection to the PCUIF socket */</span><br><span> f_init();</span><br><span>@@ -4971,8 +4973,8 @@</span><br><span> </span><br><span> f_sleep(2.0);</span><br><span> L1CTL.clear;</span><br><span style="color: hsl(0, 100%, 40%);">- si3 := f_get_si3(L1CTL);</span><br><span style="color: hsl(0, 100%, 40%);">- if (not f_si3_has_gprs_indicator(si3.rest_octets)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ si := f_get_si(L1CTL, SYSTEM_INFORMATION_TYPE_3);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not f_si3_has_gprs_indicator(si.payload.si3.rest_octets)) {</span><br><span> setverdict(fail, "SI3 indicates no GPRS despite PCU socket connected");</span><br><span> } else {</span><br><span> setverdict(pass);</span><br><span>@@ -4982,7 +4984,7 @@</span><br><span> </span><br><span> /* Ensure that GPRS capability is no longer advertised after PCU socket disconnect */</span><br><span> testcase TC_pcu_socket_disconnect_nosi3gprs() runs on test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- var SystemInformationType3 si3;</span><br><span style="color: hsl(120, 100%, 40%);">+ var SystemInformation si;</span><br><span> </span><br><span> /* this (among other things) establishes the first connection to the PCUIF socket */</span><br><span> f_init();</span><br><span>@@ -5000,8 +5002,8 @@</span><br><span> </span><br><span> f_sleep(2.0);</span><br><span> L1CTL.clear;</span><br><span style="color: hsl(0, 100%, 40%);">- si3 := f_get_si3(L1CTL);</span><br><span style="color: hsl(0, 100%, 40%);">- if (f_si3_has_gprs_indicator(si3.rest_octets)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ si := f_get_si(L1CTL, SYSTEM_INFORMATION_TYPE_3);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (f_si3_has_gprs_indicator(si.payload.si3.rest_octets)) {</span><br><span> setverdict(fail, "SI3 indicates GPRS after PCU socket disconnected");</span><br><span> } else {</span><br><span> setverdict(pass);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18029">change 18029</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/+/18029"/><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: I540b43bbe886f8ca3e9a7eb49a4d30d391d45f49 </div>
<div style="display:none"> Gerrit-Change-Number: 18029 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>