MSC_ConnectionHandler: Use explicit AoIP flag
Most differences between sccplite and AoIP are visible during the
assignment. The current implementation checks for the presence of a CIC
in the ASSIGNMENT REQUEST in order to detect if the communication should
be modeled by AoIP or sccplite. This method is error prone and does not
work very well in situations where only signalling is used, because
there in sccplite and AoIP no CIC or AoIP trasp. identifier is present,
so there is nothing to check on. To resolve this we need an explicit way
to tell the MSC_ConnectionHandler that it has to behave like an AoIP MSC
or like an sccplite MSC.
- Add an aoip flag to TestHdlrParams
- Make sure BSC_Tests.ttcn sets the AoIP depending on mp_bssap_cfg.transport
Change-Id: I800249e783deb018d99e81d814843e0574a5c69b
Related: OS#3639
diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn
index 079cc74..dfdf10c 100644
--- a/bsc/MSC_ConnectionHandler.ttcn
+++ b/bsc/MSC_ConnectionHandler.ttcn
@@ -426,9 +426,13 @@
RSL_IE_Body expect_mr_conf_ie optional, /* typically present for AMR codecs */
TestHdlrEncrParams encr optional,
TestHdlrParamsLcls lcls,
- TestHdlrParamsHandover handover optional
+ TestHdlrParamsHandover handover optional,
+ boolean aoip
};
+/* Note: Do not use valueof() to get a value of this template, use
+ * f_gen_test_hdlr_pars() instead in order to get a configuration that is
+ * matched to the current test sitation (aoio vs. sccplite) */
template (value) TestHdlrParams t_def_TestHdlrPars := {
ra := '23'O,
fn := 23,
@@ -444,7 +448,8 @@
csc := omit,
exp_sts := omit
},
- handover := omit
+ handover := omit,
+ aoip := true
}
function f_create_chan_and_exp() runs on MSC_ConnHdlr {
@@ -828,15 +833,8 @@
runs on MSC_ConnHdlr {
var BSSMAP_FIELD_CodecType codecType;
- var boolean sccplite := false;
timer T := 10.0;
- /* Check if we run on SCCPLITE instead of SCCP by looking if a CIC is
- * present or not. */
- if (isvalue(ass_tpl.pdu.bssmap.assignmentRequest.circuitIdentityCode)) {
- sccplite := true;
- }
-
if (isvalue(ass_tpl.pdu.bssmap.assignmentRequest.codecList)) {
codecType := valueof(ass_tpl.pdu.bssmap.assignmentRequest.codecList.codecElements[0].codecType);
} else {
@@ -855,7 +853,7 @@
var template PDU_BSSAP exp_l3_compl;
exp_l3_compl := tr_BSSMAP_ComplL3()
- if (sccplite) {
+ if (g_pars.aoip == false) {
exp_l3_compl.pdu.bssmap.completeLayer3Information.codecList := omit;
} else {
exp_l3_compl.pdu.bssmap.completeLayer3Information.codecList := ?;
@@ -930,7 +928,7 @@
g_media.mgcp_conn[1].mdcx_seen_exp := 0;
} else if (st.voice_call) {
/* For voice calls we expect the following MGCP activity */
- if (sccplite) {
+ if (g_pars.aoip == false) {
g_media.mgcp_conn[0].crcx_seen_exp := 1;
g_media.mgcp_conn[0].mdcx_seen_exp := 1;
g_media.mgcp_conn[1].crcx_seen_exp := 0;