<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20359">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bsc: f_logp(): add VTY pt so it works on various components<br><br>So far only worked on test_CT, now also on MSC_ConnHdlr by passing the<br>respective BSCVTY.<br><br>Change-Id: I85ad0a59af72aa72e26a1252f946ada43388dc17<br>---<br>M bsc/BSC_Tests.ttcn<br>1 file changed, 11 insertions(+), 11 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/59/20359/1</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 34ee429..3a817f4 100644</span><br><span>--- a/bsc/BSC_Tests.ttcn</span><br><span>+++ b/bsc/BSC_Tests.ttcn</span><br><span>@@ -941,12 +941,12 @@</span><br><span>                          "sccp-timer iar " & int2str(g_bsc_sccp_timer_iar)});</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-private function f_logp(charstring log_msg) runs on MSC_ConnHdlr</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_logp(TELNETasp_PT pt, charstring log_msg)</span><br><span> {</span><br><span>     // log on TTCN3 log output</span><br><span>   log(log_msg);</span><br><span>        // log in stderr log</span><br><span style="color: hsl(0, 100%, 40%);">-    f_vty_transceive(BSCVTY, "logp lglobal notice " & log_msg);</span><br><span style="color: hsl(120, 100%, 40%);">+     f_vty_transceive(pt, "logp lglobal notice TTCN3 f_logp(): " & log_msg);</span><br><span> }</span><br><span> </span><br><span> private function f_sysinfo_seen(integer rsl_idx, RSL_Message rsl) runs on test_CT</span><br><span>@@ -6092,22 +6092,22 @@</span><br><span>        ts_MI_TMSI_LV(tmsi := f_tmsi_nri(nri_v, nri_bitlen := nri_bitlen));</span><br><span> </span><br><span> private function f_perform_clear(RSL_DCHAN_PT rsl) runs on MSC_ConnHdlr {</span><br><span style="color: hsl(0, 100%, 40%);">-    f_logp("MSC instructs BSC to clear channel");</span><br><span style="color: hsl(120, 100%, 40%);">+       f_logp(BSCVTY, "MSC instructs BSC to clear channel");</span><br><span>      BSSAP.send(ts_BSSMAP_ClearCommand(0));</span><br><span>       interleave {</span><br><span>         [] rsl.receive(tr_RSL_DATA_REQ(g_chan_nr, ?, decmatch tr_RRM_RR_RELEASE)) {</span><br><span style="color: hsl(0, 100%, 40%);">-                     f_logp("Got RSL RR Release");</span><br><span style="color: hsl(120, 100%, 40%);">+                       f_logp(BSCVTY, "Got RSL RR Release");</span><br><span>              }</span><br><span>    [] rsl.receive(tr_RSL_DEACT_SACCH(g_chan_nr)) {</span><br><span style="color: hsl(0, 100%, 40%);">-                 f_logp("Got RSL Deact SACCH");</span><br><span style="color: hsl(120, 100%, 40%);">+                      f_logp(BSCVTY, "Got RSL Deact SACCH");</span><br><span>             }</span><br><span>    [] BSSAP.receive(tr_BSSMAP_ClearComplete) {</span><br><span style="color: hsl(0, 100%, 40%);">-                     f_logp("Got BSSMAP Clear Complete");</span><br><span style="color: hsl(120, 100%, 40%);">+                        f_logp(BSCVTY, "Got BSSMAP Clear Complete");</span><br><span>                       /* Also drop the SCCP connection */</span><br><span>                  BSSAP.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ);</span><br><span>            }</span><br><span>    [] rsl.receive(tr_RSL_MsgTypeD(RSL_MT_RF_CHAN_REL)) {</span><br><span style="color: hsl(0, 100%, 40%);">-                   f_logp("Got RSL RF Chan Rel, sending Rel Ack");</span><br><span style="color: hsl(120, 100%, 40%);">+                     f_logp(BSCVTY, "Got RSL RF Chan Rel, sending Rel Ack");</span><br><span>                    rsl.send(ts_RSL_RF_CHAN_REL_ACK(g_chan_nr));</span><br><span>                 }</span><br><span>    }</span><br><span>@@ -6118,7 +6118,7 @@</span><br><span>    timer T := 10.0;</span><br><span>     var octetstring l3_enc := enc_PDU_ML3_MS_NW(valueof(l3_info));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      f_logp("establish channel, send Complete Layer 3 Info");</span><br><span style="color: hsl(120, 100%, 40%);">+    f_logp(BSCVTY, "establish channel, send Complete Layer 3 Info");</span><br><span>   f_create_bssmap_exp(l3_enc);</span><br><span> </span><br><span>     /* RSL_Emulation.f_chan_est() on rsl:</span><br><span>@@ -6156,7 +6156,7 @@</span><br><span>        rsl.send(ts_RSL_EST_IND(g_chan_nr, valueof(g_pars.link_id), l3_enc));</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   f_logp("expect BSSAP Complete Layer 3 Info at MSC");</span><br><span style="color: hsl(120, 100%, 40%);">+        f_logp(BSCVTY, "expect BSSAP Complete Layer 3 Info at MSC");</span><br><span>       var template PDU_BSSAP exp_l3_compl;</span><br><span>         exp_l3_compl := tr_BSSMAP_ComplL3()</span><br><span>  if (g_pars.aoip == false) {</span><br><span>@@ -6169,7 +6169,7 @@</span><br><span>  T.start;</span><br><span>     alt {</span><br><span>        [] BSSAP.receive(exp_l3_compl) -> value bssap {</span><br><span style="color: hsl(0, 100%, 40%);">-              f_logp("received expected Complete Layer 3 Info at MSC");</span><br><span style="color: hsl(120, 100%, 40%);">+           f_logp(BSCVTY, "received expected Complete Layer 3 Info at MSC");</span><br><span>          log("rx exp_l3_compl = ", bssap);</span><br><span>          }</span><br><span>    [] BSSAP.receive(tr_BSSMAP_ComplL3) {</span><br><span>@@ -6182,7 +6182,7 @@</span><br><span> </span><br><span>    /* start ciphering, if requested */</span><br><span>  if (ispresent(g_pars.encr)) {</span><br><span style="color: hsl(0, 100%, 40%);">-           f_logp("start ciphering");</span><br><span style="color: hsl(120, 100%, 40%);">+          f_logp(BSCVTY, "start ciphering");</span><br><span>                 f_cipher_mode(g_pars.encr.enc_alg, g_pars.encr.enc_key);</span><br><span>     }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20359">change 20359</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/+/20359"/><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: I85ad0a59af72aa72e26a1252f946ada43388dc17 </div>
<div style="display:none"> Gerrit-Change-Number: 20359 </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>