diff --git a/scenarios/incoming_foreign_dom/0003_test.yml.tt2 b/scenarios/incoming_foreign_dom/0003_test.yml.tt2 index ec6b7ae7..5ff3ccfc 100644 --- a/scenarios/incoming_foreign_dom/0003_test.yml.tt2 +++ b/scenarios/incoming_foreign_dom/0003_test.yml.tt2 @@ -43,8 +43,6 @@ flow: - start|ROUTE_BLOCK_OUT: - end|ROUTE_BLOCK_OUT: - start|ROUTE_LOAD_CALLEE_PREF: - - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: - start|ROUTE_BLOCK_IN: - end|ROUTE_BLOCK_IN: - end|ROUTE_LOAD_CALLEE_PREF: @@ -56,6 +54,8 @@ flow: - end|ROUTE_ACC_CALLER: - start|ROUTE_ACC_CALLEE: - end|ROUTE_ACC_CALLEE: + - start|ROUTE_SET_CALLER_DIALOG: + - end|ROUTE_SET_CALLER_DIALOG: - start|BRANCH_ROUTE_SBC: - start|ROUTE_BRANCH_ACC_RTP: - end|ROUTE_BRANCH_ACC_RTP: diff --git a/scenarios/incoming_peer/0003_test.yml.tt2 b/scenarios/incoming_peer/0003_test.yml.tt2 index 70f58765..8519df81 100644 --- a/scenarios/incoming_peer/0003_test.yml.tt2 +++ b/scenarios/incoming_peer/0003_test.yml.tt2 @@ -36,8 +36,6 @@ flow: - start|ROUTE_BLOCK_OUT: - end|ROUTE_BLOCK_OUT: - start|ROUTE_LOAD_CALLEE_PREF: - - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: - start|ROUTE_BLOCK_IN: - end|ROUTE_BLOCK_IN: - end|ROUTE_LOAD_CALLEE_PREF: @@ -50,6 +48,8 @@ flow: - end|ROUTE_ACC_CALLER: - start|ROUTE_ACC_CALLEE: - end|ROUTE_ACC_CALLEE: + - start|ROUTE_SET_CALLER_DIALOG: + - end|ROUTE_SET_CALLER_DIALOG: - start|BRANCH_ROUTE_SBC: - start|ROUTE_BRANCH_ACC_RTP: - end|ROUTE_BRANCH_ACC_RTP: diff --git a/scenarios/invite/0005_test.yml.tt2 b/scenarios/invite/0005_test.yml.tt2 index b8c5e696..acbcd6df 100644 --- a/scenarios/invite/0005_test.yml.tt2 +++ b/scenarios/invite/0005_test.yml.tt2 @@ -43,8 +43,6 @@ flow: - start|ROUTE_BLOCK_OUT: - end|ROUTE_BLOCK_OUT: - start|ROUTE_LOAD_CALLEE_PREF: - - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: - start|ROUTE_BLOCK_IN: - end|ROUTE_BLOCK_IN: - end|ROUTE_LOAD_CALLEE_PREF: @@ -56,6 +54,8 @@ flow: - end|ROUTE_ACC_CALLER: - start|ROUTE_ACC_CALLEE: - end|ROUTE_ACC_CALLEE: + - start|ROUTE_SET_CALLER_DIALOG: + - end|ROUTE_SET_CALLER_DIALOG: - start|BRANCH_ROUTE_SBC: - start|ROUTE_BRANCH_ACC_RTP: - end|ROUTE_BRANCH_ACC_RTP: diff --git a/scenarios/invite_allowedcli_match/0005_test.yml.tt2 b/scenarios/invite_allowedcli_match/0005_test.yml.tt2 index be7cac9a..b2c89e3d 100644 --- a/scenarios/invite_allowedcli_match/0005_test.yml.tt2 +++ b/scenarios/invite_allowedcli_match/0005_test.yml.tt2 @@ -50,8 +50,6 @@ flow: - start|ROUTE_BLOCK_OUT: - end|ROUTE_BLOCK_OUT: - start|ROUTE_LOAD_CALLEE_PREF: - - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: - start|ROUTE_BLOCK_IN: - end|ROUTE_BLOCK_IN: - end|ROUTE_LOAD_CALLEE_PREF: @@ -63,6 +61,8 @@ flow: - end|ROUTE_ACC_CALLER: - start|ROUTE_ACC_CALLEE: - end|ROUTE_ACC_CALLEE: + - start|ROUTE_SET_CALLER_DIALOG: + - end|ROUTE_SET_CALLER_DIALOG: - start|BRANCH_ROUTE_SBC: - start|ROUTE_BRANCH_ACC_RTP: - end|ROUTE_BRANCH_ACC_RTP: diff --git a/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2 b/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2 index a9785e30..78b9350c 100644 --- a/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2 +++ b/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2 @@ -49,8 +49,6 @@ flow: - start|ROUTE_BLOCK_OUT: - end|ROUTE_BLOCK_OUT: - start|ROUTE_LOAD_CALLEE_PREF: - - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: - start|ROUTE_BLOCK_IN: - end|ROUTE_BLOCK_IN: - end|ROUTE_LOAD_CALLEE_PREF: @@ -62,6 +60,8 @@ flow: - end|ROUTE_ACC_CALLER: - start|ROUTE_ACC_CALLEE: - end|ROUTE_ACC_CALLEE: + - start|ROUTE_SET_CALLER_DIALOG: + - end|ROUTE_SET_CALLER_DIALOG: - start|BRANCH_ROUTE_SBC: - start|ROUTE_BRANCH_ACC_RTP: - end|ROUTE_BRANCH_ACC_RTP: diff --git a/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2 b/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2 index 4611e267..f381dae2 100644 --- a/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2 +++ b/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2 @@ -50,8 +50,6 @@ flow: - start|ROUTE_BLOCK_OUT: - end|ROUTE_BLOCK_OUT: - start|ROUTE_LOAD_CALLEE_PREF: - - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: - start|ROUTE_BLOCK_IN: - end|ROUTE_BLOCK_IN: - end|ROUTE_LOAD_CALLEE_PREF: @@ -63,6 +61,8 @@ flow: - end|ROUTE_ACC_CALLER: - start|ROUTE_ACC_CALLEE: - end|ROUTE_ACC_CALLEE: + - start|ROUTE_SET_CALLER_DIALOG: + - end|ROUTE_SET_CALLER_DIALOG: - start|BRANCH_ROUTE_SBC: - start|ROUTE_BRANCH_ACC_RTP: - end|ROUTE_BRANCH_ACC_RTP: diff --git a/scenarios/invite_blockin_blst/0003_test.yml.tt2 b/scenarios/invite_blockin_blst/0003_test.yml.tt2 index d65f4634..b2068691 100644 --- a/scenarios/invite_blockin_blst/0003_test.yml.tt2 +++ b/scenarios/invite_blockin_blst/0003_test.yml.tt2 @@ -43,14 +43,14 @@ flow: - start|ROUTE_BLOCK_OUT: - end|ROUTE_BLOCK_OUT: - start|ROUTE_LOAD_CALLEE_PREF: - - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: - start|ROUTE_BLOCK_IN: - start|ROUTE_ACC_FAILURE: - start|ROUTE_ACC_CALLER: - end|ROUTE_ACC_CALLER: - start|ROUTE_ACC_CALLEE: - end|ROUTE_ACC_CALLEE: + - start|ROUTE_SET_CALLER_DIALOG: + - end|ROUTE_SET_CALLER_DIALOG: - end|ROUTE_ACC_FAILURE: - start|ROUTE_EARLY_REJECT: - start|ROUTE_ADD_CALLINFO_REPLY: diff --git a/scenarios/invite_blockin_clir/0003_test.yml.tt2 b/scenarios/invite_blockin_clir/0003_test.yml.tt2 index d65f4634..b2068691 100644 --- a/scenarios/invite_blockin_clir/0003_test.yml.tt2 +++ b/scenarios/invite_blockin_clir/0003_test.yml.tt2 @@ -43,14 +43,14 @@ flow: - start|ROUTE_BLOCK_OUT: - end|ROUTE_BLOCK_OUT: - start|ROUTE_LOAD_CALLEE_PREF: - - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: - start|ROUTE_BLOCK_IN: - start|ROUTE_ACC_FAILURE: - start|ROUTE_ACC_CALLER: - end|ROUTE_ACC_CALLER: - start|ROUTE_ACC_CALLEE: - end|ROUTE_ACC_CALLEE: + - start|ROUTE_SET_CALLER_DIALOG: + - end|ROUTE_SET_CALLER_DIALOG: - end|ROUTE_ACC_FAILURE: - start|ROUTE_EARLY_REJECT: - start|ROUTE_ADD_CALLINFO_REPLY: diff --git a/scenarios/invite_blockin_wlst/0003_test.yml.tt2 b/scenarios/invite_blockin_wlst/0003_test.yml.tt2 index d65f4634..b2068691 100644 --- a/scenarios/invite_blockin_wlst/0003_test.yml.tt2 +++ b/scenarios/invite_blockin_wlst/0003_test.yml.tt2 @@ -43,14 +43,14 @@ flow: - start|ROUTE_BLOCK_OUT: - end|ROUTE_BLOCK_OUT: - start|ROUTE_LOAD_CALLEE_PREF: - - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: - start|ROUTE_BLOCK_IN: - start|ROUTE_ACC_FAILURE: - start|ROUTE_ACC_CALLER: - end|ROUTE_ACC_CALLER: - start|ROUTE_ACC_CALLEE: - end|ROUTE_ACC_CALLEE: + - start|ROUTE_SET_CALLER_DIALOG: + - end|ROUTE_SET_CALLER_DIALOG: - end|ROUTE_ACC_FAILURE: - start|ROUTE_EARLY_REJECT: - start|ROUTE_ADD_CALLINFO_REPLY: diff --git a/scenarios/invite_blockout_pinoverride/0005_test.yml.tt2 b/scenarios/invite_blockout_pinoverride/0005_test.yml.tt2 index 577019b1..4d3243dd 100644 --- a/scenarios/invite_blockout_pinoverride/0005_test.yml.tt2 +++ b/scenarios/invite_blockout_pinoverride/0005_test.yml.tt2 @@ -41,8 +41,6 @@ flow: - start|ROUTE_BLOCK_OUT: - return|ROUTE_BLOCK_OUT: - start|ROUTE_LOAD_CALLEE_PREF: - - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: - start|ROUTE_BLOCK_IN: - end|ROUTE_BLOCK_IN: - end|ROUTE_LOAD_CALLEE_PREF: @@ -54,6 +52,8 @@ flow: - end|ROUTE_ACC_CALLER: - start|ROUTE_ACC_CALLEE: - end|ROUTE_ACC_CALLEE: + - start|ROUTE_SET_CALLER_DIALOG: + - end|ROUTE_SET_CALLER_DIALOG: - start|BRANCH_ROUTE_SBC: - start|ROUTE_BRANCH_ACC_RTP: - end|ROUTE_BRANCH_ACC_RTP: diff --git a/scenarios/invite_callforward/0009_test.yml.tt2 b/scenarios/invite_callforward/0009_test.yml.tt2 index 9503cdc3..4e3d6376 100644 --- a/scenarios/invite_callforward/0009_test.yml.tt2 +++ b/scenarios/invite_callforward/0009_test.yml.tt2 @@ -43,8 +43,6 @@ flow: - start|ROUTE_BLOCK_OUT: - end|ROUTE_BLOCK_OUT: - start|ROUTE_LOAD_CALLEE_PREF: - - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: - start|ROUTE_BLOCK_IN: - end|ROUTE_BLOCK_IN: - end|ROUTE_LOAD_CALLEE_PREF: @@ -60,6 +58,8 @@ flow: - end|ROUTE_ACC_CALLER: - start|ROUTE_ACC_CALLEE: - end|ROUTE_ACC_CALLEE: + - start|ROUTE_SET_CALLER_DIALOG: + - end|ROUTE_SET_CALLER_DIALOG: - end|ROUTE_ACC_CF: - start|ROUTE_SET_CALLER_DIALOG: - end|ROUTE_SET_CALLER_DIALOG: diff --git a/scenarios/invite_callforward/0011_test.yml.tt2 b/scenarios/invite_callforward/0011_test.yml.tt2 index ba530b2c..48646b5b 100644 --- a/scenarios/invite_callforward/0011_test.yml.tt2 +++ b/scenarios/invite_callforward/0011_test.yml.tt2 @@ -41,8 +41,6 @@ flow: - start|ROUTE_BLOCK_OUT: - end|ROUTE_BLOCK_OUT: - start|ROUTE_LOAD_CALLEE_PREF: - - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: - start|ROUTE_BLOCK_IN: - end|ROUTE_BLOCK_IN: - end|ROUTE_LOAD_CALLEE_PREF: @@ -54,6 +52,8 @@ flow: - end|ROUTE_ACC_CALLER: - start|ROUTE_ACC_CALLEE: - end|ROUTE_ACC_CALLEE: + - start|ROUTE_SET_CALLER_DIALOG: + - end|ROUTE_SET_CALLER_DIALOG: - start|BRANCH_ROUTE_SBC: - start|ROUTE_BRANCH_ACC_RTP: - end|ROUTE_BRANCH_ACC_RTP: diff --git a/scenarios/invite_callforward/0025_test.yml.tt2 b/scenarios/invite_callforward/0025_test.yml.tt2 index 539bffe7..d105df39 100644 --- a/scenarios/invite_callforward/0025_test.yml.tt2 +++ b/scenarios/invite_callforward/0025_test.yml.tt2 @@ -43,8 +43,6 @@ flow: - start|ROUTE_BLOCK_OUT: - end|ROUTE_BLOCK_OUT: - start|ROUTE_LOAD_CALLEE_PREF: - - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: - start|ROUTE_BLOCK_IN: - end|ROUTE_BLOCK_IN: - end|ROUTE_LOAD_CALLEE_PREF: @@ -56,6 +54,8 @@ flow: - end|ROUTE_ACC_CALLER: - start|ROUTE_ACC_CALLEE: - end|ROUTE_ACC_CALLEE: + - start|ROUTE_SET_CALLER_DIALOG: + - end|ROUTE_SET_CALLER_DIALOG: - start|BRANCH_ROUTE_SBC: - start|ROUTE_BRANCH_ACC_RTP: - end|ROUTE_BRANCH_ACC_RTP: @@ -99,6 +99,8 @@ flow: - start|ROUTE_CHECK_CF_PERIOD: - return|ROUTE_CHECK_CF_PERIOD: - start|ROUTE_EXECUTE_CF_LOOP: + - start|ROUTE_SET_CALLER_DIALOG: + - end|ROUTE_SET_CALLER_DIALOG: - start|BRANCH_ROUTE_FWD_LOOP: - start|ROUTE_ADD_CALLINFO: - end|ROUTE_ADD_CALLINFO: diff --git a/scenarios/invite_callforward/0029_test.yml.tt2 b/scenarios/invite_callforward/0029_test.yml.tt2 index 181b0fb7..1eecebe4 100644 --- a/scenarios/invite_callforward/0029_test.yml.tt2 +++ b/scenarios/invite_callforward/0029_test.yml.tt2 @@ -41,8 +41,6 @@ flow: - start|ROUTE_BLOCK_OUT: - end|ROUTE_BLOCK_OUT: - start|ROUTE_LOAD_CALLEE_PREF: - - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: - start|ROUTE_BLOCK_IN: - end|ROUTE_BLOCK_IN: - end|ROUTE_LOAD_CALLEE_PREF: @@ -54,6 +52,8 @@ flow: - end|ROUTE_ACC_CALLER: - start|ROUTE_ACC_CALLEE: - end|ROUTE_ACC_CALLEE: + - start|ROUTE_SET_CALLER_DIALOG: + - end|ROUTE_SET_CALLER_DIALOG: - start|BRANCH_ROUTE_SBC: - start|ROUTE_BRANCH_ACC_RTP: - end|ROUTE_BRANCH_ACC_RTP: diff --git a/scenarios/invite_concurrent_max/0007_test.yml.tt2 b/scenarios/invite_concurrent_max/0007_test.yml.tt2 index 275e4bdf..609b9723 100644 --- a/scenarios/invite_concurrent_max/0007_test.yml.tt2 +++ b/scenarios/invite_concurrent_max/0007_test.yml.tt2 @@ -48,9 +48,6 @@ flow: - start|ROUTE_BLOCK_OUT: - end|ROUTE_BLOCK_OUT: - start|ROUTE_LOAD_CALLEE_PREF: - - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: - $avp(size): [1] - start|ROUTE_BLOCK_IN: - end|ROUTE_BLOCK_IN: - end|ROUTE_LOAD_CALLEE_PREF: @@ -62,6 +59,9 @@ flow: - end|ROUTE_ACC_CALLER: - start|ROUTE_ACC_CALLEE: - end|ROUTE_ACC_CALLEE: + - start|ROUTE_SET_CALLER_DIALOG: + - end|ROUTE_SET_CALLER_DIALOG: + $avp(size): [1] - start|BRANCH_ROUTE_SBC: - start|ROUTE_BRANCH_ACC_RTP: - end|ROUTE_BRANCH_ACC_RTP: diff --git a/scenarios/invite_concurrent_max/0014_test.yml.tt2 b/scenarios/invite_concurrent_max/0014_test.yml.tt2 index 0f33d290..5b99f644 100644 --- a/scenarios/invite_concurrent_max/0014_test.yml.tt2 +++ b/scenarios/invite_concurrent_max/0014_test.yml.tt2 @@ -43,8 +43,12 @@ flow: - start|ROUTE_BLOCK_OUT: - end|ROUTE_BLOCK_OUT: - start|ROUTE_LOAD_CALLEE_PREF: - - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: + - 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: $xavp(callee_real_prefs[0]=>concurrent_max[*]): [1] $xavp(callee_real_prefs[0]=>concurrent_max_out[*]): None diff --git a/scenarios/invite_foreign_dom/0003_test.yml.tt2 b/scenarios/invite_foreign_dom/0003_test.yml.tt2 index 1452f77b..0c21cad6 100644 --- a/scenarios/invite_foreign_dom/0003_test.yml.tt2 +++ b/scenarios/invite_foreign_dom/0003_test.yml.tt2 @@ -43,14 +43,14 @@ flow: - end|ROUTE_BLOCK_OUT: - start|ROUTE_CHECK_PBX: - return|ROUTE_CHECK_PBX: - - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: - start|ROUTE_INVITE_TO_EXT: - start|ROUTE_OUTBOUND: - start|ROUTE_ACC_CALLER: - end|ROUTE_ACC_CALLER: - start|ROUTE_ACC_CALLEE: - end|ROUTE_ACC_CALLEE: + - start|ROUTE_SET_CALLER_DIALOG: + - end|ROUTE_SET_CALLER_DIALOG: - start|BRANCH_ROUTE_SBC: - start|ROUTE_BRANCH_ACC_RTP: - end|ROUTE_BRANCH_ACC_RTP: diff --git a/scenarios/invite_ignore_allowip/0005_test.yml.tt2 b/scenarios/invite_ignore_allowip/0005_test.yml.tt2 index b8c5e696..acbcd6df 100644 --- a/scenarios/invite_ignore_allowip/0005_test.yml.tt2 +++ b/scenarios/invite_ignore_allowip/0005_test.yml.tt2 @@ -43,8 +43,6 @@ flow: - start|ROUTE_BLOCK_OUT: - end|ROUTE_BLOCK_OUT: - start|ROUTE_LOAD_CALLEE_PREF: - - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: - start|ROUTE_BLOCK_IN: - end|ROUTE_BLOCK_IN: - end|ROUTE_LOAD_CALLEE_PREF: @@ -56,6 +54,8 @@ flow: - end|ROUTE_ACC_CALLER: - start|ROUTE_ACC_CALLEE: - end|ROUTE_ACC_CALLEE: + - start|ROUTE_SET_CALLER_DIALOG: + - end|ROUTE_SET_CALLER_DIALOG: - start|BRANCH_ROUTE_SBC: - start|ROUTE_BRANCH_ACC_RTP: - end|ROUTE_BRANCH_ACC_RTP: diff --git a/scenarios/invite_no_refer/0005_test.yml.tt2 b/scenarios/invite_no_refer/0005_test.yml.tt2 index 50569a9b..a97690a5 100644 --- a/scenarios/invite_no_refer/0005_test.yml.tt2 +++ b/scenarios/invite_no_refer/0005_test.yml.tt2 @@ -43,8 +43,6 @@ flow: - start|ROUTE_BLOCK_OUT: - end|ROUTE_BLOCK_OUT: - start|ROUTE_LOAD_CALLEE_PREF: - - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: - start|ROUTE_BLOCK_IN: - end|ROUTE_BLOCK_IN: - end|ROUTE_LOAD_CALLEE_PREF: @@ -56,6 +54,8 @@ flow: - end|ROUTE_ACC_CALLER: - start|ROUTE_ACC_CALLEE: - end|ROUTE_ACC_CALLEE: + - start|ROUTE_SET_CALLER_DIALOG: + - end|ROUTE_SET_CALLER_DIALOG: - start|BRANCH_ROUTE_SBC: - start|ROUTE_BRANCH_ACC_RTP: - end|ROUTE_BRANCH_ACC_RTP: diff --git a/scenarios/invite_offline/0003_test.yml.tt2 b/scenarios/invite_offline/0003_test.yml.tt2 index 860ec894..a41717fa 100644 --- a/scenarios/invite_offline/0003_test.yml.tt2 +++ b/scenarios/invite_offline/0003_test.yml.tt2 @@ -43,8 +43,6 @@ flow: - start|ROUTE_BLOCK_OUT: - end|ROUTE_BLOCK_OUT: - start|ROUTE_LOAD_CALLEE_PREF: - - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: - start|ROUTE_BLOCK_IN: - end|ROUTE_BLOCK_IN: - end|ROUTE_LOAD_CALLEE_PREF: diff --git a/scenarios/invite_offline/0005_test.yml.tt2 b/scenarios/invite_offline/0005_test.yml.tt2 index 78601714..de7245e2 100644 --- a/scenarios/invite_offline/0005_test.yml.tt2 +++ b/scenarios/invite_offline/0005_test.yml.tt2 @@ -43,8 +43,6 @@ flow: - start|ROUTE_BLOCK_OUT: - end|ROUTE_BLOCK_OUT: - start|ROUTE_LOAD_CALLEE_PREF: - - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: - start|ROUTE_BLOCK_IN: - end|ROUTE_BLOCK_IN: - end|ROUTE_LOAD_CALLEE_PREF: diff --git a/scenarios/invite_peerout/0003_test.yml.tt2 b/scenarios/invite_peerout/0003_test.yml.tt2 index cd71ff33..2827c802 100644 --- a/scenarios/invite_peerout/0003_test.yml.tt2 +++ b/scenarios/invite_peerout/0003_test.yml.tt2 @@ -44,8 +44,6 @@ flow: - end|ROUTE_BLOCK_OUT: - start|ROUTE_CHECK_PBX: - return|ROUTE_CHECK_PBX: - - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: - start|ROUTE_INVITE_TO_EXT: - start|ROUTE_PSTN: - start|ROUTE_CLEAR_PEER_OUT_PREF: @@ -57,6 +55,8 @@ flow: - end|ROUTE_ACC_CALLER: - start|ROUTE_ACC_CALLEE: - end|ROUTE_ACC_CALLEE: + - start|ROUTE_SET_CALLER_DIALOG: + - end|ROUTE_SET_CALLER_DIALOG: - start|BRANCH_ROUTE_SBC: - start|ROUTE_BRANCH_ACC_RTP: - end|ROUTE_BRANCH_ACC_RTP: diff --git a/scenarios/invite_peerout_rewrite/0003_test.yml.tt2 b/scenarios/invite_peerout_rewrite/0003_test.yml.tt2 index 06caaaed..f17c2dec 100644 --- a/scenarios/invite_peerout_rewrite/0003_test.yml.tt2 +++ b/scenarios/invite_peerout_rewrite/0003_test.yml.tt2 @@ -50,8 +50,6 @@ flow: - end|ROUTE_BLOCK_OUT: - start|ROUTE_CHECK_PBX: - return|ROUTE_CHECK_PBX: - - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: - start|ROUTE_INVITE_TO_EXT: - start|ROUTE_PSTN: - start|ROUTE_CLEAR_PEER_OUT_PREF: @@ -63,6 +61,8 @@ flow: - end|ROUTE_ACC_CALLER: - start|ROUTE_ACC_CALLEE: - end|ROUTE_ACC_CALLEE: + - start|ROUTE_SET_CALLER_DIALOG: + - end|ROUTE_SET_CALLER_DIALOG: - start|BRANCH_ROUTE_SBC: - start|ROUTE_BRANCH_ACC_RTP: - end|ROUTE_BRANCH_ACC_RTP: 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 bb383e87..a308f57c 100644 --- a/scenarios/invite_peerout_rewrite_pv_regex/0003_test.yml.tt2 +++ b/scenarios/invite_peerout_rewrite_pv_regex/0003_test.yml.tt2 @@ -52,8 +52,6 @@ flow: - end|ROUTE_BLOCK_OUT: - start|ROUTE_CHECK_PBX: - return|ROUTE_CHECK_PBX: - - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: - start|ROUTE_INVITE_TO_EXT: - start|ROUTE_PSTN: - start|ROUTE_CLEAR_PEER_OUT_PREF: @@ -65,6 +63,8 @@ flow: - end|ROUTE_ACC_CALLER: - start|ROUTE_ACC_CALLEE: - end|ROUTE_ACC_CALLEE: + - start|ROUTE_SET_CALLER_DIALOG: + - end|ROUTE_SET_CALLER_DIALOG: - start|BRANCH_ROUTE_SBC: - start|ROUTE_BRANCH_ACC_RTP: - end|ROUTE_BRANCH_ACC_RTP: diff --git a/scenarios/invite_redirect/0007_test.yml.tt2 b/scenarios/invite_redirect/0007_test.yml.tt2 index fe8e4a57..769b4167 100644 --- a/scenarios/invite_redirect/0007_test.yml.tt2 +++ b/scenarios/invite_redirect/0007_test.yml.tt2 @@ -42,8 +42,6 @@ flow: - start|ROUTE_BLOCK_OUT: - end|ROUTE_BLOCK_OUT: - start|ROUTE_LOAD_CALLEE_PREF: - - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: - start|ROUTE_BLOCK_IN: - end|ROUTE_BLOCK_IN: - end|ROUTE_LOAD_CALLEE_PREF: @@ -55,6 +53,8 @@ flow: - end|ROUTE_ACC_CALLER: - start|ROUTE_ACC_CALLEE: - end|ROUTE_ACC_CALLEE: + - start|ROUTE_SET_CALLER_DIALOG: + - end|ROUTE_SET_CALLER_DIALOG: - start|BRANCH_ROUTE_SBC: - start|ROUTE_BRANCH_ACC_RTP: - end|ROUTE_BRANCH_ACC_RTP: @@ -107,8 +107,6 @@ flow: - start|ROUTE_BLOCK_OUT: - end|ROUTE_BLOCK_OUT: - start|ROUTE_LOAD_CALLEE_PREF: - - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: - start|ROUTE_BLOCK_IN: - end|ROUTE_BLOCK_IN: - end|ROUTE_LOAD_CALLEE_PREF: @@ -120,6 +118,8 @@ flow: - end|ROUTE_ACC_CALLER: - start|ROUTE_ACC_CALLEE: - end|ROUTE_ACC_CALLEE: + - start|ROUTE_SET_CALLER_DIALOG: + - end|ROUTE_SET_CALLER_DIALOG: - start|BRANCH_ROUTE_SBC: - start|ROUTE_BRANCH_ACC_RTP: - end|ROUTE_BRANCH_ACC_RTP: diff --git a/scenarios/invite_speeddial/0007_test.yml.tt2 b/scenarios/invite_speeddial/0007_test.yml.tt2 index 743bee00..3c3734a4 100644 --- a/scenarios/invite_speeddial/0007_test.yml.tt2 +++ b/scenarios/invite_speeddial/0007_test.yml.tt2 @@ -43,8 +43,6 @@ flow: - start|ROUTE_BLOCK_OUT: - end|ROUTE_BLOCK_OUT: - start|ROUTE_LOAD_CALLEE_PREF: - - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: - start|ROUTE_BLOCK_IN: - end|ROUTE_BLOCK_IN: - end|ROUTE_LOAD_CALLEE_PREF: @@ -56,6 +54,8 @@ flow: - end|ROUTE_ACC_CALLER: - start|ROUTE_ACC_CALLEE: - end|ROUTE_ACC_CALLEE: + - start|ROUTE_SET_CALLER_DIALOG: + - end|ROUTE_SET_CALLER_DIALOG: - start|BRANCH_ROUTE_SBC: - start|ROUTE_BRANCH_ACC_RTP: - end|ROUTE_BRANCH_ACC_RTP: diff --git a/scenarios/invite_speeddial/0016_test.yml.tt2 b/scenarios/invite_speeddial/0016_test.yml.tt2 index 71065405..65c1a786 100644 --- a/scenarios/invite_speeddial/0016_test.yml.tt2 +++ b/scenarios/invite_speeddial/0016_test.yml.tt2 @@ -43,8 +43,6 @@ flow: - start|ROUTE_BLOCK_OUT: - end|ROUTE_BLOCK_OUT: - start|ROUTE_LOAD_CALLEE_PREF: - - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: - start|ROUTE_BLOCK_IN: - end|ROUTE_BLOCK_IN: - end|ROUTE_LOAD_CALLEE_PREF: @@ -56,6 +54,8 @@ flow: - end|ROUTE_ACC_CALLER: - start|ROUTE_ACC_CALLEE: - end|ROUTE_ACC_CALLEE: + - start|ROUTE_SET_CALLER_DIALOG: + - end|ROUTE_SET_CALLER_DIALOG: - start|BRANCH_ROUTE_SBC: - start|ROUTE_BRANCH_ACC_RTP: - end|ROUTE_BRANCH_ACC_RTP: diff --git a/scenarios/invite_speeddial/0025_test.yml.tt2 b/scenarios/invite_speeddial/0025_test.yml.tt2 index ea4f8654..bba1136c 100644 --- a/scenarios/invite_speeddial/0025_test.yml.tt2 +++ b/scenarios/invite_speeddial/0025_test.yml.tt2 @@ -44,8 +44,6 @@ flow: - end|ROUTE_BLOCK_OUT: - start|ROUTE_CHECK_PBX: - return|ROUTE_CHECK_PBX: - - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: - start|ROUTE_INVITE_TO_EXT: - start|ROUTE_PSTN: - start|ROUTE_ACC_FAILURE: diff --git a/scenarios/invite_tcp_udp/0005_test.yml.tt2 b/scenarios/invite_tcp_udp/0005_test.yml.tt2 index a93bbd09..0fbd23dc 100644 --- a/scenarios/invite_tcp_udp/0005_test.yml.tt2 +++ b/scenarios/invite_tcp_udp/0005_test.yml.tt2 @@ -43,8 +43,6 @@ flow: - start|ROUTE_BLOCK_OUT: - end|ROUTE_BLOCK_OUT: - start|ROUTE_LOAD_CALLEE_PREF: - - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: - start|ROUTE_BLOCK_IN: - end|ROUTE_BLOCK_IN: - end|ROUTE_LOAD_CALLEE_PREF: @@ -56,6 +54,8 @@ flow: - end|ROUTE_ACC_CALLER: - start|ROUTE_ACC_CALLEE: - end|ROUTE_ACC_CALLEE: + - start|ROUTE_SET_CALLER_DIALOG: + - end|ROUTE_SET_CALLER_DIALOG: - start|BRANCH_ROUTE_SBC: - start|ROUTE_BRANCH_ACC_RTP: - end|ROUTE_BRANCH_ACC_RTP: diff --git a/scenarios/invite_tcp_udp_reinvite/0005_test.yml.tt2 b/scenarios/invite_tcp_udp_reinvite/0005_test.yml.tt2 index faeb2520..c016ac2f 100644 --- a/scenarios/invite_tcp_udp_reinvite/0005_test.yml.tt2 +++ b/scenarios/invite_tcp_udp_reinvite/0005_test.yml.tt2 @@ -42,8 +42,6 @@ flow: - start|ROUTE_BLOCK_OUT: - end|ROUTE_BLOCK_OUT: - start|ROUTE_LOAD_CALLEE_PREF: - - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: - start|ROUTE_BLOCK_IN: - end|ROUTE_BLOCK_IN: - end|ROUTE_LOAD_CALLEE_PREF: @@ -55,6 +53,8 @@ flow: - end|ROUTE_ACC_CALLER: - start|ROUTE_ACC_CALLEE: - end|ROUTE_ACC_CALLEE: + - start|ROUTE_SET_CALLER_DIALOG: + - end|ROUTE_SET_CALLER_DIALOG: - start|BRANCH_ROUTE_SBC: - start|ROUTE_BRANCH_ACC_RTP: - end|ROUTE_BRANCH_ACC_RTP: diff --git a/scenarios/invite_voicebox/0003_test.yml.tt2 b/scenarios/invite_voicebox/0003_test.yml.tt2 index fd0d69d6..8f3b9f3e 100644 --- a/scenarios/invite_voicebox/0003_test.yml.tt2 +++ b/scenarios/invite_voicebox/0003_test.yml.tt2 @@ -43,8 +43,6 @@ flow: - start|ROUTE_BLOCK_OUT: - end|ROUTE_BLOCK_OUT: - start|ROUTE_LOAD_CALLEE_PREF: - - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: - start|ROUTE_BLOCK_IN: - end|ROUTE_BLOCK_IN: - end|ROUTE_LOAD_CALLEE_PREF: diff --git a/scenarios/invite_voicebox/0005_test.yml.tt2 b/scenarios/invite_voicebox/0005_test.yml.tt2 index 0186f330..e54fcfdf 100644 --- a/scenarios/invite_voicebox/0005_test.yml.tt2 +++ b/scenarios/invite_voicebox/0005_test.yml.tt2 @@ -29,14 +29,14 @@ flow: - end|ROUTE_CLIR: - start|ROUTE_CHECK_PBX: - return|ROUTE_CHECK_PBX: - - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: - start|ROUTE_VOICEBOX: - start|ROUTE_OUTBOUND: - start|ROUTE_ACC_CALLER: - end|ROUTE_ACC_CALLER: - start|ROUTE_ACC_CALLEE: - end|ROUTE_ACC_CALLEE: + - start|ROUTE_SET_CALLER_DIALOG: + - end|ROUTE_SET_CALLER_DIALOG: - start|BRANCH_ROUTE_NO_SBC: - start|ROUTE_BRANCH_ACC_RTP: - end|ROUTE_BRANCH_ACC_RTP: diff --git a/scenarios/reminder/0003_test.yml.tt2 b/scenarios/reminder/0003_test.yml.tt2 index 28313864..12614c0b 100644 --- a/scenarios/reminder/0003_test.yml.tt2 +++ b/scenarios/reminder/0003_test.yml.tt2 @@ -30,8 +30,6 @@ flow: - start|ROUTE_FIND_CALLEE: - start|ROUTE_CLIR: - end|ROUTE_CLIR: - - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: - start|ROUTE_TO_APPSRV: - start|ROUTE_LOAD_APPSRV: - end|ROUTE_LOAD_APPSRV: @@ -40,6 +38,8 @@ flow: - end|ROUTE_ACC_CALLER: - start|ROUTE_ACC_CALLEE: - end|ROUTE_ACC_CALLEE: + - start|ROUTE_SET_CALLER_DIALOG: + - end|ROUTE_SET_CALLER_DIALOG: - start|BRANCH_ROUTE_NO_SBC: - start|ROUTE_BRANCH_ACC_RTP: - end|ROUTE_BRANCH_ACC_RTP: