<p>lynxis lazus <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15399">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sgsn: replace variable bssgp with ran_index<br><br>Since bssgp also been used for Iu connection,<br>rename the variable to ran_index.<br>Be consistent and use the same variable name everywhere.<br><br>Change-Id: Ib278410bc49f07387873740ed8b411a815d940a8<br>---<br>M sgsn/SGSN_Tests.ttcn<br>M sgsn/SGSN_Tests_Iu.ttcn<br>2 files changed, 15 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn</span><br><span>index 10e98a8..d96767a 100644</span><br><span>--- a/sgsn/SGSN_Tests.ttcn</span><br><span>+++ b/sgsn/SGSN_Tests.ttcn</span><br><span>@@ -2362,44 +2362,44 @@</span><br><span> f_cleanup();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-friend function f_routing_area_update(RoutingAreaIdentificationV ra, integer bssgp := 0) runs on BSSGP_ConnHdlr {</span><br><span style="color: hsl(120, 100%, 40%);">+friend function f_routing_area_update(RoutingAreaIdentificationV ra, integer ran_index := 0) runs on BSSGP_ConnHdlr {</span><br><span> var PDU_L3_SGSN_MS l3_mt;</span><br><span> var PDU_DTAP_PS_MT mt;</span><br><span> var template OCT4 p_tmsi := omit;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (is_iu(bssgp)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (is_iu(ran_index)) {</span><br><span> p_tmsi := g_pars.p_tmsi;</span><br><span> }</span><br><span> /* then send RAU */</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, g_pars.ra, false, omit, omit, p_tmsi), bssgp);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, g_pars.ra, false, omit, omit, p_tmsi), ran_index);</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [is_gb(bssgp)] BSSGP[bssgp].receive(tr_GMM_RAU_ACCEPT) -> value l3_mt {</span><br><span style="color: hsl(0, 100%, 40%);">- f_process_rau_accept(l3_mt.msgs.gprs_mm.routingAreaUpdateAccept, bssgp);</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3(ts_GMM_RAU_COMPL, bssgp);</span><br><span style="color: hsl(120, 100%, 40%);">+ [is_gb(ran_index)] BSSGP[ran_index].receive(tr_GMM_RAU_ACCEPT) -> value l3_mt {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_process_rau_accept(l3_mt.msgs.gprs_mm.routingAreaUpdateAccept, ran_index);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_GMM_RAU_COMPL, ran_index);</span><br><span> setverdict(pass);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [is_iu(bssgp)] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_GMM_RAU_ACCEPT)) -> value mt {</span><br><span style="color: hsl(0, 100%, 40%);">- f_process_rau_accept(mt.dtap.msgs.gprs_mm.routingAreaUpdateAccept, bssgp);</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3(ts_GMM_RAU_COMPL, bssgp);</span><br><span style="color: hsl(120, 100%, 40%);">+ [is_iu(ran_index)] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_GMM_RAU_ACCEPT)) -> value mt {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_process_rau_accept(mt.dtap.msgs.gprs_mm.routingAreaUpdateAccept, ran_index);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_GMM_RAU_COMPL, ran_index);</span><br><span> setverdict(pass);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- [is_gb(bssgp)] BSSGP[bssgp].receive(tr_GMM_RAU_REJECT) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [is_gb(ran_index)] BSSGP[ran_index].receive(tr_GMM_RAU_REJECT) {</span><br><span> setverdict(fail, "Unexpected RAU Reject");</span><br><span> mtc.stop;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [is_iu(bssgp)] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_GMM_RAU_REJECT)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [is_iu(ran_index)] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_GMM_RAU_REJECT)) {</span><br><span> setverdict(fail, "Unexpected RAU Reject");</span><br><span> mtc.stop;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- [is_iu(bssgp)] BSSAP.receive(tr_RANAP_SecurityModeCmd(uia_algs := ?, uia_key := oct2bit(g_pars.vec.ik),</span><br><span style="color: hsl(120, 100%, 40%);">+ [is_iu(ran_index)] BSSAP.receive(tr_RANAP_SecurityModeCmd(uia_algs := ?, uia_key := oct2bit(g_pars.vec.ik),</span><br><span> key_sts := ?)) {</span><br><span> var IntegrityProtectionAlgorithm uia_chosen := 0; /* 0 = standard_UMTS_integrity_algorithm_UIA1 */</span><br><span> BSSAP.send(ts_RANAP_SecurityModeComplete(uia_chosen));</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [is_gb(bssgp)] BSSGP[bssgp].receive { repeat; }</span><br><span style="color: hsl(0, 100%, 40%);">- [is_iu(bssgp)] BSSAP.receive { repeat; }</span><br><span style="color: hsl(120, 100%, 40%);">+ [is_gb(ran_index)] BSSGP[ran_index].receive { repeat; }</span><br><span style="color: hsl(120, 100%, 40%);">+ [is_iu(ran_index)] BSSAP.receive { repeat; }</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>diff --git a/sgsn/SGSN_Tests_Iu.ttcn b/sgsn/SGSN_Tests_Iu.ttcn</span><br><span>index 472774e..786961f 100644</span><br><span>--- a/sgsn/SGSN_Tests_Iu.ttcn</span><br><span>+++ b/sgsn/SGSN_Tests_Iu.ttcn</span><br><span>@@ -66,7 +66,7 @@</span><br><span> f_gmm_attach(umts_aka_challenge := true, force_gsm_sres := false, ran_index := 0);</span><br><span> </span><br><span> /* do a routing area update */</span><br><span style="color: hsl(0, 100%, 40%);">- f_routing_area_update(g_pars.ra, bssgp := 3);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_routing_area_update(g_pars.ra, ran_index := 3);</span><br><span> setverdict(pass);</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15399">change 15399</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/+/15399"/><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: Ib278410bc49f07387873740ed8b411a815d940a8 </div>
<div style="display:none"> Gerrit-Change-Number: 15399 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </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>