diff --git a/scenarios/incoming_foreign_dom/0003_test.yml.tt2 b/scenarios/incoming_foreign_dom/0003_test.yml.tt2 index d2376dbe..100cfd3c 100644 --- a/scenarios/incoming_foreign_dom/0003_test.yml.tt2 +++ b/scenarios/incoming_foreign_dom/0003_test.yml.tt2 @@ -35,12 +35,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/incoming_hih/0003_test.yml.tt2 b/scenarios/incoming_hih/0003_test.yml.tt2 index 386cf32e..5d664535 100644 --- a/scenarios/incoming_hih/0003_test.yml.tt2 +++ b/scenarios/incoming_hih/0003_test.yml.tt2 @@ -33,6 +33,8 @@ flow: - return|ROUTE_GET_FORWARDER_CLI: - start|ROUTE_CLIR: - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/incoming_hih/0005_test.yml.tt2 b/scenarios/incoming_hih/0005_test.yml.tt2 index 9314d624..921ccb77 100644 --- a/scenarios/incoming_hih/0005_test.yml.tt2 +++ b/scenarios/incoming_hih/0005_test.yml.tt2 @@ -26,6 +26,10 @@ flow: - return|ROUTE_LOAD_CALLER_PREF: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: @@ -34,8 +38,6 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: $var(cf_loop): 1 $var(forward): 0 diff --git a/scenarios/incoming_peer/0003_test.yml.tt2 b/scenarios/incoming_peer/0003_test.yml.tt2 index 7140d753..6988c631 100644 --- a/scenarios/incoming_peer/0003_test.yml.tt2 +++ b/scenarios/incoming_peer/0003_test.yml.tt2 @@ -31,6 +31,8 @@ flow: - return|ROUTE_GET_FORWARDER_CLI: - start|ROUTE_CLIR: - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite/0005_test.yml.tt2 b/scenarios/invite/0005_test.yml.tt2 index 4f66b5b8..ffac4506 100644 --- a/scenarios/invite/0005_test.yml.tt2 +++ b/scenarios/invite/0005_test.yml.tt2 @@ -41,12 +41,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_allowedcli_match/0005_test.yml.tt2 b/scenarios/invite_allowedcli_match/0005_test.yml.tt2 index eeb1ca9d..40d7822b 100644 --- a/scenarios/invite_allowedcli_match/0005_test.yml.tt2 +++ b/scenarios/invite_allowedcli_match/0005_test.yml.tt2 @@ -47,13 +47,15 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: $xavp(caller_real_prefs[0]=>allowed_clis[*]): ['43110021*', '43110029*'] - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2 b/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2 index c5dadafe..c936b456 100644 --- a/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2 +++ b/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2 @@ -50,10 +50,12 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: - - start|ROUTE_CHECK_USERPROV_CLI: - - return|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CLIR: - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: + - start|ROUTE_CHECK_USERPROV_CLI: + - return|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2 b/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2 index bf997bc4..386f723a 100644 --- a/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2 +++ b/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2 @@ -48,13 +48,15 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: $xavp(caller_real_prefs[0]=>allowed_clis[*]): ['43110021*', '43110029*'] - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_allowedcli_nonmatch_reject/0003_test.yml.tt2 b/scenarios/invite_allowedcli_nonmatch_reject/0003_test.yml.tt2 index 916366f2..1209dbe5 100644 --- a/scenarios/invite_allowedcli_nonmatch_reject/0003_test.yml.tt2 +++ b/scenarios/invite_allowedcli_nonmatch_reject/0003_test.yml.tt2 @@ -47,6 +47,10 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: $xavp(caller_real_prefs[0]=>allowed_clis[*]): ['43110021*', '43110029*'] diff --git a/scenarios/invite_anonymous/0005_test.yml.tt2 b/scenarios/invite_anonymous/0005_test.yml.tt2 index 20dfb465..3ff1b6ea 100644 --- a/scenarios/invite_anonymous/0005_test.yml.tt2 +++ b/scenarios/invite_anonymous/0005_test.yml.tt2 @@ -42,12 +42,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_blockin_blst/0003_test.yml.tt2 b/scenarios/invite_blockin_blst/0003_test.yml.tt2 index c2528718..121beec9 100644 --- a/scenarios/invite_blockin_blst/0003_test.yml.tt2 +++ b/scenarios/invite_blockin_blst/0003_test.yml.tt2 @@ -41,12 +41,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_blockin_clir/0003_test.yml.tt2 b/scenarios/invite_blockin_clir/0003_test.yml.tt2 index c2528718..121beec9 100644 --- a/scenarios/invite_blockin_clir/0003_test.yml.tt2 +++ b/scenarios/invite_blockin_clir/0003_test.yml.tt2 @@ -41,12 +41,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_blockin_wlst/0003_test.yml.tt2 b/scenarios/invite_blockin_wlst/0003_test.yml.tt2 index c2528718..121beec9 100644 --- a/scenarios/invite_blockin_wlst/0003_test.yml.tt2 +++ b/scenarios/invite_blockin_wlst/0003_test.yml.tt2 @@ -41,12 +41,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_blockout_blst/0003_test.yml.tt2 b/scenarios/invite_blockout_blst/0003_test.yml.tt2 index 2d926bc0..dea698b0 100644 --- a/scenarios/invite_blockout_blst/0003_test.yml.tt2 +++ b/scenarios/invite_blockout_blst/0003_test.yml.tt2 @@ -41,12 +41,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_blockout_ncos/0003_test.yml.tt2 b/scenarios/invite_blockout_ncos/0003_test.yml.tt2 index 23c435d9..2c8d9060 100644 --- a/scenarios/invite_blockout_ncos/0003_test.yml.tt2 +++ b/scenarios/invite_blockout_ncos/0003_test.yml.tt2 @@ -41,12 +41,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_blockout_pinoverride/0005_test.yml.tt2 b/scenarios/invite_blockout_pinoverride/0005_test.yml.tt2 index 91585def..f8df7a53 100644 --- a/scenarios/invite_blockout_pinoverride/0005_test.yml.tt2 +++ b/scenarios/invite_blockout_pinoverride/0005_test.yml.tt2 @@ -41,12 +41,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_blockout_wlst/0003_test.yml.tt2 b/scenarios/invite_blockout_wlst/0003_test.yml.tt2 index 534b52a3..73935f56 100644 --- a/scenarios/invite_blockout_wlst/0003_test.yml.tt2 +++ b/scenarios/invite_blockout_wlst/0003_test.yml.tt2 @@ -41,12 +41,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_callforward/0009_test.yml.tt2 b/scenarios/invite_callforward/0009_test.yml.tt2 index 26db218d..a0338088 100644 --- a/scenarios/invite_callforward/0009_test.yml.tt2 +++ b/scenarios/invite_callforward/0009_test.yml.tt2 @@ -41,12 +41,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_callforward/0011_test.yml.tt2 b/scenarios/invite_callforward/0011_test.yml.tt2 index 89110d51..62381762 100644 --- a/scenarios/invite_callforward/0011_test.yml.tt2 +++ b/scenarios/invite_callforward/0011_test.yml.tt2 @@ -26,6 +26,10 @@ flow: - return|ROUTE_LOAD_CALLER_PREF: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: @@ -34,8 +38,6 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_callforward/0025_test.yml.tt2 b/scenarios/invite_callforward/0025_test.yml.tt2 index 05474eb6..93ea29c2 100644 --- a/scenarios/invite_callforward/0025_test.yml.tt2 +++ b/scenarios/invite_callforward/0025_test.yml.tt2 @@ -41,12 +41,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_callforward/0029_test.yml.tt2 b/scenarios/invite_callforward/0029_test.yml.tt2 index 106b92e0..a2a13a04 100644 --- a/scenarios/invite_callforward/0029_test.yml.tt2 +++ b/scenarios/invite_callforward/0029_test.yml.tt2 @@ -26,6 +26,10 @@ flow: - return|ROUTE_LOAD_CALLER_PREF: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: @@ -34,8 +38,6 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_concurrent_max/0007_test.yml.tt2 b/scenarios/invite_concurrent_max/0007_test.yml.tt2 index f889fba1..e5cd112e 100644 --- a/scenarios/invite_concurrent_max/0007_test.yml.tt2 +++ b/scenarios/invite_concurrent_max/0007_test.yml.tt2 @@ -41,12 +41,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_concurrent_max/0014_test.yml.tt2 b/scenarios/invite_concurrent_max/0014_test.yml.tt2 index a78640fa..7ea7bb31 100644 --- a/scenarios/invite_concurrent_max/0014_test.yml.tt2 +++ b/scenarios/invite_concurrent_max/0014_test.yml.tt2 @@ -41,12 +41,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_concurrent_max_out/0003_test.yml.tt2 b/scenarios/invite_concurrent_max_out/0003_test.yml.tt2 index 59522ded..bd5ac0ba 100644 --- a/scenarios/invite_concurrent_max_out/0003_test.yml.tt2 +++ b/scenarios/invite_concurrent_max_out/0003_test.yml.tt2 @@ -36,12 +36,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_concurrent_max_out/0014_test.yml.tt2 b/scenarios/invite_concurrent_max_out/0014_test.yml.tt2 index 04358ea8..653cfa10 100644 --- a/scenarios/invite_concurrent_max_out/0014_test.yml.tt2 +++ b/scenarios/invite_concurrent_max_out/0014_test.yml.tt2 @@ -36,12 +36,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_concurrent_max_out_per_account/0003_test.yml.tt2 b/scenarios/invite_concurrent_max_out_per_account/0003_test.yml.tt2 index 770b0aad..e2a5a351 100644 --- a/scenarios/invite_concurrent_max_out_per_account/0003_test.yml.tt2 +++ b/scenarios/invite_concurrent_max_out_per_account/0003_test.yml.tt2 @@ -36,12 +36,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_concurrent_max_out_per_account/0014_test.yml.tt2 b/scenarios/invite_concurrent_max_out_per_account/0014_test.yml.tt2 index 21666b3e..aad841f9 100644 --- a/scenarios/invite_concurrent_max_out_per_account/0014_test.yml.tt2 +++ b/scenarios/invite_concurrent_max_out_per_account/0014_test.yml.tt2 @@ -37,12 +37,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_concurrent_max_per_account/0007_test.yml.tt2 b/scenarios/invite_concurrent_max_per_account/0007_test.yml.tt2 index 5aa9c7ee..55d2eee0 100644 --- a/scenarios/invite_concurrent_max_per_account/0007_test.yml.tt2 +++ b/scenarios/invite_concurrent_max_per_account/0007_test.yml.tt2 @@ -42,12 +42,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_concurrent_max_per_account/0014_test.yml.tt2 b/scenarios/invite_concurrent_max_per_account/0014_test.yml.tt2 index aaffaa80..b30441cf 100644 --- a/scenarios/invite_concurrent_max_per_account/0014_test.yml.tt2 +++ b/scenarios/invite_concurrent_max_per_account/0014_test.yml.tt2 @@ -41,12 +41,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_conference_update/0003_test.yml.tt2 b/scenarios/invite_conference_update/0003_test.yml.tt2 index c4186079..deb4bd3f 100644 --- a/scenarios/invite_conference_update/0003_test.yml.tt2 +++ b/scenarios/invite_conference_update/0003_test.yml.tt2 @@ -42,12 +42,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_conference_update/0005_test.yml.tt2 b/scenarios/invite_conference_update/0005_test.yml.tt2 index fe83610a..42a10f22 100644 --- a/scenarios/invite_conference_update/0005_test.yml.tt2 +++ b/scenarios/invite_conference_update/0005_test.yml.tt2 @@ -26,6 +26,10 @@ flow: - return|ROUTE_LOAD_CALLER_PREF: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: @@ -34,8 +38,6 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CHECK_PBX: - return|ROUTE_CHECK_PBX: diff --git a/scenarios/invite_foreign_dom/0003_test.yml.tt2 b/scenarios/invite_foreign_dom/0003_test.yml.tt2 index 02cf84e6..84581ea1 100644 --- a/scenarios/invite_foreign_dom/0003_test.yml.tt2 +++ b/scenarios/invite_foreign_dom/0003_test.yml.tt2 @@ -41,12 +41,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_ignore_allowip/0005_test.yml.tt2 b/scenarios/invite_ignore_allowip/0005_test.yml.tt2 index bb057ebf..d2161d24 100644 --- a/scenarios/invite_ignore_allowip/0005_test.yml.tt2 +++ b/scenarios/invite_ignore_allowip/0005_test.yml.tt2 @@ -36,12 +36,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_lateoam/0005_test.yml.tt2 b/scenarios/invite_lateoam/0005_test.yml.tt2 index 9a9378c0..0f972f78 100644 --- a/scenarios/invite_lateoam/0005_test.yml.tt2 +++ b/scenarios/invite_lateoam/0005_test.yml.tt2 @@ -41,12 +41,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_no_refer/0005_test.yml.tt2 b/scenarios/invite_no_refer/0005_test.yml.tt2 index dc28ce1d..884c38ca 100644 --- a/scenarios/invite_no_refer/0005_test.yml.tt2 +++ b/scenarios/invite_no_refer/0005_test.yml.tt2 @@ -41,12 +41,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_offline/0003_test.yml.tt2 b/scenarios/invite_offline/0003_test.yml.tt2 index 816c2616..4e56e9bf 100644 --- a/scenarios/invite_offline/0003_test.yml.tt2 +++ b/scenarios/invite_offline/0003_test.yml.tt2 @@ -41,12 +41,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_offline/0005_test.yml.tt2 b/scenarios/invite_offline/0005_test.yml.tt2 index c20ab11f..48bc8b1e 100644 --- a/scenarios/invite_offline/0005_test.yml.tt2 +++ b/scenarios/invite_offline/0005_test.yml.tt2 @@ -41,12 +41,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_peerout/0003_test.yml.tt2 b/scenarios/invite_peerout/0003_test.yml.tt2 index 3380e59a..03d748d0 100644 --- a/scenarios/invite_peerout/0003_test.yml.tt2 +++ b/scenarios/invite_peerout/0003_test.yml.tt2 @@ -36,12 +36,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_peerout_failover/0003_test.yml.tt2 b/scenarios/invite_peerout_failover/0003_test.yml.tt2 index 9dd01628..ce603f74 100644 --- a/scenarios/invite_peerout_failover/0003_test.yml.tt2 +++ b/scenarios/invite_peerout_failover/0003_test.yml.tt2 @@ -36,12 +36,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_peerout_max_out/0003_test.yml.tt2 b/scenarios/invite_peerout_max_out/0003_test.yml.tt2 index 9f52024d..af26dfaa 100644 --- a/scenarios/invite_peerout_max_out/0003_test.yml.tt2 +++ b/scenarios/invite_peerout_max_out/0003_test.yml.tt2 @@ -36,12 +36,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_peerout_rewrite/0003_test.yml.tt2 b/scenarios/invite_peerout_rewrite/0003_test.yml.tt2 index 6f8f19b9..a67bcda7 100644 --- a/scenarios/invite_peerout_rewrite/0003_test.yml.tt2 +++ b/scenarios/invite_peerout_rewrite/0003_test.yml.tt2 @@ -40,12 +40,14 @@ flow: - start|ROUTE_APPLY_REWRITE_RULE: - return|ROUTE_APPLY_REWRITE_RULE: - return|ROUTE_APPLY_CALLER_RWR: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_APPLY_REWRITE_RULE: - return|ROUTE_APPLY_REWRITE_RULE: diff --git a/scenarios/invite_peerout_rewrite_pv_regex/0003_test.yml.tt2 b/scenarios/invite_peerout_rewrite_pv_regex/0003_test.yml.tt2 index 8131e397..caf9b9bb 100644 --- a/scenarios/invite_peerout_rewrite_pv_regex/0003_test.yml.tt2 +++ b/scenarios/invite_peerout_rewrite_pv_regex/0003_test.yml.tt2 @@ -41,12 +41,14 @@ flow: - return|ROUTE_APPLY_REWRITE_RULE: $var(dp_user): 0 - return|ROUTE_APPLY_CALLER_RWR: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_APPLY_REWRITE_RULE: - return|ROUTE_APPLY_REWRITE_RULE: diff --git a/scenarios/invite_redirect/0007_test.yml.tt2 b/scenarios/invite_redirect/0007_test.yml.tt2 index bc742c37..70dc4c13 100644 --- a/scenarios/invite_redirect/0007_test.yml.tt2 +++ b/scenarios/invite_redirect/0007_test.yml.tt2 @@ -41,12 +41,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_redirect_blocked/0005_test.yml.tt2 b/scenarios/invite_redirect_blocked/0005_test.yml.tt2 index bc742c37..70dc4c13 100644 --- a/scenarios/invite_redirect_blocked/0005_test.yml.tt2 +++ b/scenarios/invite_redirect_blocked/0005_test.yml.tt2 @@ -41,12 +41,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_retrans/0005_test.yml.tt2 b/scenarios/invite_retrans/0005_test.yml.tt2 index f859478e..b0f9fc75 100644 --- a/scenarios/invite_retrans/0005_test.yml.tt2 +++ b/scenarios/invite_retrans/0005_test.yml.tt2 @@ -41,12 +41,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_tcp_udp/0005_test.yml.tt2 b/scenarios/invite_tcp_udp/0005_test.yml.tt2 index 7c176d6c..5ff556c7 100644 --- a/scenarios/invite_tcp_udp/0005_test.yml.tt2 +++ b/scenarios/invite_tcp_udp/0005_test.yml.tt2 @@ -41,12 +41,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_tcp_udp_reinvite/0005_test.yml.tt2 b/scenarios/invite_tcp_udp_reinvite/0005_test.yml.tt2 index 7c176d6c..5ff556c7 100644 --- a/scenarios/invite_tcp_udp_reinvite/0005_test.yml.tt2 +++ b/scenarios/invite_tcp_udp_reinvite/0005_test.yml.tt2 @@ -41,12 +41,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_trusted_anonymous/0003_test.yml.tt2 b/scenarios/invite_trusted_anonymous/0003_test.yml.tt2 index 41bbfe63..a8623060 100644 --- a/scenarios/invite_trusted_anonymous/0003_test.yml.tt2 +++ b/scenarios/invite_trusted_anonymous/0003_test.yml.tt2 @@ -28,12 +28,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_voicebox/0003_test.yml.tt2 b/scenarios/invite_voicebox/0003_test.yml.tt2 index 4460677b..840fc645 100644 --- a/scenarios/invite_voicebox/0003_test.yml.tt2 +++ b/scenarios/invite_voicebox/0003_test.yml.tt2 @@ -42,12 +42,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/invite_voicebox/0005_test.yml.tt2 b/scenarios/invite_voicebox/0005_test.yml.tt2 index 60c901d2..aa32d4b5 100644 --- a/scenarios/invite_voicebox/0005_test.yml.tt2 +++ b/scenarios/invite_voicebox/0005_test.yml.tt2 @@ -26,6 +26,10 @@ flow: - return|ROUTE_LOAD_CALLER_PREF: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: @@ -34,8 +38,6 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CHECK_PBX: - return|ROUTE_CHECK_PBX: diff --git a/scenarios/invite_wrong_reg/0005_test.yml.tt2 b/scenarios/invite_wrong_reg/0005_test.yml.tt2 index 6ebe0248..959535ba 100644 --- a/scenarios/invite_wrong_reg/0005_test.yml.tt2 +++ b/scenarios/invite_wrong_reg/0005_test.yml.tt2 @@ -41,12 +41,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/lock_ported/0005_test.yml.tt2 b/scenarios/lock_ported/0005_test.yml.tt2 index 99c24176..ca405df2 100644 --- a/scenarios/lock_ported/0005_test.yml.tt2 +++ b/scenarios/lock_ported/0005_test.yml.tt2 @@ -41,12 +41,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios/lock_ported/0007_test.yml.tt2 b/scenarios/lock_ported/0007_test.yml.tt2 index 4d9e3cbb..2dcea9f5 100644 --- a/scenarios/lock_ported/0007_test.yml.tt2 +++ b/scenarios/lock_ported/0007_test.yml.tt2 @@ -26,6 +26,10 @@ flow: - return|ROUTE_LOAD_CALLER_PREF: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: @@ -34,8 +38,6 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: $var(cf_loop): 1 $var(forward): 0 diff --git a/scenarios/lock_ported/0021_test.yml.tt2 b/scenarios/lock_ported/0021_test.yml.tt2 index adaf21f2..ec272e91 100644 --- a/scenarios/lock_ported/0021_test.yml.tt2 +++ b/scenarios/lock_ported/0021_test.yml.tt2 @@ -41,12 +41,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: $var(cf_loop): 0 $var(forward): 0 diff --git a/scenarios/reminder/0003_test.yml.tt2 b/scenarios/reminder/0003_test.yml.tt2 index 74b6b34a..d3f1f2a6 100644 --- a/scenarios/reminder/0003_test.yml.tt2 +++ b/scenarios/reminder/0003_test.yml.tt2 @@ -41,12 +41,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_TO_APPSRV: - start|ROUTE_LOAD_APPSRV: diff --git a/scenarios_lnp/incoming_peer/0001_test.yml.tt2 b/scenarios_lnp/incoming_peer/0001_test.yml.tt2 index dce0f165..00c716fd 100644 --- a/scenarios_lnp/incoming_peer/0001_test.yml.tt2 +++ b/scenarios_lnp/incoming_peer/0001_test.yml.tt2 @@ -31,6 +31,8 @@ flow: - return|ROUTE_GET_FORWARDER_CLI: - start|ROUTE_CLIR: - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios_lnp/incoming_peer/0003_test.yml.tt2 b/scenarios_lnp/incoming_peer/0003_test.yml.tt2 index da2ceaca..b94d175a 100644 --- a/scenarios_lnp/incoming_peer/0003_test.yml.tt2 +++ b/scenarios_lnp/incoming_peer/0003_test.yml.tt2 @@ -26,6 +26,10 @@ flow: - return|ROUTE_LOAD_CALLER_PREF: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: @@ -34,8 +38,6 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios_lnp/incoming_peer_unallocated_authoritative/0001_test.yml.tt2 b/scenarios_lnp/incoming_peer_unallocated_authoritative/0001_test.yml.tt2 index 1049e9d4..6bac7947 100644 --- a/scenarios_lnp/incoming_peer_unallocated_authoritative/0001_test.yml.tt2 +++ b/scenarios_lnp/incoming_peer_unallocated_authoritative/0001_test.yml.tt2 @@ -31,6 +31,8 @@ flow: - return|ROUTE_GET_FORWARDER_CLI: - start|ROUTE_CLIR: - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios_lnp/invite/0003_test.yml.tt2 b/scenarios_lnp/invite/0003_test.yml.tt2 index 90873362..358aa469 100644 --- a/scenarios_lnp/invite/0003_test.yml.tt2 +++ b/scenarios_lnp/invite/0003_test.yml.tt2 @@ -36,12 +36,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios_lnp/invite_ncos_black/0003_test.yml.tt2 b/scenarios_lnp/invite_ncos_black/0003_test.yml.tt2 index ab142b35..3e658764 100644 --- a/scenarios_lnp/invite_ncos_black/0003_test.yml.tt2 +++ b/scenarios_lnp/invite_ncos_black/0003_test.yml.tt2 @@ -41,12 +41,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios_lnp/invite_ncos_black/0007_test.yml.tt2 b/scenarios_lnp/invite_ncos_black/0007_test.yml.tt2 index 4b6689b4..e4757637 100644 --- a/scenarios_lnp/invite_ncos_black/0007_test.yml.tt2 +++ b/scenarios_lnp/invite_ncos_black/0007_test.yml.tt2 @@ -36,12 +36,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios_lnp/invite_ncos_black/0011_test.yml.tt2 b/scenarios_lnp/invite_ncos_black/0011_test.yml.tt2 index 4bfbefbf..239770c7 100644 --- a/scenarios_lnp/invite_ncos_black/0011_test.yml.tt2 +++ b/scenarios_lnp/invite_ncos_black/0011_test.yml.tt2 @@ -36,12 +36,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios_lnp/invite_ncos_white/0003_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0003_test.yml.tt2 index 55ed66c8..14816522 100644 --- a/scenarios_lnp/invite_ncos_white/0003_test.yml.tt2 +++ b/scenarios_lnp/invite_ncos_white/0003_test.yml.tt2 @@ -36,12 +36,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios_lnp/invite_ncos_white/0012_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0012_test.yml.tt2 index 8a4f145a..18252113 100644 --- a/scenarios_lnp/invite_ncos_white/0012_test.yml.tt2 +++ b/scenarios_lnp/invite_ncos_white/0012_test.yml.tt2 @@ -36,12 +36,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios_lnp/invite_ncos_white/0021_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0021_test.yml.tt2 index 8aea89d5..d60ab99b 100644 --- a/scenarios_lnp/invite_ncos_white/0021_test.yml.tt2 +++ b/scenarios_lnp/invite_ncos_white/0021_test.yml.tt2 @@ -41,12 +41,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios_lnp/invite_peerout/0003_test.yml.tt2 b/scenarios_lnp/invite_peerout/0003_test.yml.tt2 index 939daf6a..5e263476 100644 --- a/scenarios_lnp/invite_peerout/0003_test.yml.tt2 +++ b/scenarios_lnp/invite_peerout/0003_test.yml.tt2 @@ -40,12 +40,14 @@ flow: - start|ROUTE_APPLY_REWRITE_RULE: - return|ROUTE_APPLY_REWRITE_RULE: - return|ROUTE_APPLY_CALLER_RWR: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_APPLY_REWRITE_RULE: - return|ROUTE_APPLY_REWRITE_RULE: diff --git a/scenarios_lnp/invite_peerout_rn/0003_test.yml.tt2 b/scenarios_lnp/invite_peerout_rn/0003_test.yml.tt2 index 963e06fe..dd1fea6a 100644 --- a/scenarios_lnp/invite_peerout_rn/0003_test.yml.tt2 +++ b/scenarios_lnp/invite_peerout_rn/0003_test.yml.tt2 @@ -36,12 +36,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios_pbx/incoming_shared_line/0017_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0017_test.yml.tt2 index 9f66e006..f7a70734 100644 --- a/scenarios_pbx/incoming_shared_line/0017_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0017_test.yml.tt2 @@ -38,12 +38,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios_pbx/incoming_shared_line/0019_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0019_test.yml.tt2 index 72641765..c029fdda 100644 --- a/scenarios_pbx/incoming_shared_line/0019_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0019_test.yml.tt2 @@ -34,12 +34,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios_pbx/invite/0005_test.yml.tt2 b/scenarios_pbx/invite/0005_test.yml.tt2 index 2069194b..dc6ecb17 100644 --- a/scenarios_pbx/invite/0005_test.yml.tt2 +++ b/scenarios_pbx/invite/0005_test.yml.tt2 @@ -43,12 +43,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios_pbx/invite/0007_test.yml.tt2 b/scenarios_pbx/invite/0007_test.yml.tt2 index 633b785c..c5b783a4 100644 --- a/scenarios_pbx/invite/0007_test.yml.tt2 +++ b/scenarios_pbx/invite/0007_test.yml.tt2 @@ -34,12 +34,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios_pbx/invite_shared_line/0014_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0014_test.yml.tt2 index efdce2c1..072f905b 100644 --- a/scenarios_pbx/invite_shared_line/0014_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0014_test.yml.tt2 @@ -38,12 +38,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: diff --git a/scenarios_pbx/invite_shared_line/0017_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0017_test.yml.tt2 index f086ff16..a6140042 100644 --- a/scenarios_pbx/invite_shared_line/0017_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0017_test.yml.tt2 @@ -34,12 +34,14 @@ flow: - return|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - start|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_CLI_ALLOWED: - return|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - return|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - return|ROUTE_CLEAR_CALLEE_PREF: