Change in osmo-ttcn3-hacks[master]: LCLS: explicitly check for *CX adjustment

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11558 )

Change subject: LCLS: explicitly check for *CX adjustment
......................................................................

LCLS: explicitly check for *CX adjustment

Previously the expectations for number of CRCX and MDCX messages from
MGW was adjusted unconditionally for LCLS tests. However this is only
necessary for MGW-loop type of LCLS. Use explicit variable (with default
value preserving current behavior) to decide whether to apply this
adjustment or not. This simplifies support for other kinds of LCLS
loops.

Change-Id: I07b2c56991977b5e80c372a5b8338f348f14c076
Related: OS#3659
---
M bsc/MSC_ConnectionHandler.ttcn
1 file changed, 6 insertions(+), 3 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn
index f96e74a..0ea73a0 100644
--- a/bsc/MSC_ConnectionHandler.ttcn
+++ b/bsc/MSC_ConnectionHandler.ttcn
@@ -408,7 +408,9 @@
 	BIT4 cfg optional,
 	/* LCLS Connection Status Control */
 	BIT4 csc optional,
-	BIT4 exp_sts optional
+	BIT4 exp_sts optional,
+	/* Whether to adjust *cx_seen_exp for LCLS tests */
+	boolean adjust_cx_exp
 }
 
 type record TestHdlrParamsHandover {
@@ -446,7 +448,8 @@
 		gcr := omit,
 		cfg := omit,
 		csc := omit,
-		exp_sts := omit
+		exp_sts := omit,
+		adjust_cx_exp := true
 	},
 	handover := omit,
 	aoip := true
@@ -992,7 +995,7 @@
 	 * is mgcp_conn[1]. The BSC performs this operation already before the
 	 * assignment complete is generated. This means we expect another MDCX
 	 * at mgcp_conn[1] when LCLS is expected. */
-	if (ispresent(exp_ass_cpl.pdu.bssmap.assignmentComplete.lCLS_BSS_Status.lCLS_BSS_StatusValue)) {
+	if (g_pars.lcls.adjust_cx_exp and ispresent(exp_ass_cpl.pdu.bssmap.assignmentComplete.lCLS_BSS_Status.lCLS_BSS_StatusValue)) {
 		if (valueof(exp_ass_cpl.pdu.bssmap.assignmentComplete.lCLS_BSS_Status.lCLS_BSS_StatusValue) == LCLS_STS_locally_switched) {
 			g_media.mgcp_conn[1].mdcx_seen_exp := g_media.mgcp_conn[1].mdcx_seen_exp + 1;
 

-- 
To view, visit https://gerrit.osmocom.org/11558
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I07b2c56991977b5e80c372a5b8338f348f14c076
Gerrit-Change-Number: 11558
Gerrit-PatchSet: 6
Gerrit-Owner: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Max <msuraev at sysmocom.de>
Gerrit-CC: Neels Hofmeyr <nhofmeyr at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20181118/656a6348/attachment.htm>