Change in osmo-ttcn3-hacks[master]: bsc: make perform_clear() work when VTY is not initialized

[neels]

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26617 )


Change subject: bsc: make perform_clear() work when VTY is not initialized
......................................................................

bsc: make perform_clear() work when VTY is not initialized

To be able to invoke perform_clear() also in tests where the VTY isn't
used, only invoke the f_logp() when the VTY is ready. Otherwise this
causes an error and a failed test, for no good reason.

Related: OS#5337
Change-Id: I8116075f32937bd06ba14b426010bf6fec2ef402
---
M bsc/BSC_Tests.ttcn
1 file changed, 12 insertions(+), 5 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/17/26617/1

diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 97aff9e..b1deaf5 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -1064,6 +1064,13 @@
 	f_vty_transceive(pt, "logp lglobal notice TTCN3 f_logp(): " & log_msg);
 }
 
+private function f_logp_if_vty_inited(charstring msg) runs on MSC_ConnHdlr
+{
+	if (g_vty_initialized) {
+		f_logp(BSCVTY, msg);
+	}
+}
+
 private function f_sysinfo_seen(integer rsl_idx, RSL_Message rsl) runs on test_CT
 {
 	if (rsl_idx >= lengthof(g_system_information)) {
@@ -7771,22 +7778,22 @@
 friend function f_perform_clear(RSL_DCHAN_PT rsl_pt := RSL, RSLEM_PROC_PT rsl_proc_pt := RSL_PROC,
                                 template PDU_ML3_NW_MS exp_rr_rel_tmpl := tr_RRM_RR_RELEASE)
 runs on MSC_ConnHdlr {
-	f_logp(BSCVTY, "MSC instructs BSC to clear channel");
+	f_logp_if_vty_inited("MSC instructs BSC to clear channel");
 	BSSAP.send(ts_BSSMAP_ClearCommand(0));
 	interleave {
 	[] rsl_pt.receive(tr_RSL_DATA_REQ(g_chan_nr, ?, decmatch exp_rr_rel_tmpl)) {
-			f_logp(BSCVTY, "Got RSL RR Release");
+			f_logp_if_vty_inited("Got RSL RR Release");
 		}
 	[] rsl_pt.receive(tr_RSL_DEACT_SACCH(g_chan_nr)) {
-			f_logp(BSCVTY, "Got RSL Deact SACCH");
+			f_logp_if_vty_inited("Got RSL Deact SACCH");
 		}
 	[] BSSAP.receive(tr_BSSMAP_ClearComplete) {
-			f_logp(BSCVTY, "Got BSSMAP Clear Complete");
+			f_logp_if_vty_inited("Got BSSMAP Clear Complete");
 			/* Also drop the SCCP connection */
 			BSSAP.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ);
 		}
 	[] rsl_pt.receive(tr_RSL_RF_CHAN_REL(g_chan_nr)) {
-			f_logp(BSCVTY, "Got RSL RF Chan Rel, sending Rel Ack");
+			f_logp_if_vty_inited("Got RSL RF Chan Rel, sending Rel Ack");
 			rsl_pt.send(ts_RSL_RF_CHAN_REL_ACK(g_chan_nr));
 			f_rslem_unregister(0, g_chan_nr, PT := rsl_proc_pt);
 		}

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26617
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: I8116075f32937bd06ba14b426010bf6fec2ef402
Gerrit-Change-Number: 26617
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20211217/4e61d3a6/attachment.htm>