BSSGP+pcu: Get rid of mp_tolerate_bvc_reset_cellid
Since we have new releases in -latest, we don't need this param since
it's never set to true.
Related: OS~5042
Change-Id: Ic496407fd2139b3a5221c30f1798797320cdee24
diff --git a/library/BSSGP_Emulation.ttcnpp b/library/BSSGP_Emulation.ttcnpp
index 1f32cc2..593abd8 100644
--- a/library/BSSGP_Emulation.ttcnpp
+++ b/library/BSSGP_Emulation.ttcnpp
@@ -37,12 +37,6 @@
import from SNDCP_Types all;
-
-modulepar {
- /* tolerate CellID absence/presence in BVC-RESET in violation to spec */
- boolean mp_tolerate_bvc_reset_cellid := false;
-}
-
/***********************************************************************
* Communication between Client Components and per-BVC component
***********************************************************************/
@@ -292,16 +286,6 @@
}
BSCP.send(f_BnsUdReq(ts_BVC_RESET_ACK(0, omit), 0, 0));
}
-
- /* work-around for old, buggy libosmogb before Change-Id Ie87820537d6d616da4fd4bbf73eab06e28fda5e1 */
- [mp_tolerate_bvc_reset_cellid] BSCP.receive(f_BnsUdInd(tr_BVC_RESET(?, 0, g_cfg.bvc[0].cell_id), 0)) -> value udi {
- log("Rx BVC-RESET for Signaling BVCI=0");
- f_sign_change_state(BVC_S_UNBLOCKED);
- if (MGMT.checkstate("Connected")) {
- MGMT.send(BssgpResetIndication:{0});
- }
- BSCP.send(f_BnsUdReq(ts_BVC_RESET_ACK(0, omit), 0, 0));
- }
}
private template PDU_BSSGP tr_GLOBAL_SIG := (
diff --git a/pcu/PCU_Tests_NS.ttcn b/pcu/PCU_Tests_NS.ttcn
index 9cf37b5..e2bad4f 100644
--- a/pcu/PCU_Tests_NS.ttcn
+++ b/pcu/PCU_Tests_NS.ttcn
@@ -25,11 +25,6 @@
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;
@@ -197,11 +192,7 @@
f_outgoing_ns_alive();
/* Expect BVC-RESET for signaling (0) and ptp BVCI */
- if (mp_tolerate_bvc_reset_cellid) {
- as_rx_bvc_reset_tx_ack(0, mp_gb_cfg.bvc[0].cell_id, omit, oneshot := true);
- } else {
- as_rx_bvc_reset_tx_ack(0, omit, omit, oneshot := true);
- }
+ as_rx_bvc_reset_tx_ack(0, omit, omit, oneshot := true);
as_rx_bvc_reset_tx_ack(mp_gb_cfg.bvc[0].bvci, mp_gb_cfg.bvc[0].cell_id, omit, oneshot := true);
as_rx_bvc_unblock_tx_ack(mp_gb_cfg.bvc[0].bvci, oneshot := true);