pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38677?usp=email ) Change subject: hnbgw: Parametrize MgcpParameters MGCP endpoint ...................................................................... hnbgw: Parametrize MgcpParameters MGCP endpoint This will be needed if we want to run several CS RAB ConnHdlrs in parallel. Change-Id: I4bb28dea22a6ea5b415d6ca16bde61b835d435bc --- M hnbgw/ConnHdlr.ttcn M hnbgw/HNBGW_Tests.ttcn 2 files changed, 13 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/77/38677/1 diff --git a/hnbgw/ConnHdlr.ttcn b/hnbgw/ConnHdlr.ttcn index e09c894..0d6b9cb 100644 --- a/hnbgw/ConnHdlr.ttcn +++ b/hnbgw/ConnHdlr.ttcn @@ -122,11 +122,17 @@ integer got_osmux_count } -template (value) MgcpParameters t_MgcpParams := { +private function f_mgcp_endp_str(integer endp_idx := 1) return charstring +{ + return "rtpbridge/" & int2str(endp_idx) & "@mgw"; +} + +template (value) MgcpParameters +t_MgcpParams(integer endp_idx := 1) := { got_crcx_count := 0, got_dlcx_count := 0, mgcp_call_id := omit, - mgcp_ep := "rtpbridge/1@mgw", + mgcp_ep := f_mgcp_endp_str(endp_idx), mgw_conn_ran := { resp := 1, mgw_rtp_ip := "127.1.2.1", @@ -258,6 +264,7 @@ integer tx_sccp_cr_data_len := 0, boolean expect_compl_l3_success := true, integer cn_idx := 0, + template (value) MgcpParameters mgcp_pars := t_MgcpParams(), template (value) PfcpParameters pfcp_pars := t_PfcpParams(), template (value) RANAP_IEs.Cause rab_rel_cause := ts_RanapCause_nas_normal, integer hnbgw_timer_x31 := 5, @@ -266,7 +273,7 @@ cn_idx := cn_idx, imsi := f_gen_imsi(imsi_suffix), ps_domain := ps_domain, - mgcp_pars := t_MgcpParams, + mgcp_pars := mgcp_pars, gtp_pars := t_GtpParams, hnb := omit, /* filled in later */ expect_separate_sccp_cr := expect_separate_sccp_cr, diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 9301aac..5258a11 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -587,8 +587,9 @@ template (value) RANAP_IEs.Cause rab_rel_cause := ts_RanapCause_nas_normal) runs on test_CT return TestHdlrParams { var template (value) TestHdlrParams pars; + var template (value) MgcpParameters mgcp_pars; var template (value) PfcpParameters pfcp_pars; - + mgcp_pars := t_MgcpParams(endp_idx := imsi_suffix); pfcp_pars := t_PfcpParams(pfcp_enabled := mp_enable_pfcp_tests, pfcp_local_addr := mp_pfcp_ip_local, pfcp_upf_node_id := mp_pfcp_upf_node_id, @@ -599,6 +600,7 @@ tx_sccp_cr_data_len := tx_sccp_cr_data_len, expect_compl_l3_success := expect_compl_l3_success, cn_idx := f_cn_idx(ps_domain, cn_nr), + mgcp_pars := mgcp_pars, pfcp_pars := pfcp_pars, rab_rel_cause := rab_rel_cause, hnbgw_timer_x31 := mp_hnbgw_timer_x31); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38677?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4bb28dea22a6ea5b415d6ca16bde61b835d435bc Gerrit-Change-Number: 38677 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>