<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19475">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BTS_Tests/SMSCB: improve SDCCH8+CBCH handling and configuration<br><br>Change-Id: I130a028df7dc476ab765733261a1f007f19f39a8<br>---<br>M bts/BTS_Tests_SMSCB.ttcn<br>1 file changed, 62 insertions(+), 60 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bts/BTS_Tests_SMSCB.ttcn b/bts/BTS_Tests_SMSCB.ttcn</span><br><span>index 1e17703..11855bf 100644</span><br><span>--- a/bts/BTS_Tests_SMSCB.ttcn</span><br><span>+++ b/bts/BTS_Tests_SMSCB.ttcn</span><br><span>@@ -54,8 +54,8 @@</span><br><span> </span><br><span> /* CBCH test parameters for most of our tests */</span><br><span> type record CbchTestPars {</span><br><span style="color: hsl(0, 100%, 40%);">-     /* should we execute on SDCCH4 (true) or SDCCH8 (false) ? */</span><br><span style="color: hsl(0, 100%, 40%);">-    boolean         use_sdcch4,</span><br><span style="color: hsl(120, 100%, 40%);">+   /* Should we execute on SDCCH4 or SDCCH8? */</span><br><span style="color: hsl(120, 100%, 40%);">+  RslChannelNr chan_nr,</span><br><span>        /* Parameters for BASIC CBCH */</span><br><span>      CbchTestParsChan basic,</span><br><span>      /* Parameters for EXTENDED CBCH */</span><br><span>@@ -195,29 +195,51 @@</span><br><span>   }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-private function f_vty_cbch_setup(boolean use_sdcch4 := true) runs on test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_vty_cbch_setup(in RslChannelNr chan_nr) runs on test_CT {</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     if (use_sdcch4 == true) {</span><br><span style="color: hsl(0, 100%, 40%);">-               f_vty_config2(BSCVTY, {"network", "bts 0", "trx 0", "timeslot 0"},</span><br><span style="color: hsl(120, 100%, 40%);">+    if (match(chan_nr, t_RslChanNr_CBCH4(0))) {</span><br><span style="color: hsl(120, 100%, 40%);">+           f_vty_config2(BSCVTY, { "network", "bts 0", "trx 0", "timeslot 0"},</span><br><span>                                  "phys_chan_config CCCH+SDCCH4+CBCH");</span><br><span style="color: hsl(0, 100%, 40%);">-         f_vty_config2(BSCVTY, {"network", "bts 0", "trx 0", "timeslot 6"},</span><br><span style="color: hsl(0, 100%, 40%);">-                                      "phys_chan_config SDCCH8");</span><br><span style="color: hsl(0, 100%, 40%);">-   } else {</span><br><span style="color: hsl(0, 100%, 40%);">-                f_vty_config2(BSCVTY, {"network", "bts 0", "trx 0", "timeslot 0"},</span><br><span style="color: hsl(120, 100%, 40%);">+            /* (Re)configure timeslots 1..3 as TCH/F */</span><br><span style="color: hsl(120, 100%, 40%);">+           for (var integer tn := 1; tn <= 3; tn := tn + 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+                 f_vty_config2(BSCVTY, { "network", "bts 0", "trx 0",</span><br><span style="color: hsl(120, 100%, 40%);">+                                            "timeslot " & int2str(tn) },</span><br><span style="color: hsl(120, 100%, 40%);">+                                            "phys_chan_config TCH/F");</span><br><span style="color: hsl(120, 100%, 40%);">+          }</span><br><span style="color: hsl(120, 100%, 40%);">+     } else if (match(chan_nr, t_RslChanNr_CBCH8(?))) {</span><br><span style="color: hsl(120, 100%, 40%);">+            f_vty_config2(BSCVTY, { "network", "bts 0", "trx 0", "timeslot 0"},</span><br><span>                                  "phys_chan_config CCCH+SDCCH4");</span><br><span style="color: hsl(0, 100%, 40%);">-              f_vty_config2(BSCVTY, {"network", "bts 0", "trx 0", "timeslot 6"},</span><br><span style="color: hsl(120, 100%, 40%);">+            f_vty_config2(BSCVTY, { "network", "bts 0", "trx 0",</span><br><span style="color: hsl(120, 100%, 40%);">+                                    "timeslot " & int2str(chan_nr.tn) },</span><br><span>                                   "phys_chan_config SDCCH8+CBCH");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+          /* (Re)configure timeslots 1..3 (excluding the given one) as TCH/F */</span><br><span style="color: hsl(120, 100%, 40%);">+         for (var integer tn := 1; tn <= 3; tn := tn + 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+                 if (tn == chan_nr.tn)</span><br><span style="color: hsl(120, 100%, 40%);">+                         { continue; }</span><br><span style="color: hsl(120, 100%, 40%);">+                 f_vty_config2(BSCVTY, { "network", "bts 0", "trx 0",</span><br><span style="color: hsl(120, 100%, 40%);">+                                            "timeslot " & int2str(tn) },</span><br><span style="color: hsl(120, 100%, 40%);">+                                            "phys_chan_config TCH/F");</span><br><span style="color: hsl(120, 100%, 40%);">+          }</span><br><span>    }</span><br><span>    f_vty_transceive(BSCVTY, "drop bts connection 0 oml");</span><br><span>     f_sleep(2.0);</span><br><span> }</span><br><span> private function f_smscb_setup(inout CbchTestPars pars) runs on test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+       /* Make sure we've got either SDCCH4+CBCH or SDCCH8+CBCH.</span><br><span style="color: hsl(120, 100%, 40%);">+  * SDCCH4+CBCH can only be allocated on TS0, SDCCH8+CBCH on TS0..3.</span><br><span style="color: hsl(120, 100%, 40%);">+    * On C0 the first timeslot shall always transmit BCCH, thus TS1..3.*/</span><br><span style="color: hsl(120, 100%, 40%);">+        if (not match(pars.chan_nr, (t_RslChanNr_CBCH4(0), t_RslChanNr_CBCH8(1),</span><br><span style="color: hsl(120, 100%, 40%);">+                                   t_RslChanNr_CBCH8(2), t_RslChanNr_CBCH8(3)))) {</span><br><span style="color: hsl(120, 100%, 40%);">+          setverdict(inconc, "Unhandled channel number: ", pars.chan_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+             mtc.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+     }</span><br><span> </span><br><span>        f_cbch_compute_exp_blocks(pars);</span><br><span> </span><br><span>         f_init_vty_bsc();</span><br><span>    /* ensure that a CBCH is present in channel combination */</span><br><span style="color: hsl(0, 100%, 40%);">-      f_vty_cbch_setup(pars.use_sdcch4);</span><br><span style="color: hsl(120, 100%, 40%);">+    f_vty_cbch_setup(pars.chan_nr);</span><br><span>      f_init();</span><br><span> </span><br><span>        f_init_l1ctl();</span><br><span>@@ -231,14 +253,6 @@</span><br><span>       }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-private function f_smscb_cleanup() runs on test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">-  /* reset timeslot 0 channel combination to default */</span><br><span style="color: hsl(0, 100%, 40%);">-   f_vty_config2(BSCVTY, {"network", "bts 0", "trx 0", "timeslot 0"},</span><br><span style="color: hsl(0, 100%, 40%);">-                              "phys_chan_config CCCH+SDCCH4");</span><br><span style="color: hsl(0, 100%, 40%);">-      f_vty_config2(BSCVTY, {"network", "bts 0", "trx 0", "timeslot 6"},</span><br><span style="color: hsl(0, 100%, 40%);">-                              "phys_chan_config SDCCH8");</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* construct a receive/match template for given block_nr in given msg */</span><br><span> private function f_get_block_template(CbchTestMsg msg, integer block_nr) return template CBCH_Block {</span><br><span>  var template CBCH_Block tr;</span><br><span>@@ -326,17 +340,8 @@</span><br><span>   }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-private function t_cbch_chan_nr(CbchTestPars pars, template uint8_t tn) return template RslChannelNr {</span><br><span style="color: hsl(0, 100%, 40%);">-        if (pars.use_sdcch4) {</span><br><span style="color: hsl(0, 100%, 40%);">-          return t_RslChanNr_CBCH4(tn);</span><br><span style="color: hsl(0, 100%, 40%);">-   } else {</span><br><span style="color: hsl(0, 100%, 40%);">-                return t_RslChanNr_CBCH8(tn);</span><br><span style="color: hsl(0, 100%, 40%);">-   }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* shared function doing the heavy lifting for most CBCH tests */</span><br><span> private function f_TC_smscb(CbchTestPars pars) runs on test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">-     var template RslChannelNr t_chan_nr := t_cbch_chan_nr(pars, 0); /* FIXME: TS number */</span><br><span>       var L1ctlDlMessage dl;</span><br><span>       var integer msg_count;</span><br><span>       timer T;</span><br><span>@@ -358,7 +363,7 @@</span><br><span>       T.start(5.0 + 3.0 * int2float(msg_count));</span><br><span>   /* Expect this to show up exactly once on the basic CBCH (four blocks) */</span><br><span>    alt {</span><br><span style="color: hsl(0, 100%, 40%);">-   [] L1CTL.receive(tr_L1CTL_DATA_IND(t_chan_nr)) -> value dl {</span><br><span style="color: hsl(120, 100%, 40%);">+       [] L1CTL.receive(tr_L1CTL_DATA_IND(pars.chan_nr)) -> value dl {</span><br><span>           var integer tb := f_cbch_fn2tb(dl.dl_info.frame_nr);</span><br><span>                 var CBCH_Block cb := dec_CBCH_Block(dl.payload.data_ind.payload);</span><br><span>            log("Tb=", tb, ", CBCH: ", dl, ", block: ", cb);</span><br><span>@@ -386,12 +391,10 @@</span><br><span>               }</span><br><span>    }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   f_smscb_cleanup();</span><br><span>   Misc_Helpers.f_shutdown(__BFILE__, __LINE__, pass);</span><br><span> }</span><br><span> </span><br><span> private function f_TC_smscb_default_only(CbchTestPars pars) runs on test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">-   var template RslChannelNr t_chan_nr := t_cbch_chan_nr(pars, 0); /* FIXME: TS number */</span><br><span>       var L1ctlDlMessage dl;</span><br><span>       timer T := 5.0;</span><br><span> </span><br><span>@@ -403,7 +406,7 @@</span><br><span> </span><br><span>        T.start;</span><br><span>     alt {</span><br><span style="color: hsl(0, 100%, 40%);">-   [] L1CTL.receive(tr_L1CTL_DATA_IND(t_chan_nr)) -> value dl {</span><br><span style="color: hsl(120, 100%, 40%);">+       [] L1CTL.receive(tr_L1CTL_DATA_IND(pars.chan_nr)) -> value dl {</span><br><span>           var integer tb := f_cbch_fn2tb(dl.dl_info.frame_nr);</span><br><span>                 log("CBCH: ", dl);</span><br><span>                 var CBCH_Block cb := dec_CBCH_Block(dl.payload.data_ind.payload);</span><br><span>@@ -436,7 +439,6 @@</span><br><span>      [] T.timeout {}</span><br><span>      }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   f_smscb_cleanup();</span><br><span>   /* don't shut down; some tests still want to continue */</span><br><span> }</span><br><span> </span><br><span>@@ -505,7 +507,7 @@</span><br><span> /* transmit single-block SMSCB COMMAND */</span><br><span> testcase TC_sms_cb_cmd_sdcch4_1block() runs on test_CT {</span><br><span>         var CbchTestPars pars := {</span><br><span style="color: hsl(0, 100%, 40%);">-              use_sdcch4 := true,</span><br><span style="color: hsl(120, 100%, 40%);">+           chan_nr := valueof(ts_RslChanNr_CBCH4(0)),</span><br><span>           basic := valueof(t_CbchPC(msgs_1m_1b_norm)),</span><br><span>                 extended := omit</span><br><span>     };</span><br><span>@@ -513,7 +515,7 @@</span><br><span> }</span><br><span> testcase TC_sms_cb_cmd_sdcch8_1block() runs on test_CT {</span><br><span>    var CbchTestPars pars := {</span><br><span style="color: hsl(0, 100%, 40%);">-              use_sdcch4 := false,</span><br><span style="color: hsl(120, 100%, 40%);">+          chan_nr := valueof(ts_RslChanNr_CBCH8(2)),</span><br><span>           basic := valueof(t_CbchPC(msgs_1m_1b_norm)),</span><br><span>                 extended := omit</span><br><span>     };</span><br><span>@@ -523,7 +525,7 @@</span><br><span> /* transmit dual-block SMSCB COMMAND */</span><br><span> testcase TC_sms_cb_cmd_sdcch4_2block() runs on test_CT {</span><br><span>      var CbchTestPars pars := {</span><br><span style="color: hsl(0, 100%, 40%);">-              use_sdcch4 := true,</span><br><span style="color: hsl(120, 100%, 40%);">+           chan_nr := valueof(ts_RslChanNr_CBCH4(0)),</span><br><span>           basic := valueof(t_CbchPC(msgs_1m_2b_norm)),</span><br><span>                 extended := omit</span><br><span>     };</span><br><span>@@ -531,7 +533,7 @@</span><br><span> }</span><br><span> testcase TC_sms_cb_cmd_sdcch8_2block() runs on test_CT {</span><br><span>    var CbchTestPars pars := {</span><br><span style="color: hsl(0, 100%, 40%);">-              use_sdcch4 := false,</span><br><span style="color: hsl(120, 100%, 40%);">+          chan_nr := valueof(ts_RslChanNr_CBCH8(2)),</span><br><span>           basic := valueof(t_CbchPC(msgs_1m_2b_norm)),</span><br><span>                 extended := omit</span><br><span>     };</span><br><span>@@ -541,7 +543,7 @@</span><br><span> /* transmit triple-block SMSCB COMMAND */</span><br><span> testcase TC_sms_cb_cmd_sdcch4_3block() runs on test_CT {</span><br><span>    var CbchTestPars pars := {</span><br><span style="color: hsl(0, 100%, 40%);">-              use_sdcch4 := true,</span><br><span style="color: hsl(120, 100%, 40%);">+           chan_nr := valueof(ts_RslChanNr_CBCH4(0)),</span><br><span>           basic := valueof(t_CbchPC(msgs_1m_3b_norm)),</span><br><span>                 extended := omit</span><br><span>     };</span><br><span>@@ -549,7 +551,7 @@</span><br><span> }</span><br><span> testcase TC_sms_cb_cmd_sdcch8_3block() runs on test_CT {</span><br><span>    var CbchTestPars pars := {</span><br><span style="color: hsl(0, 100%, 40%);">-              use_sdcch4 := false,</span><br><span style="color: hsl(120, 100%, 40%);">+          chan_nr := valueof(ts_RslChanNr_CBCH8(2)),</span><br><span>           basic := valueof(t_CbchPC(msgs_1m_3b_norm)),</span><br><span>                 extended := omit</span><br><span>     };</span><br><span>@@ -559,7 +561,7 @@</span><br><span> /* transmit quad-block SMSCB COMMAND */</span><br><span> testcase TC_sms_cb_cmd_sdcch4_4block() runs on test_CT {</span><br><span>      var CbchTestPars pars := {</span><br><span style="color: hsl(0, 100%, 40%);">-              use_sdcch4 := true,</span><br><span style="color: hsl(120, 100%, 40%);">+           chan_nr := valueof(ts_RslChanNr_CBCH4(0)),</span><br><span>           basic := valueof(t_CbchPC(msgs_1m_4b_norm)),</span><br><span>                 extended := omit</span><br><span>     };</span><br><span>@@ -567,7 +569,7 @@</span><br><span> }</span><br><span> testcase TC_sms_cb_cmd_sdcch8_4block() runs on test_CT {</span><br><span>    var CbchTestPars pars := {</span><br><span style="color: hsl(0, 100%, 40%);">-              use_sdcch4 := false,</span><br><span style="color: hsl(120, 100%, 40%);">+          chan_nr := valueof(ts_RslChanNr_CBCH8(2)),</span><br><span>           basic := valueof(t_CbchPC(msgs_1m_4b_norm)),</span><br><span>                 extended := omit</span><br><span>     };</span><br><span>@@ -577,7 +579,7 @@</span><br><span> /* transmit multiple commands of each 4 blocks */</span><br><span> testcase TC_sms_cb_cmd_sdcch4_multi() runs on test_CT {</span><br><span>     var CbchTestPars pars := {</span><br><span style="color: hsl(0, 100%, 40%);">-              use_sdcch4 := true,</span><br><span style="color: hsl(120, 100%, 40%);">+           chan_nr := valueof(ts_RslChanNr_CBCH4(0)),</span><br><span>           basic := valueof(t_CbchPC(msgs_3m_4b_norm)),</span><br><span>                 extended := omit</span><br><span>     };</span><br><span>@@ -585,7 +587,7 @@</span><br><span> }</span><br><span> testcase TC_sms_cb_cmd_sdcch8_multi() runs on test_CT {</span><br><span>     var CbchTestPars pars := {</span><br><span style="color: hsl(0, 100%, 40%);">-              use_sdcch4 := false,</span><br><span style="color: hsl(120, 100%, 40%);">+          chan_nr := valueof(ts_RslChanNr_CBCH8(2)),</span><br><span>           basic := valueof(t_CbchPC(msgs_3m_4b_norm)),</span><br><span>                 extended := omit</span><br><span>     };</span><br><span>@@ -595,7 +597,7 @@</span><br><span> /* transmit multiple commands of each 4 blocks on CBCH EXTD */</span><br><span> testcase TC_sms_cb_cmd_sdcch4_extd_multi() runs on test_CT {</span><br><span>   var CbchTestPars pars := {</span><br><span style="color: hsl(0, 100%, 40%);">-              use_sdcch4 := true,</span><br><span style="color: hsl(120, 100%, 40%);">+           chan_nr := valueof(ts_RslChanNr_CBCH4(0)),</span><br><span>           basic := valueof(t_CbchPC({})),</span><br><span>              extended := valueof(t_CbchPC(msgs_3m_4b_norm))</span><br><span>       };</span><br><span>@@ -603,7 +605,7 @@</span><br><span> }</span><br><span> testcase TC_sms_cb_cmd_sdcch8_extd_multi() runs on test_CT {</span><br><span>        var CbchTestPars pars := {</span><br><span style="color: hsl(0, 100%, 40%);">-              use_sdcch4 := false,</span><br><span style="color: hsl(120, 100%, 40%);">+          chan_nr := valueof(ts_RslChanNr_CBCH8(2)),</span><br><span>           basic := valueof(t_CbchPC({})),</span><br><span>              extended := valueof(t_CbchPC(msgs_3m_4b_norm))</span><br><span>       };</span><br><span>@@ -613,7 +615,7 @@</span><br><span> /* transmit SMSCB COMMAND with SCHEDULE payload */</span><br><span> testcase TC_sms_cb_cmd_sdcch4_schedule() runs on test_CT {</span><br><span>         var CbchTestPars pars := {</span><br><span style="color: hsl(0, 100%, 40%);">-              use_sdcch4 := true,</span><br><span style="color: hsl(120, 100%, 40%);">+           chan_nr := valueof(ts_RslChanNr_CBCH4(0)),</span><br><span>           basic := valueof(t_CbchPC(msgs_1m_4b_sched)),</span><br><span>                extended := omit</span><br><span>     };</span><br><span>@@ -621,7 +623,7 @@</span><br><span> }</span><br><span> testcase TC_sms_cb_cmd_sdcch8_schedule() runs on test_CT {</span><br><span>  var CbchTestPars pars := {</span><br><span style="color: hsl(0, 100%, 40%);">-              use_sdcch4 := false,</span><br><span style="color: hsl(120, 100%, 40%);">+          chan_nr := valueof(ts_RslChanNr_CBCH8(2)),</span><br><span>           basic := valueof(t_CbchPC(msgs_1m_4b_sched)),</span><br><span>                extended := omit</span><br><span>     };</span><br><span>@@ -631,7 +633,7 @@</span><br><span> /* set a DEFAULT message; verify it gets transmitted all the time */</span><br><span> testcase TC_sms_cb_cmd_sdcch4_default_only() runs on test_CT {</span><br><span>   var CbchTestPars pars := {</span><br><span style="color: hsl(0, 100%, 40%);">-              use_sdcch4 := true,</span><br><span style="color: hsl(120, 100%, 40%);">+           chan_nr := valueof(ts_RslChanNr_CBCH4(0)),</span><br><span>           basic := valueof(t_CbchPC(msgs_1m_3b_default)),</span><br><span>              extended := omit</span><br><span>     };</span><br><span>@@ -640,7 +642,7 @@</span><br><span> }</span><br><span> testcase TC_sms_cb_cmd_sdcch8_default_only() runs on test_CT {</span><br><span>      var CbchTestPars pars := {</span><br><span style="color: hsl(0, 100%, 40%);">-              use_sdcch4 := true,</span><br><span style="color: hsl(120, 100%, 40%);">+           chan_nr := valueof(ts_RslChanNr_CBCH4(0)),</span><br><span>           basic := valueof(t_CbchPC(msgs_1m_3b_default)),</span><br><span>              extended := omit</span><br><span>     };</span><br><span>@@ -650,7 +652,7 @@</span><br><span> </span><br><span> testcase TC_sms_cb_cmd_sdcch4_default_and_normal() runs on test_CT {</span><br><span>         var CbchTestPars pars := {</span><br><span style="color: hsl(0, 100%, 40%);">-              use_sdcch4 := true,</span><br><span style="color: hsl(120, 100%, 40%);">+           chan_nr := valueof(ts_RslChanNr_CBCH4(0)),</span><br><span>           basic := valueof(t_CbchPC(msgs_1m_3b_norm, msg_default)),</span><br><span>            extended := omit</span><br><span>     };</span><br><span>@@ -658,7 +660,7 @@</span><br><span> }</span><br><span> testcase TC_sms_cb_cmd_sdcch8_default_and_normal() runs on test_CT {</span><br><span>        var CbchTestPars pars := {</span><br><span style="color: hsl(0, 100%, 40%);">-              use_sdcch4 := true,</span><br><span style="color: hsl(120, 100%, 40%);">+           chan_nr := valueof(ts_RslChanNr_CBCH8(2)),</span><br><span>           basic := valueof(t_CbchPC(msgs_1m_3b_norm, msg_default)),</span><br><span>            extended := omit</span><br><span>     };</span><br><span>@@ -668,7 +670,7 @@</span><br><span> /* first set a DEFAULT message, then disable it again */</span><br><span> testcase TC_sms_cb_cmd_sdcch4_default_then_null() runs on test_CT {</span><br><span>  var CbchTestPars pars := {</span><br><span style="color: hsl(0, 100%, 40%);">-              use_sdcch4 := true,</span><br><span style="color: hsl(120, 100%, 40%);">+           chan_nr := valueof(ts_RslChanNr_CBCH4(0)),</span><br><span>           basic := valueof(t_CbchPC(msgs_1m_3b_default)),</span><br><span>              extended := omit</span><br><span>     };</span><br><span>@@ -772,17 +774,17 @@</span><br><span>           }</span><br><span>            }</span><br><span>    }</span><br><span style="color: hsl(0, 100%, 40%);">-       f_smscb_cleanup();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>         Misc_Helpers.f_shutdown(__BFILE__, __LINE__);</span><br><span> }</span><br><span> testcase TC_cbc_sdcch4_load_idle() runs on test_CT {</span><br><span>   f_init_vty_bsc();</span><br><span style="color: hsl(0, 100%, 40%);">-       f_vty_cbch_setup(use_sdcch4 := true);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_cbch_setup(valueof(ts_RslChanNr_CBCH4(0)));</span><br><span>    f_TC_cbc_load_idle();</span><br><span> }</span><br><span> testcase TC_cbc_sdcch8_load_idle() runs on test_CT {</span><br><span>   f_init_vty_bsc();</span><br><span style="color: hsl(0, 100%, 40%);">-       f_vty_cbch_setup(use_sdcch4 := false);</span><br><span style="color: hsl(120, 100%, 40%);">+        f_vty_cbch_setup(valueof(ts_RslChanNr_CBCH8(2)));</span><br><span>    f_TC_cbc_load_idle();</span><br><span> }</span><br><span> </span><br><span>@@ -853,29 +855,29 @@</span><br><span>               }</span><br><span>            }</span><br><span>    }</span><br><span style="color: hsl(0, 100%, 40%);">-       f_smscb_cleanup();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>         Misc_Helpers.f_shutdown(__BFILE__, __LINE__);</span><br><span> }</span><br><span> testcase TC_cbc_sdcch4_load_overload() runs on test_CT {</span><br><span>       var CbchTestPars pars := {</span><br><span style="color: hsl(0, 100%, 40%);">-              use_sdcch4 := true,</span><br><span style="color: hsl(120, 100%, 40%);">+           chan_nr := valueof(ts_RslChanNr_CBCH4(0)),</span><br><span>           basic := valueof(t_CbchPC(msgs_1m_3b_norm)),</span><br><span>                 extended := omit</span><br><span>     };</span><br><span> </span><br><span>       f_init_vty_bsc();</span><br><span style="color: hsl(0, 100%, 40%);">-       f_vty_cbch_setup(use_sdcch4 := true);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_cbch_setup(pars.chan_nr);</span><br><span>      f_TC_cbc_load_overload(pars);</span><br><span> }</span><br><span> testcase TC_cbc_sdcch8_load_overload() runs on test_CT {</span><br><span>       var CbchTestPars pars := {</span><br><span style="color: hsl(0, 100%, 40%);">-              use_sdcch4 := true,</span><br><span style="color: hsl(120, 100%, 40%);">+           chan_nr := valueof(ts_RslChanNr_CBCH4(2)),</span><br><span>           basic := valueof(t_CbchPC(msgs_1m_3b_norm)),</span><br><span>                 extended := omit</span><br><span>     };</span><br><span> </span><br><span>       f_init_vty_bsc();</span><br><span style="color: hsl(0, 100%, 40%);">-       f_vty_cbch_setup(use_sdcch4 := true);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_cbch_setup(pars.chan_nr);</span><br><span>      f_TC_cbc_load_overload(pars);</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19475">change 19475</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/+/19475"/><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: I130a028df7dc476ab765733261a1f007f19f39a8 </div>
<div style="display:none"> Gerrit-Change-Number: 19475 </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-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-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>