From 61f2e3d87b406fc4e31fa16e8132ab3a5fa7cde6 Mon Sep 17 00:00:00 2001
From: Andreas Granig <agranig@sipwise.com>
Date: Fri, 29 Sep 2017 10:35:21 +0200
Subject: [PATCH] TT#22659 Fix lnp regarding runtime profiling

All tests successful.
Files=64, Tests=3023,  0 wallclock secs ( 0.22 usr +  0.01 sys =  0.23 CPU)
Result: PASS

Change-Id: I7b018b6e756b515e4e40db1dafb1311efeb3df4c
---
 scenarios_lnp/incoming_peer/0001_test.yml.tt2              | 7 ++++++-
 scenarios_lnp/incoming_peer/0003_test.yml.tt2              | 7 ++++++-
 scenarios_lnp/incoming_peer/0005_test.yml.tt2              | 7 ++++++-
 scenarios_lnp/incoming_peer/0007_test.yml.tt2              | 2 ++
 scenarios_lnp/incoming_peer/0008_test.yml.tt2              | 3 ---
 scenarios_lnp/incoming_peer/0010_test.yml.tt2              | 2 ++
 scenarios_lnp/incoming_peer/0011_test.yml.tt2              | 7 ++++++-
 scenarios_lnp/incoming_peer/0013_test.yml.tt2              | 7 ++++++-
 scenarios_lnp/incoming_peer/0014_test.yml.tt2              | 7 ++++++-
 .../0001_test.yml.tt2                                      | 7 ++++++-
 .../0002_test.yml.tt2                                      | 2 ++
 scenarios_lnp/invite/0001_test.yml.tt2                     | 7 ++++++-
 scenarios_lnp/invite/0003_test.yml.tt2                     | 7 ++++++-
 scenarios_lnp/invite/0005_test.yml.tt2                     | 7 ++++++-
 scenarios_lnp/invite/0006_test.yml.tt2                     | 2 ++
 scenarios_lnp/invite/0007_test.yml.tt2                     | 2 ++
 scenarios_lnp/invite/0008_test.yml.tt2                     | 7 ++++++-
 scenarios_lnp/invite/0009_test.yml.tt2                     | 7 ++++++-
 scenarios_lnp/invite_ncos_black/0001_test.yml.tt2          | 7 ++++++-
 scenarios_lnp/invite_ncos_black/0003_test.yml.tt2          | 7 ++++++-
 scenarios_lnp/invite_ncos_black/0004_test.yml.tt2          | 2 ++
 scenarios_lnp/invite_ncos_black/0005_test.yml.tt2          | 7 ++++++-
 scenarios_lnp/invite_ncos_black/0007_test.yml.tt2          | 7 ++++++-
 scenarios_lnp/invite_ncos_black/0008_test.yml.tt2          | 2 ++
 scenarios_lnp/invite_ncos_black/0009_test.yml.tt2          | 7 ++++++-
 scenarios_lnp/invite_ncos_black/0011_test.yml.tt2          | 7 ++++++-
 scenarios_lnp/invite_ncos_black/0013_test.yml.tt2          | 7 ++++++-
 scenarios_lnp/invite_ncos_black/0014_test.yml.tt2          | 2 ++
 scenarios_lnp/invite_ncos_black/0015_test.yml.tt2          | 2 ++
 scenarios_lnp/invite_ncos_black/0016_test.yml.tt2          | 7 ++++++-
 scenarios_lnp/invite_ncos_black/0017_test.yml.tt2          | 7 ++++++-
 scenarios_lnp/invite_ncos_white/0001_test.yml.tt2          | 7 ++++++-
 scenarios_lnp/invite_ncos_white/0003_test.yml.tt2          | 7 ++++++-
 scenarios_lnp/invite_ncos_white/0005_test.yml.tt2          | 7 ++++++-
 scenarios_lnp/invite_ncos_white/0006_test.yml.tt2          | 2 ++
 scenarios_lnp/invite_ncos_white/0007_test.yml.tt2          | 2 ++
 scenarios_lnp/invite_ncos_white/0008_test.yml.tt2          | 7 ++++++-
 scenarios_lnp/invite_ncos_white/0009_test.yml.tt2          | 7 ++++++-
 scenarios_lnp/invite_ncos_white/0010_test.yml.tt2          | 7 ++++++-
 scenarios_lnp/invite_ncos_white/0012_test.yml.tt2          | 7 ++++++-
 scenarios_lnp/invite_ncos_white/0014_test.yml.tt2          | 7 ++++++-
 scenarios_lnp/invite_ncos_white/0015_test.yml.tt2          | 2 ++
 scenarios_lnp/invite_ncos_white/0016_test.yml.tt2          | 2 ++
 scenarios_lnp/invite_ncos_white/0017_test.yml.tt2          | 7 ++++++-
 scenarios_lnp/invite_ncos_white/0018_test.yml.tt2          | 7 ++++++-
 scenarios_lnp/invite_ncos_white/0019_test.yml.tt2          | 7 ++++++-
 scenarios_lnp/invite_ncos_white/0021_test.yml.tt2          | 7 ++++++-
 scenarios_lnp/invite_ncos_white/0022_test.yml.tt2          | 2 ++
 scenarios_lnp/invite_peerout/0001_test.yml.tt2             | 7 ++++++-
 scenarios_lnp/invite_peerout/0003_test.yml.tt2             | 7 ++++++-
 scenarios_lnp/invite_peerout/0005_test.yml.tt2             | 7 ++++++-
 scenarios_lnp/invite_peerout/0006_test.yml.tt2             | 2 ++
 scenarios_lnp/invite_peerout/0007_test.yml.tt2             | 2 ++
 scenarios_lnp/invite_peerout/0008_test.yml.tt2             | 7 ++++++-
 scenarios_lnp/invite_peerout/0009_test.yml.tt2             | 7 ++++++-
 scenarios_lnp/invite_peerout_rn/0001_test.yml.tt2          | 7 ++++++-
 scenarios_lnp/invite_peerout_rn/0003_test.yml.tt2          | 7 ++++++-
 scenarios_lnp/invite_peerout_rn/0005_test.yml.tt2          | 7 ++++++-
 scenarios_lnp/invite_peerout_rn/0006_test.yml.tt2          | 2 ++
 scenarios_lnp/invite_peerout_rn/0007_test.yml.tt2          | 2 ++
 scenarios_lnp/invite_peerout_rn/0008_test.yml.tt2          | 7 ++++++-
 scenarios_lnp/invite_peerout_rn/0009_test.yml.tt2          | 7 ++++++-
 scenarios_lnp/register_lock_ported/0001_test.yml.tt2       | 7 ++++++-
 scenarios_lnp/register_lock_ported/0002_test.yml.tt2       | 7 ++++++-
 64 files changed, 306 insertions(+), 48 deletions(-)

diff --git a/scenarios_lnp/incoming_peer/0001_test.yml.tt2 b/scenarios_lnp/incoming_peer/0001_test.yml.tt2
index e86b1222..f0922ce6 100644
--- a/scenarios_lnp/incoming_peer/0001_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0001_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:
@@ -100,7 +102,10 @@ flow:
   - return|ROUTE_ADD_CALLINFO:
   - return|BRANCH_ROUTE_FWD_LOOP:
   - return|BRANCH_ROUTE_FWD_LOOP:
-  - exit|ROUTE_EXECUTE_CF_LOOP:
+  - start|ROUTE_EXIT:
+  - start|ROUTE_RUNTIME:
+  - return|ROUTE_RUNTIME:
+  - exit|ROUTE_EXIT:
       $avp(lua_dlg_profile): [
         "totalaccount:[% customer_test.id %]",
         "totaluser:[% spce_test.testuser1003.uuid %]",
diff --git a/scenarios_lnp/incoming_peer/0003_test.yml.tt2 b/scenarios_lnp/incoming_peer/0003_test.yml.tt2
index f9109091..3aa5fba3 100644
--- a/scenarios_lnp/incoming_peer/0003_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/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:
@@ -146,7 +148,10 @@ flow:
   - return|BRANCH_ROUTE_SBC:
   # branch ?
   - return|BRANCH_ROUTE_SBC:
-  - exit|ROUTE_OUTBOUND:
+  - start|ROUTE_EXIT:
+  - start|ROUTE_RUNTIME:
+  - return|ROUTE_RUNTIME:
+  - exit|ROUTE_EXIT:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
         "userout:[% spce_test.testuser1003.uuid %]",
diff --git a/scenarios_lnp/incoming_peer/0005_test.yml.tt2 b/scenarios_lnp/incoming_peer/0005_test.yml.tt2
index 8e44678f..d34b82b8 100644
--- a/scenarios_lnp/incoming_peer/0005_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0005_test.yml.tt2
@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|ROUTE_ENTRY:
+  - return|ROUTE_ENTRY:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
         "userout:[% spce_test.testuser1003.uuid %]",
@@ -14,7 +16,10 @@ flow:
         "peer:[% peer_01_host1.id %]",
         "outgoing"
       ]
-  - exit|REPLY_ROUTE_NAT:
+  - start|ROUTE_EXIT:
+  - start|ROUTE_RUNTIME:
+  - return|ROUTE_RUNTIME:
+  - exit|ROUTE_EXIT:
 sip_in:
   - '^SIP/2.0 180 Ringing'
   - 'CSeq: \d+ INVITE'
diff --git a/scenarios_lnp/incoming_peer/0007_test.yml.tt2 b/scenarios_lnp/incoming_peer/0007_test.yml.tt2
index e39dba15..0501e995 100644
--- a/scenarios_lnp/incoming_peer/0007_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0007_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_lnp/incoming_peer/0008_test.yml.tt2 b/scenarios_lnp/incoming_peer/0008_test.yml.tt2
index a67639d8..d7b80ca2 100644
--- a/scenarios_lnp/incoming_peer/0008_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0008_test.yml.tt2
@@ -1,7 +1,4 @@
 flow:
-  - start|ROUTE_EXIT:
-  - start|ROUTE_RUNTIME:
-  - return|ROUTE_RUNTIME:
   - start|dialog:start:
   - return|dialog:start:
       $avp(lua_dlg_profile): [
diff --git a/scenarios_lnp/incoming_peer/0010_test.yml.tt2 b/scenarios_lnp/incoming_peer/0010_test.yml.tt2
index 9ea41824..0768247b 100644
--- a/scenarios_lnp/incoming_peer/0010_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/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_PRX_REQUEST:
diff --git a/scenarios_lnp/incoming_peer/0011_test.yml.tt2 b/scenarios_lnp/incoming_peer/0011_test.yml.tt2
index 414046f4..09a8203f 100644
--- a/scenarios_lnp/incoming_peer/0011_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0011_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:
   - start|ROUTE_STOP_RTPPROXY:
   - 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:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
   - 'Contact: sip:004321001@'
diff --git a/scenarios_lnp/incoming_peer/0013_test.yml.tt2 b/scenarios_lnp/incoming_peer/0013_test.yml.tt2
index 3bcd09b4..6f2fcd8b 100644
--- a/scenarios_lnp/incoming_peer/0013_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0013_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'
   - 'CSeq: \d+ BYE'
diff --git a/scenarios_lnp/incoming_peer/0014_test.yml.tt2 b/scenarios_lnp/incoming_peer/0014_test.yml.tt2
index 9709e5c4..4c034ff1 100644
--- a/scenarios_lnp/incoming_peer/0014_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0014_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'
   - 'CSeq: 2 BYE'
diff --git a/scenarios_lnp/incoming_peer_unallocated_authoritative/0001_test.yml.tt2 b/scenarios_lnp/incoming_peer_unallocated_authoritative/0001_test.yml.tt2
index 65b20d83..1049e9d4 100644
--- a/scenarios_lnp/incoming_peer_unallocated_authoritative/0001_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer_unallocated_authoritative/0001_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:
@@ -53,7 +55,10 @@ flow:
   - return|dialog:failed:
       $avp(lua_dlg_profile): None
   - return|dialog:failed:
-  - exit|ROUTE_EARLY_REJECT:
+  - start|ROUTE_EXIT:
+  - start|ROUTE_RUNTIME:
+  - return|ROUTE_RUNTIME:
+  - exit|ROUTE_EXIT:
 sip_in:
   - '^INVITE sip:4321001@'
   - 'From: <sip:004411001@127.0.2.1>'
diff --git a/scenarios_lnp/incoming_peer_unallocated_authoritative/0002_test.yml.tt2 b/scenarios_lnp/incoming_peer_unallocated_authoritative/0002_test.yml.tt2
index 91087c59..6ea8dfa1 100644
--- a/scenarios_lnp/incoming_peer_unallocated_authoritative/0002_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer_unallocated_authoritative/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_PRX_REQUEST:
diff --git a/scenarios_lnp/invite/0001_test.yml.tt2 b/scenarios_lnp/invite/0001_test.yml.tt2
index b305764d..3a235ecb 100644
--- a/scenarios_lnp/invite/0001_test.yml.tt2
+++ b/scenarios_lnp/invite/0001_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:4311001@'
   - 'Contact: sip:testuser1002@'
diff --git a/scenarios_lnp/invite/0003_test.yml.tt2 b/scenarios_lnp/invite/0003_test.yml.tt2
index 4df012fd..f56e3a1a 100644
--- a/scenarios_lnp/invite/0003_test.yml.tt2
+++ b/scenarios_lnp/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:
@@ -186,7 +188,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:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
         "userout:[% spce_test.testuser1002.uuid %]",
diff --git a/scenarios_lnp/invite/0005_test.yml.tt2 b/scenarios_lnp/invite/0005_test.yml.tt2
index ad548bd7..fa7dd025 100644
--- a/scenarios_lnp/invite/0005_test.yml.tt2
+++ b/scenarios_lnp/invite/0005_test.yml.tt2
@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|ROUTE_ENTRY:
+  - return|ROUTE_ENTRY:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
         "userout:[% spce_test.testuser1002.uuid %]",
@@ -19,7 +21,10 @@ flow:
         "account:[% customer_test.id %]",
         "user:[% spce_test.testuser1001.uuid %]"
       ]
-  - exit|REPLY_ROUTE_NAT:
+  - start|ROUTE_EXIT:
+  - start|ROUTE_RUNTIME:
+  - return|ROUTE_RUNTIME:
+  - exit|ROUTE_EXIT:
 sip_in:
   - '^SIP/2.0 180 Ringing'
   - 'CSeq: 2 INVITE'
diff --git a/scenarios_lnp/invite/0006_test.yml.tt2 b/scenarios_lnp/invite/0006_test.yml.tt2
index 8df81a29..07834884 100644
--- a/scenarios_lnp/invite/0006_test.yml.tt2
+++ b/scenarios_lnp/invite/0006_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_lnp/invite/0007_test.yml.tt2 b/scenarios_lnp/invite/0007_test.yml.tt2
index aebca0e4..0f4927f3 100644
--- a/scenarios_lnp/invite/0007_test.yml.tt2
+++ b/scenarios_lnp/invite/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_PRX_REQUEST:
diff --git a/scenarios_lnp/invite/0008_test.yml.tt2 b/scenarios_lnp/invite/0008_test.yml.tt2
index 16b6dc2e..0e62c48f 100644
--- a/scenarios_lnp/invite/0008_test.yml.tt2
+++ b/scenarios_lnp/invite/0008_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:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
diff --git a/scenarios_lnp/invite/0009_test.yml.tt2 b/scenarios_lnp/invite/0009_test.yml.tt2
index 2cc1826b..1d0f6712 100644
--- a/scenarios_lnp/invite/0009_test.yml.tt2
+++ b/scenarios_lnp/invite/0009_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'
   - 'CSeq: 3 BYE'
diff --git a/scenarios_lnp/invite_ncos_black/0001_test.yml.tt2 b/scenarios_lnp/invite_ncos_black/0001_test.yml.tt2
index bc4420e6..c81705ed 100644
--- a/scenarios_lnp/invite_ncos_black/0001_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_black/0001_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_lnp/invite_ncos_black/0003_test.yml.tt2 b/scenarios_lnp/invite_ncos_black/0003_test.yml.tt2
index 77013f4e..ab142b35 100644
--- a/scenarios_lnp/invite_ncos_black/0003_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_black/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:
@@ -78,7 +80,10 @@ flow:
   - return|dialog:failed:
       $avp(lua_dlg_profile): None
   - return|dialog:failed:
-  - exit|ROUTE_EARLY_REJECT:
+  - start|ROUTE_EXIT:
+  - start|ROUTE_RUNTIME:
+  - return|ROUTE_RUNTIME:
+  - exit|ROUTE_EXIT:
 sip_in:
   - '^INVITE sip:43999100@'
   - 'Contact: sip:testuser1002@'
diff --git a/scenarios_lnp/invite_ncos_black/0004_test.yml.tt2 b/scenarios_lnp/invite_ncos_black/0004_test.yml.tt2
index bee45d89..1c76a2e5 100644
--- a/scenarios_lnp/invite_ncos_black/0004_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_black/0004_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:
diff --git a/scenarios_lnp/invite_ncos_black/0005_test.yml.tt2 b/scenarios_lnp/invite_ncos_black/0005_test.yml.tt2
index f4e78480..48c5a224 100644
--- a/scenarios_lnp/invite_ncos_black/0005_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_black/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:
@@ -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:43999200@'
   - 'From: <sip:testuser1002'
diff --git a/scenarios_lnp/invite_ncos_black/0007_test.yml.tt2 b/scenarios_lnp/invite_ncos_black/0007_test.yml.tt2
index 71fbbee9..4b6689b4 100644
--- a/scenarios_lnp/invite_ncos_black/0007_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_black/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_PRX_REQUEST:
@@ -77,7 +79,10 @@ flow:
   - return|dialog:failed:
       $avp(dlg_lua_profile): None
   - return|dialog:failed:
-  - exit|ROUTE_EARLY_REJECT:
+  - start|ROUTE_EXIT:
+  - start|ROUTE_RUNTIME:
+  - return|ROUTE_RUNTIME:
+  - exit|ROUTE_EXIT:
 sip_in:
   - '^INVITE sip:43999200@'
   - 'From: <sip:testuser1002@'
diff --git a/scenarios_lnp/invite_ncos_black/0008_test.yml.tt2 b/scenarios_lnp/invite_ncos_black/0008_test.yml.tt2
index 07ea8ba5..42d2308c 100644
--- a/scenarios_lnp/invite_ncos_black/0008_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_black/0008_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:
diff --git a/scenarios_lnp/invite_ncos_black/0009_test.yml.tt2 b/scenarios_lnp/invite_ncos_black/0009_test.yml.tt2
index 50441277..5d482092 100644
--- a/scenarios_lnp/invite_ncos_black/0009_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_black/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_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:43999300@'
   - 'From: <sip:testuser1002'
diff --git a/scenarios_lnp/invite_ncos_black/0011_test.yml.tt2 b/scenarios_lnp/invite_ncos_black/0011_test.yml.tt2
index 49f08777..2da98f14 100644
--- a/scenarios_lnp/invite_ncos_black/0011_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_black/0011_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:
@@ -150,7 +152,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:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
         "userout:[% spce_test.testuser1002.uuid %]",
diff --git a/scenarios_lnp/invite_ncos_black/0013_test.yml.tt2 b/scenarios_lnp/invite_ncos_black/0013_test.yml.tt2
index ff058b32..25dd4796 100644
--- a/scenarios_lnp/invite_ncos_black/0013_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_black/0013_test.yml.tt2
@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|ROUTE_ENTRY:
+  - return|ROUTE_ENTRY:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
         "userout:[% spce_test.testuser1002.uuid %]",
@@ -15,7 +17,10 @@ flow:
         "peer:[% peer_00_host0.id %]",
         "outgoing"
       ]
-  - exit|REPLY_ROUTE_NAT:
+  - start|ROUTE_EXIT:
+  - start|ROUTE_RUNTIME:
+  - return|ROUTE_RUNTIME:
+  - exit|ROUTE_EXIT:
 sip_in:
   - '^SIP/2.0 180 Ringing'
   - 'CSeq: 2 INVITE'
diff --git a/scenarios_lnp/invite_ncos_black/0014_test.yml.tt2 b/scenarios_lnp/invite_ncos_black/0014_test.yml.tt2
index 243599d0..f751fc5c 100644
--- a/scenarios_lnp/invite_ncos_black/0014_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_black/0014_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_lnp/invite_ncos_black/0015_test.yml.tt2 b/scenarios_lnp/invite_ncos_black/0015_test.yml.tt2
index 6a582b6e..aef00781 100644
--- a/scenarios_lnp/invite_ncos_black/0015_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_black/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:
diff --git a/scenarios_lnp/invite_ncos_black/0016_test.yml.tt2 b/scenarios_lnp/invite_ncos_black/0016_test.yml.tt2
index 80c15d6a..7110b487 100644
--- a/scenarios_lnp/invite_ncos_black/0016_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_black/0016_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:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
diff --git a/scenarios_lnp/invite_ncos_black/0017_test.yml.tt2 b/scenarios_lnp/invite_ncos_black/0017_test.yml.tt2
index 5d9ff027..6ba2067f 100644
--- a/scenarios_lnp/invite_ncos_black/0017_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_black/0017_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'
   - 'CSeq: 3 BYE'
diff --git a/scenarios_lnp/invite_ncos_white/0001_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0001_test.yml.tt2
index c2bc706f..23d6c123 100644
--- a/scenarios_lnp/invite_ncos_white/0001_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/0001_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:43999100@'
   - 'From: <sip:testuser1002'
diff --git a/scenarios_lnp/invite_ncos_white/0003_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0003_test.yml.tt2
index 16c67909..e75ce141 100644
--- a/scenarios_lnp/invite_ncos_white/0003_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/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:
@@ -140,7 +142,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:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
         "userout:[% spce_test.testuser1002.uuid %]",
diff --git a/scenarios_lnp/invite_ncos_white/0005_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0005_test.yml.tt2
index 0f50eb3b..c17521b7 100644
--- a/scenarios_lnp/invite_ncos_white/0005_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/0005_test.yml.tt2
@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|ROUTE_ENTRY:
+  - return|ROUTE_ENTRY:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
         "userout:[% spce_test.testuser1002.uuid %]",
@@ -15,7 +17,10 @@ flow:
         "peer:[% peer_00_host0.id %]",
         "outgoing"
       ]
-  - exit|REPLY_ROUTE_NAT:
+  - start|ROUTE_EXIT:
+  - start|ROUTE_RUNTIME:
+  - return|ROUTE_RUNTIME:
+  - exit|ROUTE_EXIT:
 sip_in:
   - '^SIP/2.0 180 Ringing'
   - 'CSeq: 2 INVITE'
diff --git a/scenarios_lnp/invite_ncos_white/0006_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0006_test.yml.tt2
index f1668aec..47c18978 100644
--- a/scenarios_lnp/invite_ncos_white/0006_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/0006_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_lnp/invite_ncos_white/0007_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0007_test.yml.tt2
index b5b1fbda..5f25aeb6 100644
--- a/scenarios_lnp/invite_ncos_white/0007_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/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_PRX_REQUEST:
diff --git a/scenarios_lnp/invite_ncos_white/0008_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0008_test.yml.tt2
index a8bf0bbe..ee11dcf0 100644
--- a/scenarios_lnp/invite_ncos_white/0008_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/0008_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:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
diff --git a/scenarios_lnp/invite_ncos_white/0009_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0009_test.yml.tt2
index a46f6b3d..c5ada394 100644
--- a/scenarios_lnp/invite_ncos_white/0009_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/0009_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'
   - 'CSeq: 3 BYE'
diff --git a/scenarios_lnp/invite_ncos_white/0010_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0010_test.yml.tt2
index f4e78480..48c5a224 100644
--- a/scenarios_lnp/invite_ncos_white/0010_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/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_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:43999200@'
   - 'From: <sip:testuser1002'
diff --git a/scenarios_lnp/invite_ncos_white/0012_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0012_test.yml.tt2
index 8513a3f6..ea33546d 100644
--- a/scenarios_lnp/invite_ncos_white/0012_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/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:
@@ -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:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
         "userout:[% spce_test.testuser1002.uuid %]",
diff --git a/scenarios_lnp/invite_ncos_white/0014_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0014_test.yml.tt2
index 9b760c0f..0d1c269d 100644
--- a/scenarios_lnp/invite_ncos_white/0014_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/0014_test.yml.tt2
@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|ROUTE_ENTRY:
+  - return|ROUTE_ENTRY:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
         "userout:[% spce_test.testuser1002.uuid %]",
@@ -15,7 +17,10 @@ flow:
         "peer:[% peer_00_host1.id %]",
         "outgoing"
       ]
-  - exit|REPLY_ROUTE_NAT:
+  - start|ROUTE_EXIT:
+  - start|ROUTE_RUNTIME:
+  - return|ROUTE_RUNTIME:
+  - exit|ROUTE_EXIT:
 sip_in:
   - '^SIP/2.0 180 Ringing'
   - 'CSeq: 2 INVITE'
diff --git a/scenarios_lnp/invite_ncos_white/0015_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0015_test.yml.tt2
index 6350b9c9..4ac77015 100644
--- a/scenarios_lnp/invite_ncos_white/0015_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/0015_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_lnp/invite_ncos_white/0016_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0016_test.yml.tt2
index 9a9ac795..16be8eff 100644
--- a/scenarios_lnp/invite_ncos_white/0016_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/0016_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:
diff --git a/scenarios_lnp/invite_ncos_white/0017_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0017_test.yml.tt2
index be1cacb6..2d99a00e 100644
--- a/scenarios_lnp/invite_ncos_white/0017_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/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:
@@ -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:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
diff --git a/scenarios_lnp/invite_ncos_white/0018_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0018_test.yml.tt2
index 6f2e2760..cd9b1907 100644
--- a/scenarios_lnp/invite_ncos_white/0018_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/0018_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'
   - 'CSeq: 3 BYE'
diff --git a/scenarios_lnp/invite_ncos_white/0019_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0019_test.yml.tt2
index bc4420e6..c81705ed 100644
--- a/scenarios_lnp/invite_ncos_white/0019_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/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:
@@ -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_lnp/invite_ncos_white/0021_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0021_test.yml.tt2
index e46e1308..8aea89d5 100644
--- a/scenarios_lnp/invite_ncos_white/0021_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/0021_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:
@@ -77,7 +79,10 @@ flow:
   - start|dialog:failed:
   - return|dialog:failed:
   - return|dialog:failed:
-  - exit|ROUTE_EARLY_REJECT:
+  - start|ROUTE_EXIT:
+  - start|ROUTE_RUNTIME:
+  - return|ROUTE_RUNTIME:
+  - exit|ROUTE_EXIT:
 sip_in:
   - '^INVITE sip:43999300@'
   - 'Contact: sip:testuser1002@'
diff --git a/scenarios_lnp/invite_ncos_white/0022_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0022_test.yml.tt2
index 7d9a6429..96a04bfb 100644
--- a/scenarios_lnp/invite_ncos_white/0022_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/0022_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:
diff --git a/scenarios_lnp/invite_peerout/0001_test.yml.tt2 b/scenarios_lnp/invite_peerout/0001_test.yml.tt2
index cf91b29e..15ffc9d7 100644
--- a/scenarios_lnp/invite_peerout/0001_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout/0001_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:004321001@'
   - 'Contact: sip:testuser1002@'
diff --git a/scenarios_lnp/invite_peerout/0003_test.yml.tt2 b/scenarios_lnp/invite_peerout/0003_test.yml.tt2
index 3cace770..4f4513eb 100644
--- a/scenarios_lnp/invite_peerout/0003_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout/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:
@@ -170,7 +172,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:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
         "userout:[% spce_test.testuser1002.uuid %]",
diff --git a/scenarios_lnp/invite_peerout/0005_test.yml.tt2 b/scenarios_lnp/invite_peerout/0005_test.yml.tt2
index a1d52088..2e89ff76 100644
--- a/scenarios_lnp/invite_peerout/0005_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout/0005_test.yml.tt2
@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|ROUTE_ENTRY:
+  - return|ROUTE_ENTRY:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
         "userout:[% spce_test.testuser1002.uuid %]",
@@ -15,7 +17,10 @@ flow:
         "peer:[% peer_00_host0.id %]",
         "outgoing"
       ]
-  - exit|REPLY_ROUTE_NAT:
+  - start|ROUTE_EXIT:
+  - start|ROUTE_RUNTIME:
+  - return|ROUTE_RUNTIME:
+  - exit|ROUTE_EXIT:
 sip_in:
   - '^SIP/2.0 180 Ringing'
   - 'CSeq: 2 INVITE'
diff --git a/scenarios_lnp/invite_peerout/0006_test.yml.tt2 b/scenarios_lnp/invite_peerout/0006_test.yml.tt2
index 010157ae..97338b97 100644
--- a/scenarios_lnp/invite_peerout/0006_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout/0006_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_lnp/invite_peerout/0007_test.yml.tt2 b/scenarios_lnp/invite_peerout/0007_test.yml.tt2
index ac2f2bd8..a751ae16 100644
--- a/scenarios_lnp/invite_peerout/0007_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout/0007_test.yml.tt2
@@ -1,6 +1,8 @@
 # INVITE_OFFLINE scenario
 flow:
   - start|DEFAULT_ROUTE:
+  - start|ROUTE_ENTRY:
+  - return|ROUTE_ENTRY:
   - start|ROUTE_NET_INFO:
   - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
diff --git a/scenarios_lnp/invite_peerout/0008_test.yml.tt2 b/scenarios_lnp/invite_peerout/0008_test.yml.tt2
index 5fb7717e..973accb5 100644
--- a/scenarios_lnp/invite_peerout/0008_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout/0008_test.yml.tt2
@@ -1,6 +1,8 @@
 # INVITE_OFFLINE scenario
 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:
   - 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:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
diff --git a/scenarios_lnp/invite_peerout/0009_test.yml.tt2 b/scenarios_lnp/invite_peerout/0009_test.yml.tt2
index 1171f4e1..95018345 100644
--- a/scenarios_lnp/invite_peerout/0009_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout/0009_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'
   - 'CSeq: 3 BYE'
diff --git a/scenarios_lnp/invite_peerout_rn/0001_test.yml.tt2 b/scenarios_lnp/invite_peerout_rn/0001_test.yml.tt2
index cf91b29e..15ffc9d7 100644
--- a/scenarios_lnp/invite_peerout_rn/0001_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout_rn/0001_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:004321001@'
   - 'Contact: sip:testuser1002@'
