Change in osmo-ttcn3-hacks[master]: bts: Don't expect specific ms_power_lvl when running without trxcon

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11083


Change subject: bts: Don't expect specific ms_power_lvl when running without trxcon
......................................................................

bts: Don't expect specific ms_power_lvl when running without trxcon

When we don't use trxcon (ie we run real HW) we cannot set some
parameters like ms power level, so we need to relax template matching
when we receive UL measurements in that case.

This commit makes tests TC_meas_res_sign_tchf and
TC_meas_res_sign_tchh_toa256 pass with motorola CXX and osmo-trx+osmo-bts-trx.

Change-Id: Icf1d2216d29c1ebf68c672e6ca06c54a7457304b
---
M bts/BTS_Tests.ttcn
1 file changed, 17 insertions(+), 5 deletions(-)



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

diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index aa402d1..a5992f7 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -1239,6 +1239,15 @@
 	return ret;
 }
 
+/* return a template expecting specific value only when using trxc */
+private function f_expect_with_trxc(integer val) return template integer {
+	var template integer ret := ?;
+	if (mp_bb_trxc_port != -1) {
+		ret := val;
+	}
+	return ret;
+}
+
 
 /* build a template for matching measurement results against */
 private function f_build_meas_res_tmpl() runs on ConnHdlr return template RSL_Message {
@@ -1258,7 +1267,7 @@
 	if (l1p.toa256_enabled) {
 		ul_meas.len := (3+8);
 		ul_meas.supp_meas_info := {
-			toa256_mean := l1p.timing_offset_256syms,
+			toa256_mean := f_expect_with_trxc(l1p.timing_offset_256syms),
 			toa256_min := ?,
 			toa256_max := ?,
 			toa256_std_dev := ?
@@ -1276,13 +1285,16 @@
 		power_level := l1p.bs_power_level
 	};
 	var template RSL_IE_L1Info l1_info := {
-		ms_power_lvl := l1p.ms_power_level,
+		ms_power_lvl := f_expect_with_trxc(l1p.ms_power_level),
 		fpc := false,
 		reserved := 0,
-		actual_ta := l1p.ms_actual_ta
+		actual_ta := f_expect_with_trxc(l1p.ms_actual_ta)
 	};
-	var uint8_t offs := toffs256s_to_rsl(l1p.timing_offset_256syms);
-	var template uint8_t t_toffs := (offs-1 .. offs+1);	 /* some tolerance */
+	var template uint8_t t_toffs := ?;
+	if (mp_bb_trxc_port != -1) {
+		var uint8_t offs := toffs256s_to_rsl(l1p.timing_offset_256syms);
+		t_toffs := (offs-1 .. offs+1);	 /* some tolerance */
+	}
 	return tr_RSL_MEAS_RES_OSMO(g_chan_nr, g_next_meas_res_nr, ul_meas, bs_power, l1_info,
 				    ?, t_toffs);
 }

-- 
To view, visit https://gerrit.osmocom.org/11083
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf1d2216d29c1ebf68c672e6ca06c54a7457304b
Gerrit-Change-Number: 11083
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180925/ad1caee3/attachment.htm>