<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16562">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">msc: introduce f_logp()<br><br>This is separated from other patches that were using it, so introduce this<br>function and apply to some select places, so that log markers are also seen in<br>the osmo-msc log output, to help pinpoint what is happening when.<br><br>Change-Id: Iddcda7f0f9940cc21f89d52962707667fe844010<br>---<br>M msc/MSC_Tests.ttcn<br>1 file changed, 21 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/62/16562/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn</span><br><span>index 885743a..c4d407a 100644</span><br><span>--- a/msc/MSC_Tests.ttcn</span><br><span>+++ b/msc/MSC_Tests.ttcn</span><br><span>@@ -165,6 +165,14 @@</span><br><span> };</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+private function f_logp(charstring log_msg) runs on BSC_ConnHdlr</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ // log on TTCN3 log output</span><br><span style="color: hsl(120, 100%, 40%);">+ log(log_msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ // log in stderr log</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_transceive(MSCVTY, "logp lglobal notice " & log_msg);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* altstep for the global guard timer (only used when BSSAP_DIRECT</span><br><span> * is used for communication */</span><br><span> private altstep as_Tguard_direct() runs on MTC_CT {</span><br><span>@@ -1913,13 +1921,13 @@</span><br><span> }</span><br><span> f_ran_register_imsi(g_pars.imsi, tmsi);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- log("first SMS");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_logp("first SMS");</span><br><span> f_vty_sms_send(hex2str(pars.imsi), "2342", "Hello SMS");</span><br><span> </span><br><span> /* MSC->BSC: expect PAGING from MSC */</span><br><span> f_expect_paging();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- log("second SMS");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_logp("second SMS");</span><br><span> /* Now osmo-msc is in state "Paging pending", make sure that another SMS to be sent at this time just joins in</span><br><span> * with the pending paging. Another SMS: */</span><br><span> f_vty_sms_send(hex2str(pars.imsi), "2342", "Another SMS");</span><br><span>@@ -2022,14 +2030,14 @@</span><br><span> </span><br><span> f_vty_sms_send(hex2str(pars.imsi), "2342", "Hello SMS");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- log("Expecting first Paging");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_logp("Expecting first Paging");</span><br><span> /* MSC->BSC: expect PAGING from MSC */</span><br><span> f_expect_paging();</span><br><span> </span><br><span> if (g_pars.ran_is_geran) {</span><br><span style="color: hsl(0, 100%, 40%);">- log("GERAN: expect no further Paging");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_logp("GERAN: expect no further Paging");</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- log("UTRAN: expect more Paging");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_logp("UTRAN: expect more Paging");</span><br><span> }</span><br><span> </span><br><span> timer T := 5.0;</span><br><span>@@ -2040,12 +2048,12 @@</span><br><span> mtc.stop;</span><br><span> }</span><br><span> [not g_pars.ran_is_geran] BSSAP.receive(tr_RANAP_Paging(cs_domain, imsi_hex2oct(g_pars.imsi))) {</span><br><span style="color: hsl(0, 100%, 40%);">- log("UTRAN: second Paging received, as expected");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_logp("UTRAN: second Paging received, as expected");</span><br><span> setverdict(pass);</span><br><span> }</span><br><span> [] T.timeout {</span><br><span> if (g_pars.ran_is_geran) {</span><br><span style="color: hsl(0, 100%, 40%);">- log("GERAN: No further Paging received, as expected");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_logp("GERAN: No further Paging received, as expected");</span><br><span> setverdict(pass);</span><br><span> } else {</span><br><span> setverdict(fail, "UTRAN: Expected a second Paging");</span><br><span>@@ -5008,30 +5016,30 @@</span><br><span> }</span><br><span> f_ran_register_imsi(g_pars.imsi, tmsi);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- log("start Paging by an SMS");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_logp("start Paging by an SMS");</span><br><span> f_vty_sms_send(hex2str(pars.imsi), "2342", "Hello SMS");</span><br><span> </span><br><span> /* MSC->BSC: expect PAGING from MSC */</span><br><span> f_expect_paging();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- log("MNCC signals MT call, before Paging Response");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_logp("MNCC signals MT call, before Paging Response");</span><br><span> f_mt_call_initate(cpars);</span><br><span> f_ran_register_imsi(g_pars.imsi, g_pars.tmsi);</span><br><span> </span><br><span> f_sleep(0.5);</span><br><span style="color: hsl(0, 100%, 40%);">- log("phone answers Paging, expecting both SMS and MT call to be established");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_logp("phone answers Paging, expecting both SMS and MT call to be established");</span><br><span> f_establish_fully(EST_TYPE_PAG_RESP);</span><br><span> spars.tp.ud := 'C8329BFD064D9B53'O;</span><br><span> interleave {</span><br><span> [] BSSAP.receive(f_mt_sms_expect_deliver_pdu(spars)) {</span><br><span style="color: hsl(0, 100%, 40%);">- log("Got SMS-DELIVER");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_logp("Got SMS-DELIVER");</span><br><span> };</span><br><span> [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_CC_SETUP(cpars.transaction_id, *, cpars.called_party))) {</span><br><span style="color: hsl(0, 100%, 40%);">- log("Got CC Setup");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_logp("Got CC Setup");</span><br><span> };</span><br><span> }</span><br><span> setverdict(pass);</span><br><span style="color: hsl(0, 100%, 40%);">- log("success, tear down");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_logp("success, tear down");</span><br><span> var default ccrel := activate(as_optional_cc_rel(cpars));</span><br><span> if (g_pars.ran_is_geran) {</span><br><span> BSSAP.send(ts_BSSMAP_ClearRequest(0));</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16562">change 16562</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/+/16562"/><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: Iddcda7f0f9940cc21f89d52962707667fe844010 </div>
<div style="display:none"> Gerrit-Change-Number: 16562 </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-MessageType: newchange </div>