Revert "MT#58994 Rework replies test without route nat countinue"

This reverts commit 2e02361fd9.

Reason for revert: revert on proxy.cfg

Change-Id: I451d3a3177d2bd52386a89b3d64a27c133a7a3d0

scenarios/incoming_foreign_dom/0015_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:external@incoming-foreign-dom.external.test>;tag=[\w-]+'

scenarios/invite_callee_bye/0018_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:testuser1003@invite-callee-bye.scenarios.test>;tag=[\w-]+'
@@ -14,4 +25,5 @@ sip_out:
       'To: <sip:[% invite_callee_bye_scenarios_test.testuser1002.alias_numbers.0.phone_number %]@invite-callee-bye.scenarios.test>;tag=[\w-]+',
       'CSeq: \d+ BYE',
       'Content-Length: 0',
+      'P-Out-Socket: udp:[% server_ip %]:5060',
     ]

scenarios/invite_callforward_cfna/0023_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_callforward_cfna_scenarios_test.testuser1001.phone_number %]@'

scenarios/invite_callforward_cfr/0031_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_callforward_cfr_scenarios_test.testuser1001.phone_number %]@invite-callforward-cfr.scenarios.test>;tag=[\w-]+'

scenarios/invite_emergency/0015_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_emergency_scenarios_test.testuser1002.phone_number %]@invite-emergency.scenarios.test>;tag=[\w-]+'

scenarios/invite_emergency_cirpack/0015_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_emergency_cirpack_scenarios_test.testuser1002.phone_number %]@invite-emergency-cirpack.scenarios.test>;tag=[\w-]+'

scenarios/invite_emergency_pidflo/0015_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_emergency_pidflo_scenarios_test.testuser1002.phone_number %]@invite-emergency-pidflo.scenarios.test>;tag=[\w-]+'

scenarios/invite_locmap_add/0028_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_locmap_add_scenarios_test.testuser1000.phone_number %]@invite-locmap-add.scenarios.test>;tag=[\w-]+'

scenarios/invite_prack/0011_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_prack_scenarios_test.testuser1012.phone_number %]@invite-prack.scenarios.test>;tag=[\w-]+'

scenarios/invite_redirect/0031_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_redirect_scenarios_test.testuser1002.phone_number %]@'

scenarios/invite_redirect_tel_uri/0031_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_redirect_tel_uri_scenarios_test.testuser1000.phone_number %]@invite-redirect-tel-uri.scenarios.test>;tag=[\w-]+'

scenarios/invite_reinvite_caller_transcoding/0023_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_reinvite_caller_transcoding_scenarios_test.testuser1002.phone_number %]@invite-reinvite-caller-transcoding.scenarios.test>;tag=[\w-]+'

scenarios/invite_reinvite_transcoding/0014_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 100 Trying'
   - 'From: <sip:[% scenarios.0.responders.0.username %]@invite-reinvite-transcoding.scenarios.test>;tag=[\w-]+'

scenarios/invite_reinvite_transcoding/0018_test.yml.tt2

@@ -1,6 +1,19 @@
 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_RTPENGINE:
+  - return|REPLY_ROUTE_RTPENGINE:
+  - 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:[% scenarios.0.responders.0.username %]@invite-reinvite-transcoding.scenarios.test>;tag=[\w-]+'
@@ -21,6 +34,7 @@ sip_out:
       'Contact: <sip:127.0.0.1:508[08];transport=udp>',
       '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',

scenarios/invite_reinvite_transcoding/0023_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:[% scenarios.0.username %]@invite-reinvite-transcoding.scenarios.test>;tag=[\w-]+'

scenarios/timer_session_supported/0023_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:[% scenarios.0.username %]@timer-session-supported.scenarios.test>;tag=[\w-]+'