diff --git a/scenarios/invite_reinvite_transcoding/0003_test.yml.tt2 b/scenarios/invite_reinvite_transcoding/0003_test.yml.tt2 index e0ac2369..6327ff45 100644 --- a/scenarios/invite_reinvite_transcoding/0003_test.yml.tt2 +++ b/scenarios/invite_reinvite_transcoding/0003_test.yml.tt2 @@ -144,15 +144,15 @@ flow: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: sip_in: - - 'INVITE sip:testuser1001@spce.test SIP/2.0' - - 'From: ;tag=[\w-]+' - - 'To: ' + - 'INVITE sip:[% scenarios.0.responders.0.username %]@invite-reinvite-transcoding.scenarios.test SIP/2.0' + - 'From: ;tag=[\w-]+' + - 'To: ' - 'CSeq: \d+ INVITE' - - 'Contact: ' + - 'Contact: ' - 'Content-Type: application/sdp' - 'Content-Length:\s+\d+' - - 'P-NGCP-Src-Ip: 127.0.2.1' - - 'P-NGCP-Src-Port: \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' @@ -162,32 +162,32 @@ sip_in: 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.0.2.1', + 'P-NGCP-Auth-IP: [% scenarios.0.ip %]', 'P-NGCP-Auth-UA: ', 'Server: Sipwise NGCP Proxy', 'Content-Length: 0', ] - [ - 'INVITE sip:testuser1001@127.1.0.1:\d+ SIP/2.0', - 'From: ;tag=[\w-]+', - 'To: ', + 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0', + 'From: ;tag=[\w-]+', + 'To: ', 'CSeq: \d+ INVITE', - 'Contact: ', + 'Contact: ', 'Content-Type: application/sdp', 'Content-Length:\s+\d+', 'P-LB-Uptime: \d+', - 'P-Asserted-Identity: ', + 'P-Asserted-Identity: ', 'P-Caller-UUID: 0', - 'P-Callee-UUID: [% spce_test.testuser1001.uuid %]', - 'P-Called-Party-ID: ', + 'P-Callee-UUID: [% invite_reinvite_transcoding_scenarios_test.testuser1001.uuid %]', + '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', 'P-App-Name: sbc', - 'P-NGCP-Caller-Info: ;ip=127.0.2.1;port=\d+', - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=4311001', + 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %]', + 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% invite_reinvite_transcoding.testuser1001.phone_number %]', 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060', 'P-Proxy-Uri: sip:127.0.0.1:5062', 'a=rtpmap:8 PCMA/8000', diff --git a/scenarios/invite_reinvite_transcoding/0005_test.yml.tt2 b/scenarios/invite_reinvite_transcoding/0005_test.yml.tt2 index 3f141d51..d622714d 100644 --- a/scenarios/invite_reinvite_transcoding/0005_test.yml.tt2 +++ b/scenarios/invite_reinvite_transcoding/0005_test.yml.tt2 @@ -13,15 +13,15 @@ flow: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: sip_in: - - 'INVITE sip:testuser1001@127.1.0.1:\d+ SIP/2.0' - - 'From: ;tag=[\w-]+' - - 'To: ' + - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0' + - 'From: ;tag=[\w-]+' + - 'To: ' - 'CSeq: \d+ INVITE' - 'P-LB-Uptime: \d+' - - 'P-Asserted-Identity: ' + - 'P-Asserted-Identity: ' - 'P-Caller-UUID: 0' - - 'P-NGCP-Caller-Info: ;ip=127.0.2.1;port=\d+' - - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=4311001' + - 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %]' + - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% invite_reinvite_transcoding.testuser1001.phone_number %]' - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060' - 'Content-Type: application/sdp' - 'Contact: ' @@ -31,22 +31,22 @@ sip_in: sip_out: - [ 'SIP/2.0 100 Trying', - 'From: ;tag=[\w-]+', - 'To: ', + 'From: ;tag=[\w-]+', + 'To: ', 'CSeq: \d+ INVITE', 'Server: Sipwise NGCP Proxy', 'Content-Length: 0', ] - [ - 'INVITE sip:testuser1001@127.1.0.1:\d+ SIP/2.0', - 'From: ;tag=[\w-]+', - 'To: ', + 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0', + 'From: ;tag=[\w-]+', + 'To: ', 'CSeq: \d+ INVITE', 'P-LB-Uptime: \d+', - 'P-Asserted-Identity: ', + 'P-Asserted-Identity: ', 'P-Caller-UUID: 0', - 'P-NGCP-Caller-Info: ;ip=127.0.2.1;port=\d+', - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=4311001', + 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %]', + 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% invite_reinvite_transcoding.testuser1001.phone_number %]', 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060', 'Content-Type: application/sdp', 'Contact: ', diff --git a/scenarios/invite_reinvite_transcoding/0006_test.yml.tt2 b/scenarios/invite_reinvite_transcoding/0006_test.yml.tt2 index 6164acf5..0dad89d2 100644 --- a/scenarios/invite_reinvite_transcoding/0006_test.yml.tt2 +++ b/scenarios/invite_reinvite_transcoding/0006_test.yml.tt2 @@ -9,8 +9,8 @@ flow: - exit|ROUTE_EXIT: sip_in: - 'SIP/2.0 100 Trying' - - 'From: ;tag=[\w-]+' - - 'To: ' + - 'From: ;tag=[\w-]+' + - 'To: ' - 'CSeq: \d+ INVITE' - 'Server: Sipwise NGCP LB' - 'Content-Length: 0' diff --git a/scenarios/invite_reinvite_transcoding/0007_test.yml.tt2 b/scenarios/invite_reinvite_transcoding/0007_test.yml.tt2 index b83c1f1b..090a5ecb 100644 --- a/scenarios/invite_reinvite_transcoding/0007_test.yml.tt2 +++ b/scenarios/invite_reinvite_transcoding/0007_test.yml.tt2 @@ -9,25 +9,25 @@ flow: - exit|ROUTE_EXIT: sip_in: - 'SIP/2.0 180 Ringing' - - 'From: ;tag=[\w-]+' - - 'To: ;tag=[\w-]+' + - 'From: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' - 'CSeq: \d+ INVITE' - - 'Contact: ' + - 'Contact: ' - 'Content-Length: 0' - - 'P-NGCP-Src-Ip: 127.1.0.1' - - 'P-NGCP-Src-Port: \d+' + - 'P-NGCP-Src-Ip: [% scenarios.0.responders.0.ip %]' + - 'P-NGCP-Src-Port: [% scenarios.0.responders.0.port %]' - 'P-NGCP-Src-Proto: udp' - 'P-NGCP-Src-Af: 4' sip_out: - [ 'SIP/2.0 180 Ringing', - 'From: ;tag=[\w-]+', - 'To: ;tag=[\w-]+', + 'From: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', 'CSeq: \d+ INVITE', - 'Contact: ', + 'Contact: ', 'Content-Length: 0', - 'P-NGCP-Src-Ip: 127.1.0.1', - 'P-NGCP-Src-Port: \d+', + 'P-NGCP-Src-Ip: [% scenarios.0.responders.0.ip %]', + 'P-NGCP-Src-Port: [% scenarios.0.responders.0.port %]', 'P-NGCP-Src-Proto: udp', 'P-NGCP-Src-Af: 4', ] diff --git a/scenarios/invite_reinvite_transcoding/0008_test.yml.tt2 b/scenarios/invite_reinvite_transcoding/0008_test.yml.tt2 index 1f47d1b8..d9972c7a 100644 --- a/scenarios/invite_reinvite_transcoding/0008_test.yml.tt2 +++ b/scenarios/invite_reinvite_transcoding/0008_test.yml.tt2 @@ -14,16 +14,16 @@ flow: - exit|ROUTE_EXIT: sip_in: - 'SIP/2.0 180 Ringing' - - 'From: ;tag=[\w-]+' - - 'To: ;tag=[\w-]+' + - 'From: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' - 'CSeq: \d+ INVITE' - 'Contact: ' - 'Content-Length: 0' sip_out: - [ 'SIP/2.0 180 Ringing', - 'From: ;tag=[\w-]+', - 'To: ;tag=[\w-]+', + 'From: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', 'CSeq: \d+ INVITE', 'Contact: ', 'Content-Length: 0', diff --git a/scenarios/invite_reinvite_transcoding/0009_test.yml.tt2 b/scenarios/invite_reinvite_transcoding/0009_test.yml.tt2 index 02d86350..1761eb6c 100644 --- a/scenarios/invite_reinvite_transcoding/0009_test.yml.tt2 +++ b/scenarios/invite_reinvite_transcoding/0009_test.yml.tt2 @@ -11,14 +11,14 @@ flow: - return|dialog:start: sip_in: - 'SIP/2.0 200 OK' - - 'From: ;tag=[\w-]+' - - 'To: ;tag=[\w-]+' + - 'From: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' - 'CSeq: \d+ INVITE' - - 'Contact: ' + - 'Contact: ' - 'Content-Type: application/sdp' - 'Content-Length:\s+\d+' - - 'P-NGCP-Src-Ip: 127.1.0.1' - - 'P-NGCP-Src-Port: \d+' + - 'P-NGCP-Src-Ip: [% scenarios.0.responders.0.ip %]' + - 'P-NGCP-Src-Port: [% scenarios.0.responders.0.port %]' - 'P-NGCP-Src-Proto: udp' - 'P-NGCP-Src-Af: 4' - 'a=rtpmap:8 PCMA/8000' @@ -26,14 +26,14 @@ sip_in: sip_out: - [ 'SIP/2.0 200 OK', - 'From: ;tag=[\w-]+', - 'To: ;tag=[\w-]+', + 'From: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', 'CSeq: \d+ INVITE', - 'Contact: ', + 'Contact: ', 'Content-Type: application/sdp', 'Content-Length:\s+\d+', - 'P-NGCP-Src-Ip: 127.1.0.1', - 'P-NGCP-Src-Port: \d+', + 'P-NGCP-Src-Ip: [% scenarios.0.responders.0.ip %]', + 'P-NGCP-Src-Port: [% scenarios.0.responders.0.port %]', 'P-NGCP-Src-Proto: udp', 'P-NGCP-Src-Af: 4', 'a=rtpmap:8 PCMA/8000', diff --git a/scenarios/invite_reinvite_transcoding/0010_test.yml.tt2 b/scenarios/invite_reinvite_transcoding/0010_test.yml.tt2 index 55b5deb5..cf64b10d 100644 --- a/scenarios/invite_reinvite_transcoding/0010_test.yml.tt2 +++ b/scenarios/invite_reinvite_transcoding/0010_test.yml.tt2 @@ -18,8 +18,8 @@ flow: - return|dialog:start: sip_in: - 'SIP/2.0 200 OK' - - 'From: ;tag=[\w-]+' - - 'To: ;tag=[\w-]+' + - 'From: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' - 'CSeq: \d+ INVITE' - 'Contact: ' - 'Content-Type: application/sdp' @@ -29,8 +29,8 @@ sip_in: sip_out: - [ 'SIP/2.0 200 OK', - 'From: ;tag=[\w-]+', - 'To: ;tag=[\w-]+', + 'From: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', 'CSeq: \d+ INVITE', 'Contact: ', 'Content-Type: application/sdp', diff --git a/scenarios/invite_reinvite_transcoding/0011_test.yml.tt2 b/scenarios/invite_reinvite_transcoding/0011_test.yml.tt2 index 8a077108..f2ca2ed8 100644 --- a/scenarios/invite_reinvite_transcoding/0011_test.yml.tt2 +++ b/scenarios/invite_reinvite_transcoding/0011_test.yml.tt2 @@ -25,13 +25,13 @@ flow: - exit|ROUTE_EXIT: sip_in: - 'ACK sip:127.0.0.1:508[08];prxroute=1 SIP/2.0' - - 'From: ;tag=[\w-]+' - - 'To: ;tag=[\w-]+' + - 'From: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' - 'CSeq: \d+ ACK' - - 'Contact: ' + - 'Contact: ' - 'Content-Length: 0' - - 'P-NGCP-Src-Ip: 127.0.2.1' - - 'P-NGCP-Src-Port: \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' @@ -39,13 +39,13 @@ sip_in: sip_out: - [ 'ACK sip:127.0.0.1:508[08];prxroute=1 SIP/2.0', - 'From: ;tag=[\w-]+', - 'To: ;tag=[\w-]+', + 'From: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', 'CSeq: \d+ ACK', - 'Contact: ', + 'Contact: ', 'Content-Length: 0', - 'P-NGCP-Src-Ip: 127.0.2.1', - 'P-NGCP-Src-Port: \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', diff --git a/scenarios/invite_reinvite_transcoding/0012_test.yml.tt2 b/scenarios/invite_reinvite_transcoding/0012_test.yml.tt2 index b47aa3fc..ba7556a8 100644 --- a/scenarios/invite_reinvite_transcoding/0012_test.yml.tt2 +++ b/scenarios/invite_reinvite_transcoding/0012_test.yml.tt2 @@ -20,17 +20,17 @@ flow: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: sip_in: - - 'ACK sip:127.1.0.1:\d+;transport=UDP SIP/2.0' - - 'From: ;tag=[\w-]+' - - 'To: ;tag=[\w-]+' + - 'ACK sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=UDP SIP/2.0' + - 'From: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' - 'CSeq: \d+ ACK' - 'Contact: ' - 'Content-Length: 0' sip_out: - [ - 'ACK sip:127.1.0.1:\d+;transport=UDP SIP/2.0', - 'From: ;tag=[\w-]+', - 'To: ;tag=[\w-]+', + 'ACK sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=UDP SIP/2.0', + 'From: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', 'CSeq: \d+ ACK', 'Contact: ', 'Content-Length: 0', diff --git a/scenarios/invite_reinvite_transcoding/0013_test.yml.tt2 b/scenarios/invite_reinvite_transcoding/0013_test.yml.tt2 index 6447065c..acbf8bce 100644 --- a/scenarios/invite_reinvite_transcoding/0013_test.yml.tt2 +++ b/scenarios/invite_reinvite_transcoding/0013_test.yml.tt2 @@ -21,14 +21,14 @@ flow: - exit|ROUTE_EXIT: sip_in: - 'INVITE sip:127.0.0.1:508[08] SIP/2.0' - - 'From: ;tag=[\w-]+' - - 'To: ;tag=[\w-]+' + - 'From: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' - 'CSeq: \d+ INVITE' - - 'Contact: ' + - 'Contact: ' - 'Content-Type: application/sdp' - 'Content-Length:\s+\d+' - - 'P-NGCP-Src-Ip: 127.1.0.1' - - 'P-NGCP-Src-Port: \d+' + - 'P-NGCP-Src-Ip: [% scenarios.0.responders.0.ip %]' + - 'P-NGCP-Src-Port: [% scenarios.0.responders.0.port %]' - 'P-NGCP-Src-Proto: udp' - 'P-NGCP-Src-Af: 4' - 'P-Sock-Info: udp:127.0.0.1:5060' @@ -38,21 +38,21 @@ sip_in: sip_out: - [ 'SIP/2.0 100 Trying', - '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.1.0.1', + 'P-NGCP-Auth-IP: [% scenarios.0.responders.0.ip %]', 'P-NGCP-Auth-UA: ', 'Server: Sipwise NGCP Proxy', 'Content-Length: 0', ] - [ 'INVITE sip:127.0.0.1:508[08] SIP/2.0', - 'From: ;tag=[\w-]+', - 'To: ;tag=[\w-]+', + 'From: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', 'CSeq: \d+ INVITE', - 'Contact: ', + 'Contact: ', 'Content-Type: application/sdp', 'Content-Length:\s+\d+', 'P-LB-Uptime: \d+', diff --git a/scenarios/invite_reinvite_transcoding/0014_test.yml.tt2 b/scenarios/invite_reinvite_transcoding/0014_test.yml.tt2 index d251c106..318e2287 100644 --- a/scenarios/invite_reinvite_transcoding/0014_test.yml.tt2 +++ b/scenarios/invite_reinvite_transcoding/0014_test.yml.tt2 @@ -14,8 +14,8 @@ flow: - exit|ROUTE_EXIT: sip_in: - 'SIP/2.0 100 Trying' - - 'From: ;tag=[\w-]+' - - 'To: ;tag=[\w-]+' + - 'From: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' - 'CSeq: \d+ INVITE' - 'Content-Length: 0' sip_out: [] diff --git a/scenarios/invite_reinvite_transcoding/0015_test.yml.tt2 b/scenarios/invite_reinvite_transcoding/0015_test.yml.tt2 index 9b7f19ec..9526327b 100644 --- a/scenarios/invite_reinvite_transcoding/0015_test.yml.tt2 +++ b/scenarios/invite_reinvite_transcoding/0015_test.yml.tt2 @@ -26,9 +26,9 @@ flow: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: sip_in: - - 'INVITE sip:004321001@127.0.2.1:\d+;transport=UDP SIP/2.0' - - 'From: ;tag=[\w-]+' - - 'To: ;tag=[\w-]+' + - 'INVITE sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %];transport=UDP SIP/2.0' + - 'From: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' - 'CSeq: \d+ INVITE' - 'Content-Type: application/sdp' - 'Contact: ' @@ -38,16 +38,16 @@ sip_in: sip_out: - [ 'SIP/2.0 100 Trying', - 'From: ;tag=[\w-]+', - 'To: ;tag=[\w-]+', + 'From: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', 'CSeq: \d+ INVITE', 'Server: Sipwise NGCP Proxy', 'Content-Length: 0', ] - [ - 'INVITE sip:004321001@127.0.2.1:\d+;transport=UDP SIP/2.0', - 'From: ;tag=[\w-]+', - 'To: ;tag=[\w-]+', + 'INVITE sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %];transport=UDP SIP/2.0', + 'From: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', 'CSeq: \d+ INVITE', 'Content-Type: application/sdp', 'Contact: ', diff --git a/scenarios/invite_reinvite_transcoding/0016_test.yml.tt2 b/scenarios/invite_reinvite_transcoding/0016_test.yml.tt2 index 0bcf7896..87fc4814 100644 --- a/scenarios/invite_reinvite_transcoding/0016_test.yml.tt2 +++ b/scenarios/invite_reinvite_transcoding/0016_test.yml.tt2 @@ -14,8 +14,8 @@ flow: - exit|ROUTE_EXIT: sip_in: - 'SIP/2.0 100 Trying' - - 'From: ;tag=[\w-]+' - - 'To: ;tag=[\w-]+' + - 'From: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' - 'CSeq: \d+ INVITE' - 'Server: Sipwise NGCP LB' - 'Content-Length: 0' diff --git a/scenarios/invite_reinvite_transcoding/0017_test.yml.tt2 b/scenarios/invite_reinvite_transcoding/0017_test.yml.tt2 index 47f396f0..7ee2a36a 100644 --- a/scenarios/invite_reinvite_transcoding/0017_test.yml.tt2 +++ b/scenarios/invite_reinvite_transcoding/0017_test.yml.tt2 @@ -16,14 +16,14 @@ flow: - exit|ROUTE_EXIT: sip_in: - 'SIP/2.0 200 OK' - - 'From: ;tag=[\w-]+' - - 'To: ;tag=[\w-]+' + - 'From: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' - 'CSeq: \d+ INVITE' - - 'Contact: ' + - 'Contact: ' - 'Content-Type: application/sdp' - 'Content-Length:\s+\d+' - - 'P-NGCP-Src-Ip: 127.0.2.1' - - 'P-NGCP-Src-Port: \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' - 'a=rtpmap:8 PCMA/8000' @@ -31,14 +31,14 @@ sip_in: sip_out: - [ 'SIP/2.0 200 OK', - 'From: ;tag=[\w-]+', - 'To: ;tag=[\w-]+', + 'From: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', 'CSeq: \d+ INVITE', - 'Contact: ', + 'Contact: ', 'Content-Type: application/sdp', 'Content-Length:\s+\d+', - 'P-NGCP-Src-Ip: 127.0.2.1', - 'P-NGCP-Src-Port: \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', 'a=rtpmap:18 G729/8000', diff --git a/scenarios/invite_reinvite_transcoding/0018_test.yml.tt2 b/scenarios/invite_reinvite_transcoding/0018_test.yml.tt2 index 01b51598..4306f0b4 100644 --- a/scenarios/invite_reinvite_transcoding/0018_test.yml.tt2 +++ b/scenarios/invite_reinvite_transcoding/0018_test.yml.tt2 @@ -16,8 +16,8 @@ flow: - exit|ROUTE_EXIT: sip_in: - 'SIP/2.0 200 OK' - - 'From: ;tag=[\w-]+' - - 'To: ;tag=[\w-]+' + - 'From: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' - 'CSeq: \d+ INVITE' - 'Contact: ' - 'Content-Type: application/sdp' @@ -28,8 +28,8 @@ sip_in: sip_out: - [ 'SIP/2.0 200 OK', - 'From: ;tag=[\w-]+', - 'To: ;tag=[\w-]+', + 'From: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', 'CSeq: \d+ INVITE', 'Contact: ', 'Content-Type: application/sdp', diff --git a/scenarios/invite_reinvite_transcoding/0019_test.yml.tt2 b/scenarios/invite_reinvite_transcoding/0019_test.yml.tt2 index 659ee9be..875b144a 100644 --- a/scenarios/invite_reinvite_transcoding/0019_test.yml.tt2 +++ b/scenarios/invite_reinvite_transcoding/0019_test.yml.tt2 @@ -21,13 +21,13 @@ flow: - exit|ROUTE_EXIT: sip_in: - 'ACK sip:127.0.0.1:508[08] SIP/2.0' - - 'From: ;tag=[\w-]+' - - 'To: ;tag=[\w-]+' + - 'From: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' - 'CSeq: \d+ ACK' - - 'Contact: ' + - 'Contact: ' - 'Content-Length: 0' - - 'P-NGCP-Src-Ip: 127.1.0.1' - - 'P-NGCP-Src-Port: \d+' + - 'P-NGCP-Src-Ip: [% scenarios.0.responders.0.ip %]' + - 'P-NGCP-Src-Port: [% scenarios.0.responders.0.port %]' - 'P-NGCP-Src-Proto: udp' - 'P-NGCP-Src-Af: 4' - 'P-Sock-Info: udp:127.0.0.1:5060' @@ -35,12 +35,12 @@ sip_in: sip_out: - [ 'ACK sip:127.0.0.1:508[08] SIP/2.0', - 'From: ;tag=[\w-]+', - 'To: ;tag=[\w-]+', + 'From: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', 'CSeq: \d+ ACK', - 'Contact: ', + 'Contact: ', 'Content-Length: 0', - 'P-NGCP-Src-Ip: 127.1.0.1', + 'P-NGCP-Src-Ip: [% scenarios.0.responders.0.ip %]', 'P-NGCP-Src-Port: \d+', 'P-NGCP-Src-Proto: udp', 'P-NGCP-Src-Af: 4', diff --git a/scenarios/invite_reinvite_transcoding/0020_test.yml.tt2 b/scenarios/invite_reinvite_transcoding/0020_test.yml.tt2 index 66bb0be5..ccbe77bc 100644 --- a/scenarios/invite_reinvite_transcoding/0020_test.yml.tt2 +++ b/scenarios/invite_reinvite_transcoding/0020_test.yml.tt2 @@ -24,17 +24,17 @@ flow: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: sip_in: - - 'ACK sip:127.0.2.1:\d+;transport=UDP SIP/2.0' - - 'From: ;tag=[\w-]+' - - 'To: ;tag=[\w-]+' + - 'ACK sip:[% scenarios.0.ip %]:[% scenarios.0.port %];transport=UDP SIP/2.0' + - 'From: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' - 'CSeq: \d+ ACK' - 'Contact: ' - 'Content-Length: 0' sip_out: - [ - 'ACK sip:127.0.2.1:\d+;transport=UDP SIP/2.0', - 'From: ;tag=[\w-]+', - 'To: ;tag=[\w-]+', + 'ACK sip:[% scenarios.0.ip %]:[% scenarios.0.port %];transport=UDP SIP/2.0', + 'From: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', 'CSeq: \d+ ACK', 'Contact: ', 'Content-Length: 0', diff --git a/scenarios/invite_reinvite_transcoding/0021_test.yml.tt2 b/scenarios/invite_reinvite_transcoding/0021_test.yml.tt2 index 70f202c5..dd5902da 100644 --- a/scenarios/invite_reinvite_transcoding/0021_test.yml.tt2 +++ b/scenarios/invite_reinvite_transcoding/0021_test.yml.tt2 @@ -28,13 +28,13 @@ flow: - exit|ROUTE_EXIT: sip_in: - 'BYE sip:127.0.0.1:508[08];prxroute=1 SIP/2.0' - - 'From: ;tag=[\w-]+' - - 'To: ;tag=[\w-]+' + - 'From: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' - 'CSeq: \d+ BYE' - - 'Contact: ' + - 'Contact: ' - 'Content-Length: 0' - - 'P-NGCP-Src-Ip: 127.0.2.1' - - 'P-NGCP-Src-Port: \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' @@ -42,22 +42,22 @@ sip_in: sip_out: - [ 'SIP/2.0 100 Trying', - 'From: ;tag=[\w-]+', - 'To: ;tag=[\w-]+', + 'From: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', 'CSeq: \d+ BYE', 'P-Out-Socket: udp:127.0.0.1:5060', - 'P-NGCP-Auth-IP: 127.0.2.1', + 'P-NGCP-Auth-IP: [% scenarios.0.ip %]', 'P-NGCP-Auth-UA: ', 'Server: Sipwise NGCP Proxy', 'Content-Length: 0', ] - [ 'BYE sip:127.0.0.1:508[08];prxroute=1 SIP/2.0', - 'From: ;tag=[\w-]+', - 'To: ;tag=[\w-]+', + 'From: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', 'CSeq: \d+ BYE', - 'Contact: ', + 'Contact: ', 'Content-Length: 0', 'P-LB-Uptime: \d+', - 'P-Asserted-Identity: ', + 'P-Asserted-Identity: ', ] diff --git a/scenarios/invite_reinvite_transcoding/0022_test.yml.tt2 b/scenarios/invite_reinvite_transcoding/0022_test.yml.tt2 index 505dc7b4..209e4f11 100644 --- a/scenarios/invite_reinvite_transcoding/0022_test.yml.tt2 +++ b/scenarios/invite_reinvite_transcoding/0022_test.yml.tt2 @@ -25,26 +25,26 @@ flow: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: sip_in: - - 'BYE sip:testuser1001@127.1.0.1:\d+;transport=UDP SIP/2.0' - - 'From: ;tag=[\w-]+' - - 'To: ;tag=[\w-]+' + - 'BYE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=UDP SIP/2.0' + - 'From: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' - 'CSeq: \d+ BYE' - 'P-LB-Uptime: \d+' - - 'P-Asserted-Identity: ' + - 'P-Asserted-Identity: ' - 'Content-Length: 0' sip_out: - [ 'SIP/2.0 100 Trying', - 'From: ;tag=[\w-]+', - 'To: ;tag=[\w-]+', + 'From: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', 'CSeq: \d+ BYE', 'Server: Sipwise NGCP Proxy', 'Content-Length: 0', ] - [ - 'BYE sip:testuser1001@127.1.0.1:\d+;transport=UDP SIP/2.0', - 'From: ;tag=[\w-]+', - 'To: ;tag=[\w-]+', + 'BYE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=UDP SIP/2.0', + 'From: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', 'CSeq: \d+ BYE', 'P-LB-Uptime: \d+', 'Content-Length: 0', diff --git a/scenarios/invite_reinvite_transcoding/0023_test.yml.tt2 b/scenarios/invite_reinvite_transcoding/0023_test.yml.tt2 index af1a8239..0900073d 100644 --- a/scenarios/invite_reinvite_transcoding/0023_test.yml.tt2 +++ b/scenarios/invite_reinvite_transcoding/0023_test.yml.tt2 @@ -14,24 +14,24 @@ flow: - exit|ROUTE_EXIT: sip_in: - 'SIP/2.0 200 OK' - - 'From: ;tag=[\w-]+' - - 'To: ;tag=[\w-]+' + - 'From: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' - 'CSeq: \d+ BYE' - - 'Contact: ' + - 'Contact: ' - 'Content-Length: 0' - - 'P-NGCP-Src-Ip: 127.1.0.1' + - 'P-NGCP-Src-Ip: [% scenarios.0.responders.0.ip %]' - 'P-NGCP-Src-Port: \d+' - 'P-NGCP-Src-Proto: udp' - 'P-NGCP-Src-Af: 4' sip_out: - [ 'SIP/2.0 200 OK', - 'From: ;tag=[\w-]+', - 'To: ;tag=[\w-]+', + 'From: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', 'CSeq: \d+ BYE', - 'Contact: ', + 'Contact: ', 'Content-Length: 0', - 'P-NGCP-Src-Ip: 127.1.0.1', + 'P-NGCP-Src-Ip: [% scenarios.0.responders.0.ip %]', 'P-NGCP-Src-Port: \d+', 'P-NGCP-Src-Proto: udp', 'P-NGCP-Src-Af: 4', diff --git a/scenarios/invite_reinvite_transcoding/0024_test.yml.tt2 b/scenarios/invite_reinvite_transcoding/0024_test.yml.tt2 index c9d3a660..7e2c025d 100644 --- a/scenarios/invite_reinvite_transcoding/0024_test.yml.tt2 +++ b/scenarios/invite_reinvite_transcoding/0024_test.yml.tt2 @@ -14,15 +14,15 @@ flow: - exit|ROUTE_EXIT: sip_in: - 'SIP/2.0 200 OK' - - 'From: ;tag=[\w-]+' - - 'To: ;tag=[\w-]+' + - 'From: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' - 'CSeq: \d+ BYE' - 'Content-Length: 0' sip_out: - [ 'SIP/2.0 200 OK', - 'From: ;tag=[\w-]+', - 'To: ;tag=[\w-]+', + 'From: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', 'CSeq: \d+ BYE', 'Content-Length: 0', 'P-Out-Socket: udp:127.0.0.1:5060', diff --git a/scenarios/invite_reinvite_transcoding/cdr_test.yml.tt2 b/scenarios/invite_reinvite_transcoding/cdr_test.yml.tt2 index a0337be7..d3bca5b4 100644 --- a/scenarios/invite_reinvite_transcoding/cdr_test.yml.tt2 +++ b/scenarios/invite_reinvite_transcoding/cdr_test.yml.tt2 @@ -1,10 +1,10 @@ cdr: - - source_user: '004321001' - source_domain: '127.0.2.1' - source_cli: '004321001' - destination_user: 'testuser1001' - destination_domain: 'spce.test' - destination_user_dialed: 'testuser1001' + - source_user: '[% scenarios.0.username %]' + source_domain: '[% scenarios.0.ip %]' + source_cli: '[% scenarios.0.username %]' + destination_user: '[% scenarios.0.responders.0.username %]' + destination_domain: 'invite-reinvite-transcoding.scenarios.test' + destination_user_dialed: '[% scenarios.0.responders.0.username %]' call_type: 'call' call_status: 'ok' call_code: '200' \ No newline at end of file diff --git a/scenarios/invite_reinvite_transcoding/peer.yml b/scenarios/invite_reinvite_transcoding/peer.yml index 3c12853c..d0c39a58 100644 --- a/scenarios/invite_reinvite_transcoding/peer.yml +++ b/scenarios/invite_reinvite_transcoding/peer.yml @@ -1,33 +1,33 @@ --- -peer_00: +peer_invite_reinvite_transcoding: contact: - company: peer_00 - email: peer_00@host0.not + company: peer_invite_reinvite_transcoding + email: peer_invite_reinvite_transcoding@host0.not contract: billing_profile_id: 1 status: active type: sippeering groups: - - name: peer_00_group + - name: peer_invite_reinvite_transcoding_group priority: 1 description: rules: - - group_id: peer_00_group + - group_id: peer_invite_reinvite_transcoding_group callee_prefix: "" callee_pattern: '' - caller_pattern: '^sip:.+@spce.test' + caller_pattern: '^sip:.+@invite-reinvite-transcoding.scenarios.test' description: "" inboundrules: - - group_id: peer_00_group + - group_id: peer_invite_reinvite_transcoding_group field: "ruri_uri" pattern: '.*' priority: 50 enabled: 1 hosts: - - group_id: peer_00_group - name: peer_00_host0 + - group_id: peer_invite_reinvite_transcoding_group + name: peer_invite_reinvite_transcoding_host0 ip: 127.0.2.1 port: 51602 host: transport: 1 - weight: 1 \ No newline at end of file + weight: 1 diff --git a/scenarios/invite_reinvite_transcoding/prefs.json b/scenarios/invite_reinvite_transcoding/prefs.json deleted file mode 100644 index a32e642a..00000000 --- a/scenarios/invite_reinvite_transcoding/prefs.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "@spce.test": { - "transcode_PCMA": true - } -} diff --git a/scenarios/invite_reinvite_transcoding/prefs.json.tt2 b/scenarios/invite_reinvite_transcoding/prefs.json.tt2 new file mode 100644 index 00000000..9494636f --- /dev/null +++ b/scenarios/invite_reinvite_transcoding/prefs.json.tt2 @@ -0,0 +1,5 @@ +{ + "@invite-reinvite-transcoding.scenarios.test": { + "transcode_PCMA": true + } +} diff --git a/scenarios/invite_reinvite_transcoding/scenario.yml b/scenarios/invite_reinvite_transcoding/scenario.yml index ab0073a0..db4fb628 100644 --- a/scenarios/invite_reinvite_transcoding/scenario.yml +++ b/scenarios/invite_reinvite_transcoding/scenario.yml @@ -1,11 +1,12 @@ +--- test_uuid: invite_reinvite_transcoding domains: - 'spce.test': + invite-reinvite-transcoding.scenarios.test: reseller_id: 1 customers: 'customer.test': contacts: - - email: "customer.test@spce.test" + - email: "customer.test@invite-reinvite-transcoding.scenarios.test" reseller_id: 1 details: status: 'active' @@ -13,7 +14,7 @@ customers: billing_profile_id: 1 reseller_id: 1 subscribers: - spce.test: + invite-reinvite-transcoding.scenarios.test: testuser1001: customer: 'customer.test' password: testuser @@ -23,9 +24,10 @@ subscribers: scenarios: - ip: 127.0.2.1 username: 004321001 - domain: 127.0.2.1 + domain: invite-reinvite-transcoding.host0.scenarios.test + peer_host: peer_invite_reinvite_transcoding_host0 responders: - ip: 127.1.0.1 username: testuser1001 - domain: spce.test - register: yes + domain: invite-reinvite-transcoding.scenarios.test + register: 'yes'