diff --git a/scenarios/incoming_foreign_dom/0015_test.yml.tt2 b/scenarios/incoming_foreign_dom/0015_test.yml.tt2 index b6f5bdf5..e46cce5d 100644 --- a/scenarios/incoming_foreign_dom/0015_test.yml.tt2 +++ b/scenarios/incoming_foreign_dom/0015_test.yml.tt2 @@ -1,17 +1,6 @@ flow: - start|DEFAULT_ONREPLY: - - start|REPLY_ROUTE_NAT: - - start|ROUTE_ENTRY: - - return|ROUTE_ENTRY: - - start|ROUTE_APPLY_HEADER_RULES: - - return|ROUTE_APPLY_HEADER_RULES: - - start|ROUTE_PREPARE_UA: - - return|ROUTE_PREPARE_UA: - - start|REPLY_ROUTE_NAT_CONTINUE: - - start|ROUTE_EXIT: - - start|ROUTE_RUNTIME: - - return|ROUTE_RUNTIME: - - exit|ROUTE_EXIT: + - return|DEFAULT_ONREPLY: sip_in: - 'SIP/2.0 200 OK' - 'From: ;tag=[\w-]+' diff --git a/scenarios/invite_callee_bye/0018_test.yml.tt2 b/scenarios/invite_callee_bye/0018_test.yml.tt2 index 92f32377..f5c6fa70 100644 --- a/scenarios/invite_callee_bye/0018_test.yml.tt2 +++ b/scenarios/invite_callee_bye/0018_test.yml.tt2 @@ -1,17 +1,6 @@ flow: - start|DEFAULT_ONREPLY: - - start|REPLY_ROUTE_NAT: - - start|ROUTE_ENTRY: - - return|ROUTE_ENTRY: - - start|ROUTE_APPLY_HEADER_RULES: - - return|ROUTE_APPLY_HEADER_RULES: - - start|ROUTE_PREPARE_UA: - - return|ROUTE_PREPARE_UA: - - start|REPLY_ROUTE_NAT_CONTINUE: - - start|ROUTE_EXIT: - - start|ROUTE_RUNTIME: - - return|ROUTE_RUNTIME: - - exit|ROUTE_EXIT: + - return|DEFAULT_ONREPLY: sip_in: - 'SIP/2.0 200 OK' - 'From: ;tag=[\w-]+' @@ -25,5 +14,4 @@ sip_out: 'To: ;tag=[\w-]+', 'CSeq: \d+ BYE', 'Content-Length: 0', - 'P-Out-Socket: udp:[% server_ip %]:5060', ] diff --git a/scenarios/invite_callforward_cfna/0023_test.yml.tt2 b/scenarios/invite_callforward_cfna/0023_test.yml.tt2 index e399ead1..2017bd72 100644 --- a/scenarios/invite_callforward_cfna/0023_test.yml.tt2 +++ b/scenarios/invite_callforward_cfna/0023_test.yml.tt2 @@ -1,17 +1,6 @@ flow: - start|DEFAULT_ONREPLY: - - start|REPLY_ROUTE_NAT: - - start|ROUTE_ENTRY: - - return|ROUTE_ENTRY: - - start|ROUTE_APPLY_HEADER_RULES: - - return|ROUTE_APPLY_HEADER_RULES: - - start|ROUTE_PREPARE_UA: - - return|ROUTE_PREPARE_UA: - - start|REPLY_ROUTE_NAT_CONTINUE: - - start|ROUTE_EXIT: - - start|ROUTE_RUNTIME: - - return|ROUTE_RUNTIME: - - exit|ROUTE_EXIT: + - return|DEFAULT_ONREPLY: sip_in: - 'SIP/2.0 200 OK' - 'From: ;tag=[\w-]+' diff --git a/scenarios/invite_emergency/0015_test.yml.tt2 b/scenarios/invite_emergency/0015_test.yml.tt2 index 6cbbfa81..35fff61c 100644 --- a/scenarios/invite_emergency/0015_test.yml.tt2 +++ b/scenarios/invite_emergency/0015_test.yml.tt2 @@ -1,17 +1,6 @@ flow: - start|DEFAULT_ONREPLY: - - start|REPLY_ROUTE_NAT: - - start|ROUTE_ENTRY: - - return|ROUTE_ENTRY: - - start|ROUTE_APPLY_HEADER_RULES: - - return|ROUTE_APPLY_HEADER_RULES: - - start|ROUTE_PREPARE_UA: - - return|ROUTE_PREPARE_UA: - - start|REPLY_ROUTE_NAT_CONTINUE: - - start|ROUTE_EXIT: - - start|ROUTE_RUNTIME: - - return|ROUTE_RUNTIME: - - exit|ROUTE_EXIT: + - return|DEFAULT_ONREPLY: sip_in: - 'SIP/2.0 200 OK' - 'From: ;tag=[\w-]+' diff --git a/scenarios/invite_emergency_cirpack/0015_test.yml.tt2 b/scenarios/invite_emergency_cirpack/0015_test.yml.tt2 index c78162eb..debbeaf4 100644 --- a/scenarios/invite_emergency_cirpack/0015_test.yml.tt2 +++ b/scenarios/invite_emergency_cirpack/0015_test.yml.tt2 @@ -1,17 +1,6 @@ flow: - start|DEFAULT_ONREPLY: - - start|REPLY_ROUTE_NAT: - - start|ROUTE_ENTRY: - - return|ROUTE_ENTRY: - - start|ROUTE_APPLY_HEADER_RULES: - - return|ROUTE_APPLY_HEADER_RULES: - - start|ROUTE_PREPARE_UA: - - return|ROUTE_PREPARE_UA: - - start|REPLY_ROUTE_NAT_CONTINUE: - - start|ROUTE_EXIT: - - start|ROUTE_RUNTIME: - - return|ROUTE_RUNTIME: - - exit|ROUTE_EXIT: + - return|DEFAULT_ONREPLY: sip_in: - 'SIP/2.0 200 OK' - 'From: ;tag=[\w-]+' diff --git a/scenarios/invite_emergency_pidflo/0015_test.yml.tt2 b/scenarios/invite_emergency_pidflo/0015_test.yml.tt2 index 3aed86c4..255c82ff 100644 --- a/scenarios/invite_emergency_pidflo/0015_test.yml.tt2 +++ b/scenarios/invite_emergency_pidflo/0015_test.yml.tt2 @@ -1,17 +1,6 @@ flow: - start|DEFAULT_ONREPLY: - - start|REPLY_ROUTE_NAT: - - start|ROUTE_ENTRY: - - return|ROUTE_ENTRY: - - start|ROUTE_APPLY_HEADER_RULES: - - return|ROUTE_APPLY_HEADER_RULES: - - start|ROUTE_PREPARE_UA: - - return|ROUTE_PREPARE_UA: - - start|REPLY_ROUTE_NAT_CONTINUE: - - start|ROUTE_EXIT: - - start|ROUTE_RUNTIME: - - return|ROUTE_RUNTIME: - - exit|ROUTE_EXIT: + - return|DEFAULT_ONREPLY: sip_in: - 'SIP/2.0 200 OK' - 'From: ;tag=[\w-]+' diff --git a/scenarios/invite_locmap_add/0028_test.yml.tt2 b/scenarios/invite_locmap_add/0028_test.yml.tt2 index d4a33b66..51caee05 100644 --- a/scenarios/invite_locmap_add/0028_test.yml.tt2 +++ b/scenarios/invite_locmap_add/0028_test.yml.tt2 @@ -1,17 +1,6 @@ flow: - start|DEFAULT_ONREPLY: - - start|REPLY_ROUTE_NAT: - - start|ROUTE_ENTRY: - - return|ROUTE_ENTRY: - - start|ROUTE_APPLY_HEADER_RULES: - - return|ROUTE_APPLY_HEADER_RULES: - - start|ROUTE_PREPARE_UA: - - return|ROUTE_PREPARE_UA: - - start|REPLY_ROUTE_NAT_CONTINUE: - - start|ROUTE_EXIT: - - start|ROUTE_RUNTIME: - - return|ROUTE_RUNTIME: - - exit|ROUTE_EXIT: + - return|DEFAULT_ONREPLY: sip_in: - 'SIP/2.0 200 OK' - 'From: ;tag=[\w-]+' diff --git a/scenarios/invite_prack/0011_test.yml.tt2 b/scenarios/invite_prack/0011_test.yml.tt2 index 94769692..5da885b5 100644 --- a/scenarios/invite_prack/0011_test.yml.tt2 +++ b/scenarios/invite_prack/0011_test.yml.tt2 @@ -1,17 +1,6 @@ flow: - start|DEFAULT_ONREPLY: - - start|REPLY_ROUTE_NAT: - - start|ROUTE_ENTRY: - - return|ROUTE_ENTRY: - - start|ROUTE_APPLY_HEADER_RULES: - - return|ROUTE_APPLY_HEADER_RULES: - - start|ROUTE_PREPARE_UA: - - return|ROUTE_PREPARE_UA: - - start|REPLY_ROUTE_NAT_CONTINUE: - - start|ROUTE_EXIT: - - start|ROUTE_RUNTIME: - - return|ROUTE_RUNTIME: - - exit|ROUTE_EXIT: + - return|DEFAULT_ONREPLY: sip_in: - 'SIP/2.0 200 OK' - 'From: ;tag=[\w-]+' diff --git a/scenarios/invite_redirect/0031_test.yml.tt2 b/scenarios/invite_redirect/0031_test.yml.tt2 index d92f9c7a..021298ca 100644 --- a/scenarios/invite_redirect/0031_test.yml.tt2 +++ b/scenarios/invite_redirect/0031_test.yml.tt2 @@ -1,17 +1,6 @@ flow: - start|DEFAULT_ONREPLY: - - start|REPLY_ROUTE_NAT: - - start|ROUTE_ENTRY: - - return|ROUTE_ENTRY: - - start|ROUTE_APPLY_HEADER_RULES: - - return|ROUTE_APPLY_HEADER_RULES: - - start|ROUTE_PREPARE_UA: - - return|ROUTE_PREPARE_UA: - - start|REPLY_ROUTE_NAT_CONTINUE: - - start|ROUTE_EXIT: - - start|ROUTE_RUNTIME: - - return|ROUTE_RUNTIME: - - exit|ROUTE_EXIT: + - return|DEFAULT_ONREPLY: sip_in: - 'SIP/2.0 200 OK' - 'From: ;tag=[\w-]+' diff --git a/scenarios/invite_reinvite_caller_transcoding/0023_test.yml.tt2 b/scenarios/invite_reinvite_caller_transcoding/0023_test.yml.tt2 index 9fd18578..164a499e 100644 --- a/scenarios/invite_reinvite_caller_transcoding/0023_test.yml.tt2 +++ b/scenarios/invite_reinvite_caller_transcoding/0023_test.yml.tt2 @@ -1,17 +1,6 @@ flow: - start|DEFAULT_ONREPLY: - - start|REPLY_ROUTE_NAT: - - start|ROUTE_ENTRY: - - return|ROUTE_ENTRY: - - start|ROUTE_APPLY_HEADER_RULES: - - return|ROUTE_APPLY_HEADER_RULES: - - start|ROUTE_PREPARE_UA: - - return|ROUTE_PREPARE_UA: - - start|REPLY_ROUTE_NAT_CONTINUE: - - start|ROUTE_EXIT: - - start|ROUTE_RUNTIME: - - return|ROUTE_RUNTIME: - - exit|ROUTE_EXIT: + - return|DEFAULT_ONREPLY: sip_in: - 'SIP/2.0 200 OK' - 'From: ;tag=[\w-]+' diff --git a/scenarios/invite_reinvite_transcoding/0014_test.yml.tt2 b/scenarios/invite_reinvite_transcoding/0014_test.yml.tt2 index 318e2287..d071a9fc 100644 --- a/scenarios/invite_reinvite_transcoding/0014_test.yml.tt2 +++ b/scenarios/invite_reinvite_transcoding/0014_test.yml.tt2 @@ -1,17 +1,6 @@ flow: - start|DEFAULT_ONREPLY: - - start|REPLY_ROUTE_NAT: - - start|ROUTE_ENTRY: - - return|ROUTE_ENTRY: - - start|ROUTE_APPLY_HEADER_RULES: - - return|ROUTE_APPLY_HEADER_RULES: - - start|ROUTE_PREPARE_UA: - - return|ROUTE_PREPARE_UA: - - start|REPLY_ROUTE_NAT_CONTINUE: - - start|ROUTE_EXIT: - - start|ROUTE_RUNTIME: - - return|ROUTE_RUNTIME: - - exit|ROUTE_EXIT: + - return|DEFAULT_ONREPLY: sip_in: - 'SIP/2.0 100 Trying' - 'From: ;tag=[\w-]+' diff --git a/scenarios/invite_reinvite_transcoding/0018_test.yml.tt2 b/scenarios/invite_reinvite_transcoding/0018_test.yml.tt2 index 074e2467..3b026efc 100644 --- a/scenarios/invite_reinvite_transcoding/0018_test.yml.tt2 +++ b/scenarios/invite_reinvite_transcoding/0018_test.yml.tt2 @@ -1,19 +1,6 @@ flow: - start|DEFAULT_ONREPLY: - - start|REPLY_ROUTE_NAT: - - start|ROUTE_ENTRY: - - return|ROUTE_ENTRY: - - start|ROUTE_APPLY_HEADER_RULES: - - return|ROUTE_APPLY_HEADER_RULES: - - start|ROUTE_PREPARE_UA: - - return|ROUTE_PREPARE_UA: - - start|REPLY_ROUTE_RTPENGINE: - - return|REPLY_ROUTE_RTPENGINE: - - start|REPLY_ROUTE_NAT_CONTINUE: - - start|ROUTE_EXIT: - - start|ROUTE_RUNTIME: - - return|ROUTE_RUNTIME: - - exit|ROUTE_EXIT: + - return|DEFAULT_ONREPLY: sip_in: - 'SIP/2.0 200 OK' - 'From: ;tag=[\w-]+' @@ -34,7 +21,6 @@ sip_out: 'Contact: ', 'Content-Type: application/sdp', 'Content-Length:\s+\d+', - 'P-Out-Socket: udp:[% server_ip %]:5060', 'a=rtpmap:18 G729/8000', '_:NOT:_a=rtpmap:8 PCMA/8000', '_:NOT:_a=rtpmap:0 PCMU/8000', diff --git a/scenarios/invite_reinvite_transcoding/0023_test.yml.tt2 b/scenarios/invite_reinvite_transcoding/0023_test.yml.tt2 index 0900073d..5c02f093 100644 --- a/scenarios/invite_reinvite_transcoding/0023_test.yml.tt2 +++ b/scenarios/invite_reinvite_transcoding/0023_test.yml.tt2 @@ -1,17 +1,6 @@ flow: - start|DEFAULT_ONREPLY: - - start|REPLY_ROUTE_NAT: - - start|ROUTE_ENTRY: - - return|ROUTE_ENTRY: - - start|ROUTE_APPLY_HEADER_RULES: - - return|ROUTE_APPLY_HEADER_RULES: - - start|ROUTE_PREPARE_UA: - - return|ROUTE_PREPARE_UA: - - start|REPLY_ROUTE_NAT_CONTINUE: - - start|ROUTE_EXIT: - - start|ROUTE_RUNTIME: - - return|ROUTE_RUNTIME: - - exit|ROUTE_EXIT: + - return|DEFAULT_ONREPLY: sip_in: - 'SIP/2.0 200 OK' - 'From: ;tag=[\w-]+' diff --git a/scenarios/timer_session_supported/0023_test.yml.tt2 b/scenarios/timer_session_supported/0023_test.yml.tt2 index 957efae1..89eb5277 100644 --- a/scenarios/timer_session_supported/0023_test.yml.tt2 +++ b/scenarios/timer_session_supported/0023_test.yml.tt2 @@ -1,17 +1,6 @@ flow: - start|DEFAULT_ONREPLY: - - start|REPLY_ROUTE_NAT: - - start|ROUTE_ENTRY: - - return|ROUTE_ENTRY: - - start|ROUTE_APPLY_HEADER_RULES: - - return|ROUTE_APPLY_HEADER_RULES: - - start|ROUTE_PREPARE_UA: - - return|ROUTE_PREPARE_UA: - - start|REPLY_ROUTE_NAT_CONTINUE: - - start|ROUTE_EXIT: - - start|ROUTE_RUNTIME: - - return|ROUTE_RUNTIME: - - exit|ROUTE_EXIT: + - return|DEFAULT_ONREPLY: sip_in: - 'SIP/2.0 200 OK' - 'From: ;tag=[\w-]+'