Change in osmo-ttcn3-hacks[master]: msc: Add module param to disable osmux (fix msc-latest jenkins job)

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/14301 )

Change subject: msc: Add module param to disable osmux (fix msc-latest jenkins job)
......................................................................

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
---
M msc/MSC_Tests.ttcn
1 file changed, 14 insertions(+), 6 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index 40e0720..2c898fc 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -136,6 +136,11 @@
 	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 @@
 	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 @@
 	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() );
+	}
 }
 
 

-- 
To view, visit https://gerrit.osmocom.org/14301
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I53d58b2d905905ebf1df322d0389b3715a48212f
Gerrit-Change-Number: 14301
Gerrit-PatchSet: 3
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190531/434a8247/attachment.htm>