From 355827994ea58e266a67469cb104d639d5f9f84b Mon Sep 17 00:00:00 2001
From: Victor Seva <vseva@sipwise.com>
Date: Mon, 28 Oct 2013 12:33:51 +0100
Subject: [PATCH] MT#4675 refresh checks

---
 scenarios/incoming_peer/0003_test.yml.tt2        |  4 +++-
 scenarios/invite/0005_test.yml.tt2               |  4 +++-
 .../invite_allowedcli_match/0005_test.yml.tt2    |  4 +++-
 .../0005_test.yml.tt2                            |  4 +++-
 .../invite_allowedcli_nonmatch/0005_test.yml.tt2 |  4 +++-
 .../0005_test.yml.tt2                            |  4 +++-
 scenarios/invite_callforward/0011_test.yml.tt2   |  6 ++++++
 scenarios/invite_callforward/0025_test.yml.tt2   |  2 ++
 scenarios/invite_callforward/0029_test.yml.tt2   |  6 ++++++
 .../invite_ignore_allowip/0005_test.yml.tt2      |  4 +++-
 scenarios/invite_offline/0003_test.yml.tt2       |  4 +++-
 scenarios/invite_offline/0005_test.yml.tt2       |  4 +++-
 scenarios/invite_peerout/0003_test.yml.tt2       |  2 ++
 .../invite_peerout_rewrite/0003_test.yml.tt2     | 16 ++++++++++++++++
 scenarios/invite_redirect/0007_test.yml.tt2      |  8 ++++++++
 scenarios/invite_speeddial/0007_test.yml.tt2     |  4 ++++
 scenarios/invite_speeddial/0016_test.yml.tt2     |  4 ++++
 scenarios/invite_speeddial/0025_test.yml.tt2     |  4 ++++
 scenarios/invite_voicebox/0003_test.yml.tt2      |  2 ++
 scenarios/invite_voicebox/0005_test.yml.tt2      |  6 ++++++
 scenarios/reminder/0003_test.yml.tt2             |  2 ++
 21 files changed, 89 insertions(+), 9 deletions(-)

diff --git a/scenarios/incoming_peer/0003_test.yml.tt2 b/scenarios/incoming_peer/0003_test.yml.tt2
index 10f8985a..6962fd9e 100644
--- a/scenarios/incoming_peer/0003_test.yml.tt2
+++ b/scenarios/incoming_peer/0003_test.yml.tt2
@@ -36,6 +36,8 @@ flow:
   - end|ROUTE_BLOCK_IN:
   - end|ROUTE_LOAD_CALLEE_PREF:
       $xavp(caller_peer_prefs[0]=>concurrent_max[*]): [1]
+  - start|ROUTE_CHECK_PBX:
+  - return|ROUTE_CHECK_PBX:
   - start|ROUTE_INVITE_TO_INT:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_ACC_CALLER:
@@ -106,7 +108,7 @@ sip_out:
       'P-Callee-UUID: \w+',
       'P-Asserted-Identity: <sip:004321001@',
       'P-Called-Party-ID: <sip:testuser1003@',
-      'P-App-Param: ;su=testuser1003;sr=[\w\.]+;sp=testuser;aleg_sst_enable=no;sst_enable=no',
+      'P-App-Param: ;aleg_sst_enable=no;sst_enable=no',
       'P-App-Name: sbc'
     ]
   - [
diff --git a/scenarios/invite/0005_test.yml.tt2 b/scenarios/invite/0005_test.yml.tt2
index cd3b38d3..6c908ff1 100644
--- a/scenarios/invite/0005_test.yml.tt2
+++ b/scenarios/invite/0005_test.yml.tt2
@@ -42,6 +42,8 @@ flow:
   - start|ROUTE_BLOCK_IN:
   - end|ROUTE_BLOCK_IN:
   - end|ROUTE_LOAD_CALLEE_PREF:
+  - start|ROUTE_CHECK_PBX:
+  - return|ROUTE_CHECK_PBX:
   - start|ROUTE_INVITE_TO_INT:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_ACC_CALLER:
@@ -118,7 +120,7 @@ sip_out:
       'P-Callee-UUID: \w+',
       'P-Asserted-Identity: <sip:4311002@',
       'P-Called-Party-ID: <sip:testuser1003@',
-      'P-App-Param: ;su=testuser1003;sr=[\w\.]+;sp=testuser;aleg_sst_enable=no;sst_enable=no',
+      'P-App-Param: ;aleg_sst_enable=no;sst_enable=no',
       'P-App-Name: sbc'
     ]
   - [
diff --git a/scenarios/invite_allowedcli_match/0005_test.yml.tt2 b/scenarios/invite_allowedcli_match/0005_test.yml.tt2
index 054d484a..83c7e69d 100644
--- a/scenarios/invite_allowedcli_match/0005_test.yml.tt2
+++ b/scenarios/invite_allowedcli_match/0005_test.yml.tt2
@@ -49,6 +49,8 @@ flow:
   - start|ROUTE_BLOCK_IN:
   - end|ROUTE_BLOCK_IN:
   - end|ROUTE_LOAD_CALLEE_PREF:
+  - start|ROUTE_CHECK_PBX:
+  - return|ROUTE_CHECK_PBX:
   - start|ROUTE_INVITE_TO_INT:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_ACC_CALLER:
@@ -125,7 +127,7 @@ sip_out:
       'P-Callee-UUID: \w+',
       'P-Asserted-Identity: <sip:4311002@',
       'P-Called-Party-ID: <sip:testuser1003@',
-      'P-App-Param: ;su=testuser1003;sr=[\w\.]+;sp=testuser;aleg_sst_enable=no;sst_enable=no',
+      'P-App-Param: ;aleg_sst_enable=no;sst_enable=no',
       'P-App-Name: sbc'
     ]
   - [
diff --git a/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2 b/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2
index e2eed4f7..80239793 100644
--- a/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2
+++ b/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2
@@ -48,6 +48,8 @@ flow:
   - start|ROUTE_BLOCK_IN:
   - end|ROUTE_BLOCK_IN:
   - end|ROUTE_LOAD_CALLEE_PREF:
+  - start|ROUTE_CHECK_PBX:
+  - return|ROUTE_CHECK_PBX:
   - start|ROUTE_INVITE_TO_INT:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_ACC_CALLER:
@@ -124,7 +126,7 @@ sip_out:
       'P-Callee-UUID: \w+',
       'P-Asserted-Identity: <sip:4311009@',
       'P-Called-Party-ID: <sip:testuser1003@',
-      'P-App-Param: ;su=testuser1003;sr=[\w\.]+;sp=testuser;aleg_sst_enable=no;sst_enable=no',
+      'P-App-Param: ;aleg_sst_enable=no;sst_enable=no',
       'P-App-Name: sbc'
     ]
   - [
diff --git a/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2 b/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2
index 9b5a6fca..5ea67157 100644
--- a/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2
+++ b/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2
@@ -49,6 +49,8 @@ flow:
   - start|ROUTE_BLOCK_IN:
   - end|ROUTE_BLOCK_IN:
   - end|ROUTE_LOAD_CALLEE_PREF:
+  - start|ROUTE_CHECK_PBX:
+  - return|ROUTE_CHECK_PBX:
   - start|ROUTE_INVITE_TO_INT:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_ACC_CALLER:
@@ -125,7 +127,7 @@ sip_out:
       'P-Callee-UUID: \w+',
       'P-Asserted-Identity: <sip:4311002@',
       'P-Called-Party-ID: <sip:testuser1003@',
-      'P-App-Param: ;su=testuser1003;sr=[\w\.]+;sp=testuser;aleg_sst_enable=no;sst_enable=no',
+      'P-App-Param: ;aleg_sst_enable=no;sst_enable=no',
       'P-App-Name: sbc'
     ]
   - [
diff --git a/scenarios/invite_blockout_pinoverride/0005_test.yml.tt2 b/scenarios/invite_blockout_pinoverride/0005_test.yml.tt2
index d036c538..e277cf49 100644
--- a/scenarios/invite_blockout_pinoverride/0005_test.yml.tt2
+++ b/scenarios/invite_blockout_pinoverride/0005_test.yml.tt2
@@ -40,6 +40,8 @@ flow:
   - start|ROUTE_BLOCK_IN:
   - end|ROUTE_BLOCK_IN:
   - end|ROUTE_LOAD_CALLEE_PREF:
+  - start|ROUTE_CHECK_PBX:
+  - return|ROUTE_CHECK_PBX:
   - start|ROUTE_INVITE_TO_INT:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_ACC_CALLER:
@@ -116,7 +118,7 @@ sip_out:
       'P-Callee-UUID: \w+',
       'P-Asserted-Identity: <sip:4311002@',
       'P-Called-Party-ID: <sip:testuser1003@',
-      'P-App-Param: ;su=testuser1003;sr=[\w\.]+;sp=testuser;aleg_sst_enable=no;sst_enable=no',
+      'P-App-Param: ;aleg_sst_enable=no;sst_enable=no',
       'P-App-Name: sbc'
     ]
   - [
diff --git a/scenarios/invite_callforward/0011_test.yml.tt2 b/scenarios/invite_callforward/0011_test.yml.tt2
index 1fa55fd8..35886770 100644
--- a/scenarios/invite_callforward/0011_test.yml.tt2
+++ b/scenarios/invite_callforward/0011_test.yml.tt2
@@ -21,6 +21,10 @@ flow:
   - start|ROUTE_CHECK_CLI_ALLOWED:
   - end|ROUTE_CHECK_CLI_ALLOWED:
   - end|ROUTE_CHECK_USERPROV_CLI:
+  - start|ROUTE_CHECK_USERPROV_CLI:
+  - 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:
@@ -36,6 +40,8 @@ flow:
   - start|ROUTE_BLOCK_IN:
   - end|ROUTE_BLOCK_IN:
   - end|ROUTE_LOAD_CALLEE_PREF:
+  - start|ROUTE_CHECK_PBX:
+  - return|ROUTE_CHECK_PBX:
   - start|ROUTE_INVITE_TO_INT:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_ACC_CALLER:
diff --git a/scenarios/invite_callforward/0025_test.yml.tt2 b/scenarios/invite_callforward/0025_test.yml.tt2
index fae60e42..d1bac606 100644
--- a/scenarios/invite_callforward/0025_test.yml.tt2
+++ b/scenarios/invite_callforward/0025_test.yml.tt2
@@ -42,6 +42,8 @@ flow:
   - start|ROUTE_BLOCK_IN:
   - end|ROUTE_BLOCK_IN:
   - end|ROUTE_LOAD_CALLEE_PREF:
+  - start|ROUTE_CHECK_PBX:
+  - return|ROUTE_CHECK_PBX:
   - start|ROUTE_INVITE_TO_INT:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_ACC_CALLER:
diff --git a/scenarios/invite_callforward/0029_test.yml.tt2 b/scenarios/invite_callforward/0029_test.yml.tt2
index 646ad553..322b5c99 100644
--- a/scenarios/invite_callforward/0029_test.yml.tt2
+++ b/scenarios/invite_callforward/0029_test.yml.tt2
@@ -21,6 +21,10 @@ flow:
   - start|ROUTE_CHECK_CLI_ALLOWED:
   - end|ROUTE_CHECK_CLI_ALLOWED:
   - end|ROUTE_CHECK_USERPROV_CLI:
+  - start|ROUTE_CHECK_USERPROV_CLI:
+  - 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:
@@ -36,6 +40,8 @@ flow:
   - start|ROUTE_BLOCK_IN:
   - end|ROUTE_BLOCK_IN:
   - end|ROUTE_LOAD_CALLEE_PREF:
+  - start|ROUTE_CHECK_PBX:
+  - return|ROUTE_CHECK_PBX:
   - start|ROUTE_INVITE_TO_INT:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_ACC_CALLER:
diff --git a/scenarios/invite_ignore_allowip/0005_test.yml.tt2 b/scenarios/invite_ignore_allowip/0005_test.yml.tt2
index cd3b38d3..6c908ff1 100644
--- a/scenarios/invite_ignore_allowip/0005_test.yml.tt2
+++ b/scenarios/invite_ignore_allowip/0005_test.yml.tt2
@@ -42,6 +42,8 @@ flow:
   - start|ROUTE_BLOCK_IN:
   - end|ROUTE_BLOCK_IN:
   - end|ROUTE_LOAD_CALLEE_PREF:
+  - start|ROUTE_CHECK_PBX:
+  - return|ROUTE_CHECK_PBX:
   - start|ROUTE_INVITE_TO_INT:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_ACC_CALLER:
@@ -118,7 +120,7 @@ sip_out:
       'P-Callee-UUID: \w+',
       'P-Asserted-Identity: <sip:4311002@',
       'P-Called-Party-ID: <sip:testuser1003@',
-      'P-App-Param: ;su=testuser1003;sr=[\w\.]+;sp=testuser;aleg_sst_enable=no;sst_enable=no',
+      'P-App-Param: ;aleg_sst_enable=no;sst_enable=no',
       'P-App-Name: sbc'
     ]
   - [
diff --git a/scenarios/invite_offline/0003_test.yml.tt2 b/scenarios/invite_offline/0003_test.yml.tt2
index e0fa6393..27a9616f 100644
--- a/scenarios/invite_offline/0003_test.yml.tt2
+++ b/scenarios/invite_offline/0003_test.yml.tt2
@@ -42,6 +42,8 @@ flow:
   - start|ROUTE_BLOCK_IN:
   - end|ROUTE_BLOCK_IN:
   - end|ROUTE_LOAD_CALLEE_PREF:
+  - start|ROUTE_CHECK_PBX:
+  - return|ROUTE_CHECK_PBX:
   - start|ROUTE_INVITE_TO_INT:
   - start|ROUTE_ACC_FAILURE:
   - start|ROUTE_ACC_CALLER:
@@ -49,7 +51,7 @@ flow:
   - start|ROUTE_ACC_CALLEE:
   - end|ROUTE_ACC_CALLEE:
   - end|ROUTE_ACC_FAILURE:
-  - start|ROUTE_EARLY_REJECT: 
+  - start|ROUTE_EARLY_REJECT:
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - end|ROUTE_ADD_CALLINFO_REPLY:
   - exit|ROUTE_EARLY_REJECT:
diff --git a/scenarios/invite_offline/0005_test.yml.tt2 b/scenarios/invite_offline/0005_test.yml.tt2
index 5feb337b..15c360af 100644
--- a/scenarios/invite_offline/0005_test.yml.tt2
+++ b/scenarios/invite_offline/0005_test.yml.tt2
@@ -42,6 +42,8 @@ flow:
   - start|ROUTE_BLOCK_IN:
   - end|ROUTE_BLOCK_IN:
   - end|ROUTE_LOAD_CALLEE_PREF:
+  - start|ROUTE_CHECK_PBX:
+  - return|ROUTE_CHECK_PBX:
   - start|ROUTE_INVITE_TO_INT:
   - start|ROUTE_ACC_FAILURE:
   - start|ROUTE_ACC_CALLER:
@@ -49,7 +51,7 @@ flow:
   - start|ROUTE_ACC_CALLEE:
   - end|ROUTE_ACC_CALLEE:
   - end|ROUTE_ACC_FAILURE:
-  - start|ROUTE_EARLY_REJECT: 
+  - start|ROUTE_EARLY_REJECT:
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - end|ROUTE_ADD_CALLINFO_REPLY:
   - exit|ROUTE_EARLY_REJECT:
diff --git a/scenarios/invite_peerout/0003_test.yml.tt2 b/scenarios/invite_peerout/0003_test.yml.tt2
index 3ae8c89a..23a99c90 100644
--- a/scenarios/invite_peerout/0003_test.yml.tt2
+++ b/scenarios/invite_peerout/0003_test.yml.tt2
@@ -38,6 +38,8 @@ flow:
   - end|ROUTE_NCOS:
   - start|ROUTE_BLOCK_OUT:
   - end|ROUTE_BLOCK_OUT:
+  - start|ROUTE_CHECK_PBX:
+  - return|ROUTE_CHECK_PBX:
   - start|ROUTE_INVITE_TO_EXT:
   - start|ROUTE_PSTN:
   - start|ROUTE_CLEAR_PEER_OUT_PREF:
diff --git a/scenarios/invite_peerout_rewrite/0003_test.yml.tt2 b/scenarios/invite_peerout_rewrite/0003_test.yml.tt2
index 7770b947..65da5aa7 100644
--- a/scenarios/invite_peerout_rewrite/0003_test.yml.tt2
+++ b/scenarios/invite_peerout_rewrite/0003_test.yml.tt2
@@ -23,6 +23,10 @@ flow:
   - end|ROUTE_GET_CALLER_CLI:
   - start|ROUTE_GET_FORWARDER_CLI:
   - end|ROUTE_GET_FORWARDER_CLI:
+  - start|ROUTE_APPLY_CALLER_RWR:
+  - start|ROUTE_APPLY_REWRITE_RULE:
+  - return|ROUTE_APPLY_REWRITE_RULE:
+  - end|ROUTE_APPLY_CALLER_RWR:
   - start|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_CHECK_CLI_ALLOWED:
   - end|ROUTE_CHECK_CLI_ALLOWED:
@@ -30,6 +34,8 @@ flow:
   - start|ROUTE_CLIR:
   - end|ROUTE_CLIR:
   - start|ROUTE_FIND_CALLEE:
+  - start|ROUTE_APPLY_REWRITE_RULE:
+  - return|ROUTE_APPLY_REWRITE_RULE:
   - start|ROUTE_CLEAR_CALLEE_PREF:
   - end|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_NCOS:
@@ -38,6 +44,8 @@ flow:
   - end|ROUTE_NCOS:
   - start|ROUTE_BLOCK_OUT:
   - end|ROUTE_BLOCK_OUT:
+  - start|ROUTE_CHECK_PBX:
+  - return|ROUTE_CHECK_PBX:
   - start|ROUTE_INVITE_TO_EXT:
   - start|ROUTE_PSTN:
   - start|ROUTE_CLEAR_PEER_OUT_PREF:
@@ -61,6 +69,12 @@ flow:
   - end|ROUTE_PREPARE_MOH:
 [% END -%]
   - start|ROUTE_SET_CALLER_CLI:
+  - start|ROUTE_APPLY_CALLER_RWR_FIRST:
+  - start|ROUTE_APPLY_REWRITE_RULE:
+  - return|ROUTE_APPLY_REWRITE_RULE:
+  - start|ROUTE_APPLY_REWRITE_RULE:
+  - return|ROUTE_APPLY_REWRITE_RULE:
+  - end|ROUTE_APPLY_CALLER_RWR_FIRST:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
@@ -75,6 +89,8 @@ flow:
   - end|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_SET_CALLEE:
+  - start|ROUTE_APPLY_REWRITE_RULE:
+  - return|ROUTE_APPLY_REWRITE_RULE:
   - end|ROUTE_SET_CALLEE:
   - start|ROUTE_ADD_CALLINFO:
   - end|ROUTE_ADD_CALLINFO:
diff --git a/scenarios/invite_redirect/0007_test.yml.tt2 b/scenarios/invite_redirect/0007_test.yml.tt2
index b00824f9..98836d9d 100644
--- a/scenarios/invite_redirect/0007_test.yml.tt2
+++ b/scenarios/invite_redirect/0007_test.yml.tt2
@@ -29,6 +29,8 @@ flow:
   - start|ROUTE_CLIR:
   - end|ROUTE_CLIR:
   - start|ROUTE_FIND_CALLEE:
+  - start|ROUTE_APPLY_REWRITE_RULE:
+  - return|ROUTE_APPLY_REWRITE_RULE:
   - start|ROUTE_CLEAR_CALLEE_PREF:
   - end|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_NCOS:
@@ -41,6 +43,8 @@ flow:
   - start|ROUTE_BLOCK_IN:
   - end|ROUTE_BLOCK_IN:
   - end|ROUTE_LOAD_CALLEE_PREF:
+  - start|ROUTE_CHECK_PBX:
+  - return|ROUTE_CHECK_PBX:
   - start|ROUTE_INVITE_TO_INT:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_ACC_CALLER:
@@ -90,6 +94,8 @@ flow:
   - end|ROUTE_CLEAR_CALLER_PREF:
   - end|ROUTE_LOAD_CALLER_PREF:
   - start|ROUTE_FIND_CALLEE:
+  - start|ROUTE_APPLY_REWRITE_RULE:
+  - return|ROUTE_APPLY_REWRITE_RULE:
   - start|ROUTE_CLEAR_CALLEE_PREF:
   - end|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_NCOS:
@@ -102,6 +108,8 @@ flow:
   - start|ROUTE_BLOCK_IN:
   - end|ROUTE_BLOCK_IN:
   - end|ROUTE_LOAD_CALLEE_PREF:
+  - start|ROUTE_CHECK_PBX:
+  - return|ROUTE_CHECK_PBX:
   - start|ROUTE_INVITE_TO_INT:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_ACC_CALLER:
diff --git a/scenarios/invite_speeddial/0007_test.yml.tt2 b/scenarios/invite_speeddial/0007_test.yml.tt2
index 0e2233a2..4aed25e3 100644
--- a/scenarios/invite_speeddial/0007_test.yml.tt2
+++ b/scenarios/invite_speeddial/0007_test.yml.tt2
@@ -30,6 +30,8 @@ flow:
   - start|ROUTE_CLIR:
   - end|ROUTE_CLIR:
   - start|ROUTE_FIND_CALLEE:
+  - start|ROUTE_APPLY_REWRITE_RULE:
+  - return|ROUTE_APPLY_REWRITE_RULE:
   - start|ROUTE_CLEAR_CALLEE_PREF:
   - end|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_NCOS:
@@ -42,6 +44,8 @@ flow:
   - start|ROUTE_BLOCK_IN:
   - end|ROUTE_BLOCK_IN:
   - end|ROUTE_LOAD_CALLEE_PREF:
+  - start|ROUTE_CHECK_PBX:
+  - return|ROUTE_CHECK_PBX:
   - start|ROUTE_INVITE_TO_INT:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_ACC_CALLER:
diff --git a/scenarios/invite_speeddial/0016_test.yml.tt2 b/scenarios/invite_speeddial/0016_test.yml.tt2
index 299ce240..099cff2f 100644
--- a/scenarios/invite_speeddial/0016_test.yml.tt2
+++ b/scenarios/invite_speeddial/0016_test.yml.tt2
@@ -30,6 +30,8 @@ flow:
   - start|ROUTE_CLIR:
   - end|ROUTE_CLIR:
   - start|ROUTE_FIND_CALLEE:
+  - start|ROUTE_APPLY_REWRITE_RULE:
+  - return|ROUTE_APPLY_REWRITE_RULE:
   - start|ROUTE_CLEAR_CALLEE_PREF:
   - end|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_NCOS:
@@ -42,6 +44,8 @@ flow:
   - start|ROUTE_BLOCK_IN:
   - end|ROUTE_BLOCK_IN:
   - end|ROUTE_LOAD_CALLEE_PREF:
+  - start|ROUTE_CHECK_PBX:
+  - return|ROUTE_CHECK_PBX:
   - start|ROUTE_INVITE_TO_INT:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_ACC_CALLER:
diff --git a/scenarios/invite_speeddial/0025_test.yml.tt2 b/scenarios/invite_speeddial/0025_test.yml.tt2
index 32510eb9..7b0548a8 100644
--- a/scenarios/invite_speeddial/0025_test.yml.tt2
+++ b/scenarios/invite_speeddial/0025_test.yml.tt2
@@ -30,6 +30,8 @@ flow:
   - start|ROUTE_CLIR:
   - end|ROUTE_CLIR:
   - start|ROUTE_FIND_CALLEE:
+  - start|ROUTE_APPLY_REWRITE_RULE:
+  - return|ROUTE_APPLY_REWRITE_RULE:
   - start|ROUTE_CLEAR_CALLEE_PREF:
   - end|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_NCOS:
@@ -38,6 +40,8 @@ flow:
   - end|ROUTE_NCOS:
   - start|ROUTE_BLOCK_OUT:
   - end|ROUTE_BLOCK_OUT:
+  - start|ROUTE_CHECK_PBX:
+  - return|ROUTE_CHECK_PBX:
   - start|ROUTE_INVITE_TO_EXT:
   - start|ROUTE_PSTN:
   - start|ROUTE_ACC_FAILURE:
diff --git a/scenarios/invite_voicebox/0003_test.yml.tt2 b/scenarios/invite_voicebox/0003_test.yml.tt2
index ce833b20..e1fe84d2 100644
--- a/scenarios/invite_voicebox/0003_test.yml.tt2
+++ b/scenarios/invite_voicebox/0003_test.yml.tt2
@@ -30,6 +30,8 @@ flow:
   - start|ROUTE_CLIR:
   - end|ROUTE_CLIR:
   - start|ROUTE_FIND_CALLEE:
+  - start|ROUTE_APPLY_REWRITE_RULE:
+  - return|ROUTE_APPLY_REWRITE_RULE:
   - 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 5cd31595..718b3ed6 100644
--- a/scenarios/invite_voicebox/0005_test.yml.tt2
+++ b/scenarios/invite_voicebox/0005_test.yml.tt2
@@ -20,9 +20,15 @@ flow:
   - start|ROUTE_CHECK_CLI_ALLOWED:
   - end|ROUTE_CHECK_CLI_ALLOWED:
   - end|ROUTE_CHECK_USERPROV_CLI:
+  - start|ROUTE_CHECK_USERPROV_CLI:
+  - 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_CHECK_PBX:
+  - return|ROUTE_CHECK_PBX:
   - start|ROUTE_VOICEBOX:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_ACC_CALLER:
diff --git a/scenarios/reminder/0003_test.yml.tt2 b/scenarios/reminder/0003_test.yml.tt2
index 96f8153a..969288ea 100644
--- a/scenarios/reminder/0003_test.yml.tt2
+++ b/scenarios/reminder/0003_test.yml.tt2
@@ -30,6 +30,8 @@ flow:
   - start|ROUTE_CLIR:
   - end|ROUTE_CLIR:
   - start|ROUTE_FIND_CALLEE:
+  - start|ROUTE_APPLY_REWRITE_RULE:
+  - return|ROUTE_APPLY_REWRITE_RULE:
   - start|ROUTE_TO_APPSRV:
   - start|ROUTE_LOAD_APPSRV:
   - end|ROUTE_LOAD_APPSRV: