diff --git a/scenarios/invite_reinvite_caller_transcoding/0003_test.yml.tt2 b/scenarios/invite_reinvite_caller_transcoding/0003_test.yml.tt2 index d336cb3d..e96a136d 100644 --- a/scenarios/invite_reinvite_caller_transcoding/0003_test.yml.tt2 +++ b/scenarios/invite_reinvite_caller_transcoding/0003_test.yml.tt2 @@ -149,14 +149,14 @@ sip_in: - 'To: ' - 'CSeq: \d+ INVITE' - 'Contact: ' - - 'Proxy-Authorization: Digest username="testuser1002",realm="invite-reinvite-caller-transcoding.scenarios.test",uri="sip:127.0.0.1:5060",nonce=".+",response=".+",algorithm=MD5' + - 'Proxy-Authorization: Digest username="testuser1002",realm="invite-reinvite-caller-transcoding.scenarios.test",uri="sip:[% server_ip %]:5060",nonce=".+",response=".+",algorithm=MD5' - 'Content-Type: application/sdp' - 'Content-Length:\s+\d+' - 'P-NGCP-Src-Ip: [% scenarios.0.ip %]' - 'P-NGCP-Src-Port: [% scenarios.0.port %]' - 'P-NGCP-Src-Proto: udp' - 'P-NGCP-Src-Af: 4' - - 'P-Sock-Info: udp:127.0.0.1:5060' + - 'P-Sock-Info: udp:[% server_ip %]:5060' - 'P-LB-Uptime: \d+' - 'a=rtpmap:8 PCMA/8000' sip_out: @@ -165,7 +165,7 @@ sip_out: 'From: ;tag=[\w-]+', 'To: ', 'CSeq: \d+ INVITE', - 'P-Out-Socket: udp:127.0.0.1:5060', + 'P-Out-Socket: udp:[% server_ip %]:5060', 'P-NGCP-Auth-IP: [% scenarios.0.ip %]', 'P-NGCP-Auth-UA: ', 'Server: Sipwise NGCP Proxy', @@ -176,7 +176,7 @@ sip_out: 'From: ;tag=[\w-]+', 'To: ', 'CSeq: \d+ INVITE', - 'P-Out-Socket: udp:127.0.0.1:5060', + 'P-Out-Socket: udp:[% server_ip %]:5060', 'P-NGCP-Auth-IP: [% scenarios.0.ip %]', 'P-NGCP-Auth-UA: ', 'P-NGCP-Authorization: [% scenarios.0.username %]@invite-reinvite-caller-transcoding.scenarios.test', diff --git a/scenarios/invite_reinvite_caller_transcoding/0008_test.yml.tt2 b/scenarios/invite_reinvite_caller_transcoding/0008_test.yml.tt2 index f72ab287..484c6e30 100644 --- a/scenarios/invite_reinvite_caller_transcoding/0008_test.yml.tt2 +++ b/scenarios/invite_reinvite_caller_transcoding/0008_test.yml.tt2 @@ -27,5 +27,5 @@ sip_out: 'CSeq: \d+ INVITE', 'Contact: ', 'Content-Length: 0', - 'P-Out-Socket: udp:127.0.0.1:5060', + 'P-Out-Socket: udp:[% server_ip %]:5060', ] diff --git a/scenarios/invite_reinvite_caller_transcoding/0010_test.yml.tt2 b/scenarios/invite_reinvite_caller_transcoding/0010_test.yml.tt2 index 71eaf1de..53d20cd1 100644 --- a/scenarios/invite_reinvite_caller_transcoding/0010_test.yml.tt2 +++ b/scenarios/invite_reinvite_caller_transcoding/0010_test.yml.tt2 @@ -34,6 +34,6 @@ sip_out: 'Contact: ', 'Content-Type: application/sdp', 'Content-Length:\s+\d+', - 'P-Out-Socket: udp:127.0.0.1:5060', + 'P-Out-Socket: udp:[% server_ip %]:5060', 'a=rtpmap:8 PCMA/8000', ] diff --git a/scenarios/invite_reinvite_caller_transcoding/0011_test.yml.tt2 b/scenarios/invite_reinvite_caller_transcoding/0011_test.yml.tt2 index 23b8e991..aa266a17 100644 --- a/scenarios/invite_reinvite_caller_transcoding/0011_test.yml.tt2 +++ b/scenarios/invite_reinvite_caller_transcoding/0011_test.yml.tt2 @@ -34,7 +34,7 @@ sip_in: - 'P-NGCP-Src-Port: [% scenarios.0.port %]' - 'P-NGCP-Src-Proto: udp' - 'P-NGCP-Src-Af: 4' - - 'P-Sock-Info: udp:127.0.0.1:5060' + - 'P-Sock-Info: udp:[% server_ip %]:5060' - 'P-LB-Uptime: \d+' sip_out: - [ @@ -48,6 +48,6 @@ sip_out: 'P-NGCP-Src-Port: [% scenarios.0.port %]', 'P-NGCP-Src-Proto: udp', 'P-NGCP-Src-Af: 4', - 'P-Sock-Info: udp:127.0.0.1:5060', + 'P-Sock-Info: udp:[% server_ip %]:5060', 'P-LB-Uptime: \d+', ] diff --git a/scenarios/invite_reinvite_caller_transcoding/0013_test.yml.tt2 b/scenarios/invite_reinvite_caller_transcoding/0013_test.yml.tt2 index 379706a4..51705359 100644 --- a/scenarios/invite_reinvite_caller_transcoding/0013_test.yml.tt2 +++ b/scenarios/invite_reinvite_caller_transcoding/0013_test.yml.tt2 @@ -147,14 +147,14 @@ sip_in: - 'To: ' - 'CSeq: \d+ INVITE' - 'Contact: ' - - 'Proxy-Authorization: Digest username="testuser1002",realm="invite-reinvite-caller-transcoding.scenarios.test",uri="sip:127.0.0.1:5060",nonce=".+",response=".+",algorithm=MD5' + - 'Proxy-Authorization: Digest username="testuser1002",realm="invite-reinvite-caller-transcoding.scenarios.test",uri="sip:[% server_ip %]:5060",nonce=".+",response=".+",algorithm=MD5' - 'Content-Type: application/sdp' - 'Content-Length:\s+\d+' - 'P-NGCP-Src-Ip: [% scenarios.0.ip %]' - 'P-NGCP-Src-Port: [% scenarios.0.port %]' - 'P-NGCP-Src-Proto: udp' - 'P-NGCP-Src-Af: 4' - - 'P-Sock-Info: udp:127.0.0.1:5060' + - 'P-Sock-Info: udp:[% server_ip %]:5060' - 'P-LB-Uptime: \d+' - 'a=rtpmap:18 G729/8000' - '_:NOT:_a=rtpmap:\d+ PCMA/8000' @@ -164,7 +164,7 @@ sip_out: 'From: ;tag=[\w-]+', 'To: ', 'CSeq: \d+ INVITE', - 'P-Out-Socket: udp:127.0.0.1:5060', + 'P-Out-Socket: udp:[% server_ip %]:5060', 'P-NGCP-Auth-IP: [% scenarios.0.ip %]', 'P-NGCP-Auth-UA: ', 'Server: Sipwise NGCP Proxy', @@ -175,7 +175,7 @@ sip_out: 'From: ;tag=[\w-]+', 'To: ', 'CSeq: \d+ INVITE', - 'P-Out-Socket: udp:127.0.0.1:5060', + 'P-Out-Socket: udp:[% server_ip %]:5060', 'P-NGCP-Auth-IP: [% scenarios.0.ip %]', 'P-NGCP-Auth-UA: ', 'P-NGCP-Authorization: [% scenarios.0.username %]@invite-reinvite-caller-transcoding.scenarios.test', diff --git a/scenarios/invite_reinvite_caller_transcoding/0018_test.yml.tt2 b/scenarios/invite_reinvite_caller_transcoding/0018_test.yml.tt2 index 5573f7b9..aebe3430 100644 --- a/scenarios/invite_reinvite_caller_transcoding/0018_test.yml.tt2 +++ b/scenarios/invite_reinvite_caller_transcoding/0018_test.yml.tt2 @@ -36,7 +36,7 @@ sip_out: 'Contact: ', 'Content-Type: application/sdp', 'Content-Length:\s+\d+', - 'P-Out-Socket: udp:127.0.0.1:5060', + 'P-Out-Socket: udp:[% server_ip %]:5060', 'a=rtpmap:18 G729/8000', '_:NOT:_a=rtpmap:\d+ PCMA/8000', ] diff --git a/scenarios/invite_reinvite_caller_transcoding/0019_test.yml.tt2 b/scenarios/invite_reinvite_caller_transcoding/0019_test.yml.tt2 index 23b8e991..aa266a17 100644 --- a/scenarios/invite_reinvite_caller_transcoding/0019_test.yml.tt2 +++ b/scenarios/invite_reinvite_caller_transcoding/0019_test.yml.tt2 @@ -34,7 +34,7 @@ sip_in: - 'P-NGCP-Src-Port: [% scenarios.0.port %]' - 'P-NGCP-Src-Proto: udp' - 'P-NGCP-Src-Af: 4' - - 'P-Sock-Info: udp:127.0.0.1:5060' + - 'P-Sock-Info: udp:[% server_ip %]:5060' - 'P-LB-Uptime: \d+' sip_out: - [ @@ -48,6 +48,6 @@ sip_out: 'P-NGCP-Src-Port: [% scenarios.0.port %]', 'P-NGCP-Src-Proto: udp', 'P-NGCP-Src-Af: 4', - 'P-Sock-Info: udp:127.0.0.1:5060', + 'P-Sock-Info: udp:[% server_ip %]:5060', 'P-LB-Uptime: \d+', ] diff --git a/scenarios/invite_reinvite_caller_transcoding/0021_test.yml.tt2 b/scenarios/invite_reinvite_caller_transcoding/0021_test.yml.tt2 index 46f4b040..7683faa7 100644 --- a/scenarios/invite_reinvite_caller_transcoding/0021_test.yml.tt2 +++ b/scenarios/invite_reinvite_caller_transcoding/0021_test.yml.tt2 @@ -37,7 +37,7 @@ sip_in: - 'P-NGCP-Src-Port: [% scenarios.0.port %]' - 'P-NGCP-Src-Proto: udp' - 'P-NGCP-Src-Af: 4' - - 'P-Sock-Info: udp:127.0.0.1:5060' + - 'P-Sock-Info: udp:[% server_ip %]:5060' - 'P-LB-Uptime: \d+' sip_out: - [ @@ -45,7 +45,7 @@ sip_out: 'From: ;tag=[\w-]+', 'To: ;tag=[\w-]+', 'CSeq: \d+ BYE', - 'P-Out-Socket: udp:127.0.0.1:5060', + 'P-Out-Socket: udp:[% server_ip %]:5060', 'P-NGCP-Auth-IP: [% scenarios.0.ip %]', 'P-NGCP-Auth-UA: ', 'Server: Sipwise NGCP Proxy', diff --git a/scenarios/invite_reinvite_caller_transcoding/0024_test.yml.tt2 b/scenarios/invite_reinvite_caller_transcoding/0024_test.yml.tt2 index 26de1690..f12801e9 100644 --- a/scenarios/invite_reinvite_caller_transcoding/0024_test.yml.tt2 +++ b/scenarios/invite_reinvite_caller_transcoding/0024_test.yml.tt2 @@ -25,5 +25,5 @@ sip_out: 'To: ;tag=[\w-]+', 'CSeq: \d+ BYE', 'Content-Length: 0', - 'P-Out-Socket: udp:127.0.0.1:5060', + 'P-Out-Socket: udp:[% server_ip %]:5060', ] diff --git a/scenarios/invite_reinvite_caller_transcoding/sipp_scenario00.xml b/scenarios/invite_reinvite_caller_transcoding/sipp_scenario00.xml index f1b96e55..22165a98 100644 --- a/scenarios/invite_reinvite_caller_transcoding/sipp_scenario00.xml +++ b/scenarios/invite_reinvite_caller_transcoding/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] @@ -39,7 +39,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" line=0]@[local_ip]:[local_port] + Contact: Max-Forwards: 70 Content-Length: 0