osmith has uploaded this change for review.

View Change

msc: add helper func f_set_cpars_csd()

Prepare to add new CSD related tests that also need to configure the
call parameters for CSD.

Related: OS#4394
Change-Id: I49c29af736cc37c393cecde4c45c4ffd41322bf7
---
M msc/MSC_Tests.ttcn
1 file changed, 34 insertions(+), 17 deletions(-)

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

diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index d955f02..e5ae7d3 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -7187,21 +7187,34 @@
 	f_TC_auth_options(11);
 }
 
-friend function f_mo_csd(charstring bs_name, BIT1 async, GSM48_bcap_transp transp, GSM48_bcap_user_rate user_rate)
-		runs on BSC_ConnHdlr {
+function f_set_cpars_csd(CallParameters cpars, charstring bs_name, BIT1 async,
+		         GSM48_bcap_transp transp, GSM48_bcap_user_rate user_rate)
+		runs on BSC_ConnHdlr return CallParameters {
 	log("-----------------------------------------------");
-	log("MO CSD: " & bs_name);
+	log("CSD Bearer Service: " & bs_name);
 	log("-----------------------------------------------");
-	g_Tguard.start(20.0);
-
-	var CallParameters cpars := valueof(t_CallParams);
 
 	cpars.csd := true;
+
 	cpars.bearer_cap := valueof(ts_Bcap_csd);
 	cpars.bearer_cap.octet6.synchronous_asynchronous := async;
 	cpars.bearer_cap.octet6.connectionElement := int2bit(enum2int(transp), 2);
 	cpars.bearer_cap.octet6.userRate := int2bit(enum2int(user_rate), 4);
 
+	cpars.mncc_bearer_cap := valueof(ts_MNCC_bcap_data);
+	cpars.mncc_bearer_cap.data.async := bit2int(async);
+	cpars.mncc_bearer_cap.data.transp := transp;
+	cpars.mncc_bearer_cap.data.user_rate := user_rate;
+
+	return cpars;
+}
+
+friend function f_mo_csd(charstring bs_name, BIT1 async, GSM48_bcap_transp transp, GSM48_bcap_user_rate user_rate)
+		runs on BSC_ConnHdlr {
+	var CallParameters cpars := valueof(t_CallParams);
+
+	g_Tguard.start(20.0);
+	cpars := f_set_cpars_csd(cpars, bs_name, async, transp, user_rate);
 	f_perform_lu();
 	f_mo_call(cpars, 0.5);
 }
@@ -7236,19 +7249,10 @@
 
 friend function f_mt_csd(charstring bs_name, BIT1 async, GSM48_bcap_transp transp, GSM48_bcap_user_rate user_rate)
 		runs on BSC_ConnHdlr {
-	log("-----------------------------------------------");
-	log("MT CSD: " & bs_name);
-	log("-----------------------------------------------");
-	g_Tguard.start(20.0);
-
 	var CallParameters cpars := valueof(t_CallParams);
 
-	cpars.csd := true;
-	cpars.mncc_bearer_cap := valueof(ts_MNCC_bcap_data);
-	cpars.mncc_bearer_cap.data.async := bit2int(async);
-	cpars.mncc_bearer_cap.data.transp := transp;
-	cpars.mncc_bearer_cap.data.user_rate := user_rate;
-
+	g_Tguard.start(20.0);
+	cpars := f_set_cpars_csd(cpars, bs_name, async, transp, user_rate);
 	f_perform_lu();
 	f_mt_call(cpars, 0.5);
 }

To view, visit change 34176. To unsubscribe, or for help writing mail filters, visit settings.