This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
laforge gerrit-no-reply at lists.osmocom.orglaforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15675 ) Change subject: pcu: Introduce func helper f_imm_ass_verify_ul_tbf_ass() ...................................................................... pcu: Introduce func helper f_imm_ass_verify_ul_tbf_ass() Change-Id: I5b8a7ca5a4d0f905bf68949978811b139568c237 --- M pcu/PCU_Tests_RAW.ttcn 1 file changed, 28 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn index d5e53e2..344c39f 100644 --- a/pcu/PCU_Tests_RAW.ttcn +++ b/pcu/PCU_Tests_RAW.ttcn @@ -549,6 +549,28 @@ return false; } +private function f_imm_ass_verify_ul_tbf_ass(GsmRrMessage rr_imm_ass, out PacketUlAssign ul_tbf_ass) +runs on RAW_PCU_Test_CT return boolean { + + /* 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_pcuif_tx_data_ind(octetstring data, int16_t lqual_cb := 0) runs on RAW_PCU_Test_CT { @@ -847,10 +869,10 @@ private template integer CS4_lqual_dB_range := (12 .. infinity); testcase TC_cs_lqual_ul_tbf() runs on RAW_PCU_Test_CT { + var GsmRrMessage rr_imm_ass; var PacketUlAssign ul_tbf_ass; var RlcmacDlBlock dl_block; var PCUIF_Message pcu_msg; - var GsmRrMessage rr_msg; var octetstring data; var boolean ok; @@ -858,25 +880,15 @@ f_init_raw(testcasename()); /* Establish an Uplink TBF */ - ok := f_establish_tbf(rr_msg); + ok := f_establish_tbf(rr_imm_ass); if (not ok) { - setverdict(fail, "Failed to establish an Uplink TBF"); + setverdict(fail, "Failed to establish 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()); + ok := f_imm_ass_verify_ul_tbf_ass(rr_imm_ass, ul_tbf_ass); + if (not ok) { + setverdict(fail, "Immediate Assignment not an Uplink TBF"); mtc.stop; } -- 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: 4 Gerrit-Owner: pespin <pespin at sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <axilirator at gmail.com> Gerrit-Reviewer: laforge <laforge at osmocom.org> Gerrit-Reviewer: osmith <osmith at sysmocom.de> 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/20191007/6083398d/attachment.htm>