From 9fc1894884e093271704bb5de72667183cad6aec Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Tue, 7 Mar 2023 16:26:26 +0100 Subject: [PATCH] MT#55258 PBX applications: improve internal flow to not use CF profile Change-Id: I30826dd6d616ebfecc39d105ef3cfdc2f8b15019 --- .../invite_callforward/0009_test.yml.tt2 | 2 ++ .../0010_test.yml.tt2 | 2 ++ .../0014_test.yml.tt2 | 19 ++++++++++++++++++- .../0003_test.yml.tt2 | 2 ++ .../0007_test.yml.tt2 | 19 ++++++++++++++++++- .../invite_callforward_cfna/0005_test.yml.tt2 | 2 ++ .../0003_test.yml.tt2 | 2 ++ scenarios_lnp/incoming_peer/0001_test.yml.tt2 | 2 ++ .../invite_manager/0023_test.yml.tt2 | 2 ++ .../invite_manager_2sec/0025_test.yml.tt2 | 2 ++ 10 files changed, 52 insertions(+), 2 deletions(-) diff --git a/scenarios/invite_callforward/0009_test.yml.tt2 b/scenarios/invite_callforward/0009_test.yml.tt2 index a67531e2..ad9519ec 100644 --- a/scenarios/invite_callforward/0009_test.yml.tt2 +++ b/scenarios/invite_callforward/0009_test.yml.tt2 @@ -110,6 +110,8 @@ flow: - return|ROUTE_LOAD_CF_MAP: - start|ROUTE_CHECK_CF: - return|ROUTE_CHECK_CF: + - start|ROUTE_PLAY_ANNOUNCE_BEFORE_CF: + - return|ROUTE_PLAY_ANNOUNCE_BEFORE_CF: - start|ROUTE_ACC_CF: - start|ROUTE_ACC_CALLER: - start|ROUTE_SET_ACC_CALLER_CALL_COUNTERS: diff --git a/scenarios/invite_callforward_but_callee_locked_cfna/0010_test.yml.tt2 b/scenarios/invite_callforward_but_callee_locked_cfna/0010_test.yml.tt2 index 5c6e96c5..847e9b13 100644 --- a/scenarios/invite_callforward_but_callee_locked_cfna/0010_test.yml.tt2 +++ b/scenarios/invite_callforward_but_callee_locked_cfna/0010_test.yml.tt2 @@ -25,6 +25,8 @@ flow: - return|ROUTE_LOAD_CF_MAP: - start|ROUTE_CHECK_CF: - return|ROUTE_CHECK_CF: + - start|ROUTE_PLAY_ANNOUNCE_BEFORE_CF: + - return|ROUTE_PLAY_ANNOUNCE_BEFORE_CF: - start|ROUTE_EXECUTE_CF_LOOP: - start|ROUTE_ADD_AOC_HEADER: - return|ROUTE_ADD_AOC_HEADER: diff --git a/scenarios/invite_callforward_but_callee_locked_cfna/0014_test.yml.tt2 b/scenarios/invite_callforward_but_callee_locked_cfna/0014_test.yml.tt2 index 57cd4add..205f761d 100644 --- a/scenarios/invite_callforward_but_callee_locked_cfna/0014_test.yml.tt2 +++ b/scenarios/invite_callforward_but_callee_locked_cfna/0014_test.yml.tt2 @@ -16,10 +16,27 @@ flow: - return|ROUTE_STOP_RTPPROXY_BRANCH: - start|ROUTE_INITVARS: - return|ROUTE_INITVARS: - - return|FAILURE_ROUTE_HUNT: + - start|ROUTE_CF_EARLY_REJECT: + - start|ROUTE_CODES_ANNOUNCEMENTS_MAPPING: + - return|ROUTE_CODES_ANNOUNCEMENTS_MAPPING: + - start|ROUTE_EARLY_REJECT: + - start|ROUTE_ADD_CALLINFO_REPLY: + - start|ROUTE_ADD_CALLINFO_CALLER_PRIMARY: + - return|ROUTE_ADD_CALLINFO_CALLER_PRIMARY: + - start|ROUTE_ADD_CALLINFO_CALLEE_PRIMARY: + - return|ROUTE_ADD_CALLINFO_CALLEE_PRIMARY: + - return|ROUTE_ADD_CALLINFO_REPLY: + - start|ROUTE_LOCAL_REPLY: + - start|ROUTE_APPLY_HEADER_RULES: + - return|ROUTE_APPLY_HEADER_RULES: - start|dialog:failed: - return|dialog:failed: - return|dialog:failed: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT: + - exit|ROUTE_EXIT: sip_in: - 'SIP/2.0 403 Caller locked' - 'From: ;tag=[\w-]+' diff --git a/scenarios/invite_callforward_but_callee_locked_cfu/0003_test.yml.tt2 b/scenarios/invite_callforward_but_callee_locked_cfu/0003_test.yml.tt2 index 7d3d4517..b791c4b5 100644 --- a/scenarios/invite_callforward_but_callee_locked_cfu/0003_test.yml.tt2 +++ b/scenarios/invite_callforward_but_callee_locked_cfu/0003_test.yml.tt2 @@ -98,6 +98,8 @@ flow: - return|ROUTE_LOAD_CF_MAP: - start|ROUTE_CHECK_CF: - return|ROUTE_CHECK_CF: + - start|ROUTE_PLAY_ANNOUNCE_BEFORE_CF: + - return|ROUTE_PLAY_ANNOUNCE_BEFORE_CF: - start|ROUTE_ACC_CF: - start|ROUTE_ACC_CALLER: - start|ROUTE_SET_ACC_CALLER_CALL_COUNTERS: diff --git a/scenarios/invite_callforward_but_callee_locked_cfu/0007_test.yml.tt2 b/scenarios/invite_callforward_but_callee_locked_cfu/0007_test.yml.tt2 index ee7e2549..c65463be 100644 --- a/scenarios/invite_callforward_but_callee_locked_cfu/0007_test.yml.tt2 +++ b/scenarios/invite_callforward_but_callee_locked_cfu/0007_test.yml.tt2 @@ -16,10 +16,27 @@ flow: - return|ROUTE_STOP_RTPPROXY_BRANCH: - start|ROUTE_INITVARS: - return|ROUTE_INITVARS: - - return|FAILURE_ROUTE_HUNT: + - start|ROUTE_CF_EARLY_REJECT: + - start|ROUTE_CODES_ANNOUNCEMENTS_MAPPING: + - return|ROUTE_CODES_ANNOUNCEMENTS_MAPPING: + - start|ROUTE_EARLY_REJECT: + - start|ROUTE_ADD_CALLINFO_REPLY: + - start|ROUTE_ADD_CALLINFO_CALLER_PRIMARY: + - return|ROUTE_ADD_CALLINFO_CALLER_PRIMARY: + - start|ROUTE_ADD_CALLINFO_CALLEE_PRIMARY: + - return|ROUTE_ADD_CALLINFO_CALLEE_PRIMARY: + - return|ROUTE_ADD_CALLINFO_REPLY: + - start|ROUTE_LOCAL_REPLY: + - start|ROUTE_APPLY_HEADER_RULES: + - return|ROUTE_APPLY_HEADER_RULES: - start|dialog:failed: - return|dialog:failed: - return|dialog:failed: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT: + - exit|ROUTE_EXIT: sip_in: - 'SIP/2.0 403 Caller locked' - 'From: ;tag=[\w-]+' diff --git a/scenarios/invite_callforward_cfna/0005_test.yml.tt2 b/scenarios/invite_callforward_cfna/0005_test.yml.tt2 index cd710483..6b1e5c0f 100644 --- a/scenarios/invite_callforward_cfna/0005_test.yml.tt2 +++ b/scenarios/invite_callforward_cfna/0005_test.yml.tt2 @@ -117,6 +117,8 @@ flow: - return|ROUTE_LOAD_CF_MAP: - start|ROUTE_CHECK_CF: - return|ROUTE_CHECK_CF: + - start|ROUTE_PLAY_ANNOUNCE_BEFORE_CF: + - return|ROUTE_PLAY_ANNOUNCE_BEFORE_CF: - start|ROUTE_ACC_CF: - start|ROUTE_ACC_CALLER: - start|ROUTE_SET_ACC_CALLER_CALL_COUNTERS: diff --git a/scenarios/invite_conference_update/0003_test.yml.tt2 b/scenarios/invite_conference_update/0003_test.yml.tt2 index 6d9a99f3..e9d14258 100644 --- a/scenarios/invite_conference_update/0003_test.yml.tt2 +++ b/scenarios/invite_conference_update/0003_test.yml.tt2 @@ -111,6 +111,8 @@ flow: - return|ROUTE_LOAD_CF_MAP: - start|ROUTE_CHECK_CF: - return|ROUTE_CHECK_CF: + - start|ROUTE_PLAY_ANNOUNCE_BEFORE_CF: + - return|ROUTE_PLAY_ANNOUNCE_BEFORE_CF: - start|ROUTE_ACC_CF: - start|ROUTE_ACC_CALLER: - start|ROUTE_SET_ACC_CALLER_CALL_COUNTERS: diff --git a/scenarios_lnp/incoming_peer/0001_test.yml.tt2 b/scenarios_lnp/incoming_peer/0001_test.yml.tt2 index 684b7a7e..3c905842 100644 --- a/scenarios_lnp/incoming_peer/0001_test.yml.tt2 +++ b/scenarios_lnp/incoming_peer/0001_test.yml.tt2 @@ -96,6 +96,8 @@ flow: - return|ROUTE_LOAD_CF_MAP: - start|ROUTE_CHECK_CF: - return|ROUTE_CHECK_CF: + - start|ROUTE_PLAY_ANNOUNCE_BEFORE_CF: + - return|ROUTE_PLAY_ANNOUNCE_BEFORE_CF: - start|ROUTE_ACC_CF: - start|ROUTE_ACC_CALLER: - start|ROUTE_SET_ACC_CALLER_CALL_COUNTERS: diff --git a/scenarios_pbx/invite_manager/0023_test.yml.tt2 b/scenarios_pbx/invite_manager/0023_test.yml.tt2 index e1ef4d7e..d7dcc93c 100644 --- a/scenarios_pbx/invite_manager/0023_test.yml.tt2 +++ b/scenarios_pbx/invite_manager/0023_test.yml.tt2 @@ -100,6 +100,8 @@ flow: - return|ROUTE_LOAD_CF_MAP: - start|ROUTE_CHECK_CF: - return|ROUTE_CHECK_CF: + - start|ROUTE_PLAY_ANNOUNCE_BEFORE_CF: + - return|ROUTE_PLAY_ANNOUNCE_BEFORE_CF: - start|ROUTE_ACC_CF: - start|ROUTE_ACC_CALLER: - start|ROUTE_SET_ACC_CALLER_CALL_COUNTERS: diff --git a/scenarios_pbx/invite_manager_2sec/0025_test.yml.tt2 b/scenarios_pbx/invite_manager_2sec/0025_test.yml.tt2 index 1a6e25d7..3bd12911 100644 --- a/scenarios_pbx/invite_manager_2sec/0025_test.yml.tt2 +++ b/scenarios_pbx/invite_manager_2sec/0025_test.yml.tt2 @@ -100,6 +100,8 @@ flow: - return|ROUTE_LOAD_CF_MAP: - start|ROUTE_CHECK_CF: - return|ROUTE_CHECK_CF: + - start|ROUTE_PLAY_ANNOUNCE_BEFORE_CF: + - return|ROUTE_PLAY_ANNOUNCE_BEFORE_CF: - start|ROUTE_ACC_CF: - start|ROUTE_ACC_CALLER: - start|ROUTE_SET_ACC_CALLER_CALL_COUNTERS: