TT#5508 update kamailio-config-tests flows for new rtpengine routes

Change-Id: Ifacb9d9d640760a0bad03aad4862b992ca56e734

scenarios/incoming_foreign_dom/0006_test.yml.tt2

@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|REPLY_ROUTE_RTPENGINE:
+  - return|REPLY_ROUTE_RTPENGINE:
   - 'start|dialog:start':
   - 'return|dialog:start':
       $avp(lua_dlg_profile): [

scenarios/incoming_foreign_dom/0007_test.yml.tt2

@@ -5,6 +5,10 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
   - return|ROUTE_INITVARS:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_WITHINDLG_RTPENGINE:
+  - return|ROUTE_WITHINDLG_RTPENGINE:
   - start|ROUTE_OUTBOUND:
   - return|ROUTE_OUTBOUND:
 sip_in:

scenarios/incoming_hih/0011_test.yml.tt2

@@ -5,6 +5,10 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
   - return|ROUTE_INITVARS:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_WITHINDLG_RTPENGINE:
+  - return|ROUTE_WITHINDLG_RTPENGINE:
   - start|ROUTE_OUTBOUND:
   - return|ROUTE_OUTBOUND:
 sip_in:

scenarios/incoming_peer/0006_test.yml.tt2

@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|REPLY_ROUTE_RTPENGINE:
+  - return|REPLY_ROUTE_RTPENGINE:
   - 'start|dialog:start':
   - 'return|dialog:start':
       $avp(lua_dlg_profile): [

scenarios/incoming_peer/0007_test.yml.tt2

@@ -5,6 +5,10 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
   - return|ROUTE_INITVARS:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_WITHINDLG_RTPENGINE:
+  - return|ROUTE_WITHINDLG_RTPENGINE:
   - start|ROUTE_OUTBOUND:
   - return|ROUTE_OUTBOUND:
 sip_in:

scenarios/invite/0008_test.yml.tt2

@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|REPLY_ROUTE_RTPENGINE:
+  - return|REPLY_ROUTE_RTPENGINE:
   - 'start|dialog:start':
   - 'return|dialog:start':
       $avp(lua_dlg_profile): [

scenarios/invite/0009_test.yml.tt2

@@ -5,6 +5,10 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
   - return|ROUTE_INITVARS:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_WITHINDLG_RTPENGINE:
+  - return|ROUTE_WITHINDLG_RTPENGINE:
   - start|ROUTE_OUTBOUND:
   - return|ROUTE_OUTBOUND:
 sip_in:

scenarios/invite_allowedcli_match/0008_test.yml.tt2

@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|REPLY_ROUTE_RTPENGINE:
+  - return|REPLY_ROUTE_RTPENGINE:
   - 'start|dialog:start':
   - 'return|dialog:start':
       $avp(lua_dlg_profile): [

scenarios/invite_allowedcli_match/0009_test.yml.tt2

@@ -5,6 +5,10 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
   - return|ROUTE_INITVARS:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_WITHINDLG_RTPENGINE:
+  - return|ROUTE_WITHINDLG_RTPENGINE:
   - start|ROUTE_OUTBOUND:
   - return|ROUTE_OUTBOUND:
 sip_in:

scenarios/invite_allowedcli_match_alias/0008_test.yml.tt2

@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|REPLY_ROUTE_RTPENGINE:
+  - return|REPLY_ROUTE_RTPENGINE:
   - 'start|dialog:start':
   - 'return|dialog:start':
       $avp(lua_dlg_profile): [

scenarios/invite_allowedcli_match_alias/0009_test.yml.tt2

@@ -5,6 +5,10 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
   - return|ROUTE_INITVARS:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_WITHINDLG_RTPENGINE:
+  - return|ROUTE_WITHINDLG_RTPENGINE:
   - start|ROUTE_OUTBOUND:
   - return|ROUTE_OUTBOUND:
 sip_in:

scenarios/invite_allowedcli_nonmatch/0008_test.yml.tt2

@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|REPLY_ROUTE_RTPENGINE:
+  - return|REPLY_ROUTE_RTPENGINE:
   - 'start|dialog:start':
   - 'return|dialog:start':
       $avp(lua_dlg_profile) : [

scenarios/invite_allowedcli_nonmatch/0009_test.yml.tt2

@@ -5,6 +5,10 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
   - return|ROUTE_INITVARS:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_WITHINDLG_RTPENGINE:
+  - return|ROUTE_WITHINDLG_RTPENGINE:
   - start|ROUTE_OUTBOUND:
   - return|ROUTE_OUTBOUND:
 sip_in:

scenarios/invite_allowip_soundset/0004_test.yml.tt2

@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|REPLY_ROUTE_RTPENGINE:
+  - return|REPLY_ROUTE_RTPENGINE:
   - exit|REPLY_ROUTE_NAT:
 sip_in:
   - '^SIP/2.0 183 Progress'

scenarios/invite_anonymous/0008_test.yml.tt2

@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|REPLY_ROUTE_RTPENGINE:
+  - return|REPLY_ROUTE_RTPENGINE:
   - 'start|dialog:start':
   - 'return|dialog:start':
       $avp(lua_dlg_profile): [

scenarios/invite_anonymous/0009_test.yml.tt2

@@ -5,6 +5,10 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
   - return|ROUTE_INITVARS:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_WITHINDLG_RTPENGINE:
+  - return|ROUTE_WITHINDLG_RTPENGINE:
   - start|ROUTE_OUTBOUND:
   - return|ROUTE_OUTBOUND:
 sip_in:

scenarios/invite_blockout_pinoverride/0008_test.yml.tt2

@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|REPLY_ROUTE_RTPENGINE:
+  - return|REPLY_ROUTE_RTPENGINE:
   - 'start|dialog:start':
   - 'return|dialog:start':
       $avp(lua_dlg_profile): [

scenarios/invite_blockout_pinoverride/0009_test.yml.tt2

@@ -5,6 +5,10 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
   - return|ROUTE_INITVARS:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_WITHINDLG_RTPENGINE:
+  - return|ROUTE_WITHINDLG_RTPENGINE:
   - start|ROUTE_OUTBOUND:
   - return|ROUTE_OUTBOUND:
 sip_in:

scenarios/invite_callforward/0017_test.yml.tt2

@@ -5,6 +5,10 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
   - return|ROUTE_INITVARS:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_WITHINDLG_RTPENGINE:
+  - return|ROUTE_WITHINDLG_RTPENGINE:
   - start|ROUTE_OUTBOUND:
   - return|ROUTE_OUTBOUND:
 sip_in:

scenarios/invite_callforward/0033_test.yml.tt2

@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|REPLY_ROUTE_RTPENGINE:
+  - return|REPLY_ROUTE_RTPENGINE:
   - start|dialog:start:
   - return|dialog:start:
       $avp(lua_dlg_profile): [

scenarios/invite_callforward/0034_test.yml.tt2

@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|REPLY_ROUTE_RTPENGINE:
+  - return|REPLY_ROUTE_RTPENGINE:
   - 'start|dialog:start':
   - 'return|dialog:start':
       $avp(lua_dlg_profile): [

scenarios/invite_callforward/0037_test.yml.tt2

@@ -9,6 +9,8 @@ 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_OUTBOUND:
   - exit|ROUTE_OUTBOUND:

scenarios/invite_concurrent_max_out/0006_test.yml.tt2

@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|REPLY_ROUTE_RTPENGINE:
+  - return|REPLY_ROUTE_RTPENGINE:
   - 'start|dialog:start':
   - 'return|dialog:start':
       $avp(lua_dlg_profile): [

scenarios/invite_concurrent_max_out/0008_test.yml.tt2

@@ -7,6 +7,8 @@ flow:
   - return|ROUTE_INITVARS:
   - start|ROUTE_RESTORE_CLUSTERSET:
   - return|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_WITHINDLG_RTPENGINE:
+  - return|ROUTE_WITHINDLG_RTPENGINE:
   - start|ROUTE_OUTBOUND:
   - exit|ROUTE_OUTBOUND:
 sip_in:

scenarios/invite_concurrent_max_out/0010_test.yml.tt2

@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|REPLY_ROUTE_RTPENGINE:
+  - return|REPLY_ROUTE_RTPENGINE:
   - exit|REPLY_ROUTE_NAT:
 sip_in:
   - '^SIP/2.0 200 OK'

scenarios/invite_concurrent_max_out_per_account/0006_test.yml.tt2

@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|REPLY_ROUTE_RTPENGINE:
+  - return|REPLY_ROUTE_RTPENGINE:
   - 'start|dialog:start':
   - 'return|dialog:start':
       $avp(lua_dlg_profile): [

scenarios/invite_concurrent_max_out_per_account/0008_test.yml.tt2

@@ -7,6 +7,8 @@ flow:
   - return|ROUTE_INITVARS:
   - start|ROUTE_RESTORE_CLUSTERSET:
   - return|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_WITHINDLG_RTPENGINE:
+  - return|ROUTE_WITHINDLG_RTPENGINE:
   - start|ROUTE_OUTBOUND:
   - exit|ROUTE_OUTBOUND:
 sip_in:

scenarios/invite_concurrent_max_out_per_account/0010_test.yml.tt2

@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|REPLY_ROUTE_RTPENGINE:
+  - return|REPLY_ROUTE_RTPENGINE:
   - exit|REPLY_ROUTE_NAT:
 sip_in:
   - '^SIP/2.0 200 OK'

scenarios/invite_concurrent_max_per_account/0010_test.yml.tt2

@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|REPLY_ROUTE_RTPENGINE:
+  - return|REPLY_ROUTE_RTPENGINE:
   - 'start|dialog:start':
   - 'return|dialog:start':
       $avp(lua_dlg_profile): [

scenarios/invite_foreign_dom/0006_test.yml.tt2

@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|REPLY_ROUTE_RTPENGINE:
+  - return|REPLY_ROUTE_RTPENGINE:
   - 'start|dialog:start':
   - 'return|dialog:start':
       $avp(lua_dlg_profile): [

scenarios/invite_foreign_dom/0007_test.yml.tt2

@@ -5,6 +5,10 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
   - return|ROUTE_INITVARS:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_WITHINDLG_RTPENGINE:
+  - return|ROUTE_WITHINDLG_RTPENGINE:
   - start|ROUTE_OUTBOUND:
   - return|ROUTE_OUTBOUND:
 sip_in:

scenarios/invite_ignore_allowip/0008_test.yml.tt2

@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|REPLY_ROUTE_RTPENGINE:
+  - return|REPLY_ROUTE_RTPENGINE:
   - 'start|dialog:start':
   - 'return|dialog:start':
        $avp(lua_dlg_profile): [

scenarios/invite_ignore_allowip/0009_test.yml.tt2

@@ -5,6 +5,10 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
   - return|ROUTE_INITVARS:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_WITHINDLG_RTPENGINE:
+  - return|ROUTE_WITHINDLG_RTPENGINE:
   - start|ROUTE_OUTBOUND:
   - return|ROUTE_OUTBOUND:
 sip_in:

scenarios/invite_lateoam/0008_test.yml.tt2

@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|REPLY_ROUTE_RTPENGINE:
+  - return|REPLY_ROUTE_RTPENGINE:
   - 'start|dialog:start':
   - 'return|dialog:start':
       $avp(lua_dlg_profile): [

scenarios/invite_lateoam/0009_test.yml.tt2

@@ -7,6 +7,8 @@ flow:
   - return|ROUTE_INITVARS:
   - start|ROUTE_RESTORE_CLUSTERSET:
   - return|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_WITHINDLG_RTPENGINE:
+  - return|ROUTE_WITHINDLG_RTPENGINE:
   - start|ROUTE_OUTBOUND:
   - return|ROUTE_OUTBOUND:
 sip_in:

scenarios/invite_no_refer/0008_test.yml.tt2

@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|REPLY_ROUTE_RTPENGINE:
+  - return|REPLY_ROUTE_RTPENGINE:
   - 'start|dialog:start':
   - 'return|dialog:start':
       $avp(lua_dlg_profile): [

scenarios/invite_no_refer/0009_test.yml.tt2

@@ -5,6 +5,10 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
   - return|ROUTE_INITVARS:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_WITHINDLG_RTPENGINE:
+  - return|ROUTE_WITHINDLG_RTPENGINE:
   - start|ROUTE_OUTBOUND:
   - return|ROUTE_OUTBOUND:
 sip_in:

scenarios/invite_peerout/0006_test.yml.tt2

@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|REPLY_ROUTE_RTPENGINE:
+  - return|REPLY_ROUTE_RTPENGINE:
   - 'start|dialog:start':
   - 'return|dialog:start':
       $avp(lua_dlg_profile): [

scenarios/invite_peerout/0007_test.yml.tt2

@@ -6,6 +6,10 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
   - return|ROUTE_INITVARS:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_WITHINDLG_RTPENGINE:
+  - return|ROUTE_WITHINDLG_RTPENGINE:
   - start|ROUTE_OUTBOUND:
   - return|ROUTE_OUTBOUND:
 sip_in:

scenarios/invite_peerout_rewrite/0006_test.yml.tt2

@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|REPLY_ROUTE_RTPENGINE:
+  - return|REPLY_ROUTE_RTPENGINE:
   - 'start|dialog:start':
   - 'return|dialog:start':
       $avp(lua_dlg_profile): [

scenarios/invite_peerout_rewrite/0007_test.yml.tt2

@@ -5,6 +5,10 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
   - return|ROUTE_INITVARS:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_WITHINDLG_RTPENGINE:
+  - return|ROUTE_WITHINDLG_RTPENGINE:
   - start|ROUTE_OUTBOUND:
   - return|ROUTE_OUTBOUND:
 sip_in:

scenarios/invite_peerout_rewrite_pv_regex/0006_test.yml.tt2

@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|REPLY_ROUTE_RTPENGINE:
+  - return|REPLY_ROUTE_RTPENGINE:
   - 'start|dialog:start':
   - 'return|dialog:start':
       $avp(lua_dlg_profile): [

scenarios/invite_peerout_rewrite_pv_regex/0007_test.yml.tt2

@@ -5,6 +5,10 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
   - return|ROUTE_INITVARS:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_WITHINDLG_RTPENGINE:
+  - return|ROUTE_WITHINDLG_RTPENGINE:
   - start|ROUTE_OUTBOUND:
   - return|ROUTE_OUTBOUND:
 sip_in:

scenarios/invite_redirect/0012_test.yml.tt2

@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|REPLY_ROUTE_RTPENGINE:
+  - return|REPLY_ROUTE_RTPENGINE:
   - 'start|dialog:start':
   - 'return|dialog:start':
       $avp(lua_dlg_profile): [

scenarios/invite_redirect/0013_test.yml.tt2

@@ -5,6 +5,10 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
   - return|ROUTE_INITVARS:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_WITHINDLG_RTPENGINE:
+  - return|ROUTE_WITHINDLG_RTPENGINE:
   - start|ROUTE_OUTBOUND:
   - return|ROUTE_OUTBOUND:
 sip_in:

scenarios/invite_retrans/0009_test.yml.tt2

@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|REPLY_ROUTE_RTPENGINE:
+  - return|REPLY_ROUTE_RTPENGINE:
   - 'start|dialog:start':
   - 'return|dialog:start':
       $avp(lua_dlg_profile): [

scenarios/invite_retrans/0010_test.yml.tt2

@@ -5,6 +5,10 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
   - return|ROUTE_INITVARS:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_WITHINDLG_RTPENGINE:
+  - return|ROUTE_WITHINDLG_RTPENGINE:
   - start|ROUTE_OUTBOUND:
   - return|ROUTE_OUTBOUND:
 sip_in:

scenarios/invite_tcp_udp_reinvite/0010_test.yml.tt2

@@ -7,6 +7,8 @@ flow:
   - return|ROUTE_INITVARS:
   - start|ROUTE_RESTORE_CLUSTERSET:
   - return|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_WITHINDLG_RTPENGINE:
+  - return|ROUTE_WITHINDLG_RTPENGINE:
   - start|ROUTE_OUTBOUND:
   - exit|ROUTE_OUTBOUND:
       $avp(proto): ["udp"]

scenarios/invite_voicebox/0009_test.yml.tt2

@@ -5,6 +5,10 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
   - return|ROUTE_INITVARS:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_WITHINDLG_RTPENGINE:
+  - return|ROUTE_WITHINDLG_RTPENGINE:
   - start|ROUTE_OUTBOUND:
   - return|ROUTE_OUTBOUND:
 sip_in:

scenarios/lock_ported/0013_test.yml.tt2

@@ -5,6 +5,10 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
   - return|ROUTE_INITVARS:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_WITHINDLG_RTPENGINE:
+  - return|ROUTE_WITHINDLG_RTPENGINE:
   - start|ROUTE_OUTBOUND:
   - return|ROUTE_OUTBOUND:
 sip_in:

scenarios/reminder/0005_test.yml.tt2

@@ -5,6 +5,10 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
   - return|ROUTE_INITVARS:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_WITHINDLG_RTPENGINE:
+  - return|ROUTE_WITHINDLG_RTPENGINE:
   - start|ROUTE_OUTBOUND:
   - return|ROUTE_OUTBOUND:
 sip_in:

scenarios_lnp/incoming_peer/0007_test.yml.tt2

@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|REPLY_ROUTE_RTPENGINE:
+  - return|REPLY_ROUTE_RTPENGINE:
   - start|dialog:start:
   - return|dialog:start:
       $avp(lua_dlg_profile): [

scenarios_lnp/incoming_peer/0010_test.yml.tt2

@@ -5,6 +5,10 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
   - return|ROUTE_INITVARS:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_WITHINDLG_RTPENGINE:
+  - return|ROUTE_WITHINDLG_RTPENGINE:
   - start|ROUTE_OUTBOUND:
   - return|ROUTE_OUTBOUND:
 sip_in:

scenarios_lnp/invite/0006_test.yml.tt2

@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|REPLY_ROUTE_RTPENGINE:
+  - return|REPLY_ROUTE_RTPENGINE:
   - 'start|dialog:start':
   - 'return|dialog:start':
       $avp(lua_dlg_profile): [

scenarios_lnp/invite/0007_test.yml.tt2

@@ -5,6 +5,10 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
   - return|ROUTE_INITVARS:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_WITHINDLG_RTPENGINE:
+  - return|ROUTE_WITHINDLG_RTPENGINE:
   - start|ROUTE_OUTBOUND:
   - return|ROUTE_OUTBOUND:
 sip_in:

scenarios_lnp/invite_ncos_black/0014_test.yml.tt2

@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|REPLY_ROUTE_RTPENGINE:
+  - return|REPLY_ROUTE_RTPENGINE:
   - 'start|dialog:start':
   - 'return|dialog:start':
       $avp(lua_dlg_profile): [

scenarios_lnp/invite_ncos_black/0015_test.yml.tt2

@@ -5,6 +5,10 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
   - return|ROUTE_INITVARS:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_WITHINDLG_RTPENGINE:
+  - return|ROUTE_WITHINDLG_RTPENGINE:
   - start|ROUTE_OUTBOUND:
   - return|ROUTE_OUTBOUND:
 sip_in:

scenarios_lnp/invite_ncos_white/0006_test.yml.tt2

@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|REPLY_ROUTE_RTPENGINE:
+  - return|REPLY_ROUTE_RTPENGINE:
   - 'start|dialog:start':
   - 'return|dialog:start':
       $avp(lua_dlg_profile): [

scenarios_lnp/invite_ncos_white/0007_test.yml.tt2

@@ -5,6 +5,10 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
   - return|ROUTE_INITVARS:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_WITHINDLG_RTPENGINE:
+  - return|ROUTE_WITHINDLG_RTPENGINE:
   - start|ROUTE_OUTBOUND:
   - return|ROUTE_OUTBOUND:
 sip_in:

scenarios_lnp/invite_ncos_white/0015_test.yml.tt2

@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|REPLY_ROUTE_RTPENGINE:
+  - return|REPLY_ROUTE_RTPENGINE:
   - 'start|dialog:start':
   - 'return|dialog:start':
       $avp(lua_dlg_profile): [

scenarios_lnp/invite_ncos_white/0016_test.yml.tt2

@@ -5,6 +5,10 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
   - return|ROUTE_INITVARS:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_WITHINDLG_RTPENGINE:
+  - return|ROUTE_WITHINDLG_RTPENGINE:
   - start|ROUTE_OUTBOUND:
   - return|ROUTE_OUTBOUND:
 sip_in:

scenarios_lnp/invite_peerout/0006_test.yml.tt2

@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|REPLY_ROUTE_RTPENGINE:
+  - return|REPLY_ROUTE_RTPENGINE:
   - 'start|dialog:start':
   - 'return|dialog:start':
       $avp(lua_dlg_profile): [

scenarios_lnp/invite_peerout/0007_test.yml.tt2

@@ -6,6 +6,10 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
   - return|ROUTE_INITVARS:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_WITHINDLG_RTPENGINE:
+  - return|ROUTE_WITHINDLG_RTPENGINE:
   - start|ROUTE_OUTBOUND:
   - return|ROUTE_OUTBOUND:
 sip_in:

scenarios_lnp/invite_peerout_rn/0006_test.yml.tt2

@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|REPLY_ROUTE_RTPENGINE:
+  - return|REPLY_ROUTE_RTPENGINE:
   - 'start|dialog:start':
   - 'return|dialog:start':
   # branch ??

scenarios_lnp/invite_peerout_rn/0007_test.yml.tt2

@@ -6,6 +6,10 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
   - return|ROUTE_INITVARS:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_WITHINDLG_RTPENGINE:
+  - return|ROUTE_WITHINDLG_RTPENGINE:
   - start|ROUTE_OUTBOUND:
   - return|ROUTE_OUTBOUND:
 sip_in:

scenarios_pbx/invite/0005_test.yml.tt2

@@ -20,6 +20,8 @@ flow:
       $avp(orig_acc_caller_user): ['testuser1002']
       $avp(orig_acc_caller_domain): ['spce.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
+  - start|ROUTE_ADD_CALLINFO_CALLER_PRIMARY:
+  - return|ROUTE_ADD_CALLINFO_CALLER_PRIMARY:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - return|ROUTE_AUTH:
   - return|ROUTE_FIND_CALLER:
@@ -110,6 +112,10 @@ flow:
   - start|ROUTE_LOAD_PBXSRV:
   - return|ROUTE_LOAD_PBXSRV:
   - start|ROUTE_ADD_CALLINFO:
+  - 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:
   - return|BRANCH_ROUTE_NO_SBC:
   - return|BRANCH_ROUTE_NO_SBC:
@@ -153,7 +159,7 @@ sip_out:
       'Content-Type: application/sdp',
       'P-Caller-UUID: [% spce_test.testuser1002.uuid %]',
       'P-Callee-UUID: [% spce_test.testuser1003.uuid %]',
-      'P-NGCP-Lookup-Ext: 1003',
+      'P-NGCP-Lookup-Type: ext',
       'P-NGCP-Orig-User: 43110021003',
       'P-NGCP-Orig-Dialed: 1003',
       'P-App-Param: ;aleg_sst_enable=no;sst_enable=no;a_park_domain=\d+;b_park_domain=\d+',

scenarios_pbx/invite/0007_test.yml.tt2

@@ -43,12 +43,12 @@ flow:
   - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF:
   - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF:
   - start|ROUTE_SET_CALLEE_DIALOG:
-  - start|ROUTE_CNT_DLG_CHECK:
-  - return|ROUTE_CNT_DLG_CHECK:
-  - return|ROUTE_SET_CALLEE_DIALOG:
       $avp(lua_dlg_profile): [
         "total"
       ]
+  - start|ROUTE_CNT_DLG_CHECK:
+  - return|ROUTE_CNT_DLG_CHECK:
+  - return|ROUTE_SET_CALLEE_DIALOG:
   - start|ROUTE_BLOCK_IN:
   - return|ROUTE_BLOCK_IN:
   - start|ROUTE_ORDER_CF_MAP_ID:
@@ -56,6 +56,7 @@ flow:
   - return|ROUTE_LOAD_CALLEE_PREF:
   - start|ROUTE_CHECK_PBX:
   - return|ROUTE_CHECK_PBX:
+  - start|ROUTE_CALLEE_DISPATCH:
   - start|ROUTE_INVITE_TO_INT:
   - start|ROUTE_CNT_DLG_CHECK:
   - return|ROUTE_CNT_DLG_CHECK:
@@ -102,6 +103,10 @@ flow:
   - start|ROUTE_SET_CALLEE:
   - return|ROUTE_SET_CALLEE:
   - start|ROUTE_ADD_CALLINFO:
+  - 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:
   - return|BRANCH_ROUTE_SBC:
   - return|BRANCH_ROUTE_SBC:
@@ -116,7 +121,7 @@ sip_in:
   - 'To: <sip:1003@'
   - 'CSeq: \d+ INVITE'
   - 'Max-Forwards: 70'
-  - 'P-NGCP-Lookup-Ext: 1003'
+  - 'P-NGCP-Lookup-Type: ext'
   - 'P-NGCP-Orig-User: 43110021003'
   - 'P-NGCP-Orig-Domain: spce.test'
   - 'P-NGCP-Orig-Dialed: 1003'
@@ -147,7 +152,6 @@ sip_out:
        'To: <sip:1003@',
        'CSeq: \d+ INVITE',
        'Max-Forwards: 69',
-       'P-NGCP-Lookup-Ext: 1003',
        'Content-Type: application/sdp',
        'Contact: <sip:127.0.0.1:5085;transport=udp>',
        'Call-Info: <sip:spce.test>;appearance-index=1',

scenarios_pbx/invite/0011_test.yml.tt2

@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|REPLY_ROUTE_RTPENGINE:
+  - return|REPLY_ROUTE_RTPENGINE:
   - 'start|dialog:start':
   - 'return|dialog:start':
       $avp(lua_dlg_profile): [

scenarios_pbx/invite/0012_test.yml.tt2

@@ -1,5 +1,7 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+  - start|REPLY_ROUTE_RTPENGINE:
+  - return|REPLY_ROUTE_RTPENGINE:
   - 'start|dialog:start':
   - 'return|dialog:start':
       $avp(lua_dlg_profile): [

scenarios_pbx/invite/0013_test.yml.tt2

@@ -5,6 +5,10 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
   - return|ROUTE_INITVARS:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_WITHINDLG_RTPENGINE:
+  - return|ROUTE_WITHINDLG_RTPENGINE:
   - start|ROUTE_OUTBOUND:
   - return|ROUTE_OUTBOUND:
 sip_in:

scenarios_pbx/invite/0014_test.yml.tt2

@@ -5,6 +5,10 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
   - return|ROUTE_INITVARS:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_WITHINDLG_RTPENGINE:
+  - return|ROUTE_WITHINDLG_RTPENGINE:
   - start|ROUTE_OUTBOUND:
   - return|ROUTE_OUTBOUND:
 sip_in: