cellular-infrastructure
/
osmo-pcu
mirror of https://gerrit.osmocom.org/osmo-pcu
9
0
Fork 1
Code Issues Releases Wiki Activity

Use unique NSEI/BVCI/NSVCI in TBF tests 

This works around the issue with colliding rate counter group index
highlighted by 86e35e4887 by using
different NSEI/BVCI/NSVCI parameters for different TBF tests.

Change-Id: Id7d2d1a48308a6b1fb17768aee0e79adbdee56ee
Related: OS#3827
This commit is contained in:
Max 2019-03-11 14:40:21 +01:00
parent ed6e4acdf6
commit a3ff316c5f
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/tbf/TbfTest.cpp
View File

@ -449,8 +449,7 @@ static void test_tbf_exhaustion()
bts = the_bts.bts_data();
setup_bts(&the_bts, ts_no);
gprs_bssgp_create_and_connect(bts, 33001, 0, 33001,
1234, 1234, 1234, 1, 1, false, 0, 0, 0);
gprs_bssgp_create_and_connect(bts, 33001, 0, 33001, 1234, 1234, 1234, 1, 1, false, 0, 0, 0);
for (i = 0; i < 1024; i++) {
uint32_t tlli = 0xc0000000 + i;
@ -492,8 +491,7 @@ static void test_tbf_dl_llc_loss()
setup_bts(&the_bts, ts_no);
bts->ms_idle_sec = 10; /* keep the MS object */
gprs_bssgp_create_and_connect(bts, 33001, 0, 33001,
1234, 1234, 1234, 1, 1, false, 0, 0, 0);
gprs_bssgp_create_and_connect(bts, 33001, 0, 33001, 2234, 2234, 2234, 1, 1, false, 0, 0, 0);
/* Handle LLC frame 1 */
memset(buf, 1, sizeof(buf));
@ -2179,8 +2177,7 @@ static void test_tbf_gprs_egprs()
/* EGPRS-only */
bts->egprs_enabled = 1;
gprs_bssgp_create_and_connect(bts, 33001, 0, 33001,
1234, 1234, 1234, 1, 1, false, 0, 0, 0);
gprs_bssgp_create_and_connect(bts, 33001, 0, 33001, 3234, 3234, 3234, 1, 1, false, 0, 0, 0);
/* Does not support EGPRS */
rc = gprs_rlcmac_dl_tbf::handle(bts, tlli, 0, imsi, ms_class, 0,
@ -2241,8 +2238,7 @@ static void test_tbf_ws()
bts->trx[0].pdch[4].enable();
bts->trx[0].pdch[5].enable();
gprs_bssgp_create_and_connect(bts, 33001, 0, 33001,
1234, 1234, 1234, 1, 1, false, 0, 0, 0);
gprs_bssgp_create_and_connect(bts, 33001, 0, 33001, 4234, 4234, 4234, 1, 1, false, 0, 0, 0);
/* Does no support EGPRS */
dl_tbf = tbf_alloc_dl_tbf(bts, NULL, 0, ms_class, 0, false);
@ -2279,8 +2275,7 @@ static void test_tbf_update_ws(void)
bts->trx[0].pdch[4].enable();
bts->trx[0].pdch[5].enable();
gprs_bssgp_create_and_connect(bts, 33001, 0, 33001,
1234, 1234, 1234, 1, 1, false, 0, 0, 0);
gprs_bssgp_create_and_connect(bts, 33001, 0, 33001, 5234, 5234, 5234, 1, 1, false, 0, 0, 0);
/* EGPRS-only */
bts->egprs_enabled = 1;

4
tests/tbf/TbfTest.err
View File

@ -1337,7 +1337,6 @@ Slot Allocation (Algorithm A) for class 45
- Failed to find a usable TRX (TFI exhausted)
No PDCH resource
Destroying MS object, TLLI = 0x00000000
counter group 'bssgp:bss_ctx' already exists for index 1234, instead using index 1235. This is a software bug that needs fixing.
********** DL-TBF starts here **********
Allocating DL TBF: MS_CLASS=45/0
Creating MS object, TLLI = 0x00000000
@ -3032,10 +3031,8 @@ TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Scheduled DL Acknowledgement po
TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=FINISHED) starting timer T3191 [final block (DL-TBF)] with 0 sec. 0 microsec, cur_fn=0
TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Scheduled Ack/Nack polling on FN=2654461, TS=7
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
counter group 'bssgp:bss_ctx' already exists for index 1234, instead using index 1236. This is a software bug that needs fixing.
Not accepting non-EGPRS phone in EGPRS-only mode
No PDCH resource
counter group 'bssgp:bss_ctx' already exists for index 1234, instead using index 1237. This is a software bug that needs fixing.
********** DL-TBF starts here **********
Allocating DL TBF: MS_CLASS=12/0
Creating MS object, TLLI = 0x00000000
@ -5924,7 +5921,6 @@ TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=NULL EGPRS) changes state from NULL to AS
TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN EGPRS) set ass. type PACCH [prev CCCH:0, PACCH:0]
TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN EGPRS) starting timer T0 [assignment (PACCH)] with 2 sec. 0 microsec, cur_fn=0
TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN EGPRS) appending 256 bytes
counter group 'bssgp:bss_ctx' already exists for index 1234, instead using index 1238. This is a software bug that needs fixing.
********** DL-TBF starts here **********
Allocating DL TBF: MS_CLASS=11/11
Creating MS object, TLLI = 0x00000000