Change in osmo-ttcn3-hacks[master]: library: enrich tr_RLCMAC_DATA_RRBP, rename to tr_RLCMAC_DATA_GPRS

[fixeria]

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

Change subject: library: enrich tr_RLCMAC_DATA_RRBP, rename to tr_RLCMAC_DATA_GPRS
......................................................................

library: enrich tr_RLCMAC_DATA_RRBP, rename to tr_RLCMAC_DATA_GPRS

Let's make this template more flexible, so it can be used to match
any GPRS DL data blocks, not only those with rrbp_valid == true.

Note that behavior of f_rx_rlcmac_dl_block_exp_data() is
intentionally left unchanged, and will be fixed later.

Change-Id: I3940216368cdbb58fe89420675d1d8d5f5e49b05
Signed-off-by: Vadim Yanitskiy <axilirator at gmail.com>
---
M library/RLCMAC_Templates.ttcn
M pcu/PCU_Tests.ttcn
2 files changed, 8 insertions(+), 5 deletions(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, approved



diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn
index f2945eb..675a081 100644
--- a/library/RLCMAC_Templates.ttcn
+++ b/library/RLCMAC_Templates.ttcn
@@ -497,14 +497,16 @@
 		}
 	}
 
-	template RlcmacDlBlock tr_RLCMAC_DATA_RRBP := {
+	template RlcmacDlBlock tr_RLCMAC_DATA_GPRS(template (present) boolean rrbp_valid := ?,
+						   template (present) MacRrbp rrbp := ?,
+						   template (present) uint3_t usf := ?) := {
 		data := {
 			mac_hdr := {
 				mac_hdr := {
 					payload_type := MAC_PT_RLC_DATA,
-					rrbp := ?,
-					rrbp_valid := true,
-					usf := ?
+					rrbp := rrbp,
+					rrbp_valid := rrbp_valid,
+					usf := usf
 				},
 				hdr_ext := ?
 			},
diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn
index eff20f7..3d194a9 100644
--- a/pcu/PCU_Tests.ttcn
+++ b/pcu/PCU_Tests.ttcn
@@ -686,7 +686,8 @@
 	var PCUIF_Message pcu_msg;
 	var uint32_t dl_fn;
 	var boolean is_egprs := false;
-	var template RlcmacDlBlock dl_template := tr_RLCMAC_DATA_RRBP;
+	/* FIXME: for some reason, this template expects blocks with 'rrbp_valid' flag set */
+	var template RlcmacDlBlock dl_template := tr_RLCMAC_DATA_GPRS(rrbp_valid := true);
 	dl_template.data.blocks := ?;
 
 	f_rx_rlcmac_dl_block(dl_block, dl_fn);

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18185
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: I3940216368cdbb58fe89420675d1d8d5f5e49b05
Gerrit-Change-Number: 18185
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <axilirator at gmail.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <axilirator at gmail.com>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200511/f9dc66a5/attachment.htm>