<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20984">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pcu: prepare tests for new GPRS/EGPRS multiplex support<br><br>Once GPRS/EGPRS multiplexed support is ready, it will be controlled<br>through pcu info_ind.flags by enabling<br>MCS or not; the "egprs only" VTY comamnd will be dropped.<br>The usual setup would be to support both GPRS+EGPRS, so make that the default.<br>Most tests require to be passed the _noMCS variant to work in older<br>versions of PCU, since those versions use the "egprs only" concept which<br>will reject egprs_ms_class=0. Same tests enabling MCS in newer osmo-pcu<br>shouldn't be a problem.<br><br>Related: OS#4544<br>Change-Id: Ib95aae155b0712313a30f0c5404a8cb1f28b98f5<br>---<br>M library/PCUIF_Types.ttcn<br>M pcu/PCU_Tests.ttcn<br>2 files changed, 63 insertions(+), 39 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn</span><br><span>index a7a32ab..d6e0867 100644</span><br><span>--- a/library/PCUIF_Types.ttcn</span><br><span>+++ b/library/PCUIF_Types.ttcn</span><br><span>@@ -749,6 +749,32 @@</span><br><span> spare2 := '000'B</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+const PCUIF_Flags c_PCUIF_Flags_noMCS := {</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_active := true,</span><br><span style="color: hsl(120, 100%, 40%);">+ sysmo_direct_dsp := false,</span><br><span style="color: hsl(120, 100%, 40%);">+ spare := '00000000000000'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ cs1 := true,</span><br><span style="color: hsl(120, 100%, 40%);">+ cs2 := true,</span><br><span style="color: hsl(120, 100%, 40%);">+ cs3 := true,</span><br><span style="color: hsl(120, 100%, 40%);">+ cs4 := true,</span><br><span style="color: hsl(120, 100%, 40%);">+ mcs1 := false,</span><br><span style="color: hsl(120, 100%, 40%);">+ mcs2 := false,</span><br><span style="color: hsl(120, 100%, 40%);">+ mcs3 := false,</span><br><span style="color: hsl(120, 100%, 40%);">+ mcs4 := false,</span><br><span style="color: hsl(120, 100%, 40%);">+ mcs5 := false,</span><br><span style="color: hsl(120, 100%, 40%);">+ mcs6 := false,</span><br><span style="color: hsl(120, 100%, 40%);">+ mcs7 := false,</span><br><span style="color: hsl(120, 100%, 40%);">+ mcs8 := false,</span><br><span style="color: hsl(120, 100%, 40%);">+ mcs9 := false,</span><br><span style="color: hsl(120, 100%, 40%);">+ spare2 := '000'B</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_pcuif_ind_flags_egprs_enabled(PCUIF_Flags flags) return boolean {</span><br><span style="color: hsl(120, 100%, 40%);">+ return flags.mcs1 or flags.mcs2 or flags.mcs3 or flags.mcs4 or</span><br><span style="color: hsl(120, 100%, 40%);">+ flags.mcs5 or flags.mcs6 or flags.mcs7 or flags.mcs8 or</span><br><span style="color: hsl(120, 100%, 40%);">+ flags.mcs9;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> template (value) PCUIF_InfoTrxTs ts_PCUIF_InfoTrxTsH0(template (value) uint3_t tsc := 7) := {</span><br><span> tsc := tsc,</span><br><span> hopping := 0,</span><br><span>diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn</span><br><span>index 3421c73..d114875 100644</span><br><span>--- a/pcu/PCU_Tests.ttcn</span><br><span>+++ b/pcu/PCU_Tests.ttcn</span><br><span>@@ -67,9 +67,10 @@</span><br><span> </span><br><span> </span><br><span> /* FIXME: make sure to use parameters from mp_gb_cfg.cell_id in the PCU INFO IND */</span><br><span style="color: hsl(0, 100%, 40%);">-friend template (value) PCUIF_info_ind ts_PCUIF_INFO_default := {</span><br><span style="color: hsl(120, 100%, 40%);">+friend template (value) PCUIF_info_ind ts_PCUIF_INFO_default(template (value) PCUIF_Flags flags := c_PCUIF_Flags_default)</span><br><span style="color: hsl(120, 100%, 40%);">+:= {</span><br><span> version := PCUIF_Types.mp_pcuif_version,</span><br><span style="color: hsl(0, 100%, 40%);">- flags := c_PCUIF_Flags_default,</span><br><span style="color: hsl(120, 100%, 40%);">+ flags := flags,</span><br><span> trx := f_PCUIF_ver_INFO_Trxs(GPRS_Components.mp_base_arfcn),</span><br><span> bsic := 7,</span><br><span> mcc := 262,</span><br><span>@@ -145,7 +146,6 @@</span><br><span> var uint8_t g_mcs_max_dl := 9;</span><br><span> var uint8_t g_mcs_max_ul := 9;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- var boolean g_egprs_only := false;</span><br><span> var boolean g_force_two_phase_access := false;</span><br><span> </span><br><span> /* Guard timeout */</span><br><span>@@ -190,12 +190,13 @@</span><br><span> f_vty_config2(PCUVTY, {"pcu"}, cmd);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-private function f_init_vty(charstring id) runs on RAW_PCU_Test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_init_vty(charstring id, boolean egprs_only) runs on RAW_PCU_Test_CT {</span><br><span> map(self:PCUVTY, system:PCUVTY);</span><br><span> f_vty_set_prompts(PCUVTY);</span><br><span> f_vty_transceive(PCUVTY, "enable");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (g_egprs_only) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* This will be removed soon, not needed. EGPRS support is controlled through pcu_ind flags */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (egprs_only) {</span><br><span> f_vty_config2(PCUVTY, {"pcu"}, "egprs only");</span><br><span> } else {</span><br><span> f_vty_config2(PCUVTY, {"pcu"}, "no egprs");</span><br><span>@@ -224,7 +225,7 @@</span><br><span> connect(vc_BTS:PCUIF, vc_PCUIF:BTS);</span><br><span> connect(vc_BTS:TC, self:BTS);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_init_vty(id);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_vty(id, f_pcuif_ind_flags_egprs_enabled(valueof(info_ind.flags)));</span><br><span> </span><br><span> f_init_statsd(id, vc_STATSD, mp_pcu_statsd_ip, mp_pcu_statsd_port);</span><br><span> /* This is normally done in the ConnHdlr component, but here</span><br><span>@@ -346,7 +347,7 @@</span><br><span> f_init_gprs_ms();</span><br><span> ms := g_ms[0]; /* We only use first MS in this test */</span><br><span> /* Initialize the PCU interface abstraction */</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_raw(testcasename());</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_raw(testcasename(), ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS));</span><br><span> </span><br><span> /* We cannot send too many TBF requests in a short time because</span><br><span> * at some point the PCU will fail to allocate a new TBF. */</span><br><span>@@ -626,7 +627,7 @@</span><br><span> ms := g_ms[0]; /* We only use first MS in this test */</span><br><span> </span><br><span> /* Initialize the PCU interface abstraction */</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_raw(testcasename());</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_raw(testcasename(), ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS));</span><br><span> </span><br><span> f_pcuvty_set_allowed_cs_mcs();</span><br><span> f_pcuvty_set_link_quality_ranges();</span><br><span>@@ -713,7 +714,7 @@</span><br><span> ms := g_ms[0]; /* We only use first MS in this test */</span><br><span> </span><br><span> /* Initialize the PCU interface abstraction */</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_raw(testcasename());</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_raw(testcasename(), ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS));</span><br><span> </span><br><span> /* Set initial UL CS to 3 */</span><br><span> g_cs_initial_ul := 3;</span><br><span>@@ -788,7 +789,7 @@</span><br><span> ms := g_ms[0]; /* We only use first MS in this test */</span><br><span> </span><br><span> /* Initialize the PCU interface abstraction */</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_raw(testcasename());</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_raw(testcasename(), ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS));</span><br><span> </span><br><span> /* Set maximum allowed UL CS to 3 */</span><br><span> g_cs_max_ul := 3;</span><br><span>@@ -834,7 +835,7 @@</span><br><span> f_init_gprs_ms();</span><br><span> ms := g_ms[0]; /* We only use first MS in this test */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- info_ind := valueof(ts_PCUIF_INFO_default);</span><br><span style="color: hsl(120, 100%, 40%);">+ info_ind := valueof(ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS));</span><br><span> /* Set timer to 1 sec (default 5) to speedup test: */</span><br><span> info_ind.t3169 := 1;</span><br><span> </span><br><span>@@ -933,7 +934,7 @@</span><br><span> ms := g_ms[0]; /* We only use first MS in this test */</span><br><span> </span><br><span> /* Initialize the PCU interface abstraction */</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_raw(testcasename());</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_raw(testcasename(), ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS));</span><br><span> </span><br><span> /* Establish BSSGP connection to the PCU */</span><br><span> f_bssgp_establish();</span><br><span>@@ -982,7 +983,7 @@</span><br><span> ms := g_ms[0]; /* We only use first MS in this test */</span><br><span> </span><br><span> /* Initialize the PCU interface abstraction */</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_raw(testcasename());</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_raw(testcasename(), ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS));</span><br><span> </span><br><span> /* Establish BSSGP connection to the PCU */</span><br><span> f_bssgp_establish();</span><br><span>@@ -1112,7 +1113,7 @@</span><br><span> ms := g_ms[0]; /* We only use first MS in this test */</span><br><span> </span><br><span> /* Initialize the PCU interface abstraction */</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_raw(testcasename());</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_raw(testcasename(), ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS));</span><br><span> </span><br><span> /* Establish BSSGP connection to the PCU */</span><br><span> f_bssgp_establish();</span><br><span>@@ -1145,7 +1146,7 @@</span><br><span> ms := g_ms[0]; /* We only use first MS in this test */</span><br><span> </span><br><span> /* Initialize the PCU interface abstraction */</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_raw(testcasename());</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_raw(testcasename(), ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS));</span><br><span> </span><br><span> /* Establish BSSGP connection to the PCU */</span><br><span> f_bssgp_establish();</span><br><span>@@ -1191,7 +1192,8 @@</span><br><span> /* Test scenario where MS wants to send some data on PDCH against SGSN and it is</span><br><span> * answered, so TBFs for uplink and later for downlink are created.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-private function f_TC_mo_ping_pong_2phase_access(template (value) MSRadioAccessCapabilityV ms_racap,</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_TC_mo_ping_pong_2phase_access(PCUIF_Flags ind_flags,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) MSRadioAccessCapabilityV ms_racap,</span><br><span> template (present) CodingScheme exp_ul_cs_mcs := ?,</span><br><span> template (present) CodingScheme exp_dl_cs_mcs := ?)</span><br><span> runs on RAW_PCU_Test_CT {</span><br><span>@@ -1210,7 +1212,7 @@</span><br><span> ms := g_ms[0]; /* We only use first MS in this test */</span><br><span> </span><br><span> /* Initialize the PCU interface abstraction */</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_raw(testcasename());</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_raw(testcasename(), ts_PCUIF_INFO_default(ind_flags));</span><br><span> </span><br><span> /* Establish BSSGP connection to the PCU */</span><br><span> f_bssgp_establish();</span><br><span>@@ -1263,13 +1265,10 @@</span><br><span> var CodingScheme exp_ul_cs_mcs := f_rlcmac_block_int2cs_mcs(g_mcs_initial_ul, false);</span><br><span> var CodingScheme exp_dl_cs_mcs := CS_2;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_TC_mo_ping_pong_2phase_access(ms_racap, exp_ul_cs_mcs, exp_dl_cs_mcs);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_noMCS, ms_racap, exp_ul_cs_mcs, exp_dl_cs_mcs);</span><br><span> }</span><br><span> </span><br><span> testcase TC_mo_ping_pong_with_ul_racap_egprs_only() runs on RAW_PCU_Test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- /* Initialize the PCU interface abstraction with EGPRS-only */</span><br><span style="color: hsl(0, 100%, 40%);">- g_egprs_only := true;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> var MultislotCap_GPRS mscap_gprs := {</span><br><span> gprsmultislotclass := '00011'B,</span><br><span> gprsextendeddynalloccap := '0'B</span><br><span>@@ -1282,7 +1281,7 @@</span><br><span> var CodingScheme exp_ul_cs_mcs := f_rlcmac_block_int2cs_mcs(g_mcs_initial_ul, true);</span><br><span> var CodingScheme exp_dl_cs_mcs := MCS_1;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_TC_mo_ping_pong_2phase_access(ms_racap, exp_ul_cs_mcs, exp_dl_cs_mcs);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_default, ms_racap, exp_ul_cs_mcs, exp_dl_cs_mcs);</span><br><span> }</span><br><span> </span><br><span> testcase TC_force_two_phase_access() runs on RAW_PCU_Test_CT {</span><br><span>@@ -1297,7 +1296,7 @@</span><br><span> var CodingScheme exp_ul_cs_mcs := f_rlcmac_block_int2cs_mcs(g_mcs_initial_ul, false);</span><br><span> var CodingScheme exp_dl_cs_mcs := CS_2;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_TC_mo_ping_pong_2phase_access(ms_racap, exp_ul_cs_mcs, exp_dl_cs_mcs);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_noMCS, ms_racap, exp_ul_cs_mcs, exp_dl_cs_mcs);</span><br><span> }</span><br><span> </span><br><span> /* Test scenario where SGSN wants to send some data against MS and it is</span><br><span>@@ -1319,7 +1318,7 @@</span><br><span> ms := g_ms[0]; /* We only use first MS in this test */</span><br><span> </span><br><span> /* Initialize the PCU interface abstraction */</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_raw(testcasename());</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_raw(testcasename(), ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS));</span><br><span> </span><br><span> /* Establish BSSGP connection to the PCU */</span><br><span> f_bssgp_establish();</span><br><span>@@ -1393,7 +1392,7 @@</span><br><span> ms := g_ms[0]; /* We only use first MS in this test */</span><br><span> </span><br><span> /* Initialize the PCU interface abstraction */</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_raw(testcasename());</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_raw(testcasename(), ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS));</span><br><span> </span><br><span> /* Establish BSSGP connection to the PCU */</span><br><span> f_bssgp_establish();</span><br><span>@@ -1515,7 +1514,7 @@</span><br><span> ms := g_ms[0]; /* We only use first MS in this test */</span><br><span> </span><br><span> /* Initialize the PCU interface abstraction */</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_raw(testcasename());</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_raw(testcasename(), ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS));</span><br><span> </span><br><span> f_statsd_reset();</span><br><span> </span><br><span>@@ -1602,7 +1601,7 @@</span><br><span> ms := g_ms[0]; /* We only use first MS in this test */</span><br><span> </span><br><span> /* Initialize the PCU interface abstraction */</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_raw(testcasename());</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_raw(testcasename(), ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS));</span><br><span> </span><br><span> /* Establish BSSGP connection to the PCU */</span><br><span> f_bssgp_establish();</span><br><span>@@ -1688,7 +1687,7 @@</span><br><span> </span><br><span> /* Verify allocation and use of multislot tbf, triggered by MS class provided in SGSN. SYS#5131 */</span><br><span> testcase TC_dl_multislot_tbf_ms_class_from_sgsn() runs on RAW_PCU_Test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default);</span><br><span style="color: hsl(120, 100%, 40%);">+ var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS));</span><br><span> var octetstring data := f_rnd_octstring(10);</span><br><span> var PacketDlAssign dl_tbf_ass;</span><br><span> var RlcmacDlBlock dl_block;</span><br><span>@@ -1742,7 +1741,7 @@</span><br><span> }</span><br><span> </span><br><span> testcase TC_dl_multislot_tbf_ms_class_from_2phase() runs on RAW_PCU_Test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default);</span><br><span style="color: hsl(120, 100%, 40%);">+ var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS));</span><br><span> var RlcmacDlBlock dl_block;</span><br><span> var octetstring data := f_rnd_octstring(10);</span><br><span> var PollFnCtx pollctx;</span><br><span>@@ -1919,7 +1918,7 @@</span><br><span> ms := g_ms[0]; /* We only use first MS in this test */</span><br><span> </span><br><span> /* Initialize the PCU interface abstraction */</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_raw(testcasename());</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_raw(testcasename(), ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS));</span><br><span> </span><br><span> /* Establish BSSGP connection to the PCU */</span><br><span> f_bssgp_establish();</span><br><span>@@ -1963,7 +1962,7 @@</span><br><span> ms := g_ms[0]; /* We only use first MS in this test */</span><br><span> </span><br><span> /* Initialize the PCU interface abstraction */</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_raw(testcasename());</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_raw(testcasename(), ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS));</span><br><span> </span><br><span> /* Establish BSSGP connection to the PCU */</span><br><span> f_bssgp_establish();</span><br><span>@@ -2072,7 +2071,7 @@</span><br><span> ms := g_ms[0]; /* We only use first MS in this test */</span><br><span> </span><br><span> /* Initialize the PCU interface abstraction */</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_raw(testcasename());</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_raw(testcasename(), ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS));</span><br><span> </span><br><span> f_statsd_reset();</span><br><span> </span><br><span>@@ -2133,7 +2132,7 @@</span><br><span> ms := g_ms[0]; /* We only use first MS in this test */</span><br><span> </span><br><span> /* Initialize the PCU interface abstraction */</span><br><span style="color: hsl(0, 100%, 40%);">- f_init_raw(testcasename());</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_raw(testcasename(), ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS));</span><br><span> </span><br><span> /* Establish BSSGP connection to the PCU */</span><br><span> f_bssgp_establish();</span><br><span>@@ -2479,7 +2478,7 @@</span><br><span> </span><br><span> /* Make sure that Immediate (UL TBF) Assignment contains hopping parameters */</span><br><span> testcase TC_pcuif_fh_imm_ass_ul() runs on RAW_PCU_Test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- var template PCUIF_info_ind info_ind := ts_PCUIF_INFO_default;</span><br><span style="color: hsl(120, 100%, 40%);">+ var template PCUIF_info_ind info_ind := ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS);</span><br><span> var GprsMS ms := valueof(t_GprsMS_def);</span><br><span> </span><br><span> /* Enable frequency hopping on TRX0/TS7 */</span><br><span>@@ -2497,7 +2496,7 @@</span><br><span> </span><br><span> /* Make sure that Immediate (DL TBF) Assignment contains hopping parameters */</span><br><span> testcase TC_pcuif_fh_imm_ass_dl() runs on RAW_PCU_Test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- var template PCUIF_info_ind info_ind := ts_PCUIF_INFO_default;</span><br><span style="color: hsl(120, 100%, 40%);">+ var template PCUIF_info_ind info_ind := ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS)</span><br><span> var GprsMS ms := valueof(t_GprsMS_def);</span><br><span> </span><br><span> /* Enable frequency hopping on TRX0/TS7 */</span><br><span>@@ -2558,7 +2557,7 @@</span><br><span> </span><br><span> /* Make sure that Packet Uplink Assignment contains hopping parameters */</span><br><span> testcase TC_pcuif_fh_pkt_ass_ul() runs on RAW_PCU_Test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- var template PCUIF_info_ind info_ind := ts_PCUIF_INFO_default;</span><br><span style="color: hsl(120, 100%, 40%);">+ var template PCUIF_info_ind info_ind := ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS);</span><br><span> var GprsMS ms := valueof(t_GprsMS_def);</span><br><span> var uint32_t poll_fn;</span><br><span> </span><br><span>@@ -2598,7 +2597,7 @@</span><br><span> </span><br><span> /* Make sure that Packet Downlink Assignment contains hopping parameters */</span><br><span> testcase TC_pcuif_fh_pkt_ass_dl() runs on RAW_PCU_Test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- var template PCUIF_info_ind info_ind := ts_PCUIF_INFO_default;</span><br><span style="color: hsl(120, 100%, 40%);">+ var template PCUIF_info_ind info_ind := ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS);</span><br><span> var octetstring data := f_rnd_octstring(10);</span><br><span> var GprsMS ms := valueof(t_GprsMS_def);</span><br><span> var RlcmacDlBlock dl_block;</span><br><span>@@ -2672,8 +2671,7 @@</span><br><span> /* Initialize GPRS MS side */</span><br><span> f_init_gprs_ms(num_ms);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- info_ind := valueof(ts_PCUIF_INFO_default);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ info_ind := valueof(ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS));</span><br><span> /* Only the 3 first TRX are enabled. The enabled ones all have same</span><br><span> amount of resources, hence same amount of initial resources. */</span><br><span> f_PCUIF_ver_INFO_PDCHMask_set(info_ind, '00000000'B, (3 .. 7));</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20984">change 20984</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/+/20984"/><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: Ib95aae155b0712313a30f0c5404a8cb1f28b98f5 </div>
<div style="display:none"> Gerrit-Change-Number: 20984 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </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: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>