bsc: Set g_osmux_enabled_cn directly in the test

We want to add more options later on, and we don't want to be passing
all of them as params. Let's simply set the global fields directly in
the test and let f_init() use the confgured values.

Change-Id: I27b685c2c22cf876b5eba79cf8ad151a2643ecb1

1 files changed, 4 insertions, 4 deletions

diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index d8a660c5..7f4ce464 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -1083,7 +1083,6 @@ private function f_vty_allow_osmux_cn(boolean allow) runs on test_CT {
 	}
 	f_vty_transceive(BSCVTY, "exit");
 	f_vty_transceive(BSCVTY, "exit");
-	g_osmux_enabled_cn := allow;
 }
 
 function f_init_vty(charstring id := "foo") runs on test_CT {
@@ -1187,7 +1186,7 @@ private function f_vty_msc_allow_attach(TELNETasp_PT pt, my_BooleanList allow_at
  * \param handler_mode Start an RSL_Emulation_CT component (true) or not (false).
  * \param nr_msc Number of virtual MSCs to bring up to connect to osmo-bsc.
  */
-function f_init(integer nr_bts := NUM_BTS, boolean handler_mode := false, boolean allow_osmux_cn := false,
+function f_init(integer nr_bts := NUM_BTS, boolean handler_mode := false,
 		integer nr_msc := 1, float guard_timeout := 30.0) runs on test_CT {
 	var integer bssap_idx;
 
@@ -1200,7 +1199,7 @@ function f_init(integer nr_bts := NUM_BTS, boolean handler_mode := false, boolea
 	activate(as_Tguard());
 
 	f_init_vty("VirtMSC");
-	f_vty_allow_osmux_cn(allow_osmux_cn);
+	f_vty_allow_osmux_cn(g_osmux_enabled_cn);
 
 	var my_BooleanList allow_attach := { false, false, false };
 	f_init_statsd("VirtMSC", vc_STATSD, mp_test_ip, mp_bsc_statsd_port);
@@ -5262,7 +5261,8 @@ testcase TC_assignment_osmux() runs on test_CT {
 	pars.expect_mr_conf_ie := mr_conf;
 	pars.use_osmux_cn := true;
 
-	f_init(1, true, true);
+	g_osmux_enabled_cn := true;
+	f_init(1, true);
 	f_sleep(1.0);
 	f_vty_amr_start_mode_set(false, "1");