From 7ffa166c5fe6bec64fcd722db786f95861f3d243 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Wed, 23 Jun 2021 12:47:46 +0200 Subject: [PATCH] TT#116103 scenarios/incoming_foreign_dom * Contact with <> format * tests: - add received Contact parameter as optional Change-Id: Ie9fbb09ac5feaba38578b53fa86c20632f115fe0 --- .../incoming_foreign_dom/0003_test.yml.tt2 | 22 +++++++++---------- .../incoming_foreign_dom/0005_test.yml.tt2 | 18 +++++++-------- .../incoming_foreign_dom/0013_test.yml.tt2 | 16 +++++++------- .../incoming_foreign_dom/sipp_scenario00.xml | 6 ++--- 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/scenarios/incoming_foreign_dom/0003_test.yml.tt2 b/scenarios/incoming_foreign_dom/0003_test.yml.tt2 index 9aa2ed5d..7611647e 100644 --- a/scenarios/incoming_foreign_dom/0003_test.yml.tt2 +++ b/scenarios/incoming_foreign_dom/0003_test.yml.tt2 @@ -192,9 +192,9 @@ flow: "user:[% incoming_foreign_dom_scenarios_test.testuser1003.uuid %]" ] sip_in: - - '^INVITE sip:[% incoming_foreign_dom_scenarios_test.testuser1003.phone_number %]@' - - 'From: ' - - 'Contact: sip:external@' + - '^INVITE sip:[% incoming_foreign_dom_scenarios_test.testuser1003.phone_number %]@incoming-foreign-dom.scenarios.test SIP/2.0' + - 'From: ' + - 'Contact: ]+)?>' - 'CSeq: 1 INVITE' - 'Max-Forwards: 69' - 'Content-Type: application/sdp' @@ -202,29 +202,29 @@ sip_out: - [ '^SIP/2.0 100 Trying', 'CSeq: 1 INVITE', - 'From: ', + 'From: ', 'To: ', + 'From: ', 'To: ', + 'P-NGCP-Caller-Info: ', 'P-Caller-UUID: 0', 'Content-Length: 0' ] - [ - '^INVITE sip:testuser1003@', + '^INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0', 'CSeq: 1 INVITE', - 'From: ', + 'From: ', 'To: ]+)?>', 'Content-Type: application/sdp', 'P-Caller-UUID: 0', 'P-Callee-UUID: [% incoming_foreign_dom_scenarios_test.testuser1003.uuid %]', - 'P-Asserted-Identity: ', - 'P-Called-Party-ID: ', + 'P-Called-Party-ID: ', 'P-App-Name: sbc' ] diff --git a/scenarios/incoming_foreign_dom/0005_test.yml.tt2 b/scenarios/incoming_foreign_dom/0005_test.yml.tt2 index 094409d8..399a201f 100644 --- a/scenarios/incoming_foreign_dom/0005_test.yml.tt2 +++ b/scenarios/incoming_foreign_dom/0005_test.yml.tt2 @@ -13,16 +13,16 @@ flow: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: sip_in: - - 'INVITE sip:testuser1003@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0' + - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0' - 'From: ;tag=[\w-]+' - - 'To: ' + - 'To: ' - 'CSeq: \d+ INVITE' - 'P-LB-Uptime: \d+' - 'P-Asserted-Identity: ' - 'P-Caller-UUID: 0' - 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %]' - - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% incoming_foreign_dom_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=[% incoming_foreign_dom_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+' @@ -30,22 +30,22 @@ sip_out: - [ 'SIP/2.0 100 Trying', 'From: ;tag=[\w-]+', - 'To: ', + 'To: ', 'CSeq: \d+ INVITE', 'Server: Sipwise NGCP Proxy', 'Content-Length: 0', ] - [ - 'INVITE sip:testuser1003@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0', + 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0', 'From: ;tag=[\w-]+', - 'To: ', + 'To: ', 'CSeq: \d+ INVITE', 'P-LB-Uptime: \d+', 'P-Asserted-Identity: ', 'P-Caller-UUID: 0', 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %]', - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% incoming_foreign_dom_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=[% incoming_foreign_dom_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/incoming_foreign_dom/0013_test.yml.tt2 b/scenarios/incoming_foreign_dom/0013_test.yml.tt2 index 028a35f2..9113c8e8 100644 --- a/scenarios/incoming_foreign_dom/0013_test.yml.tt2 +++ b/scenarios/incoming_foreign_dom/0013_test.yml.tt2 @@ -29,27 +29,27 @@ flow: - exit|ROUTE_EXIT: sip_in: - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0' - - 'Contact: sip:external@' + - 'Contact: ]+)?>' - 'CSeq: 2 BYE' - 'Max-Forwards: 69' - 'Content-Length: 0' - - 'From: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' sip_out: - [ '^SIP/2.0 100 Trying', 'CSeq: 2 BYE', 'Content-Length: 0', - 'From: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', ] - [ '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0', - 'Contact: sip:external@', + 'Contact: ]+)?>', 'CSeq: 2 BYE', 'Max-Forwards: 68', 'Content-Length: 0', - 'From: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', ] diff --git a/scenarios/incoming_foreign_dom/sipp_scenario00.xml b/scenarios/incoming_foreign_dom/sipp_scenario00.xml index 9c2abf80..e8694315 100644 --- a/scenarios/incoming_foreign_dom/sipp_scenario00.xml +++ b/scenarios/incoming_foreign_dom/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" line=0]@[local_ip]:[local_port] + Contact: Max-Forwards: 70 Content-Type: application/sdp Content-Length: [len] @@ -52,7 +52,7 @@ Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] [routes] CSeq: 1 ACK - Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port] + Contact: Max-Forwards: 70 Content-Length: 0 @@ -77,7 +77,7 @@ To: [peer_tag_param] Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 2 BYE - Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port] + Contact: [routes] Max-Forwards: 70 Content-Length: 0