<p>Max <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13201">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use unique NSEI/BVCI/NSVCI in TBF tests<br><br>This works around the issue with colliding rate counter group index<br>highlighted by 86e35e488740889f8ad03d09a78918839b883240 by using<br>different NSEI/BVCI/NSVCI parameters for different TBF tests.<br><br>Change-Id: Id7d2d1a48308a6b1fb17768aee0e79adbdee56ee<br>Related: OS#3827<br>---<br>M tests/tbf/TbfTest.cpp<br>M tests/tbf/TbfTest.err<br>2 files changed, 5 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp</span><br><span>index 0d473a1..993ca10 100644</span><br><span>--- a/tests/tbf/TbfTest.cpp</span><br><span>+++ b/tests/tbf/TbfTest.cpp</span><br><span>@@ -449,8 +449,7 @@</span><br><span> </span><br><span> bts = the_bts.bts_data();</span><br><span> setup_bts(&the_bts, ts_no);</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_bssgp_create_and_connect(bts, 33001, 0, 33001,</span><br><span style="color: hsl(0, 100%, 40%);">- 1234, 1234, 1234, 1, 1, false, 0, 0, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_bssgp_create_and_connect(bts, 33001, 0, 33001, 1234, 1234, 1234, 1, 1, false, 0, 0, 0);</span><br><span> </span><br><span> for (i = 0; i < 1024; i++) {</span><br><span> uint32_t tlli = 0xc0000000 + i;</span><br><span>@@ -492,8 +491,7 @@</span><br><span> setup_bts(&the_bts, ts_no);</span><br><span> bts->ms_idle_sec = 10; /* keep the MS object */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- gprs_bssgp_create_and_connect(bts, 33001, 0, 33001,</span><br><span style="color: hsl(0, 100%, 40%);">- 1234, 1234, 1234, 1, 1, false, 0, 0, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_bssgp_create_and_connect(bts, 33001, 0, 33001, 2234, 2234, 2234, 1, 1, false, 0, 0, 0);</span><br><span> </span><br><span> /* Handle LLC frame 1 */</span><br><span> memset(buf, 1, sizeof(buf));</span><br><span>@@ -2179,8 +2177,7 @@</span><br><span> /* EGPRS-only */</span><br><span> bts->egprs_enabled = 1;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- gprs_bssgp_create_and_connect(bts, 33001, 0, 33001,</span><br><span style="color: hsl(0, 100%, 40%);">- 1234, 1234, 1234, 1, 1, false, 0, 0, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_bssgp_create_and_connect(bts, 33001, 0, 33001, 3234, 3234, 3234, 1, 1, false, 0, 0, 0);</span><br><span> </span><br><span> /* Does not support EGPRS */</span><br><span> rc = gprs_rlcmac_dl_tbf::handle(bts, tlli, 0, imsi, ms_class, 0,</span><br><span>@@ -2241,8 +2238,7 @@</span><br><span> bts->trx[0].pdch[4].enable();</span><br><span> bts->trx[0].pdch[5].enable();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- gprs_bssgp_create_and_connect(bts, 33001, 0, 33001,</span><br><span style="color: hsl(0, 100%, 40%);">- 1234, 1234, 1234, 1, 1, false, 0, 0, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_bssgp_create_and_connect(bts, 33001, 0, 33001, 4234, 4234, 4234, 1, 1, false, 0, 0, 0);</span><br><span> </span><br><span> /* Does no support EGPRS */</span><br><span> dl_tbf = tbf_alloc_dl_tbf(bts, NULL, 0, ms_class, 0, false);</span><br><span>@@ -2279,8 +2275,7 @@</span><br><span> bts->trx[0].pdch[4].enable();</span><br><span> bts->trx[0].pdch[5].enable();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- gprs_bssgp_create_and_connect(bts, 33001, 0, 33001,</span><br><span style="color: hsl(0, 100%, 40%);">- 1234, 1234, 1234, 1, 1, false, 0, 0, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_bssgp_create_and_connect(bts, 33001, 0, 33001, 5234, 5234, 5234, 1, 1, false, 0, 0, 0);</span><br><span> </span><br><span> /* EGPRS-only */</span><br><span> bts->egprs_enabled = 1;</span><br><span>diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err</span><br><span>index 8d5adf9..355ec69 100644</span><br><span>--- a/tests/tbf/TbfTest.err</span><br><span>+++ b/tests/tbf/TbfTest.err</span><br><span>@@ -1337,7 +1337,6 @@</span><br><span> - Failed to find a usable TRX (TFI exhausted)</span><br><span> No PDCH resource</span><br><span> Destroying MS object, TLLI = 0x00000000</span><br><span style="color: hsl(0, 100%, 40%);">-counter group 'bssgp:bss_ctx' already exists for index 1234, instead using index 1235. This is a software bug that needs fixing.</span><br><span> ********** DL-TBF starts here **********</span><br><span> Allocating DL TBF: MS_CLASS=45/0</span><br><span> Creating MS object, TLLI = 0x00000000</span><br><span>@@ -3032,10 +3031,8 @@</span><br><span> TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=FINISHED) starting timer T3191 [final block (DL-TBF)] with 0 sec. 0 microsec, cur_fn=0</span><br><span> TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Scheduled Ack/Nack polling on FN=2654461, TS=7</span><br><span> TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=FINISHED) msg block (BSN 10, CS-1): 0f 03 14 4d 43 20 50 41 43 4b 45 54 20 30 39 20 28 54 42 46 20 32 29 </span><br><span style="color: hsl(0, 100%, 40%);">-counter group 'bssgp:bss_ctx' already exists for index 1234, instead using index 1236. This is a software bug that needs fixing.</span><br><span> Not accepting non-EGPRS phone in EGPRS-only mode</span><br><span> No PDCH resource</span><br><span style="color: hsl(0, 100%, 40%);">-counter group 'bssgp:bss_ctx' already exists for index 1234, instead using index 1237. This is a software bug that needs fixing.</span><br><span> ********** DL-TBF starts here **********</span><br><span> Allocating DL TBF: MS_CLASS=12/0</span><br><span> Creating MS object, TLLI = 0x00000000</span><br><span>@@ -5924,7 +5921,6 @@</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN EGPRS) set ass. type PACCH [prev CCCH:0, PACCH:0]</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN EGPRS) starting timer T0 [assignment (PACCH)] with 2 sec. 0 microsec, cur_fn=0</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN EGPRS) appending 256 bytes</span><br><span style="color: hsl(0, 100%, 40%);">-counter group 'bssgp:bss_ctx' already exists for index 1234, instead using index 1238. This is a software bug that needs fixing.</span><br><span> ********** DL-TBF starts here **********</span><br><span> Allocating DL TBF: MS_CLASS=11/11</span><br><span> Creating MS object, TLLI = 0x00000000</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13201">change 13201</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/13201"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Id7d2d1a48308a6b1fb17768aee0e79adbdee56ee </div>
<div style="display:none"> Gerrit-Change-Number: 13201 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Max <msuraev@sysmocom.de> </div>