TT#116100 scenarios/invite_allowedcli_match_alias

* domain per scenario * dynamic IP/port and numbers * dynamic values in prefs.json Change-Id: Ia5ec4082542a3a3a0e79fe97989c321f47ce3eaf
5 years ago · 023e0799b3
parent 6abbc4670e
commit 023e0799b3
13 changed files with 124 additions and 115 deletions
--- a/scenarios/invite_allowedcli_match_alias/0003_test.yml.tt2
+++ b/scenarios/invite_allowedcli_match_alias/0003_test.yml.tt2
@ -23,8 +23,8 @@ flow:
  - exit|ROUTE_EXIT:
 sip_in:
  - '^INVITE'
-  - 'Contact: sip:testuser1002@'
-  - 'To: <sip:testuser1003@'
+  - 'Contact: sip:[% scenarios.0.username %]@'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@'
  - 'CSeq: 1 INVITE'
  - 'Max-Forwards: 69'
  - 'Content-Type: application/sdp'
@ -32,12 +32,12 @@ sip_out:
  - [
      '^SIP/2.0 100 Trying',
      'CSeq: 1 INVITE',
-      'From: "4311009" <sip:testuser1002@',
-      'To: <sip:testuser1003@'
+      'From: "[% invite_allowedcli_match_alias_scenarios_test.testuser1002.alias_numbers.0.phone_number %]" <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
    ]
  - [
      '^SIP/2.0 407 Proxy Authentication Required',
      'CSeq: 1 INVITE',
-      'From: "4311009" <sip:testuser1002@',
-      'To: <sip:testuser1003@'
+      'From: "[% invite_allowedcli_match_alias_scenarios_test.testuser1002.alias_numbers.0.phone_number %]" <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
    ]
--- a/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2
+++ b/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2
@ -18,12 +18,12 @@ flow:
  - start|ROUTE_FIND_CALLER:
  - start|ROUTE_AUTH:
  - start|ROUTE_AUTH_HELPER:
-      $x_hdr(From): spce.test
-      $var(realm_user): testuser1002
-      $var(realm_domain): spce.test
+      $x_hdr(From): invite-allowedcli-match-alias.scenarios.test
+      $var(realm_user): [% scenarios.0.username %]
+      $var(realm_domain): invite-allowedcli-match-alias.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-allowedcli-match-alias.scenarios.test']
  - start|ROUTE_ADD_CALLINFO_REPLY:
  - start|ROUTE_ADD_CALLINFO_CALLER_PRIMARY:
  - return|ROUTE_ADD_CALLINFO_CALLER_PRIMARY:
@ -38,10 +38,10 @@ flow:
  - start|ROUTE_LOAD_CALLER_CONTRACT_PREF:
  - return|ROUTE_LOAD_CALLER_CONTRACT_PREF:
  - return|ROUTE_LOAD_CALLER_PREF:
-      $xavp(caller_usr_prefs[0]=>allowed_clis[*]): ['43110021*', '43110029*']
-      $xavp(caller_real_prefs[0]=>allowed_clis[*]): ['43110021*', '43110029*']
-      $xavp(caller_usr_prefs[0]=>user_cli[*]): ['43122122']
-      $xavp(caller_real_prefs[0]=>user_cli[*]): ['43122122']
+      $xavp(caller_usr_prefs[0]=>allowed_clis[*]): ['[% invite_allowedcli_match_alias_scenarios_test.testuser1002.phone_number %]1*', '[% invite_allowedcli_match_alias_scenarios_test.testuser1002.phone_number %]9*']
+      $xavp(caller_real_prefs[0]=>allowed_clis[*]): ['[% invite_allowedcli_match_alias_scenarios_test.testuser1002.phone_number %]1*', '[% invite_allowedcli_match_alias_scenarios_test.testuser1002.phone_number %]9*']
+      $xavp(caller_usr_prefs[0]=>user_cli[*]): ['[% extra_info.phone_numbers.0 %]']
+      $xavp(caller_real_prefs[0]=>user_cli[*]): ['[% extra_info.phone_numbers.0 %]']
      $xavp(caller_usr_prefs[0]=>inbound_upn[*]): ['from_display']
      $xavp(caller_real_prefs[0]=>inbound_upn[*]): ['from_display']
      $xavp(caller_usr_prefs[0]=>extension_in_npn[*]): [1]
@ -72,10 +72,10 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
      $avp(lua_dlg_profile): [
        "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]",
        "total",
        "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]"
+        "user:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]"
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
@ -109,29 +109,29 @@ flow:
      $avp(lua_dlg_profile): [
        "local",
        "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]",
        "total",
        "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]"
+        "user:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]"
      ]
  - start|ROUTE_CNT_DLG_CHECK:
  - return|ROUTE_CNT_DLG_CHECK:
  - return|ROUTE_SET_CALLER_DIALOG:
      $avp(lua_dlg_profile): [
        'accountout:[% customer_test.id %]',
-        'userout:[% spce_test.testuser1002.uuid %]',
+        'userout:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]',
        'account:[% customer_test.id %]',
-        'user:[% spce_test.testuser1002.uuid %]',
+        'user:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]',
        'totalaccountout:[% customer_test.id %]',
-        'totaluserout:[% spce_test.testuser1002.uuid %]',
+        'totaluserout:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]',
        'totalaccount:[% customer_test.id %]',
-        'totaluser:[% spce_test.testuser1002.uuid %]',
+        'totaluser:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]',
        "local",
        "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]",
        "total",
        "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]"
+        "user:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]"
      ]
  - start|ROUTE_ACC_CALLER:
  - start|ROUTE_SET_ACC_CALLER_CALL_COUNTERS:
@ -199,50 +199,50 @@ flow:
  - exit|ROUTE_EXIT:
      $avp(lua_dlg_profile): [
        'accountout:[% customer_test.id %]',
-        'userout:[% spce_test.testuser1002.uuid %]',
+        'userout:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]',
        'account:[% customer_test.id %]',
-        'user:[% spce_test.testuser1002.uuid %]',
+        'user:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]',
        'totalaccountout:[% customer_test.id %]',
-        'totaluserout:[% spce_test.testuser1002.uuid %]',
+        'totaluserout:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]',
        'totalaccount:[% customer_test.id %]',
-        'totaluser:[% spce_test.testuser1002.uuid %]',
+        'totaluser:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]',
        "local",
        "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]",
        "total",
        "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]"
+        "user:[% invite_allowedcli_match_alias_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: "4311009" <sip:testuser1002@',
-      'To: <sip:testuser1003@'
+      'From: "[% invite_allowedcli_match_alias_scenarios_test.testuser1002.alias_numbers.0.phone_number %]" <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
    ]
  - [
      '^SIP/2.0 101 Connecting',
      'CSeq: 2 INVITE',
-      'From: "4311009" <sip:testuser1002@',
-      'To: <sip:testuser1003@'
+      'From: "[% invite_allowedcli_match_alias_scenarios_test.testuser1002.alias_numbers.0.phone_number %]" <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
    ]
  - [
-      '^INVITE sip:testuser1003@',
+      '^INVITE sip:[% scenarios.0.responders.0.username %]@',
      'CSeq: 2 INVITE',
-      'From: <sip:4311009@',
-      'To: <sip:testuser1003@',
+      'From: <sip:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.alias_numbers.0.phone_number %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@',
      'Content-Type: application/sdp',
-      'P-Caller-UUID: \w+',
-      'P-Callee-UUID: \w+',
-      'P-Asserted-Identity: <sip:4311009@',
-      'P-Called-Party-ID: <sip:testuser1003@',
+      'P-Caller-UUID: [% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]',
+      'P-Callee-UUID: [% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]',
+      'P-Asserted-Identity: <sip:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.alias_numbers.0.phone_number %]@',
+      'P-Called-Party-ID: <sip:[% scenarios.0.responders.0.username %]@',
      'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no',
      'P-App-Name: sbc'
    ]
--- a/scenarios/invite_allowedcli_match_alias/0007_test.yml.tt2
+++ b/scenarios/invite_allowedcli_match_alias/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: <sip:4311009@spce.test>;tag=[\w-]+'
-  - 'To: <sip:testuser1003@spce.test>'
+  - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
+  - 'From: <sip:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.alias_numbers.0.phone_number %]@invite-allowedcli-match-alias.scenarios.test>;tag=[\w-]+'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-allowedcli-match-alias.scenarios.test>'
  - 'CSeq: \d+ INVITE'
  - 'P-LB-Uptime: \d+'
-  - 'P-Asserted-Identity: <sip:4311009@spce.test>'
-  - 'P-Caller-UUID: [% spce_test.testuser1002.uuid %]'
-  - 'P-NGCP-Caller-Info: <sip:testuser1002@spce.test>;ip=127.126.0.1;port=\d+;primary=4311002;alias=4311009'
-  - 'P-NGCP-Callee-Info: <sip:testuser1003@spce.test>;ip=127.0.0.1;port=5060;primary=4311003'
+  - 'P-Asserted-Identity: <sip:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.alias_numbers.0.phone_number %]@invite-allowedcli-match-alias.scenarios.test>'
+  - 'P-Caller-UUID: [% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]'
+  - 'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@invite-allowedcli-match-alias.scenarios.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_allowedcli_match_alias_scenarios_test.testuser1002.phone_number %];alias=[% invite_allowedcli_match_alias_scenarios_test.testuser1002.alias_numbers.0.phone_number %]'
+  - 'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-allowedcli-match-alias.scenarios.test>;ip=127.0.0.1;port=5060;primary=[% invite_allowedcli_match_alias_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: <sip:127.0.0.1:508[08];transport=udp>'
@ -29,22 +29,22 @@ sip_in:
 sip_out:
  - [
      'SIP/2.0 100 Trying',
-      'From: <sip:4311009@spce.test>;tag=[\w-]+',
-      'To: <sip:testuser1003@spce.test>',
+      'From: <sip:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.alias_numbers.0.phone_number %]@invite-allowedcli-match-alias.scenarios.test>;tag=[\w-]+',
+      'To: <sip:[% scenarios.0.responders.0.username %]@invite-allowedcli-match-alias.scenarios.test>',
      'CSeq: \d+ INVITE',
      'Server: Sipwise NGCP Proxy',
      'Content-Length: 0',
    ]
  - [
-      'INVITE sip:testuser1003@127.1.0.1:\d+ SIP/2.0',
-      'From: <sip:4311009@spce.test>;tag=[\w-]+',
-      'To: <sip:testuser1003@spce.test>',
+      'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0',
+      'From: <sip:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.alias_numbers.0.phone_number %]@invite-allowedcli-match-alias.scenarios.test>;tag=[\w-]+',
+      'To: <sip:[% scenarios.0.responders.0.username %]@invite-allowedcli-match-alias.scenarios.test>',
      'CSeq: \d+ INVITE',
      'P-LB-Uptime: \d+',
-      'P-Asserted-Identity: <sip:4311009@spce.test>',
-      'P-Caller-UUID: [% spce_test.testuser1002.uuid %]',
-      'P-NGCP-Caller-Info: <sip:testuser1002@spce.test>;ip=127.126.0.1;port=\d+;primary=4311002;alias=4311009',
-      'P-NGCP-Callee-Info: <sip:testuser1003@spce.test>;ip=127.0.0.1;port=5060;primary=4311003',
+      'P-Asserted-Identity: <sip:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.alias_numbers.0.phone_number %]@invite-allowedcli-match-alias.scenarios.test>',
+      'P-Caller-UUID: [% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]',
+      'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@invite-allowedcli-match-alias.scenarios.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_allowedcli_match_alias_scenarios_test.testuser1002.phone_number %];alias=[% invite_allowedcli_match_alias_scenarios_test.testuser1002.alias_numbers.0.phone_number %]',
+      'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-allowedcli-match-alias.scenarios.test>;ip=127.0.0.1;port=5060;primary=[% invite_allowedcli_match_alias_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: <sip:127.0.0.1:508[08];transport=udp>',
--- a/scenarios/invite_allowedcli_match_alias/0010_test.yml.tt2
+++ b/scenarios/invite_allowedcli_match_alias/0010_test.yml.tt2
@ -15,12 +15,12 @@ flow:
 sip_in:
  - '^SIP/2.0 180 Ringing'
  - 'CSeq: 2 INVITE'
-  - 'From: <sip:4311009@'
-  - 'To: <sip:testuser1003@'
+  - 'From: <sip:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.alias_numbers.0.phone_number %]@'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@'
 sip_out:
  - [
      '^SIP/2.0 180 Ringing',
      'CSeq: 2 INVITE',
-      'From: "4311009" <sip:testuser1002@',
-      'To: <sip:testuser1003@'
+      'From: "[% invite_allowedcli_match_alias_scenarios_test.testuser1002.alias_numbers.0.phone_number %]" <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
    ]
--- a/scenarios/invite_allowedcli_match_alias/0012_test.yml.tt2
+++ b/scenarios/invite_allowedcli_match_alias/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_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]',
        'account:[% customer_test.id %]',
-        'user:[% spce_test.testuser1002.uuid %]',
+        'user:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]',
        'totalaccountout:[% customer_test.id %]',
-        'totaluserout:[% spce_test.testuser1002.uuid %]',
+        'totaluserout:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]',
        'totalaccount:[% customer_test.id %]',
-        'totaluser:[% spce_test.testuser1002.uuid %]',
+        'totaluser:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]',
        "local",
        "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]",
        "total",
        "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]"
+        "user:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]"
      ]
  - return|dialog:start:
 sip_in:
@ -39,6 +39,6 @@ sip_out:
  - [
      '^SIP/2.0 200 OK',
      'CSeq: 2 INVITE',
-      'From: "4311009" <sip:testuser1002@',
-      'To: <sip:testuser1003@'
+      'From: "[% invite_allowedcli_match_alias_scenarios_test.testuser1002.alias_numbers.0.phone_number %]" <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
    ]
--- a/scenarios/invite_allowedcli_match_alias/0013_test.yml.tt2
+++ b/scenarios/invite_allowedcli_match_alias/0013_test.yml.tt2
@ -26,12 +26,12 @@ flow:
 sip_in:
  - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0'
  - 'CSeq: 2 ACK'
-  - 'From: "4311009" <sip:testuser1002@'
-  - 'To: <sip:testuser1003@'
+  - 'From: "[% invite_allowedcli_match_alias_scenarios_test.testuser1002.alias_numbers.0.phone_number %]" <sip:[% scenarios.0.username %]@'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@'
 sip_out:
  - [
      '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0',
      'CSeq: 2 ACK',
-      'From: "4311009" <sip:4311009@',
-      'To: <sip:testuser1003@'
+      'From: "[% invite_allowedcli_match_alias_scenarios_test.testuser1002.alias_numbers.0.phone_number %]" <sip:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.alias_numbers.0.phone_number %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
    ]
--- a/scenarios/invite_allowedcli_match_alias/0015_test.yml.tt2
+++ b/scenarios/invite_allowedcli_match_alias/0015_test.yml.tt2
@ -29,27 +29,27 @@ flow:
  - exit|ROUTE_EXIT:
 sip_in:
  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
-  - 'Contact: sip:testuser1002@'
+  - 'Contact: sip:[% scenarios.0.username %]@'
  - 'CSeq: 3 BYE'
  - 'Max-Forwards: 69'
  - 'Content-Length: 0'
-  - 'From: "4311009" <sip:testuser1002@'
-  - 'To: <sip:testuser1003@'
+  - 'From: "[% invite_allowedcli_match_alias_scenarios_test.testuser1002.alias_numbers.0.phone_number %]" <sip:[% scenarios.0.username %]@'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@'

 sip_out:
  - [
      '^SIP/2.0 100 Trying',
      'CSeq: 3 BYE',
      'Content-Length: 0',
-      'From: "4311009" <sip:testuser1002@',
-      'To: <sip:testuser1003@'
+      'From: "[% invite_allowedcli_match_alias_scenarios_test.testuser1002.alias_numbers.0.phone_number %]" <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
    ]
  - [
      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
-      'Contact: sip:testuser1002@',
+      'Contact: sip:[% scenarios.0.username %]@',
      'CSeq: 3 BYE',
      'Max-Forwards: 68',
      'Content-Length: 0',
-      'From: "4311009" <sip:4311009@',
-      'To: <sip:testuser1003@'
+      'From: "[% invite_allowedcli_match_alias_scenarios_test.testuser1002.alias_numbers.0.phone_number %]" <sip:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.alias_numbers.0.phone_number %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
    ]
--- a/scenarios/invite_allowedcli_match_alias/0018_test.yml.tt2
+++ b/scenarios/invite_allowedcli_match_alias/0018_test.yml.tt2
@ -16,13 +16,13 @@ sip_in:
  - '^SIP/2.0 200 OK'
  - 'CSeq: 3 BYE'
  - 'Content-Length: 0'
-  - 'From: "4311009" <sip:4311009@'
-  - 'To: <sip:testuser1003@'
+  - 'From: "[% invite_allowedcli_match_alias_scenarios_test.testuser1002.alias_numbers.0.phone_number %]" <sip:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.alias_numbers.0.phone_number %]@'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@'
 sip_out:
  - [
      '^SIP/2.0 200 OK',
      'CSeq: 3 BYE',
      'Content-Length: 0',
-      'From: "4311009" <sip:testuser1002@',
-      'To: <sip:testuser1003@'
+      'From: "[% invite_allowedcli_match_alias_scenarios_test.testuser1002.alias_numbers.0.phone_number %]" <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
    ]
--- a/scenarios/invite_allowedcli_match_alias/cdr_test.yml.tt2
+++ b/scenarios/invite_allowedcli_match_alias/cdr_test.yml.tt2
@ -1,10 +1,10 @@
 cdr:
-  - source_user: 'testuser1002'
-    source_domain: 'spce.test'
-    source_cli: '4311009'
-    destination_user: 'testuser1003'
-    destination_domain: 'spce.test'
-    destination_user_dialed: 'testuser1003'
+  - source_user: '[% scenarios.0.username %]'
+    source_domain: 'invite-allowedcli-match-alias.scenarios.test'
+    source_cli: '[% invite_allowedcli_match_alias_scenarios_test.testuser1002.alias_numbers.0.phone_number %]'
+    destination_user: '[% scenarios.0.responders.0.username %]'
+    destination_domain: 'invite-allowedcli-match-alias.scenarios.test'
+    destination_user_dialed: '[% scenarios.0.responders.0.username %]'
    call_type: 'call'
    call_status: 'ok'
    call_code: '200'
--- a/scenarios/invite_allowedcli_match_alias/prefs.json
+++ b/scenarios/invite_allowedcli_match_alias/prefs.json
@ -1,11 +0,0 @@
-{
-    "testuser1002@spce.test": {
-        "allowed_clis": [
-            "43110029*",
-            "43110021*"
-        ],
-        "user_cli": 43122122,
-        "inbound_upn": "from_display",
-        "extension_in_npn": true
-    }
-}
--- a/scenarios/invite_allowedcli_match_alias/prefs.json.tt2
+++ b/scenarios/invite_allowedcli_match_alias/prefs.json.tt2
@ -0,0 +1,11 @@
+{
+    "testuser1002@invite-allowedcli-match-alias.scenarios.test": {
+        "allowed_clis": [
+            "[% invite_allowedcli_match_alias_scenarios_test.testuser1002.phone_number %]9*",
+            "[% invite_allowedcli_match_alias_scenarios_test.testuser1002.phone_number %]1*"
+        ],
+        "user_cli": [% extra_info.phone_numbers.0 %],
+        "inbound_upn": "from_display",
+        "extension_in_npn": true
+    }
+}
--- a/scenarios/invite_allowedcli_match_alias/scenario.yml
+++ b/scenarios/invite_allowedcli_match_alias/scenario.yml
@ -1,6 +1,7 @@
+---
 test_uuid: invite_allowedcli_match_alias
 domains:
-  'spce.test':
+  invite-allowedcli-match-alias.scenarios.test:
    reseller_id: 1
 customers:
  'customer.test':
@ -13,7 +14,7 @@ customers:
      billing_profile_id: 1
      reseller_id: 1
 subscribers:
-  spce.test:
+  invite-allowedcli-match-alias.scenarios.test:
    testuser1003:
      customer: 'customer.test'
      password: testuser
@ -33,9 +34,17 @@ subscribers:
 scenarios:
  - ip: 127.126.0.1
    username: testuser1002
-    domain: spce.test
+    domain: invite-allowedcli-match-alias.scenarios.test
    responders:
      - ip: 127.1.0.1
        username: testuser1003
-        domain: spce.test
-        register: yes
+        domain: invite-allowedcli-match-alias.scenarios.test
+        register: 'yes'
+      - ip: 127.1.0.2
+        username: testuser1003
+        domain: invite-allowedcli-match-alias.scenarios.test
+        register: 'no'
+        active: 'no'
+extra_info:
+  phone_numbers:
+    - 43122122
--- a/scenarios/invite_allowedcli_match_alias/sipp_scenario00.xml
+++ b/scenarios/invite_allowedcli_match_alias/sipp_scenario00.xml
@ -6,7 +6,7 @@

      INVITE sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: "4311009" <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
+      From: "[field5 file="caller.csv"]" <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
      CSeq: 1 INVITE
@ -37,7 +37,7 @@

      ACK sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]:[remote_port] SIP/2.0
      [last_Via:]
-      From: "4311009" <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
+      From: "[field5 file="caller.csv"]" <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
      CSeq: 1 ACK
@ -55,7 +55,7 @@

      INVITE sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: "4311009" <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
+      From: "[field5 file="caller.csv"]" <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
      CSeq: 2 INVITE
@ -94,7 +94,7 @@

      ACK [next_url] SIP/2.0
      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: "4311009" <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
+      From: "[field5 file="caller.csv"]" <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
      [routes]
@ -120,7 +120,7 @@

      BYE [next_url] SIP/2.0
      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: "4311009" <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
+      From: "[field5 file="caller.csv"]" <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
      CSeq: 3 BYE