Change in osmo-ttcn3-hacks[master]: bsc: f_logp(): add VTY pt so it works on various components

[neels]

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20359 )

Change subject: bsc: f_logp(): add VTY pt so it works on various components
......................................................................

bsc: f_logp(): add VTY pt so it works on various components

So far only worked on test_CT, now also on MSC_ConnHdlr by passing the
respective BSCVTY.

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

Approvals:
  Jenkins Builder: Verified
  fixeria: Looks good to me, approved
  laforge: Looks good to me, approved



diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 34ee429..3a817f4 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -941,12 +941,12 @@
 			  "sccp-timer iar " & int2str(g_bsc_sccp_timer_iar)});
 }
 
-private function f_logp(charstring log_msg) runs on MSC_ConnHdlr
+private function f_logp(TELNETasp_PT pt, charstring log_msg)
 {
 	// log on TTCN3 log output
 	log(log_msg);
 	// log in stderr log
-	f_vty_transceive(BSCVTY, "logp lglobal notice " & log_msg);
+	f_vty_transceive(pt, "logp lglobal notice TTCN3 f_logp(): " & log_msg);
 }
 
 private function f_sysinfo_seen(integer rsl_idx, RSL_Message rsl) runs on test_CT
@@ -6092,22 +6092,22 @@
 	ts_MI_TMSI_LV(tmsi := f_tmsi_nri(nri_v, nri_bitlen := nri_bitlen));
 
 private function f_perform_clear(RSL_DCHAN_PT rsl) runs on MSC_ConnHdlr {
-	f_logp("MSC instructs BSC to clear channel");
+	f_logp(BSCVTY, "MSC instructs BSC to clear channel");
 	BSSAP.send(ts_BSSMAP_ClearCommand(0));
 	interleave {
 	[] rsl.receive(tr_RSL_DATA_REQ(g_chan_nr, ?, decmatch tr_RRM_RR_RELEASE)) {
-			f_logp("Got RSL RR Release");
+			f_logp(BSCVTY, "Got RSL RR Release");
 		}
 	[] rsl.receive(tr_RSL_DEACT_SACCH(g_chan_nr)) {
-			f_logp("Got RSL Deact SACCH");
+			f_logp(BSCVTY, "Got RSL Deact SACCH");
 		}
 	[] BSSAP.receive(tr_BSSMAP_ClearComplete) {
-			f_logp("Got BSSMAP Clear Complete");
+			f_logp(BSCVTY, "Got BSSMAP Clear Complete");
 			/* Also drop the SCCP connection */
 			BSSAP.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ);
 		}
 	[] rsl.receive(tr_RSL_MsgTypeD(RSL_MT_RF_CHAN_REL)) {
-			f_logp("Got RSL RF Chan Rel, sending Rel Ack");
+			f_logp(BSCVTY, "Got RSL RF Chan Rel, sending Rel Ack");
 			rsl.send(ts_RSL_RF_CHAN_REL_ACK(g_chan_nr));
 		}
 	}
@@ -6118,7 +6118,7 @@
 	timer T := 10.0;
 	var octetstring l3_enc := enc_PDU_ML3_MS_NW(valueof(l3_info));
 
-	f_logp("establish channel, send Complete Layer 3 Info");
+	f_logp(BSCVTY, "establish channel, send Complete Layer 3 Info");
 	f_create_bssmap_exp(l3_enc);
 
 	/* RSL_Emulation.f_chan_est() on rsl:
@@ -6156,7 +6156,7 @@
 	rsl.send(ts_RSL_EST_IND(g_chan_nr, valueof(g_pars.link_id), l3_enc));
 
 
-	f_logp("expect BSSAP Complete Layer 3 Info at MSC");
+	f_logp(BSCVTY, "expect BSSAP Complete Layer 3 Info at MSC");
 	var template PDU_BSSAP exp_l3_compl;
 	exp_l3_compl := tr_BSSMAP_ComplL3()
 	if (g_pars.aoip == false) {
@@ -6169,7 +6169,7 @@
 	T.start;
 	alt {
 	[] BSSAP.receive(exp_l3_compl) -> value bssap {
-		f_logp("received expected Complete Layer 3 Info at MSC");
+		f_logp(BSCVTY, "received expected Complete Layer 3 Info at MSC");
 		log("rx exp_l3_compl = ", bssap);
 		}
 	[] BSSAP.receive(tr_BSSMAP_ComplL3) {
@@ -6182,7 +6182,7 @@
 
 	/* start ciphering, if requested */
 	if (ispresent(g_pars.encr)) {
-		f_logp("start ciphering");
+		f_logp(BSCVTY, "start ciphering");
 		f_cipher_mode(g_pars.encr.enc_alg, g_pars.encr.enc_key);
 	}
 

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20359
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: I85ad0a59af72aa72e26a1252f946ada43388dc17
Gerrit-Change-Number: 20359
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201001/a9cae1e1/attachment.htm>