<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22230">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
daniel: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gbproxy: Use correct NRI in suspend/resume<br><br>We cannot choose a random TLLI anymore, as this will obviously end up<br>at a random SGSN, and not the one we're targeting.<br><br>Change-Id: I665eda9e04cbf505f55abc9bcd414d6cbd6a36dd<br>---<br>M gbproxy/GBProxy_Tests.ttcn<br>1 file changed, 12 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn</span><br><span>index 6f5b326..a0e6d1d 100644</span><br><span>--- a/gbproxy/GBProxy_Tests.ttcn</span><br><span>+++ b/gbproxy/GBProxy_Tests.ttcn</span><br><span>@@ -1066,11 +1066,14 @@</span><br><span> f_cleanup();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-private function f_suspend_one(integer sgsn_idx, integer pcu_idx, integer bvc_idx, integer suffix)</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_suspend_one(integer sgsn_idx, integer nri_idx, integer pcu_idx, integer bvc_idx,</span><br><span style="color: hsl(120, 100%, 40%);">+ integer suffix)</span><br><span> runs on GlobalTest_CT</span><br><span> {</span><br><span> var RoutingAreaIdentification ra_id := g_pcu[pcu_idx].cfg.bvc[bvc_idx].cell_id.ra_id;</span><br><span style="color: hsl(0, 100%, 40%);">- var OCT4 tlli := f_gprs_tlli_random();</span><br><span style="color: hsl(120, 100%, 40%);">+ var OCT4 p_tmsi := f_gen_tmsi(suffix, nri_v := mp_sgsn_nri[sgsn_idx][nri_idx],</span><br><span style="color: hsl(120, 100%, 40%);">+ nri_bitlen := mp_nri_bitlength);</span><br><span style="color: hsl(120, 100%, 40%);">+ var OCT4 tlli := f_gprs_tlli_from_tmsi(p_tmsi, TLLI_LOCAL);</span><br><span> var template (value) PDU_BSSGP pdu_tx := ts_BSSGP_SUSPEND(tlli, ra_id);</span><br><span> /* we cannot use pdu_tx as there are some subtle differences in the length field :/ */</span><br><span> var template (present) PDU_BSSGP pdu_rx := tr_BSSGP_SUSPEND(tlli, ra_id);</span><br><span>@@ -1098,7 +1101,7 @@</span><br><span> </span><br><span> /* TODO: Generate RA ID for each ConnHdlr */</span><br><span> for (i := 0; i < 10; i := i+1) {</span><br><span style="color: hsl(0, 100%, 40%);">- f_suspend_one(0, 0, 0, i);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_suspend_one(sgsn_idx := 0, nri_idx := 0, pcu_idx := 0, bvc_idx := 0, suffix := i);</span><br><span> }</span><br><span> setverdict(pass);</span><br><span> }</span><br><span>@@ -1110,11 +1113,14 @@</span><br><span> f_cleanup();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-private function f_resume_one(integer sgsn_idx, integer pcu_idx, integer bvc_idx, integer suffix)</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_resume_one(integer sgsn_idx, integer nri_idx, integer pcu_idx, integer bvc_idx,</span><br><span style="color: hsl(120, 100%, 40%);">+ integer suffix)</span><br><span> runs on GlobalTest_CT</span><br><span> {</span><br><span> var RoutingAreaIdentification ra_id := g_pcu[pcu_idx].cfg.bvc[bvc_idx].cell_id.ra_id;</span><br><span style="color: hsl(0, 100%, 40%);">- var OCT4 tlli := f_gprs_tlli_random();</span><br><span style="color: hsl(120, 100%, 40%);">+ var OCT4 p_tmsi := f_gen_tmsi(suffix, nri_v := mp_sgsn_nri[sgsn_idx][nri_idx],</span><br><span style="color: hsl(120, 100%, 40%);">+ nri_bitlen := mp_nri_bitlength);</span><br><span style="color: hsl(120, 100%, 40%);">+ var OCT4 tlli := f_gprs_tlli_from_tmsi(p_tmsi, TLLI_LOCAL);</span><br><span> var template (value) PDU_BSSGP pdu_tx := ts_BSSGP_RESUME(tlli, ra_id, int2oct(suffix, 1));</span><br><span> /* we cannot use pdu_tx as there are some subtle differences in the length field :/ */</span><br><span> var template (present) PDU_BSSGP pdu_rx := tr_BSSGP_RESUME(tlli, ra_id, int2oct(suffix, 1));</span><br><span>@@ -1141,7 +1147,7 @@</span><br><span> var integer i;</span><br><span> </span><br><span> for (i := 0; i < 10; i := i+1) {</span><br><span style="color: hsl(0, 100%, 40%);">- f_resume_one(0, 0, 0, i);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_resume_one(sgsn_idx := 0, nri_idx := 0, pcu_idx := 0, bvc_idx := 0, suffix := i);</span><br><span> }</span><br><span> setverdict(pass);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22230">change 22230</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/+/22230"/><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: I665eda9e04cbf505f55abc9bcd414d6cbd6a36dd </div>
<div style="display:none"> Gerrit-Change-Number: 22230 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>