Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: Make sure COMPLETE LAYER 3 INFORMATION contain...

[dexter]

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


Change subject: MSC_ConnectionHandler: Make sure COMPLETE LAYER 3 INFORMATION contains a codecList
......................................................................

MSC_ConnectionHandler: Make sure COMPLETE LAYER 3 INFORMATION contains a codecList

Since our BSC implementation is ALL-IP, the COMPLETE LAYER 3 INFORMATION
message must contan a Codec List (BSS Supported) information element.
The test currently just receive a L3 compl Template and then continue.
This is implemented without an altstep. So lets have an altstep with
timeout here and make sure that the codecList information element is
always included.

- Check L3 compl message using an alt-step
- Make sure codecList is always included

Change-Id: Ia16a454e78421430ec32cc37939d429970cb06ec
Related: OS#3548
---
M bsc/MSC_ConnectionHandler.ttcn
1 file changed, 20 insertions(+), 2 deletions(-)



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

diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn
index 9f67f1b..f67117a 100644
--- a/bsc/MSC_ConnectionHandler.ttcn
+++ b/bsc/MSC_ConnectionHandler.ttcn
@@ -822,6 +822,7 @@
 
 	var BSSMAP_FIELD_CodecType codecType;
 	var boolean sccplite := false;
+	timer T := 10.0;
 
 	/* Check if we run on SCCPLITE instead of SCCP by looking if a CIC is
 	 * present or not. */
@@ -844,7 +845,24 @@
 
 	f_create_chan_and_exp();
 	/* we should now have a COMPL_L3 at the MSC */
-	BSSAP.receive(tr_BSSMAP_ComplL3);
+
+	var template PDU_BSSAP exp_l3_compl;
+	exp_l3_compl := tr_BSSMAP_ComplL3()
+	exp_l3_compl.pdu.bssmap.completeLayer3Information.codecList := ?;
+	T.start;
+	alt {
+	[] BSSAP.receive(exp_l3_compl);
+	[] BSSAP.receive(tr_BSSMAP_ComplL3) {
+		setverdict(fail, "Received non-matching COMPLETE LAYER 3 INFORMATION");
+		all component.stop;
+		mtc.stop;
+		}
+	[] T.timeout {
+		setverdict(fail, "Timeout waiting for COMPLETE LAYER 3 INFORMATION");
+		all component.stop;
+		mtc.stop;
+		}
+	}
 
 	/* start ciphering, if requested */
 	if (ispresent(g_pars.encr)) {
@@ -858,10 +876,10 @@
 
 	var PDU_BSSAP ass_cmd := valueof(ass_tpl);
 	var PDU_BSSAP bssap;
-	timer T := 10.0;
 	var boolean exp_compl := ischosen(exp_ass_cpl.pdu.bssmap.assignmentComplete);
 	var boolean exp_fail := ischosen(exp_ass_cpl.pdu.bssmap.assignmentFailure);
 	var boolean exp_modify;
+
 	var ExpectCriteria mgcpcrit := {
 		connid := omit,
 		endpoint := omit,

-- 
To view, visit https://gerrit.osmocom.org/10966
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: Ia16a454e78421430ec32cc37939d429970cb06ec
Gerrit-Change-Number: 10966
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/20180914/cac608e6/attachment.htm>