<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21318">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BTS_Tests: make ts_LapdmAddr / ts_LAPDm_AB more friendly<br><br>Change-Id: I35f84ebd6cb884f3ab63d1c2b77d8ed61acd5c74<br>---<br>M bts/BTS_Tests.ttcn<br>1 file changed, 15 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn</span><br><span>index a9e464a..8a3b101 100644</span><br><span>--- a/bts/BTS_Tests.ttcn</span><br><span>+++ b/bts/BTS_Tests.ttcn</span><br><span>@@ -1829,7 +1829,9 @@</span><br><span> * Measurement Processing / Reporting</span><br><span> ***********************************************************************/</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-private template LapdmAddressField ts_LapdmAddr(LapdmSapi sapi, boolean c_r) := {</span><br><span style="color: hsl(120, 100%, 40%);">+private template (value) LapdmAddressField</span><br><span style="color: hsl(120, 100%, 40%);">+ts_LapdmAddr(template (value) LapdmSapi sapi,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) boolean c_r) := {</span><br><span> spare := '0'B,</span><br><span> lpd := 0,</span><br><span> sapi := sapi,</span><br><span>@@ -1837,22 +1839,28 @@</span><br><span> ea := true</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-private template LapdmFrameAB ts_LAPDm_AB(LapdmSapi sapi, boolean c_r, boolean p, octetstring pl) := {</span><br><span style="color: hsl(120, 100%, 40%);">+private template (value) LapdmFrameAB</span><br><span style="color: hsl(120, 100%, 40%);">+ts_LAPDm_AB(template (value) LapdmSapi sapi,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) GsmRrL3Message l3,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) boolean c_r := false,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) boolean p := false) := {</span><br><span> addr := ts_LapdmAddr(sapi, c_r),</span><br><span style="color: hsl(0, 100%, 40%);">- ctrl := ts_LapdmCtrlUI(p),</span><br><span style="color: hsl(120, 100%, 40%);">+ ctrl := ts_LapdmCtrlUI(valueof(p)),</span><br><span> len := 0, /* overwritten */</span><br><span> m := false,</span><br><span> el := 1,</span><br><span style="color: hsl(0, 100%, 40%);">- payload := pl</span><br><span style="color: hsl(120, 100%, 40%);">+ payload := enc_GsmRrL3Message(valueof(l3))</span><br><span> }</span><br><span> </span><br><span> /* handle incoming downlink SACCH and respond with uplink SACCH (meas res) */</span><br><span> private altstep as_l1_sacch() runs on ConnHdlr {</span><br><span style="color: hsl(120, 100%, 40%);">+ var template (value) LapdmFrameAB lb;</span><br><span> var L1ctlDlMessage l1_dl;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?))) -> value l1_dl {</span><br><span> log("SACCH received: ", l1_dl.payload.data_ind.payload);</span><br><span style="color: hsl(0, 100%, 40%);">- var GsmRrL3Message meas_rep := valueof(ts_MEAS_REP(true, mp_rxlev_exp, mp_rxlev_exp));</span><br><span style="color: hsl(0, 100%, 40%);">- var LapdmFrameAB lb := valueof(ts_LAPDm_AB(0, false, false, enc_GsmRrL3Message(meas_rep)));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ lb := ts_LAPDm_AB(0, ts_MEAS_REP(true, mp_rxlev_exp, mp_rxlev_exp));</span><br><span> log("LAPDm: ", lb);</span><br><span> </span><br><span> var template (value) SacchL1Header l1h := ts_SacchL1Header(</span><br><span>@@ -1860,7 +1868,7 @@</span><br><span> g_pars.l1_pars.ms_actual_ta);</span><br><span> </span><br><span> /* TODO: we can use an extension of TTCN-3 for that, i.e. PADDING('2B'O) */</span><br><span style="color: hsl(0, 100%, 40%);">- var octetstring l2 := f_pad_oct(enc_LapdmFrameAB(lb), 21, '2B'O);</span><br><span style="color: hsl(120, 100%, 40%);">+ var octetstring l2 := f_pad_oct(enc_LapdmFrameAB(valueof(lb)), 21, '2B'O);</span><br><span> </span><br><span> log("Sending Measurement Report: ", l1h, l2);</span><br><span> L1CTL.send(ts_L1CTL_DATA_REQ_SACCH(g_chan_nr, ts_RslLinkID_SACCH(0), l1h, l2));</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21318">change 21318</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/+/21318"/><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: I35f84ebd6cb884f3ab63d1c2b77d8ed61acd5c74 </div>
<div style="display:none"> Gerrit-Change-Number: 21318 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>