pcu: Define a global default set of MS RaCap

We initialize those verbose structures over and over in different tests,
and we usually don't care about detials, only whether they enable EGPRS
or not.
So let's define them once and reuse them in tests whenever possible.
Some tests requiring specific values (eg to test allocation of 8 PDCH on
a single TBF) are left intact.

Change-Id: Id047929ad71dc7e330b09fd6cbfab2da43320fde

1 files changed, 41 insertions, 144 deletions

diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn
index 3c3b5706..8c9b469b 100644
--- a/pcu/PCU_Tests.ttcn
+++ b/pcu/PCU_Tests.ttcn
@@ -118,6 +118,28 @@ const octetstring si3_default := '1b753000f110236ec9033c2747407900003c0b2b2b'O;
 const octetstring si13_default := '009000185a6fc9e08410ab2b2b2b2b2b2b2b2b2b2b'O;
 const octetstring si_default := si1_default & si3_default & si13_default;
 
+const MultislotCap_GPRS mscap_gprs_def := {
+	gprsmultislotclass := '00011'B,
+	gprsextendeddynalloccap := '0'B
+};
+const MultislotCap_EGPRS mscap_egprs_def := {
+	egprsmultislotclass := '00011'B,
+	egprsextendeddynalloccap := '0'B
+};
+template (value) MSRadioAccessCapabilityV ms_racap_gprs_def := { ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs_def, omit) };
+template (value) MSRadioAccessCapabilityV ms_racap_egprs_def := { ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs_def, mscap_egprs_def) };
+
+const MultislotCap_GPRS_BSSGP bssgp_mscap_gprs_def := {
+	gprsmultislotclass := '00011'B,
+	gprsextendeddynalloccap := '0'B
+};
+const MultislotCap_EGPRS_BSSGP bssgp_mscap_egprs_def := {
+	egprsmultislotclass := '00011'B,
+	egprsextendeddynalloccap := '0'B
+};
+template (value) MSRadioAccessCapabilityV_BSSGP bssgp_ms_racap_gprs_def := { valueof(ts_RaCapRec_BSSGP('0001'B /* E-GSM */, bssgp_mscap_gprs_def, omit)) };
+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)) };
+
 type record lqual_range {
 	/* component reference to the IPA_Client component used for RSL */
 	uint8_t low,
@@ -1077,15 +1099,6 @@ testcase TC_mcs_initial_ul() runs on RAW_PCU_Test_CT {
 	var uint32_t unused_fn, sched_fn;
 	var GprsMS ms;
 	var CodingScheme exp_ul_mcs;
-	var MultislotCap_GPRS mscap_gprs := {
-		gprsmultislotclass := '00011'B,
-		gprsextendeddynalloccap := '0'B
-	};
-	var MultislotCap_EGPRS mscap_egprs := {
-		egprsmultislotclass := '00011'B,
-		egprsextendeddynalloccap := '0'B
-	};
-	var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, mscap_egprs)) };
 
 	/* Initialize GPRS MS side */
 	f_init_gprs_ms();
@@ -1104,7 +1117,7 @@ testcase TC_mcs_initial_ul() runs on RAW_PCU_Test_CT {
 	ms.lqual_cb := g_mcs_lqual_ranges[2].low * 10;
 
 	/* Send PACKET RESOURCE REQUEST to upgrade to EGPRS */
-	pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap));
+	pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_egprs_def));
 
 	if (not match(ms.ul_tbf.tx_cs_mcs, exp_ul_mcs)) {
 		setverdict(fail, "Wrong CS_MCS ", ms.ul_tbf.tx_cs_mcs, " received vs exp ", exp_ul_mcs);
@@ -1161,16 +1174,6 @@ testcase TC_mcs_max_ul() runs on RAW_PCU_Test_CT {
 	var PollFnCtx pollctx;
 	var uint32_t unused_fn, sched_fn;
 	var GprsMS ms;
-	var MultislotCap_GPRS mscap_gprs := {
-		gprsmultislotclass := '00011'B,
-		gprsextendeddynalloccap := '0'B
-	};
-	var MultislotCap_EGPRS mscap_egprs := {
-		egprsmultislotclass := '00011'B,
-		egprsextendeddynalloccap := '0'B
-	};
-	var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, mscap_egprs)) };
-
 
 	/* Initialize GPRS MS side */
 	f_init_gprs_ms();
@@ -1185,7 +1188,7 @@ testcase TC_mcs_max_ul() runs on RAW_PCU_Test_CT {
 	f_pcuvty_set_link_quality_ranges();
 
 	/* Send PACKET RESOURCE REQUEST to upgrade to EGPRS */
-	pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap));
+	pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_egprs_def));
 	/* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */
 	f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts);
 
