fix TC_ho_int; make neighbor config more robust
Since osmo-bsc commit "neighbor config: allow re-using ARFCN+BSIC pairs" (I29bca59ab232eddc74e0d4698efb9c9992443983), osmo-bsc considers only those cells as neighbors that are explicitly listed, or all local cells if none are listed. This lead to breaking TC_ho_int, because the osmo-bsc.cfg has only one remote-cell neighbor for bts 0, and hence a handover to local cell bts 1 is now regarded as invalid. The remote-cell neighbor is needed for inter-BSC handover tests; also consider that the TC_ho_neighbor_config_* tests each place individual neighbor configuration by live VTY interaction. Hence make all of these tests more robust: remove the neighbor config from the osmo-bsc.cfg file, and instead include VTY interaction for each test case that sets the particularly needed neighbor configuration at runtime. An analogous osmo-bsc.cfg change in docker-playground is in change If44dd6b578cdc55076c8180707d1c2d69fe5f2a8. (It is not actually harmful to leave the neighbor config in osmo-bsc.cfg, but remove that since it is also not needed anymore.) Change-Id: If44dd6b578cdc55076c8180707d1c2d69fe5f2a8
This commit is contained in:
parent
9140101cb0
commit
7e2769f3b1
|
@ -2863,6 +2863,7 @@ private function f_tc_ho_int(charstring id) runs on MSC_ConnHdlr {
|
|||
ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR}));
|
||||
|
||||
f_establish_fully(ass_cmd, exp_compl);
|
||||
f_bts_0_cfg({"neighbor bts 1"});
|
||||
|
||||
var HandoverState hs := {
|
||||
rr_ho_cmpl_seen := false,
|
||||
|
@ -2944,6 +2945,7 @@ private function f_tc_ho_out_of_this_bsc(charstring id) runs on MSC_ConnHdlr {
|
|||
var template PDU_BSSAP exp_compl := f_gen_exp_compl();
|
||||
f_establish_fully(ass_req, exp_compl);
|
||||
|
||||
f_bts_0_cfg({"neighbor lac 99 arfcn 123 bsic any"});
|
||||
f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any");
|
||||
|
||||
BSSAP.receive(tr_BSSMAP_HandoverRequired);
|
||||
|
@ -3010,6 +3012,7 @@ private function f_tc_ho_out_fail_no_msc_response(charstring id) runs on MSC_Con
|
|||
var template PDU_BSSAP exp_compl := f_gen_exp_compl();
|
||||
f_establish_fully(ass_req, exp_compl);
|
||||
|
||||
f_bts_0_cfg({"neighbor lac 99 arfcn 123 bsic any"});
|
||||
f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any");
|
||||
|
||||
BSSAP.receive(tr_BSSMAP_HandoverRequired);
|
||||
|
@ -3056,6 +3059,7 @@ private function f_tc_ho_out_fail_rr_ho_failure(charstring id) runs on MSC_ConnH
|
|||
var template PDU_BSSAP exp_compl := f_gen_exp_compl();
|
||||
f_establish_fully(ass_req, exp_compl);
|
||||
|
||||
f_bts_0_cfg({"neighbor lac 99 arfcn 123 bsic any"});
|
||||
f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any");
|
||||
|
||||
BSSAP.receive(tr_BSSMAP_HandoverRequired);
|
||||
|
@ -3140,6 +3144,7 @@ private function f_tc_ho_out_fail_no_result_after_ho_cmd(charstring id) runs on
|
|||
var template PDU_BSSAP exp_compl := f_gen_exp_compl();
|
||||
f_establish_fully(ass_req, exp_compl);
|
||||
|
||||
f_bts_0_cfg({"neighbor lac 99 arfcn 123 bsic any"});
|
||||
f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any");
|
||||
|
||||
BSSAP.receive(tr_BSSMAP_HandoverRequired);
|
||||
|
|
|
@ -88,8 +88,6 @@ network
|
|||
early-classmark-sending forbidden
|
||||
ip.access unit_id 1234 0
|
||||
oml ip.access stream_id 255 line 0
|
||||
# remote-BSS neighbor:
|
||||
neighbor lac 99 arfcn 123 bsic any
|
||||
neighbor-list mode manual-si5
|
||||
neighbor-list add arfcn 100
|
||||
neighbor-list add arfcn 200
|
||||
|
|
Loading…
Reference in New Issue