<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14330">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bts: BTS_Tests_LAPDm.ttcn: rename f_init() to f_lapdm_init()<br><br>This is to avoid name clashes with f_init() from BTS_Tests.ttcn<br><br>Change-Id: Ie6272165b1dbda53d2d02af43c8e969da7a54d2e<br>---<br>M bts/BTS_Tests_LAPDm.ttcn<br>1 file changed, 11 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bts/BTS_Tests_LAPDm.ttcn b/bts/BTS_Tests_LAPDm.ttcn</span><br><span>index 0792863..33aa174 100644</span><br><span>--- a/bts/BTS_Tests_LAPDm.ttcn</span><br><span>+++ b/bts/BTS_Tests_LAPDm.ttcn</span><br><span>@@ -17,7 +17,11 @@</span><br><span> type component lapdm_bts_CT extends lapdm_test_CT, test_CT {</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-function f_init() runs on lapdm_test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+/*********************************************************************************</span><br><span style="color: hsl(120, 100%, 40%);">+ * Test using only L1CTL/LAPDm</span><br><span style="color: hsl(120, 100%, 40%);">+ *********************************************************************************/</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+function f_lapdm_init() runs on lapdm_test_CT {</span><br><span> /* create the LAPDm component */</span><br><span> lapdm_component := lapdm_CT.create;</span><br><span> /* connect our own LAPDM port to the LAPDM Service Provider of the LAPDm component */</span><br><span>@@ -144,7 +148,7 @@</span><br><span> }</span><br><span> </span><br><span> testcase TC_sabm_ua_dcch_sapi0() runs on lapdm_test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- f_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_lapdm_init();</span><br><span> if (not f_test_sabm_results_in_ua(0, false, 'FEFE'O)) {</span><br><span> setverdict(fail);</span><br><span> }</span><br><span>@@ -152,7 +156,7 @@</span><br><span> }</span><br><span> </span><br><span> testcase TC_sabm_ua_dcch_sapi0_nopayload() runs on lapdm_test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- f_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_lapdm_init();</span><br><span> if (f_test_sabm_results_in_ua(0, false, ''O)) {</span><br><span> setverdict(fail, "Initial SABM/UA must contain L3 payload but BTS accepts without");</span><br><span> }</span><br><span>@@ -160,7 +164,7 @@</span><br><span> }</span><br><span> </span><br><span> testcase TC_sabm_ua_dcch_sapi3() runs on lapdm_test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- f_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_lapdm_init();</span><br><span> if (f_test_sabm_results_in_ua(3, false, 'FEFE'O)) {</span><br><span> setverdict(fail, "Initial SABM/UA must be on SAPI0, but BTS accepts SAPI=3");</span><br><span> }</span><br><span>@@ -168,7 +172,7 @@</span><br><span> }</span><br><span> </span><br><span> testcase TC_sabm_ua_dcch_sapi4() runs on lapdm_test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- f_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_lapdm_init();</span><br><span> if (f_test_sabm_results_in_ua(4, false, 'FEFE'O)) {</span><br><span> setverdict(fail, "Initial SABM/UA must be on SAPI0, but BTS accepts SAPI=4");</span><br><span> }</span><br><span>@@ -182,7 +186,7 @@</span><br><span> const boolean use_sacch := false;</span><br><span> timer T := 5.0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_lapdm_init();</span><br><span> </span><br><span> f_establish_dcch();</span><br><span> /* first frame is our real SABM */</span><br><span>@@ -206,7 +210,7 @@</span><br><span> * UA. This is required during the contention resolution procedure as specified in 8.4.1.4 */</span><br><span> testcase TC_sabm_retransmit() runs on lapdm_test_CT {</span><br><span> const octetstring payload := '00FEFEDEADBEEF'O;</span><br><span style="color: hsl(0, 100%, 40%);">- f_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_lapdm_init();</span><br><span> if (not f_test_sabm_results_in_ua(0, false, payload)) {</span><br><span> setverdict(fail, "UA not received for first SABM");</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14330">change 14330</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/+/14330"/><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: Ie6272165b1dbda53d2d02af43c8e969da7a54d2e </div>
<div style="display:none"> Gerrit-Change-Number: 14330 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-MessageType: merged </div>