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

[Harald Welte]

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

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

bsc: Add module param to disable osmux (fix bsc-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-bsc master supports it.

Change-Id: I61e4c59b2926f3f70cb6d0190a8683861e54179a
---
M bsc/BSC_Tests.ttcn
1 file changed, 11 insertions(+), 2 deletions(-)

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



diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 85260bc..a84277f 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -122,6 +122,11 @@
 		sio := '83'O,
 		rctx := 0
 	};
+
+	/* Whether to enable osmux tests. Can be dropped completely and enable
+	   unconditionally once new version of osmo-bsc is released (current
+	   version: 1.4.1) */
+	boolean mp_enable_osmux_test := true;
 }
 
 private function f_gen_test_hdlr_pars() return TestHdlrParams {
@@ -335,7 +340,9 @@
 	activate(as_Tguard());
 
 	f_init_vty("VirtMSC");
-	f_vty_allow_osmux(allow_osmux);
+	if (mp_enable_osmux_test) {
+		f_vty_allow_osmux(allow_osmux);
+	}
 
 	/* Call a function of our 'parent component' RAN_Adapter_CT to start the
 	 * MSC-side BSSAP emulation */
@@ -4061,7 +4068,9 @@
 	execute( TC_assignment_codec_req_hr_fr() );
 	execute( TC_assignment_codec_req_fr_hr() );
 
-	execute( TC_assignment_osmux() );
+	if (mp_enable_osmux_test) {
+		execute( TC_assignment_osmux() );
+	}
 
 	/* RLL Establish Indication on inactive DCHAN / SAPI */
 	execute( TC_rll_est_ind_inact_lchan() );

-- 
To view, visit https://gerrit.osmocom.org/14227
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: I61e4c59b2926f3f70cb6d0190a8683861e54179a
Gerrit-Change-Number: 14227
Gerrit-PatchSet: 2
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/20190529/6bdd73e7/attachment.htm>