<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22721">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pcu: Define a global default set of MS RaCap<br><br>We initialize those verbose structures over and over in different tests,<br>and we usually don't care about detials, only whether they enable EGPRS<br>or not.<br>So let's define them once and reuse them in tests whenever possible.<br>Some tests requiring specific values (eg to test allocation of 8 PDCH on<br>a single TBF) are left intact.<br><br>Change-Id: Id047929ad71dc7e330b09fd6cbfab2da43320fde<br>---<br>M pcu/PCU_Tests.ttcn<br>1 file changed, 41 insertions(+), 144 deletions(-)<br><br></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 3c3b570..8c9b469 100644</span><br><span>--- a/pcu/PCU_Tests.ttcn</span><br><span>+++ b/pcu/PCU_Tests.ttcn</span><br><span>@@ -118,6 +118,28 @@</span><br><span> const octetstring si13_default := '009000185a6fc9e08410ab2b2b2b2b2b2b2b2b2b2b'O;</span><br><span> const octetstring si_default := si1_default & si3_default & si13_default;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+const MultislotCap_GPRS mscap_gprs_def := {</span><br><span style="color: hsl(120, 100%, 40%);">+ gprsmultislotclass := '00011'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ gprsextendeddynalloccap := '0'B</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+const MultislotCap_EGPRS mscap_egprs_def := {</span><br><span style="color: hsl(120, 100%, 40%);">+ egprsmultislotclass := '00011'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ egprsextendeddynalloccap := '0'B</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+template (value) MSRadioAccessCapabilityV ms_racap_gprs_def := { ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs_def, omit) };</span><br><span style="color: hsl(120, 100%, 40%);">+template (value) MSRadioAccessCapabilityV ms_racap_egprs_def := { ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs_def, mscap_egprs_def) };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+const MultislotCap_GPRS_BSSGP bssgp_mscap_gprs_def := {</span><br><span style="color: hsl(120, 100%, 40%);">+ gprsmultislotclass := '00011'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ gprsextendeddynalloccap := '0'B</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+const MultislotCap_EGPRS_BSSGP bssgp_mscap_egprs_def := {</span><br><span style="color: hsl(120, 100%, 40%);">+ egprsmultislotclass := '00011'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ egprsextendeddynalloccap := '0'B</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+template (value) MSRadioAccessCapabilityV_BSSGP bssgp_ms_racap_gprs_def := { valueof(ts_RaCapRec_BSSGP('0001'B /* E-GSM */, bssgp_mscap_gprs_def, omit)) };</span><br><span style="color: hsl(120, 100%, 40%);">+template (value) MSRadioAccessCapabilityV_BSSGP bssgp_ms_racap_egprs_def := { valueof(ts_RaCapRec_BSSGP('0001'B /* E-GSM */, bssgp_mscap_gprs_def, bssgp_mscap_egprs_def)) };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> type record lqual_range {</span><br><span> /* component reference to the IPA_Client component used for RSL */</span><br><span> uint8_t low,</span><br><span>@@ -1077,15 +1099,6 @@</span><br><span> var uint32_t unused_fn, sched_fn;</span><br><span> var GprsMS ms;</span><br><span> var CodingScheme exp_ul_mcs;</span><br><span style="color: hsl(0, 100%, 40%);">- var MultislotCap_GPRS mscap_gprs := {</span><br><span style="color: hsl(0, 100%, 40%);">- gprsmultislotclass := '00011'B,</span><br><span style="color: hsl(0, 100%, 40%);">- gprsextendeddynalloccap := '0'B</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- var MultislotCap_EGPRS mscap_egprs := {</span><br><span style="color: hsl(0, 100%, 40%);">- egprsmultislotclass := '00011'B,</span><br><span style="color: hsl(0, 100%, 40%);">- egprsextendeddynalloccap := '0'B</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, mscap_egprs)) };</span><br><span> </span><br><span> /* Initialize GPRS MS side */</span><br><span> f_init_gprs_ms();</span><br><span>@@ -1104,7 +1117,7 @@</span><br><span> ms.lqual_cb := g_mcs_lqual_ranges[2].low * 10;</span><br><span> </span><br><span> /* Send PACKET RESOURCE REQUEST to upgrade to EGPRS */</span><br><span style="color: hsl(0, 100%, 40%);">- pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap));</span><br><span style="color: hsl(120, 100%, 40%);">+ pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_egprs_def));</span><br><span> </span><br><span> if (not match(ms.ul_tbf.tx_cs_mcs, exp_ul_mcs)) {</span><br><span> setverdict(fail, "Wrong CS_MCS ", ms.ul_tbf.tx_cs_mcs, " received vs exp ", exp_ul_mcs);</span><br><span>@@ -1161,16 +1174,6 @@</span><br><span> var PollFnCtx pollctx;</span><br><span> var uint32_t unused_fn, sched_fn;</span><br><span> var GprsMS ms;</span><br><span style="color: hsl(0, 100%, 40%);">- var MultislotCap_GPRS mscap_gprs := {</span><br><span style="color: hsl(0, 100%, 40%);">- gprsmultislotclass := '00011'B,</span><br><span style="color: hsl(0, 100%, 40%);">- gprsextendeddynalloccap := '0'B</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- var MultislotCap_EGPRS mscap_egprs := {</span><br><span style="color: hsl(0, 100%, 40%);">- egprsmultislotclass := '00011'B,</span><br><span style="color: hsl(0, 100%, 40%);">- egprsextendeddynalloccap := '0'B</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, mscap_egprs)) };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> </span><br><span> /* Initialize GPRS MS side */</span><br><span> f_init_gprs_ms();</span><br><span>@@ -1185,7 +1188,7 @@</span><br><span> f_pcuvty_set_link_quality_ranges();</span><br><span> </span><br><span> /* Send PACKET RESOURCE REQUEST to upgrade to EGPRS */</span><br><span style="color: hsl(0, 100%, 40%);">- pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap));</span><br><span style="color: hsl(120, 100%, 40%);">+ pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_egprs_def));</span><br><span> /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */</span><br><span> f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts);</span><br><span> </span><br><span>@@ -1210,15 +1213,6 @@</span><br><span> var RlcmacDlBlock dl_block;</span><br><span> var uint32_t poll_fn;</span><br><span> var GprsMS ms;</span><br><span style="color: hsl(0, 100%, 40%);">- var MultislotCap_GPRS_BSSGP mscap_gprs := {</span><br><span style="color: hsl(0, 100%, 40%);">- gprsmultislotclass := '00011'B,</span><br><span style="color: hsl(0, 100%, 40%);">- gprsextendeddynalloccap := '0'B</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- var MultislotCap_EGPRS_BSSGP mscap_egprs := {</span><br><span style="color: hsl(0, 100%, 40%);">- egprsmultislotclass := '00011'B,</span><br><span style="color: hsl(0, 100%, 40%);">- egprsextendeddynalloccap := '0'B</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- var MSRadioAccessCapabilityV_BSSGP ms_racap := { valueof(ts_RaCapRec_BSSGP('0001'B /* E-GSM */, mscap_gprs, mscap_egprs)) };</span><br><span> </span><br><span> /* Initialize NS/BSSGP side */</span><br><span> f_init_bssgp();</span><br><span>@@ -1242,7 +1236,7 @@</span><br><span> f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli);</span><br><span> </span><br><span> /* SGSN sends some DL data, PCU will page on CCCH (PCH) */</span><br><span style="color: hsl(0, 100%, 40%);">- BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data, ms_racap));</span><br><span style="color: hsl(120, 100%, 40%);">+ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data, bssgp_ms_racap_egprs_def));</span><br><span> f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH);</span><br><span> </span><br><span> /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */</span><br><span>@@ -1273,17 +1267,7 @@</span><br><span> f_pcuvty_set_allowed_cs_mcs();</span><br><span> f_pcuvty_set_link_quality_ranges();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- var MultislotCap_GPRS_BSSGP mscap_gprs := {</span><br><span style="color: hsl(0, 100%, 40%);">- gprsmultislotclass := '00011'B,</span><br><span style="color: hsl(0, 100%, 40%);">- gprsextendeddynalloccap := '0'B</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- var MultislotCap_EGPRS_BSSGP mscap_egprs := {</span><br><span style="color: hsl(0, 100%, 40%);">- egprsmultislotclass := '00011'B,</span><br><span style="color: hsl(0, 100%, 40%);">- egprsextendeddynalloccap := '0'B</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- var MSRadioAccessCapabilityV_BSSGP ms_racap := { valueof(ts_RaCapRec_BSSGP('0001'B /* E-GSM */, mscap_gprs, mscap_egprs)) };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- f_dl_data_exp_cs(f_rlcmac_block_int2cs_mcs(g_mcs_max_dl, true), ms_racap);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_dl_data_exp_cs(f_rlcmac_block_int2cs_mcs(g_mcs_max_dl, true), bssgp_ms_racap_egprs_def);</span><br><span> }</span><br><span> </span><br><span> /* Verify PCU drops TBF after some time of inactivity. */</span><br><span>@@ -1728,46 +1712,27 @@</span><br><span> }</span><br><span> </span><br><span> testcase TC_mo_ping_pong_with_ul_racap() runs on RAW_PCU_Test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- var MultislotCap_GPRS mscap_gprs := {</span><br><span style="color: hsl(0, 100%, 40%);">- gprsmultislotclass := '00011'B,</span><br><span style="color: hsl(0, 100%, 40%);">- gprsextendeddynalloccap := '0'B</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) };</span><br><span> var template CodingScheme exp_ul_cs_mcs := cs_gprs_any;</span><br><span> var template CodingScheme exp_dl_cs_mcs := cs_gprs_any;</span><br><span> </span><br><span style="color: hsl(0, 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 style="color: hsl(120, 100%, 40%);">+ f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_noMCS, ms_racap_gprs_def, 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%);">- var MultislotCap_GPRS mscap_gprs := {</span><br><span style="color: hsl(0, 100%, 40%);">- gprsmultislotclass := '00011'B,</span><br><span style="color: hsl(0, 100%, 40%);">- gprsextendeddynalloccap := '0'B</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- var MultislotCap_EGPRS mscap_egprs := {</span><br><span style="color: hsl(0, 100%, 40%);">- egprsmultislotclass := '00011'B,</span><br><span style="color: hsl(0, 100%, 40%);">- egprsextendeddynalloccap := '0'B</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, mscap_egprs)) };</span><br><span> var template CodingScheme exp_ul_cs_mcs := mcs_egprs_any;</span><br><span> var template CodingScheme exp_dl_cs_mcs := mcs_egprs_any;</span><br><span> </span><br><span style="color: hsl(0, 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 style="color: hsl(120, 100%, 40%);">+ f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_default, ms_racap_egprs_def, 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> /* Configure PCU to force two phase access */</span><br><span> g_force_two_phase_access := true;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- var MultislotCap_GPRS mscap_gprs := {</span><br><span style="color: hsl(0, 100%, 40%);">- gprsmultislotclass := '00011'B,</span><br><span style="color: hsl(0, 100%, 40%);">- gprsextendeddynalloccap := '0'B</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) };</span><br><span> var CodingScheme exp_ul_cs_mcs := f_rlcmac_block_int2cs_mcs(g_mcs_initial_ul, false);</span><br><span> var template CodingScheme exp_dl_cs_mcs := cs_gprs_any;</span><br><span> </span><br><span style="color: hsl(0, 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 style="color: hsl(120, 100%, 40%);">+ f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_noMCS, ms_racap_gprs_def, 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>@@ -1832,13 +1797,8 @@</span><br><span> /* TC_mt_ping_pong, but DL-UNITDATA contains RA Access capability with (M)CS</span><br><span> /* information about the MS */</span><br><span> testcase TC_mt_ping_pong_with_dl_racap() runs on RAW_PCU_Test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- var MultislotCap_GPRS_BSSGP mscap_gprs := {</span><br><span style="color: hsl(0, 100%, 40%);">- gprsmultislotclass := '00011'B,</span><br><span style="color: hsl(0, 100%, 40%);">- gprsextendeddynalloccap := '0'B</span><br><span style="color: hsl(0, 100%, 40%);">- } ;</span><br><span style="color: hsl(0, 100%, 40%);">- var MSRadioAccessCapabilityV_BSSGP ms_racap := { valueof(ts_RaCapRec_BSSGP('0001'B /* E-GSM */, mscap_gprs, omit)) };</span><br><span> var template CodingScheme exp_cs_mcs := cs_gprs_any;</span><br><span style="color: hsl(0, 100%, 40%);">- f_TC_mt_ping_pong(ms_racap, exp_cs_mcs);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_TC_mt_ping_pong(bssgp_ms_racap_gprs_def, exp_cs_mcs);</span><br><span> }</span><br><span> </span><br><span> /* Verify that if PCU doesn't get one of the intermediate UL data blocks in a UL</span><br><span>@@ -2703,18 +2663,7 @@</span><br><span> /* Verify osmo-pcu Doesn't append LLC UI dummy frames to rlcmac blocks</span><br><span> * containing llc data. See OS#4849 */</span><br><span> testcase TC_dl_egprs_data_no_llc_ui_dummy() runs on RAW_PCU_Test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- var MultislotCap_GPRS_BSSGP mscap_gprs := {</span><br><span style="color: hsl(0, 100%, 40%);">- gprsmultislotclass := '00011'B,</span><br><span style="color: hsl(0, 100%, 40%);">- gprsextendeddynalloccap := '0'B</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- var MultislotCap_EGPRS_BSSGP mscap_egprs := {</span><br><span style="color: hsl(0, 100%, 40%);">- egprsmultislotclass := '00011'B,</span><br><span style="color: hsl(0, 100%, 40%);">- egprsextendeddynalloccap := '0'B</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- var MSRadioAccessCapabilityV_BSSGP ms_racap := { valueof(ts_RaCapRec_BSSGP('0001'B /* E-GSM */, mscap_gprs, mscap_egprs)) };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- f_tc_dl_data_no_llc_ui_dummy(ms_racap);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_tc_dl_data_no_llc_ui_dummy(bssgp_ms_racap_egprs_def);</span><br><span> }</span><br><span> </span><br><span> private function f_TC_egprs_pkt_chan_req(in EGPRSPktChRequest req,</span><br><span>@@ -3266,7 +3215,6 @@</span><br><span> var PCUIF_info_ind info_ind;</span><br><span> const integer num_ms := 2; /* 2 MS, first one is GPRS-only, second one is EGPRS */</span><br><span> var PollFnCtx pollctx;</span><br><span style="color: hsl(0, 100%, 40%);">- var MSRadioAccessCapabilityV ms_racap;</span><br><span> var uint32_t sched_fn, dl_fn, ack_fn;</span><br><span> var octetstring data := f_rnd_octstring(10);</span><br><span> var RlcmacDlBlock dl_block;</span><br><span>@@ -3297,18 +3245,8 @@</span><br><span> f_bssgp_establish();</span><br><span> f_multi_ms_bssgp_register();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- var MultislotCap_GPRS mscap_gprs := {</span><br><span style="color: hsl(0, 100%, 40%);">- gprsmultislotclass := '00011'B,</span><br><span style="color: hsl(0, 100%, 40%);">- gprsextendeddynalloccap := '0'B</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- var MultislotCap_EGPRS mscap_egprs := {</span><br><span style="color: hsl(0, 100%, 40%);">- egprsmultislotclass := '00011'B,</span><br><span style="color: hsl(0, 100%, 40%);">- egprsextendeddynalloccap := '0'B</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* Establish UL TBF for MS0 (GPRS-only) */</span><br><span style="color: hsl(0, 100%, 40%);">- ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) };</span><br><span style="color: hsl(0, 100%, 40%);">- pollctx := f_ms_establish_ul_tbf_2phase_access(g_ms[0], ts_RlcMacUlCtrl_PKT_RES_REQ(g_ms[0].tlli, ms_racap));</span><br><span style="color: hsl(120, 100%, 40%);">+ pollctx := f_ms_establish_ul_tbf_2phase_access(g_ms[0], ts_RlcMacUlCtrl_PKT_RES_REQ(g_ms[0].tlli, ms_racap_gprs_def));</span><br><span> if (not match(g_ms[0].ul_tbf.tx_cs_mcs, cs_gprs_any)) {</span><br><span> setverdict(fail, "Wrong CS_MCS ", g_ms[0].ul_tbf.tx_cs_mcs, " received vs exp ", cs_gprs_any);</span><br><span> f_shutdown(__BFILE__, __LINE__);</span><br><span>@@ -3317,8 +3255,7 @@</span><br><span> f_ms_tx_ul_block(g_ms[0], ts_RLCMAC_CTRL_ACK(g_ms[0].tlli), pollctx.fn, nr := pollctx.tstrxbts);</span><br><span> </span><br><span> /* Establish UL TBF for MS1 (EGPRS) */</span><br><span style="color: hsl(0, 100%, 40%);">- ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, mscap_egprs)) };</span><br><span style="color: hsl(0, 100%, 40%);">- pollctx := f_ms_establish_ul_tbf_2phase_access(g_ms[1], ts_RlcMacUlCtrl_PKT_RES_REQ(g_ms[1].tlli, ms_racap));</span><br><span style="color: hsl(120, 100%, 40%);">+ pollctx := f_ms_establish_ul_tbf_2phase_access(g_ms[1], ts_RlcMacUlCtrl_PKT_RES_REQ(g_ms[1].tlli, ms_racap_egprs_def));</span><br><span> if (not match(g_ms[1].ul_tbf.tx_cs_mcs, mcs_egprs_any)) {</span><br><span> setverdict(fail, "Wrong CS_MCS ", g_ms[1].ul_tbf.tx_cs_mcs, " received vs exp ", mcs_egprs_any);</span><br><span> f_shutdown(__BFILE__, __LINE__);</span><br><span>@@ -3748,11 +3685,6 @@</span><br><span> var PollFnCtx pollctx;</span><br><span> var GprsMS ms;</span><br><span> var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default);</span><br><span style="color: hsl(0, 100%, 40%);">- var MultislotCap_GPRS mscap_gprs := {</span><br><span style="color: hsl(0, 100%, 40%);">- gprsmultislotclass := '00011'B,</span><br><span style="color: hsl(0, 100%, 40%);">- gprsextendeddynalloccap := '0'B</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) };</span><br><span> </span><br><span> /* Initialize osmo-bsc emulation neighbor resolution CTRL port */</span><br><span> f_ipa_ctrl_start_server(mp_ctrl_neigh_ip, mp_ctrl_neigh_port);</span><br><span>@@ -3774,7 +3706,7 @@</span><br><span> f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli);</span><br><span> </span><br><span> /* Send PACKET RESOURCE REQUEST */</span><br><span style="color: hsl(0, 100%, 40%);">- pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap));</span><br><span style="color: hsl(120, 100%, 40%);">+ pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def));</span><br><span> /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */</span><br><span> f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts);</span><br><span> </span><br><span>@@ -3791,11 +3723,6 @@</span><br><span> var RlcmacDlBlock dl_block;</span><br><span> var uint32_t sched_fn;</span><br><span> var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default);</span><br><span style="color: hsl(0, 100%, 40%);">- var MultislotCap_GPRS mscap_gprs := {</span><br><span style="color: hsl(0, 100%, 40%);">- gprsmultislotclass := '00011'B,</span><br><span style="color: hsl(0, 100%, 40%);">- gprsextendeddynalloccap := '0'B</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) };</span><br><span> </span><br><span> /* Initialize osmo-bsc emulation neighbor resolution CTRL port */</span><br><span> f_ipa_ctrl_start_server(mp_ctrl_neigh_ip, mp_ctrl_neigh_port);</span><br><span>@@ -3817,7 +3744,7 @@</span><br><span> f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli);</span><br><span> </span><br><span> /* Send PACKET RESOURCE REQUEST */</span><br><span style="color: hsl(0, 100%, 40%);">- pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap));</span><br><span style="color: hsl(120, 100%, 40%);">+ pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def));</span><br><span> /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */</span><br><span> f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts);</span><br><span> </span><br><span>@@ -3844,11 +3771,6 @@</span><br><span> var PollFnCtx pollctx;</span><br><span> var GprsMS ms;</span><br><span> var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default);</span><br><span style="color: hsl(0, 100%, 40%);">- var MultislotCap_GPRS mscap_gprs := {</span><br><span style="color: hsl(0, 100%, 40%);">- gprsmultislotclass := '00011'B,</span><br><span style="color: hsl(0, 100%, 40%);">- gprsextendeddynalloccap := '0'B</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) };</span><br><span> var template (value) RlcmacUlCtrlMsg cell_chf_notif;</span><br><span> </span><br><span> /* Initialize osmo-bsc emulation neighbor resolution CTRL port */</span><br><span>@@ -3873,7 +3795,7 @@</span><br><span> f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli);</span><br><span> </span><br><span> /* Send PACKET RESOURCE REQUEST */</span><br><span style="color: hsl(0, 100%, 40%);">- pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap));</span><br><span style="color: hsl(120, 100%, 40%);">+ pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def));</span><br><span> /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */</span><br><span> f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts);</span><br><span> </span><br><span>@@ -3893,11 +3815,6 @@</span><br><span> var PollFnCtx pollctx;</span><br><span> var GprsMS ms;</span><br><span> var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default);</span><br><span style="color: hsl(0, 100%, 40%);">- var MultislotCap_GPRS mscap_gprs := {</span><br><span style="color: hsl(0, 100%, 40%);">- gprsmultislotclass := '00011'B,</span><br><span style="color: hsl(0, 100%, 40%);">- gprsextendeddynalloccap := '0'B</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) };</span><br><span> var template (value) RlcmacUlCtrlMsg cell_chf_notif;</span><br><span> </span><br><span> /* Initialize osmo-bsc emulation neighbor resolution CTRL port */</span><br><span>@@ -3922,7 +3839,7 @@</span><br><span> f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli);</span><br><span> </span><br><span> /* Send PACKET RESOURCE REQUEST */</span><br><span style="color: hsl(0, 100%, 40%);">- pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap));</span><br><span style="color: hsl(120, 100%, 40%);">+ pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def));</span><br><span> /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */</span><br><span> f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts);</span><br><span> </span><br><span>@@ -3947,11 +3864,6 @@</span><br><span> var GprsMS ms;</span><br><span> var template (value) RlcmacUlCtrlMsg cell_chf_notif;</span><br><span> var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default);</span><br><span style="color: hsl(0, 100%, 40%);">- var MultislotCap_GPRS mscap_gprs := {</span><br><span style="color: hsl(0, 100%, 40%);">- gprsmultislotclass := '00011'B,</span><br><span style="color: hsl(0, 100%, 40%);">- gprsextendeddynalloccap := '0'B</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) };</span><br><span> var GsmArfcn req_arfcn := 862;</span><br><span> var uint6_t req_bsic := 43;</span><br><span> </span><br><span>@@ -3977,7 +3889,7 @@</span><br><span> f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli);</span><br><span> </span><br><span> /* Send PACKET RESOURCE REQUEST */</span><br><span style="color: hsl(0, 100%, 40%);">- pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap));</span><br><span style="color: hsl(120, 100%, 40%);">+ pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def));</span><br><span> /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */</span><br><span> f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts);</span><br><span> </span><br><span>@@ -4008,11 +3920,6 @@</span><br><span> var GprsMS ms;</span><br><span> var template (value) RlcmacUlCtrlMsg cell_chf_notif;</span><br><span> var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default);</span><br><span style="color: hsl(0, 100%, 40%);">- var MultislotCap_GPRS mscap_gprs := {</span><br><span style="color: hsl(0, 100%, 40%);">- gprsmultislotclass := '00011'B,</span><br><span style="color: hsl(0, 100%, 40%);">- gprsextendeddynalloccap := '0'B</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) };</span><br><span> var GsmArfcn req_arfcn := 862;</span><br><span> var uint6_t req_bsic := 43;</span><br><span> </span><br><span>@@ -4036,7 +3943,7 @@</span><br><span> f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli);</span><br><span> </span><br><span> /* Send PACKET RESOURCE REQUEST */</span><br><span style="color: hsl(0, 100%, 40%);">- pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap));</span><br><span style="color: hsl(120, 100%, 40%);">+ pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def));</span><br><span> /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */</span><br><span> f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts);</span><br><span> </span><br><span>@@ -4077,11 +3984,6 @@</span><br><span> var GprsMS ms;</span><br><span> var template (value) RlcmacUlCtrlMsg cell_chf_notif;</span><br><span> var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default);</span><br><span style="color: hsl(0, 100%, 40%);">- var MultislotCap_GPRS mscap_gprs := {</span><br><span style="color: hsl(0, 100%, 40%);">- gprsmultislotclass := '00011'B,</span><br><span style="color: hsl(0, 100%, 40%);">- gprsextendeddynalloccap := '0'B</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) };</span><br><span> var GsmArfcn req_arfcn := 862;</span><br><span> var uint6_t req_bsic := 43;</span><br><span> </span><br><span>@@ -4105,7 +4007,7 @@</span><br><span> f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli);</span><br><span> </span><br><span> /* Send PACKET RESOURCE REQUEST */</span><br><span style="color: hsl(0, 100%, 40%);">- pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap));</span><br><span style="color: hsl(120, 100%, 40%);">+ pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def));</span><br><span> /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */</span><br><span> f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts);</span><br><span> </span><br><span>@@ -4146,11 +4048,6 @@</span><br><span> var GprsMS ms;</span><br><span> var template (value) RlcmacUlCtrlMsg cell_chf_notif;</span><br><span> var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default);</span><br><span style="color: hsl(0, 100%, 40%);">- var MultislotCap_GPRS mscap_gprs := {</span><br><span style="color: hsl(0, 100%, 40%);">- gprsmultislotclass := '00011'B,</span><br><span style="color: hsl(0, 100%, 40%);">- gprsextendeddynalloccap := '0'B</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) };</span><br><span> var GsmArfcn req_arfcn := 862;</span><br><span> var uint6_t req_bsic := 43;</span><br><span> var BssgpCellId src := valueof(ts_BssgpCellId(ts_RAI(ts_LAI(f_enc_BcdMccMnc(info_ind.mcc, info_ind.mnc, info_ind.mnc_3_digits == 1), /* '262F42'H */</span><br><span>@@ -4184,7 +4081,7 @@</span><br><span> f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli);</span><br><span> </span><br><span> /* Send PACKET RESOURCE REQUEST */</span><br><span style="color: hsl(0, 100%, 40%);">- pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap));</span><br><span style="color: hsl(120, 100%, 40%);">+ pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def));</span><br><span> /* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */</span><br><span> f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22721">change 22721</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/+/22721"/><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: Id047929ad71dc7e330b09fd6cbfab2da43320fde </div>
<div style="display:none"> Gerrit-Change-Number: 22721 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>