mgw: Drop unneeded mp_enable_conn_timeout_test
Latest osmo-mgw release is 1.7.0, so this param is not needed at all.
Furthermore, the config can be moved to .cfg.
Change-Id: I537c0f5fd6f9e18e111c773c0e42e5f1120ce2f4
diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn
index b46b178..77eed4b 100644
--- a/mgw/MGCP_Test.ttcn
+++ b/mgw/MGCP_Test.ttcn
@@ -69,10 +69,6 @@
charstring mp_remote_ip := "127.0.0.1";
PortNumber mp_local_rtp_port_base := 10000;
PortNumber mp_local_osmux_port := 1985;
-
- /* Whether to enable conn-timeout tests. Can be dropped completely and enabled unconditionally once new
- * version of osmo-mgw is released (current version: 1.5.0) */
- boolean mp_enable_conn_timeout_test := true;
}
private function f_vty_enable_osmux(boolean osmux_on) runs on dummy_CT {
@@ -95,9 +91,6 @@
f_vty_transceive(MGWVTY, "enable");
f_vty_enable_osmux(osmux_on);
- if (mp_enable_conn_timeout_test) {
- f_vty_config(MGWVTY, "mgcp", "conn-timeout 0");
- }
}
private function f_rtpem_init(inout RTP_Emulation_CT comp_ref, integer i)
@@ -2199,8 +2192,6 @@
execute(TC_amr_oa_oa_rtp_conversion());
execute(TC_amr_bwe_bwe_rtp_conversion());
- if (mp_enable_conn_timeout_test) {
- execute(TC_conn_timeout());
- }
+ execute(TC_conn_timeout());
}
}
diff --git a/mgw/osmo-mgw.cfg b/mgw/osmo-mgw.cfg
index b27a50c..edc8190 100644
--- a/mgw/osmo-mgw.cfg
+++ b/mgw/osmo-mgw.cfg
@@ -31,6 +31,7 @@
sdp audio-payload name GSM
sdp audio-payload send-ptime
sdp audio-payload send-name
+ conn-timeout 0
loop 0
number endpoints 31
allow-transcoding