diff --git a/scenarios_lnp/invite_peerout_rn/0003_test.yml.tt2 b/scenarios_lnp/invite_peerout_rn/0003_test.yml.tt2
index 7b568e22..cf051920 100644
--- a/scenarios_lnp/invite_peerout_rn/0003_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout_rn/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:
@@ -151,7 +153,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:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
         "userout:[% spce_test.testuser1002.uuid %]",
diff --git a/scenarios_lnp/invite_peerout_rn/0005_test.yml.tt2 b/scenarios_lnp/invite_peerout_rn/0005_test.yml.tt2
index 365aa769..73e9b349 100644
--- a/scenarios_lnp/invite_peerout_rn/0005_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout_rn/0005_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'
   - 'CSeq: 2 INVITE'
diff --git a/scenarios_lnp/invite_peerout_rn/0006_test.yml.tt2 b/scenarios_lnp/invite_peerout_rn/0006_test.yml.tt2
index 740a61ab..a39254c5 100644
--- a/scenarios_lnp/invite_peerout_rn/0006_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout_rn/0006_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_lnp/invite_peerout_rn/0007_test.yml.tt2 b/scenarios_lnp/invite_peerout_rn/0007_test.yml.tt2
index ac2f2bd8..a751ae16 100644
--- a/scenarios_lnp/invite_peerout_rn/0007_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout_rn/0007_test.yml.tt2
@@ -1,6 +1,8 @@
 # INVITE_OFFLINE scenario
 flow:
   - start|DEFAULT_ROUTE:
+  - start|ROUTE_ENTRY:
+  - return|ROUTE_ENTRY:
   - start|ROUTE_NET_INFO:
   - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
diff --git a/scenarios_lnp/invite_peerout_rn/0008_test.yml.tt2 b/scenarios_lnp/invite_peerout_rn/0008_test.yml.tt2
index 87b54fb1..adbec449 100644
--- a/scenarios_lnp/invite_peerout_rn/0008_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout_rn/0008_test.yml.tt2
@@ -1,6 +1,8 @@
 # INVITE_OFFLINE scenario
 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:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
diff --git a/scenarios_lnp/invite_peerout_rn/0009_test.yml.tt2 b/scenarios_lnp/invite_peerout_rn/0009_test.yml.tt2
index 1171f4e1..95018345 100644
--- a/scenarios_lnp/invite_peerout_rn/0009_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout_rn/0009_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'
   - 'CSeq: 3 BYE'
diff --git a/scenarios_lnp/register_lock_ported/0001_test.yml.tt2 b/scenarios_lnp/register_lock_ported/0001_test.yml.tt2
index 9b4e5e7e..87d6139b 100644
--- a/scenarios_lnp/register_lock_ported/0001_test.yml.tt2
+++ b/scenarios_lnp/register_lock_ported/0001_test.yml.tt2
@@ -1,5 +1,7 @@
 flow:
   - start|DEFAULT_ROUTE:
+  - start|ROUTE_ENTRY:
+  - return|ROUTE_ENTRY:
       $fU: testuser1003
       $tU: testuser1003
   - start|ROUTE_NET_INFO:
@@ -9,7 +11,10 @@ flow:
   - 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'
   - 'Contact: sip:testuser1003@'
diff --git a/scenarios_lnp/register_lock_ported/0002_test.yml.tt2 b/scenarios_lnp/register_lock_ported/0002_test.yml.tt2
index c4fa2329..7e1bd95d 100644
--- a/scenarios_lnp/register_lock_ported/0002_test.yml.tt2
+++ b/scenarios_lnp/register_lock_ported/0002_test.yml.tt2
@@ -1,5 +1,7 @@
 flow:
   - start|DEFAULT_ROUTE:
+  - start|ROUTE_ENTRY:
+  - return|ROUTE_ENTRY:
       $fU: testuser1003
       $tU: testuser1003
   - start|ROUTE_NET_INFO:
@@ -17,7 +19,10 @@ flow:
   - start|ROUTE_PREFERENCES:
   - start|ROUTE_CHECK_UA:
   - return|ROUTE_CHECK_UA:
-  - exit|ROUTE_PREFERENCES:
+  - start|ROUTE_EXIT:
+  - start|ROUTE_RUNTIME:
+  - return|ROUTE_RUNTIME:
+  - exit|ROUTE_EXIT:
       $xavp(callee_dom_prefs): None
       $xavp(callee_peer_prefs): None
       $xavp(callee_real_prefs): None