diff --git a/scenarios/invite_redirect/0005_test.yml.tt2 b/scenarios/invite_redirect/0005_test.yml.tt2 index 3f696341..83287ae4 100644 --- a/scenarios/invite_redirect/0005_test.yml.tt2 +++ b/scenarios/invite_redirect/0005_test.yml.tt2 @@ -22,7 +22,7 @@ flow: - exit|ROUTE_EXIT: sip_in: - '^INVITE' - - 'Contact: sip:[% scenarios.0.username %]@' + - 'Contact: ]+)?>' - 'To: ]+)?>' - 'Max-Forwards: 69' - 'Proxy-Authorization: Digest username="[% scenarios.0.username %]"' - 'Content-Type: application/sdp' @@ -237,7 +237,7 @@ sip_out: 'From: ]+)?>', 'Content-Type: application/sdp', 'P-Caller-UUID: [% invite_redirect_scenarios_test.testuser1002.uuid %]', 'P-Callee-UUID: [% invite_redirect_scenarios_test.testuser1003.uuid %]', diff --git a/scenarios/invite_redirect/0009_test.yml.tt2 b/scenarios/invite_redirect/0009_test.yml.tt2 index 377be9c1..4235892b 100644 --- a/scenarios/invite_redirect/0009_test.yml.tt2 +++ b/scenarios/invite_redirect/0009_test.yml.tt2 @@ -21,8 +21,8 @@ sip_in: - 'P-Asserted-Identity: ' - 'P-Caller-UUID: [% invite_redirect_scenarios_test.testuser1002.uuid %]' - 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_redirect_scenarios_test.testuser1002.phone_number %]' - - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% invite_redirect_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_redirect_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_redirect_scenarios_test.testuser1002.uuid %]', 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_redirect_scenarios_test.testuser1002.phone_number %]', - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% invite_redirect_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_redirect_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_redirect/0012_test.yml.tt2 b/scenarios/invite_redirect/0012_test.yml.tt2 index 6c303a6f..14382da0 100644 --- a/scenarios/invite_redirect/0012_test.yml.tt2 +++ b/scenarios/invite_redirect/0012_test.yml.tt2 @@ -186,7 +186,7 @@ sip_out: 'From: ]+)?>', 'Max-Forwards: 68', 'Content-Type: application/sdp', 'P-Caller-UUID: [% invite_redirect_scenarios_test.testuser1003.uuid %]', diff --git a/scenarios/invite_redirect/0014_test.yml.tt2 b/scenarios/invite_redirect/0014_test.yml.tt2 index 17513812..2b11178d 100644 --- a/scenarios/invite_redirect/0014_test.yml.tt2 +++ b/scenarios/invite_redirect/0014_test.yml.tt2 @@ -24,9 +24,9 @@ sip_in: - 'Diversion: ;privacy=off;counter=1' - 'History-Info: ;index=1\.1' - 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_redirect_scenarios_test.testuser1003.phone_number %]' - - 'P-NGCP-Forward-Info: ;ip=127.0.0.1;port=5060;primary=[% invite_redirect_scenarios_test.testuser1004.phone_number %]' - - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060' - - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060' + - 'P-NGCP-Forward-Info: ;ip=[% scenarios.0.responders.1.ip %];port=[% scenarios.0.responders.1.port %];primary=[% invite_redirect_scenarios_test.testuser1004.phone_number %]' + - 'P-NGCP-Callee-Info: ;ip=[% scenarios.0.responders.1.ip %];port=[% scenarios.0.responders.1.port %]' + - 'P-D-Uri: sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.0.responders.1.ip %]:[% scenarios.0.responders.1.port %];)?socket=sip:[% server_ip %]:5060' - 'Content-Type: application/sdp' - 'Contact: ' - 'Content-Length:\s+\d+' @@ -51,9 +51,9 @@ sip_out: 'History-Info: ;index=1', 'History-Info: ;index=1\.1', 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_redirect_scenarios_test.testuser1003.phone_number %]', - 'P-NGCP-Forward-Info: ;ip=127.0.0.1;port=5060;primary=[% invite_redirect_scenarios_test.testuser1004.phone_number %]', - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060', - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060', + 'P-NGCP-Forward-Info: ;ip=[% scenarios.0.responders.1.ip %];port=[% scenarios.0.responders.1.port %];primary=[% invite_redirect_scenarios_test.testuser1004.phone_number %]', + 'P-NGCP-Callee-Info: ;ip=[% scenarios.0.responders.1.ip %];port=[% scenarios.0.responders.1.port %]', + 'P-D-Uri: sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.0.responders.1.ip %]:[% scenarios.0.responders.1.port %];)?socket=sip:[% server_ip %]:5060', 'Content-Type: application/sdp', 'Contact: ', 'Content-Length:\s+\d+', diff --git a/scenarios/invite_redirect/0021_test.yml.tt2 b/scenarios/invite_redirect/0021_test.yml.tt2 index 3d881ab5..d22963c5 100644 --- a/scenarios/invite_redirect/0021_test.yml.tt2 +++ b/scenarios/invite_redirect/0021_test.yml.tt2 @@ -25,7 +25,7 @@ flow: - exit|ROUTE_EXIT: sip_in: - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0' - - 'Contact: sip:[% scenarios.0.username %]@' + - 'Contact: ]+)?>' - 'CSeq: 2 ACK' - 'Max-Forwards: 69' - 'Content-Length: 0' @@ -35,7 +35,7 @@ sip_in: sip_out: - [ '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0', - 'Contact: sip:[% scenarios.0.username %]@', + 'Contact: ]+)?>', 'CSeq: 2 ACK', 'Max-Forwards: 68', 'Content-Length: 0', diff --git a/scenarios/invite_redirect/0023_test.yml.tt2 b/scenarios/invite_redirect/0023_test.yml.tt2 index f2fecb5c..eb514882 100644 --- a/scenarios/invite_redirect/0023_test.yml.tt2 +++ b/scenarios/invite_redirect/0023_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_redirect/sipp_scenario00.xml b/scenarios/invite_redirect/sipp_scenario00.xml index 13b3c912..571234b0 100644 --- a/scenarios/invite_redirect/sipp_scenario00.xml +++ b/scenarios/invite_redirect/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