<p>fixeria would like pespin to <strong>review</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18544">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pcu/GPRS_Components: get rid of meaningless bts_nr argument<br><br>We don't (yet) support multi-BTS test cases anyway. Ideally, each<br>virtual BTS would be a separate component with an individual port.<br><br>Change-Id: I8b639d179db259bf0e43cf1929447a44d5736f62<br>---<br>M pcu/GPRS_Components.ttcn<br>M pcu/PCU_Tests.ttcn<br>2 files changed, 6 insertions(+), 8 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/44/18544/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn</span><br><span>index cbb6cda..1bda189 100644</span><br><span>--- a/pcu/GPRS_Components.ttcn</span><br><span>+++ b/pcu/GPRS_Components.ttcn</span><br><span>@@ -171,8 +171,7 @@</span><br><span> </span><br><span> function f_pcuif_rx_imm_ass(out GsmRrMessage rr_imm_ass,</span><br><span> template PCUIF_Sapi sapi := PCU_IF_SAPI_AGCH,</span><br><span style="color: hsl(0, 100%, 40%);">- template GsmRrMessage t_imm_ass := ?,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t bts_nr := 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ template GsmRrMessage t_imm_ass := ?)</span><br><span> runs on MS_BTS_IFACE_CT return boolean {</span><br><span> var PCUIF_Message pcu_msg;</span><br><span> var octetstring data;</span><br><span>@@ -180,7 +179,7 @@</span><br><span> </span><br><span> T.start(2.0);</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] BTS.receive(tr_PCUIF_DATA_REQ(bts_nr := bts_nr, trx_nr := 0, ts_nr := 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ [] BTS.receive(tr_PCUIF_DATA_REQ(bts_nr := 0, trx_nr := 0, ts_nr := 0,</span><br><span> sapi := sapi, data := ?)) -> value pcu_msg {</span><br><span> /* On PCH the payload is prefixed with paging group (3 octets): skip it.</span><br><span> * TODO: add an additional template parameter, so we can match it. */</span><br><span>@@ -213,7 +212,7 @@</span><br><span> const BIT8 chan_req_def := '01111000'B;</span><br><span> </span><br><span> /* Establish an Uplink TBF by sending RACH.ind towards the PCU */</span><br><span style="color: hsl(0, 100%, 40%);">-function f_establish_tbf(out GsmRrMessage rr_imm_ass, uint8_t bts_nr := 0,</span><br><span style="color: hsl(120, 100%, 40%);">+function f_establish_tbf(out GsmRrMessage rr_imm_ass,</span><br><span> uint16_t ra := bit2int(chan_req_def),</span><br><span> uint8_t is_11bit := 0,</span><br><span> PCUIF_BurstType burst_type := BURST_TYPE_0,</span><br><span>@@ -226,7 +225,7 @@</span><br><span> </span><br><span> /* Send RACH.ind */</span><br><span> log("Sending RACH.ind on fn=", fn, " with RA=", ra, ", TA=", ta);</span><br><span style="color: hsl(0, 100%, 40%);">- BTS.send(ts_PCUIF_RACH_IND(bts_nr := bts_nr, trx_nr := 0, ts_nr := 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS.send(ts_PCUIF_RACH_IND(bts_nr := 0, trx_nr := 0, ts_nr := 0,</span><br><span> ra := ra, is_11bit := is_11bit,</span><br><span> burst_type := burst_type,</span><br><span> fn := fn, arfcn := 871,</span><br><span>@@ -239,8 +238,7 @@</span><br><span> </span><br><span> /* Expect Immediate (TBF) Assignment on TS0/AGCH */</span><br><span> return f_pcuif_rx_imm_ass(rr_imm_ass, PCU_IF_SAPI_AGCH,</span><br><span style="color: hsl(0, 100%, 40%);">- tr_IMM_TBF_ASS(false, ra, fn),</span><br><span style="color: hsl(0, 100%, 40%);">- bts_nr := bts_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ tr_IMM_TBF_ASS(false, ra, fn));</span><br><span> }</span><br><span> </span><br><span> function f_imm_ass_verify_ul_tbf_ass(in GsmRrMessage rr_imm_ass, out PacketUlAssign ul_tbf_ass, template PacketUlAssign ul_ass := tr_PacketUlDynAssign)</span><br><span>diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn</span><br><span>index 8a1a425..9e7c92b 100644</span><br><span>--- a/pcu/PCU_Tests.ttcn</span><br><span>+++ b/pcu/PCU_Tests.ttcn</span><br><span>@@ -263,7 +263,7 @@</span><br><span> * at some point the PCU will fail to allocate a new TBF. */</span><br><span> for (var TimingAdvance ta := 0; ta < 64; ta := ta + 16) {</span><br><span> /* Establish an Uplink TBF (send RACH.ind with current TA) */</span><br><span style="color: hsl(0, 100%, 40%);">- ok := f_establish_tbf(rr_msg, bts_nr := 0, ta := ta);</span><br><span style="color: hsl(120, 100%, 40%);">+ ok := f_establish_tbf(rr_msg, ta := ta);</span><br><span> if (not ok) {</span><br><span> setverdict(fail, "Failed to establish an Uplink TBF");</span><br><span> break;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18544">change 18544</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/+/18544"/><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: I8b639d179db259bf0e43cf1929447a44d5736f62 </div>
<div style="display:none"> Gerrit-Change-Number: 18544 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>