From 3fb4a8e49c80ceaa964cc7cc5d8293a9af2a8239 Mon Sep 17 00:00:00 2001 From: Andrew Pogrebennyk Date: Fri, 4 Apr 2014 00:51:52 +0200 Subject: [PATCH] MT#6491 adapt tests after ROUTE_CLIR moving. --- scenarios/incoming_foreign_dom/0003_test.yml.tt2 | 2 +- scenarios/incoming_peer/0003_test.yml.tt2 | 2 +- scenarios/invite/0005_test.yml.tt2 | 2 +- scenarios/invite_allowedcli_match/0005_test.yml.tt2 | 2 +- scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2 | 2 +- scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2 | 2 +- scenarios/invite_blockin_blst/0003_test.yml.tt2 | 2 +- scenarios/invite_blockin_clir/0003_test.yml.tt2 | 2 +- scenarios/invite_blockin_wlst/0003_test.yml.tt2 | 2 +- scenarios/invite_blockout_blst/0003_test.yml.tt2 | 2 +- scenarios/invite_blockout_ncos/0003_test.yml.tt2 | 2 +- scenarios/invite_blockout_pinoverride/0005_test.yml.tt2 | 2 +- scenarios/invite_blockout_wlst/0003_test.yml.tt2 | 2 +- scenarios/invite_callforward/0009_test.yml.tt2 | 2 +- scenarios/invite_callforward/0011_test.yml.tt2 | 2 +- scenarios/invite_callforward/0025_test.yml.tt2 | 2 +- scenarios/invite_callforward/0029_test.yml.tt2 | 2 +- scenarios/invite_concurrent_max/0007_test.yml.tt2 | 2 +- scenarios/invite_concurrent_max/0014_test.yml.tt2 | 2 +- scenarios/invite_concurrent_max_out/0007_test.yml.tt2 | 2 +- scenarios/invite_concurrent_max_out/0018_test.yml.tt2 | 2 +- .../invite_concurrent_max_out_per_account/0003_test.yml.tt2 | 2 +- .../invite_concurrent_max_out_per_account/0014_test.yml.tt2 | 2 +- scenarios/invite_concurrent_max_per_account/0007_test.yml.tt2 | 2 +- scenarios/invite_concurrent_max_per_account/0014_test.yml.tt2 | 2 +- scenarios/invite_foreign_dom/0003_test.yml.tt2 | 2 +- scenarios/invite_ignore_allowip/0005_test.yml.tt2 | 2 +- scenarios/invite_offline/0003_test.yml.tt2 | 2 +- scenarios/invite_offline/0005_test.yml.tt2 | 2 +- scenarios/invite_peerout/0003_test.yml.tt2 | 2 +- scenarios/invite_peerout_rewrite/0003_test.yml.tt2 | 4 ++-- scenarios/invite_redirect/0007_test.yml.tt2 | 2 +- scenarios/invite_speeddial/0007_test.yml.tt2 | 2 +- scenarios/invite_speeddial/0016_test.yml.tt2 | 2 +- scenarios/invite_speeddial/0025_test.yml.tt2 | 2 +- scenarios/invite_speeddial/0029_test.yml.tt2 | 2 +- scenarios/invite_tcp_udp/0005_test.yml.tt2 | 2 +- scenarios/invite_tcp_udp_reinvite/0005_test.yml.tt2 | 2 +- scenarios/invite_voicebox/0003_test.yml.tt2 | 2 +- scenarios/invite_voicebox/0005_test.yml.tt2 | 2 +- scenarios/reminder/0003_test.yml.tt2 | 2 +- 41 files changed, 42 insertions(+), 42 deletions(-) diff --git a/scenarios/incoming_foreign_dom/0003_test.yml.tt2 b/scenarios/incoming_foreign_dom/0003_test.yml.tt2 index 14e796ca..0d04a523 100644 --- a/scenarios/incoming_foreign_dom/0003_test.yml.tt2 +++ b/scenarios/incoming_foreign_dom/0003_test.yml.tt2 @@ -27,9 +27,9 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - end|ROUTE_CLEAR_CALLEE_PREF: - start|ROUTE_NCOS: diff --git a/scenarios/incoming_peer/0003_test.yml.tt2 b/scenarios/incoming_peer/0003_test.yml.tt2 index 6962fd9e..e919f4c0 100644 --- a/scenarios/incoming_peer/0003_test.yml.tt2 +++ b/scenarios/incoming_peer/0003_test.yml.tt2 @@ -20,9 +20,9 @@ flow: - end|ROUTE_GET_CALLER_CLI: - start|ROUTE_GET_FORWARDER_CLI: - end|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - end|ROUTE_CLEAR_CALLEE_PREF: - start|ROUTE_NCOS: diff --git a/scenarios/invite/0005_test.yml.tt2 b/scenarios/invite/0005_test.yml.tt2 index 6c908ff1..71456f61 100644 --- a/scenarios/invite/0005_test.yml.tt2 +++ b/scenarios/invite/0005_test.yml.tt2 @@ -27,9 +27,9 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - end|ROUTE_CLEAR_CALLEE_PREF: - start|ROUTE_NCOS: diff --git a/scenarios/invite_allowedcli_match/0005_test.yml.tt2 b/scenarios/invite_allowedcli_match/0005_test.yml.tt2 index 83c7e69d..1aa3b77b 100644 --- a/scenarios/invite_allowedcli_match/0005_test.yml.tt2 +++ b/scenarios/invite_allowedcli_match/0005_test.yml.tt2 @@ -34,9 +34,9 @@ flow: $xavp(caller_real_prefs[0]=>allowed_clis[*]): ['43110021*', '43110029*'] - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - end|ROUTE_CLEAR_CALLEE_PREF: - start|ROUTE_NCOS: diff --git a/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2 b/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2 index 80239793..81156746 100644 --- a/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2 +++ b/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2 @@ -33,9 +33,9 @@ flow: - end|ROUTE_GET_FORWARDER_CLI: - start|ROUTE_CHECK_USERPROV_CLI: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - end|ROUTE_CLEAR_CALLEE_PREF: - start|ROUTE_NCOS: diff --git a/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2 b/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2 index 5ea67157..48805aee 100644 --- a/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2 +++ b/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2 @@ -34,9 +34,9 @@ flow: $xavp(caller_real_prefs[0]=>allowed_clis[*]): ['43110021*', '43110029*'] - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - end|ROUTE_CLEAR_CALLEE_PREF: - start|ROUTE_NCOS: diff --git a/scenarios/invite_blockin_blst/0003_test.yml.tt2 b/scenarios/invite_blockin_blst/0003_test.yml.tt2 index 687ecfc4..5187d93b 100644 --- a/scenarios/invite_blockin_blst/0003_test.yml.tt2 +++ b/scenarios/invite_blockin_blst/0003_test.yml.tt2 @@ -27,9 +27,9 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - end|ROUTE_CLEAR_CALLEE_PREF: - start|ROUTE_NCOS: diff --git a/scenarios/invite_blockin_clir/0003_test.yml.tt2 b/scenarios/invite_blockin_clir/0003_test.yml.tt2 index 687ecfc4..5187d93b 100644 --- a/scenarios/invite_blockin_clir/0003_test.yml.tt2 +++ b/scenarios/invite_blockin_clir/0003_test.yml.tt2 @@ -27,9 +27,9 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - end|ROUTE_CLEAR_CALLEE_PREF: - start|ROUTE_NCOS: diff --git a/scenarios/invite_blockin_wlst/0003_test.yml.tt2 b/scenarios/invite_blockin_wlst/0003_test.yml.tt2 index 687ecfc4..5187d93b 100644 --- a/scenarios/invite_blockin_wlst/0003_test.yml.tt2 +++ b/scenarios/invite_blockin_wlst/0003_test.yml.tt2 @@ -27,9 +27,9 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - end|ROUTE_CLEAR_CALLEE_PREF: - start|ROUTE_NCOS: diff --git a/scenarios/invite_blockout_blst/0003_test.yml.tt2 b/scenarios/invite_blockout_blst/0003_test.yml.tt2 index e7339a64..14ec8815 100644 --- a/scenarios/invite_blockout_blst/0003_test.yml.tt2 +++ b/scenarios/invite_blockout_blst/0003_test.yml.tt2 @@ -27,9 +27,9 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - end|ROUTE_CLEAR_CALLEE_PREF: - start|ROUTE_NCOS: diff --git a/scenarios/invite_blockout_ncos/0003_test.yml.tt2 b/scenarios/invite_blockout_ncos/0003_test.yml.tt2 index 7ad687c7..951d9629 100644 --- a/scenarios/invite_blockout_ncos/0003_test.yml.tt2 +++ b/scenarios/invite_blockout_ncos/0003_test.yml.tt2 @@ -27,9 +27,9 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - end|ROUTE_CLEAR_CALLEE_PREF: - start|ROUTE_NCOS: diff --git a/scenarios/invite_blockout_pinoverride/0005_test.yml.tt2 b/scenarios/invite_blockout_pinoverride/0005_test.yml.tt2 index e277cf49..224ed2e2 100644 --- a/scenarios/invite_blockout_pinoverride/0005_test.yml.tt2 +++ b/scenarios/invite_blockout_pinoverride/0005_test.yml.tt2 @@ -27,9 +27,9 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - end|ROUTE_CLEAR_CALLEE_PREF: - start|ROUTE_NCOS: diff --git a/scenarios/invite_blockout_wlst/0003_test.yml.tt2 b/scenarios/invite_blockout_wlst/0003_test.yml.tt2 index 24fef3ad..028fd324 100644 --- a/scenarios/invite_blockout_wlst/0003_test.yml.tt2 +++ b/scenarios/invite_blockout_wlst/0003_test.yml.tt2 @@ -27,9 +27,9 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - end|ROUTE_CLEAR_CALLEE_PREF: - start|ROUTE_NCOS: diff --git a/scenarios/invite_callforward/0009_test.yml.tt2 b/scenarios/invite_callforward/0009_test.yml.tt2 index 07c27beb..14acaf57 100644 --- a/scenarios/invite_callforward/0009_test.yml.tt2 +++ b/scenarios/invite_callforward/0009_test.yml.tt2 @@ -27,9 +27,9 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - end|ROUTE_CLEAR_CALLEE_PREF: - start|ROUTE_NCOS: diff --git a/scenarios/invite_callforward/0011_test.yml.tt2 b/scenarios/invite_callforward/0011_test.yml.tt2 index 35886770..29e2ea80 100644 --- a/scenarios/invite_callforward/0011_test.yml.tt2 +++ b/scenarios/invite_callforward/0011_test.yml.tt2 @@ -25,9 +25,9 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - end|ROUTE_CLEAR_CALLEE_PREF: - start|ROUTE_NCOS: diff --git a/scenarios/invite_callforward/0025_test.yml.tt2 b/scenarios/invite_callforward/0025_test.yml.tt2 index 620afc96..300cf976 100644 --- a/scenarios/invite_callforward/0025_test.yml.tt2 +++ b/scenarios/invite_callforward/0025_test.yml.tt2 @@ -27,9 +27,9 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - end|ROUTE_CLEAR_CALLEE_PREF: - start|ROUTE_NCOS: diff --git a/scenarios/invite_callforward/0029_test.yml.tt2 b/scenarios/invite_callforward/0029_test.yml.tt2 index 322b5c99..42aa33b9 100644 --- a/scenarios/invite_callforward/0029_test.yml.tt2 +++ b/scenarios/invite_callforward/0029_test.yml.tt2 @@ -25,9 +25,9 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - end|ROUTE_CLEAR_CALLEE_PREF: - start|ROUTE_NCOS: diff --git a/scenarios/invite_concurrent_max/0007_test.yml.tt2 b/scenarios/invite_concurrent_max/0007_test.yml.tt2 index ff15bd15..4ffc88e3 100644 --- a/scenarios/invite_concurrent_max/0007_test.yml.tt2 +++ b/scenarios/invite_concurrent_max/0007_test.yml.tt2 @@ -32,9 +32,9 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: $avp(size): [1] - end|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 7f2c655e..91200da7 100644 --- a/scenarios/invite_concurrent_max/0014_test.yml.tt2 +++ b/scenarios/invite_concurrent_max/0014_test.yml.tt2 @@ -27,9 +27,9 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - end|ROUTE_CLEAR_CALLEE_PREF: - start|ROUTE_NCOS: diff --git a/scenarios/invite_concurrent_max_out/0007_test.yml.tt2 b/scenarios/invite_concurrent_max_out/0007_test.yml.tt2 index 6c908ff1..71456f61 100644 --- a/scenarios/invite_concurrent_max_out/0007_test.yml.tt2 +++ b/scenarios/invite_concurrent_max_out/0007_test.yml.tt2 @@ -27,9 +27,9 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - end|ROUTE_CLEAR_CALLEE_PREF: - start|ROUTE_NCOS: diff --git a/scenarios/invite_concurrent_max_out/0018_test.yml.tt2 b/scenarios/invite_concurrent_max_out/0018_test.yml.tt2 index fb8c60b1..35d409c2 100644 --- a/scenarios/invite_concurrent_max_out/0018_test.yml.tt2 +++ b/scenarios/invite_concurrent_max_out/0018_test.yml.tt2 @@ -26,9 +26,9 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_ACC_FAILURE: - start|ROUTE_ACC_CALLER: - end|ROUTE_ACC_CALLER: 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 1af0c83a..b6e1f3b1 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 @@ -26,9 +26,9 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - end|ROUTE_CLEAR_CALLEE_PREF: - start|ROUTE_NCOS: 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 f5fbff98..ad5a5cb1 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 @@ -26,9 +26,9 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_ACC_FAILURE: - start|ROUTE_ACC_CALLER: - end|ROUTE_ACC_CALLER: 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 3110f56a..27e944d8 100644 --- a/scenarios/invite_concurrent_max_per_account/0007_test.yml.tt2 +++ b/scenarios/invite_concurrent_max_per_account/0007_test.yml.tt2 @@ -32,9 +32,9 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: $avp(size): [1] - end|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 0889349f..bfda4595 100644 --- a/scenarios/invite_concurrent_max_per_account/0014_test.yml.tt2 +++ b/scenarios/invite_concurrent_max_per_account/0014_test.yml.tt2 @@ -27,9 +27,9 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - end|ROUTE_CLEAR_CALLEE_PREF: - start|ROUTE_NCOS: diff --git a/scenarios/invite_foreign_dom/0003_test.yml.tt2 b/scenarios/invite_foreign_dom/0003_test.yml.tt2 index 7a1a4233..a22c019d 100644 --- a/scenarios/invite_foreign_dom/0003_test.yml.tt2 +++ b/scenarios/invite_foreign_dom/0003_test.yml.tt2 @@ -26,9 +26,9 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - end|ROUTE_CLEAR_CALLEE_PREF: - start|ROUTE_NCOS: diff --git a/scenarios/invite_ignore_allowip/0005_test.yml.tt2 b/scenarios/invite_ignore_allowip/0005_test.yml.tt2 index 6c908ff1..71456f61 100644 --- a/scenarios/invite_ignore_allowip/0005_test.yml.tt2 +++ b/scenarios/invite_ignore_allowip/0005_test.yml.tt2 @@ -27,9 +27,9 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - end|ROUTE_CLEAR_CALLEE_PREF: - start|ROUTE_NCOS: diff --git a/scenarios/invite_offline/0003_test.yml.tt2 b/scenarios/invite_offline/0003_test.yml.tt2 index 27a9616f..30e1a305 100644 --- a/scenarios/invite_offline/0003_test.yml.tt2 +++ b/scenarios/invite_offline/0003_test.yml.tt2 @@ -27,9 +27,9 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - end|ROUTE_CLEAR_CALLEE_PREF: - start|ROUTE_NCOS: diff --git a/scenarios/invite_offline/0005_test.yml.tt2 b/scenarios/invite_offline/0005_test.yml.tt2 index 15c360af..5eddb669 100644 --- a/scenarios/invite_offline/0005_test.yml.tt2 +++ b/scenarios/invite_offline/0005_test.yml.tt2 @@ -27,9 +27,9 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - end|ROUTE_CLEAR_CALLEE_PREF: - start|ROUTE_NCOS: diff --git a/scenarios/invite_peerout/0003_test.yml.tt2 b/scenarios/invite_peerout/0003_test.yml.tt2 index 23a99c90..9497fbea 100644 --- a/scenarios/invite_peerout/0003_test.yml.tt2 +++ b/scenarios/invite_peerout/0003_test.yml.tt2 @@ -27,9 +27,9 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - end|ROUTE_CLEAR_CALLEE_PREF: - start|ROUTE_NCOS: diff --git a/scenarios/invite_peerout_rewrite/0003_test.yml.tt2 b/scenarios/invite_peerout_rewrite/0003_test.yml.tt2 index 65da5aa7..2b103848 100644 --- a/scenarios/invite_peerout_rewrite/0003_test.yml.tt2 +++ b/scenarios/invite_peerout_rewrite/0003_test.yml.tt2 @@ -31,11 +31,11 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: - - start|ROUTE_CLIR: - - end|ROUTE_CLIR: - start|ROUTE_FIND_CALLEE: - start|ROUTE_APPLY_REWRITE_RULE: - return|ROUTE_APPLY_REWRITE_RULE: + - start|ROUTE_CLIR: + - end|ROUTE_CLIR: - start|ROUTE_CLEAR_CALLEE_PREF: - end|ROUTE_CLEAR_CALLEE_PREF: - start|ROUTE_NCOS: diff --git a/scenarios/invite_redirect/0007_test.yml.tt2 b/scenarios/invite_redirect/0007_test.yml.tt2 index 9af0ace9..e65213b0 100644 --- a/scenarios/invite_redirect/0007_test.yml.tt2 +++ b/scenarios/invite_redirect/0007_test.yml.tt2 @@ -26,9 +26,9 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - end|ROUTE_CLEAR_CALLEE_PREF: - start|ROUTE_NCOS: diff --git a/scenarios/invite_speeddial/0007_test.yml.tt2 b/scenarios/invite_speeddial/0007_test.yml.tt2 index 205b7c86..d25f731e 100644 --- a/scenarios/invite_speeddial/0007_test.yml.tt2 +++ b/scenarios/invite_speeddial/0007_test.yml.tt2 @@ -27,9 +27,9 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - end|ROUTE_CLEAR_CALLEE_PREF: - start|ROUTE_NCOS: diff --git a/scenarios/invite_speeddial/0016_test.yml.tt2 b/scenarios/invite_speeddial/0016_test.yml.tt2 index f4a12785..68a67dbd 100644 --- a/scenarios/invite_speeddial/0016_test.yml.tt2 +++ b/scenarios/invite_speeddial/0016_test.yml.tt2 @@ -27,9 +27,9 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - end|ROUTE_CLEAR_CALLEE_PREF: - start|ROUTE_NCOS: diff --git a/scenarios/invite_speeddial/0025_test.yml.tt2 b/scenarios/invite_speeddial/0025_test.yml.tt2 index 7e7a44bc..92ca0c50 100644 --- a/scenarios/invite_speeddial/0025_test.yml.tt2 +++ b/scenarios/invite_speeddial/0025_test.yml.tt2 @@ -27,9 +27,9 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - end|ROUTE_CLEAR_CALLEE_PREF: - start|ROUTE_NCOS: diff --git a/scenarios/invite_speeddial/0029_test.yml.tt2 b/scenarios/invite_speeddial/0029_test.yml.tt2 index a5b362a4..3e464c1b 100644 --- a/scenarios/invite_speeddial/0029_test.yml.tt2 +++ b/scenarios/invite_speeddial/0029_test.yml.tt2 @@ -27,9 +27,9 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_ACC_FAILURE: - start|ROUTE_ACC_CALLER: - end|ROUTE_ACC_CALLER: diff --git a/scenarios/invite_tcp_udp/0005_test.yml.tt2 b/scenarios/invite_tcp_udp/0005_test.yml.tt2 index 169b3bcd..39134c44 100644 --- a/scenarios/invite_tcp_udp/0005_test.yml.tt2 +++ b/scenarios/invite_tcp_udp/0005_test.yml.tt2 @@ -27,9 +27,9 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - end|ROUTE_CLEAR_CALLEE_PREF: - start|ROUTE_NCOS: diff --git a/scenarios/invite_tcp_udp_reinvite/0005_test.yml.tt2 b/scenarios/invite_tcp_udp_reinvite/0005_test.yml.tt2 index 8f56d521..6be2d6b3 100644 --- a/scenarios/invite_tcp_udp_reinvite/0005_test.yml.tt2 +++ b/scenarios/invite_tcp_udp_reinvite/0005_test.yml.tt2 @@ -26,9 +26,9 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - end|ROUTE_CLEAR_CALLEE_PREF: - start|ROUTE_NCOS: diff --git a/scenarios/invite_voicebox/0003_test.yml.tt2 b/scenarios/invite_voicebox/0003_test.yml.tt2 index ce833b20..c8ed4bd3 100644 --- a/scenarios/invite_voicebox/0003_test.yml.tt2 +++ b/scenarios/invite_voicebox/0003_test.yml.tt2 @@ -27,9 +27,9 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLEAR_CALLEE_PREF: - end|ROUTE_CLEAR_CALLEE_PREF: - start|ROUTE_NCOS: diff --git a/scenarios/invite_voicebox/0005_test.yml.tt2 b/scenarios/invite_voicebox/0005_test.yml.tt2 index 718b3ed6..dc12082c 100644 --- a/scenarios/invite_voicebox/0005_test.yml.tt2 +++ b/scenarios/invite_voicebox/0005_test.yml.tt2 @@ -24,9 +24,9 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_CHECK_PBX: - return|ROUTE_CHECK_PBX: - start|ROUTE_VOICEBOX: diff --git a/scenarios/reminder/0003_test.yml.tt2 b/scenarios/reminder/0003_test.yml.tt2 index 28cd8bc4..8959fe3d 100644 --- a/scenarios/reminder/0003_test.yml.tt2 +++ b/scenarios/reminder/0003_test.yml.tt2 @@ -27,9 +27,9 @@ flow: - start|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_CLI_ALLOWED: - end|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_FIND_CALLEE: - start|ROUTE_TO_APPSRV: - start|ROUTE_LOAD_APPSRV: - end|ROUTE_LOAD_APPSRV: