diff --git a/scenarios/invite_retrans/0003_test.yml.tt2 b/scenarios/invite_retrans/0003_test.yml.tt2 index 2ed92a4e..3f696341 100644 --- a/scenarios/invite_retrans/0003_test.yml.tt2 +++ b/scenarios/invite_retrans/0003_test.yml.tt2 @@ -22,8 +22,8 @@ flow: - exit|ROUTE_EXIT: sip_in: - '^INVITE' - - 'Contact: sip:testuser1002@' - - 'To: ;tag=\w+ + $var(realm_user): [% scenarios.0.username %] + $var(realm_domain): invite-retrans.scenarios.test - return|ROUTE_AUTH_HELPER: - $avp(orig_acc_caller_user): ['testuser1002'] - $avp(orig_acc_caller_domain): ['spce.test'] + $avp(orig_acc_caller_user): ['[% scenarios.0.username %]'] + $avp(orig_acc_caller_domain): ['invite-retrans.scenarios.test'] - start|ROUTE_ADD_CALLINFO_REPLY: - start|ROUTE_ADD_CALLINFO_CALLER_PRIMARY: - return|ROUTE_ADD_CALLINFO_CALLER_PRIMARY: @@ -65,10 +65,10 @@ flow: - return|ROUTE_SET_CALLEE_DIALOG: $avp(lua_dlg_profile): [ "totalaccount:[% customer_test.id %]", - "totaluser:[% spce_test.testuser1003.uuid %]", + "totaluser:[% invite_retrans_scenarios_test.testuser1003.uuid %]", "total", "account:[% customer_test.id %]", - "user:[% spce_test.testuser1003.uuid %]" + "user:[% invite_retrans_scenarios_test.testuser1003.uuid %]" ] - start|ROUTE_BLOCK_IN: - return|ROUTE_BLOCK_IN: @@ -121,19 +121,19 @@ flow: - return|ROUTE_SET_CALLEE_DIALOG: $avp(lua_dlg_profile): [ "accountout:[% customer_test.id %]", - "userout:[% spce_test.testuser1002.uuid %]", + "userout:[% invite_retrans_scenarios_test.testuser1002.uuid %]", "account:[% customer_test.id %]", - "user:[% spce_test.testuser1002.uuid %]", + "user:[% invite_retrans_scenarios_test.testuser1002.uuid %]", "totalaccountout:[% customer_test.id %]", - "totaluserout:[% spce_test.testuser1002.uuid %]", + "totaluserout:[% invite_retrans_scenarios_test.testuser1002.uuid %]", "totalaccount:[% customer_test.id %]", - "totaluser:[% spce_test.testuser1002.uuid %]", + "totaluser:[% invite_retrans_scenarios_test.testuser1002.uuid %]", "local", "totalaccount:[% customer_test.id %]", - "totaluser:[% spce_test.testuser1003.uuid %]", + "totaluser:[% invite_retrans_scenarios_test.testuser1003.uuid %]", "total", "account:[% customer_test.id %]", - "user:[% spce_test.testuser1003.uuid %]" + "user:[% invite_retrans_scenarios_test.testuser1003.uuid %]" ] - start|ROUTE_SET_BRANCH_HDRS: - start|ROUTE_PREPARE_UA: @@ -183,50 +183,50 @@ flow: - exit|ROUTE_EXIT: $avp(lua_dlg_profile): [ "accountout:[% customer_test.id %]", - "userout:[% spce_test.testuser1002.uuid %]", + "userout:[% invite_retrans_scenarios_test.testuser1002.uuid %]", "account:[% customer_test.id %]", - "user:[% spce_test.testuser1002.uuid %]", + "user:[% invite_retrans_scenarios_test.testuser1002.uuid %]", "totalaccountout:[% customer_test.id %]", - "totaluserout:[% spce_test.testuser1002.uuid %]", + "totaluserout:[% invite_retrans_scenarios_test.testuser1002.uuid %]", "totalaccount:[% customer_test.id %]", - "totaluser:[% spce_test.testuser1002.uuid %]", + "totaluser:[% invite_retrans_scenarios_test.testuser1002.uuid %]", "local", "totalaccount:[% customer_test.id %]", - "totaluser:[% spce_test.testuser1003.uuid %]", + "totaluser:[% invite_retrans_scenarios_test.testuser1003.uuid %]", "total", "account:[% customer_test.id %]", - "user:[% spce_test.testuser1003.uuid %]" + "user:[% invite_retrans_scenarios_test.testuser1003.uuid %]" ] sip_in: - '^INVITE' - - 'Contact: sip:testuser1002@' + - 'Contact: sip:[% scenarios.0.username %]@' - 'CSeq: 2 INVITE' - 'Max-Forwards: 69' - 'Content-Type: application/sdp' - - 'Proxy-Authorization: Digest username="testuser1002"' + - 'Proxy-Authorization: Digest username="[% scenarios.0.username %]"' sip_out: - [ '^SIP/2.0 100 Trying', 'CSeq: 2 INVITE', - 'From: ;tag=[\w-]+' - - 'To: ' + - 'From: ;tag=[\w-]+' + - 'To: ' - 'CSeq: \d+ INVITE' - 'Content-Length: 0' sip_out: [] diff --git a/scenarios/invite_retrans/0007_test.yml.tt2 b/scenarios/invite_retrans/0007_test.yml.tt2 index a5d7e511..832eca3e 100644 --- a/scenarios/invite_retrans/0007_test.yml.tt2 +++ b/scenarios/invite_retrans/0007_test.yml.tt2 @@ -13,15 +13,15 @@ flow: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: sip_in: - - '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_retrans_scenarios_test.testuser1002.uuid %]' + - 'P-NGCP-Caller-Info: ;ip=127.126.0.1;port=\d+;primary=[% invite_retrans_scenarios_test.testuser1002.phone_number %]' + - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% invite_retrans_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_retrans_scenarios_test.testuser1002.uuid %]', + 'P-NGCP-Caller-Info: ;ip=127.126.0.1;port=\d+;primary=[% invite_retrans_scenarios_test.testuser1002.phone_number %]', + 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% invite_retrans_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_retrans/0012_test.yml.tt2 b/scenarios/invite_retrans/0012_test.yml.tt2 index 3a888e5e..4270b008 100644 --- a/scenarios/invite_retrans/0012_test.yml.tt2 +++ b/scenarios/invite_retrans/0012_test.yml.tt2 @@ -17,19 +17,19 @@ flow: - return|dialog:start: $avp(lua_dlg_profile): [ "accountout:[% customer_test.id %]", - "userout:[% spce_test.testuser1002.uuid %]", + "userout:[% invite_retrans_scenarios_test.testuser1002.uuid %]", "account:[% customer_test.id %]", - "user:[% spce_test.testuser1002.uuid %]", + "user:[% invite_retrans_scenarios_test.testuser1002.uuid %]", "totalaccountout:[% customer_test.id %]", - "totaluserout:[% spce_test.testuser1002.uuid %]", + "totaluserout:[% invite_retrans_scenarios_test.testuser1002.uuid %]", "totalaccount:[% customer_test.id %]", - "totaluser:[% spce_test.testuser1002.uuid %]", + "totaluser:[% invite_retrans_scenarios_test.testuser1002.uuid %]", "local", "totalaccount:[% customer_test.id %]", - "totaluser:[% spce_test.testuser1003.uuid %]", + "totaluser:[% invite_retrans_scenarios_test.testuser1003.uuid %]", "total", "account:[% customer_test.id %]", - "user:[% spce_test.testuser1003.uuid %]" + "user:[% invite_retrans_scenarios_test.testuser1003.uuid %]" ] - return|dialog:start: sip_in: @@ -39,6 +39,6 @@ sip_out: - [ '^SIP/2.0 200 OK', 'CSeq: 2 INVITE', - 'From: