<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23465">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BTS_Tests: do not connect to PCUIF socket if not used<br><br>The PCUIF connection involves a lot of frequent messages, such as<br>the TIME.ind and since recently DATA.ind with len=0.  As a result,<br>the test suite logs are getting unreadable due to lots of coding<br>warnings and port queueing notifications.<br><br>This change is aimed to improve the situation a bit, by establishing<br>the PCUIF connection only for those test cases which actually use it.<br><br>Side effects:<br><br>  * TC_pcu_socket_verify_info_ind becomes reliable, because the<br>    PCUIF establishment is done after the RSL bootstrapping;<br><br>  * TC_pcu_socket_connect_multi starts to fail, because it used<br>    to pass due to timeout, since not all messages are handled<br>    in the 'alt' statement.<br><br>Change-Id: I09ccb65ce94a41ffdad4e93da650c3f32d422af4<br>Related: OS#5083<br>---<br>M bts/BTS_Tests.ttcn<br>M bts/BTS_Tests_SMSCB.ttcn<br>2 files changed, 20 insertions(+), 23 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/65/23465/1</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 0ad55ce..59b60f0 100644</span><br><span>--- a/bts/BTS_Tests.ttcn</span><br><span>+++ b/bts/BTS_Tests.ttcn</span><br><span>@@ -472,7 +472,7 @@</span><br><span>      trxc_conn_id := res.connId;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* global init function */</span><br><span style="color: hsl(120, 100%, 40%);">+/* global init function (without PCUIF connection) */</span><br><span> friend function f_init(uint8_t trx_nr := 0)</span><br><span> runs on test_CT</span><br><span> {</span><br><span>@@ -555,9 +555,6 @@</span><br><span>   f_rsl_bcch_fill(RSL_SYSTEM_INFO_2, ts_SI2_default);</span><br><span>  f_rsl_bcch_fill(RSL_SYSTEM_INFO_4, ts_SI4_default);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- map(self:PCU, system:PCU);</span><br><span style="color: hsl(0, 100%, 40%);">-      f_init_pcu(PCU, id, g_pcu_conn_id, g_pcu_last_info);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>         if (mp_bts_trxc_port != -1) {</span><br><span>                var TrxcMessage ret;</span><br><span> </span><br><span>@@ -4283,7 +4280,9 @@</span><br><span> }</span><br><span> </span><br><span> testcase TC_si_sched_13() runs on test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">-        f_init();</span><br><span style="color: hsl(120, 100%, 40%);">+     /* NOTE: PCUIF connection is not used in this test case, but</span><br><span style="color: hsl(120, 100%, 40%);">+   * without it the IUT would not broadcast SI13 (see OS#3075). */</span><br><span style="color: hsl(120, 100%, 40%);">+      f_init_with_pcuif();</span><br><span>         si_cfg.si13_present := true;</span><br><span>         f_rsl_bcch_fill_raw(RSL_SYSTEM_INFO_13, '0106009000185a6fc9e08410ab2b2b2b2b2b2b2b2b2b2b'O);</span><br><span>  f_TC_si_sched();</span><br><span>@@ -4291,7 +4290,9 @@</span><br><span> }</span><br><span> </span><br><span> testcase TC_si_sched_13_2bis_2ter_2quater() runs on test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">-      f_init();</span><br><span style="color: hsl(120, 100%, 40%);">+     /* NOTE: PCUIF connection is not used in this test case, but</span><br><span style="color: hsl(120, 100%, 40%);">+   * without it the IUT would not broadcast SI13 (see OS#3075). */</span><br><span style="color: hsl(120, 100%, 40%);">+      f_init_with_pcuif();</span><br><span>         si_cfg.si2bis_present := true;</span><br><span>       f_rsl_bcch_fill_raw(RSL_SYSTEM_INFO_2bis, '550602bfe809b3ff00000000000000000000007900002b'O);</span><br><span>        si_cfg.si2ter_present := true;</span><br><span>@@ -4626,6 +4627,8 @@</span><br><span> </span><br><span> friend function f_init_with_pcuif() runs on test_CT {</span><br><span>  f_init();</span><br><span style="color: hsl(120, 100%, 40%);">+     map(self:PCU, system:PCU);</span><br><span style="color: hsl(120, 100%, 40%);">+    f_init_pcu(PCU, testcasename(), g_pcu_conn_id, g_pcu_last_info);</span><br><span>     PCU.send(t_SD_PCUIF(g_pcu_conn_id, ts_PCUIF_TXT_IND(0, PCU_VERSION, testcasename())));</span><br><span> }</span><br><span> </span><br><span>@@ -5453,7 +5456,7 @@</span><br><span>      var ConnHdlrPars pars;</span><br><span>       var ConnHdlr vc_conn;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-       f_init();</span><br><span style="color: hsl(120, 100%, 40%);">+     f_init_with_pcuif();</span><br><span> </span><br><span>     pars := valueof(t_Pars(t_RslChanNr_SDCCH4(0,3), ts_RSL_ChanMode_SIGN));</span><br><span>      vc_conn := f_start_handler(refers(f_TC_rr_suspend_req), pars, true);</span><br><span>@@ -5466,7 +5469,7 @@</span><br><span>         timer T := 5.0;</span><br><span> </span><br><span>  /* this (among other things) establishes the first connection to the PCUIF socket */</span><br><span style="color: hsl(0, 100%, 40%);">-    f_init();</span><br><span style="color: hsl(120, 100%, 40%);">+     f_init_with_pcuif();</span><br><span> </span><br><span>     /* try to establish a second connection, expect it to fail */</span><br><span>        PCU.send(UD_connect:{mp_pcu_socket, -1});</span><br><span>@@ -5488,7 +5491,7 @@</span><br><span> /* Ensure that PCUIF socket can disconnect + reconnect */</span><br><span> testcase TC_pcu_socket_reconnect() runs on test_CT {</span><br><span>       /* this (among other things) establishes the first connection to the PCUIF socket */</span><br><span style="color: hsl(0, 100%, 40%);">-    f_init();</span><br><span style="color: hsl(120, 100%, 40%);">+     f_init_with_pcuif();</span><br><span> </span><br><span>     f_sleep(1.0);</span><br><span> </span><br><span>@@ -5549,13 +5552,7 @@</span><br><span> /* Make sure that GPRS Indicator is absent when the PCU is not connected */</span><br><span> private function f_TC_pcu_socket_noconnect(RrMessageType si_type)</span><br><span> runs on test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">-     /* don't call f_init() as this would connect PCU socket */</span><br><span style="color: hsl(0, 100%, 40%);">-  f_init_rsl(testcasename());</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-     /* Send both System Information Type 3 and 4 (with GPRS Indicator) */</span><br><span style="color: hsl(0, 100%, 40%);">-   f_rsl_bcch_fill(RSL_SYSTEM_INFO_3, ts_SI3_default);</span><br><span style="color: hsl(0, 100%, 40%);">-     f_rsl_bcch_fill(RSL_SYSTEM_INFO_4, ts_SI4_default);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+   f_init();</span><br><span>    f_init_l1ctl();</span><br><span>      f_l1_tune(L1CTL);</span><br><span>    f_sleep(2.0);</span><br><span>@@ -5582,7 +5579,7 @@</span><br><span> private function f_TC_pcu_socket_connect(RrMessageType si_type)</span><br><span> runs on test_CT {</span><br><span>        /* this (among other things) establishes the first connection to the PCUIF socket */</span><br><span style="color: hsl(0, 100%, 40%);">-    f_init();</span><br><span style="color: hsl(120, 100%, 40%);">+     f_init_with_pcuif();</span><br><span>         f_init_l1ctl();</span><br><span>      f_l1_tune(L1CTL);</span><br><span> </span><br><span>@@ -5610,7 +5607,7 @@</span><br><span> private function f_TC_pcu_socket_disconnect(RrMessageType si_type)</span><br><span> runs on test_CT {</span><br><span>     /* this (among other things) establishes the first connection to the PCUIF socket */</span><br><span style="color: hsl(0, 100%, 40%);">-    f_init();</span><br><span style="color: hsl(120, 100%, 40%);">+     f_init_with_pcuif();</span><br><span>         f_init_l1ctl();</span><br><span>      f_l1_tune(L1CTL);</span><br><span> </span><br><span>@@ -5647,7 +5644,7 @@</span><br><span> testcase TC_pcu_socket_verify_info_ind() runs on test_CT {</span><br><span>  var SystemInformation si3 := valueof(ts_SI3_default);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-       f_init();</span><br><span style="color: hsl(120, 100%, 40%);">+     f_init_with_pcuif();</span><br><span> </span><br><span>     /* actually give the BTS some time to fully come up and to send a PCU INFO IND with the correct</span><br><span>       * information */</span><br><span>@@ -5682,7 +5679,7 @@</span><br><span>    var PCUIF_info_ind info_ind;</span><br><span>         var FreqHopPars fhp;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        f_init();</span><br><span style="color: hsl(120, 100%, 40%);">+     f_init_with_pcuif();</span><br><span> </span><br><span>     info_ind := g_pcu_last_info.u.info_ind;</span><br><span> </span><br><span>@@ -5727,7 +5724,7 @@</span><br><span>  f_vty_config2(BSCVTY, {"network", "bts 0"} , "gprs nsvc 0 remote ip 127.127.127.127");</span><br><span>         f_vty_transceive(BSCVTY, "drop bts connection 0 oml");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    f_init();</span><br><span style="color: hsl(120, 100%, 40%);">+     f_init_with_pcuif();</span><br><span> </span><br><span>     var PCUIF_RemoteAddr remote_addr := g_pcu_last_info.u.info_ind.remote_addr;</span><br><span>  var template PCUIF_RemoteAddr tr_remote_addr := {</span><br><span>@@ -5747,7 +5744,7 @@</span><br><span>    f_init_vty_bsc();</span><br><span>    f_vty_config2(BSCVTY, {"network", "bts 0"} , "gprs nsvc 0 remote ip fd00::ca:ff:ee");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_init();</span><br><span style="color: hsl(120, 100%, 40%);">+     f_init_with_pcuif();</span><br><span> </span><br><span>     var PCUIF_RemoteAddr remote_addr := g_pcu_last_info.u.info_ind.remote_addr;</span><br><span>  var template PCUIF_RemoteAddr tr_remote_addr := {</span><br><span>diff --git a/bts/BTS_Tests_SMSCB.ttcn b/bts/BTS_Tests_SMSCB.ttcn</span><br><span>index 102e2ac..dda78fd 100644</span><br><span>--- a/bts/BTS_Tests_SMSCB.ttcn</span><br><span>+++ b/bts/BTS_Tests_SMSCB.ttcn</span><br><span>@@ -1051,7 +1051,7 @@</span><br><span> testcase TC_etws_pcu() runs on test_CT {</span><br><span>   timer T := 10.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_init_with_pcuif();</span><br><span>         f_init_l1ctl();</span><br><span>      f_l1_tune(L1CTL, ccch_mode := CCCH_MODE_COMBINED_CBCH);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23465">change 23465</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/+/23465"/><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: I09ccb65ce94a41ffdad4e93da650c3f32d422af4 </div>
<div style="display:none"> Gerrit-Change-Number: 23465 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>