summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2020-09-15 15:56:33 +0200
committerlaforge <laforge@osmocom.org>2020-09-15 20:46:00 +0000
commit9a732a4f485e837b3bc4102c7608fa5a3c7a9635 (patch)
tree100e191466ddc9f934f667581eb60f0ee0e8bd99
parent220fa204da5e85af8e8bed13171fb93477fae709 (diff)
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
-rw-r--r--msc/MSC_Tests.ttcn19
1 files changed, 5 insertions, 14 deletions
diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index 6cb852a..f6e8577 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() );