This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
neels gerrit-no-reply at lists.osmocom.orgneels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20683 ) Change subject: bsc: clarify RESET logging: BSSMAP vs RANAP vs BSSMAP-LE ...................................................................... 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 --- M bsc/BSC_Tests.ttcn M library/BSSAP_LE_Emulation.ttcn M library/RAN_Emulation.ttcnpp 3 files changed, 13 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve neels: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index fff5c2c..9a5faa7 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -774,10 +774,10 @@ alt { [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(g_bssap[bssap_idx].sccp_addr_own, g_bssap[bssap_idx].sccp_addr_peer, tr_BSSMAP_ResetAck(g_osmux_enabled))) { - 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!"); } [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(?, ?, tr_BSSMAP_Reset(g_osmux_enabled))) -> value ud_ind { - log("Respoding to inbound RESET with RESET-ACK"); + log("BSSMAP: Respoding to inbound RESET with RESET-ACK"); BSSAP.send(ts_BSSAP_UNITDATA_req(ud_ind.callingAddress, ud_ind.calledAddress, ts_BSSMAP_ResetAck(g_osmux_enabled))); reset_received := true; @@ -785,7 +785,7 @@ } [] BSSAP.receive { repeat; } [] T.timeout { - log("Timeout waiting for RESET-ACK after sending RESET"); + log("BSSMAP: Timeout waiting for RESET-ACK after sending RESET"); /* If we received a RESET after ours was sent, it may be a race condition where the other peer beacame available after we sent it, but we are in a desired 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 @@ 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 @@ 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 @@ } [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 @@ 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 @@ 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 @@ #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 @@ #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, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I874567e68b8279bf2460b9474241f0a9fe5ff0ff Gerrit-Change-Number: 20683 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr at sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr at sysmocom.de> Gerrit-Reviewer: pespin <pespin at sysmocom.de> Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201016/979ac831/attachment.htm>