bsc: fix ho-out test failures: cleanup neighbor cfg cruft
In the out-of-this-BSC handover tests, a neighbor config of LAC 99 left
behind from a previous test obstructed the test from working:
% BTS 0 already had neighbor LAC:99 ARFCN-BSIC:123-45
% ERROR: duplicate Cell ID in neighbor config, with differing ARFCN+BSIC: LAC:99 ARFCN-BSIC:123-any
Add a 'no neighbor lac 99' before configuring the neighbor via VTY.
Also add the missing neighbor config to
f_tc_srvcc_eutran_to_geran_ho_out_main().
Affects tests:
BSC_Tests.TC_ho_out_of_this_bsc
BSC_Tests.TC_srvcc_eutran_to_geran_ho_out
BSC_Tests.TC_srvcc_eutran_to_geran_ho_out_forbid_fast_return
Change-Id: I7a7c97a47a06abb59c0d89638c6b503ab66eb359
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 5276ed9..c485ec5 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -5616,6 +5616,7 @@
"handover 1",
"handover algorithm 2",
"handover2 window rxlev averaging 1",
+ "no neighbors",
"neighbor lac 99 arfcn 123 bsic any"});
f_vty_transceive(BSCVTY, "drop bts connection 0 oml");
@@ -5687,7 +5688,7 @@
var template PDU_BSSAP exp_compl := f_gen_exp_compl();
f_establish_fully(ass_req, exp_compl);
- f_bts_0_cfg(BSCVTY, {"neighbor lac 99 arfcn 123 bsic any"});
+ f_bts_0_cfg(BSCVTY, {"no neighbor lac 99", "neighbor lac 99 arfcn 123 bsic any"});
f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any");
BSSAP.receive(tr_BSSMAP_HandoverRequired);
@@ -5731,7 +5732,7 @@
var template PDU_BSSAP exp_compl := f_gen_exp_compl();
f_establish_fully(ass_req, exp_compl);
- f_bts_0_cfg(BSCVTY, {"neighbor lac 99 arfcn 123 bsic any"});
+ f_bts_0_cfg(BSCVTY, {"no neighbor lac 99", "neighbor lac 99 arfcn 123 bsic any"});
f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any");
BSSAP.receive(tr_BSSMAP_HandoverRequired);
@@ -5813,7 +5814,7 @@
var template PDU_BSSAP exp_compl := f_gen_exp_compl();
f_establish_fully(ass_req, exp_compl);
- f_bts_0_cfg(BSCVTY, {"neighbor lac 99 arfcn 123 bsic any"});
+ f_bts_0_cfg(BSCVTY, {"no neighbor lac 99", "neighbor lac 99 arfcn 123 bsic any"});
f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any");
BSSAP.receive(tr_BSSMAP_HandoverRequired);
@@ -6099,6 +6100,16 @@
var MSC_ConnHdlr vc_conn;
var TestHdlrParams pars := f_gen_test_hdlr_pars();
+ f_init_vty();
+ f_bts_0_cfg(BSCVTY,
+ {"neighbor-list mode automatic",
+ "handover 1",
+ "handover algorithm 2",
+ "handover2 window rxlev averaging 1",
+ "no neighbors",
+ "neighbor lac 99 arfcn 123 bsic any"});
+ f_vty_transceive(BSCVTY, "drop bts connection 0 oml");
+
f_init(1, true);
if (disable_fast_return) {
f_vty_allow_srvcc_fast_return(true, 0);