From 9a732a4f485e837b3bc4102c7608fa5a3c7a9635 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Tue, 15 Sep 2020 15:56:33 +0200 Subject: msc: Drop parameter mp_enable_osmux_test That was needed for osmo-msc <= 1.3.0, and we are at 1.6.1 now. Change-Id: I8bc0551ec91a5fd8ea2f291a1e16a06a739c7a75 --- msc/MSC_Tests.ttcn | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 6cb852a2..f6e85779 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -140,11 +140,6 @@ 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", @@ -345,12 +340,10 @@ function f_init(integer num_bsc := 1, boolean sgsap := false, boolean gsup := tr f_vty_config(MSCVTY, "network", "encryption a5 0"); f_vty_config(MSCVTY, "cs7 instance 0", "sccp-timer ias " & int2str(g_msc_sccp_timer_ias)); f_vty_config(MSCVTY, "cs7 instance 0", "sccp-timer iar " & int2str(g_msc_sccp_timer_iar)); - if (mp_enable_osmux_test) { - if (osmux) { - f_vty_config(MSCVTY, "msc", "osmux on"); - } else { - f_vty_config(MSCVTY, "msc", "osmux off"); - } + if (osmux) { + f_vty_config(MSCVTY, "msc", "osmux on"); + } else { + f_vty_config(MSCVTY, "msc", "osmux off"); } } @@ -6361,6 +6354,7 @@ control { execute( TC_lu_and_mt_call() ); execute( TC_lu_and_mt_call_ipv6() ); execute( TC_lu_and_mt_call_already_paging() ); + execute( TC_lu_and_mt_call_osmux() ); execute( TC_lu_and_mo_sms() ); execute( TC_lu_and_mt_sms() ); @@ -6447,9 +6441,6 @@ control { /* Run this last: at the time of writing this test crashes the MSC */ execute( TC_lu_imsi_auth_tmsi_encr_3_1_log_msc_debug() ); execute( TC_mo_cc_bssmap_clear() ); - if (mp_enable_osmux_test) { - execute( TC_lu_and_mt_call_osmux() ); - } execute( TC_invalid_mgcp_crash() ); execute( TC_mm_id_resp_no_identity() ); execute( TC_lu_and_expire_while_paging() ); -- cgit v1.2.3