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
This commit is contained in:
Max 2018-11-06 19:21:41 +01:00 committed by Harald Welte
parent b1599b11e3
commit 2eeb511f43
1 changed files with 6 additions and 3 deletions

View File

@ -408,7 +408,9 @@ type record TestHdlrParamsLcls {
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 @@ template (value) TestHdlrParams t_def_TestHdlrPars := {
gcr := omit,
cfg := omit,
csc := omit,
exp_sts := omit
exp_sts := omit,
adjust_cx_exp := true
},
handover := omit,
aoip := true
@ -992,7 +995,7 @@ runs on MSC_ConnHdlr {
* 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;