<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22227">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gbproxy: Start to allocate NRIs to SGSNs<br><br>We change the osmo-gbproxy.cfg to use NRI 3 for SGSN-0 (NSEI 101) and<br>NRI 4 for SGSN-1 (NSEI 102).<br><br>We also add the capability to GBProxy_Tests to allocate P-TMSI with<br>a specific NRI and default to the first NRI of SGSN-0 so all tests<br>written still for a single-SGSN-non-pool scenario pass without any<br>modification.<br><br>Related: OS#4472, SYS#5002<br>Change-Id: I15f78dca5ac31a1c71f086d3e92a70e900eae250<br>---<br>M gbproxy/GBProxy_Tests.ttcn<br>M gbproxy/osmo-gbproxy.cfg<br>M gbproxy/osmo-gbproxy.fr.cfg<br>3 files changed, 16 insertions(+), 4 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 4857515..9168fa3 100644</span><br><span>--- a/gbproxy/GBProxy_Tests.ttcn</span><br><span>+++ b/gbproxy/GBProxy_Tests.ttcn</span><br><span>@@ -45,6 +45,12 @@</span><br><span> const integer max_fr_info_size := 1600;</span><br><span> </span><br><span> modulepar {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* NRI bit-length. 0 for no pooling */</span><br><span style="color: hsl(120, 100%, 40%);">+ integer mp_nri_bitlength := 5;</span><br><span style="color: hsl(120, 100%, 40%);">+ roro_integer mp_sgsn_nri := {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 3 }, /* list of NRIs of first SGSN */</span><br><span style="color: hsl(120, 100%, 40%);">+ { 4 } /* list of NRIs of second SGSN */</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span> boolean mp_enable_bss_load_sharing := false;</span><br><span> /* SGSN NS configuration */</span><br><span> NSConfigurations mp_nsconfig_sgsn := {</span><br><span>@@ -594,10 +600,10 @@</span><br><span> </span><br><span> /* helper function to create, connect and start a BSSGP_ConnHdlr component */</span><br><span> function f_start_handler(void_fn fn, charstring id, GbInstances pcu, GbInstances sgsn, integer imsi_suffix,</span><br><span style="color: hsl(0, 100%, 40%);">- float t_guard := 30.0)</span><br><span style="color: hsl(120, 100%, 40%);">+ float t_guard := 30.0, integer nri := mp_sgsn_nri[0][0])</span><br><span> runs on test_CT return BSSGP_ConnHdlr {</span><br><span> var BSSGP_ConnHdlr vc_conn;</span><br><span style="color: hsl(0, 100%, 40%);">- var OCT4 p_tmsi := f_gen_tmsi(imsi_suffix);</span><br><span style="color: hsl(120, 100%, 40%);">+ var OCT4 p_tmsi := f_gen_tmsi(imsi_suffix, nri_v := nri, nri_bitlen := mp_nri_bitlength);</span><br><span> </span><br><span> var BSSGP_ConnHdlrPars pars := {</span><br><span> imei := f_gen_imei(imsi_suffix),</span><br><span>@@ -608,8 +614,8 @@</span><br><span> tlli := f_gprs_tlli_from_tmsi(p_tmsi, TLLI_LOCAL),</span><br><span> tlli_old := omit,</span><br><span> ra := omit,</span><br><span style="color: hsl(0, 100%, 40%);">- pcu := g_pcu,</span><br><span style="color: hsl(0, 100%, 40%);">- sgsn := g_sgsn,</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu := pcu,</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn := sgsn,</span><br><span> t_guard := t_guard</span><br><span> };</span><br><span> </span><br><span>diff --git a/gbproxy/osmo-gbproxy.cfg b/gbproxy/osmo-gbproxy.cfg</span><br><span>index 1c6caa9..5789e3a 100644</span><br><span>--- a/gbproxy/osmo-gbproxy.cfg</span><br><span>+++ b/gbproxy/osmo-gbproxy.cfg</span><br><span>@@ -6,10 +6,13 @@</span><br><span> no login</span><br><span> !</span><br><span> gbproxy</span><br><span style="color: hsl(120, 100%, 40%);">+ nri bitlen 5</span><br><span> sgsn nsei 101</span><br><span> name first</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 3</span><br><span> sgsn nsei 102</span><br><span> name second</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 4</span><br><span> ns</span><br><span> bind udp local</span><br><span> listen 127.0.0.1 23000</span><br><span>diff --git a/gbproxy/osmo-gbproxy.fr.cfg b/gbproxy/osmo-gbproxy.fr.cfg</span><br><span>index e350526..11ab84b 100644</span><br><span>--- a/gbproxy/osmo-gbproxy.fr.cfg</span><br><span>+++ b/gbproxy/osmo-gbproxy.fr.cfg</span><br><span>@@ -49,7 +49,10 @@</span><br><span> nsvc fr hdlcnet7 dlci 22 nsvci 7</span><br><span> nsvc fr hdlcnet8 dlci 23 nsvci 8</span><br><span> gbproxy</span><br><span style="color: hsl(120, 100%, 40%);">+ nri bitlen 5</span><br><span> sgsn nsei 101</span><br><span> name first</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 3</span><br><span> sgsn nsei 102</span><br><span> name second</span><br><span style="color: hsl(120, 100%, 40%);">+ nri add 4</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22227">change 22227</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/+/22227"/><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: I15f78dca5ac31a1c71f086d3e92a70e900eae250 </div>
<div style="display:none"> Gerrit-Change-Number: 22227 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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>