daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42135?usp=email )
Change subject: Fix/change TC_tcap_loadshare_ipa_tcap_udts() ......................................................................
Fix/change TC_tcap_loadshare_ipa_tcap_udts()
The behaviour changed to not reject tcap messages outside of any valid route. Change the test expectation that these messages are indeed forwarded.
Change-Id: Ibffa98702fd6eb276410630ab525d986fa0f36e0 --- M stp/STP_Tests_TCAP.ttcn 1 file changed, 11 insertions(+), 21 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/35/42135/1
diff --git a/stp/STP_Tests_TCAP.ttcn b/stp/STP_Tests_TCAP.ttcn index fe29950..8efc1c8 100644 --- a/stp/STP_Tests_TCAP.ttcn +++ b/stp/STP_Tests_TCAP.ttcn @@ -636,12 +636,12 @@ setverdict(pass); }
-/* Test if UDTS is sent back when sending a TCAP messages with a OTID not valid +/* Test if TCAP message is routed with an OTID not in any tcap range * * node a: 0..99 * node b: 100..199 */ -testcase TC_tcap_loadshare_ipa_tcap_udts() runs on TCAP_CT { +testcase TC_tcap_loadshare_ipa_tcap_norange() runs on TCAP_CT { var template (value) IPA_EXT_TCAP_ROUTING_Message tcap_rt_msg; var Misc_Helpers.ro_charstring tcap_asps := { "asp-m3ua-loadshare-0-0", "asp-m3ua-loadshare-0-1", @@ -649,6 +649,7 @@ "asp-ipa-loadshare-0-1" }; var TCAP_CT_Configurations tcap_configs := tcap_build_configs(tcap_asps); var template (value) TCMessage tcap_msg; + var OCT4 otid := int2oct(250, 4); timer T := 5.0;
f_init_tcap(tcap_configs); @@ -657,26 +658,15 @@
/* send a TCAP message with oTID 250 (no range available) */ - /* TCAP Being: O -> T */ - tcap_msg := ts_TCAP_Begin(int2oct(250, 4)); - f_asp_tx_tcap(tcap_msg, 0); + tcap_msg := ts_TCAP_Begin(otid); + /* TODO: Get the asp_idx of the received message to verify related + * messages are routed to the same ASP */ + f_asp_tx_tcap_exp_any(tcap_msg, 0);
- var template (present) TCAP_N_NOTICE_ind exp_sccp_notice_ind := - tr_TCAP_N_NOTICE_ind(g_tcap[0].sccp_addr_own, - g_tcap[0].sccp_addr_peer, - *, - tcap_msg); - T.start; - alt { - [] any from SCCP_TCAP.receive(exp_sccp_notice_ind) { - setverdict(pass); - } - [] T.timeout { - setverdict(fail, __SCOPE__, "(): Timeout waiting for UDTS"); - Misc_Helpers.f_shutdown(__BFILE__, __LINE__); - } - } + /* The next message should be routed to the same ASP */ + tcap_msg := ts_TCAP_Continue(otid, int2oct(1234, 4)); + f_asp_tx_tcap_exp_any(tcap_msg, 0);
setverdict(pass); } @@ -700,7 +690,7 @@ execute( TC_tcap_loadshare_ipa_tcap_range_success_pc_ssn() ); execute( TC_tcap_loadshare_ipa_tcap_range_success_pc_ssn2() ); execute( TC_tcap_loadshare_ipa_tcap_range_fail_pc_ssn_overlap() ); - execute( TC_tcap_loadshare_ipa_tcap_udts() ); + execute( TC_tcap_loadshare_ipa_tcap_norange() ); }