Change in osmo-ttcn3-hacks[master]: PCU_Tests_NS: Fix our expectations regarding CellID presence/absence

[laforge]

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20505 )


Change subject: PCU_Tests_NS: Fix our expectations regarding CellID presence/absence
......................................................................

PCU_Tests_NS: Fix our expectations regarding CellID presence/absence

This is required by the spec, and implemented libosmocore since
Change-Id Ie87820537d6d616da4fd4bbf73eab06e28fda5e1

So let's change our test expectations.  Meanwhile, introduce
mp_tolerate_bvc_reset_cellid for working around the bug in 'latest'.

Change-Id: Icebee25b53fef623db6ae91ca0d943e70a3c86b7
---
M library/RAW_NS.ttcn
M pcu/PCU_Tests_NS.ttcn
2 files changed, 11 insertions(+), 2 deletions(-)



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

diff --git a/library/RAW_NS.ttcn b/library/RAW_NS.ttcn
index dca352f..daad8ae 100644
--- a/library/RAW_NS.ttcn
+++ b/library/RAW_NS.ttcn
@@ -162,7 +162,7 @@
 }
 
 /* Receive a BSSGP RESET for given BVCI and ACK it */
-altstep as_rx_bvc_reset_tx_ack(BssgpBvci bvci, BssgpCellId cell_id, boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT {
+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 {
 	var NS_RecvFrom ns_rf;
 	/* FIXME: nail down received cell_id in match */
 	[] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, 0,
diff --git a/pcu/PCU_Tests_NS.ttcn b/pcu/PCU_Tests_NS.ttcn
index 26b81a2..6a62f29 100644
--- a/pcu/PCU_Tests_NS.ttcn
+++ b/pcu/PCU_Tests_NS.ttcn
@@ -28,6 +28,11 @@
 import from PCUIF_CodecPort all;
 import from RAW_NS all;
 
+modulepar {
+	/* tolerate CellID absence/presence in BVC-RESET in violation to spec */
+	boolean mp_tolerate_bvc_reset_cellid := false;
+}
+
 type component RAW_PCU_CT {
 	/* PCUIF (we emulate the BTS part) */
 	port PCUIF_CODEC_PT PCU;
@@ -188,7 +193,11 @@
 	f_outgoing_ns_alive();
 
 	/* Expect BVC-RESET for signaling (0) and ptp BVCI */
-	as_rx_bvc_reset_tx_ack(0, mp_gb_cfg.cell_id, oneshot := true);
+	if (mp_tolerate_bvc_reset_cellid) {
+		as_rx_bvc_reset_tx_ack(0, mp_gb_cfg.cell_id, oneshot := true);
+	} else {
+		as_rx_bvc_reset_tx_ack(0, omit, oneshot := true);
+	}
 	as_rx_bvc_reset_tx_ack(mp_gb_cfg.bvci, mp_gb_cfg.cell_id, oneshot := true);
 	as_rx_bvc_unblock_tx_ack(mp_gb_cfg.bvci, oneshot := true);
 

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20505
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: Icebee25b53fef623db6ae91ca0d943e70a3c86b7
Gerrit-Change-Number: 20505
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201009/db6eaaa9/attachment.htm>