diff --git a/scenarios/invite_record_call/0003_test.yml.tt2 b/scenarios/invite_record_call/0003_test.yml.tt2 index 2ed92a4e..3f696341 100644 --- a/scenarios/invite_record_call/0003_test.yml.tt2 +++ b/scenarios/invite_record_call/0003_test.yml.tt2 @@ -22,8 +22,8 @@ flow: - exit|ROUTE_EXIT: sip_in: - '^INVITE' - - 'Contact: sip:testuser1002@' - - 'To: ;tag=[\w-]+' - - 'To: ;tag=[\w-]+' + - 'From: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' - 'CSeq: \d+ INVITE' - 'Contact: ' - 'Content-Type: application/sdp' @@ -25,8 +25,8 @@ sip_in: sip_out: - [ 'SIP/2.0 183 Progress', - '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_record_call/0007_test.yml.tt2 b/scenarios/invite_record_call/0007_test.yml.tt2 index f84b0bef..ea40f6a8 100644 --- a/scenarios/invite_record_call/0007_test.yml.tt2 +++ b/scenarios/invite_record_call/0007_test.yml.tt2 @@ -95,49 +95,49 @@ flow: - exit|ROUTE_EXIT: $avp(lua_dlg_profile): [ "accountout:[% customer_test.id %]", - "userout:[% spce_test.testuser1002.uuid %]", + "userout:[% invite_record_call_scenarios_test.testuser1002.uuid %]", "account:[% customer_test.id %]", - "user:[% spce_test.testuser1002.uuid %]", + "user:[% invite_record_call_scenarios_test.testuser1002.uuid %]", "totalaccountout:[% customer_test.id %]", - "totaluserout:[% spce_test.testuser1002.uuid %]", + "totaluserout:[% invite_record_call_scenarios_test.testuser1002.uuid %]", "totalaccount:[% customer_test.id %]", - "totaluser:[% spce_test.testuser1002.uuid %]", + "totaluser:[% invite_record_call_scenarios_test.testuser1002.uuid %]", "peer:appsrv", "local", "totalaccount:[% customer_test.id %]", - "totaluser:[% spce_test.testuser1003.uuid %]", + "totaluser:[% invite_record_call_scenarios_test.testuser1003.uuid %]", "total", "account:[% customer_test.id %]", - "user:[% spce_test.testuser1003.uuid %]" + "user:[% invite_record_call_scenarios_test.testuser1003.uuid %]" ] - exit|ROUTE_EXIT: sip_in: - '^SIP/2.0 301 Message Ended' - - '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-Caller-UUID: [% spce_test.testuser1002.uuid %]' - - 'P-NGCP-Caller-Info: ;ip=127.126.0.1;port=\d+;primary=4311002' - - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=4311003' + - 'P-Asserted-Identity: ' + - 'P-Caller-UUID: [% invite_record_call_scenarios_test.testuser1002.uuid %]' + - 'P-NGCP-Caller-Info: ;ip=127.126.0.1;port=\d+;primary=[% invite_record_call_scenarios_test.testuser1002.phone_number %]' + - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% invite_record_call_scenarios_test.testuser1003.phone_number %]' - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060' - 'Content-Type: application/sdp' - 'Contact: ' @@ -29,22 +29,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:testuser1003@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-Caller-UUID: [% spce_test.testuser1002.uuid %]', - 'P-NGCP-Caller-Info: ;ip=127.126.0.1;port=\d+;primary=4311002', - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=4311003', + 'P-Asserted-Identity: ', + 'P-Caller-UUID: [% invite_record_call_scenarios_test.testuser1002.uuid %]', + 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_record_call_scenarios_test.testuser1002.phone_number %]', + 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% invite_record_call_scenarios_test.testuser1003.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_record_call/0014_test.yml.tt2 b/scenarios/invite_record_call/0014_test.yml.tt2 index 6c6e150d..1ac50c03 100644 --- a/scenarios/invite_record_call/0014_test.yml.tt2 +++ b/scenarios/invite_record_call/0014_test.yml.tt2 @@ -17,20 +17,20 @@ flow: - return|dialog:start: $avp(lua_dlg_profile): [ "accountout:[% customer_test.id %]", - "userout:[% spce_test.testuser1002.uuid %]", + "userout:[% invite_record_call_scenarios_test.testuser1002.uuid %]", "account:[% customer_test.id %]", - "user:[% spce_test.testuser1002.uuid %]", + "user:[% invite_record_call_scenarios_test.testuser1002.uuid %]", "totalaccountout:[% customer_test.id %]", - "totaluserout:[% spce_test.testuser1002.uuid %]", + "totaluserout:[% invite_record_call_scenarios_test.testuser1002.uuid %]", "totalaccount:[% customer_test.id %]", - "totaluser:[% spce_test.testuser1002.uuid %]", + "totaluser:[% invite_record_call_scenarios_test.testuser1002.uuid %]", "peer:appsrv", "local", "totalaccount:[% customer_test.id %]", - "totaluser:[% spce_test.testuser1003.uuid %]", + "totaluser:[% invite_record_call_scenarios_test.testuser1003.uuid %]", "total", "account:[% customer_test.id %]", - "user:[% spce_test.testuser1003.uuid %]" + "user:[% invite_record_call_scenarios_test.testuser1003.uuid %]" ] - return|dialog:start: sip_in: @@ -40,6 +40,6 @@ sip_out: - [ '^SIP/2.0 200 OK', 'CSeq: 2 INVITE', - 'From: