summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2019-07-13 05:37:29 +0200
committerNeels Hofmeyr <neels@hofmeyr.de>2019-07-13 05:55:29 +0200
commit163d8d855ab99ecb31b9f459d33b904740f7a296 (patch)
treea8486af182bbde83dd501e7fd6506fda3c70603c
parent231cf812558fbef2874ba120e5ee9f67c4f7c961 (diff)
use vty logp for f_probe_for_handover()
This reverts commit f76babd86048b89163580869a1b52de62d435a0a. Change-Id: I31caec2986a93f069dbb7bacbe757f9337fb19f0
-rw-r--r--bsc/BSC_Tests.ttcn28
1 files changed, 17 insertions, 11 deletions
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 4497a2e..cb21aa2 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -3607,6 +3607,12 @@ private function f_bts_0_cfg(Commands cmds := {}) runs on MSC_ConnHdlr
f_vty_transceive(BSCVTY, "end");
}
+private function f_logp(charstring log_msg) runs on MSC_ConnHdlr
+{
+ log(log_msg);
+ f_vty_transceive(BSCVTY, "logp " & log_msg);
+}
+
private function f_probe_for_handover(charstring log_label,
charstring log_descr,
charstring handover_vty_cmd,
@@ -3620,7 +3626,7 @@ runs on MSC_ConnHdlr
if (not expect_handover) {
log_msg := " (expecting NO handover)";
}
- log("f_probe_for_handover starting: " & log_label & ": " & log_descr & log_msg);
+ f_logp("f_probe_for_handover starting: " & log_label & ": " & log_descr & log_msg);
f_vty_transceive(BSCVTY, handover_vty_cmd);
/* We're going to thwart any and all handover attempts, just be ready to handle (and ignore) handover target
@@ -3653,13 +3659,13 @@ runs on MSC_ConnHdlr
if (expect_handover and not is_inter_bsc_handover) {
setverdict(pass);
- log("f_probe_for_handover(" & log_label & "): Got RSL Handover Command as expected.");
+ f_logp("f_probe_for_handover(" & log_label & "): Got RSL Handover Command as expected.");
} else {
setverdict(fail, "f_probe_for_handover(" & log_label & "): Expected none, but got RSL Handover Command. "
& log_label & ": " & log_descr);
}
- log("f_probe_for_handover(" & log_label & "): Ending the test: Handover Failure stops the procedure.");
+ f_logp("f_probe_for_handover(" & log_label & "): Ending the test: Handover Failure stops the procedure.");
/* osmo-bsc has triggered Handover. That's all we need to know for this test, reply with
* Handover Failure. */
f_rsl_send_l3(ts_RRM_HandoverFailure('00'O));
@@ -3668,7 +3674,7 @@ runs on MSC_ConnHdlr
f_sleep(0.5);
RSL1.clear;
RSL2.clear;
- log("f_probe_for_handover(" & log_label & "): done (got RSL Handover Command)");
+ f_logp("f_probe_for_handover(" & log_label & "): done (got RSL Handover Command)");
break;
} else {
repeat;
@@ -3677,20 +3683,20 @@ runs on MSC_ConnHdlr
[] BSSAP.receive(tr_BSSMAP_HandoverRequired) {
if (expect_handover and is_inter_bsc_handover) {
setverdict(pass);
- log("f_probe_for_handover(" & log_label & "): Got BSSMAP Handover Required as expected.");
+ f_logp("f_probe_for_handover(" & log_label & "): Got BSSMAP Handover Required as expected.");
} else {
setverdict(fail, "f_probe_for_handover(" & log_label & "): Expected none, but got BSSMAP Handover Required. "
& log_label & ": " & log_descr);
}
- log("f_probe_for_handover(" & log_label & "): done (got BSSMAP Handover Required)");
+ f_logp("f_probe_for_handover(" & log_label & "): done (got BSSMAP Handover Required)");
/* Note: f_tc_ho_neighbor_config_start() sets T7, the timeout for BSSMAP Handover Required, to
* 1 second. There is no legal way to quickly abort a handover after a BSSMAP Handover Required,
* setting a short timeout and waiting is the only way. */
- log("f_probe_for_handover(" & log_label & "): waiting for inter-BSC HO to time out...");
+ f_logp("f_probe_for_handover(" & log_label & "): waiting for inter-BSC HO to time out...");
f_sleep(1.5);
- log("f_probe_for_handover(" & log_label & "): ...done");
+ f_logp("f_probe_for_handover(" & log_label & "): ...done");
break;
}
@@ -3700,9 +3706,9 @@ runs on MSC_ConnHdlr
& log_label & ": " & log_descr);
} else {
setverdict(pass);
- log("f_probe_for_handover(" & log_label & "): Got no Handover, as expected.");
+ f_logp("f_probe_for_handover(" & log_label & "): Got no Handover, as expected.");
}
- log("f_probe_for_handover(" & log_label & "): done (got no Handover)");
+ f_logp("f_probe_for_handover(" & log_label & "): done (got no Handover)");
break;
}
}
@@ -3712,7 +3718,7 @@ runs on MSC_ConnHdlr
f_sleep(3.0);
RSL.clear;
- log("f_probe_for_handover(" & log_label & "): done clearing");
+ f_logp("f_probe_for_handover(" & log_label & "): done clearing");
}
/* Test the effect of various neighbor configuration scenarios: