From 976b1051b0de9f2501ab4ad418d72fee9284fba0 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Wed, 23 Jun 2021 13:47:33 +0200 Subject: [PATCH] TT#116103 scenarios/invite_allowedcli_match_alias * Contact with <> format * tests: - add received Contact parameter as optional Change-Id: I07817f58234e71b9f8db4ca4268440659a0751d9 --- .../invite_allowedcli_match_alias/0003_test.yml.tt2 | 2 +- .../invite_allowedcli_match_alias/0005_test.yml.tt2 | 2 +- .../invite_allowedcli_match_alias/0007_test.yml.tt2 | 8 ++++---- .../invite_allowedcli_match_alias/0015_test.yml.tt2 | 4 ++-- .../invite_allowedcli_match_alias/sipp_scenario00.xml | 10 +++++----- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/scenarios/invite_allowedcli_match_alias/0003_test.yml.tt2 b/scenarios/invite_allowedcli_match_alias/0003_test.yml.tt2 index 65671c1c..751f48f4 100644 --- a/scenarios/invite_allowedcli_match_alias/0003_test.yml.tt2 +++ b/scenarios/invite_allowedcli_match_alias/0003_test.yml.tt2 @@ -23,7 +23,7 @@ flow: - exit|ROUTE_EXIT: sip_in: - '^INVITE' - - 'Contact: sip:[% scenarios.0.username %]@' + - 'Contact: ]+)?>' - 'To: ]+)?>' - 'CSeq: 2 INVITE' - 'Max-Forwards: 69' - 'Content-Type: application/sdp' diff --git a/scenarios/invite_allowedcli_match_alias/0007_test.yml.tt2 b/scenarios/invite_allowedcli_match_alias/0007_test.yml.tt2 index b57fccf5..4591e616 100644 --- a/scenarios/invite_allowedcli_match_alias/0007_test.yml.tt2 +++ b/scenarios/invite_allowedcli_match_alias/0007_test.yml.tt2 @@ -21,8 +21,8 @@ sip_in: - 'P-Asserted-Identity: ' - 'P-Caller-UUID: [% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]' - 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_allowedcli_match_alias_scenarios_test.testuser1002.phone_number %];alias=[% invite_allowedcli_match_alias_scenarios_test.testuser1002.alias_numbers.0.phone_number %]' - - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% invite_allowedcli_match_alias_scenarios_test.testuser1003.phone_number %]' - - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060' + - 'P-NGCP-Callee-Info: ;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %];primary=[% invite_allowedcli_match_alias_scenarios_test.testuser1003.phone_number %]' + - 'P-D-Uri: sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];)?socket=sip:[% server_ip %]:5060' - 'Content-Type: application/sdp' - 'Contact: ' - 'Content-Length:\s+\d+' @@ -44,8 +44,8 @@ sip_out: 'P-Asserted-Identity: ', 'P-Caller-UUID: [% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]', 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_allowedcli_match_alias_scenarios_test.testuser1002.phone_number %];alias=[% invite_allowedcli_match_alias_scenarios_test.testuser1002.alias_numbers.0.phone_number %]', - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% invite_allowedcli_match_alias_scenarios_test.testuser1003.phone_number %]', - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060', + 'P-NGCP-Callee-Info: ;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %];primary=[% invite_allowedcli_match_alias_scenarios_test.testuser1003.phone_number %]', + 'P-D-Uri: sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];)?socket=sip:[% server_ip %]:5060', 'Content-Type: application/sdp', 'Contact: ', 'Content-Length:\s+\d+', diff --git a/scenarios/invite_allowedcli_match_alias/0015_test.yml.tt2 b/scenarios/invite_allowedcli_match_alias/0015_test.yml.tt2 index a561f852..e6a72d47 100644 --- a/scenarios/invite_allowedcli_match_alias/0015_test.yml.tt2 +++ b/scenarios/invite_allowedcli_match_alias/0015_test.yml.tt2 @@ -29,7 +29,7 @@ flow: - exit|ROUTE_EXIT: sip_in: - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0' - - 'Contact: sip:[% scenarios.0.username %]@' + - 'Contact: ]+)?>' - 'CSeq: 3 BYE' - 'Max-Forwards: 69' - 'Content-Length: 0' @@ -46,7 +46,7 @@ sip_out: ] - [ '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0', - 'Contact: sip:[% scenarios.0.username %]@', + 'Contact: ]+)?>', 'CSeq: 3 BYE', 'Max-Forwards: 68', 'Content-Length: 0', diff --git a/scenarios/invite_allowedcli_match_alias/sipp_scenario00.xml b/scenarios/invite_allowedcli_match_alias/sipp_scenario00.xml index d90ff542..9f2dff4b 100644 --- a/scenarios/invite_allowedcli_match_alias/sipp_scenario00.xml +++ b/scenarios/invite_allowedcli_match_alias/sipp_scenario00.xml @@ -10,7 +10,7 @@ To: Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 1 INVITE - Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port] + Contact: Max-Forwards: 70 Content-Type: application/sdp Content-Length: [len] @@ -41,7 +41,7 @@ To: [peer_tag_param] Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 1 ACK - Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port] + Contact: Max-Forwards: 70 Content-Length: 0 @@ -59,7 +59,7 @@ To: Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 2 INVITE - Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port] + Contact: Max-Forwards: 70 [field1 file="caller.csv"] Content-Type: application/sdp @@ -99,7 +99,7 @@ Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] [routes] CSeq: 2 ACK - Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port] + Contact: Max-Forwards: 70 Content-Length: 0 @@ -124,7 +124,7 @@ To: [peer_tag_param] Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 3 BYE - Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port] + Contact: [routes] Max-Forwards: 70 Content-Length: 0