From e97e3af20340ac12d954b63542da27cb1250220d Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Fri, 9 Oct 2020 14:56:54 +0200 Subject: PCU_Tests_{NS,SNS}: Fix our expectations regarding CellID in BVC-RESET The BVC-RESET / BVC-RESEt-ACK follow a set of rules: * Signaling BVCI=0 never has a CellId in BVC-RESET nor BVC-RESET-ACK * Any BVC-RESET or BVC-RESET ack in BSS->SGSN direction must have CellID * Any BVC-RESET or BVC-RESET ack in SGSN->BSS direction must NOT have CellID Let's adjust our test expectations accordingly. This will break tests against "latest", but the amount of work-arounds needed in this code outweighs the benefit. Change-Id: Ic8a83f5214c372faa15178dd9b54364e7d2a60cb --- library/RAW_NS.ttcn | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'library') diff --git a/library/RAW_NS.ttcn b/library/RAW_NS.ttcn index 23530462..314bf317 100644 --- a/library/RAW_NS.ttcn +++ b/library/RAW_NS.ttcn @@ -139,16 +139,17 @@ altstep as_rx_alive_tx_ack(boolean oneshot := false, integer idx := 0) runs on R } /* Transmit BSSGP RESET for given BVCI and expect ACK */ -function f_tx_bvc_reset_rx_ack(BssgpBvci bvci, BssgpCellId cell_id, integer idx := 0, boolean exp_ack := true) +function f_tx_bvc_reset_rx_ack(BssgpBvci bvci, template (omit) BssgpCellId tx_cell_id, template BssgpCellId rx_cell_id, + integer idx := 0, boolean exp_ack := true) runs on RAW_NS_CT { var PDU_BSSGP bssgp_tx := valueof(ts_BVC_RESET(BSSGP_CAUSE_NET_SV_CAP_MOD_GT_ZERO_KBPS, bvci, - cell_id)); + tx_cell_id)); timer T := 5.0; NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx)))); T.start; alt { [exp_ack] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, 0, - decmatch tr_BVC_RESET_ACK(bvci, ?)))) { + decmatch tr_BVC_RESET_ACK(bvci, rx_cell_id)))) { setverdict(pass); } [exp_ack] T.timeout { @@ -162,13 +163,14 @@ runs on RAW_NS_CT { } /* Receive a BSSGP RESET for given BVCI and ACK it */ -altstep as_rx_bvc_reset_tx_ack(BssgpBvci bvci, template (omit) BssgpCellId cell_id, boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { +altstep as_rx_bvc_reset_tx_ack(BssgpBvci bvci, template BssgpCellId rx_cell_id, template (omit) BssgpCellId tx_cell_id, + boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT { var NS_RecvFrom ns_rf; [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, 0, - decmatch tr_BVC_RESET(?, bvci, cell_id)))) + decmatch tr_BVC_RESET(?, bvci, rx_cell_id)))) -> value ns_rf { var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.msg.pDU_NS_Unitdata.nS_SDU); - var PDU_BSSGP bssgp_tx := valueof(ts_BVC_RESET_ACK(bvci, cell_id)); + var PDU_BSSGP bssgp_tx := valueof(ts_BVC_RESET_ACK(bvci, tx_cell_id)); NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_NS_UNITDATA(t_SduCtrlB, 0, enc_PDU_BSSGP(bssgp_tx)))); if (not oneshot) { repeat; } } -- cgit v1.2.3