fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bsc/+/32250 )
Change subject: si2quater: bts_earfcn_add(): do not add duplicate EARFCNs
......................................................................
si2quater: bts_earfcn_add(): do not add duplicate EARFCNs
We don't want to have duplicate EARFCNs in the config file.
The desired behavior is modifying existing EARFCNs.
Change-Id: Ia2fd8bd86d9f093967c1b0b0135151d2d5386dc1
Related: SYS#6401
(cherry picked from commit 143dc67c9955e065468ee8a19881c2c7a3b6a919)
---
M src/osmo-bsc/system_information.c
M tests/gsm0408/gsm0408_test.ok
M tests/si2quater_neighbor_list.vty
3 files changed, 96 insertions(+), 78 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/50/32250/1
diff --git a/src/osmo-bsc/system_information.c
b/src/osmo-bsc/system_information.c
index 1c69bb8..98d563e 100644
--- a/src/osmo-bsc/system_information.c
+++ b/src/osmo-bsc/system_information.c
@@ -220,7 +220,16 @@
uint8_t qrx, uint8_t meas_bw)
{
struct osmo_earfcn_si2q *e = &bts->si_common.si2quater_neigh_list;
- int r = osmo_earfcn_add(e, earfcn, (meas_bw < EARFCN_MEAS_BW_INVALID) ?
meas_bw : OSMO_EARFCN_MEAS_INVALID);
+ int r;
+
+ /* EARFCN may already exist, so we delete it to avoid duplicates */
+ if (osmo_earfcn_del(e, earfcn) == 0)
+ LOGP(DRR, LOGL_NOTICE, "EARFCN %u is already in the list,
modifying\n", earfcn);
+
+ if (meas_bw < EARFCN_MEAS_BW_INVALID)
+ r = osmo_earfcn_add(e, earfcn, meas_bw);
+ else
+ r = osmo_earfcn_add(e, earfcn, OSMO_EARFCN_MEAS_INVALID);
if (r < 0)
return r;
diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok
index 1a8389d..619a297 100644
--- a/tests/gsm0408/gsm0408_test.ok
+++ b/tests/gsm0408/gsm0408_test.ok
@@ -79,93 +79,91 @@
BTS deallocated OK in test_si2q_mu()
BTS allocation OK in test_si2q_long()
Testing SYSINFO_TYPE_2quater combined EARFCN & UARFCN generation:
-generating SI2quater for 17 EARFCNs and 1 UARFCNs...
-generated valid SI2quater [00/05]: [23] 59 06 07 40 a0 25 0f 70 0c 1a 10 9c 00
02 cc 1e 09 07 82 39 76 56 0b
+generating SI2quater for 16 EARFCNs and 1 UARFCNs...
+generated valid SI2quater [00/05]: [23] 59 06 07 40 a0 25 0f 70 0c 1a 10 9c 00
02 cc 1e 09 07 84 d7 2e ca c1
+generated valid SI2quater [01/05]: [23] 59 06 07 42 a0 04 87 00 00 b3 07 83 d8
3c 2e c2 0f f5 cb b2 b0 2b 2b
+generated valid SI2quater [02/05]: [23] 59 06 07 44 a0 04 87 00 00 b3 08 40 c8
42 0d c2 10 a9 cb b2 b0 2b 2b
+generated valid SI2quater [03/05]: [23] 59 06 07 46 a0 04 87 00 00 b3 08 53 d8
42 a6 42 15 6d cb b2 b0 2b 2b
+generated valid SI2quater [04/05]: [23] 59 06 07 48 a0 04 87 00 00 b3 08 56 a8
42 4e c2 12 b1 cb b2 b0 2b 2b
+generated valid SI2quater [05/05]: [23] 59 06 07 4a a0 04 87 00 00 b3 08 4b b8
42 65 39 76 56 0b 2b 2b 2b 2b
+generating SI2quater for 16 EARFCNs and 2 UARFCNs...
+generated valid SI2quater [00/05]: [23] 59 06 07 40 a0 25 0f 70 14 4d e7 00 46
00 01 66 0f 04 72 ec ac 0b 2b
generated valid SI2quater [01/05]: [23] 59 06 07 42 a0 04 87 00 00 b3 07 84 d8
3c 1e c1 e1 75 cb b2 b0 2b 2b
generated valid SI2quater [02/05]: [23] 59 06 07 44 a0 04 87 00 00 b3 08 3f d8
42 06 42 10 6d cb b2 b0 2b 2b
generated valid SI2quater [03/05]: [23] 59 06 07 46 a0 04 87 00 00 b3 08 42 a8
42 9e c2 15 31 cb b2 b0 2b 2b
generated valid SI2quater [04/05]: [23] 59 06 07 48 a0 04 87 00 00 b3 08 55 b8
42 b5 42 12 75 cb b2 b0 2b 2b
generated valid SI2quater [05/05]: [23] 59 06 07 4a a0 04 87 00 00 b3 08 4a c8
42 5d c2 13 29 cb b2 b0 2b 2b
-generating SI2quater for 17 EARFCNs and 2 UARFCNs...
-generated valid SI2quater [00/06]: [23] 59 06 07 40 c0 25 0f 70 14 4d e7 00 46
00 01 66 0f 04 72 ec ac 0b 2b
-generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41
e1 36 0f 07 ae 5d 95 83 2b 2b
-generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 85 d8
41 fe c2 10 31 cb b2 b0 2b 2b
-generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 41 b8
42 15 42 14 f5 cb b2 b0 2b 2b
-generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 54 c8
42 ad c2 15 a9 cb b2 b0 2b 2b
-generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 49 d8
42 56 42 12 ed cb b2 b0 2b 2b
-generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4c a7
2e ca c1 2b 2b 2b 2b 2b 2b 2b
-generating SI2quater for 17 EARFCNs and 3 UARFCNs...
-generated valid SI2quater [00/06]: [23] 59 06 07 40 c0 25 0f 70 1c 4d e7 03 04
87 00 00 b3 07 82 39 76 56 0b
-generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41
e1 36 0f 07 ae 5d 95 83 2b 2b
-generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 85 d8
41 fe c2 10 31 cb b2 b0 2b 2b
-generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 41 b8
42 15 42 14 f5 cb b2 b0 2b 2b
-generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 54 c8
42 ad c2 15 a9 cb b2 b0 2b 2b
-generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 49 d8
42 56 42 12 ed cb b2 b0 2b 2b
-generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4c a7
2e ca c1 2b 2b 2b 2b 2b 2b 2b
-generating SI2quater for 17 EARFCNs and 4 UARFCNs...
+generating SI2quater for 16 EARFCNs and 3 UARFCNs...
+generated valid SI2quater [00/05]: [23] 59 06 07 40 a0 25 0f 70 1c 4d e7 03 04
87 00 00 b3 07 82 39 76 56 0b
+generated valid SI2quater [01/05]: [23] 59 06 07 42 a0 04 87 00 00 b3 07 84 d8
3c 1e c1 e1 75 cb b2 b0 2b 2b
+generated valid SI2quater [02/05]: [23] 59 06 07 44 a0 04 87 00 00 b3 08 3f d8
42 06 42 10 6d cb b2 b0 2b 2b
+generated valid SI2quater [03/05]: [23] 59 06 07 46 a0 04 87 00 00 b3 08 42 a8
42 9e c2 15 31 cb b2 b0 2b 2b
+generated valid SI2quater [04/05]: [23] 59 06 07 48 a0 04 87 00 00 b3 08 55 b8
42 b5 42 12 75 cb b2 b0 2b 2b
+generated valid SI2quater [05/05]: [23] 59 06 07 4a a0 04 87 00 00 b3 08 4a c8
42 5d c2 13 29 cb b2 b0 2b 2b
+generating SI2quater for 16 EARFCNs and 4 UARFCNs...
generated valid SI2quater [00/06]: [23] 59 06 07 40 c0 25 0f 70 24 59 fa 26 73
84 87 00 00 b2 e5 d9 58 2b 2b
-generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41
e0 90 78 4d 72 ec ac 0b 2b 2b
-generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 83 d8
3c 2e c2 0f f5 cb b2 b0 2b 2b
-generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 40 c8
42 0d c2 10 a9 cb b2 b0 2b 2b
-generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 53 d8
42 a6 42 15 6d cb b2 b0 2b 2b
-generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 56 a8
42 4e c2 12 b1 cb b2 b0 2b 2b
-generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4b b8
42 65 39 76 56 0b 2b 2b 2b 2b
-generating SI2quater for 17 EARFCNs and 5 UARFCNs...
+generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41
e1 36 0f 07 ae 5d 95 83 2b 2b
+generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 85 d8
41 fe c2 10 31 cb b2 b0 2b 2b
+generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 41 b8
42 15 42 14 f5 cb b2 b0 2b 2b
+generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 54 c8
42 ad c2 15 a9 cb b2 b0 2b 2b
+generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 49 d8
42 56 42 12 ed cb b2 b0 2b 2b
+generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4c a7
2e ca c1 2b 2b 2b 2b 2b 2b 2b
+generating SI2quater for 16 EARFCNs and 5 UARFCNs...
generated valid SI2quater [00/06]: [23] 59 06 07 40 c0 25 0f 70 2c 59 fa 30 73
f6 04 87 00 00 b2 e5 d9 58 2b
-generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41
e0 90 78 4d 72 ec ac 0b 2b 2b
-generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 83 d8
3c 2e c2 0f f5 cb b2 b0 2b 2b
-generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 40 c8
42 0d c2 10 a9 cb b2 b0 2b 2b
-generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 53 d8
42 a6 42 15 6d cb b2 b0 2b 2b
-generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 56 a8
42 4e c2 12 b1 cb b2 b0 2b 2b
-generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4b b8
42 65 39 76 56 0b 2b 2b 2b 2b
-generating SI2quater for 17 EARFCNs and 6 UARFCNs...
+generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41
e1 36 0f 07 ae 5d 95 83 2b 2b
+generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 85 d8
41 fe c2 10 31 cb b2 b0 2b 2b
+generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 41 b8
42 15 42 14 f5 cb b2 b0 2b 2b
+generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 54 c8
42 ad c2 15 a9 cb b2 b0 2b 2b
+generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 49 d8
42 56 42 12 ed cb b2 b0 2b 2b
+generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4c a7
2e ca c1 2b 2b 2b 2b 2b 2b 2b
+generating SI2quater for 16 EARFCNs and 6 UARFCNs...
generated valid SI2quater [00/06]: [23] 59 06 07 40 c0 25 0f 70 34 f1 ae 15 f3
f4 83 03 2b 2b 2b 2b 2b 2b 2b
-generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41
e0 90 78 4d 72 ec ac 0b 2b 2b
-generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 83 d8
3c 2e c2 0f f5 cb b2 b0 2b 2b
-generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 40 c8
42 0d c2 10 a9 cb b2 b0 2b 2b
-generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 53 d8
42 a6 42 15 6d cb b2 b0 2b 2b
-generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 56 a8
42 4e c2 12 b1 cb b2 b0 2b 2b
-generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4b b8
42 65 39 76 56 0b 2b 2b 2b 2b
-generating SI2quater for 17 EARFCNs and 7 UARFCNs...
+generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41
e1 36 0f 07 ae 5d 95 83 2b 2b
+generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 85 d8
41 fe c2 10 31 cb b2 b0 2b 2b
+generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 41 b8
42 15 42 14 f5 cb b2 b0 2b 2b
+generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 54 c8
42 ad c2 15 a9 cb b2 b0 2b 2b
+generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 49 d8
42 56 42 12 ed cb b2 b0 2b 2b
+generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4c a7
2e ca c1 2b 2b 2b 2b 2b 2b 2b
+generating SI2quater for 16 EARFCNs and 7 UARFCNs...
generated valid SI2quater [00/06]: [23] 59 06 07 40 c0 25 0f 70 3c f1 ae 15 f3
f4 83 01 83 2b 2b 2b 2b 2b 2b
-generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41
e0 90 78 4d 72 ec ac 0b 2b 2b
-generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 83 d8
3c 2e c2 0f f5 cb b2 b0 2b 2b
-generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 40 c8
42 0d c2 10 a9 cb b2 b0 2b 2b
-generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 53 d8
42 a6 42 15 6d cb b2 b0 2b 2b
-generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 56 a8
42 4e c2 12 b1 cb b2 b0 2b 2b
-generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4b b8
42 65 39 76 56 0b 2b 2b 2b 2b
-generating SI2quater for 17 EARFCNs and 8 UARFCNs...
+generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41
e1 36 0f 07 ae 5d 95 83 2b 2b
+generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 85 d8
41 fe c2 10 31 cb b2 b0 2b 2b
+generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 41 b8
42 15 42 14 f5 cb b2 b0 2b 2b
+generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 54 c8
42 ad c2 15 a9 cb b2 b0 2b 2b
+generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 49 d8
42 56 42 12 ed cb b2 b0 2b 2b
+generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4c a7
2e ca c1 2b 2b 2b 2b 2b 2b 2b
+generating SI2quater for 16 EARFCNs and 8 UARFCNs...
generated valid SI2quater [00/06]: [23] 59 06 07 40 c0 25 0f 70 45 19 a0 0d 7d
7e a6 19 e7 0b 2b 2b 2b 2b 2b
-generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41
e0 90 78 4d 72 ec ac 0b 2b 2b
-generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 83 d8
3c 2e c2 0f f5 cb b2 b0 2b 2b
-generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 40 c8
42 0d c2 10 a9 cb b2 b0 2b 2b
-generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 53 d8
42 a6 42 15 6d cb b2 b0 2b 2b
-generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 56 a8
42 4e c2 12 b1 cb b2 b0 2b 2b
-generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4b b8
42 65 39 76 56 0b 2b 2b 2b 2b
-generating SI2quater for 17 EARFCNs and 9 UARFCNs...
+generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41
e1 36 0f 07 ae 5d 95 83 2b 2b
+generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 85 d8
41 fe c2 10 31 cb b2 b0 2b 2b
+generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 41 b8
42 15 42 14 f5 cb b2 b0 2b 2b
+generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 54 c8
42 ad c2 15 a9 cb b2 b0 2b 2b
+generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 49 d8
42 56 42 12 ed cb b2 b0 2b 2b
+generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4c a7
2e ca c1 2b 2b 2b 2b 2b 2b 2b
+generating SI2quater for 16 EARFCNs and 9 UARFCNs...
generated valid SI2quater [00/06]: [23] 59 06 07 40 c0 25 0f 70 4d 19 a0 26 fd
66 a6 03 e7 fa 0b 2b 2b 2b 2b
-generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41
e0 90 78 4d 72 ec ac 0b 2b 2b
-generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 83 d8
3c 2e c2 0f f5 cb b2 b0 2b 2b
-generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 40 c8
42 0d c2 10 a9 cb b2 b0 2b 2b
-generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 53 d8
42 a6 42 15 6d cb b2 b0 2b 2b
-generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 56 a8
42 4e c2 12 b1 cb b2 b0 2b 2b
-generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4b b8
42 65 39 76 56 0b 2b 2b 2b 2b
-generating SI2quater for 17 EARFCNs and 10 UARFCNs...
+generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41
e1 36 0f 07 ae 5d 95 83 2b 2b
+generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 85 d8
41 fe c2 10 31 cb b2 b0 2b 2b
+generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 41 b8
42 15 42 14 f5 cb b2 b0 2b 2b
+generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 54 c8
42 ad c2 15 a9 cb b2 b0 2b 2b
+generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 49 d8
42 56 42 12 ed cb b2 b0 2b 2b
+generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4c a7
2e ca c1 2b 2b 2b 2b 2b 2b 2b
+generating SI2quater for 16 EARFCNs and 10 UARFCNs...
generated valid SI2quater [00/06]: [23] 59 06 07 40 c0 25 0f 70 55 47 89 1e fd
7c b0 00 e7 9b b0 2b 2b 2b 2b
-generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41
e0 90 78 4d 72 ec ac 0b 2b 2b
-generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 83 d8
3c 2e c2 0f f5 cb b2 b0 2b 2b
-generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 40 c8
42 0d c2 10 a9 cb b2 b0 2b 2b
-generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 53 d8
42 a6 42 15 6d cb b2 b0 2b 2b
-generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 56 a8
42 4e c2 12 b1 cb b2 b0 2b 2b
-generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4b b8
42 65 39 76 56 0b 2b 2b 2b 2b
-generating SI2quater for 17 EARFCNs and 11 UARFCNs...
+generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41
e1 36 0f 07 ae 5d 95 83 2b 2b
+generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 85 d8
41 fe c2 10 31 cb b2 b0 2b 2b
+generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 41 b8
42 15 42 14 f5 cb b2 b0 2b 2b
+generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 54 c8
42 ad c2 15 a9 cb b2 b0 2b 2b
+generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 49 d8
42 56 42 12 ed cb b2 b0 2b 2b
+generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4c a7
2e ca c1 2b 2b 2b 2b 2b 2b 2b
+generating SI2quater for 16 EARFCNs and 11 UARFCNs...
generated valid SI2quater [00/06]: [23] 59 06 07 40 c0 25 0f 70 5d 47 89 1e fd
7c b0 01 67 9b b3 f8 2b 2b 2b
-generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41
e0 90 78 4d 72 ec ac 0b 2b 2b
-generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 83 d8
3c 2e c2 0f f5 cb b2 b0 2b 2b
-generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 40 c8
42 0d c2 10 a9 cb b2 b0 2b 2b
-generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 53 d8
42 a6 42 15 6d cb b2 b0 2b 2b
-generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 56 a8
42 4e c2 12 b1 cb b2 b0 2b 2b
-generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4b b8
42 65 39 76 56 0b 2b 2b 2b 2b
+generated valid SI2quater [01/06]: [23] 59 06 07 42 c0 04 87 00 00 b3 07 82 41
e1 36 0f 07 ae 5d 95 83 2b 2b
+generated valid SI2quater [02/06]: [23] 59 06 07 44 c0 04 87 00 00 b3 07 85 d8
41 fe c2 10 31 cb b2 b0 2b 2b
+generated valid SI2quater [03/06]: [23] 59 06 07 46 c0 04 87 00 00 b3 08 41 b8
42 15 42 14 f5 cb b2 b0 2b 2b
+generated valid SI2quater [04/06]: [23] 59 06 07 48 c0 04 87 00 00 b3 08 54 c8
42 ad c2 15 a9 cb b2 b0 2b 2b
+generated valid SI2quater [05/06]: [23] 59 06 07 4a c0 04 87 00 00 b3 08 49 d8
42 56 42 12 ed cb b2 b0 2b 2b
+generated valid SI2quater [06/06]: [23] 59 06 07 4c c0 04 87 00 00 b3 08 4c a7
2e ca c1 2b 2b 2b 2b 2b 2b 2b
BTS deallocated OK in test_si2q_long()
BTS allocation OK in test_si_ba_ind()
Testing if BA-IND is set as expected in SI2xxx and SI5xxx
diff --git a/tests/si2quater_neighbor_list.vty
b/tests/si2quater_neighbor_list.vty
index ea353f2..0aa1c23 100644
--- a/tests/si2quater_neighbor_list.vty
+++ b/tests/si2quater_neighbor_list.vty
@@ -95,14 +95,12 @@
OsmoBSC(config-net-bts)# ### EARFCN add command: EARFCN already exists
-OsmoBSC(config-net-bts)# ### FIXME: osmo-bsc adds a duplicate EARFCN
OsmoBSC(config-net-bts)# si2quater neighbor-list add earfcn 300 thresh-hi 7
thresh-lo 5 prio 5 qrxlv 6 meas 2
OsmoBSC(config-net-bts)# show running-config
...
bts 0
... !si2quater neighbor-list
si2quater neighbor-list add earfcn 0 thresh-hi 7 thresh-lo 5 prio 5 qrxlv 6
meas 8
- si2quater neighbor-list add earfcn 300 thresh-hi 7 thresh-lo 5 prio 5 qrxlv
6 meas 5
si2quater neighbor-list add earfcn 300 thresh-hi 7 thresh-lo 5 prio 5 qrxlv
6 meas 2
... !si2quater neighbor-list
@@ -110,7 +108,6 @@
OsmoBSC(config-net-bts)# ### Remove remaining EARFCNs
OsmoBSC(config-net-bts)# si2quater neighbor-list del earfcn 0
OsmoBSC(config-net-bts)# si2quater neighbor-list del earfcn 300
-OsmoBSC(config-net-bts)# si2quater neighbor-list del earfcn 300
OsmoBSC(config-net-bts)# show running-config
... !si2quater neighbor-list
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32250
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: 2023q1
Gerrit-Change-Id: Ia2fd8bd86d9f093967c1b0b0135151d2d5386dc1
Gerrit-Change-Number: 32250
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <[email protected]>
Gerrit-MessageType: newchange