@@ -1210,15 +1213,6 @@ testcase TC_mcs_initial_dl() runs on RAW_PCU_Test_CT {
 	var RlcmacDlBlock dl_block;
 	var uint32_t poll_fn;
 	var GprsMS ms;
-	var MultislotCap_GPRS_BSSGP mscap_gprs := {
-		gprsmultislotclass := '00011'B,
-		gprsextendeddynalloccap := '0'B
-	};
-	var MultislotCap_EGPRS_BSSGP mscap_egprs := {
-		egprsmultislotclass := '00011'B,
-		egprsextendeddynalloccap := '0'B
-	};
-	var MSRadioAccessCapabilityV_BSSGP ms_racap := { valueof(ts_RaCapRec_BSSGP('0001'B /* E-GSM */, mscap_gprs, mscap_egprs)) };
 
 	/* Initialize NS/BSSGP side */
 	f_init_bssgp();
@@ -1242,7 +1236,7 @@ testcase TC_mcs_initial_dl() runs on RAW_PCU_Test_CT {
 	f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli);
 
 	/* SGSN sends some DL data, PCU will page on CCCH (PCH) */
-	BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data, ms_racap));
+	BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data, bssgp_ms_racap_egprs_def));
 	f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH);
 
 	/* Wait timer X2002 and DL block is available after CCCH IMM ASS: */
@@ -1273,17 +1267,7 @@ testcase TC_mcs_max_dl() runs on RAW_PCU_Test_CT {
 	f_pcuvty_set_allowed_cs_mcs();
 	f_pcuvty_set_link_quality_ranges();
 
-	var MultislotCap_GPRS_BSSGP mscap_gprs := {
-		gprsmultislotclass := '00011'B,
-		gprsextendeddynalloccap := '0'B
-	};
-	var MultislotCap_EGPRS_BSSGP mscap_egprs := {
-		egprsmultislotclass := '00011'B,
-		egprsextendeddynalloccap := '0'B
-	};
-	var MSRadioAccessCapabilityV_BSSGP ms_racap := { valueof(ts_RaCapRec_BSSGP('0001'B /* E-GSM */, mscap_gprs, mscap_egprs)) };
-
-	f_dl_data_exp_cs(f_rlcmac_block_int2cs_mcs(g_mcs_max_dl, true), ms_racap);
+	f_dl_data_exp_cs(f_rlcmac_block_int2cs_mcs(g_mcs_max_dl, true), bssgp_ms_racap_egprs_def);
 }
 
 /* Verify PCU drops TBF after some time of inactivity. */
@@ -1728,46 +1712,27 @@ runs on RAW_PCU_Test_CT {
 }
 
 testcase TC_mo_ping_pong_with_ul_racap() runs on RAW_PCU_Test_CT {
-	var MultislotCap_GPRS mscap_gprs := {
-		gprsmultislotclass := '00011'B,
-		gprsextendeddynalloccap := '0'B
-	};
-	var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) };
 	var template CodingScheme exp_ul_cs_mcs := cs_gprs_any;
 	var template CodingScheme exp_dl_cs_mcs := cs_gprs_any;
 
-	f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_noMCS, ms_racap, exp_ul_cs_mcs, exp_dl_cs_mcs);
+	f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_noMCS, ms_racap_gprs_def, exp_ul_cs_mcs, exp_dl_cs_mcs);
 }
 
 testcase TC_mo_ping_pong_with_ul_racap_egprs_only() runs on RAW_PCU_Test_CT {
-	var MultislotCap_GPRS mscap_gprs := {
-		gprsmultislotclass := '00011'B,
-		gprsextendeddynalloccap := '0'B
-	};
-	var MultislotCap_EGPRS mscap_egprs := {
-		egprsmultislotclass := '00011'B,
-		egprsextendeddynalloccap := '0'B
-	};
-	var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, mscap_egprs)) };
 	var template CodingScheme exp_ul_cs_mcs := mcs_egprs_any;
 	var template CodingScheme exp_dl_cs_mcs := mcs_egprs_any;
 
-	f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_default, ms_racap, exp_ul_cs_mcs, exp_dl_cs_mcs);
+	f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_default, ms_racap_egprs_def, exp_ul_cs_mcs, exp_dl_cs_mcs);
 }
 
 testcase TC_force_two_phase_access() runs on RAW_PCU_Test_CT {
 	/* Configure PCU to force two phase access */
 	g_force_two_phase_access := true;
 
-	var MultislotCap_GPRS mscap_gprs := {
-		gprsmultislotclass := '00011'B,
-		gprsextendeddynalloccap := '0'B
-	};
-	var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) };
 	var CodingScheme exp_ul_cs_mcs := f_rlcmac_block_int2cs_mcs(g_mcs_initial_ul, false);
 	var template CodingScheme exp_dl_cs_mcs := cs_gprs_any;
 
-	f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_noMCS, ms_racap, exp_ul_cs_mcs, exp_dl_cs_mcs);
+	f_TC_mo_ping_pong_2phase_access(c_PCUIF_Flags_noMCS, ms_racap_gprs_def, exp_ul_cs_mcs, exp_dl_cs_mcs);
 }
 
 /* Test scenario where SGSN wants to send some data against MS and it is
@@ -1832,13 +1797,8 @@ testcase TC_mt_ping_pong() runs on RAW_PCU_Test_CT {
 /* TC_mt_ping_pong, but DL-UNITDATA contains RA Access capability with (M)CS
 /* information about the MS */
 testcase TC_mt_ping_pong_with_dl_racap() runs on RAW_PCU_Test_CT {
-	var MultislotCap_GPRS_BSSGP mscap_gprs := {
-		gprsmultislotclass := '00011'B,
-		gprsextendeddynalloccap := '0'B
-	} ;
-	var MSRadioAccessCapabilityV_BSSGP ms_racap := { valueof(ts_RaCapRec_BSSGP('0001'B /* E-GSM */, mscap_gprs, omit)) };
 	var template CodingScheme exp_cs_mcs := cs_gprs_any;
-	f_TC_mt_ping_pong(ms_racap, exp_cs_mcs);
+	f_TC_mt_ping_pong(bssgp_ms_racap_gprs_def, exp_cs_mcs);
 }
 
 /* Verify that if PCU doesn't get one of the intermediate UL data blocks in a UL
@@ -2703,18 +2663,7 @@ testcase TC_dl_gprs_data_no_llc_ui_dummy() runs on RAW_PCU_Test_CT {
 /* Verify osmo-pcu Doesn't append LLC UI dummy frames to rlcmac blocks
  * containing llc data. See OS#4849 */
 testcase TC_dl_egprs_data_no_llc_ui_dummy() runs on RAW_PCU_Test_CT {
-
-	var MultislotCap_GPRS_BSSGP mscap_gprs := {
-		gprsmultislotclass := '00011'B,
-		gprsextendeddynalloccap := '0'B
-	};
-	var MultislotCap_EGPRS_BSSGP mscap_egprs := {
-		egprsmultislotclass := '00011'B,
-		egprsextendeddynalloccap := '0'B
-	};
-	var MSRadioAccessCapabilityV_BSSGP ms_racap := { valueof(ts_RaCapRec_BSSGP('0001'B /* E-GSM */, mscap_gprs, mscap_egprs)) };
-
-	f_tc_dl_data_no_llc_ui_dummy(ms_racap);
+	f_tc_dl_data_no_llc_ui_dummy(bssgp_ms_racap_egprs_def);
 }
 
 private function f_TC_egprs_pkt_chan_req(in EGPRSPktChRequest req,
@@ -3266,7 +3215,6 @@ testcase TC_multiplex_dl_gprs_egprs() runs on RAW_PCU_Test_CT {
 	var PCUIF_info_ind info_ind;
 	const integer num_ms := 2; /* 2 MS, first one is GPRS-only, second one is EGPRS */
 	var PollFnCtx pollctx;
-	var MSRadioAccessCapabilityV ms_racap;
 	var uint32_t sched_fn, dl_fn, ack_fn;
 	var octetstring data := f_rnd_octstring(10);
 	var RlcmacDlBlock dl_block;
@@ -3297,18 +3245,8 @@ testcase TC_multiplex_dl_gprs_egprs() runs on RAW_PCU_Test_CT {
 	f_bssgp_establish();
 	f_multi_ms_bssgp_register();
 
-	var MultislotCap_GPRS mscap_gprs := {
-		gprsmultislotclass := '00011'B,
-		gprsextendeddynalloccap := '0'B
-	};
-	var MultislotCap_EGPRS mscap_egprs := {
-		egprsmultislotclass := '00011'B,
-		egprsextendeddynalloccap := '0'B
-	};
-
 	/* Establish UL TBF for MS0 (GPRS-only) */
-	ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) };
-	pollctx := f_ms_establish_ul_tbf_2phase_access(g_ms[0], ts_RlcMacUlCtrl_PKT_RES_REQ(g_ms[0].tlli, ms_racap));
+	pollctx := f_ms_establish_ul_tbf_2phase_access(g_ms[0], ts_RlcMacUlCtrl_PKT_RES_REQ(g_ms[0].tlli, ms_racap_gprs_def));
 	if (not match(g_ms[0].ul_tbf.tx_cs_mcs, cs_gprs_any)) {
 		setverdict(fail, "Wrong CS_MCS ", g_ms[0].ul_tbf.tx_cs_mcs, " received vs exp ", cs_gprs_any);
 		f_shutdown(__BFILE__, __LINE__);
@@ -3317,8 +3255,7 @@ testcase TC_multiplex_dl_gprs_egprs() runs on RAW_PCU_Test_CT {
 	f_ms_tx_ul_block(g_ms[0], ts_RLCMAC_CTRL_ACK(g_ms[0].tlli), pollctx.fn, nr := pollctx.tstrxbts);
 
 	/* Establish UL TBF for MS1 (EGPRS) */
-	ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, mscap_egprs)) };
-	pollctx := f_ms_establish_ul_tbf_2phase_access(g_ms[1], ts_RlcMacUlCtrl_PKT_RES_REQ(g_ms[1].tlli, ms_racap));
+	pollctx := f_ms_establish_ul_tbf_2phase_access(g_ms[1], ts_RlcMacUlCtrl_PKT_RES_REQ(g_ms[1].tlli, ms_racap_egprs_def));
 	if (not match(g_ms[1].ul_tbf.tx_cs_mcs, mcs_egprs_any)) {
 		setverdict(fail, "Wrong CS_MCS ", g_ms[1].ul_tbf.tx_cs_mcs, " received vs exp ", mcs_egprs_any);
 		f_shutdown(__BFILE__, __LINE__);
@@ -3748,11 +3685,6 @@ testcase TC_nacc_outbound_success() runs on RAW_PCU_Test_CT {
 	var PollFnCtx pollctx;
 	var GprsMS ms;
 	var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default);
-	var MultislotCap_GPRS mscap_gprs := {
-		gprsmultislotclass := '00011'B,
-		gprsextendeddynalloccap := '0'B
-	};
-	var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) };
 
 	/* Initialize osmo-bsc emulation neighbor resolution CTRL port */
 	f_ipa_ctrl_start_server(mp_ctrl_neigh_ip, mp_ctrl_neigh_port);
@@ -3774,7 +3706,7 @@ testcase TC_nacc_outbound_success() runs on RAW_PCU_Test_CT {
 	f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli);
 
 	/* Send PACKET RESOURCE REQUEST */
-	pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap));
+	pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def));
 	/* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */
 	f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts);
 
@@ -3791,11 +3723,6 @@ testcase TC_nacc_outbound_success_no_ctrl_ack() runs on RAW_PCU_Test_CT {
 	var RlcmacDlBlock dl_block;
 	var uint32_t sched_fn;
 	var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default);
-	var MultislotCap_GPRS mscap_gprs := {
-		gprsmultislotclass := '00011'B,
-		gprsextendeddynalloccap := '0'B
-	};
-	var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) };
 
 	/* Initialize osmo-bsc emulation neighbor resolution CTRL port */
 	f_ipa_ctrl_start_server(mp_ctrl_neigh_ip, mp_ctrl_neigh_port);
@@ -3817,7 +3744,7 @@ testcase TC_nacc_outbound_success_no_ctrl_ack() runs on RAW_PCU_Test_CT {
 	f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli);
 
 	/* Send PACKET RESOURCE REQUEST */
-	pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap));
+	pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def));
 	/* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */
 	f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts);
 
@@ -3844,11 +3771,6 @@ testcase TC_nacc_outbound_success_twice() runs on RAW_PCU_Test_CT {
 	var PollFnCtx pollctx;
 	var GprsMS ms;
 	var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default);
-	var MultislotCap_GPRS mscap_gprs := {
-		gprsmultislotclass := '00011'B,
-		gprsextendeddynalloccap := '0'B
-	};
-	var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) };
 	var template (value) RlcmacUlCtrlMsg cell_chf_notif;
 
 	/* Initialize osmo-bsc emulation neighbor resolution CTRL port */
@@ -3873,7 +3795,7 @@ testcase TC_nacc_outbound_success_twice() runs on RAW_PCU_Test_CT {
 	f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli);
 
 	/* Send PACKET RESOURCE REQUEST */
-	pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap));
+	pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def));
 	/* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */
 	f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts);
 
@@ -3893,11 +3815,6 @@ testcase TC_nacc_outbound_success_twice_nocache() runs on RAW_PCU_Test_CT {
 	var PollFnCtx pollctx;
 	var GprsMS ms;
 	var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default);
-	var MultislotCap_GPRS mscap_gprs := {
-		gprsmultislotclass := '00011'B,
-		gprsextendeddynalloccap := '0'B
-	};
-	var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) };
 	var template (value) RlcmacUlCtrlMsg cell_chf_notif;
 
 	/* Initialize osmo-bsc emulation neighbor resolution CTRL port */
@@ -3922,7 +3839,7 @@ testcase TC_nacc_outbound_success_twice_nocache() runs on RAW_PCU_Test_CT {
 	f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli);
 
 	/* Send PACKET RESOURCE REQUEST */
-	pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap));
+	pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def));
 	/* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */
 	f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts);
 
@@ -3947,11 +3864,6 @@ testcase TC_nacc_outbound_rac_ci_resolve_conn_refused() runs on RAW_PCU_Test_CT
 	var GprsMS ms;
 	var template (value) RlcmacUlCtrlMsg cell_chf_notif;
 	var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default);
-	var MultislotCap_GPRS mscap_gprs := {
-		gprsmultislotclass := '00011'B,
-		gprsextendeddynalloccap := '0'B
-	};
-	var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) };
 	var GsmArfcn req_arfcn := 862;
 	var uint6_t req_bsic := 43;
 
@@ -3977,7 +3889,7 @@ testcase TC_nacc_outbound_rac_ci_resolve_conn_refused() runs on RAW_PCU_Test_CT
 	f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli);
 
 	/* Send PACKET RESOURCE REQUEST */
-	pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap));
+	pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def));
 	/* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */
 	f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts);
 
@@ -4008,11 +3920,6 @@ testcase TC_nacc_outbound_rac_ci_resolve_timeout() runs on RAW_PCU_Test_CT {
 	var GprsMS ms;
 	var template (value) RlcmacUlCtrlMsg cell_chf_notif;
 	var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default);
-	var MultislotCap_GPRS mscap_gprs := {
-		gprsmultislotclass := '00011'B,
-		gprsextendeddynalloccap := '0'B
-	};
-	var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) };
 	var GsmArfcn req_arfcn := 862;
 	var uint6_t req_bsic := 43;
 
@@ -4036,7 +3943,7 @@ testcase TC_nacc_outbound_rac_ci_resolve_timeout() runs on RAW_PCU_Test_CT {
 	f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli);
 
 	/* Send PACKET RESOURCE REQUEST */
-	pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap));
+	pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def));
 	/* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */
 	f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts);
 
@@ -4077,11 +3984,6 @@ testcase TC_nacc_outbound_rac_ci_resolve_fail_parse_response() runs on RAW_PCU_T
 	var GprsMS ms;
 	var template (value) RlcmacUlCtrlMsg cell_chf_notif;
 	var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default);
-	var MultislotCap_GPRS mscap_gprs := {
-		gprsmultislotclass := '00011'B,
-		gprsextendeddynalloccap := '0'B
-	};
-	var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) };
 	var GsmArfcn req_arfcn := 862;
 	var uint6_t req_bsic := 43;
 
@@ -4105,7 +4007,7 @@ testcase TC_nacc_outbound_rac_ci_resolve_fail_parse_response() runs on RAW_PCU_T
 	f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli);
 
 	/* Send PACKET RESOURCE REQUEST */
-	pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap));
+	pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def));
 	/* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */
 	f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts);
 
@@ -4146,11 +4048,6 @@ testcase TC_nacc_outbound_si_resolve_timeout() runs on RAW_PCU_Test_CT {
 	var GprsMS ms;
 	var template (value) RlcmacUlCtrlMsg cell_chf_notif;
 	var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default);
-	var MultislotCap_GPRS mscap_gprs := {
-		gprsmultislotclass := '00011'B,
-		gprsextendeddynalloccap := '0'B
-	};
-	var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, omit)) };
 	var GsmArfcn req_arfcn := 862;
 	var uint6_t req_bsic := 43;
 	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 */
@@ -4184,7 +4081,7 @@ testcase TC_nacc_outbound_si_resolve_timeout() runs on RAW_PCU_Test_CT {
 	f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli);
 
 	/* Send PACKET RESOURCE REQUEST */
-	pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap));
+	pollctx := f_ms_establish_ul_tbf_2phase_access(ms, ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, ms_racap_gprs_def));
 	/* Pkt Uplink Assignment above sets poll+rrbp requesting PACKET CONTROL ACK */
 	f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), pollctx.fn, nr := pollctx.tstrxbts);