<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20683">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
neels: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bsc: clarify RESET logging: BSSMAP vs RANAP vs BSSMAP-LE<br><br>When a RESET-ACK times out, the logs currently are indistinguishable between<br>BSSMAP and BSSMAP-LE. Add protocol naming for each RESET / RESET-ACK logging to<br>make sure the information does not need guesswork.<br><br>Example of a test failure shown in jenkins:<br><br> BSC_Tests.TC_unsol_ass_compl<br> Stacktrace<br><br> Timeout waiting for RESET-ACK after sending RESET<br> BSC_Tests.ttcn:8295 BSC_Tests control part<br> BSC_Tests.ttcn:4274 TC_unsol_ass_compl testcase<br><br>Nothing conveys that it is (presumably) the background *BSSMAP-LE* timeout<br>halting the test 5 seconds in, and not an A-interface failure.<br><br>Change-Id: I874567e68b8279bf2460b9474241f0a9fe5ff0ff<br>---<br>M bsc/BSC_Tests.ttcn<br>M library/BSSAP_LE_Emulation.ttcn<br>M library/RAN_Emulation.ttcnpp<br>3 files changed, 13 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn</span><br><span>index fff5c2c..9a5faa7 100644</span><br><span>--- a/bsc/BSC_Tests.ttcn</span><br><span>+++ b/bsc/BSC_Tests.ttcn</span><br><span>@@ -774,10 +774,10 @@</span><br><span> alt {</span><br><span> [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(g_bssap[bssap_idx].sccp_addr_own, g_bssap[bssap_idx].sccp_addr_peer,</span><br><span> tr_BSSMAP_ResetAck(g_osmux_enabled))) {</span><br><span style="color: hsl(0, 100%, 40%);">- log("Received RESET-ACK in response to RESET, we're ready to go!");</span><br><span style="color: hsl(120, 100%, 40%);">+ log("BSSMAP: Received RESET-ACK in response to RESET, we're ready to go!");</span><br><span> }</span><br><span> [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(?, ?, tr_BSSMAP_Reset(g_osmux_enabled))) -> value ud_ind {</span><br><span style="color: hsl(0, 100%, 40%);">- log("Respoding to inbound RESET with RESET-ACK");</span><br><span style="color: hsl(120, 100%, 40%);">+ log("BSSMAP: Respoding to inbound RESET with RESET-ACK");</span><br><span> BSSAP.send(ts_BSSAP_UNITDATA_req(ud_ind.callingAddress, ud_ind.calledAddress,</span><br><span> ts_BSSMAP_ResetAck(g_osmux_enabled)));</span><br><span> reset_received := true;</span><br><span>@@ -785,7 +785,7 @@</span><br><span> }</span><br><span> [] BSSAP.receive { repeat; }</span><br><span> [] T.timeout {</span><br><span style="color: hsl(0, 100%, 40%);">- log("Timeout waiting for RESET-ACK after sending RESET");</span><br><span style="color: hsl(120, 100%, 40%);">+ log("BSSMAP: Timeout waiting for RESET-ACK after sending RESET");</span><br><span> /* If we received a RESET after ours was sent, it</span><br><span> may be a race condition where the other peer beacame</span><br><span> available after we sent it, but we are in a desired</span><br><span>diff --git a/library/BSSAP_LE_Emulation.ttcn b/library/BSSAP_LE_Emulation.ttcn</span><br><span>index d95506c..fe85e58 100644</span><br><span>--- a/library/BSSAP_LE_Emulation.ttcn</span><br><span>+++ b/library/BSSAP_LE_Emulation.ttcn</span><br><span>@@ -315,13 +315,13 @@</span><br><span> T.start;</span><br><span> alt {</span><br><span> [] BSSAP_LE.receive(tr_BSSAP_LE_UNITDATA_ind(own, peer, tr_BSSMAP_LE_ResetAck)) {</span><br><span style="color: hsl(0, 100%, 40%);">- log("Received RESET-ACK in response to RESET, we're ready to go!");</span><br><span style="color: hsl(120, 100%, 40%);">+ log("BSSMAP-LE: Received RESET-ACK in response to RESET, we're ready to go!");</span><br><span> g_reset_ack_ready := true;</span><br><span> }</span><br><span> [] as_reset_ack();</span><br><span> [] BSSAP_LE.receive { repeat };</span><br><span> [] T.timeout {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Timeout waiting for RESET-ACK after sending RESET");</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "BSSMAP-LE: Timeout waiting for RESET-ACK after sending RESET");</span><br><span> mtc.stop;</span><br><span> }</span><br><span> }</span><br><span>@@ -347,7 +347,7 @@</span><br><span> private altstep as_reset_ack() runs on BSSAP_LE_Emulation_CT {</span><br><span> var BSSAP_LE_N_UNITDATA_ind ud_ind;</span><br><span> [] BSSAP_LE.receive(tr_BSSAP_LE_UNITDATA_ind(?, ?, tr_BSSMAP_LE_Reset)) -> value ud_ind {</span><br><span style="color: hsl(0, 100%, 40%);">- log("Responding to inbound RESET with RESET-ACK");</span><br><span style="color: hsl(120, 100%, 40%);">+ log("BSSMAP-LE: Responding to inbound RESET with RESET-ACK");</span><br><span> BSSAP_LE.send(ts_BSSAP_LE_UNITDATA_req(ud_ind.callingAddress, ud_ind.calledAddress,</span><br><span> ts_BSSMAP_LE_ResetAck));</span><br><span> g_reset_ack_ready := true;</span><br><span>@@ -569,7 +569,7 @@</span><br><span> }</span><br><span> </span><br><span> [wait_seconds == 0] T_reset_ack.timeout {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Timeout waiting for BSSMAP-LE RESET-ACK");</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "BSSMAP-LE: Timeout waiting for RESET-ACK");</span><br><span> mtc.stop;</span><br><span> }</span><br><span> }</span><br><span>diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp</span><br><span>index f410427..3158dc4 100644</span><br><span>--- a/library/RAN_Emulation.ttcnpp</span><br><span>+++ b/library/RAN_Emulation.ttcnpp</span><br><span>@@ -526,12 +526,12 @@</span><br><span> T.start;</span><br><span> alt {</span><br><span> [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(own, peer, tr_BSSMAP_ResetAck(append_osmux_support))) {</span><br><span style="color: hsl(0, 100%, 40%);">- log("Received RESET-ACK in response to RESET, we're ready to go!");</span><br><span style="color: hsl(120, 100%, 40%);">+ log("BSSMAP: Received RESET-ACK in response to RESET, we're ready to go!");</span><br><span> }</span><br><span> [] as_reset_ack(append_osmux_support);</span><br><span> [] BSSAP.receive { repeat };</span><br><span> [] T.timeout {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Timeout waiting for RESET-ACK after sending RESET");</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "BSSMAP: Timeout waiting for RESET-ACK after sending RESET");</span><br><span> mtc.stop;</span><br><span> }</span><br><span> }</span><br><span>@@ -680,12 +680,12 @@</span><br><span> T.start;</span><br><span> alt {</span><br><span> [] RANAP.receive(tr_RANAP_UNITDATA_ind(own, peer, tr_RANAP_ResetAck)) {</span><br><span style="color: hsl(0, 100%, 40%);">- log("Received RESET-ACK in response to RESET, we're ready to go!");</span><br><span style="color: hsl(120, 100%, 40%);">+ log("RANAP: Received RESET-ACK in response to RESET, we're ready to go!");</span><br><span> }</span><br><span> [] as_reset_ack();</span><br><span> [] RANAP.receive { repeat };</span><br><span> [] T.timeout {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Timeout waiting for RESET-ACK after sending RESET");</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "RANAP: Timeout waiting for RESET-ACK after sending RESET");</span><br><span> mtc.stop;</span><br><span> }</span><br><span> }</span><br><span>@@ -791,7 +791,7 @@</span><br><span> #endif</span><br><span> #ifdef RAN_EMULATION_BSSAP</span><br><span> [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(?, ?, tr_BSSMAP_Reset(append_osmux_support))) -> value ud_ind {</span><br><span style="color: hsl(0, 100%, 40%);">- log("Respoding to inbound RESET with RESET-ACK");</span><br><span style="color: hsl(120, 100%, 40%);">+ log("BSSMAP: Responding to inbound RESET with RESET-ACK");</span><br><span> BSSAP.send(ts_BSSAP_UNITDATA_req(ud_ind.callingAddress, ud_ind.calledAddress,</span><br><span> ts_BSSMAP_ResetAck(append_osmux_support)));</span><br><span> repeat;</span><br><span>@@ -799,7 +799,7 @@</span><br><span> #endif</span><br><span> #ifdef RAN_EMULATION_RANAP</span><br><span> [] RANAP.receive(tr_RANAP_UNITDATA_ind(?, ?, tr_RANAP_Reset)) -> value rud_ind {</span><br><span style="color: hsl(0, 100%, 40%);">- log("Respoding to inbound IuRESET with IuRESET-ACK");</span><br><span style="color: hsl(120, 100%, 40%);">+ log("RANAP: Responding to inbound IuRESET with IuRESET-ACK");</span><br><span> var CN_DomainIndicator dom;</span><br><span> dom := rud_ind.userData.initiatingMessage.value_.Reset.protocolIEs[1].value_.cN_DomainIndicator;</span><br><span> RANAP.send(ts_RANAP_UNITDATA_req(rud_ind.callingAddress, rud_ind.calledAddress,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20683">change 20683</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20683"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I874567e68b8279bf2460b9474241f0a9fe5ff0ff </div>
<div style="display:none"> Gerrit-Change-Number: 20683 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>