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. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22627 )
Change subject: pcu: ACK Pkt Cell Change Continue
......................................................................
pcu: ACK Pkt Cell Change Continue
Related: OS#4909
Change-Id: I73aaa80e73b2abb06fd0084433122337dc9c4e3f
---
M pcu/PCU_Tests.ttcn
1 file changed, 31 insertions(+), 8 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn
index c44f50a..e302480 100644
--- a/pcu/PCU_Tests.ttcn
+++ b/pcu/PCU_Tests.ttcn
@@ -3597,10 +3597,9 @@
f_shutdown(__BFILE__, __LINE__, final := true);
}
-private function f_skip_dummy(integer max_num_iter)
+private function f_skip_dummy(integer max_num_iter, out uint32_t sched_fn)
runs on RAW_PCU_Test_CT return RlcmacDlBlock {
var RlcmacDlBlock dl_block;
- var uint32_t sched_fn;
var integer i := 0;
while (true) {
f_rx_rlcmac_dl_block(dl_block, sched_fn);
@@ -3628,7 +3627,7 @@
var octetstring exp_si_chunk;
var GlobalTfi gtfi := { is_dl_tfi := false, tfi := ms.ul_tbf.tfi };
- dl_block := f_skip_dummy(50);
+ dl_block := f_skip_dummy(50, sched_fn);
while (true) {
var template RlcmacDlCtrlMsg exp_msg; exp_msg :=
@@ -3745,7 +3744,11 @@
setverdict(fail, "Rx unexpected DL block: ", dl_block);
f_shutdown(__BFILE__, __LINE__);
}
-
+ /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */
+ if (dl_block.ctrl.mac_hdr.rrbp_valid) {
+ sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp);
+ f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn);
+ }
}
/* Verify PCU handles outbound Network Assisted Cell Change Cell Change (NACC, TS 44.060 sec 8.8). */
@@ -3936,11 +3939,16 @@
f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(cell_chf_notif), 0, nr := f_ms_tx_TsTrxBtsNum(ms));
/* Wait until we receive something non-dummy */
- dl_block := f_skip_dummy(0);
+ dl_block := f_skip_dummy(0, sched_fn);
/* Make sure it is a Pkt Cell Chg Continue */
if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) {
setverdict(fail, "Rx unexpected DL block: ", dl_block);
}
+ /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */
+ if (dl_block.ctrl.mac_hdr.rrbp_valid) {
+ sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp);
+ f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn);
+ }
f_shutdown(__BFILE__, __LINE__, final := true);
}
@@ -4000,11 +4008,16 @@
f_ctrl_exp_get(IPA_CTRL, ctrl_var, omit);
/* Wait until we receive something non-dummy */
- dl_block := f_skip_dummy(0);
+ dl_block := f_skip_dummy(0, sched_fn);
/* Make sure it is a Pkt Cell Chg Continue */
if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) {
setverdict(fail, "Rx unexpected DL block: ", dl_block);
}
+ /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */
+ if (dl_block.ctrl.mac_hdr.rrbp_valid) {
+ sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp);
+ f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn);
+ }
f_shutdown(__BFILE__, __LINE__, final := true);
}
@@ -4064,11 +4077,16 @@
f_ctrl_exp_get(IPA_CTRL, ctrl_var, "foobar-error");
/* Wait until we receive something non-dummy */
- dl_block := f_skip_dummy(0);
+ dl_block := f_skip_dummy(0, sched_fn);
/* Make sure it is a Pkt Cell Chg Continue */
if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) {
setverdict(fail, "Rx unexpected DL block: ", dl_block);
}
+ /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */
+ if (dl_block.ctrl.mac_hdr.rrbp_valid) {
+ sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp);
+ f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn);
+ }
f_shutdown(__BFILE__, __LINE__, final := true);
}
@@ -4143,11 +4161,16 @@
/* We never answer the RIM procude -> PCU timeouts and should send Pkt Cell Chg continue */
/* Wait until we receive something non-dummy */
- dl_block := f_skip_dummy(0);
+ dl_block := f_skip_dummy(0, sched_fn);
/* Make sure it is a Pkt Cell Chg Continue */
if (not match(dl_block, tr_RLCMAC_DL_CTRL(?, tr_RlcMacDlCtrl_PKT_CELL_CHG_CONTINUE))) {
setverdict(fail, "Rx unexpected DL block: ", dl_block);
}
+ /* PKT CELL CHG CONTINUE ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */
+ if (dl_block.ctrl.mac_hdr.rrbp_valid) {
+ sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp);
+ f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn);
+ }
f_shutdown(__BFILE__, __LINE__, final := true);
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22627
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: I73aaa80e73b2abb06fd0084433122337dc9c4e3f
Gerrit-Change-Number: 22627
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210203/6d30e87d/attachment.htm>