<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18562">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">PCU: revert changes to f_TC_egprs_pkt_chan_req(), fix tests<br><br>I noticed that TC_egprs_pkt_chan_req_reject_exhaustion has started<br>to fail since the refactoring change [1]. As it turned out, this<br>test case does not init a GprsMs instance, which is needed by a<br>function it depends on - f_TC_egprs_pkt_chan_req().<br><br>I don't really see the point of using the GprsMs abstraction for<br>such small test cases sending just a few messages, which do not<br>require us to keep any state. Let's just revert those changes,<br>and keep using the low level API.<br><br>[1] Ib3fee37580f0ea0530a659dec83656799bf57288<br><br>Change-Id: I4f32c138e7587e68d2d35d13d13c044893fec4b2<br>---<br>M pcu/PCU_Tests.ttcn<br>1 file changed, 5 insertions(+), 17 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/18562/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn</span><br><span>index 061b868..5fb4b2b 100644</span><br><span>--- a/pcu/PCU_Tests.ttcn</span><br><span>+++ b/pcu/PCU_Tests.ttcn</span><br><span>@@ -1509,20 +1509,17 @@</span><br><span> }</span><br><span> </span><br><span> private function f_TC_egprs_pkt_chan_req(in EGPRSPktChRequest req,</span><br><span style="color: hsl(0, 100%, 40%);">- template GsmRrMessage t_imm_ass := ?)</span><br><span style="color: hsl(120, 100%, 40%);">+ template GsmRrMessage t_imm_ass := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ PCUIF_BurstType bt := BURST_TYPE_1)</span><br><span> runs on RAW_PCU_Test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var GsmRrMessage rr_msg;</span><br><span> var uint16_t ra11;</span><br><span style="color: hsl(0, 100%, 40%);">- var GprsMS ms;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ms := g_ms[0]; /* We only use first MS in this test */</span><br><span> </span><br><span> ra11 := enc_EGPRSPktChRequest2uint(req);</span><br><span style="color: hsl(0, 100%, 40%);">- f_ms_use_ra(ms, ra11, ra_is_11bit := 1);</span><br><span> log("Sending EGPRS Packet Channel Request (", ra11, "): ", req);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_ms_establish_ul_tbf(ms);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (not match(ms.ul_tbf.rr_imm_ass, t_imm_ass)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rr_msg := f_establish_tbf(ra := ra11, is_11bit := 1, burst_type := bt);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not match(rr_msg, t_imm_ass)) {</span><br><span> setverdict(fail, "Immediate Assignment does not match");</span><br><span> f_shutdown(__BFILE__, __LINE__);</span><br><span> }</span><br><span>@@ -1535,9 +1532,6 @@</span><br><span> var template IaRestOctets rest;</span><br><span> var template EgprsUlAss ul_ass;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Initialize GPRS MS side */</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_gprs_ms();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* Initialize the PCU interface abstraction */</span><br><span> f_init_raw(testcasename());</span><br><span> </span><br><span>@@ -1566,9 +1560,6 @@</span><br><span> var template IaRestOctets rest;</span><br><span> var template EgprsUlAss ul_ass;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Initialize GPRS MS side */</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_gprs_ms();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* Initialize the PCU interface abstraction */</span><br><span> f_init_raw(testcasename());</span><br><span> </span><br><span>@@ -1603,9 +1594,6 @@</span><br><span> var template IaRestOctets rest;</span><br><span> var template EgprsUlAss ul_ass;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Initialize GPRS MS side */</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_gprs_ms();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* Initialize the PCU interface abstraction */</span><br><span> f_init_raw(testcasename());</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18562">change 18562</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/+/18562"/><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: I4f32c138e7587e68d2d35d13d13c044893fec4b2 </div>
<div style="display:none"> Gerrit-Change-Number: 18562 </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-MessageType: newchange </div>