Change in osmo-ttcn3-hacks[master]: pcu: Relax some CS/MCS expectancy checks

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21049 )

Change subject: pcu: Relax some CS/MCS expectancy checks
......................................................................

pcu: Relax some CS/MCS expectancy checks

Previous commit implemented the CS/MCS verification, and hence now some
tests fail because they had too restrictive checks.

In theory the verifications could be done so restrictive by configuring
the PCU accordingly at the start of the test, but we are not
really interested in checking the exact CS/MCS in these tests, only
checking if GPRS/EGPRS is being used.

Change-Id: I79b81d473b7428b57a0ec501c5bd0d88e35c81e3
---
M library/RLCMAC_Templates.ttcn
M pcu/PCU_Tests.ttcn
2 files changed, 12 insertions(+), 9 deletions(-)

Approvals:
  Jenkins Builder: Verified
  fixeria: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved
  neels: Looks good to me, but someone else must approve



diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn
index f7bd570..f24cce1 100644
--- a/library/RLCMAC_Templates.ttcn
+++ b/library/RLCMAC_Templates.ttcn
@@ -18,6 +18,10 @@
 	import from RLCMAC_CSN1_Templates all;
 	import from RLCMAC_Types all;
 
+	template CodingScheme cs_gprs_any := (CS_1, CS_2, CS_3, CS_4);
+	template CodingScheme mcs_egprs_any := (MCS_1, MCS_2, MCS_3, MCS_4, MCS_5,
+						MCS_6, MCS_7, MCS_8, MCS_9);
+
 	/* TS 44.060 10.4.5 */
 	function f_rrbp_fn_delay(MacRrbp rrbp) return uint32_t {
 		select (rrbp) {
diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn
index d114875..427eb35 100644
--- a/pcu/PCU_Tests.ttcn
+++ b/pcu/PCU_Tests.ttcn
@@ -1185,7 +1185,7 @@
  * answered, so TBFs for uplink and later for downlink are created.
  */
 testcase TC_mo_ping_pong() runs on RAW_PCU_Test_CT {
-	var CodingScheme exp_cs_mcs := CS_1;
+	var template CodingScheme exp_cs_mcs := cs_gprs_any;
 	f_TC_mo_ping_pong_1phase_access(exp_cs_mcs);
 }
 
@@ -1262,8 +1262,8 @@
 		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 CodingScheme exp_dl_cs_mcs := CS_2;
+	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);
 }
@@ -1278,8 +1278,8 @@
 		egprsextendeddynalloccap := '0'B
 	};
 	var MSRadioAccessCapabilityV ms_racap := { valueof(ts_RaCapRec('0001'B /* E-GSM */, mscap_gprs, mscap_egprs)) };
-	var CodingScheme exp_ul_cs_mcs := f_rlcmac_block_int2cs_mcs(g_mcs_initial_ul, true);
-	var CodingScheme exp_dl_cs_mcs := MCS_1;
+	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);
 }
@@ -1294,7 +1294,7 @@
 	};
 	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 CodingScheme exp_dl_cs_mcs := CS_2;
+	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);
 }
@@ -1354,7 +1354,7 @@
 }
 
 testcase TC_mt_ping_pong() runs on RAW_PCU_Test_CT {
-	var CodingScheme exp_cs_mcs := CS_1;
+	var template CodingScheme exp_cs_mcs := cs_gprs_any;
 	f_TC_mt_ping_pong(omit, exp_cs_mcs);
 }
 
@@ -1366,7 +1366,7 @@
 		gprsextendeddynalloccap := '0'B
 	} ;
 	var MSRadioAccessCapabilityV_BSSGP ms_racap := { valueof(ts_RaCapRec_BSSGP('0001'B /* E-GSM */, mscap_gprs, omit)) };
-	var CodingScheme exp_cs_mcs := CS_2;
+	var template CodingScheme exp_cs_mcs := cs_gprs_any;
 	f_TC_mt_ping_pong(ms_racap, exp_cs_mcs);
 }
 
@@ -1837,7 +1837,6 @@
  * last Pkt Ul ACK's RRBP.
  * See 3GPP TS 44.060 sec 9.3.2.4.2 "Non-extended uplink TBF mode" */
 testcase TC_ul_tbf_reestablish_with_pkt_resource_req() runs on RAW_PCU_Test_CT {
-	var CodingScheme exp_cs_mcs := CS_1;
 	var RlcmacDlBlock dl_block;
 	var octetstring data := f_rnd_octstring(10);
 	var uint32_t sched_fn;

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21049
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I79b81d473b7428b57a0ec501c5bd0d88e35c81e3
Gerrit-Change-Number: 21049
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201109/287b2ddd/attachment.htm>