Change in osmo-ttcn3-hacks[master]: msc: introduce f_logp()

[neels]

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


Change subject: msc: introduce f_logp()
......................................................................

msc: introduce f_logp()

This is separated from other patches that were using it, so introduce this
function and apply to some select places, so that log markers are also seen in
the osmo-msc log output, to help pinpoint what is happening when.

Change-Id: Iddcda7f0f9940cc21f89d52962707667fe844010
---
M msc/MSC_Tests.ttcn
1 file changed, 21 insertions(+), 13 deletions(-)



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

diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index 885743a..c4d407a 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -165,6 +165,14 @@
 	};
 }
 
+private function f_logp(charstring log_msg) runs on BSC_ConnHdlr
+{
+        // log on TTCN3 log output
+        log(log_msg);
+        // log in stderr log
+	f_vty_transceive(MSCVTY, "logp lglobal notice " & log_msg);
+}
+
 /* altstep for the global guard timer (only used when BSSAP_DIRECT
  * is used for communication */
 private altstep as_Tguard_direct() runs on MTC_CT {
@@ -1913,13 +1921,13 @@
 	}
 	f_ran_register_imsi(g_pars.imsi, tmsi);
 
-	log("first SMS");
+	f_logp("first SMS");
 	f_vty_sms_send(hex2str(pars.imsi), "2342", "Hello SMS");
 
 	/* MSC->BSC: expect PAGING from MSC */
 	f_expect_paging();
 
-	log("second SMS");
+	f_logp("second SMS");
 	/* Now osmo-msc is in state "Paging pending", make sure that another SMS to be sent at this time just joins in
 	 * with the pending paging. Another SMS: */
 	f_vty_sms_send(hex2str(pars.imsi), "2342", "Another SMS");
@@ -2022,14 +2030,14 @@
 
 	f_vty_sms_send(hex2str(pars.imsi), "2342", "Hello SMS");
 
-	log("Expecting first Paging");
+	f_logp("Expecting first Paging");
 	/* MSC->BSC: expect PAGING from MSC */
 	f_expect_paging();
 
 	if (g_pars.ran_is_geran) {
-		log("GERAN: expect no further Paging");
+		f_logp("GERAN: expect no further Paging");
 	} else {
-		log("UTRAN: expect more Paging");
+		f_logp("UTRAN: expect more Paging");
 	}
 
 	timer T := 5.0;
@@ -2040,12 +2048,12 @@
 		mtc.stop;
 		}
 	[not g_pars.ran_is_geran] BSSAP.receive(tr_RANAP_Paging(cs_domain, imsi_hex2oct(g_pars.imsi))) {
-		log("UTRAN: second Paging received, as expected");
+		f_logp("UTRAN: second Paging received, as expected");
 		setverdict(pass);
 		}
 	[] T.timeout {
 		if (g_pars.ran_is_geran) {
-			log("GERAN: No further Paging received, as expected");
+			f_logp("GERAN: No further Paging received, as expected");
 			setverdict(pass);
 		} else {
 			setverdict(fail, "UTRAN: Expected a second Paging");
@@ -5008,30 +5016,30 @@
 	}
 	f_ran_register_imsi(g_pars.imsi, tmsi);
 
-	log("start Paging by an SMS");
+	f_logp("start Paging by an SMS");
 	f_vty_sms_send(hex2str(pars.imsi), "2342", "Hello SMS");
 
 	/* MSC->BSC: expect PAGING from MSC */
 	f_expect_paging();
 
-	log("MNCC signals MT call, before Paging Response");
+	f_logp("MNCC signals MT call, before Paging Response");
 	f_mt_call_initate(cpars);
 	f_ran_register_imsi(g_pars.imsi, g_pars.tmsi);
 
 	f_sleep(0.5);
-	log("phone answers Paging, expecting both SMS and MT call to be established");
+	f_logp("phone answers Paging, expecting both SMS and MT call to be established");
 	f_establish_fully(EST_TYPE_PAG_RESP);
 	spars.tp.ud := 'C8329BFD064D9B53'O;
 	interleave {
 	[] BSSAP.receive(f_mt_sms_expect_deliver_pdu(spars)) {
-			log("Got SMS-DELIVER");
+			f_logp("Got SMS-DELIVER");
 		};
 	[] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_CC_SETUP(cpars.transaction_id, *, cpars.called_party))) {
-			log("Got CC Setup");
+			f_logp("Got CC Setup");
 		};
 	}
 	setverdict(pass);
-	log("success, tear down");
+	f_logp("success, tear down");
 	var default ccrel := activate(as_optional_cc_rel(cpars));
 	if (g_pars.ran_is_geran) {
 		BSSAP.send(ts_BSSMAP_ClearRequest(0));

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16562
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: Iddcda7f0f9940cc21f89d52962707667fe844010
Gerrit-Change-Number: 16562
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/20191212/6e676871/attachment.htm>