diff --git a/bin/check.sh b/bin/check.sh index e604f7a0..2eb83e22 100755 --- a/bin/check.sh +++ b/bin/check.sh @@ -234,7 +234,7 @@ delete_locations() { for f in ${SCEN_CHECK_DIR}/callee.csv ${SCEN_CHECK_DIR}/caller.csv; do for sub in $(uniq "$f" | grep "${DOMAIN}" | cut -d\; -f1 | xargs); do - ngcp-kamctl proxy ul rm "$sub@${DOMAIN}" + ngcp-kamctl proxy fifo ul.rm location "$sub@${DOMAIN}" # delete possible banned user ngcp-sercmd lb htable.delete auth "$sub@${DOMAIN}::auth_count" done @@ -249,7 +249,7 @@ delete_locations() { -e 'select concat(username, "@", domain) as user from kamailio.location;' \ -r -s | head| uniq|xargs) for f in $sub; do - ngcp-kamctl proxy ul rm "$f" + ngcp-kamctl proxy fifo ul.rm location "$f" done mysql -usipwise -p"${SIPWISE_DB_PASSWORD}" \ -e 'delete from kamailio.location;' || true diff --git a/scenarios/incoming_foreign_dom/0007_test.yml.tt2 b/scenarios/incoming_foreign_dom/0007_test.yml.tt2 index 534445a8..5446964f 100644 --- a/scenarios/incoming_foreign_dom/0007_test.yml.tt2 +++ b/scenarios/incoming_foreign_dom/0007_test.yml.tt2 @@ -12,7 +12,10 @@ flow: - start|ROUTE_WITHINDLG_RTPENGINE: - return|ROUTE_WITHINDLG_RTPENGINE: - start|ROUTE_OUTBOUND: - - return|ROUTE_OUTBOUND: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT: sip_in: - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0' - 'CSeq: 1 ACK' diff --git a/scenarios/incoming_hih/0011_test.yml.tt2 b/scenarios/incoming_hih/0011_test.yml.tt2 index fd4e502e..930c609a 100644 --- a/scenarios/incoming_hih/0011_test.yml.tt2 +++ b/scenarios/incoming_hih/0011_test.yml.tt2 @@ -12,7 +12,10 @@ flow: - start|ROUTE_WITHINDLG_RTPENGINE: - return|ROUTE_WITHINDLG_RTPENGINE: - start|ROUTE_OUTBOUND: - - return|ROUTE_OUTBOUND: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT: sip_in: - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0' - 'Contact: sip:004321001@' diff --git a/scenarios/incoming_peer/0007_test.yml.tt2 b/scenarios/incoming_peer/0007_test.yml.tt2 index dfa9852b..39031b3e 100644 --- a/scenarios/incoming_peer/0007_test.yml.tt2 +++ b/scenarios/incoming_peer/0007_test.yml.tt2 @@ -12,7 +12,10 @@ flow: - start|ROUTE_WITHINDLG_RTPENGINE: - return|ROUTE_WITHINDLG_RTPENGINE: - start|ROUTE_OUTBOUND: - - return|ROUTE_OUTBOUND: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT: sip_in: - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0' - 'CSeq: 1 ACK' diff --git a/scenarios/invite/0009_test.yml.tt2 b/scenarios/invite/0009_test.yml.tt2 index 3e7befb1..41ec5717 100644 --- a/scenarios/invite/0009_test.yml.tt2 +++ b/scenarios/invite/0009_test.yml.tt2 @@ -12,7 +12,10 @@ flow: - start|ROUTE_WITHINDLG_RTPENGINE: - return|ROUTE_WITHINDLG_RTPENGINE: - start|ROUTE_OUTBOUND: - - return|ROUTE_OUTBOUND: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT: sip_in: - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0' - 'CSeq: 2 ACK' diff --git a/scenarios/invite_allowedcli_match/0009_test.yml.tt2 b/scenarios/invite_allowedcli_match/0009_test.yml.tt2 index 751b656b..d4ba5790 100644 --- a/scenarios/invite_allowedcli_match/0009_test.yml.tt2 +++ b/scenarios/invite_allowedcli_match/0009_test.yml.tt2 @@ -12,7 +12,10 @@ flow: - start|ROUTE_WITHINDLG_RTPENGINE: - return|ROUTE_WITHINDLG_RTPENGINE: - start|ROUTE_OUTBOUND: - - return|ROUTE_OUTBOUND: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT: sip_in: - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0' - 'CSeq: 2 ACK' diff --git a/scenarios/invite_allowedcli_match_alias/0009_test.yml.tt2 b/scenarios/invite_allowedcli_match_alias/0009_test.yml.tt2 index 65da2742..b2210f72 100644 --- a/scenarios/invite_allowedcli_match_alias/0009_test.yml.tt2 +++ b/scenarios/invite_allowedcli_match_alias/0009_test.yml.tt2 @@ -12,7 +12,10 @@ flow: - start|ROUTE_WITHINDLG_RTPENGINE: - return|ROUTE_WITHINDLG_RTPENGINE: - start|ROUTE_OUTBOUND: - - return|ROUTE_OUTBOUND: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT: sip_in: - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0' - 'CSeq: 2 ACK' diff --git a/scenarios/invite_allowedcli_nonmatch/0009_test.yml.tt2 b/scenarios/invite_allowedcli_nonmatch/0009_test.yml.tt2 index 08237f89..4e996838 100644 --- a/scenarios/invite_allowedcli_nonmatch/0009_test.yml.tt2 +++ b/scenarios/invite_allowedcli_nonmatch/0009_test.yml.tt2 @@ -12,7 +12,10 @@ flow: - start|ROUTE_WITHINDLG_RTPENGINE: - return|ROUTE_WITHINDLG_RTPENGINE: - start|ROUTE_OUTBOUND: - - return|ROUTE_OUTBOUND: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT: sip_in: - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0' - 'CSeq: 2 ACK' diff --git a/scenarios/invite_anonymous/0009_test.yml.tt2 b/scenarios/invite_anonymous/0009_test.yml.tt2 index 5016a3a8..5fd8bc0c 100644 --- a/scenarios/invite_anonymous/0009_test.yml.tt2 +++ b/scenarios/invite_anonymous/0009_test.yml.tt2 @@ -12,7 +12,10 @@ flow: - start|ROUTE_WITHINDLG_RTPENGINE: - return|ROUTE_WITHINDLG_RTPENGINE: - start|ROUTE_OUTBOUND: - - return|ROUTE_OUTBOUND: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT: sip_in: - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0' - 'CSeq: 2 ACK' diff --git a/scenarios/invite_blockout_pinoverride/0009_test.yml.tt2 b/scenarios/invite_blockout_pinoverride/0009_test.yml.tt2 index 921c853b..811ddbed 100644 --- a/scenarios/invite_blockout_pinoverride/0009_test.yml.tt2 +++ b/scenarios/invite_blockout_pinoverride/0009_test.yml.tt2 @@ -12,7 +12,10 @@ flow: - start|ROUTE_WITHINDLG_RTPENGINE: - return|ROUTE_WITHINDLG_RTPENGINE: - start|ROUTE_OUTBOUND: - - return|ROUTE_OUTBOUND: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT: sip_in: - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0' - 'CSeq: 2 ACK' diff --git a/scenarios/invite_callforward/0017_test.yml.tt2 b/scenarios/invite_callforward/0017_test.yml.tt2 index 7295180f..60d1a4c1 100644 --- a/scenarios/invite_callforward/0017_test.yml.tt2 +++ b/scenarios/invite_callforward/0017_test.yml.tt2 @@ -12,7 +12,10 @@ flow: - start|ROUTE_WITHINDLG_RTPENGINE: - return|ROUTE_WITHINDLG_RTPENGINE: - start|ROUTE_OUTBOUND: - - return|ROUTE_OUTBOUND: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT: sip_in: - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0' - 'Contact: sip:testuser1002@' diff --git a/scenarios/invite_concurrent_max_per_account/sipp_scenario00.xml b/scenarios/invite_concurrent_max_per_account/sipp_scenario00.xml index 13b3c912..8403cc52 100644 --- a/scenarios/invite_concurrent_max_per_account/sipp_scenario00.xml +++ b/scenarios/invite_concurrent_max_per_account/sipp_scenario00.xml @@ -113,7 +113,7 @@ - + - + ;tag=' diff --git a/scenarios_pbx/incoming_shared_line/0003_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0003_test.yml.tt2 index 5d3637c1..9f19ecb9 100644 --- a/scenarios_pbx/incoming_shared_line/0003_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0003_test.yml.tt2 @@ -1,5 +1,7 @@ flow: - start|DEFAULT_ROUTE: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: - start|ROUTE_NET_INFO: - return|ROUTE_NET_INFO: - start|ROUTE_IMP_REQUEST: @@ -12,7 +14,10 @@ flow: - return|ROUTE_ADD_CALLINFO_REPLY: - return|ROUTE_AUTH: - start|ROUTE_IMP_PRESENCE: - - exit|ROUTE_IMP_PRESENCE: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT sip_in: - '^SUBSCRIBE sip:testuser1002@spce.test SIP/2.0' - 'From: ;tag=' diff --git a/scenarios_pbx/incoming_shared_line/0005_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0005_test.yml.tt2 index fef36d52..89d87e81 100644 --- a/scenarios_pbx/incoming_shared_line/0005_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0005_test.yml.tt2 @@ -1,12 +1,17 @@ flow: - start|DEFAULT_ROUTE: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: - start|ROUTE_NET_INFO: - return|ROUTE_NET_INFO: - start|ROUTE_IMP_REQUEST: - start|ROUTE_IMP_WITHINDLG: - return|ROUTE_IMP_WITHINDLG: - start|ROUTE_AUTH: - - exit|ROUTE_AUTH: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT sip_in: - '^SUBSCRIBE sip:testuser1002@spce.test SIP/2.0' - 'From: ;tag=' diff --git a/scenarios_pbx/incoming_shared_line/0007_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0007_test.yml.tt2 index 4dbdea88..015a8ec7 100644 --- a/scenarios_pbx/incoming_shared_line/0007_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0007_test.yml.tt2 @@ -1,5 +1,7 @@ flow: - start|DEFAULT_ROUTE: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: - start|ROUTE_NET_INFO: - return|ROUTE_NET_INFO: - start|ROUTE_IMP_REQUEST: @@ -12,7 +14,10 @@ flow: - return|ROUTE_ADD_CALLINFO_REPLY: - return|ROUTE_AUTH: - start|ROUTE_IMP_PRESENCE: - - exit|ROUTE_IMP_PRESENCE: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT sip_in: - '^SUBSCRIBE sip:testuser1002@spce.test SIP/2.0' - 'From: ;tag=' diff --git a/scenarios_pbx/incoming_shared_line/0009_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0009_test.yml.tt2 index 5d7b3a60..1d36e81b 100644 --- a/scenarios_pbx/incoming_shared_line/0009_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0009_test.yml.tt2 @@ -1,11 +1,16 @@ flow: - start|DEFAULT_ROUTE: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: - start|ROUTE_NET_INFO: - return|ROUTE_NET_INFO: - start|ROUTE_REG_REQUEST: - start|ROUTE_REG_HANDLE: - start|ROUTE_AUTH: - - exit|ROUTE_AUTH: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT sip_in: - '^REGISTER sip:testuser1002@spce.test SIP/2.0' - 'From: ;tag=' diff --git a/scenarios_pbx/incoming_shared_line/0010_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0010_test.yml.tt2 index 76b27f6c..0199a517 100644 --- a/scenarios_pbx/incoming_shared_line/0010_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0010_test.yml.tt2 @@ -1,5 +1,7 @@ flow: - start|DEFAULT_ROUTE: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: - start|ROUTE_NET_INFO: - return|ROUTE_NET_INFO: - start|ROUTE_REG_REQUEST: @@ -14,7 +16,10 @@ flow: - start|ROUTE_CHECK_UA: - return|ROUTE_CHECK_UA: - return|ROUTE_PREFERENCES: - - exit|ROUTE_REG_HANDLE: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT sip_in: - '^REGISTER sip:testuser1002@spce.test SIP/2.0' - 'From: ;tag=' diff --git a/scenarios_pbx/incoming_shared_line/0011_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0011_test.yml.tt2 index 0169e4ff..c070bb3d 100644 --- a/scenarios_pbx/incoming_shared_line/0011_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0011_test.yml.tt2 @@ -1,11 +1,16 @@ flow: - start|DEFAULT_ROUTE: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: - start|ROUTE_NET_INFO: - return|ROUTE_NET_INFO: - start|ROUTE_REG_REQUEST: - start|ROUTE_REG_HANDLE: - start|ROUTE_AUTH: - - exit|ROUTE_AUTH: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT sip_in: - '^REGISTER sip:testuser1002@spce.test SIP/2.0' - 'From: ;tag=' diff --git a/scenarios_pbx/incoming_shared_line/0012_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0012_test.yml.tt2 index 59399ca3..2f96ded0 100644 --- a/scenarios_pbx/incoming_shared_line/0012_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0012_test.yml.tt2 @@ -1,5 +1,7 @@ flow: - start|DEFAULT_ROUTE: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: - start|ROUTE_NET_INFO: - return|ROUTE_NET_INFO: - start|ROUTE_REG_REQUEST: @@ -14,7 +16,10 @@ flow: - start|ROUTE_CHECK_UA: - return|ROUTE_CHECK_UA: - return|ROUTE_PREFERENCES: - - exit|ROUTE_REG_HANDLE: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT sip_in: - '^REGISTER sip:testuser1002@spce.test SIP/2.0' - 'From: ;tag=' diff --git a/scenarios_pbx/incoming_shared_line/0015_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0015_test.yml.tt2 index 826f280a..44f5e358 100644 --- a/scenarios_pbx/incoming_shared_line/0015_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0015_test.yml.tt2 @@ -1,5 +1,7 @@ flow: - start|DEFAULT_ROUTE: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: - start|ROUTE_NET_INFO: - return|ROUTE_NET_INFO: - start|ROUTE_PRX_REQUEST: @@ -12,7 +14,10 @@ flow: - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF: - start|ROUTE_FIND_CALLER: - start|ROUTE_AUTH: - - exit|ROUTE_AUTH: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT sip_in: - '^INVITE sip:1002@spce.test SIP/2.0' - 'From: ;tag=' diff --git a/scenarios_pbx/incoming_shared_line/0017_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0017_test.yml.tt2 index a54b995b..b0e3e7e7 100644 --- a/scenarios_pbx/incoming_shared_line/0017_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0017_test.yml.tt2 @@ -1,5 +1,7 @@ flow: - start|DEFAULT_ROUTE: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: - start|ROUTE_NET_INFO: - return|ROUTE_NET_INFO: - start|ROUTE_PRX_REQUEST: @@ -102,7 +104,10 @@ flow: - return|ROUTE_ADD_CALLINFO: - return|BRANCH_ROUTE_NO_SBC: - return|BRANCH_ROUTE_NO_SBC: - - exit|ROUTE_OUTBOUND: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT sip_in: - '^INVITE sip:1002@spce.test SIP/2.0' - 'From: ;tag=' diff --git a/scenarios_pbx/incoming_shared_line/0019_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0019_test.yml.tt2 index bb4efa24..9d8052d6 100644 --- a/scenarios_pbx/incoming_shared_line/0019_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0019_test.yml.tt2 @@ -1,5 +1,7 @@ flow: - start|DEFAULT_ROUTE: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: - start|ROUTE_NET_INFO: - return|ROUTE_NET_INFO: - start|ROUTE_PRX_REQUEST: @@ -146,7 +148,10 @@ flow: - return|ROUTE_ADD_CALLINFO: - return|BRANCH_ROUTE_SBC: - return|BRANCH_ROUTE_SBC: - - exit|ROUTE_OUTBOUND: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT sip_in: - 'INVITE sip:testuser1002@spce.test SIP/2.0' - 'From: ;tag=' diff --git a/scenarios_pbx/incoming_shared_line/0022_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0022_test.yml.tt2 index 99cc5e99..2daa63c6 100644 --- a/scenarios_pbx/incoming_shared_line/0022_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0022_test.yml.tt2 @@ -1,6 +1,11 @@ flow: - start|REPLY_ROUTE_NAT: - - exit|REPLY_ROUTE_NAT: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT sip_in: - '^SIP/2.0 180 Ringing' - 'From: ;tag=' diff --git a/scenarios_pbx/incoming_shared_line/0023_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0023_test.yml.tt2 index b1375065..3ca6e735 100644 --- a/scenarios_pbx/incoming_shared_line/0023_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0023_test.yml.tt2 @@ -1,6 +1,11 @@ flow: - start|REPLY_ROUTE_NAT: - - exit|REPLY_ROUTE_NAT: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT sip_in: - '^SIP/2.0 180 Ringing' - 'From: ;tag=' diff --git a/scenarios_pbx/incoming_shared_line/0024_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0024_test.yml.tt2 index f69e281b..303e9472 100644 --- a/scenarios_pbx/incoming_shared_line/0024_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0024_test.yml.tt2 @@ -1,8 +1,13 @@ flow: - start|REPLY_ROUTE_NAT: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: - start|REPLY_SCA_UPDATE: - return|REPLY_SCA_UPDATE: - - exit|REPLY_ROUTE_NAT: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT sip_in: - '^SIP/2.0 180 Ringing' - 'From: ;tag=' diff --git a/scenarios_pbx/incoming_shared_line/0025_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0025_test.yml.tt2 index 90e0f0e0..adc8e567 100644 --- a/scenarios_pbx/incoming_shared_line/0025_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0025_test.yml.tt2 @@ -1,5 +1,7 @@ flow: - start|REPLY_ROUTE_NAT: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: - start|REPLY_ROUTE_RTPENGINE: - return|REPLY_ROUTE_RTPENGINE: - start|ROUTE_EXIT: diff --git a/scenarios_pbx/incoming_shared_line/0027_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0027_test.yml.tt2 index 63d8eee0..5b862930 100644 --- a/scenarios_pbx/incoming_shared_line/0027_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0027_test.yml.tt2 @@ -1,6 +1,11 @@ flow: - start|REPLY_ROUTE_NAT: - - exit|REPLY_ROUTE_NAT: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT sip_in: - '^SIP/2.0 487 Request terminated' - 'From: ;tag=' diff --git a/scenarios_pbx/incoming_shared_line/0028_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0028_test.yml.tt2 index f5531a45..b99e0e10 100644 --- a/scenarios_pbx/incoming_shared_line/0028_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0028_test.yml.tt2 @@ -1,5 +1,7 @@ flow: - start|REPLY_ROUTE_NAT: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: - start|REPLY_SCA_UPDATE: - return|REPLY_SCA_UPDATE: - start|REPLY_ROUTE_RTPENGINE: diff --git a/scenarios_pbx/incoming_shared_line/0029_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0029_test.yml.tt2 index c26b2bf1..03655f7e 100644 --- a/scenarios_pbx/incoming_shared_line/0029_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0029_test.yml.tt2 @@ -1,5 +1,7 @@ flow: - start|DEFAULT_ROUTE: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: - start|ROUTE_NET_INFO: - return|ROUTE_NET_INFO: - start|ROUTE_PRX_REQUEST: @@ -10,7 +12,10 @@ flow: - start|ROUTE_WITHINDLG_RTPENGINE: - return|ROUTE_WITHINDLG_RTPENGINE: - start|ROUTE_OUTBOUND: - - return|ROUTE_OUTBOUND: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT: sip_in: - '^ACK sip:127.0.0.1:5085;prxroute=1 SIP/2.0' - 'From: ;tag=' diff --git a/scenarios_pbx/incoming_shared_line/0033_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0033_test.yml.tt2 index b74e6e7c..018d7c02 100644 --- a/scenarios_pbx/incoming_shared_line/0033_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0033_test.yml.tt2 @@ -1,5 +1,7 @@ flow: - start|DEFAULT_ROUTE: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: - start|ROUTE_NET_INFO: - return|ROUTE_NET_INFO: - start|ROUTE_PRX_REQUEST: @@ -15,7 +17,10 @@ flow: - start|ROUTE_SCA_UPDATE: - return|ROUTE_SCA_UPDATE: - start|ROUTE_OUTBOUND: - - exit|ROUTE_OUTBOUND: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT sip_in: - '^BYE sip:127.0.0.1:5085;prxroute=1 SIP/2.0' - 'From: ;tag=' diff --git a/scenarios_pbx/incoming_shared_line/0036_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0036_test.yml.tt2 index ee926360..74e9c1b7 100644 --- a/scenarios_pbx/incoming_shared_line/0036_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0036_test.yml.tt2 @@ -1,5 +1,7 @@ flow: - start|DEFAULT_ROUTE: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: - start|ROUTE_NET_INFO: - return|ROUTE_NET_INFO: - start|ROUTE_PRX_REQUEST: @@ -13,7 +15,10 @@ flow: - return|ROUTE_RESTORE_CLUSTERSET: - return|ROUTE_STOP_RTPPROXY: - start|ROUTE_OUTBOUND: - - exit|ROUTE_OUTBOUND: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT sip_in: - '^BYE sip:testuser1002@127.0.0.1:5080 SIP/2.0' - 'From: ;tag=' diff --git a/scenarios_pbx/incoming_shared_line/0037_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0037_test.yml.tt2 index 83ced32b..b2d9038c 100644 --- a/scenarios_pbx/incoming_shared_line/0037_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0037_test.yml.tt2 @@ -1,6 +1,11 @@ flow: - start|REPLY_ROUTE_NAT: - - exit|REPLY_ROUTE_NAT: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT sip_in: - '^SIP/2.0 200 OK' - 'From: ;tag=' diff --git a/scenarios_pbx/incoming_shared_line/0038_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0038_test.yml.tt2 index 0197f662..9a915681 100644 --- a/scenarios_pbx/incoming_shared_line/0038_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0038_test.yml.tt2 @@ -1,6 +1,11 @@ flow: - start|REPLY_ROUTE_NAT: - - exit|REPLY_ROUTE_NAT: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT sip_in: - '^SIP/2.0 200 OK' - 'From: ;tag=' diff --git a/scenarios_pbx/invite/0003_test.yml.tt2 b/scenarios_pbx/invite/0003_test.yml.tt2 index 73109de7..ef225bb2 100644 --- a/scenarios_pbx/invite/0003_test.yml.tt2 +++ b/scenarios_pbx/invite/0003_test.yml.tt2 @@ -1,5 +1,7 @@ flow: - start|DEFAULT_ROUTE: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: - start|ROUTE_NET_INFO: - return|ROUTE_NET_INFO: - start|ROUTE_PRX_REQUEST: @@ -12,7 +14,10 @@ flow: - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF: - start|ROUTE_FIND_CALLER: - start|ROUTE_AUTH: - - exit|ROUTE_AUTH: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT sip_in: - '^INVITE' - 'Contact: sip:testuser1002@' diff --git a/scenarios_pbx/invite/0005_test.yml.tt2 b/scenarios_pbx/invite/0005_test.yml.tt2 index e3c4d5f8..1f37cd04 100644 --- a/scenarios_pbx/invite/0005_test.yml.tt2 +++ b/scenarios_pbx/invite/0005_test.yml.tt2 @@ -1,5 +1,7 @@ flow: - start|DEFAULT_ROUTE: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: - start|ROUTE_NET_INFO: - return|ROUTE_NET_INFO: - start|ROUTE_PRX_REQUEST: @@ -121,7 +123,7 @@ flow: - return|ROUTE_ADD_CALLINFO: - return|BRANCH_ROUTE_NO_SBC: - return|BRANCH_ROUTE_NO_SBC: - - exit|ROUTE_OUTBOUND: + - start|ROUTE_EXIT: $avp(lua_dlg_profile): [ "totalaccountout:[% customerpbx_test.id %]", "totaluserout:[% spce_test.testuser1002.uuid %]", @@ -131,6 +133,9 @@ flow: "totaluser:[% spce_test.testuser1003.uuid %]", "total" ] + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT sip_in: - '^INVITE sip:1003' - 'Contact: sip:testuser1002@' diff --git a/scenarios_pbx/invite/0006_test.yml.tt2 b/scenarios_pbx/invite/0006_test.yml.tt2 index 95306d7a..cfdea115 100644 --- a/scenarios_pbx/invite/0006_test.yml.tt2 +++ b/scenarios_pbx/invite/0006_test.yml.tt2 @@ -9,7 +9,12 @@ flow: "totaluser:[% spce_test.testuser1003.uuid %]", "total" ] - - exit|REPLY_ROUTE_NAT: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT sip_in: - 'SIP/2.0 100 Trying' - 'From: ;tag=' diff --git a/scenarios_pbx/invite_shared_line/0002_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0002_test.yml.tt2 index dce6fe10..88d402bb 100644 --- a/scenarios_pbx/invite_shared_line/0002_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0002_test.yml.tt2 @@ -1,5 +1,7 @@ flow: - start|DEFAULT_ROUTE: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: - start|ROUTE_NET_INFO: - return|ROUTE_NET_INFO: - start|ROUTE_IMP_REQUEST: @@ -12,7 +14,10 @@ flow: - return|ROUTE_ADD_CALLINFO_REPLY: - return|ROUTE_AUTH: - start|ROUTE_IMP_PRESENCE: - - exit|ROUTE_IMP_PRESENCE: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT sip_in: - '^SUBSCRIBE sip:testuser1002@spce.test SIP/2.0' - 'From: ;tag=' diff --git a/scenarios_pbx/invite_shared_line/0008_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0008_test.yml.tt2 index 4b52baaf..b45306dd 100644 --- a/scenarios_pbx/invite_shared_line/0008_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0008_test.yml.tt2 @@ -1,12 +1,17 @@ flow: - start|DEFAULT_ROUTE: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: - start|ROUTE_NET_INFO: - return|ROUTE_NET_INFO: - start|ROUTE_IMP_REQUEST: - start|ROUTE_IMP_WITHINDLG: - return|ROUTE_IMP_WITHINDLG: - start|ROUTE_AUTH: - - exit|ROUTE_AUTH: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT sip_in: - '^SUBSCRIBE sip:testuser1002@spce.test SIP/2.0' - 'From: ;tag=' diff --git a/scenarios_pbx/invite_shared_line/0009_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0009_test.yml.tt2 index db1eef5e..d5c995ef 100644 --- a/scenarios_pbx/invite_shared_line/0009_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0009_test.yml.tt2 @@ -1,5 +1,7 @@ flow: - start|DEFAULT_ROUTE: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: - start|ROUTE_NET_INFO: - return|ROUTE_NET_INFO: - start|ROUTE_IMP_REQUEST: @@ -12,7 +14,10 @@ flow: - return|ROUTE_ADD_CALLINFO_REPLY: - return|ROUTE_AUTH: - start|ROUTE_IMP_PRESENCE: - - exit|ROUTE_IMP_PRESENCE: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT sip_in: - '^SUBSCRIBE sip:testuser1002@spce.test SIP/2.0' - 'From: ;tag=' diff --git a/scenarios_pbx/invite_shared_line/0012_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0012_test.yml.tt2 index b4a2ab68..d48eb8e7 100644 --- a/scenarios_pbx/invite_shared_line/0012_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0012_test.yml.tt2 @@ -1,5 +1,7 @@ flow: - start|DEFAULT_ROUTE: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: - start|ROUTE_NET_INFO: - return|ROUTE_NET_INFO: - start|ROUTE_PRX_REQUEST: @@ -12,7 +14,10 @@ flow: - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF: - start|ROUTE_FIND_CALLER: - start|ROUTE_AUTH: - - exit|ROUTE_AUTH: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT sip_in: - '^INVITE sip:1003@spce.test SIP/2.0' - 'From: ;tag=' diff --git a/scenarios_pbx/invite_shared_line/0014_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0014_test.yml.tt2 index 661bb689..9f085e6a 100644 --- a/scenarios_pbx/invite_shared_line/0014_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0014_test.yml.tt2 @@ -1,5 +1,7 @@ flow: - start|DEFAULT_ROUTE: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: - start|ROUTE_NET_INFO: - return|ROUTE_NET_INFO: - start|ROUTE_PRX_REQUEST: @@ -116,7 +118,7 @@ flow: - return|ROUTE_ADD_CALLINFO: - return|BRANCH_ROUTE_NO_SBC: - return|BRANCH_ROUTE_NO_SBC: - - exit|ROUTE_OUTBOUND: + - start|ROUTE_EXIT: $avp(lua_dlg_profile): [ "totalaccountout:[% customerpbx_test.id %]", "totaluserout:[% spce_test.testuser1002.uuid %]", @@ -126,6 +128,9 @@ flow: "totaluser:[% spce_test.testuser1003.uuid %]", "total" ] + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT sip_in: - '^INVITE sip:1003@spce.test SIP/2.0' - 'From: ;tag=' diff --git a/scenarios_pbx/invite_shared_line/0017_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0017_test.yml.tt2 index c6f101fa..6f6f17ad 100644 --- a/scenarios_pbx/invite_shared_line/0017_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0017_test.yml.tt2 @@ -1,5 +1,7 @@ flow: - start|DEFAULT_ROUTE: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: - start|ROUTE_NET_INFO: - return|ROUTE_NET_INFO: - start|ROUTE_PRX_REQUEST: @@ -114,11 +116,14 @@ flow: - return|ROUTE_ADD_CALLINFO: - return|BRANCH_ROUTE_SBC: - return|BRANCH_ROUTE_SBC: - - exit|ROUTE_OUTBOUND: + - start|ROUTE_EXIT: $avp(lua_dlg_profile): [ "local", "total" ] + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT sip_in: - '^INVITE sip:testuser1003@spce.test SIP/2.0' - 'From: ;tag=' diff --git a/scenarios_pbx/invite_shared_line/0019_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0019_test.yml.tt2 index 772e8e1c..a4d58aba 100644 --- a/scenarios_pbx/invite_shared_line/0019_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0019_test.yml.tt2 @@ -1,6 +1,11 @@ flow: - start|REPLY_ROUTE_NAT: - - exit|REPLY_ROUTE_NAT: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT sip_in: - '^SIP/2.0 180 Ringing' - 'Contact: ' diff --git a/scenarios_pbx/invite_shared_line/0020_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0020_test.yml.tt2 index 4680b5ce..a2d3c3fd 100644 --- a/scenarios_pbx/invite_shared_line/0020_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0020_test.yml.tt2 @@ -1,8 +1,13 @@ flow: - start|REPLY_ROUTE_NAT: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: - start|REPLY_SCA_UPDATE: - return|REPLY_SCA_UPDATE: - - exit|REPLY_ROUTE_NAT: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT sip_in: - '^SIP/2.0 180 Ringing' - 'From: ;tag=' diff --git a/scenarios_pbx/invite_shared_line/0023_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0023_test.yml.tt2 index c2054df0..ae950894 100644 --- a/scenarios_pbx/invite_shared_line/0023_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0023_test.yml.tt2 @@ -1,5 +1,7 @@ flow: - start|REPLY_ROUTE_NAT: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: - start|REPLY_ROUTE_RTPENGINE: - return|REPLY_ROUTE_RTPENGINE: - start|ROUTE_EXIT: diff --git a/scenarios_pbx/invite_shared_line/0024_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0024_test.yml.tt2 index 30da1e27..2b6e3503 100644 --- a/scenarios_pbx/invite_shared_line/0024_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0024_test.yml.tt2 @@ -1,5 +1,7 @@ flow: - start|REPLY_ROUTE_NAT: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: - start|REPLY_SCA_UPDATE: - return|REPLY_SCA_UPDATE: - start|REPLY_ROUTE_RTPENGINE: diff --git a/scenarios_pbx/invite_shared_line/0026_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0026_test.yml.tt2 index f766a267..3215e82d 100644 --- a/scenarios_pbx/invite_shared_line/0026_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0026_test.yml.tt2 @@ -1,5 +1,7 @@ flow: - start|DEFAULT_ROUTE: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: - start|ROUTE_NET_INFO: - return|ROUTE_NET_INFO: - start|ROUTE_PRX_REQUEST: @@ -10,7 +12,10 @@ flow: - start|ROUTE_WITHINDLG_RTPENGINE: - return|ROUTE_WITHINDLG_RTPENGINE: - start|ROUTE_OUTBOUND: - - return|ROUTE_OUTBOUND: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT: sip_in: - '^ACK sip:127.0.0.1:5085(;prxroute=1)? SIP/2.0' - 'From: ;tag=' diff --git a/scenarios_pbx/invite_shared_line/0027_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0027_test.yml.tt2 index a2b5c90a..163b51ed 100644 --- a/scenarios_pbx/invite_shared_line/0027_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0027_test.yml.tt2 @@ -1,5 +1,7 @@ flow: - start|DEFAULT_ROUTE: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: - start|ROUTE_NET_INFO: - return|ROUTE_NET_INFO: - start|ROUTE_PRX_REQUEST: @@ -10,7 +12,10 @@ flow: - start|ROUTE_WITHINDLG_RTPENGINE: - return|ROUTE_WITHINDLG_RTPENGINE: - start|ROUTE_OUTBOUND: - - return|ROUTE_OUTBOUND: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT sip_in: - '^ACK sip:testuser1003@127.0.0.1:5080 SIP/2.0' - 'From: ;tag=' diff --git a/scenarios_pbx/invite_shared_line/0028_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0028_test.yml.tt2 index ae51956a..1245cbfc 100644 --- a/scenarios_pbx/invite_shared_line/0028_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0028_test.yml.tt2 @@ -1,5 +1,7 @@ flow: - start|DEFAULT_ROUTE: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: - start|ROUTE_NET_INFO: - return|ROUTE_NET_INFO: - start|ROUTE_PRX_REQUEST: @@ -16,7 +18,10 @@ flow: - start|ROUTE_SCA_UPDATE: - return|ROUTE_SCA_UPDATE: - start|ROUTE_OUTBOUND: - - exit|ROUTE_OUTBOUND: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT sip_in: - '^BYE sip:127.0.0.1:5085;prxroute=1 SIP/2.0' - 'From: ;tag=' diff --git a/scenarios_pbx/invite_shared_line/0030_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0030_test.yml.tt2 index 15d295d9..5f12e8bd 100644 --- a/scenarios_pbx/invite_shared_line/0030_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0030_test.yml.tt2 @@ -1,5 +1,7 @@ flow: - start|DEFAULT_ROUTE: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: - start|ROUTE_NET_INFO: - return|ROUTE_NET_INFO: - start|ROUTE_PRX_REQUEST: @@ -14,7 +16,10 @@ flow: - return|ROUTE_RESTORE_CLUSTERSET: - return|ROUTE_STOP_RTPPROXY: - start|ROUTE_OUTBOUND: - - exit|ROUTE_OUTBOUND: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT sip_in: - '^BYE sip:testuser1003@127.0.0.1:5080 SIP/2.0' - 'From: ;tag=' diff --git a/scenarios_pbx/invite_shared_line/0031_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0031_test.yml.tt2 index 33cd313f..02009f05 100644 --- a/scenarios_pbx/invite_shared_line/0031_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0031_test.yml.tt2 @@ -1,6 +1,11 @@ flow: - start|REPLY_ROUTE_NAT: - - exit|REPLY_ROUTE_NAT: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT sip_in: - '^SIP/2.0 200 OK' - 'From: ;tag=' diff --git a/scenarios_pbx/invite_shared_line/0032_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0032_test.yml.tt2 index d79dd5d7..45846785 100644 --- a/scenarios_pbx/invite_shared_line/0032_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0032_test.yml.tt2 @@ -1,6 +1,11 @@ flow: - start|REPLY_ROUTE_NAT: - - exit|REPLY_ROUTE_NAT: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT sip_in: - '^SIP/2.0 200 OK' - 'From: ;tag=' diff --git a/scenarios_pbx/invite_shared_line/0033_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0033_test.yml.tt2 index 62c7e4cc..d9352d37 100644 --- a/scenarios_pbx/invite_shared_line/0033_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0033_test.yml.tt2 @@ -1,12 +1,17 @@ flow: - start|DEFAULT_ROUTE: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: - start|ROUTE_NET_INFO: - return|ROUTE_NET_INFO: - start|ROUTE_IMP_REQUEST: - start|ROUTE_IMP_WITHINDLG: - return|ROUTE_IMP_WITHINDLG: - start|ROUTE_AUTH: - - exit|ROUTE_AUTH: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT sip_in: - '^SUBSCRIBE sip:testuser1002@spce.test SIP/2.0' - 'From: ;tag=' diff --git a/scenarios_pbx/invite_shared_line/0034_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0034_test.yml.tt2 index 69053531..121f11c6 100644 --- a/scenarios_pbx/invite_shared_line/0034_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0034_test.yml.tt2 @@ -1,5 +1,7 @@ flow: - start|DEFAULT_ROUTE: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: - start|ROUTE_NET_INFO: - return|ROUTE_NET_INFO: - start|ROUTE_IMP_REQUEST: @@ -12,7 +14,10 @@ flow: - return|ROUTE_ADD_CALLINFO_REPLY: - return|ROUTE_AUTH: - start|ROUTE_IMP_PRESENCE: - - exit|ROUTE_IMP_PRESENCE: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT sip_in: - '^SUBSCRIBE sip:testuser1002@spce.test SIP/2.0' - 'From: ;tag='