diff --git a/scenarios/incoming_foreign_dom/0008_test.yml.tt2 b/scenarios/incoming_foreign_dom/0008_test.yml.tt2 index d1ddef6e..b09824e5 100644 --- a/scenarios/incoming_foreign_dom/0008_test.yml.tt2 +++ b/scenarios/incoming_foreign_dom/0008_test.yml.tt2 @@ -5,10 +5,9 @@ flow: - start|ROUTE_PRX_REQUEST: - start|ROUTE_INITVARS: - return|ROUTE_INITVARS: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch ?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:end': + - 'return|dialog:end': + - 'return|dialog:end': - start|ROUTE_STOP_RTPPROXY: - start|ROUTE_RESTORE_CLUSTERSET: - return|ROUTE_RESTORE_CLUSTERSET: diff --git a/scenarios/incoming_peer/0008_test.yml.tt2 b/scenarios/incoming_peer/0008_test.yml.tt2 index 07e75b0f..324e61f4 100644 --- a/scenarios/incoming_peer/0008_test.yml.tt2 +++ b/scenarios/incoming_peer/0008_test.yml.tt2 @@ -6,10 +6,9 @@ flow: - start|ROUTE_PRX_REQUEST: - start|ROUTE_INITVARS: - return|ROUTE_INITVARS: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch ?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:end': + - 'return|dialog:end': + - 'return|dialog:end': - start|ROUTE_STOP_RTPPROXY: - start|ROUTE_RESTORE_CLUSTERSET: - return|ROUTE_RESTORE_CLUSTERSET: diff --git a/scenarios/invite/0010_test.yml.tt2 b/scenarios/invite/0010_test.yml.tt2 index 8a557769..6368f62b 100644 --- a/scenarios/invite/0010_test.yml.tt2 +++ b/scenarios/invite/0010_test.yml.tt2 @@ -5,10 +5,9 @@ flow: - start|ROUTE_PRX_REQUEST: - start|ROUTE_INITVARS: - return|ROUTE_INITVARS: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch ?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:end': + - 'return|dialog:end': + - 'return|dialog:end': - start|ROUTE_STOP_RTPPROXY: - start|ROUTE_RESTORE_CLUSTERSET: - return|ROUTE_RESTORE_CLUSTERSET: diff --git a/scenarios/invite_allowedcli_match/0010_test.yml.tt2 b/scenarios/invite_allowedcli_match/0010_test.yml.tt2 index 5eae1712..c97a7595 100644 --- a/scenarios/invite_allowedcli_match/0010_test.yml.tt2 +++ b/scenarios/invite_allowedcli_match/0010_test.yml.tt2 @@ -5,10 +5,9 @@ flow: - start|ROUTE_PRX_REQUEST: - start|ROUTE_INITVARS: - return|ROUTE_INITVARS: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch ?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:end': + - 'return|dialog:end': + - 'return|dialog:end': - start|ROUTE_STOP_RTPPROXY: - start|ROUTE_RESTORE_CLUSTERSET: - return|ROUTE_RESTORE_CLUSTERSET: diff --git a/scenarios/invite_allowedcli_match_alias/0010_test.yml.tt2 b/scenarios/invite_allowedcli_match_alias/0010_test.yml.tt2 index 0a87657c..196f0657 100644 --- a/scenarios/invite_allowedcli_match_alias/0010_test.yml.tt2 +++ b/scenarios/invite_allowedcli_match_alias/0010_test.yml.tt2 @@ -5,10 +5,9 @@ flow: - start|ROUTE_PRX_REQUEST: - start|ROUTE_INITVARS: - return|ROUTE_INITVARS: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch ?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:end': + - 'return|dialog:end': + - 'return|dialog:end': - start|ROUTE_STOP_RTPPROXY: - start|ROUTE_RESTORE_CLUSTERSET: - return|ROUTE_RESTORE_CLUSTERSET: diff --git a/scenarios/invite_allowedcli_nonmatch/0010_test.yml.tt2 b/scenarios/invite_allowedcli_nonmatch/0010_test.yml.tt2 index b1f0842c..df42259d 100644 --- a/scenarios/invite_allowedcli_nonmatch/0010_test.yml.tt2 +++ b/scenarios/invite_allowedcli_nonmatch/0010_test.yml.tt2 @@ -5,10 +5,9 @@ flow: - start|ROUTE_PRX_REQUEST: - start|ROUTE_INITVARS: - return|ROUTE_INITVARS: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch ?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:end': + - 'return|dialog:end': + - 'return|dialog:end': - start|ROUTE_STOP_RTPPROXY: - start|ROUTE_RESTORE_CLUSTERSET: - return|ROUTE_RESTORE_CLUSTERSET: diff --git a/scenarios/invite_allowip/0003_test.yml.tt2 b/scenarios/invite_allowip/0003_test.yml.tt2 index 8a6f8a00..f4674d77 100644 --- a/scenarios/invite_allowip/0003_test.yml.tt2 +++ b/scenarios/invite_allowip/0003_test.yml.tt2 @@ -31,10 +31,9 @@ flow: - start|ROUTE_EARLY_REJECT: - start|ROUTE_ADD_CALLINFO_REPLY: - return|ROUTE_ADD_CALLINFO_REPLY: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch ?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:failed': + - 'return|dialog:failed': + - 'return|dialog:failed': - exit|ROUTE_EARLY_REJECT: sip_in: - '^INVITE' diff --git a/scenarios/invite_blockin_blst/0003_test.yml.tt2 b/scenarios/invite_blockin_blst/0003_test.yml.tt2 index f1214004..42e7b9b5 100644 --- a/scenarios/invite_blockin_blst/0003_test.yml.tt2 +++ b/scenarios/invite_blockin_blst/0003_test.yml.tt2 @@ -54,10 +54,9 @@ flow: - start|ROUTE_EARLY_REJECT: - start|ROUTE_ADD_CALLINFO_REPLY: - return|ROUTE_ADD_CALLINFO_REPLY: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch ?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:failed': + - 'return|dialog:failed': + - 'return|dialog:failed': - exit|ROUTE_EARLY_REJECT: sip_in: - '^INVITE' diff --git a/scenarios/invite_blockin_clir/0003_test.yml.tt2 b/scenarios/invite_blockin_clir/0003_test.yml.tt2 index f1214004..42e7b9b5 100644 --- a/scenarios/invite_blockin_clir/0003_test.yml.tt2 +++ b/scenarios/invite_blockin_clir/0003_test.yml.tt2 @@ -54,10 +54,9 @@ flow: - start|ROUTE_EARLY_REJECT: - start|ROUTE_ADD_CALLINFO_REPLY: - return|ROUTE_ADD_CALLINFO_REPLY: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch ?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:failed': + - 'return|dialog:failed': + - 'return|dialog:failed': - exit|ROUTE_EARLY_REJECT: sip_in: - '^INVITE' diff --git a/scenarios/invite_blockin_wlst/0003_test.yml.tt2 b/scenarios/invite_blockin_wlst/0003_test.yml.tt2 index f1214004..42e7b9b5 100644 --- a/scenarios/invite_blockin_wlst/0003_test.yml.tt2 +++ b/scenarios/invite_blockin_wlst/0003_test.yml.tt2 @@ -54,10 +54,9 @@ flow: - start|ROUTE_EARLY_REJECT: - start|ROUTE_ADD_CALLINFO_REPLY: - return|ROUTE_ADD_CALLINFO_REPLY: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch ?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:failed': + - 'return|dialog:failed': + - 'return|dialog:failed': - exit|ROUTE_EARLY_REJECT: sip_in: - '^INVITE' diff --git a/scenarios/invite_blockout_blst/0003_test.yml.tt2 b/scenarios/invite_blockout_blst/0003_test.yml.tt2 index 68ff7521..09804073 100644 --- a/scenarios/invite_blockout_blst/0003_test.yml.tt2 +++ b/scenarios/invite_blockout_blst/0003_test.yml.tt2 @@ -53,10 +53,9 @@ flow: - start|ROUTE_EARLY_REJECT: - start|ROUTE_ADD_CALLINFO_REPLY: - return|ROUTE_ADD_CALLINFO_REPLY: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch ?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:failed': + - 'return|dialog:failed': + - 'return|dialog:failed': - exit|ROUTE_EARLY_REJECT: sip_in: - '^INVITE' diff --git a/scenarios/invite_blockout_ncos/0003_test.yml.tt2 b/scenarios/invite_blockout_ncos/0003_test.yml.tt2 index 00fcced6..1d249ca2 100644 --- a/scenarios/invite_blockout_ncos/0003_test.yml.tt2 +++ b/scenarios/invite_blockout_ncos/0003_test.yml.tt2 @@ -49,10 +49,9 @@ flow: - start|ROUTE_EARLY_REJECT: - start|ROUTE_ADD_CALLINFO_REPLY: - return|ROUTE_ADD_CALLINFO_REPLY: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch ?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:failed': + - 'return|dialog:failed': + - 'return|dialog:failed': - exit|ROUTE_EARLY_REJECT: sip_in: - '^INVITE' diff --git a/scenarios/invite_blockout_pinoverride/0010_test.yml.tt2 b/scenarios/invite_blockout_pinoverride/0010_test.yml.tt2 index 95286b56..5e0985fa 100644 --- a/scenarios/invite_blockout_pinoverride/0010_test.yml.tt2 +++ b/scenarios/invite_blockout_pinoverride/0010_test.yml.tt2 @@ -5,10 +5,9 @@ flow: - start|ROUTE_PRX_REQUEST: - start|ROUTE_INITVARS: - return|ROUTE_INITVARS: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch ?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:end': + - 'return|dialog:end': + - 'return|dialog:end': - start|ROUTE_STOP_RTPPROXY: - start|ROUTE_RESTORE_CLUSTERSET: - return|ROUTE_RESTORE_CLUSTERSET: diff --git a/scenarios/invite_blockout_wlst/0003_test.yml.tt2 b/scenarios/invite_blockout_wlst/0003_test.yml.tt2 index a3fe1dfd..288a74db 100644 --- a/scenarios/invite_blockout_wlst/0003_test.yml.tt2 +++ b/scenarios/invite_blockout_wlst/0003_test.yml.tt2 @@ -51,10 +51,9 @@ flow: - start|ROUTE_EARLY_REJECT: - start|ROUTE_ADD_CALLINFO_REPLY: - return|ROUTE_ADD_CALLINFO_REPLY: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch ?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:failed': + - 'return|dialog:failed': + - 'return|dialog:failed': - exit|ROUTE_EARLY_REJECT: sip_in: - '^INVITE' diff --git a/scenarios/invite_callforward/0019_test.yml.tt2 b/scenarios/invite_callforward/0019_test.yml.tt2 index 1123885e..fac5d9eb 100644 --- a/scenarios/invite_callforward/0019_test.yml.tt2 +++ b/scenarios/invite_callforward/0019_test.yml.tt2 @@ -5,10 +5,9 @@ flow: - start|ROUTE_PRX_REQUEST: - start|ROUTE_INITVARS: - return|ROUTE_INITVARS: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch ?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:end': + - 'return|dialog:end': + - 'return|dialog:end': - start|ROUTE_STOP_RTPPROXY: - return|ROUTE_STOP_RTPPROXY: - start|ROUTE_OUTBOUND: diff --git a/scenarios/invite_callforward/0037_test.yml.tt2 b/scenarios/invite_callforward/0037_test.yml.tt2 index 53641002..cddb31f7 100644 --- a/scenarios/invite_callforward/0037_test.yml.tt2 +++ b/scenarios/invite_callforward/0037_test.yml.tt2 @@ -5,10 +5,9 @@ flow: - start|ROUTE_PRX_REQUEST: - start|ROUTE_INITVARS: - return|ROUTE_INITVARS: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch ?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:end': + - 'return|dialog:end': + - 'return|dialog:end': - start|ROUTE_STOP_RTPPROXY: - return|ROUTE_STOP_RTPPROXY: - start|ROUTE_OUTBOUND: diff --git a/scenarios/invite_concurrent_max/0014_test.yml.tt2 b/scenarios/invite_concurrent_max/0014_test.yml.tt2 index 4d31ef43..f5d4c6ac 100644 --- a/scenarios/invite_concurrent_max/0014_test.yml.tt2 +++ b/scenarios/invite_concurrent_max/0014_test.yml.tt2 @@ -58,10 +58,9 @@ flow: - start|ROUTE_EARLY_REJECT: - start|ROUTE_ADD_CALLINFO_REPLY: - return|ROUTE_ADD_CALLINFO_REPLY: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:failed': + - 'return|dialog:failed': + - 'return|dialog:failed': - exit|ROUTE_EARLY_REJECT: sip_in: - '^INVITE sip:testuser1003@' diff --git a/scenarios/invite_concurrent_max/0016_test.yml.tt2 b/scenarios/invite_concurrent_max/0016_test.yml.tt2 index 8a557769..6368f62b 100644 --- a/scenarios/invite_concurrent_max/0016_test.yml.tt2 +++ b/scenarios/invite_concurrent_max/0016_test.yml.tt2 @@ -5,10 +5,9 @@ flow: - start|ROUTE_PRX_REQUEST: - start|ROUTE_INITVARS: - return|ROUTE_INITVARS: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch ?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:end': + - 'return|dialog:end': + - 'return|dialog:end': - start|ROUTE_STOP_RTPPROXY: - start|ROUTE_RESTORE_CLUSTERSET: - return|ROUTE_RESTORE_CLUSTERSET: diff --git a/scenarios/invite_concurrent_max_out/0014_test.yml.tt2 b/scenarios/invite_concurrent_max_out/0014_test.yml.tt2 index 399a84c0..a8276a6f 100644 --- a/scenarios/invite_concurrent_max_out/0014_test.yml.tt2 +++ b/scenarios/invite_concurrent_max_out/0014_test.yml.tt2 @@ -62,10 +62,9 @@ flow: - start|ROUTE_EARLY_REJECT: - start|ROUTE_ADD_CALLINFO_REPLY: - return|ROUTE_ADD_CALLINFO_REPLY: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch ?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:failed': + - 'return|dialog:failed': + - 'return|dialog:failed': - exit|ROUTE_EARLY_REJECT: sip_in: - '^INVITE sip:004421003@' diff --git a/scenarios/invite_concurrent_max_out/0016_test.yml.tt2 b/scenarios/invite_concurrent_max_out/0016_test.yml.tt2 index 3f89dd15..851ad934 100644 --- a/scenarios/invite_concurrent_max_out/0016_test.yml.tt2 +++ b/scenarios/invite_concurrent_max_out/0016_test.yml.tt2 @@ -5,9 +5,9 @@ flow: - start|ROUTE_PRX_REQUEST: - start|ROUTE_INITVARS: - return|ROUTE_INITVARS: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:end': + - 'return|dialog:end': + - 'return|dialog:end': - start|ROUTE_STOP_RTPPROXY: - start|ROUTE_RESTORE_CLUSTERSET: - return|ROUTE_RESTORE_CLUSTERSET: 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 399a84c0..a8276a6f 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 @@ -62,10 +62,9 @@ flow: - start|ROUTE_EARLY_REJECT: - start|ROUTE_ADD_CALLINFO_REPLY: - return|ROUTE_ADD_CALLINFO_REPLY: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch ?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:failed': + - 'return|dialog:failed': + - 'return|dialog:failed': - exit|ROUTE_EARLY_REJECT: sip_in: - '^INVITE sip:004421003@' diff --git a/scenarios/invite_concurrent_max_out_per_account/0016_test.yml.tt2 b/scenarios/invite_concurrent_max_out_per_account/0016_test.yml.tt2 index 3f89dd15..851ad934 100644 --- a/scenarios/invite_concurrent_max_out_per_account/0016_test.yml.tt2 +++ b/scenarios/invite_concurrent_max_out_per_account/0016_test.yml.tt2 @@ -5,9 +5,9 @@ flow: - start|ROUTE_PRX_REQUEST: - start|ROUTE_INITVARS: - return|ROUTE_INITVARS: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:end': + - 'return|dialog:end': + - 'return|dialog:end': - start|ROUTE_STOP_RTPPROXY: - start|ROUTE_RESTORE_CLUSTERSET: - return|ROUTE_RESTORE_CLUSTERSET: 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 80434c1b..7a86f12f 100644 --- a/scenarios/invite_concurrent_max_per_account/0014_test.yml.tt2 +++ b/scenarios/invite_concurrent_max_per_account/0014_test.yml.tt2 @@ -59,10 +59,9 @@ flow: - start|ROUTE_EARLY_REJECT: - start|ROUTE_ADD_CALLINFO_REPLY: - return|ROUTE_ADD_CALLINFO_REPLY: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch ?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:failed': + - 'return|dialog:failed': + - 'return|dialog:failed': - exit|ROUTE_EARLY_REJECT: sip_in: - '^INVITE sip:testuser1004@' diff --git a/scenarios/invite_concurrent_max_per_account/0015_test.yml.tt2 b/scenarios/invite_concurrent_max_per_account/0015_test.yml.tt2 index d3786d8a..49a7f387 100644 --- a/scenarios/invite_concurrent_max_per_account/0015_test.yml.tt2 +++ b/scenarios/invite_concurrent_max_per_account/0015_test.yml.tt2 @@ -5,9 +5,9 @@ flow: - start|ROUTE_PRX_REQUEST: - start|ROUTE_INITVARS: - return|ROUTE_INITVARS: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:end': + - 'return|dialog:end': + - 'return|dialog:end': - start|ROUTE_STOP_RTPPROXY: - start|ROUTE_RESTORE_CLUSTERSET: - return|ROUTE_RESTORE_CLUSTERSET: diff --git a/scenarios/invite_foreign_dom/0008_test.yml.tt2 b/scenarios/invite_foreign_dom/0008_test.yml.tt2 index 3042f1ef..b2ee1909 100644 --- a/scenarios/invite_foreign_dom/0008_test.yml.tt2 +++ b/scenarios/invite_foreign_dom/0008_test.yml.tt2 @@ -5,10 +5,9 @@ flow: - start|ROUTE_PRX_REQUEST: - start|ROUTE_INITVARS: - return|ROUTE_INITVARS: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch ?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:end': + - 'return|dialog:end': + - 'return|dialog:end': - start|ROUTE_STOP_RTPPROXY: - start|ROUTE_RESTORE_CLUSTERSET: - return|ROUTE_RESTORE_CLUSTERSET: diff --git a/scenarios/invite_ignore_allowip/0010_test.yml.tt2 b/scenarios/invite_ignore_allowip/0010_test.yml.tt2 index 8a557769..6368f62b 100644 --- a/scenarios/invite_ignore_allowip/0010_test.yml.tt2 +++ b/scenarios/invite_ignore_allowip/0010_test.yml.tt2 @@ -5,10 +5,9 @@ flow: - start|ROUTE_PRX_REQUEST: - start|ROUTE_INITVARS: - return|ROUTE_INITVARS: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch ?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:end': + - 'return|dialog:end': + - 'return|dialog:end': - start|ROUTE_STOP_RTPPROXY: - start|ROUTE_RESTORE_CLUSTERSET: - return|ROUTE_RESTORE_CLUSTERSET: diff --git a/scenarios/invite_no_refer/0010_test.yml.tt2 b/scenarios/invite_no_refer/0010_test.yml.tt2 index 8a557769..6368f62b 100644 --- a/scenarios/invite_no_refer/0010_test.yml.tt2 +++ b/scenarios/invite_no_refer/0010_test.yml.tt2 @@ -5,10 +5,9 @@ flow: - start|ROUTE_PRX_REQUEST: - start|ROUTE_INITVARS: - return|ROUTE_INITVARS: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch ?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:end': + - 'return|dialog:end': + - 'return|dialog:end': - start|ROUTE_STOP_RTPPROXY: - start|ROUTE_RESTORE_CLUSTERSET: - return|ROUTE_RESTORE_CLUSTERSET: diff --git a/scenarios/invite_offline/0003_test.yml.tt2 b/scenarios/invite_offline/0003_test.yml.tt2 index e8c04c62..a63db787 100644 --- a/scenarios/invite_offline/0003_test.yml.tt2 +++ b/scenarios/invite_offline/0003_test.yml.tt2 @@ -60,10 +60,9 @@ flow: - start|ROUTE_EARLY_REJECT: - start|ROUTE_ADD_CALLINFO_REPLY: - return|ROUTE_ADD_CALLINFO_REPLY: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch ?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:failed': + - 'return|dialog:failed': + - 'return|dialog:failed': - exit|ROUTE_EARLY_REJECT: sip_in: - '^INVITE sip:testuser1003@' diff --git a/scenarios/invite_offline/0005_test.yml.tt2 b/scenarios/invite_offline/0005_test.yml.tt2 index da1eff1b..6f9b01d2 100644 --- a/scenarios/invite_offline/0005_test.yml.tt2 +++ b/scenarios/invite_offline/0005_test.yml.tt2 @@ -60,10 +60,9 @@ flow: - start|ROUTE_EARLY_REJECT: - start|ROUTE_ADD_CALLINFO_REPLY: - return|ROUTE_ADD_CALLINFO_REPLY: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch ?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:failed': + - 'return|dialog:failed': + - 'return|dialog:failed': - exit|ROUTE_EARLY_REJECT: sip_in: - '^INVITE sip:4311003@' diff --git a/scenarios/invite_peerout/0008_test.yml.tt2 b/scenarios/invite_peerout/0008_test.yml.tt2 index cfc8779a..39224e7a 100644 --- a/scenarios/invite_peerout/0008_test.yml.tt2 +++ b/scenarios/invite_peerout/0008_test.yml.tt2 @@ -6,10 +6,9 @@ flow: - start|ROUTE_PRX_REQUEST: - start|ROUTE_INITVARS: - return|ROUTE_INITVARS: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch ?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:end': + - 'return|dialog:end': + - 'return|dialog:end': - start|ROUTE_STOP_RTPPROXY: - start|ROUTE_RESTORE_CLUSTERSET: - return|ROUTE_RESTORE_CLUSTERSET: diff --git a/scenarios/invite_peerout_rewrite/0008_test.yml.tt2 b/scenarios/invite_peerout_rewrite/0008_test.yml.tt2 index 3042f1ef..b2ee1909 100644 --- a/scenarios/invite_peerout_rewrite/0008_test.yml.tt2 +++ b/scenarios/invite_peerout_rewrite/0008_test.yml.tt2 @@ -5,10 +5,9 @@ flow: - start|ROUTE_PRX_REQUEST: - start|ROUTE_INITVARS: - return|ROUTE_INITVARS: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch ?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:end': + - 'return|dialog:end': + - 'return|dialog:end': - start|ROUTE_STOP_RTPPROXY: - start|ROUTE_RESTORE_CLUSTERSET: - return|ROUTE_RESTORE_CLUSTERSET: diff --git a/scenarios/invite_peerout_rewrite_pv_regex/0008_test.yml.tt2 b/scenarios/invite_peerout_rewrite_pv_regex/0008_test.yml.tt2 index 80bf0f07..96c475f9 100644 --- a/scenarios/invite_peerout_rewrite_pv_regex/0008_test.yml.tt2 +++ b/scenarios/invite_peerout_rewrite_pv_regex/0008_test.yml.tt2 @@ -6,10 +6,9 @@ flow: - start|ROUTE_PRX_REQUEST: - start|ROUTE_INITVARS: - return|ROUTE_INITVARS: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch ?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:end': + - 'return|dialog:end': + - 'return|dialog:end': - start|ROUTE_STOP_RTPPROXY: - start|ROUTE_RESTORE_CLUSTERSET: - return|ROUTE_RESTORE_CLUSTERSET: diff --git a/scenarios/invite_redirect/0009_test.yml.tt2 b/scenarios/invite_redirect/0009_test.yml.tt2 index 8b612fb9..ec44d379 100644 --- a/scenarios/invite_redirect/0009_test.yml.tt2 +++ b/scenarios/invite_redirect/0009_test.yml.tt2 @@ -1,6 +1,6 @@ flow: - start|REPLY_ROUTE_NAT: -- start|BRANCH_ROUTE_SBC: +- 'start|tm:branch-failure:redirect': - start|ROUTE_STOP_RTPPROXY_BRANCH: - start|ROUTE_RESTORE_CLUSTERSET: - return|ROUTE_RESTORE_CLUSTERSET: diff --git a/scenarios/invite_redirect/0014_test.yml.tt2 b/scenarios/invite_redirect/0014_test.yml.tt2 index 8a557769..6368f62b 100644 --- a/scenarios/invite_redirect/0014_test.yml.tt2 +++ b/scenarios/invite_redirect/0014_test.yml.tt2 @@ -5,10 +5,9 @@ flow: - start|ROUTE_PRX_REQUEST: - start|ROUTE_INITVARS: - return|ROUTE_INITVARS: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch ?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:end': + - 'return|dialog:end': + - 'return|dialog:end': - start|ROUTE_STOP_RTPPROXY: - start|ROUTE_RESTORE_CLUSTERSET: - return|ROUTE_RESTORE_CLUSTERSET: diff --git a/scenarios/invite_speeddial/0012_test.yml.tt2 b/scenarios/invite_speeddial/0012_test.yml.tt2 index e0f33960..acc9d858 100644 --- a/scenarios/invite_speeddial/0012_test.yml.tt2 +++ b/scenarios/invite_speeddial/0012_test.yml.tt2 @@ -5,10 +5,9 @@ flow: - start|ROUTE_PRX_REQUEST: - start|ROUTE_INITVARS: - return|ROUTE_INITVARS: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch ?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:end': + - 'return|dialog:end': + - 'return|dialog:end': - start|ROUTE_STOP_RTPPROXY: - start|ROUTE_RESTORE_CLUSTERSET: - return|ROUTE_RESTORE_CLUSTERSET: diff --git a/scenarios/invite_speeddial/0021_test.yml.tt2 b/scenarios/invite_speeddial/0021_test.yml.tt2 index 774d0908..50d5bd09 100644 --- a/scenarios/invite_speeddial/0021_test.yml.tt2 +++ b/scenarios/invite_speeddial/0021_test.yml.tt2 @@ -6,10 +6,9 @@ flow: - start|ROUTE_PRX_REQUEST: - start|ROUTE_INITVARS: - return|ROUTE_INITVARS: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch ?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:end': + - 'return|dialog:end': + - 'return|dialog:end': - start|ROUTE_STOP_RTPPROXY: - start|ROUTE_RESTORE_CLUSTERSET: - return|ROUTE_RESTORE_CLUSTERSET: diff --git a/scenarios/invite_speeddial/0025_test.yml.tt2 b/scenarios/invite_speeddial/0025_test.yml.tt2 index dc5410c7..8c054c06 100644 --- a/scenarios/invite_speeddial/0025_test.yml.tt2 +++ b/scenarios/invite_speeddial/0025_test.yml.tt2 @@ -57,10 +57,9 @@ flow: - start|ROUTE_EARLY_REJECT: - start|ROUTE_ADD_CALLINFO_REPLY: - return|ROUTE_ADD_CALLINFO_REPLY: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch ?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:failed': + - 'return|dialog:failed': + - 'return|dialog:failed': - exit|ROUTE_EARLY_REJECT: sip_in: - '^INVITE sip:\*2@' diff --git a/scenarios/invite_speeddial/0029_test.yml.tt2 b/scenarios/invite_speeddial/0029_test.yml.tt2 index bf381fde..be8ef6ec 100644 --- a/scenarios/invite_speeddial/0029_test.yml.tt2 +++ b/scenarios/invite_speeddial/0029_test.yml.tt2 @@ -38,10 +38,9 @@ flow: - start|ROUTE_EARLY_REJECT: - start|ROUTE_ADD_CALLINFO_REPLY: - return|ROUTE_ADD_CALLINFO_REPLY: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch ?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:failed': + - 'return|dialog:failed': + - 'return|dialog:failed': - exit|ROUTE_EARLY_REJECT: sip_in: - '^INVITE sip:\*9@' diff --git a/scenarios/invite_tcp_udp/0010_test.yml.tt2 b/scenarios/invite_tcp_udp/0010_test.yml.tt2 index d3be4244..1a1ec00e 100644 --- a/scenarios/invite_tcp_udp/0010_test.yml.tt2 +++ b/scenarios/invite_tcp_udp/0010_test.yml.tt2 @@ -5,10 +5,9 @@ flow: - start|ROUTE_PRX_REQUEST: - start|ROUTE_INITVARS: - return|ROUTE_INITVARS: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch ?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:end': + - 'return|dialog:end': + - 'return|dialog:end': - start|ROUTE_STOP_RTPPROXY: - start|ROUTE_RESTORE_CLUSTERSET: - return|ROUTE_RESTORE_CLUSTERSET: diff --git a/scenarios/invite_tcp_udp_reinvite/0013_test.yml.tt2 b/scenarios/invite_tcp_udp_reinvite/0013_test.yml.tt2 index 000f9314..f0924c3b 100644 --- a/scenarios/invite_tcp_udp_reinvite/0013_test.yml.tt2 +++ b/scenarios/invite_tcp_udp_reinvite/0013_test.yml.tt2 @@ -6,10 +6,9 @@ flow: - start|ROUTE_PRX_REQUEST: - start|ROUTE_INITVARS: - return|ROUTE_INITVARS: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch ?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:end': + - 'return|dialog:end': + - 'return|dialog:end': - start|ROUTE_STOP_RTPPROXY: - start|ROUTE_RESTORE_CLUSTERSET: - return|ROUTE_RESTORE_CLUSTERSET: diff --git a/scenarios/invite_voicebox/0011_test.yml.tt2 b/scenarios/invite_voicebox/0011_test.yml.tt2 index e4582f88..11e249f2 100644 --- a/scenarios/invite_voicebox/0011_test.yml.tt2 +++ b/scenarios/invite_voicebox/0011_test.yml.tt2 @@ -5,10 +5,9 @@ flow: - start|ROUTE_PRX_REQUEST: - start|ROUTE_INITVARS: - return|ROUTE_INITVARS: - - start|BRANCH_ROUTE_SBC: - - return|BRANCH_ROUTE_SBC: - # branch ?? - - return|BRANCH_ROUTE_SBC: + - 'start|dialog:end': + - 'return|dialog:end': + - 'return|dialog:end': - start|ROUTE_STOP_RTPPROXY: - return|ROUTE_STOP_RTPPROXY: - start|ROUTE_OUTBOUND: