fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32201 )

Change subject: si2quater: return CMD_SUCCESS if UARFCN is already added ......................................................................

si2quater: return CMD_SUCCESS if UARFCN is already added

Change-Id: Iadc884aa8968e2dc01adf26ba68ba9597fa05d94 Related: SYS#6401 --- M src/osmo-bsc/bts_vty.c M tests/si2quater_neighbor_list.vty 2 files changed, 14 insertions(+), 4 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/01/32201/1

diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index 30f9c72..45f218c 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -2128,9 +2128,9 @@ arfcn, scramble, VTY_NEWLINE); return CMD_WARNING; case -EADDRINUSE: - vty_out(vty, "%% Unable to add UARFCN: (%u, %u) is already added%s", + vty_out(vty, "%% UARFCN: (%u, %u) is already added%s", arfcn, scramble, VTY_NEWLINE); - return CMD_WARNING; + return CMD_SUCCESS; }

return CMD_SUCCESS; diff --git a/tests/si2quater_neighbor_list.vty b/tests/si2quater_neighbor_list.vty index dbb8d2a..61ae7ef 100644 --- a/tests/si2quater_neighbor_list.vty +++ b/tests/si2quater_neighbor_list.vty @@ -150,9 +150,9 @@

OsmoBSC(config-net-bts)# ### Adding duplicate UARFCN is not allowed OsmoBSC(config-net-bts)# si2quater neighbor-list add uarfcn 111 511 1 -% Unable to add UARFCN: (111, 511) is already added +% 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 +% UARFCN: (111, 511) is already added

OsmoBSC(config-net-bts)# ### FIXME: UARFCN 0 cannot be added