diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2019-05-31 17:56:32 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2019-05-31 20:42:41 +0000 |
| commit | 690d6593e9ad9af7fc5c7528bf87f22c5b0ebfac (patch) | |
| tree | 4795c59701537cc69b67a2f4abbd3189a007a9b7 | |
| parent | 3dd33bc8f6d7adfa407ab05a768c3278bfa5c00c (diff) | |
msc: Add module param to disable osmux (fix msc-latest jenkins job)
ttcn3-bsc-test-latest currently fails on most tests because it tries to
use "osmux off" VTY param and only current osmo-msc master supports
it.
Change-Id: I53d58b2d905905ebf1df322d0389b3715a48212f
| -rw-r--r-- | msc/MSC_Tests.ttcn | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 40e0720a..2c898fcb 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -136,6 +136,11 @@ modulepar { charstring mp_mme_name := "mmec01.mmegi0001.mme.epc.mnc070.mcc901.3gppnetwork.org"; charstring mp_vlr_name := "vlr.example.net"; + /* Whether to enable osmux tests. Can be dropped completely and enable + unconditionally once new version of osmo-msc is released (current + version: 1.3.1) */ + boolean mp_enable_osmux_test := true; + RAN_Configurations mp_bssap_cfg := { { sccp_service_type := "mtp3_itu", @@ -330,10 +335,12 @@ function f_init(integer num_bsc := 1, boolean sgsap := false, boolean gsup := tr f_vty_config(MSCVTY, "network", "authentication optional"); f_vty_config(MSCVTY, "msc", "assign-tmsi"); f_vty_config(MSCVTY, "network", "encryption a5 0"); - if (osmux) { - f_vty_config(MSCVTY, "msc", "osmux on"); - } else { - f_vty_config(MSCVTY, "msc", "osmux off"); + if (mp_enable_osmux_test) { + if (osmux) { + f_vty_config(MSCVTY, "msc", "osmux on"); + } else { + f_vty_config(MSCVTY, "msc", "osmux off"); + } } } @@ -5332,8 +5339,9 @@ control { execute( TC_lu_imsi_auth_tmsi_encr_3_1_log_msc_debug() ); execute( TC_gsup_mt_multi_part_sms() ); execute( TC_mo_cc_bssmap_clear() ); - - execute( TC_lu_and_mt_call_osmux() ); + if (mp_enable_osmux_test) { + execute( TC_lu_and_mt_call_osmux() ); + } } |