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

si2quater: bts_uarfcn_add(): modify existsing UARFCNs 

Do not print an error, modify the existsing UARFCNs instead.

Change-Id: Iadc884aa8968e2dc01adf26ba68ba9597fa05d94
Related: SYS#6401
changes/01/32201/3
Vadim Yanitskiy 2023-04-04 02:46:12 +07:00 committed by laforge
parent a60d74ba9c
commit 117c699107
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/osmo-bsc/bts_vty.c
View File

@ -2127,10 +2127,6 @@ DEFUN_USRATTR(cfg_bts_si2quater_uarfcn_add,
vty_out(vty, "%% Warning: not enough space in SI2quater for a given UARFCN (%u, %u)%s",
arfcn, scramble, VTY_NEWLINE);
return CMD_WARNING;
case -EADDRINUSE:
vty_out(vty, "%% Unable to add UARFCN: (%u, %u) is already added%s",
arfcn, scramble, VTY_NEWLINE);
return CMD_WARNING;
}
return CMD_SUCCESS;

9
src/osmo-bsc/system_information.c
View File

@ -302,8 +302,13 @@ int bts_uarfcn_add(struct gsm_bts *bts, uint16_t arfcn, uint16_t scramble, bool
*ual = bts->si_common.data.uarfcn_list,
*scl = bts->si_common.data.scramble_list;
if (pos >= 0)
return -EADDRINUSE;
if (pos >= 0) {
LOGP(DRR, LOGL_NOTICE,
"EARFCN (%u, %u) is already in the list, modifying\n",
arfcn, scramble);
scl[pos] = scr;
return 0;
}
if (len == MAX_EARFCN_LIST)
return -ENOMEM;

11
tests/si2quater_neighbor_list.vty
View File

@ -148,11 +148,16 @@ OsmoBSC(config-net-bts)# show running-config
... !si2quater neighbor-list
OsmoBSC(config-net-bts)# ### Adding duplicate UARFCN is not allowed
OsmoBSC(config-net-bts)# ### UARFCN add command: UARFCN already exists
OsmoBSC(config-net-bts)# si2quater neighbor-list add uarfcn 111 511 1
% Unable to add UARFCN: (111, 511) is already added
OsmoBSC(config-net-bts)# si2quater neighbor-list add uarfcn 111 511 0
% Unable to add UARFCN: (111, 511) is already added
OsmoBSC(config-net-bts)# show running-config
...
bts 0
... !si2quater neighbor-list
si2quater neighbor-list add uarfcn 111 511 0
si2quater neighbor-list add uarfcn 111 211 1
... !si2quater neighbor-list
OsmoBSC(config-net-bts)# ### FIXME: UARFCN 0 cannot be added