From 8dcfa9ed6f45e026483cec497953eec6982415b3 Mon Sep 17 00:00:00 2001
From: Alessio Garzi <agarzi@sipwise.com>
Date: Tue, 16 Jan 2024 11:30:23 +0100
Subject: [PATCH] Revert "MT#58994 Rework replies test without route nat
 countinue for scenarios_pbx"

This reverts commit 94123dd39f48d1afc4267ac14f6f7aa9748b8b05.

Reason for revert: revert in proxy.cfg

Change-Id: Ia58542f7088a5bed5c07b58cce63b3804c1e37ba
---
 .../incoming_shared_line/0030_test.yml.tt2          | 13 ++++++++++++-
 scenarios_pbx/invite/0017_test.yml.tt2              | 13 ++++++++++++-
 scenarios_pbx/invite_alias/0017_test.yml.tt2        | 13 ++++++++++++-
 scenarios_pbx/invite_alias_devid/0021_test.yml.tt2  | 13 ++++++++++++-
 .../invite_alias_devid_fulllookup/0021_test.yml.tt2 | 13 ++++++++++++-
 scenarios_pbx/invite_manager/0041_test.yml.tt2      | 13 ++++++++++++-
 scenarios_pbx/invite_manager_2sec/0053_test.yml.tt2 | 13 ++++++++++++-
 scenarios_pbx/invite_shared_line/0017_test.yml.tt2  | 13 ++++++++++++-
 .../invite_username_devid/0021_test.yml.tt2         | 13 ++++++++++++-
 9 files changed, 108 insertions(+), 9 deletions(-)

diff --git a/scenarios_pbx/incoming_shared_line/0030_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0030_test.yml.tt2
index 4b2b4252..5396788e 100644
--- a/scenarios_pbx/incoming_shared_line/0030_test.yml.tt2
+++ b/scenarios_pbx/incoming_shared_line/0030_test.yml.tt2
@@ -1,6 +1,17 @@
 flow:
   - start|DEFAULT_ONREPLY:
-  - return|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:
 sip_in:
   - 'SIP/2.0 200 OK'
   - 'From: <sip:[% incoming_shared_line_scenarios_pbx_test.testuser1003.pbx_phone_number %]@incoming-shared-line.scenarios-pbx.test>;tag=[\w-]+'
diff --git a/scenarios_pbx/invite/0017_test.yml.tt2 b/scenarios_pbx/invite/0017_test.yml.tt2
index 4667d7d4..41b7a2d5 100644
--- a/scenarios_pbx/invite/0017_test.yml.tt2
+++ b/scenarios_pbx/invite/0017_test.yml.tt2
@@ -1,6 +1,17 @@
 flow:
   - start|DEFAULT_ONREPLY:
-  - return|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:
 sip_in:
   - 'SIP/2.0 200 OK'
   - 'From: <sip:[% invite_scenarios_pbx_test.testuser1002.phone_number %]@invite.scenarios-pbx.test>;tag=[\w-]+'
diff --git a/scenarios_pbx/invite_alias/0017_test.yml.tt2 b/scenarios_pbx/invite_alias/0017_test.yml.tt2
index dfef6cd3..2cebfeef 100644
--- a/scenarios_pbx/invite_alias/0017_test.yml.tt2
+++ b/scenarios_pbx/invite_alias/0017_test.yml.tt2
@@ -1,6 +1,17 @@
 flow:
   - start|DEFAULT_ONREPLY:
-  - return|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:
 sip_in:
   - 'SIP/2.0 200 OK'
   - 'From: <sip:[% invite_alias_scenarios_pbx_test.testuser1002.phone_number %]@invite-alias.scenarios-pbx.test>;tag=[\w-]+'
diff --git a/scenarios_pbx/invite_alias_devid/0021_test.yml.tt2 b/scenarios_pbx/invite_alias_devid/0021_test.yml.tt2
index 7a8f1f3c..15a1fd8e 100644
--- a/scenarios_pbx/invite_alias_devid/0021_test.yml.tt2
+++ b/scenarios_pbx/invite_alias_devid/0021_test.yml.tt2
@@ -1,6 +1,17 @@
 flow:
   - start|DEFAULT_ONREPLY:
-  - return|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:
 sip_in:
   - 'SIP/2.0 200 OK'
   - 'From: <sip:[% invite_alias_devid_scenarios_pbx_test.testuser1002.phone_number %]@invite-alias-devid.scenarios-pbx.test>;tag=[\w-]+'
diff --git a/scenarios_pbx/invite_alias_devid_fulllookup/0021_test.yml.tt2 b/scenarios_pbx/invite_alias_devid_fulllookup/0021_test.yml.tt2
index daf20dbe..a5dce7e7 100644
--- a/scenarios_pbx/invite_alias_devid_fulllookup/0021_test.yml.tt2
+++ b/scenarios_pbx/invite_alias_devid_fulllookup/0021_test.yml.tt2
@@ -1,6 +1,17 @@
 flow:
   - start|DEFAULT_ONREPLY:
-  - return|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:
 sip_in:
   - 'SIP/2.0 200 OK'
   - 'From: <sip:[% invite_alias_devid_fulllookup_scenarios_pbx_test.testuser1002.phone_number %]@invite-alias-devid-fulllookup.scenarios-pbx.test>;tag=[\w-]+'
diff --git a/scenarios_pbx/invite_manager/0041_test.yml.tt2 b/scenarios_pbx/invite_manager/0041_test.yml.tt2
index 8da8869b..a07e4b60 100644
--- a/scenarios_pbx/invite_manager/0041_test.yml.tt2
+++ b/scenarios_pbx/invite_manager/0041_test.yml.tt2
@@ -1,6 +1,17 @@
 flow:
   - start|DEFAULT_ONREPLY:
-  - return|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:
 sip_in:
  - 'SIP/2.0 200 OK'
  - 'From: <sip:[% invite_manager_scenarios_pbx_test.testuser1003.pbx_phone_number %]@invite-manager.scenarios-pbx.test>;tag=[\w-]+'
diff --git a/scenarios_pbx/invite_manager_2sec/0053_test.yml.tt2 b/scenarios_pbx/invite_manager_2sec/0053_test.yml.tt2
index b883618a..e793387b 100644
--- a/scenarios_pbx/invite_manager_2sec/0053_test.yml.tt2
+++ b/scenarios_pbx/invite_manager_2sec/0053_test.yml.tt2
@@ -1,6 +1,17 @@
 flow:
   - start|DEFAULT_ONREPLY:
-  - return|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:
 sip_in:
  - 'SIP/2.0 200 OK'
  - 'From: <sip:[% invite_manager_2sec_scenarios_pbx_test.testuser1003.pbx_phone_number %]@invite-manager-2sec.scenarios-pbx.test>;tag=[\w-]+'
diff --git a/scenarios_pbx/invite_shared_line/0017_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0017_test.yml.tt2
index f7f5a354..1b91fc48 100644
--- a/scenarios_pbx/invite_shared_line/0017_test.yml.tt2
+++ b/scenarios_pbx/invite_shared_line/0017_test.yml.tt2
@@ -1,6 +1,17 @@
 flow:
   - start|DEFAULT_ONREPLY:
-  - return|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:
 sip_in:
   - 'SIP/2.0 200 OK'
   - 'From: <sip:[% invite_shared_line_scenarios_pbx_test.testuser1002.phone_number %]@invite-shared-line.scenarios-pbx.test>;tag=[\w-]+'
diff --git a/scenarios_pbx/invite_username_devid/0021_test.yml.tt2 b/scenarios_pbx/invite_username_devid/0021_test.yml.tt2
index 32d3b0bc..fd4dcbef 100644
--- a/scenarios_pbx/invite_username_devid/0021_test.yml.tt2
+++ b/scenarios_pbx/invite_username_devid/0021_test.yml.tt2
@@ -1,6 +1,17 @@
 flow:
   - start|DEFAULT_ONREPLY:
-  - return|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:
 sip_in:
   - 'SIP/2.0 200 OK'
   - 'From: <sip:[% invite_username_devid_scenarios_pbx_test.testuser1002.phone_number %]@invite-username-devid.scenarios-pbx.test>;tag=[\w-]+'