laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/38086?usp=email )

Change subject: tests/ctrl/osmo-bsc-neigh-test.cfg: Fix duplicate <LAC,CI> between bts1 and bts2 ......................................................................

tests/ctrl/osmo-bsc-neigh-test.cfg: Fix duplicate <LAC,CI> between bts1 and bts2

According to TS23.003, CI should be unique in a LAC. Previous commit wrongly introduced a while ago a new "bts 2" with same LAC and CI as "bts 1" in config file.

This makes current tests fails once a hashtable is added to lookup bts by lac, since the hashtable code does prepend new bts instead of appending them. As a result, bts 2 is returned instead of bts 1 being previously returned.

Also change the ARFCN+BSIC since it was also duplicated. It makes not much sense to have 2 neighbor BTS with same ARFCN+BSIC.

Fixes: 97ed3c8d971f3c231a1303efe61b3f98116f1e2f Change-Id: I7d1ebd529e050ecb4c14b9d3523637e4c8c87e1d --- M tests/ctrl/osmo-bsc-neigh-test.cfg 1 file changed, 3 insertions(+), 3 deletions(-)

Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified

diff --git a/tests/ctrl/osmo-bsc-neigh-test.cfg b/tests/ctrl/osmo-bsc-neigh-test.cfg index d6a5c9d..35ff2cc 100644 --- a/tests/ctrl/osmo-bsc-neigh-test.cfg +++ b/tests/ctrl/osmo-bsc-neigh-test.cfg @@ -137,9 +137,9 @@ bts 2 type osmo-bts band DCS1800 - cell_identity 123 + cell_identity 124 location_area_code 0x0001 - base_station_id_code 55 + base_station_id_code 56 ms max power 15 cell reselection hysteresis 4 rxlev access min 0 @@ -158,7 +158,7 @@ gprs routing area 6 trx 0 rf_locked 0 - arfcn 880 + arfcn 881 nominal power 23 ! to use full TRX power, set max_power_red 0 max_power_red 20