diff --git a/scenarios/invite_anonymous/0003_test.yml.tt2 b/scenarios/invite_anonymous/0003_test.yml.tt2 index e9e56435..45cc3814 100644 --- a/scenarios/invite_anonymous/0003_test.yml.tt2 +++ b/scenarios/invite_anonymous/0003_test.yml.tt2 @@ -23,10 +23,10 @@ flow: $x_hdr(From): sip:anonymous@ $x_hdr(From): anonymous.invalid $var(realm_user): testuser1002 - $var(realm_domain): spce.test + $var(realm_domain): invite-anonymous.scenarios.test sip_in: - '^INVITE' - - 'P-Asserted-Identity: "long name here" ' + - 'P-Asserted-Identity: "long name here" ' - 'From: "Anonymous" ;tag=' - 'Contact: sip:testuser1002@' - 'To: ;tag=', 'To: ;tag=[\w-]+' - - 'To: ' + - 'To: ' - 'CSeq: \d+ INVITE' - 'P-LB-Uptime: \d+' - 'Privacy: id' - - '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-Caller-UUID: [% invite_anonymous_scenarios_test.testuser1002.uuid %]' + - 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_anonymous_scenarios_test.testuser1002.phone_number %]' + - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% invite_anonymous_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: ' @@ -30,21 +30,21 @@ sip_out: - [ 'SIP/2.0 100 Trying', 'From: "Anonymous" ;tag=[\w-]+', - 'To: ', + 'To: ', 'CSeq: \d+ INVITE', 'Server: Sipwise NGCP Proxy', 'Content-Length: 0', ] - [ - 'INVITE sip:testuser1003@127.1.0.1:\d+ SIP/2.0', + 'INVITE sip:testuser1003@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0', 'From: "Anonymous" ;tag=[\w-]+', - 'To: ', + 'To: ', 'CSeq: \d+ INVITE', 'P-LB-Uptime: \d+', 'Privacy: id', - '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-Caller-UUID: [% invite_anonymous_scenarios_test.testuser1002.uuid %]', + 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_anonymous_scenarios_test.testuser1002.phone_number %]', + 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% invite_anonymous_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_anonymous/0010_test.yml.tt2 b/scenarios/invite_anonymous/0010_test.yml.tt2 index f4cf5a46..006e3640 100644 --- a/scenarios/invite_anonymous/0010_test.yml.tt2 +++ b/scenarios/invite_anonymous/0010_test.yml.tt2 @@ -7,19 +7,19 @@ flow: - return|ROUTE_APPLY_HEADER_RULES: $avp(lua_dlg_profile): [ 'accountout:[% customer_test.id %]', - 'userout:[% spce_test.testuser1002.uuid %]', + 'userout:[% invite_anonymous_scenarios_test.testuser1002.uuid %]', 'account:[% customer_test.id %]', - 'user:[% spce_test.testuser1002.uuid %]', + 'user:[% invite_anonymous_scenarios_test.testuser1002.uuid %]', 'totalaccountout:[% customer_test.id %]', - 'totaluserout:[% spce_test.testuser1002.uuid %]', + 'totaluserout:[% invite_anonymous_scenarios_test.testuser1002.uuid %]', 'totalaccount:[% customer_test.id %]', - 'totaluser:[% spce_test.testuser1002.uuid %]', + 'totaluser:[% invite_anonymous_scenarios_test.testuser1002.uuid %]', "local", "totalaccount:[% customer_test.id %]", - "totaluser:[% spce_test.testuser1003.uuid %]", + "totaluser:[% invite_anonymous_scenarios_test.testuser1003.uuid %]", "total", "account:[% customer_test.id %]", - "user:[% spce_test.testuser1003.uuid %]" + "user:[% invite_anonymous_scenarios_test.testuser1003.uuid %]" ] - start|ROUTE_PREPARE_UA: - return|ROUTE_PREPARE_UA: diff --git a/scenarios/invite_anonymous/0012_test.yml.tt2 b/scenarios/invite_anonymous/0012_test.yml.tt2 index 18449bcf..bc77765d 100644 --- a/scenarios/invite_anonymous/0012_test.yml.tt2 +++ b/scenarios/invite_anonymous/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_anonymous_scenarios_test.testuser1002.uuid %]', 'account:[% customer_test.id %]', - 'user:[% spce_test.testuser1002.uuid %]', + 'user:[% invite_anonymous_scenarios_test.testuser1002.uuid %]', 'totalaccountout:[% customer_test.id %]', - 'totaluserout:[% spce_test.testuser1002.uuid %]', + 'totaluserout:[% invite_anonymous_scenarios_test.testuser1002.uuid %]', 'totalaccount:[% customer_test.id %]', - 'totaluser:[% spce_test.testuser1002.uuid %]', + 'totaluser:[% invite_anonymous_scenarios_test.testuser1002.uuid %]', "local", "totalaccount:[% customer_test.id %]", - "totaluser:[% spce_test.testuser1003.uuid %]", + "totaluser:[% invite_anonymous_scenarios_test.testuser1003.uuid %]", "total", "account:[% customer_test.id %]", - "user:[% spce_test.testuser1003.uuid %]" + "user:[% invite_anonymous_scenarios_test.testuser1003.uuid %]" ] - return|dialog:start: sip_in: diff --git a/scenarios/invite_anonymous/cdr_test.yml.tt2 b/scenarios/invite_anonymous/cdr_test.yml.tt2 index af6f12da..a8fd850b 100644 --- a/scenarios/invite_anonymous/cdr_test.yml.tt2 +++ b/scenarios/invite_anonymous/cdr_test.yml.tt2 @@ -1,10 +1,10 @@ cdr: - source_user: 'anonymous' - source_domain: 'spce.test' - source_cli: '4311002' + source_domain: 'invite-anonymous.scenarios.test' + source_cli: '[% invite_anonymous_scenarios_test.testuser1002.phone_number %]' source_clir: '1' destination_user: 'testuser1003' - destination_domain: 'spce.test' + destination_domain: 'invite-anonymous.scenarios.test' destination_user_dialed: 'testuser1003' call_type: 'call' call_status: 'ok' diff --git a/scenarios/invite_anonymous/prefs.json b/scenarios/invite_anonymous/prefs.json deleted file mode 100644 index 56d962a4..00000000 --- a/scenarios/invite_anonymous/prefs.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "testuser1002@spce.test": { - "cli": 4311002 - } -} \ No newline at end of file diff --git a/scenarios/invite_anonymous/prefs.json.tt2 b/scenarios/invite_anonymous/prefs.json.tt2 new file mode 100644 index 00000000..d1a9f15d --- /dev/null +++ b/scenarios/invite_anonymous/prefs.json.tt2 @@ -0,0 +1,5 @@ +{ + "testuser1002@invite-anonymous.scenarios.test": { + "cli": 4311002 + } +} \ No newline at end of file diff --git a/scenarios/invite_anonymous/scenario.yml b/scenarios/invite_anonymous/scenario.yml index 8d4ed0c0..f186aa66 100644 --- a/scenarios/invite_anonymous/scenario.yml +++ b/scenarios/invite_anonymous/scenario.yml @@ -1,6 +1,7 @@ +--- test_uuid: invite_anonymous domains: - 'spce.test': + invite-anonymous.scenarios.test: reseller_id: 1 customers: 'customer.test': @@ -13,7 +14,7 @@ customers: billing_profile_id: 1 reseller_id: 1 subscribers: - spce.test: + invite-anonymous.scenarios.test: testuser1003: customer: 'customer.test' password: testuser @@ -33,9 +34,9 @@ subscribers: scenarios: - ip: 127.126.0.1 username: testuser1002 - domain: spce.test + domain: invite-anonymous.scenarios.test responders: - ip: 127.1.0.1 username: testuser1003 - domain: spce.test - register: yes + domain: invite-anonymous.scenarios.test + register: 'yes'