pespin submitted this change.

View Change

hnbgw: Set sccp_addr parameters during init

Those will be needed by other tests using UNITDATA primitives to send
RANAP ResetResourceAck.

Change-Id: I53f7e2e0a4622bb25667053b0b80e743e5f493bd
---
M hnbgw/ConnHdlr.ttcn
M hnbgw/HNBGW_Tests.ttcn
2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/hnbgw/ConnHdlr.ttcn b/hnbgw/ConnHdlr.ttcn
index 93875bd..a99aa03 100644
--- a/hnbgw/ConnHdlr.ttcn
+++ b/hnbgw/ConnHdlr.ttcn
@@ -164,7 +164,8 @@
 	integer tx_sccp_cr_data_len,
 	charstring pfcp_local_addr,
 	octetstring nas_pdu optional,
-	/* local and remote SCCP addresses, used in TC_mscpool_paging_* */
+	/* local and remote SCCP addresses, used to transmit conectionless
+	 * (unitdata) messages: */
 	SCCP_PAR_Address sccp_addr_msc optional,
 	SCCP_PAR_Address sccp_addr_hnbgw optional,
 	/* RAB release cause */
diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn
index ed4ebda..f7346a9 100644
--- a/hnbgw/HNBGW_Tests.ttcn
+++ b/hnbgw/HNBGW_Tests.ttcn
@@ -509,7 +509,7 @@
 				  integer tx_sccp_cr_data_len := 0,
 				  integer cn_nr := 0,
 				  template (value) RANAP_IEs.Cause rab_rel_cause := ts_RanapCause_nas_normal)
-return TestHdlrParams {
+ runs on test_CT return TestHdlrParams {
 	var template (value) TestHdlrParams pars;
 	pars := t_pars(imsi_suffix,
 		       ps_domain := ps_domain,
@@ -519,6 +519,8 @@
 		       pfcp_local_addr := mp_pfcp_ip_local,
 		       rab_rel_cause := rab_rel_cause,
 		       hnbgw_timer_x31 := mp_hnbgw_timer_x31);
+	pars.sccp_addr_hnbgw := g_cn[valueof(pars.cn_idx)].sccp_addr_peer;
+	pars.sccp_addr_msc := g_cn[valueof(pars.cn_idx)].sccp_addr_own;
 	return valueof(pars);
 }
 
@@ -2084,8 +2086,6 @@
 
 	var ConnHdlr vc_conn1;
 	var template (value) TestHdlrParams pars1 := f_TestHdlrParams(0, ps_domain := ps_domain, cn_nr := 0);
-	pars1.sccp_addr_hnbgw := g_cn[valueof(pars1.cn_idx)].sccp_addr_peer;
-	pars1.sccp_addr_msc := g_cn[valueof(pars1.cn_idx)].sccp_addr_own;
 	vc_conn1 := f_start_handler_with_pars(refers(f_tc_mscpool_paging_imsi), pars1);
 	vc_conn1.done;
 	f_ctrs_cn_expect(0, "cnpool:subscr:paged");
@@ -2137,8 +2137,6 @@
 
 	var ConnHdlr vc_conn1;
 	var template (value) TestHdlrParams pars1 := f_TestHdlrParams(0, ps_domain := ps_domain, cn_nr := 0);
-	pars1.sccp_addr_hnbgw := g_cn[valueof(pars1.cn_idx)].sccp_addr_peer;
-	pars1.sccp_addr_msc := g_cn[valueof(pars1.cn_idx)].sccp_addr_own;
 	vc_conn1 := f_start_handler_with_pars(refers(f_tc_mscpool_paging_tmsi), pars1);
 	vc_conn1.done;
 	f_ctrs_cn_expect(0, "cnpool:subscr:paged");

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