summaryrefslogtreecommitdiffstats
path: root/library
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2020-10-16 16:28:16 +0200
committerNeels Hofmeyr <neels@hofmeyr.de>2020-10-16 16:31:52 +0200
commit4f5d7be5795300eb550cdda0ca1127c4337eaf03 (patch)
tree07c3997c365843e107fc9c35161137bfd86d6149 /library
parent9a053c07c9c69409e61a7d72def27c3ce4f57c55 (diff)
bsc: clarify RESET logging: BSSMAP vs RANAP vs BSSMAP-LE
When a RESET-ACK times out, the logs currently are indistinguishable between BSSMAP and BSSMAP-LE. Add protocol naming for each RESET / RESET-ACK logging to make sure the information does not need guesswork. Example of a test failure shown in jenkins: BSC_Tests.TC_unsol_ass_compl Stacktrace Timeout waiting for RESET-ACK after sending RESET BSC_Tests.ttcn:8295 BSC_Tests control part BSC_Tests.ttcn:4274 TC_unsol_ass_compl testcase Nothing conveys that it is (presumably) the background *BSSMAP-LE* timeout halting the test 5 seconds in, and not an A-interface failure. Change-Id: I874567e68b8279bf2460b9474241f0a9fe5ff0ff
Diffstat (limited to 'library')
-rw-r--r--library/BSSAP_LE_Emulation.ttcn8
-rw-r--r--library/RAN_Emulation.ttcnpp12
2 files changed, 10 insertions, 10 deletions
diff --git a/library/BSSAP_LE_Emulation.ttcn b/library/BSSAP_LE_Emulation.ttcn
index d95506c..fe85e58 100644
--- a/library/BSSAP_LE_Emulation.ttcn
+++ b/library/BSSAP_LE_Emulation.ttcn
@@ -315,13 +315,13 @@ private function f_bssap_le_reset(SCCP_PAR_Address peer, SCCP_PAR_Address own) r
T.start;
alt {
[] BSSAP_LE.receive(tr_BSSAP_LE_UNITDATA_ind(own, peer, tr_BSSMAP_LE_ResetAck)) {
- log("Received RESET-ACK in response to RESET, we're ready to go!");
+ log("BSSMAP-LE: Received RESET-ACK in response to RESET, we're ready to go!");
g_reset_ack_ready := true;
}
[] as_reset_ack();
[] BSSAP_LE.receive { repeat };
[] T.timeout {
- setverdict(fail, "Timeout waiting for RESET-ACK after sending RESET");
+ setverdict(fail, "BSSMAP-LE: Timeout waiting for RESET-ACK after sending RESET");
mtc.stop;
}
}
@@ -347,7 +347,7 @@ type record BssapLeOps {
private altstep as_reset_ack() runs on BSSAP_LE_Emulation_CT {
var BSSAP_LE_N_UNITDATA_ind ud_ind;
[] BSSAP_LE.receive(tr_BSSAP_LE_UNITDATA_ind(?, ?, tr_BSSMAP_LE_Reset)) -> value ud_ind {
- log("Responding to inbound RESET with RESET-ACK");
+ log("BSSMAP-LE: Responding to inbound RESET with RESET-ACK");
BSSAP_LE.send(ts_BSSAP_LE_UNITDATA_req(ud_ind.callingAddress, ud_ind.calledAddress,
ts_BSSMAP_LE_ResetAck));
g_reset_ack_ready := true;
@@ -569,7 +569,7 @@ function main(BssapLeOps ops, charstring id) runs on BSSAP_LE_Emulation_CT {
}
[wait_seconds == 0] T_reset_ack.timeout {
- setverdict(fail, "Timeout waiting for BSSMAP-LE RESET-ACK");
+ setverdict(fail, "BSSMAP-LE: Timeout waiting for RESET-ACK");
mtc.stop;
}
}
diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp
index f410427..3158dc4 100644
--- a/library/RAN_Emulation.ttcnpp
+++ b/library/RAN_Emulation.ttcnpp
@@ -526,12 +526,12 @@ function f_bssap_reset(SCCP_PAR_Address peer, SCCP_PAR_Address own) runs on RAN_
T.start;
alt {
[] BSSAP.receive(tr_BSSAP_UNITDATA_ind(own, peer, tr_BSSMAP_ResetAck(append_osmux_support))) {
- log("Received RESET-ACK in response to RESET, we're ready to go!");
+ log("BSSMAP: Received RESET-ACK in response to RESET, we're ready to go!");
}
[] as_reset_ack(append_osmux_support);
[] BSSAP.receive { repeat };
[] T.timeout {
- setverdict(fail, "Timeout waiting for RESET-ACK after sending RESET");
+ setverdict(fail, "BSSMAP: Timeout waiting for RESET-ACK after sending RESET");
mtc.stop;
}
}
@@ -680,12 +680,12 @@ function f_ranap_reset(SCCP_PAR_Address peer, SCCP_PAR_Address own) runs on RAN_
T.start;
alt {
[] RANAP.receive(tr_RANAP_UNITDATA_ind(own, peer, tr_RANAP_ResetAck)) {
- log("Received RESET-ACK in response to RESET, we're ready to go!");
+ log("RANAP: Received RESET-ACK in response to RESET, we're ready to go!");
}
[] as_reset_ack();
[] RANAP.receive { repeat };
[] T.timeout {
- setverdict(fail, "Timeout waiting for RESET-ACK after sending RESET");
+ setverdict(fail, "RANAP: Timeout waiting for RESET-ACK after sending RESET");
mtc.stop;
}
}
@@ -791,7 +791,7 @@ private altstep as_reset_ack(boolean append_osmux_support := false) runs on RAN_
#endif
#ifdef RAN_EMULATION_BSSAP
[] BSSAP.receive(tr_BSSAP_UNITDATA_ind(?, ?, tr_BSSMAP_Reset(append_osmux_support))) -> value ud_ind {
- log("Respoding to inbound RESET with RESET-ACK");
+ log("BSSMAP: Responding to inbound RESET with RESET-ACK");
BSSAP.send(ts_BSSAP_UNITDATA_req(ud_ind.callingAddress, ud_ind.calledAddress,
ts_BSSMAP_ResetAck(append_osmux_support)));
repeat;
@@ -799,7 +799,7 @@ private altstep as_reset_ack(boolean append_osmux_support := false) runs on RAN_
#endif
#ifdef RAN_EMULATION_RANAP
[] RANAP.receive(tr_RANAP_UNITDATA_ind(?, ?, tr_RANAP_Reset)) -> value rud_ind {
- log("Respoding to inbound IuRESET with IuRESET-ACK");
+ log("RANAP: Responding to inbound IuRESET with IuRESET-ACK");
var CN_DomainIndicator dom;
dom := rud_ind.userData.initiatingMessage.value_.Reset.protocolIEs[1].value_.cN_DomainIndicator;
RANAP.send(ts_RANAP_UNITDATA_req(rud_ind.callingAddress, rud_ind.calledAddress,