Change in ...osmo-ttcn3-hacks[master]: pcu: Introduce func helper f_establish_tbf_ul()

[pespin]

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15675


Change subject: pcu: Introduce func helper f_establish_tbf_ul()
......................................................................

pcu: Introduce func helper f_establish_tbf_ul()

Change-Id: I5b8a7ca5a4d0f905bf68949978811b139568c237
---
M pcu/PCU_Tests_RAW.ttcn
1 file changed, 31 insertions(+), 18 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/75/15675/1

diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn
index a464562..e17a369 100644
--- a/pcu/PCU_Tests_RAW.ttcn
+++ b/pcu/PCU_Tests_RAW.ttcn
@@ -563,6 +563,36 @@
 	return false;
 }
 
+private function f_establish_tbf_ul(out PacketUlAssign ul_tbf_ass, uint8_t bts_nr := 0,
+				 uint16_t ra := oct2int('3A'O), uint8_t is_11bit := 0,
+				 PCUIF_BurstType burst_type := BURST_TYPE_0,
+				 TimingAdvance ta := 0)
+runs on RAW_PCU_Test_CT return boolean {
+	var GsmRrMessage rr_imm_ass;
+
+	if (not f_establish_tbf(rr_imm_ass, bts_nr, ra, is_11bit, burst_type, ta)) {
+		return false;
+	}
+
+	/* Make sure we received an UL TBF Assignment */
+	if (match(rr_imm_ass, tr_IMM_TBF_ASS(dl := false, rest := tr_IaRestOctets_ULAss(?)))) {
+		ul_tbf_ass := rr_imm_ass.payload.imm_ass.rest_octets.hh.pa.uldl.ass.ul;
+		log("Rx Uplink TBF assignment: ", ul_tbf_ass);
+		setverdict(pass);
+	} else {
+		setverdict(fail, "Failed to match UL TBF Assignment");
+		return false;
+	}
+
+	/* Make sure we have got a TBF with Dynamic Block Allocation */
+	if (ul_tbf_ass.dynamic == omit) {
+		setverdict(fail, "Single Block Allocation is not handled by ", testcasename());
+		return false;
+	}
+
+	return true;
+}
+
 /* Enqueue DATA.ind (both TDMA frame and block numbers to be patched) */
 private function f_tx_pcuif_data_ind(octetstring data, int16_t lqual_cb := 0)
 runs on RAW_PCU_Test_CT {
@@ -859,7 +889,6 @@
 	var PacketUlAssign ul_tbf_ass;
 	var RlcmacDlBlock dl_block;
 	var PCUIF_Message pcu_msg;
-	var GsmRrMessage rr_msg;
 	var octetstring data;
 	var boolean ok;
 
@@ -867,28 +896,12 @@
 	f_init_raw(testcasename());
 
 	/* Establish an Uplink TBF */
-	ok := f_establish_tbf(rr_msg);
+	ok := f_establish_tbf_ul(ul_tbf_ass);
 	if (not ok) {
 		setverdict(fail, "Failed to establish an Uplink TBF");
 		mtc.stop;
 	}
 
-	/* Make sure we received an UL TBF Assignment */
-	if (match(rr_msg, tr_IMM_TBF_ASS(dl := false, rest := tr_IaRestOctets_ULAss(?)))) {
-		ul_tbf_ass := rr_msg.payload.imm_ass.rest_octets.hh.pa.uldl.ass.ul;
-		log("Rx Uplink TBF assignment: ", ul_tbf_ass);
-		setverdict(pass);
-	} else {
-		setverdict(fail, "Failed to match UL TBF Assignment");
-		mtc.stop;
-	}
-
-	/* Make sure we have got a TBF with Dynamic Block Allocation */
-	if (ul_tbf_ass.dynamic == omit) {
-		setverdict(fail, "Single Block Allocation is not handled by ", testcasename());
-		mtc.stop;
-	}
-
 	var template (value) RlcmacUlBlock ul_data := t_RLCMAC_UL_DATA(
 		tfi := ul_tbf_ass.dynamic.tfi_assignment,
 		cv := 15, /* 15 UL blocks to be sent (to be overridden in loop) */

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15675
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: I5b8a7ca5a4d0f905bf68949978811b139568c237
Gerrit-Change-Number: 15675
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20191004/6cfacc02/attachment.htm>