March 2022 - gerrit-log - lists.osmocom.org

Change in osmo-bsc[master]: add counter for inter-BSC incoming Handover Request

by neels

Attention is currently required from: laforge. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27371 ) Change subject: add counter for inter-BSC incoming Handover Request ...................................................................... Patch Set 2: (2 comments) Patchset: PS2: > in general I find it completely strange that the type of SCCP transport layer message is part of the […] yes exactly the reason why i was reluctant to complicate things here. I'm not sure where the DT1 came from originally... File src/osmo-bsc/osmo_bsc_msc.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27371/comment/e8066bd3_9601c9a7 PS2, Line 58: [MSC_CTR_BSSMAP_RX_DT1_HANDOVER_RQST] = {"bssmap:rx:dt1:handover:rqst", "Number of received BSSMAP DT1 HANDOVER RQST messages"}, > is the description and naming correct here? Are we really only counting those handover requests whi […] that's true. i was thinking though, should we really have separate counters for those cases? if i want to see the nr of ho req, do i want to see separate counters for those coming in the CR and those coming juuust after the CR? maybe it should be called _RX_CR_AND_DT1_? same thing for the Perform Location Request in the other patch. There we already have MSC_CTR_BSSMAP_RX_DT1_PERFORM_LOCATION_REQUEST so far accurately only counting the DT1 Perform Loc Req; because we so far don't count the CR ones at all. I guess we don't want to rename that counter. So then is the conclusion to after all do have separate counters: MSC_CTR_BSSMAP_RX_CR_HANDOVER_REQUEST MSC_CTR_BSSMAP_RX_DT1_HANDOVER_REQUEST MSC_CTR_BSSMAP_RX_CR_PERFORM_LOCATION_REQUEST MSC_CTR_BSSMAP_RX_DT1_PERFORM_LOCATION_REQUEST to benefit accuracy but not neccessarily practical use ... ? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icdde2bb339a5e367a4d297802214a1ef3f36eefa Gerrit-Change-Number: 27371 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 03 Mar 2022 22:10:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in docker-playground[master]: centos8-repo-install-test: set UPSTREAM_DISTRO=almalinux:8 in Makefile

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27401 ) Change subject: centos8-repo-install-test: set UPSTREAM_DISTRO=almalinux:8 in Makefile ...................................................................... centos8-repo-install-test: set UPSTREAM_DISTRO=almalinux:8 in Makefile Otherwise 'debian:bullseye' is used by default when running make. Change-Id: I1744f5199b1686ee615173572afee524104eb91f --- M centos8-repo-install-test/Makefile 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/01/27401/1 diff --git a/centos8-repo-install-test/Makefile b/centos8-repo-install-test/Makefile index 8d0e10b..977ec9c 100644 --- a/centos8-repo-install-test/Makefile +++ b/centos8-repo-install-test/Makefile @@ -1 +1,2 @@ +UPSTREAM_DISTRO=almalinux:8 include ../make/Makefile -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1744f5199b1686ee615173572afee524104eb91f Gerrit-Change-Number: 27401 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in osmo-bts[master]: bts-trx: Log lchan if avaialble in Meas Avg

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27399 ) Change subject: bts-trx: Log lchan if avaialble in Meas Avg ...................................................................... bts-trx: Log lchan if avaialble in Meas Avg Change-Id: I1460715fa46c4195c5aaac91be776ad770d8099e --- M src/osmo-bts-trx/scheduler_trx.c 1 file changed, 5 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c index 1159e59..0534086 100644 --- a/src/osmo-bts-trx/scheduler_trx.c +++ b/src/osmo-bts-trx/scheduler_trx.c @@ -690,7 +690,9 @@ .ci_cb = (ci_cb_sum / n), }; - LOGP(DMEAS, LOGL_DEBUG, "Measurement AVG (num=%u, shift=%u): " - "RSSI %f, ToA256 %d, C/I %d cB\n", n, shift, - avg->rssi, avg->toa256, avg->ci_cb); + LOGP(DMEAS, LOGL_DEBUG, "%s%sMeasurement AVG (num=%u, shift=%u): " + "RSSI %f, ToA256 %d, C/I %d cB\n", + chan_state->lchan ? gsm_lchan_name(chan_state->lchan) : "", + chan_state->lchan ? " " : "", + n, shift, avg->rssi, avg->toa256, avg->ci_cb); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27399 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1460715fa46c4195c5aaac91be776ad770d8099e Gerrit-Change-Number: 27399 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in osmo-bts[master]: bts-trx: Log lchan if avaialble in Meas Avg

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27399 ) Change subject: bts-trx: Log lchan if avaialble in Meas Avg ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27399 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1460715fa46c4195c5aaac91be776ad770d8099e Gerrit-Change-Number: 27399 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 19:54:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-bts[master]: bts-trx: Log lchan if avaialble in Meas Avg

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27399 ) Change subject: bts-trx: Log lchan if avaialble in Meas Avg ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: agreeing with fixeria, both variants would work -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27399 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1460715fa46c4195c5aaac91be776ad770d8099e Gerrit-Change-Number: 27399 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 19:35:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-bsc[2021q4]: bitvec2freq_list(): fix handling of E-GSM ARFCNs

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27383 ) Change subject: bitvec2freq_list(): fix handling of E-GSM ARFCNs ...................................................................... bitvec2freq_list(): fix handling of E-GSM ARFCNs According to 3GPP TS 44.018, section 10.5.2.1b.2, only ARFCN values in range 1..124 can be encoded using the 'bit map 0' format. Before this patch, ARFCN values belonging to E-GSM band (0, 975..1023) were ignored in bitvec2freq_list(), and thus not present in the resulting Cell Channel Description IE. Change-Id: I17739e6845cd84e2a81bc406dd532541f7c52cb6 Related: SYS#5854 --- M src/osmo-bsc/system_information.c M tests/gsm0408/gsm0408_test.ok 2 files changed, 19 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 974af3a..e1b369d 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -504,20 +504,29 @@ bool pgsm = false; memset(chan_list, 0, 16); - if (bts->band == GSM_BAND_900 - && bts->c0->arfcn >= 1 && bts->c0->arfcn <= 124) + /* According to 3GPP TS 44.018, section 10.5.2.1b.2, only ARFCN values + * in range 1..124 can be encoded using the 'bit map 0' format. */ + if (bts->band == GSM_BAND_900) pgsm = true; + /* Check presence of E-GSM ARFCN 0 */ + if (pgsm && bitvec_get_bit_pos(bv, 0) == ONE) + pgsm = false; + /* Check presence of E-GSM ARFCNs 975..1023 */ + for (i = 975; pgsm && i <= 1023; i++) { + if (bitvec_get_bit_pos(bv, i) == ONE) + pgsm = false; + } + /* P-GSM-only handsets only support 'bit map 0 format' */ if (!bis && !ter && pgsm) { chan_list[0] = 0; - for (i = 0; i < bv->data_len*8; i++) { - if (i >= 1 && i <= 124 - && bitvec_get_bit_pos(bv, i)) { - rc = freq_list_bm0_set_arfcn(chan_list, i); - if (rc < 0) - return rc; - } + for (i = 1; i <= 124; i++) { + if (!bitvec_get_bit_pos(bv, i)) + continue; + rc = freq_list_bm0_set_arfcn(chan_list, i); + if (rc < 0) + return rc; } return 0; } diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok index 26ec931..1a8389d 100644 --- a/tests/gsm0408/gsm0408_test.ok +++ b/tests/gsm0408/gsm0408_test.ok @@ -191,6 +191,6 @@ Testing generation of the Cell Channel Description IE: Case a) only the BCCH carrier: 10 Case b) more carriers from P-GSM band: 1 3 10 64 99 124 -Case c) more carriers from E-GSM band: 1 3 10 64 99 124 +Case c) more carriers from E-GSM band: 0 3 10 64 99 124 975 1001 1023 BTS deallocated OK in test_cell_chan_desc() Done. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27383 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q4 Gerrit-Change-Id: I17739e6845cd84e2a81bc406dd532541f7c52cb6 Gerrit-Change-Number: 27383 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in osmo-bsc[2021q4]: tests/gsm0408: add testing coverage for generate_cell_chan_list()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27382 ) Change subject: tests/gsm0408: add testing coverage for generate_cell_chan_list() ...................................................................... tests/gsm0408: add testing coverage for generate_cell_chan_list() This commit demonstrates what happens when a cell has channels in both P-GSM and E-GSM bands (case 'c'). As can be seen from: Case a) only the BCCH carrier: 10 Case b) more carriers from P-GSM band: 1 3 10 64 99 124 Case c) more carriers from E-GSM band: 1 3 10 64 99 124 in both cases 'b' and 'c' we have the same set of ARFCNs. Carriers from the E-GSM band are not present at all. This is wrong and will be fixed in the follow up change(s). Change-Id: Ied0519c70501f105673a9b36657101063d275058 Related: SYS#5854 --- M tests/gsm0408/gsm0408_test.c M tests/gsm0408/gsm0408_test.ok 2 files changed, 74 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index 90b294e..a7270a4 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -29,6 +29,7 @@ #include <osmocom/bsc/system_information.h> #include <osmocom/bsc/abis_rsl.h> #include <osmocom/bsc/bts.h> +#include <osmocom/bsc/bss.h> #include <osmocom/core/application.h> #include <osmocom/core/byteswap.h> @@ -555,6 +556,71 @@ msgb_free(msg); } +/* Similar to list_arfcn() from system_information.c, but uses printf(). + * Another difference is that the text is printed even if n is 0. */ +static void print_cell_chan_desc(uint8_t *cd, const char *text) +{ + struct gsm_sysinfo_freq freq[1024]; + unsigned int n = 0, i; + + memset(freq, 0, sizeof(freq)); + gsm48_decode_freq_list(freq, cd, 16, 0xce, 1); + + printf("%s:", text); + for (i = 0; i < 1024; i++) { + if (!freq[i].mask) + continue; + printf(" %u", i); + n++; + } + if (!n) + printf(" (empty set)"); + printf("\n"); +} + +static void test_cell_chan_desc(struct gsm_network *net) +{ + struct gsm_bts *bts = bts_init(net); + uint8_t cell_chan_desc[16]; + + printf("Testing generation of the Cell Channel Description IE:\n"); + + bts_model_unknown_init(); + bts->type = GSM_BTS_TYPE_UNKNOWN; + bts->model = bts_model_find(bts->type); + OSMO_ASSERT(bts->model != NULL); + + bts->band = GSM_BAND_900; + bts->c0->arfcn = 10; /* BCCH carrier */ + + /* Case a) only the BCCH carrier */ + bitvec_set_bit_pos(&bts->si_common.cell_alloc, bts->c0->arfcn, ONE); + + OSMO_ASSERT(generate_cell_chan_list(&cell_chan_desc[0], bts) == 0); + print_cell_chan_desc(&cell_chan_desc[0], "Case a) only the BCCH carrier"); + + /* Case b) more carriers from P-GSM band */ + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 1, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 3, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 64, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 99, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 124, ONE); + + OSMO_ASSERT(generate_cell_chan_list(&cell_chan_desc[0], bts) == 0); + print_cell_chan_desc(&cell_chan_desc[0], "Case b) more carriers from P-GSM band"); + + /* Case c) more carriers from E-GSM band */ + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 0, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 975, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 1001, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 1023, ONE); + + OSMO_ASSERT(generate_cell_chan_list(&cell_chan_desc[0], bts) == 0); + print_cell_chan_desc(&cell_chan_desc[0], "Case c) more carriers from E-GSM band"); + + bts_del(bts); +} + static const struct log_info_cat log_categories[] = { }; @@ -591,6 +657,8 @@ test_gsm48_multirate_config(); + test_cell_chan_desc(net); + printf("Done.\n"); return EXIT_SUCCESS; diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok index 0bb7ee0..26ec931 100644 --- a/tests/gsm0408/gsm0408_test.ok +++ b/tests/gsm0408/gsm0408_test.ok @@ -187,4 +187,10 @@ gsm48_multirate_config(): rc=0, lv=0520340bf330 gsm48_multirate_config(): rc=0, lv=0420140bf0 gsm48_multirate_config(): rc=0, lv=022004 +BTS allocation OK in test_cell_chan_desc() +Testing generation of the Cell Channel Description IE: +Case a) only the BCCH carrier: 10 +Case b) more carriers from P-GSM band: 1 3 10 64 99 124 +Case c) more carriers from E-GSM band: 1 3 10 64 99 124 +BTS deallocated OK in test_cell_chan_desc() Done. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27382 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q4 Gerrit-Change-Id: Ied0519c70501f105673a9b36657101063d275058 Gerrit-Change-Number: 27382 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in osmo-bsc[2021q4]: bitvec2freq_list(): fix handling of E-GSM ARFCNs

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27383 ) Change subject: bitvec2freq_list(): fix handling of E-GSM ARFCNs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27383 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q4 Gerrit-Change-Id: I17739e6845cd84e2a81bc406dd532541f7c52cb6 Gerrit-Change-Number: 27383 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 03 Mar 2022 19:25:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-bsc[2021q4]: tests/gsm0408: add testing coverage for generate_cell_chan_list()

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27382 ) Change subject: tests/gsm0408: add testing coverage for generate_cell_chan_list() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27382 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q4 Gerrit-Change-Id: Ied0519c70501f105673a9b36657101063d275058 Gerrit-Change-Number: 27382 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 19:25:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-bsc[2021q1]: tests/gsm0408: add testing coverage for generate_cell_chan_list()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27380 ) Change subject: tests/gsm0408: add testing coverage for generate_cell_chan_list() ...................................................................... tests/gsm0408: add testing coverage for generate_cell_chan_list() This commit demonstrates what happens when a cell has channels in both P-GSM and E-GSM bands (case 'c'). As can be seen from: Case a) only the BCCH carrier: 10 Case b) more carriers from P-GSM band: 1 3 10 64 99 124 Case c) more carriers from E-GSM band: 1 3 10 64 99 124 in both cases 'b' and 'c' we have the same set of ARFCNs. Carriers from the E-GSM band are not present at all. This is wrong and will be fixed in the follow up change(s). Change-Id: Ied0519c70501f105673a9b36657101063d275058 Related: SYS#5854 --- M tests/gsm0408/Makefile.am M tests/gsm0408/gsm0408_test.c M tests/gsm0408/gsm0408_test.ok 3 files changed, 75 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/tests/gsm0408/Makefile.am b/tests/gsm0408/Makefile.am index 571e7e6..b5a1ae5 100644 --- a/tests/gsm0408/Makefile.am +++ b/tests/gsm0408/Makefile.am @@ -29,6 +29,7 @@ $(top_builddir)/src/osmo-bsc/gsm_04_08_rr.o \ $(top_builddir)/src/osmo-bsc/arfcn_range_encode.o \ $(top_builddir)/src/osmo-bsc/bts.o \ + $(top_builddir)/src/osmo-bsc/bts_unknown.o \ $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \ $(top_builddir)/src/osmo-bsc/bts_sm.o \ $(top_builddir)/src/osmo-bsc/bts_trx.o \ diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index 9a1d3cf..2018e53 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -30,6 +30,7 @@ #include <osmocom/bsc/system_information.h> #include <osmocom/bsc/abis_rsl.h> #include <osmocom/bsc/bts.h> +#include <osmocom/bsc/bss.h> #include <osmocom/core/application.h> #include <osmocom/core/byteswap.h> @@ -878,6 +879,71 @@ OSMO_ASSERT(rc == -EINVAL); } +/* Similar to list_arfcn() from system_information.c, but uses printf(). + * Another difference is that the text is printed even if n is 0. */ +static void print_cell_chan_desc(uint8_t *cd, const char *text) +{ + struct gsm_sysinfo_freq freq[1024]; + unsigned int n = 0, i; + + memset(freq, 0, sizeof(freq)); + gsm48_decode_freq_list(freq, cd, 16, 0xce, 1); + + printf("%s:", text); + for (i = 0; i < 1024; i++) { + if (!freq[i].mask) + continue; + printf(" %u", i); + n++; + } + if (!n) + printf(" (empty set)"); + printf("\n"); +} + +static void test_cell_chan_desc(struct gsm_network *net) +{ + struct gsm_bts *bts = bts_init(net); + uint8_t cell_chan_desc[16]; + + printf("Testing generation of the Cell Channel Description IE:\n"); + + bts_model_unknown_init(); + bts->type = GSM_BTS_TYPE_UNKNOWN; + bts->model = bts_model_find(bts->type); + OSMO_ASSERT(bts->model != NULL); + + bts->band = GSM_BAND_900; + bts->c0->arfcn = 10; /* BCCH carrier */ + + /* Case a) only the BCCH carrier */ + bitvec_set_bit_pos(&bts->si_common.cell_alloc, bts->c0->arfcn, ONE); + + OSMO_ASSERT(generate_cell_chan_list(&cell_chan_desc[0], bts) == 0); + print_cell_chan_desc(&cell_chan_desc[0], "Case a) only the BCCH carrier"); + + /* Case b) more carriers from P-GSM band */ + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 1, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 3, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 64, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 99, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 124, ONE); + + OSMO_ASSERT(generate_cell_chan_list(&cell_chan_desc[0], bts) == 0); + print_cell_chan_desc(&cell_chan_desc[0], "Case b) more carriers from P-GSM band"); + + /* Case c) more carriers from E-GSM band */ + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 0, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 975, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 1001, ONE); + bitvec_set_bit_pos(&bts->si_common.cell_alloc, 1023, ONE); + + OSMO_ASSERT(generate_cell_chan_list(&cell_chan_desc[0], bts) == 0); + print_cell_chan_desc(&cell_chan_desc[0], "Case c) more carriers from E-GSM band"); + + bts_del(bts); +} + static const struct log_info_cat log_categories[] = { }; @@ -919,6 +985,8 @@ test_gsm48_multirate_config(); + test_cell_chan_desc(net); + printf("Done.\n"); return EXIT_SUCCESS; diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok index f1aa463..38b5b4b 100644 --- a/tests/gsm0408/gsm0408_test.ok +++ b/tests/gsm0408/gsm0408_test.ok @@ -243,4 +243,10 @@ gsm48_multirate_config(): rc=0, lv=0520340bf330 gsm48_multirate_config(): rc=0, lv=0420140bf0 gsm48_multirate_config(): rc=0, lv=022004 +BTS allocation OK in test_cell_chan_desc() +Testing generation of the Cell Channel Description IE: +Case a) only the BCCH carrier: 10 +Case b) more carriers from P-GSM band: 1 3 10 64 99 124 +Case c) more carriers from E-GSM band: 1 3 10 64 99 124 +BTS deallocated OK in test_cell_chan_desc() Done. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27380 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q1 Gerrit-Change-Id: Ied0519c70501f105673a9b36657101063d275058 Gerrit-Change-Number: 27380 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2022