pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29009 ) Change subject: bsc: Set g_osmux_enabled_cn directly in the test ...................................................................... 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 --- M bsc/BSC_Tests.ttcn 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index d8a660c..7f4ce46 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1083,7 +1083,6 @@ } 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 @@ * \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 @@ 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 @@ 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"); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I27b685c2c22cf876b5eba79cf8ad151a2643ecb1 Gerrit-Change-Number: 29009 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged