TT#118950 Fix kct scenarios after the rework of the call forward

Mainly removed the routes: * ROUTE_ORDER_CF_MAP_ID * ROUTE_CHECK_CF_SOURCES * ROUTE_CHECK_CF_BNUMBERS * ROUTE_CHECK_CF_PERIOD Change-Id: I6485014e39f93bff66ad3fd454d72e4e6b19630b
4 years ago · eb58296bae
parent 4b846db7b3
commit eb58296bae
100 changed files with 9 additions and 261 deletions
--- a/disabled/invite_callforward/0009_test.yml.tt2
+++ b/disabled/invite_callforward/0009_test.yml.tt2
@ -62,8 +62,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/disabled/invite_callforward/0011_test.yml.tt2
+++ b/disabled/invite_callforward/0011_test.yml.tt2
@ -58,8 +58,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_CHECK_PBX:
  - return|ROUTE_CHECK_PBX:
@ -71,12 +69,6 @@ flow:
  - start|ROUTE_LOAD_CF_MAP:
  - return|ROUTE_LOAD_CF_MAP:
  - start|ROUTE_CHECK_CF:
-  - start|ROUTE_CHECK_CF_SOURCES:
-  - return|ROUTE_CHECK_CF_SOURCES:
-  - start|ROUTE_CHECK_CF_BNUMBERS:
-  - return|ROUTE_CHECK_CF_BNUMBERS:
-  - start|ROUTE_CHECK_CF_PERIOD:
-  - return|ROUTE_CHECK_CF_PERIOD:
  - return|ROUTE_CHECK_CF:
  - start|ROUTE_ACC_CF:
  - start|ROUTE_ACC_CALLER:
--- a/disabled/invite_callforward/0012_test.yml.tt2
+++ b/disabled/invite_callforward/0012_test.yml.tt2
@ -58,8 +58,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/disabled/invite_callforward/0015_test.yml.tt2
+++ b/disabled/invite_callforward/0015_test.yml.tt2
@ -62,8 +62,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_CHECK_PBX:
  - return|ROUTE_CHECK_PBX:
--- a/disabled/invite_callforward/0039_test.yml.tt2
+++ b/disabled/invite_callforward/0039_test.yml.tt2
@ -62,8 +62,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/disabled/invite_callforward/0040_test.yml.tt2
+++ b/disabled/invite_callforward/0040_test.yml.tt2
@ -58,8 +58,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_CHECK_PBX:
  - return|ROUTE_CHECK_PBX:
--- a/disabled/invite_callforward/0043_test.yml.tt2
+++ b/disabled/invite_callforward/0043_test.yml.tt2
@ -23,12 +23,6 @@ flow:
  - start|ROUTE_LOAD_CF_MAP:
  - return|ROUTE_LOAD_CF_MAP:
  - start|ROUTE_CHECK_CF:
-  - start|ROUTE_CHECK_CF_SOURCES:
-  - return|ROUTE_CHECK_CF_SOURCES:
-  - start|ROUTE_CHECK_CF_BNUMBERS:
-  - return|ROUTE_CHECK_CF_BNUMBERS:
-  - start|ROUTE_CHECK_CF_PERIOD:
-  - return|ROUTE_CHECK_CF_PERIOD:
  - return|ROUTE_CHECK_CF:
  - start|ROUTE_EXECUTE_CF_LOOP:
  - start|ROUTE_ADD_AOC_HEADER:
--- a/disabled/invite_callforward/0044_test.yml.tt2
+++ b/disabled/invite_callforward/0044_test.yml.tt2
@ -58,8 +58,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/disabled/invite_callforward/0046_test.yml.tt2
+++ b/disabled/invite_callforward/0046_test.yml.tt2
@ -62,8 +62,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_CHECK_PBX:
  - return|ROUTE_CHECK_PBX:
--- a/disabled/invite_group_parallel/0007_test.yml.tt2
+++ b/disabled/invite_group_parallel/0007_test.yml.tt2
@ -72,8 +72,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/disabled/invite_group_parallel/0009_test.yml.tt2
+++ b/disabled/invite_group_parallel/0009_test.yml.tt2
@ -63,8 +63,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_CHECK_PBX:
  - return|ROUTE_CHECK_PBX:
--- a/disabled/invite_group_parallel/0011_test.yml.tt2
+++ b/disabled/invite_group_parallel/0011_test.yml.tt2
@ -58,8 +58,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_CHECK_PBX:
  - return|ROUTE_CHECK_PBX:
--- a/disabled/invite_group_parallel/0012_test.yml.tt2
+++ b/disabled/invite_group_parallel/0012_test.yml.tt2
@ -58,8 +58,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_CHECK_PBX:
  - return|ROUTE_CHECK_PBX:
--- a/disabled/invite_group_serial/0007_test.yml.tt2
+++ b/disabled/invite_group_serial/0007_test.yml.tt2
@ -72,8 +72,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/disabled/invite_group_serial/0009_test.yml.tt2
+++ b/disabled/invite_group_serial/0009_test.yml.tt2
@ -61,8 +61,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_CHECK_PBX:
  - return|ROUTE_CHECK_PBX:
--- a/disabled/invite_group_serial/0011_test.yml.tt2
+++ b/disabled/invite_group_serial/0011_test.yml.tt2
@ -58,8 +58,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_CHECK_PBX:
  - return|ROUTE_CHECK_PBX:
--- a/disabled/invite_group_serial/0020_test.yml.tt2
+++ b/disabled/invite_group_serial/0020_test.yml.tt2
@ -58,8 +58,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_CHECK_PBX:
  - return|ROUTE_CHECK_PBX:
--- a/disabled/invite_no_404_fallback/0005_test.yml.tt2
+++ b/disabled/invite_no_404_fallback/0005_test.yml.tt2
@ -60,8 +60,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/disabled/invite_perm_reg/0003_test.yml.tt2
+++ b/disabled/invite_perm_reg/0003_test.yml.tt2
@ -72,8 +72,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/disabled/invite_perm_reg/0004_test.yml.tt2
+++ b/disabled/invite_perm_reg/0004_test.yml.tt2
@ -61,8 +61,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_CHECK_PBX:
  - return|ROUTE_CHECK_PBX:
--- a/disabled/invite_queue/0005_test.yml.tt2
+++ b/disabled/invite_queue/0005_test.yml.tt2
@ -72,8 +72,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/disabled/invite_queue/0007_test.yml.tt2
+++ b/disabled/invite_queue/0007_test.yml.tt2
@ -61,8 +61,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_CHECK_PBX:
  - return|ROUTE_CHECK_PBX:
--- a/disabled/invite_queue/0009_test.yml.tt2
+++ b/disabled/invite_queue/0009_test.yml.tt2
@ -54,8 +54,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_CHECK_PBX:
  - return|ROUTE_CHECK_PBX:
--- a/disabled/invite_queue/0011_test.yml.tt2
+++ b/disabled/invite_queue/0011_test.yml.tt2
@ -54,8 +54,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_CHECK_PBX:
  - return|ROUTE_CHECK_PBX:
--- a/disabled/invite_speeddial/0007_test.yml.tt2
+++ b/disabled/invite_speeddial/0007_test.yml.tt2
@ -55,8 +55,6 @@ flow:
  - start|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_CHECK_PBX:
  - return|ROUTE_CHECK_PBX:
--- a/disabled/invite_speeddial/0016_test.yml.tt2
+++ b/disabled/invite_speeddial/0016_test.yml.tt2
@ -55,8 +55,6 @@ flow:
  - start|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_CHECK_PBX:
  - return|ROUTE_CHECK_PBX:
--- a/disabled/invite_username_devid_fulllookup/0009_test.yml.tt2
+++ b/disabled/invite_username_devid_fulllookup/0009_test.yml.tt2
@ -62,8 +62,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/disabled/invite_username_devid_fulllookup/0010_test.yml.tt2
+++ b/disabled/invite_username_devid_fulllookup/0010_test.yml.tt2
@ -60,8 +60,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_CHECK_PBX:
  - return|ROUTE_CHECK_PBX:
--- a/disabled/invite_xfer_blind_callee/0005_test.yml.tt2
+++ b/disabled/invite_xfer_blind_callee/0005_test.yml.tt2
@ -72,8 +72,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/disabled/invite_xfer_blind_callee/0007_test.yml.tt2
+++ b/disabled/invite_xfer_blind_callee/0007_test.yml.tt2
@ -63,8 +63,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_CHECK_PBX:
  - return|ROUTE_CHECK_PBX:
--- a/disabled/invite_xfer_blind_caller/0005_test.yml.tt2
+++ b/disabled/invite_xfer_blind_caller/0005_test.yml.tt2
@ -72,8 +72,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/disabled/invite_xfer_blind_caller/0007_test.yml.tt2
+++ b/disabled/invite_xfer_blind_caller/0007_test.yml.tt2
@ -63,8 +63,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_CHECK_PBX:
  - return|ROUTE_CHECK_PBX:
--- a/scenarios/incoming_foreign_dom/0003_test.yml.tt2
+++ b/scenarios/incoming_foreign_dom/0003_test.yml.tt2
@ -66,8 +66,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
@ -98,7 +96,7 @@ flow:
  - start|ROUTE_CNT_DLG_CHECK:
  - return|ROUTE_CNT_DLG_CHECK:
  - return|ROUTE_SET_CALLER_DIALOG:
-      $avp(lua_dlg_profile): [
+     $avp(lua_dlg_profile): [
        "accountout:0",
        "userout:0",
        "account:0",
@ -177,7 +175,7 @@ flow:
  - start|ROUTE_RUNTIME:
  - return|ROUTE_RUNTIME:
  - exit|ROUTE_EXIT:
-      $avp(lua_dlg_profile): [
+     $avp(lua_dlg_profile): [
        "accountout:0",
        "userout:0",
        "account:0",
--- a/scenarios/incoming_hih/0003_test.yml.tt2
+++ b/scenarios/incoming_hih/0003_test.yml.tt2
@ -23,7 +23,7 @@ flow:
  - start|ROUTE_DLG_MANAGE:
  - return|ROUTE_DLG_MANAGE:
  - return|ROUTE_LOAD_PEER_IN_PREF:
-      $avp(lua_dlg_profile): ["peer:[% peer_00_host0.id %]", "total"]
+     $avp(lua_dlg_profile): ["peer:[% peer_00_host0.id %]", "total"]
  - start|ROUTE_PROCESS_INCOMING_HIH:
  - return|ROUTE_PROCESS_INCOMING_HIH:
  - return|ROUTE_FIND_CALLER:
@ -49,7 +49,7 @@ flow:
  - start|ROUTE_CNT_DLG_CHECK:
  - return|ROUTE_CNT_DLG_CHECK:
  - return|ROUTE_SET_CALLEE_DIALOG:
-      $avp(lua_dlg_profile): [
+     $avp(lua_dlg_profile): [
        "totalaccount:[% customer_test.id %]",
        "totaluser:[% spce_test.testuser1003.uuid %]",
        "account:[% customer_test.id %]",
@ -58,8 +58,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
@ -83,12 +81,6 @@ flow:
  - start|ROUTE_LOAD_CF_MAP:
  - return|ROUTE_LOAD_CF_MAP:
  - start|ROUTE_CHECK_CF:
-  - start|ROUTE_CHECK_CF_SOURCES:
-  - return|ROUTE_CHECK_CF_SOURCES:
-  - start|ROUTE_CHECK_CF_BNUMBERS:
-  - return|ROUTE_CHECK_CF_BNUMBERS:
-  - start|ROUTE_CHECK_CF_PERIOD:
-  - return|ROUTE_CHECK_CF_PERIOD:
  - return|ROUTE_CHECK_CF:
  - start|ROUTE_ACC_CF:
  - start|ROUTE_ACC_CALLER:
@ -177,4 +169,3 @@ sip_out:
      'P-NGCP-Forward-Info: <sip:4311003@',
      'P-NGCP-Callee-Info: <sip:4311002@'
    ]
-
--- a/scenarios/incoming_hih/0005_test.yml.tt2
+++ b/scenarios/incoming_hih/0005_test.yml.tt2
@ -45,8 +45,8 @@ flow:
  - return|ROUTE_CHECK_CLI_ALLOWED:
  - return|ROUTE_CHECK_USERPROV_CLI:
  - start|ROUTE_FIND_CALLEE:
-      $var(cf_loop): 1
-      $var(forward): 0
+     $var(cf_loop): 1
+     $var(forward): 0
  - start|ROUTE_CLEAR_CALLEE_PREF:
  - return|ROUTE_CLEAR_CALLEE_PREF:
  - start|ROUTE_LOAD_CALLEE_PREF:
@ -66,8 +66,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/incoming_peer/0003_test.yml.tt2
+++ b/scenarios/incoming_peer/0003_test.yml.tt2
@ -47,7 +47,7 @@ flow:
  - start|ROUTE_CNT_DLG_CHECK:
  - return|ROUTE_CNT_DLG_CHECK:
  - return|ROUTE_SET_CALLEE_DIALOG:
-      $avp(lua_dlg_profile): [
+     $avp(lua_dlg_profile): [
        "totalaccount:[% customer_test.id %]",
        "totaluser:[% spce_test.testuser1003.uuid %]",
        "account:[% customer_test.id %]",
@ -57,8 +57,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
      $xavp(caller_peer_prefs[0]=>concurrent_max[*]): [1]
  - start|ROUTE_NCOS_CHECK:
--- a/scenarios/invite/0005_test.yml.tt2
+++ b/scenarios/invite/0005_test.yml.tt2
@ -72,8 +72,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/invite/responder00_01.yml.tt2
+++ b/scenarios/invite/responder00_01.yml.tt2
--- a/scenarios/invite_allowedcli_match/0005_test.yml.tt2
+++ b/scenarios/invite_allowedcli_match/0005_test.yml.tt2
@ -79,8 +79,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2
+++ b/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2
@ -79,8 +79,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2
+++ b/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2
@ -55,10 +55,10 @@ flow:
  - start|ROUTE_CLIR:
  - return|ROUTE_CLIR:
  - start|ROUTE_CALLER_BLOCK_CLI:
+      $xavp(caller_real_prefs[0]=>allowed_clis[*]): ['43110021*', '43110029*']
  - 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_FIND_CALLEE:
@ -80,8 +80,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
@ -109,7 +107,7 @@ flow:
  - return|ROUTE_LOOKUP_SUBSCRIBER_LOCATIONS:
  - start|ROUTE_OUTBOUND:
  - start|ROUTE_SET_CALLER_DIALOG:
-      $avp(lua_dlg_profile) : [
+     $avp(lua_dlg_profile) : [
        "local",
        "totalaccount:[% customer_test.id %]",
        "totaluser:[% spce_test.testuser1003.uuid %]",
--- a/scenarios/invite_anonymous/0005_test.yml.tt2
+++ b/scenarios/invite_anonymous/0005_test.yml.tt2
@ -73,8 +73,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/invite_blockout_blst/0003_test.yml.tt2
+++ b/scenarios/invite_blockout_blst/0003_test.yml.tt2
@ -65,8 +65,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/invite_blockout_ncos/0003_test.yml.tt2
+++ b/scenarios/invite_blockout_ncos/0003_test.yml.tt2
@ -65,8 +65,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/invite_blockout_pinoverride/0005_test.yml.tt2
+++ b/scenarios/invite_blockout_pinoverride/0005_test.yml.tt2
@ -72,8 +72,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/invite_blockout_wlst/0003_test.yml.tt2
+++ b/scenarios/invite_blockout_wlst/0003_test.yml.tt2
@ -65,8 +65,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/invite_callee_bye/0005_test.yml.tt2
+++ b/scenarios/invite_callee_bye/0005_test.yml.tt2
@ -60,8 +60,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/invite_callforward/0009_test.yml.tt2
+++ b/scenarios/invite_callforward/0009_test.yml.tt2
@ -72,8 +72,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
@ -97,12 +95,6 @@ flow:
  - start|ROUTE_LOAD_CF_MAP:
  - return|ROUTE_LOAD_CF_MAP:
  - start|ROUTE_CHECK_CF:
-  - start|ROUTE_CHECK_CF_SOURCES:
-  - return|ROUTE_CHECK_CF_SOURCES:
-  - start|ROUTE_CHECK_CF_BNUMBERS:
-  - return|ROUTE_CHECK_CF_BNUMBERS:
-  - start|ROUTE_CHECK_CF_PERIOD:
-  - return|ROUTE_CHECK_CF_PERIOD:
  - return|ROUTE_CHECK_CF:
  - start|ROUTE_ACC_CF:
  - start|ROUTE_ACC_CALLER:
--- a/scenarios/invite_callforward/0011_test.yml.tt2
+++ b/scenarios/invite_callforward/0011_test.yml.tt2
@ -64,8 +64,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/invite_callforward/0032_test.yml.tt2
+++ b/scenarios/invite_callforward/0032_test.yml.tt2
@ -72,8 +72,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/invite_callforward/0039_test.yml.tt2
+++ b/scenarios/invite_callforward/0039_test.yml.tt2
@ -64,8 +64,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/invite_concurrent_max/0007_test.yml.tt2
+++ b/scenarios/invite_concurrent_max/0007_test.yml.tt2
@ -74,8 +74,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
      $xavp(callee_real_prefs[0]=>concurrent_max[*]): [1]
      $xavp(callee_real_prefs[0]=>concurrent_max_out[*]): None
--- a/scenarios/invite_concurrent_max_per_account/0007_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_per_account/0007_test.yml.tt2
@ -1,4 +1,3 @@
-# INVITE_OFFLINE scenario
 flow:
  - start|DEFAULT_ROUTE:
  - start|ROUTE_ENTRY:
@ -75,8 +74,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
      $xavp(callee_real_prefs[0]=>concurrent_max[*]): None
      $xavp(callee_real_prefs[0]=>concurrent_max_out[*]): None
--- a/scenarios/invite_conference_update/0003_test.yml.tt2
+++ b/scenarios/invite_conference_update/0003_test.yml.tt2
@ -73,8 +73,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
@ -98,12 +96,6 @@ flow:
  - start|ROUTE_LOAD_CF_MAP:
  - return|ROUTE_LOAD_CF_MAP:
  - start|ROUTE_CHECK_CF:
-  - start|ROUTE_CHECK_CF_SOURCES:
-  - return|ROUTE_CHECK_CF_SOURCES:
-  - start|ROUTE_CHECK_CF_BNUMBERS:
-  - return|ROUTE_CHECK_CF_BNUMBERS:
-  - start|ROUTE_CHECK_CF_PERIOD:
-  - return|ROUTE_CHECK_CF_PERIOD:
  - return|ROUTE_CHECK_CF:
  - start|ROUTE_ACC_CF:
  - start|ROUTE_ACC_CALLER:
--- a/scenarios/invite_force_inbound_calls_to_peer/0003_test.yml.tt2
+++ b/scenarios/invite_force_inbound_calls_to_peer/0003_test.yml.tt2
@ -60,8 +60,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/invite_force_outbound_calls_to_peer/0003_test.yml.tt2
+++ b/scenarios/invite_force_outbound_calls_to_peer/0003_test.yml.tt2
@ -60,8 +60,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/invite_hdr/0005_test.yml.tt2
+++ b/scenarios/invite_hdr/0005_test.yml.tt2
@ -72,8 +72,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/invite_hm/0005_test.yml.tt2
+++ b/scenarios/invite_hm/0005_test.yml.tt2
@ -72,8 +72,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/invite_hm_callforward/0005_test.yml.tt2
+++ b/scenarios/invite_hm_callforward/0005_test.yml.tt2
@ -72,8 +72,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
@ -97,12 +95,6 @@ flow:
  - start|ROUTE_LOAD_CF_MAP:
  - return|ROUTE_LOAD_CF_MAP:
  - start|ROUTE_CHECK_CF:
-  - start|ROUTE_CHECK_CF_SOURCES:
-  - return|ROUTE_CHECK_CF_SOURCES:
-  - start|ROUTE_CHECK_CF_BNUMBERS:
-  - return|ROUTE_CHECK_CF_BNUMBERS:
-  - start|ROUTE_CHECK_CF_PERIOD:
-  - return|ROUTE_CHECK_CF_PERIOD:
  - return|ROUTE_CHECK_CF:
  - start|ROUTE_ACC_CF:
  - start|ROUTE_ACC_CALLER:
--- a/scenarios/invite_hm_callforward/0007_test.yml.tt2
+++ b/scenarios/invite_hm_callforward/0007_test.yml.tt2
@ -64,8 +64,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/invite_ignore_allowip/0005_test.yml.tt2
+++ b/scenarios/invite_ignore_allowip/0005_test.yml.tt2
@ -67,8 +67,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/invite_lateoam/0005_test.yml.tt2
+++ b/scenarios/invite_lateoam/0005_test.yml.tt2
@ -72,8 +72,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/invite_no_refer/0005_test.yml.tt2
+++ b/scenarios/invite_no_refer/0005_test.yml.tt2
@ -72,8 +72,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/invite_offline/0003_test.yml.tt2
+++ b/scenarios/invite_offline/0003_test.yml.tt2
@ -72,8 +72,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/invite_offline/0005_test.yml.tt2
+++ b/scenarios/invite_offline/0005_test.yml.tt2
@ -72,8 +72,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/invite_pai_none/0005_test.yml.tt2
+++ b/scenarios/invite_pai_none/0005_test.yml.tt2
@ -72,8 +72,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/invite_perm_reg/0003_test.yml.tt2
+++ b/scenarios/invite_perm_reg/0003_test.yml.tt2
@ -72,8 +72,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/invite_q_forking/0007_test.yml.tt2
+++ b/scenarios/invite_q_forking/0007_test.yml.tt2
@ -72,8 +72,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/invite_record_call/0005_test.yml.tt2
+++ b/scenarios/invite_record_call/0005_test.yml.tt2
@ -72,8 +72,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/invite_redirect/0007_test.yml.tt2
+++ b/scenarios/invite_redirect/0007_test.yml.tt2
@ -72,8 +72,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/invite_redirect/0012_test.yml.tt2
+++ b/scenarios/invite_redirect/0012_test.yml.tt2
@ -57,8 +57,6 @@ flow:
        ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/invite_redirect_blocked/0005_test.yml.tt2
+++ b/scenarios/invite_redirect_blocked/0005_test.yml.tt2
@ -72,8 +72,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/invite_reinvite_transcoding/0003_test.yml.tt2
+++ b/scenarios/invite_reinvite_transcoding/0003_test.yml.tt2
@ -48,8 +48,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/invite_retrans/0005_test.yml.tt2
+++ b/scenarios/invite_retrans/0005_test.yml.tt2
@ -72,8 +72,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/invite_tcp_udp/0005_test.yml.tt2
+++ b/scenarios/invite_tcp_udp/0005_test.yml.tt2
@ -72,8 +72,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/invite_tcp_udp_reinvite/0005_test.yml.tt2
+++ b/scenarios/invite_tcp_udp_reinvite/0005_test.yml.tt2
@ -72,8 +72,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/invite_trusted_anonymous/0003_test.yml.tt2
+++ b/scenarios/invite_trusted_anonymous/0003_test.yml.tt2
@ -59,8 +59,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/invite_voicebox/0003_test.yml.tt2
+++ b/scenarios/invite_voicebox/0003_test.yml.tt2
@ -73,8 +73,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
@ -98,12 +96,6 @@ flow:
  - start|ROUTE_LOAD_CF_MAP:
  - return|ROUTE_LOAD_CF_MAP:
  - start|ROUTE_CHECK_CF:
-  - start|ROUTE_CHECK_CF_SOURCES:
-  - return|ROUTE_CHECK_CF_SOURCES:
-  - start|ROUTE_CHECK_CF_BNUMBERS:
-  - return|ROUTE_CHECK_CF_BNUMBERS:
-  - start|ROUTE_CHECK_CF_PERIOD:
-  - return|ROUTE_CHECK_CF_PERIOD:
  - return|ROUTE_CHECK_CF:
  - start|ROUTE_ACC_CF:
  - start|ROUTE_ACC_CALLER:
--- a/scenarios/invite_wrong_reg/0005_test.yml.tt2
+++ b/scenarios/invite_wrong_reg/0005_test.yml.tt2
@ -72,8 +72,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/lock_ported/0005_test.yml.tt2
+++ b/scenarios/lock_ported/0005_test.yml.tt2
@ -72,8 +72,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
@ -97,12 +95,6 @@ flow:
  - start|ROUTE_LOAD_CF_MAP:
  - return|ROUTE_LOAD_CF_MAP:
  - start|ROUTE_CHECK_CF:
-  - start|ROUTE_CHECK_CF_SOURCES:
-  - return|ROUTE_CHECK_CF_SOURCES:
-  - start|ROUTE_CHECK_CF_BNUMBERS:
-  - return|ROUTE_CHECK_CF_BNUMBERS:
-  - start|ROUTE_CHECK_CF_PERIOD:
-  - return|ROUTE_CHECK_CF_PERIOD:
  - return|ROUTE_CHECK_CF:
  - start|ROUTE_ACC_CF:
  - start|ROUTE_ACC_CALLER:
--- a/scenarios/lock_ported/0006_test.yml.tt2
+++ b/scenarios/lock_ported/0006_test.yml.tt2
@ -67,8 +67,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/timer_session_callee_only_supported/0003_test.yml.tt2
+++ b/scenarios/timer_session_callee_only_supported/0003_test.yml.tt2
@ -49,8 +49,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/timer_session_caller_only_supported/0003_test.yml.tt2
+++ b/scenarios/timer_session_caller_only_supported/0003_test.yml.tt2
@ -49,8 +49,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios/timer_session_supported/0003_test.yml.tt2
+++ b/scenarios/timer_session_supported/0003_test.yml.tt2
@ -49,8 +49,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios_lnp/incoming_peer/0001_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0001_test.yml.tt2
@ -57,8 +57,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
      $xavp(caller_peer_prefs[0]=>concurrent_max[*]): [1]
  - start|ROUTE_NCOS_CHECK:
@ -83,12 +81,6 @@ flow:
  - start|ROUTE_LOAD_CF_MAP:
  - return|ROUTE_LOAD_CF_MAP:
  - start|ROUTE_CHECK_CF:
-  - start|ROUTE_CHECK_CF_SOURCES:
-  - return|ROUTE_CHECK_CF_SOURCES:
-  - start|ROUTE_CHECK_CF_BNUMBERS:
-  - return|ROUTE_CHECK_CF_BNUMBERS:
-  - start|ROUTE_CHECK_CF_PERIOD:
-  - return|ROUTE_CHECK_CF_PERIOD:
  - return|ROUTE_CHECK_CF:
  - start|ROUTE_ACC_CF:
  - start|ROUTE_ACC_CALLER:
--- a/scenarios_lnp/invite/0003_test.yml.tt2
+++ b/scenarios_lnp/invite/0003_test.yml.tt2
@ -67,8 +67,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios_pbx/incoming_shared_line/0007_test.yml.tt2
+++ b/scenarios_pbx/incoming_shared_line/0007_test.yml.tt2
@ -62,8 +62,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios_pbx/incoming_shared_line/0009_test.yml.tt2
+++ b/scenarios_pbx/incoming_shared_line/0009_test.yml.tt2
@ -60,8 +60,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_CHECK_PBX:
  - return|ROUTE_CHECK_PBX:
--- a/scenarios_pbx/invite/0005_test.yml.tt2
+++ b/scenarios_pbx/invite/0005_test.yml.tt2
@ -72,8 +72,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios_pbx/invite/0007_test.yml.tt2
+++ b/scenarios_pbx/invite/0007_test.yml.tt2
@ -63,8 +63,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_CHECK_PBX:
  - return|ROUTE_CHECK_PBX:
--- a/scenarios_pbx/invite_alias/0005_test.yml.tt2
+++ b/scenarios_pbx/invite_alias/0005_test.yml.tt2
@ -62,8 +62,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios_pbx/invite_alias/0007_test.yml.tt2
+++ b/scenarios_pbx/invite_alias/0007_test.yml.tt2
@ -60,8 +60,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_CHECK_PBX:
  - return|ROUTE_CHECK_PBX:
--- a/scenarios_pbx/invite_alias_devid/0009_test.yml.tt2
+++ b/scenarios_pbx/invite_alias_devid/0009_test.yml.tt2
@ -62,8 +62,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios_pbx/invite_alias_devid/0010_test.yml.tt2
+++ b/scenarios_pbx/invite_alias_devid/0010_test.yml.tt2
@ -60,8 +60,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_CHECK_PBX:
  - return|ROUTE_CHECK_PBX:
--- a/scenarios_pbx/invite_alias_devid_fulllookup/0009_test.yml.tt2
+++ b/scenarios_pbx/invite_alias_devid_fulllookup/0009_test.yml.tt2
@ -62,8 +62,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios_pbx/invite_alias_devid_fulllookup/0011_test.yml.tt2
+++ b/scenarios_pbx/invite_alias_devid_fulllookup/0011_test.yml.tt2
@ -60,8 +60,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_CHECK_PBX:
  - return|ROUTE_CHECK_PBX:
--- a/scenarios_pbx/invite_shared_line/0005_test.yml.tt2
+++ b/scenarios_pbx/invite_shared_line/0005_test.yml.tt2
@ -67,8 +67,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios_pbx/invite_shared_line/0007_test.yml.tt2
+++ b/scenarios_pbx/invite_shared_line/0007_test.yml.tt2
@ -63,8 +63,6 @@ flow:
      ]
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_CHECK_PBX:
  - return|ROUTE_CHECK_PBX:
--- a/scenarios_pbx/invite_username_devid/0009_test.yml.tt2
+++ b/scenarios_pbx/invite_username_devid/0009_test.yml.tt2
@ -62,8 +62,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_NCOS_CHECK:
  - start|ROUTE_NCOS:
--- a/scenarios_pbx/invite_username_devid/0010_test.yml.tt2
+++ b/scenarios_pbx/invite_username_devid/0010_test.yml.tt2
@ -60,8 +60,6 @@ flow:
  - return|ROUTE_SET_CALLEE_DIALOG:
  - start|ROUTE_BLOCK_IN:
  - return|ROUTE_BLOCK_IN:
-  - start|ROUTE_ORDER_CF_MAP_ID:
-  - return|ROUTE_ORDER_CF_MAP_ID:
  - return|ROUTE_LOAD_CALLEE_PREF:
  - start|ROUTE_CHECK_PBX:
  - return|ROUTE_CHECK_PBX: