diff options
author | Neels Hofmeyr <neels@hofmeyr.de> | 2020-07-04 00:53:07 +0200 |
---|---|---|
committer | laforge <laforge@osmocom.org> | 2020-07-08 15:27:50 +0000 |
commit | 666f043de68153ff50842515671654f64e0dbadd (patch) | |
tree | b6fe74f17f3b88c27c6c8b8c51a0ffa6d4a1cc72 | |
parent | 0b7365bb5779afb7fccc8b0fc4f7363fe7845b5f (diff) |
bsc: change f_bts_0_cfg() to take a VTY port arg
Remove the 'runs on' clause, add a VTY port argument.
That allows using this function also on the test_CT.
Will be used by upcoming System Information tests.
Change-Id: Ib059d9690f92f5f76025bca2b84496716a2a4cf0
-rw-r--r-- | bsc/BSC_Tests.ttcn | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index f6e1b2c4..784375a2 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -3020,7 +3020,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"}); + f_bts_0_cfg(BSCVTY, {"neighbor bts 1"}); var HandoverState hs := { rr_ho_cmpl_seen := false, @@ -3102,7 +3102,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_bts_0_cfg(BSCVTY, {"neighbor lac 99 arfcn 123 bsic any"}); f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any"); BSSAP.receive(tr_BSSMAP_HandoverRequired); @@ -3169,7 +3169,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_bts_0_cfg(BSCVTY, {"neighbor lac 99 arfcn 123 bsic any"}); f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any"); BSSAP.receive(tr_BSSMAP_HandoverRequired); @@ -3216,7 +3216,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_bts_0_cfg(BSCVTY, {"neighbor lac 99 arfcn 123 bsic any"}); f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any"); BSSAP.receive(tr_BSSMAP_HandoverRequired); @@ -3301,7 +3301,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_bts_0_cfg(BSCVTY, {"neighbor lac 99 arfcn 123 bsic any"}); f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any"); BSSAP.receive(tr_BSSMAP_HandoverRequired); @@ -3760,13 +3760,13 @@ testcase TC_ho_in_fail_no_detect2() runs on test_CT { type record of charstring Commands; -private function f_bts_0_cfg(Commands cmds := {}) runs on MSC_ConnHdlr +private function f_bts_0_cfg(TELNETasp_PT pt, Commands cmds := {}) { - f_vty_enter_cfg_bts(BSCVTY, 0); + f_vty_enter_cfg_bts(pt, 0); for (var integer i := 0; i < sizeof(cmds); i := i+1) { - f_vty_transceive(BSCVTY, cmds[i]); + f_vty_transceive(pt, cmds[i]); } - f_vty_transceive(BSCVTY, "end"); + f_vty_transceive(pt, "end"); } private function f_cs7_inst_0_cfg(TELNETasp_PT pt, Commands cmds := {}) @@ -3920,7 +3920,7 @@ private function f_tc_ho_neighbor_config_1(charstring id) runs on MSC_ConnHdlr { */ log("f_tc_ho_neighbor_config: 1. No 'neighbor' config"); - f_bts_0_cfg({"no neighbors"}); + f_bts_0_cfg(BSCVTY, {"no neighbors"}); f_probe_for_handover("1.a", "HO to bts 1 works, implicitly listed as neighbor (legacy behavior when none are configured)", "handover any to arfcn 871 bsic 11", true); @@ -3948,7 +3948,7 @@ private function f_tc_ho_neighbor_config_2(charstring id) runs on MSC_ConnHdlr { */ log("f_tc_ho_neighbor_config: 2. explicit local neighbor: 'neighbor bts 1'"); - f_bts_0_cfg({"neighbor bts 1"}); + f_bts_0_cfg(BSCVTY, {"neighbor bts 1"}); f_sleep(0.5); f_probe_for_handover("2.a", "HO to bts 1 works, explicitly listed as neighbor", @@ -3970,7 +3970,7 @@ private function f_tc_ho_neighbor_config_3(charstring id) runs on MSC_ConnHdlr { */ log("f_tc_ho_neighbor_config: 3. explicit local neighbor: 'neighbor bts 2'"); - f_bts_0_cfg({"no neighbors", "neighbor bts 2"}); + f_bts_0_cfg(BSCVTY, {"no neighbors", "neighbor bts 2"}); f_sleep(0.5); f_probe_for_handover("3.a", "HO to bts 1 doesn't work, not listed as neighbor", @@ -3991,7 +3991,7 @@ private function f_tc_ho_neighbor_config_4(charstring id) runs on MSC_ConnHdlr { */ log("f_tc_ho_neighbor_config: 4. explicit remote neighbor: 'neighbor lac 99 arfcn 123 bsic 45'"); - f_bts_0_cfg({"no neighbors", "neighbor lac 99 arfcn 123 bsic 45"}); + f_bts_0_cfg(BSCVTY, {"no neighbors", "neighbor lac 99 arfcn 123 bsic 45"}); f_sleep(0.5); f_probe_for_handover("4.a", "HO to bts 1 doesn't work, not listed as neighbor", @@ -4015,7 +4015,7 @@ private function f_tc_ho_neighbor_config_5(charstring id) runs on MSC_ConnHdlr { */ log("f_tc_ho_neighbor_config: 5. explicit remote neighbor re-using ARFCN+BSIC: 'neighbor lac 99 arfcn 871 bsic 12'"); - f_bts_0_cfg({"no neighbors", "neighbor lac 99 arfcn 871 bsic 12"}); + f_bts_0_cfg(BSCVTY, {"no neighbors", "neighbor lac 99 arfcn 871 bsic 12"}); f_sleep(0.5); f_probe_for_handover("5.a", "HO to 871-12 triggers inter-BSC HO (ignoring local cells with same ARFCN+BSIC)", @@ -4034,7 +4034,7 @@ private function f_tc_ho_neighbor_config_6(charstring id) runs on MSC_ConnHdlr { log("f_tc_ho_neighbor_config: 6. config error: explicit local and remote neighbors with ambiguous ARFCN+BSIC:" & " 'neighbor bts 2; neighbor lac 99 arfcn 871 bsic 12'"); - f_bts_0_cfg({"no neighbors", "neighbor bts 2", "neighbor lac 99 arfcn 871 bsic 12"}); + f_bts_0_cfg(BSCVTY, {"no neighbors", "neighbor bts 2", "neighbor lac 99 arfcn 871 bsic 12"}); f_sleep(0.5); f_probe_for_handover("6.a", "HO to 871-12 is ambiguous = error", @@ -4053,7 +4053,7 @@ private function f_tc_ho_neighbor_config_7(charstring id) runs on MSC_ConnHdlr { log("f_tc_ho_neighbor_config: 7. explicit local and remote neighbors:" & " 'neighbor bts 2; neighbor lac 99 arfcn 123 bsic 45'"); - f_bts_0_cfg({"no neighbors", "neighbor bts 2", "neighbor lac 99 arfcn 123 bsic 45"}); + f_bts_0_cfg(BSCVTY, {"no neighbors", "neighbor bts 2", "neighbor lac 99 arfcn 123 bsic 45"}); f_sleep(0.5); f_probe_for_handover("7.a", "HO to 871-12 does HO to bts 2", |