From 2ac71df3922a9198ec1b167c7636f68a907613ba Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Thu, 8 Jul 2021 14:46:20 +0200 Subject: [PATCH] TT#116103 scenarios_pbx/invite_shared_line * use server_ip from scenario_ids.yml * Contact with <> format * tests: - add received Contact parameter as optional Change-Id: Ic9333ad40bee717c4681f7c4e01f1a2292981dfa --- .../invite_shared_line/0003_test.yml.tt2 | 26 ++++++------ .../invite_shared_line/0005_test.yml.tt2 | 40 +++++++++---------- .../invite_shared_line/0006_test.yml.tt2 | 2 +- .../invite_shared_line/0007_test.yml.tt2 | 12 +++--- .../invite_shared_line/0008_test.yml.tt2 | 2 +- .../invite_shared_line/0009_test.yml.tt2 | 10 ++--- .../invite_shared_line/0010_test.yml.tt2 | 12 +++--- .../invite_shared_line/0012_test.yml.tt2 | 10 ++--- .../invite_shared_line/0013_test.yml.tt2 | 10 ++--- .../invite_shared_line/0014_test.yml.tt2 | 4 +- .../invite_shared_line/0015_test.yml.tt2 | 14 +++---- .../invite_shared_line/0016_test.yml.tt2 | 4 +- .../invite_shared_line/0017_test.yml.tt2 | 4 +- .../invite_shared_line/0018_test.yml.tt2 | 2 +- .../invite_shared_line/sipp_scenario02.xml | 10 ++--- 15 files changed, 81 insertions(+), 81 deletions(-) diff --git a/scenarios_pbx/invite_shared_line/0003_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0003_test.yml.tt2 index 6d6de42b..f4d39a93 100644 --- a/scenarios_pbx/invite_shared_line/0003_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0003_test.yml.tt2 @@ -21,35 +21,35 @@ flow: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: sip_in: - - 'INVITE sip:1003@invite-shared-line.scenarios-pbx.test SIP/2.0' - - 'From: ;tag=[\w-]+' - - 'To: ' + - 'INVITE sip:[% invite_shared_line_scenarios_pbx_test.testuser1003.pbx_extension %]@invite-shared-line.scenarios-pbx.test SIP/2.0' + - 'From: ;tag=[\w-]+' + - 'To: ' - 'Call-Info: ;appearance-index=1' - 'CSeq: \d+ INVITE' - - 'Contact: sip:testuser1002@127.126.0.1:\d+' + - 'Contact: ]+)?>' - 'Content-Type: application/sdp' - 'Content-Length:\s+\d+' - - 'P-Sock-Info: udp:127.0.0.1:5060' + - 'P-Sock-Info: udp:[% server_ip %]:5060' - 'P-LB-Uptime: \d+' sip_out: - [ 'SIP/2.0 100 Trying', - 'From: ;tag=[\w-]+', - 'To: ', + 'From: ;tag=[\w-]+', + 'To: ', 'CSeq: \d+ INVITE', - 'P-Out-Socket: udp:127.0.0.1:5060', - 'P-NGCP-Auth-IP: 127.126.0.1', + 'P-Out-Socket: udp:[% server_ip %]:5060', + 'P-NGCP-Auth-IP: [% scenarios.2.ip %]', 'P-NGCP-Auth-UA: ', 'Server: Sipwise NGCP Proxy', 'Content-Length: 0', ] - [ 'SIP/2.0 407 Proxy Authentication Required', - 'From: ;tag=[\w-]+', - 'To: ;tag=[\w-]+', + 'From: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', 'CSeq: \d+ INVITE', - 'P-Out-Socket: udp:127.0.0.1:5060', - 'P-NGCP-Auth-IP: 127.126.0.1', + 'P-Out-Socket: udp:[% server_ip %]:5060', + 'P-NGCP-Auth-IP: [% scenarios.2.ip %]', 'P-NGCP-Auth-UA: ', 'Proxy-Authenticate: Digest realm="invite-shared-line.scenarios-pbx.test", nonce=".+"', 'Server: Sipwise NGCP Proxy', diff --git a/scenarios_pbx/invite_shared_line/0005_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0005_test.yml.tt2 index a8071cce..38b840f4 100644 --- a/scenarios_pbx/invite_shared_line/0005_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0005_test.yml.tt2 @@ -156,28 +156,28 @@ flow: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: sip_in: - - 'INVITE sip:1003@invite-shared-line.scenarios-pbx.test SIP/2.0' + - 'INVITE sip:[% invite_shared_line_scenarios_pbx_test.testuser1003.pbx_extension %]@invite-shared-line.scenarios-pbx.test SIP/2.0' - 'From: ;tag=[\w-]+' - - 'To: ' + - 'To: ' - 'Call-Info: ;appearance-index=1' - 'CSeq: \d+ INVITE' - - 'Contact: sip:testuser1002@[% scenarios.2.ip %]:[% scenarios.2.port %]' - - 'Proxy-Authorization: Digest username="testuser1002",realm="invite-shared-line.scenarios-pbx.test",uri="sip:127.0.0.1:5060",nonce=".+",response=".+",algorithm=MD5' + - 'Contact: ]+)?>' + - 'Proxy-Authorization: Digest username="testuser1002",realm="invite-shared-line.scenarios-pbx.test",uri="sip:[% server_ip %]:5060",nonce=".+",response=".+",algorithm=MD5' - 'Content-Type: application/sdp' - 'Content-Length:\s+\d+' - 'P-NGCP-Src-Ip: [% scenarios.2.ip %]' - 'P-NGCP-Src-Port: [% scenarios.2.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: - [ 'SIP/2.0 100 Trying', 'From: ;tag=[\w-]+', - 'To: ', + '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.2.ip %]', 'P-NGCP-Auth-UA: ', 'Server: Sipwise NGCP Proxy', @@ -186,14 +186,14 @@ sip_out: - [ 'SIP/2.0 101 Connecting', 'From: ;tag=[\w-]+', - 'To: ', + '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.2.ip %]', 'P-NGCP-Auth-UA: ', 'P-NGCP-Authorization: testuser1002@invite-shared-line.scenarios-pbx.test', 'P-NGCP-Authorized: 1', - 'P-NGCP-Caller-Info: ;ip=127.126.0.1;port=\d+;primary=[% invite_shared_line_scenarios_pbx_test.testuser1002.phone_number %]', + 'P-NGCP-Caller-Info: ;ip=[% scenarios.2.ip %];port=[% scenarios.2.port %];primary=[% invite_shared_line_scenarios_pbx_test.testuser1002.phone_number %]', 'P-Caller-UUID: [% invite_shared_line_scenarios_pbx_test.testuser1002.uuid %]', 'Server: Sipwise NGCP Proxy', 'Content-Length: 0', @@ -209,7 +209,7 @@ sip_out: 'Content-Type: application/dialog\-info\+xml', ] - [ - 'NOTIFY sip:testuser1002@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0', + 'NOTIFY sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %](;alias=[% scenarios.0.responders.0.ip %]~[% scenarios.0.responders.0.port %]~1) SIP/2.0', 'To: ;tag=[\w-]+', 'From: ;tag=[\w-]+', 'CSeq: \d+ NOTIFY', @@ -221,11 +221,11 @@ sip_out: 'Subscription-State: active;expires=\d+', ] - [ - '^INVITE sip:testuser1003', + '^INVITE sip:[% scenarios.2.responders.0.username %]@[% scenarios.2.responders.0.ip %]:[% scenarios.2.responders.0.port %] SIP/2.0', 'From: ;tag=[\w-]+', - 'To: ', + 'To: ', 'CSeq: \d+ INVITE', - 'Contact: sip:testuser1002@127.126.0.1:\d+', + 'Contact: ]+)?>', 'Content-Type: application/sdp', 'Content-Length:\s+\d+', 'P-LB-Uptime: \d+', @@ -233,13 +233,13 @@ sip_out: 'P-Caller-UUID: [% invite_shared_line_scenarios_pbx_test.testuser1002.uuid %]', 'P-Callee-UUID: [% invite_shared_line_scenarios_pbx_test.testuser1003.uuid %]', 'P-NGCP-Rtpengine-Bleg: 1', - 'P-Called-Party-ID: ', - 'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no;hold_alter_b2b_bleg=no;hold_alter_b2b_aleg=no;fast_ack=no;a_park_domain=[% customerpbx_test.id %];b_park_domain=[% customerpbx_test.id %]', + 'P-Called-Party-ID: ', + 'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no;hold_alter_b2b_bleg=no;hold_alter_b2b_aleg=no;fast_ack=no;a_park_domain=[% invite_shared_line_customerpbx_test.id %];b_park_domain=[% invite_shared_line_customerpbx_test.id %]', 'P-App-Name: sbc', 'P-NGCP-Caller-Info: ;ip=[% scenarios.2.ip %];port=[% scenarios.2.port %];primary=[% invite_shared_line_scenarios_pbx_test.testuser1002.phone_number %]', - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% invite_shared_line_scenarios_pbx_test.testuser1003.pbx_phone_number %]', - 'P-NGCP-Presence-Caller: sip:testuser1002@invite-shared-line.scenarios-pbx.test', - 'P-NGCP-Presence-Callee: sip:testuser1003@invite-shared-line.scenarios-pbx.test', - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060', + 'P-NGCP-Callee-Info: ;ip=[% scenarios.2.responders.0.ip %];port=[% scenarios.2.responders.0.port %];primary=[% invite_shared_line_scenarios_pbx_test.testuser1003.pbx_phone_number %]', + 'P-NGCP-Presence-Caller: sip:[% scenarios.2.username %]@invite-shared-line.scenarios-pbx.test', + 'P-NGCP-Presence-Callee: sip:[% scenarios.2.responders.0.username %]@invite-shared-line.scenarios-pbx.test', + 'P-D-Uri: sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.2.responders.0.ip %]:[% scenarios.2.responders.0.port %];)?socket=sip:[% server_ip %]:5060', 'P-Proxy-Uri: sip:127.0.0.1:5062', ] diff --git a/scenarios_pbx/invite_shared_line/0006_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0006_test.yml.tt2 index 34d34fcd..e1131ec3 100644 --- a/scenarios_pbx/invite_shared_line/0006_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0006_test.yml.tt2 @@ -15,7 +15,7 @@ flow: sip_in: - 'SIP/2.0 100 Trying' - 'From: ;tag=[\w-]+' - - 'To: ' + - 'To: ' - 'CSeq: \d+ INVITE' - 'Content-Length: 0' sip_out: [] diff --git a/scenarios_pbx/invite_shared_line/0007_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0007_test.yml.tt2 index 5a133d07..cd209f60 100644 --- a/scenarios_pbx/invite_shared_line/0007_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0007_test.yml.tt2 @@ -15,7 +15,7 @@ flow: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: sip_in: - - '^INVITE' + - '^INVITE sip:[% scenarios.2.responders.0.username %]@[% scenarios.2.responders.0.ip %]:[% scenarios.2.responders.0.port %] SIP/2.0' - 'From: ;tag=[\w-]+' - 'To: ' - 'CSeq: \d+ INVITE' @@ -25,10 +25,10 @@ sip_in: - 'P-Callee-UUID: [% invite_shared_line_scenarios_pbx_test.testuser1003.uuid %]' - 'P-NGCP-Rtpengine-Bleg: 1' - 'P-NGCP-Caller-Info: ;ip=[% scenarios.2.ip %];port=[% scenarios.2.port %];primary=[% invite_shared_line_scenarios_pbx_test.testuser1002.phone_number %]' - - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% invite_shared_line_scenarios_pbx_test.testuser1003.pbx_phone_number %]' + - 'P-NGCP-Callee-Info: ;ip=[% scenarios.2.responders.0.ip %];port=[% scenarios.2.responders.0.port %];primary=[% invite_shared_line_scenarios_pbx_test.testuser1003.pbx_phone_number %]' - 'P-NGCP-Presence-Caller: sip:testuser1002@invite-shared-line.scenarios-pbx.test' - 'P-NGCP-Presence-Callee: sip:testuser1003@invite-shared-line.scenarios-pbx.test' - - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060' + - 'P-D-Uri: sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.2.responders.0.ip %]:[% scenarios.2.responders.0.port %];)?socket=sip:[% server_ip %]:5060' - 'Content-Type: application/sdp' - 'Content-Length:\s+\d+' - 'Contact: ' @@ -42,7 +42,7 @@ sip_out: 'Content-Length: 0', ] - [ - '^INVITE', + '^INVITE sip:[% scenarios.2.responders.0.username %]@[% scenarios.2.responders.0.ip %]:[% scenarios.2.responders.0.port %] SIP/2.0', 'From: ;tag=[\w-]+', 'To: ', 'CSeq: \d+ INVITE', @@ -52,8 +52,8 @@ sip_out: 'P-Callee-UUID: [% invite_shared_line_scenarios_pbx_test.testuser1003.uuid %]', 'P-NGCP-Rtpengine-Bleg: 1', 'P-NGCP-Caller-Info: ;ip=[% scenarios.2.ip %];port=[% scenarios.2.port %];primary=[% invite_shared_line_scenarios_pbx_test.testuser1002.phone_number %]', - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% invite_shared_line_scenarios_pbx_test.testuser1003.pbx_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.2.responders.0.ip %];port=[% scenarios.2.responders.0.port %];primary=[% invite_shared_line_scenarios_pbx_test.testuser1003.pbx_phone_number %]', + 'P-D-Uri: sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.2.responders.0.ip %]:[% scenarios.2.responders.0.port %];)?socket=sip:[% server_ip %]:5060', 'Content-Type: application/sdp', 'Content-Length:\s+\d+', 'Contact: ', diff --git a/scenarios_pbx/invite_shared_line/0008_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0008_test.yml.tt2 index e3c4ca16..8c8e86d3 100644 --- a/scenarios_pbx/invite_shared_line/0008_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0008_test.yml.tt2 @@ -10,7 +10,7 @@ flow: sip_in: - 'SIP/2.0 100 Trying' - 'From: ;tag=[\w-]+' - - 'To: ' + - 'To: ' - 'CSeq: \d+ INVITE' - 'Server: Sipwise NGCP LB' - 'Content-Length: 0' diff --git a/scenarios_pbx/invite_shared_line/0009_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0009_test.yml.tt2 index 98f9e76c..c631c771 100644 --- a/scenarios_pbx/invite_shared_line/0009_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0009_test.yml.tt2 @@ -10,14 +10,14 @@ flow: sip_in: - 'SIP/2.0 180 Ringing' - 'From: ;tag=[\w-]+' - - 'To: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' - 'CSeq: \d+ INVITE' - 'Content-Length: 0' sip_out: - [ - 'PUBLISH sip:testuser1003@invite-shared-line.scenarios-pbx.test SIP/2.0', - 'To: ', - 'From: ;tag=[\w-]+', + 'PUBLISH sip:[% scenarios.2.responders.0.username %]@invite-shared-line.scenarios-pbx.test SIP/2.0', + 'To: ', + 'From: ;tag=[\w-]+', 'CSeq: \d+ PUBLISH', 'Content-Length:\s+\d+', 'User-Agent: Sipwise NGCP Proxy', @@ -27,7 +27,7 @@ sip_out: - [ 'SIP/2.0 180 Ringing', 'From: ;tag=[\w-]+', - 'To: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', 'CSeq: \d+ INVITE', 'Content-Length: 0', ] diff --git a/scenarios_pbx/invite_shared_line/0010_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0010_test.yml.tt2 index bb0500aa..b7662794 100644 --- a/scenarios_pbx/invite_shared_line/0010_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0010_test.yml.tt2 @@ -17,13 +17,13 @@ flow: sip_in: - 'SIP/2.0 180 Ringing' - 'From: ;tag=[\w-]+' - - 'To: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' - 'CSeq: \d+ INVITE' - 'Contact: ' - 'Content-Length: 0' sip_out: - [ - 'NOTIFY sip:testuser1002@127.126.0.1:\d+ SIP/2.0', + 'NOTIFY sip:[% scenarios.1.responders.0.username %]@[% scenarios.1.responders.0.ip %]:[% scenarios.1.responders.0.port %](;alias=[% scenarios.1.responders.0.ip %]~[% scenarios.1.responders.0.port %]~1) SIP/2.0', 'To: ;tag=[\w-]+', 'From: ;tag=[\w-]+', 'CSeq: \d+ NOTIFY', @@ -35,7 +35,7 @@ sip_out: 'Subscription-State: terminated;reason=noresource', ] - [ - 'NOTIFY sip:testuser1002@127.126.0.1:\d+ SIP/2.0', + 'NOTIFY sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %](;alias=[% scenarios.0.responders.0.ip %]~[% scenarios.0.responders.0.port %]~1) SIP/2.0', 'To: ;tag=[\w-]+', 'From: ;tag=[\w-]+', 'CSeq: \d+ NOTIFY', @@ -60,10 +60,10 @@ sip_out: - [ 'SIP/2.0 180 Ringing', 'From: ;tag=[\w-]+', - 'To: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', 'CSeq: \d+ INVITE', 'Contact: ', 'Content-Length: 0', - 'P-COLP-Identity: "1003" ', - 'P-Out-Socket: udp:127.0.0.1:5060', + 'P-COLP-Identity: "[% invite_shared_line_scenarios_pbx_test.testuser1003.pbx_extension %]" ', + 'P-Out-Socket: udp:[% server_ip %]:5060', ] diff --git a/scenarios_pbx/invite_shared_line/0012_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0012_test.yml.tt2 index 84e24433..72e22003 100644 --- a/scenarios_pbx/invite_shared_line/0012_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0012_test.yml.tt2 @@ -21,14 +21,14 @@ flow: sip_in: - 'SIP/2.0 200 OK' - 'From: ;tag=[\w-]+' - - 'To: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' - 'CSeq: \d+ INVITE' - 'Contact: ' - 'Content-Type: application/sdp' - 'Content-Length:\s+\d+' sip_out: - [ - 'NOTIFY sip:testuser1002@127.126.0.1:\d+ SIP/2.0', + 'NOTIFY sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %](;alias=[% scenarios.0.responders.0.ip %]~[% scenarios.0.responders.0.port %]~1)? SIP/2.0', 'To: ;tag=[\w-]+', 'From: ;tag=[\w-]+', 'CSeq: \d+ NOTIFY', @@ -53,11 +53,11 @@ sip_out: - [ 'SIP/2.0 200 OK', 'From: ;tag=[\w-]+', - 'To: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', 'CSeq: \d+ INVITE', 'Contact: ', 'Content-Type: application/sdp', 'Content-Length:\s+\d+', - 'P-COLP-Identity: "1003" ', - 'P-Out-Socket: udp:127.0.0.1:5060', + 'P-COLP-Identity: "[% invite_shared_line_scenarios_pbx_test.testuser1003.pbx_extension %]" ', + 'P-Out-Socket: udp:[% server_ip %]:5060', ] diff --git a/scenarios_pbx/invite_shared_line/0013_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0013_test.yml.tt2 index bd1a96ba..44bc20a5 100644 --- a/scenarios_pbx/invite_shared_line/0013_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0013_test.yml.tt2 @@ -28,21 +28,21 @@ flow: sip_in: - 'ACK sip:127.0.0.1:508[08];prxroute=1 SIP/2.0' - 'From: ;tag=[\w-]+' - - 'To: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' - 'Call-Info: ;appearance-index=1' - 'CSeq: \d+ ACK' - 'Content-Length: 0' - - 'P-Sock-Info: udp:127.0.0.1:5060' + - 'P-Sock-Info: udp:[% server_ip %]:5060' - 'P-LB-Uptime: \d+' sip_out: - [ 'ACK sip:127.0.0.1:508[08];prxroute=1 SIP/2.0', 'From: ;tag=[\w-]+', - 'To: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', 'Call-Info: ;appearance-index=1', 'CSeq: \d+ ACK', - 'Contact: sip:testuser1002@127.126.0.1:\d+', + 'Contact: ]+)?>', 'Content-Length: 0', - 'P-Sock-Info: udp:127.0.0.1:5060', + 'P-Sock-Info: udp:[% server_ip %]:5060', 'P-LB-Uptime: \d+', ] diff --git a/scenarios_pbx/invite_shared_line/0014_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0014_test.yml.tt2 index 5def2649..9abc8f6f 100644 --- a/scenarios_pbx/invite_shared_line/0014_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0014_test.yml.tt2 @@ -24,7 +24,7 @@ flow: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: sip_in: - - 'ACK sip:127.126.0.1:\d+;transport=UDP SIP/2.0' + - 'ACK sip:[% scenarios.2.responders.0.ip %]:[% scenarios.2.responders.0.port %];transport=UDP SIP/2.0' - 'From: ;tag=[\w-]+' - 'To: ;tag=[\w-]+' - 'CSeq: \d+ ACK' @@ -32,7 +32,7 @@ sip_in: - 'Contact: ' sip_out: - [ - 'ACK sip:127.126.0.1:\d+;transport=UDP SIP/2.0', + 'ACK sip:[% scenarios.2.responders.0.ip %]:[% scenarios.2.responders.0.port %];transport=UDP SIP/2.0', 'From: ;tag=[\w-]+', 'To: ;tag=[\w-]+', 'CSeq: \d+ ACK', diff --git a/scenarios_pbx/invite_shared_line/0015_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0015_test.yml.tt2 index ce0d6b76..d5757894 100644 --- a/scenarios_pbx/invite_shared_line/0015_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0015_test.yml.tt2 @@ -33,20 +33,20 @@ flow: sip_in: - 'BYE sip:127.0.0.1:508[08];prxroute=1 SIP/2.0' - 'From: ;tag=[\w-]+' - - 'To: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' - 'Call-Info: ;appearance-index=1' - 'CSeq: \d+ BYE' - 'Content-Length: 0' - '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: - [ 'SIP/2.0 100 Trying', 'From: ;tag=[\w-]+', - 'To: ;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-UA: ', 'Server: Sipwise NGCP Proxy', 'Content-Length: 0', @@ -63,7 +63,7 @@ sip_out: 'Content-Type: application/dialog\-info\+xml', ] - [ - 'NOTIFY sip:testuser1002@127.126.0.1:\d+ SIP/2.0', + 'NOTIFY sip:testuser1002@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %](;alias=[% scenarios.0.responders.0.ip %]~[% scenarios.0.responders.0.port %]~1)? SIP/2.0', 'To: ;tag=[\w-]+', 'From: ;tag=[\w-]+', 'CSeq: \d+ NOTIFY', @@ -77,9 +77,9 @@ sip_out: - [ 'BYE sip:127.0.0.1:508[08];prxroute=1 SIP/2.0', 'From: ;tag=[\w-]+', - 'To: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', 'CSeq: \d+ BYE', - 'Contact: sip:testuser1002@127.126.0.1:\d+', + 'Contact: ]+)?>', 'Content-Length: 0', 'P-LB-Uptime: \d+', 'P-Asserted-Identity: ', diff --git a/scenarios_pbx/invite_shared_line/0016_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0016_test.yml.tt2 index f4c4350e..9952b1dd 100644 --- a/scenarios_pbx/invite_shared_line/0016_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0016_test.yml.tt2 @@ -29,7 +29,7 @@ flow: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: sip_in: - - 'BYE sip:127.126.0.1:\d+;transport=UDP SIP/2.0' + - 'BYE sip:[% scenarios.2.responders.0.ip %]:[% scenarios.2.responders.0.port %];transport=UDP SIP/2.0' - 'From: ;tag=[\w-]+' - 'To: ;tag=[\w-]+' - 'CSeq: \d+ BYE' @@ -57,7 +57,7 @@ sip_out: 'Content-Type: application/dialog\-info\+xml', ] - [ - 'BYE sip:127.126.0.1:\d+;transport=UDP SIP/2.0', + 'BYE sip:[% scenarios.2.responders.0.ip %]:[% scenarios.2.responders.0.port %];transport=UDP SIP/2.0', 'From: ;tag=[\w-]+', 'To: ;tag=[\w-]+', 'CSeq: \d+ BYE', diff --git a/scenarios_pbx/invite_shared_line/0017_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0017_test.yml.tt2 index 22e00ce9..1b91fc48 100644 --- a/scenarios_pbx/invite_shared_line/0017_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0017_test.yml.tt2 @@ -17,7 +17,7 @@ sip_in: - 'From: ;tag=[\w-]+' - 'To: ;tag=[\w-]+' - 'CSeq: \d+ BYE' - - 'Contact: ' + - 'Contact: ]+)?>' - 'Content-Length: \s+0' - 'P-NGCP-Src-Af: 4' sip_out: @@ -26,7 +26,7 @@ sip_out: 'From: ;tag=[\w-]+', 'To: ;tag=[\w-]+', 'CSeq: \d+ BYE', - 'Contact: ', + 'Contact: ]+)?>', 'Content-Length: \s+0', 'P-NGCP-Src-Af: 4', ] diff --git a/scenarios_pbx/invite_shared_line/0018_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0018_test.yml.tt2 index 98ae56d4..38b7e879 100644 --- a/scenarios_pbx/invite_shared_line/0018_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0018_test.yml.tt2 @@ -28,5 +28,5 @@ sip_out: 'CSeq: \d+ BYE', 'Content-Length: 0', 'P-COLP-Identity: "1003" ', - 'P-Out-Socket: udp:127.0.0.1:5060', + 'P-Out-Socket: udp:[% server_ip %]:5060', ] diff --git a/scenarios_pbx/invite_shared_line/sipp_scenario02.xml b/scenarios_pbx/invite_shared_line/sipp_scenario02.xml index 781b088e..9580835c 100644 --- a/scenarios_pbx/invite_shared_line/sipp_scenario02.xml +++ b/scenarios_pbx/invite_shared_line/sipp_scenario02.xml @@ -14,7 +14,7 @@ Call-ID: NGCP%[field4 file="callee.csv" line=2]%///[call_id] Call-Info: ;appearance-index=1 CSeq: 1 INVITE - Contact: sip:[field0 file="caller.csv" line=2]@[local_ip]:[local_port] + Contact: Max-Forwards: 70 Content-Type: application/sdp Content-Length: [len] @@ -46,7 +46,7 @@ Call-ID: NGCP%[field4 file="callee.csv" line=2]%///[call_id] Call-Info: ;appearance-index=1 CSeq: 1 ACK - Contact: sip:[field0 file="caller.csv" line=2]@[local_ip]:[local_port] + Contact: Max-Forwards: 70 Content-Length: 0 @@ -65,7 +65,7 @@ Call-ID: NGCP%[field4 file="callee.csv" line=2]%///[call_id] Call-Info: ;appearance-index=1 CSeq: 2 INVITE - Contact: sip:[field0 file="caller.csv" line=2]@[local_ip]:[local_port] + Contact: Max-Forwards: 70 [field1 file="caller.csv" line=2] Content-Type: application/sdp @@ -106,7 +106,7 @@ Call-Info: ;appearance-index=1 [routes] CSeq: 2 ACK - Contact: sip:[field0 file="caller.csv" line=2]@[local_ip]:[local_port] + Contact: Max-Forwards: 70 Content-Length: 0 @@ -132,7 +132,7 @@ Call-ID: NGCP%[field4 file="callee.csv" line=2]%///[call_id] Call-Info: ;appearance-index=1 CSeq: 3 BYE - Contact: sip:[field0 file="caller.csv" line=2]@[local_ip]:[local_port] + Contact: [routes] Max-Forwards: 70 Content-Length: 0