From 44bf39e5edfa7db0d9f8ad481e8202b0d1baa593 Mon Sep 17 00:00:00 2001
From: Donat Zenichev <dzenichev@sipwise.com>
Date: Thu, 20 Jan 2022 10:12:14 +0100
Subject: [PATCH] TT#159350 Fix flows for 'invite_callforward' /
 'invite_callforward_but_callee_locked_cfna'

Fix flows of two scenarios:
- 'invite_callforward'
- 'invite_callforward_but_callee_locked_cfna'

Change-Id: I133edeff98812a2eaf292e29080595abf35a5fde
---
 scenarios/invite_callforward/0053_test.yml.tt2                 | 3 ---
 scenarios/invite_callforward/sipp_scenario01_test.yml.tt2      | 2 +-
 .../{0015_test.yml.tt2 => 0014_test.yml.tt2}                   | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)
 rename scenarios/invite_callforward_but_callee_locked_cfna/{0015_test.yml.tt2 => 0014_test.yml.tt2} (96%)

diff --git a/scenarios/invite_callforward/0053_test.yml.tt2 b/scenarios/invite_callforward/0053_test.yml.tt2
index 72848183..e3d8a6d6 100644
--- a/scenarios/invite_callforward/0053_test.yml.tt2
+++ b/scenarios/invite_callforward/0053_test.yml.tt2
@@ -13,8 +13,6 @@ flow:
   - return|dialog:end:
   - return|dialog:end:
   - start|ROUTE_STOP_RTPPROXY:
-  - start|ROUTE_RESTORE_CLUSTERSET:
-  - return|ROUTE_RESTORE_CLUSTERSET:
   - return|ROUTE_STOP_RTPPROXY:
   - start|ROUTE_PREPARE_UA:
   - return|ROUTE_PREPARE_UA:
@@ -34,7 +32,6 @@ sip_in:
   - 'Content-Length: 0'
   - 'From: <sip:testuser1002@'
   - 'To: <sip:testuser1004@'
-
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
diff --git a/scenarios/invite_callforward/sipp_scenario01_test.yml.tt2 b/scenarios/invite_callforward/sipp_scenario01_test.yml.tt2
index 5149bfa3..9fb49ba2 100644
--- a/scenarios/invite_callforward/sipp_scenario01_test.yml.tt2
+++ b/scenarios/invite_callforward/sipp_scenario01_test.yml.tt2
@@ -48,7 +48,7 @@ messages:
   - 'a=rtcp:\d+'
   - 'a=ptime:50'
 - - 'SIP/2.0 200 OK'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;rtpprx=yes>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;nat=yes;socket=udp:[% server_ip %]:5060>'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;nat=yes;socket=udp:[% server_ip %]:5060>'
   - 'From: <sip:[% scenarios.0.username %]@invite-callforward.scenarios.test>;tag=[\w-]+'
diff --git a/scenarios/invite_callforward_but_callee_locked_cfna/0015_test.yml.tt2 b/scenarios/invite_callforward_but_callee_locked_cfna/0014_test.yml.tt2
similarity index 96%
rename from scenarios/invite_callforward_but_callee_locked_cfna/0015_test.yml.tt2
rename to scenarios/invite_callforward_but_callee_locked_cfna/0014_test.yml.tt2
index c3289c3a..57cd4add 100644
--- a/scenarios/invite_callforward_but_callee_locked_cfna/0015_test.yml.tt2
+++ b/scenarios/invite_callforward_but_callee_locked_cfna/0014_test.yml.tt2
@@ -13,8 +13,6 @@ flow:
   - exit|ROUTE_EXIT:
   - start|FAILURE_ROUTE_HUNT:
   - start|ROUTE_STOP_RTPPROXY_BRANCH:
-  - start|ROUTE_RESTORE_CLUSTERSET:
-  - return|ROUTE_RESTORE_CLUSTERSET:
   - return|ROUTE_STOP_RTPPROXY_BRANCH:
   - start|ROUTE_INITVARS:
   - return|ROUTE_INITVARS: