fix BSC_Tests_LCLS: do not use t_def_TestHdlrPars directly

As stated in the comment near the t_def_TestHdlrPars definition,
valueof() shall not be used for getting a value of this template.
The f_gen_test_hdlr_pars() function should be used instead.

All LCLS testcases violated this, and started to fail since
recently after patch [1] has been merged:

  "MSC_ConnectionHandler.ttcn:820 : Either imsi or imei must be set!"
      BSC_Tests_LCLS.ttcn:743 BSC_Tests_LCLS control part
      BSC_Tests_LCLS.ttcn:262 TC_lcls_gcr_only testcase

Use f_gen_test_hdlr_pars() as suggested.

Change-Id: I69ab8699b0be80b12e2df590d9170a743a00d035
Fixes: [1] b27653c6b6
This commit is contained in:
Vadim Yanitskiy 2023-01-06 21:35:12 +07:00
parent 14076d3b72
commit 3cc065b252
2 changed files with 11 additions and 10 deletions

View File

@ -22,6 +22,7 @@ module BSC_Tests {
friend module BSC_Tests_VAMOS; friend module BSC_Tests_VAMOS;
friend module BSC_Tests_CBSP; friend module BSC_Tests_CBSP;
friend module BSC_Tests_LCLS;
import from Misc_Helpers all; import from Misc_Helpers all;
import from General_Types all; import from General_Types all;

View File

@ -249,7 +249,7 @@ private function f_lcls_init(boolean bts_mode := false, integer nr_bts := 1) run
/* Send an ASSIGNMENT REQ with LCLS GCR only, without LCLS CFG or CSC */ /* Send an ASSIGNMENT REQ with LCLS GCR only, without LCLS CFG or CSC */
testcase TC_lcls_gcr_only() runs on lcls_test_CT { testcase TC_lcls_gcr_only() runs on lcls_test_CT {
var TestHdlrParams pars := valueof(t_def_TestHdlrPars); var TestHdlrParams pars := f_gen_test_hdlr_pars();
var MSC_ConnHdlr vc_conn; var MSC_ConnHdlr vc_conn;
f_lcls_init(); f_lcls_init();
@ -335,7 +335,7 @@ private function f_tc_lcls_recv_ls_exp_rsl() runs on lcls_test_CT {
} }
private function f_tc_lcls_gcr_bway_connect(boolean hr, boolean bts_mode := false) runs on lcls_test_CT { private function f_tc_lcls_gcr_bway_connect(boolean hr, boolean bts_mode := false) runs on lcls_test_CT {
var TestHdlrParams pars_a := valueof(t_def_TestHdlrPars); var TestHdlrParams pars_a := f_gen_test_hdlr_pars();
var TestHdlrParams pars_b; var TestHdlrParams pars_b;
var MSC_ConnHdlr vc_conn; var MSC_ConnHdlr vc_conn;
@ -393,7 +393,7 @@ testcase TC_lcls_bts_gcr_bway_connect_hr() runs on lcls_test_CT {
/* Unless explicitly enabled, osmo-bsc will avoid LCLSs when the codecs or rates /* Unless explicitly enabled, osmo-bsc will avoid LCLSs when the codecs or rates
* of both legs are different */ * of both legs are different */
testcase TC_lcls_gcr_bway_codec_mismatch() runs on lcls_test_CT { testcase TC_lcls_gcr_bway_codec_mismatch() runs on lcls_test_CT {
var TestHdlrParams pars_a := valueof(t_def_TestHdlrPars); var TestHdlrParams pars_a := f_gen_test_hdlr_pars();
var TestHdlrParams pars_b; var TestHdlrParams pars_b;
var MSC_ConnHdlr vc_conn; var MSC_ConnHdlr vc_conn;
var MgcpCommand mgcp_cmd; var MgcpCommand mgcp_cmd;
@ -428,7 +428,7 @@ testcase TC_lcls_gcr_bway_codec_mismatch() runs on lcls_test_CT {
/* Send an ASSIGNMENT REQ with LCLS CFG+CSC enabling LCLS but GCR doesn't match! */ /* Send an ASSIGNMENT REQ with LCLS CFG+CSC enabling LCLS but GCR doesn't match! */
testcase TC_lcls_gcr_nomatch_bway_connect() runs on lcls_test_CT { testcase TC_lcls_gcr_nomatch_bway_connect() runs on lcls_test_CT {
var TestHdlrParams pars_a := valueof(t_def_TestHdlrPars); var TestHdlrParams pars_a := f_gen_test_hdlr_pars();
var TestHdlrParams pars_b; var TestHdlrParams pars_b;
var MSC_ConnHdlr vc_conn; var MSC_ConnHdlr vc_conn;
var MgcpCommand mgcp_cmd; var MgcpCommand mgcp_cmd;
@ -462,7 +462,7 @@ private function f_lcls_not_yet_ls() runs on lcls_test_CT {
/* Send an ASSIGNMENT REQ with LCLS GCR+CFG+CSC; expect no connect */ /* Send an ASSIGNMENT REQ with LCLS GCR+CFG+CSC; expect no connect */
testcase TC_lcls_gcr_bway_dont_connect() runs on lcls_test_CT { testcase TC_lcls_gcr_bway_dont_connect() runs on lcls_test_CT {
var TestHdlrParams pars_a := valueof(t_def_TestHdlrPars); var TestHdlrParams pars_a := f_gen_test_hdlr_pars();
var TestHdlrParams pars_b; var TestHdlrParams pars_b;
var MSC_ConnHdlr vc_conn; var MSC_ConnHdlr vc_conn;
@ -487,7 +487,7 @@ testcase TC_lcls_gcr_bway_dont_connect() runs on lcls_test_CT {
/* Send an ASSIGNMENT REQ with LCLS GCR+CFG+CSC; expect no connect */ /* Send an ASSIGNMENT REQ with LCLS GCR+CFG+CSC; expect no connect */
testcase TC_lcls_gcr_unsuppported_cfg() runs on lcls_test_CT { testcase TC_lcls_gcr_unsuppported_cfg() runs on lcls_test_CT {
var TestHdlrParams pars := valueof(t_def_TestHdlrPars); var TestHdlrParams pars := f_gen_test_hdlr_pars();
var MSC_ConnHdlr vc_conn; var MSC_ConnHdlr vc_conn;
f_lcls_init(); f_lcls_init();
@ -508,7 +508,7 @@ testcase TC_lcls_gcr_unsuppported_cfg() runs on lcls_test_CT {
/* Send an ASSIGNMENT REQ with LCLS GCR+CFG+CSC; expect no connect */ /* Send an ASSIGNMENT REQ with LCLS GCR+CFG+CSC; expect no connect */
testcase TC_lcls_gcr_unsuppported_csc() runs on lcls_test_CT { testcase TC_lcls_gcr_unsuppported_csc() runs on lcls_test_CT {
var TestHdlrParams pars_a := valueof(t_def_TestHdlrPars); var TestHdlrParams pars_a := f_gen_test_hdlr_pars();
var TestHdlrParams pars_b; var TestHdlrParams pars_b;
var MSC_ConnHdlr vc_conn; var MSC_ConnHdlr vc_conn;
@ -568,7 +568,7 @@ private function f_lcls_sts_rsl(BIT4 expected_status) runs on lcls_test_CT {
/* Send an ASSIGNMENT REQ with "do not connect" and enable later using LCLS CTRL */ /* Send an ASSIGNMENT REQ with "do not connect" and enable later using LCLS CTRL */
testcase TC_lcls_gcr_bway_dont_connect_csc() runs on lcls_test_CT { testcase TC_lcls_gcr_bway_dont_connect_csc() runs on lcls_test_CT {
var TestHdlrParams pars_a := valueof(t_def_TestHdlrPars); var TestHdlrParams pars_a := f_gen_test_hdlr_pars();
var TestHdlrParams pars_b; var TestHdlrParams pars_b;
var MSC_ConnHdlr vc_conn; var MSC_ConnHdlr vc_conn;
var MgcpCommand mgcp_cmd; var MgcpCommand mgcp_cmd;
@ -620,7 +620,7 @@ private function f_build_mdcx_rsp(MgcpCommand mdcx) return MgcpResponse
} }
private function f_lcls_connect_break(boolean bts_mode := false) runs on lcls_test_CT { private function f_lcls_connect_break(boolean bts_mode := false) runs on lcls_test_CT {
var TestHdlrParams pars_a := valueof(t_def_TestHdlrPars); var TestHdlrParams pars_a := f_gen_test_hdlr_pars();
var TestHdlrParams pars_b; var TestHdlrParams pars_b;
var MSC_ConnHdlr vc_conn; var MSC_ConnHdlr vc_conn;
@ -676,7 +676,7 @@ testcase TC_lcls_bts_connect_break() runs on lcls_test_CT {
/* Establish LCLS "connect" followed by a SCCP-level release of one leg */ /* Establish LCLS "connect" followed by a SCCP-level release of one leg */
testcase TC_lcls_connect_clear() runs on lcls_test_CT { testcase TC_lcls_connect_clear() runs on lcls_test_CT {
var TestHdlrParams pars_a := valueof(t_def_TestHdlrPars); var TestHdlrParams pars_a := f_gen_test_hdlr_pars();
var TestHdlrParams pars_b; var TestHdlrParams pars_b;
var MSC_ConnHdlr vc_conn; var MSC_ConnHdlr vc_conn;
var MgcpCommand mgcp_cmd; var MgcpCommand mgcp_cmd;