Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: more verbosity for f_check_mgcp_expectations()

[dexter]

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10004


Change subject: MSC_ConnectionHandler: more verbosity for f_check_mgcp_expectations()
......................................................................

MSC_ConnectionHandler: more verbosity for f_check_mgcp_expectations()

The function f_check_mgcp_expectations() checks the counters that
count the occurrence of MDCX and CRCX messages against computed
expected values. At the moment it is not easy to spot where exactly
the deviation occurred. Lets add some log output so that we can see
which type of message on which connection was missing or too much.
Also add a string parameter that is set to the calling functions
name so that we know from where the check has been triggered.

- Add more verbose log output for counters
- Add parameter to prepend to the log line

Change-Id: Ida0eba4ef3c1db977d392267ef76ec37b87133b3
Related: OS#3292
---
M bsc/BSC_Tests.ttcn
M bsc/MSC_ConnectionHandler.ttcn
2 files changed, 7 insertions(+), 3 deletions(-)



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

diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 2897a0b..ef37a7f 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -2134,7 +2134,7 @@
 
 	/* Check the amount of MGCP transactions is still consistant with the
 	 * test expectation */
-	f_check_mgcp_expectations()
+	f_check_mgcp_expectations("f_tc_ho_int")
 }
 
 testcase TC_ho_int() runs on test_CT {
diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn
index ba4d19d..dd13ee2 100644
--- a/bsc/MSC_ConnectionHandler.ttcn
+++ b/bsc/MSC_ConnectionHandler.ttcn
@@ -794,8 +794,12 @@
 
 /* Helper function to check if the activity on the MGCP matches what we
  * expected */
-function f_check_mgcp_expectations() runs on MSC_ConnHdlr {
+function f_check_mgcp_expectations(charstring caller) runs on MSC_ConnHdlr {
 	for (var integer i:= 0; i < sizeof(g_media.mgcp_conn); i := i+1) {
+		log(caller, ": Check MGCP test expectations for g_media.mgcp_conn[", i , "]:",
+		    " crcx_seen=", g_media.mgcp_conn[i].crcx_seen, ", crcx_seen_exp=", g_media.mgcp_conn[i].crcx_seen_exp,
+		    ", mdcx_seen=", g_media.mgcp_conn[i].mdcx_seen, ", mdcx_seen_exp=", g_media.mgcp_conn[i].mdcx_seen_exp);
+
 		if(g_media.mgcp_conn[i].crcx_seen != g_media.mgcp_conn[i].crcx_seen_exp) {
 			setverdict(fail, "unexpected number of MGW-CRCX transactions");
 		}
@@ -947,7 +951,7 @@
 		self.stop;
 	}
 
-	f_check_mgcp_expectations();
+	f_check_mgcp_expectations("f_establish_fully");
 }
 
 type record HandoverState {

-- 
To view, visit https://gerrit.osmocom.org/10004
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida0eba4ef3c1db977d392267ef76ec37b87133b3
Gerrit-Change-Number: 10004
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180716/409dfe94/attachment.htm>