fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41934?usp=email )
Change subject: bts: rename s/as_meas_res/as_rsl_meas_res/ ......................................................................
bts: rename s/as_meas_res/as_rsl_meas_res/
Let's make it clear that this altstep is tracking measurements on the A-bis/RSL link (MEASurement RESult PDUs).
Change-Id: Ie9dd0d06ac6fcaba5724c6a3eb7459d0971139f9 Related: OS#6933 --- M bts/BTS_Tests.ttcn 1 file changed, 9 insertions(+), 9 deletions(-)
Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 2642007..960761f 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -784,7 +784,7 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout expecting " & id); } [not ignore_other] as_l1_sacch_loop(); - [not ignore_other] as_meas_res(); + [not ignore_other] as_rsl_meas_res(); [not ignore_other] as_l1_dcch_loop(); [not ignore_other] as_l1_tch_loop(); [not ignore_other] RSL.receive(RSL_Message:?) -> value rx { @@ -2375,8 +2375,8 @@ return tr_RSL_MEAS_RES_EMPTY(g_chan_nr, g_next_meas_res_nr, ul_meas, bs_power); }
-/* verify we regularly receive measurement reports with incrementing numbers */ -private altstep as_meas_res(boolean verify_meas := true) runs on ConnHdlr { +/* verify we regularly receive measurement reports on RSL with incrementing numbers */ +private altstep as_rsl_meas_res(boolean verify_meas := true) runs on ConnHdlr { var RSL_Message rsl; var boolean chan_est := false;
@@ -2734,12 +2734,12 @@ T.start; alt { [] as_l1_sacch_loop(); - [] as_meas_res(); + [] as_rsl_meas_res(); [] as_l1_dcch_loop(); [] as_l1_tch_loop(); [] L1CTL.receive { repeat; } [g_Tmeas_exp.running] T.timeout { - /* as_meas_res() would have done Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail) in case + /* as_rsl_meas_res() would have done Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail) in case * of any earlier errors, so if we reach this timeout, we're good */ setverdict(pass); } @@ -7285,7 +7285,7 @@ } } /* We also expect to receive the measurements */ - [] as_meas_res(verify_meas := false); + [] as_rsl_meas_res(verify_meas := false); [tc.exp] T.timeout { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for EST IND"); } @@ -7442,7 +7442,7 @@ setverdict(pass); } /* We also expect to receive the measurements */ - [] as_meas_res(verify_meas := false); + [] as_rsl_meas_res(verify_meas := false); }
/* release the channel */ @@ -7641,7 +7641,7 @@ [] RSL.receive(tr_RSL_UNITDATA_IND(g_chan_nr, link_id, l3)) { setverdict(pass); } - [exp_sacch] as_meas_res(verify_meas := false); + [exp_sacch] as_rsl_meas_res(verify_meas := false); [] as_rsl_any_ind(exp_any); [] T.timeout { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for UNIT_DATA_IND"); @@ -7665,7 +7665,7 @@ [] RSL.receive(tr_RSL_DATA_IND(g_chan_nr, link_id, l3)) { setverdict(pass); } - [exp_sacch] as_meas_res(verify_meas := false); + [exp_sacch] as_rsl_meas_res(verify_meas := false); [] as_rsl_any_ind(exp_any); [] T.timeout { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for DATA_IND");
-
fixeria