MT#7971 get rid of IF PRO in kamailio templates (fix tests)

12 years ago · 7462af6158
parent 60d8f9e327
commit 7462af6158
27 changed files with 2 additions and 54 deletions
--- a/scenarios/incoming_foreign_dom/0003_test.yml.tt2
+++ b/scenarios/incoming_foreign_dom/0003_test.yml.tt2
@ -63,10 +63,8 @@ flow:
  - end|ROUTE_SET_RUSER:
  - start|ROUTE_PREPARE_SST:
  - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
  - start|ROUTE_PREPARE_MOH:
  - end|ROUTE_PREPARE_MOH:
-[% END -%]
  - start|ROUTE_SET_CALLER_CLI:
  - start|ROUTE_PREPARE_CALLER_CLI:
  - end|ROUTE_PREPARE_CALLER_CLI:
--- a/scenarios/incoming_foreign_dom/0007_test.yml.tt2
+++ b/scenarios/incoming_foreign_dom/0007_test.yml.tt2
@ -22,4 +22,4 @@ sip_out:
      'Content-Length: 0',
      'From: <sip:external@external.test>',
      'To: <sip:4311003@'
-    ]
+    ]
--- a/scenarios/incoming_peer/0003_test.yml.tt2
+++ b/scenarios/incoming_peer/0003_test.yml.tt2
@ -57,10 +57,8 @@ flow:
  - end|ROUTE_SET_RUSER:
  - start|ROUTE_PREPARE_SST:
  - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
  - start|ROUTE_PREPARE_MOH:
  - end|ROUTE_PREPARE_MOH:
-[% END -%]
  - start|ROUTE_SET_CALLER_CLI:
  - start|ROUTE_PREPARE_CALLER_CLI:
  - end|ROUTE_PREPARE_CALLER_CLI:
--- a/scenarios/incoming_peer/0007_test.yml.tt2
+++ b/scenarios/incoming_peer/0007_test.yml.tt2
@ -22,4 +22,4 @@ sip_out:
      'Content-Length: 0',
      'From: <sip:004321001@',
      'To: <sip:4311003@'
-    ]
+    ]
--- a/scenarios/invite/0005_test.yml.tt2
+++ b/scenarios/invite/0005_test.yml.tt2
@ -63,10 +63,8 @@ flow:
  - end|ROUTE_SET_RUSER:
  - start|ROUTE_PREPARE_SST:
  - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
  - start|ROUTE_PREPARE_MOH:
  - end|ROUTE_PREPARE_MOH:
-[% END -%]
  - start|ROUTE_SET_CALLER_CLI:
  - start|ROUTE_PREPARE_CALLER_CLI:
  - end|ROUTE_PREPARE_CALLER_CLI:
--- a/scenarios/invite_allowedcli_match/0005_test.yml.tt2
+++ b/scenarios/invite_allowedcli_match/0005_test.yml.tt2
@ -70,10 +70,8 @@ flow:
  - end|ROUTE_SET_RUSER:
  - start|ROUTE_PREPARE_SST:
  - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
  - start|ROUTE_PREPARE_MOH:
  - end|ROUTE_PREPARE_MOH:
-[% END -%]
  - start|ROUTE_SET_CALLER_CLI:
  - start|ROUTE_PREPARE_CALLER_CLI:
  - end|ROUTE_PREPARE_CALLER_CLI:
--- a/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2
+++ b/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2
@ -69,10 +69,8 @@ flow:
  - end|ROUTE_SET_RUSER:
  - start|ROUTE_PREPARE_SST:
  - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
  - start|ROUTE_PREPARE_MOH:
  - end|ROUTE_PREPARE_MOH:
-[% END -%]
  - start|ROUTE_SET_CALLER_CLI:
  - start|ROUTE_PREPARE_CALLER_CLI:
  - end|ROUTE_PREPARE_CALLER_CLI:
--- a/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2
+++ b/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2
@ -70,10 +70,8 @@ flow:
  - end|ROUTE_SET_RUSER:
  - start|ROUTE_PREPARE_SST:
  - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
  - start|ROUTE_PREPARE_MOH:
  - end|ROUTE_PREPARE_MOH:
-[% END -%]
  - start|ROUTE_SET_CALLER_CLI:
  - start|ROUTE_PREPARE_CALLER_CLI:
  - end|ROUTE_PREPARE_CALLER_CLI:
--- a/scenarios/invite_blockout_pinoverride/0005_test.yml.tt2
+++ b/scenarios/invite_blockout_pinoverride/0005_test.yml.tt2
@ -61,10 +61,8 @@ flow:
  - end|ROUTE_SET_RUSER:
  - start|ROUTE_PREPARE_SST:
  - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
  - start|ROUTE_PREPARE_MOH:
  - end|ROUTE_PREPARE_MOH:
-[% END -%]
  - start|ROUTE_SET_CALLER_CLI:
  - start|ROUTE_PREPARE_CALLER_CLI:
  - end|ROUTE_PREPARE_CALLER_CLI:
--- a/scenarios/invite_callforward/0011_test.yml.tt2
+++ b/scenarios/invite_callforward/0011_test.yml.tt2
@ -61,10 +61,8 @@ flow:
  - end|ROUTE_SET_RUSER:
  - start|ROUTE_PREPARE_SST:
  - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
  - start|ROUTE_PREPARE_MOH:
  - end|ROUTE_PREPARE_MOH:
-[% END -%]
  - start|ROUTE_SET_CALLER_CLI:
  - start|ROUTE_PREPARE_CALLER_CLI:
  - end|ROUTE_PREPARE_CALLER_CLI:
--- a/scenarios/invite_callforward/0025_test.yml.tt2
+++ b/scenarios/invite_callforward/0025_test.yml.tt2
@ -63,10 +63,8 @@ flow:
  - end|ROUTE_SET_RUSER:
  - start|ROUTE_PREPARE_SST:
  - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
  - start|ROUTE_PREPARE_MOH:
  - end|ROUTE_PREPARE_MOH:
-[% END -%]
  - start|ROUTE_SET_CALLER_CLI:
  - start|ROUTE_PREPARE_CALLER_CLI:
  - end|ROUTE_PREPARE_CALLER_CLI:
--- a/scenarios/invite_callforward/0029_test.yml.tt2
+++ b/scenarios/invite_callforward/0029_test.yml.tt2
@ -61,10 +61,8 @@ flow:
  - end|ROUTE_SET_RUSER:
  - start|ROUTE_PREPARE_SST:
  - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
  - start|ROUTE_PREPARE_MOH:
  - end|ROUTE_PREPARE_MOH:
-[% END -%]
  - start|ROUTE_SET_CALLER_CLI:
  - start|ROUTE_PREPARE_CALLER_CLI:
  - end|ROUTE_PREPARE_CALLER_CLI:
--- a/scenarios/invite_concurrent_max/0007_test.yml.tt2
+++ b/scenarios/invite_concurrent_max/0007_test.yml.tt2
@ -69,10 +69,8 @@ flow:
  - end|ROUTE_SET_RUSER:
  - start|ROUTE_PREPARE_SST:
  - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
  - start|ROUTE_PREPARE_MOH:
  - end|ROUTE_PREPARE_MOH:
-[% END -%]
  - start|ROUTE_SET_CALLER_CLI:
  - start|ROUTE_PREPARE_CALLER_CLI:
  - end|ROUTE_PREPARE_CALLER_CLI:
--- a/scenarios/invite_concurrent_max_out/0007_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_out/0007_test.yml.tt2
@ -63,10 +63,8 @@ flow:
  - end|ROUTE_SET_RUSER:
  - start|ROUTE_PREPARE_SST:
  - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
  - start|ROUTE_PREPARE_MOH:
  - end|ROUTE_PREPARE_MOH:
-[% END -%]
  - start|ROUTE_SET_CALLER_CLI:
  - start|ROUTE_PREPARE_CALLER_CLI:
  - end|ROUTE_PREPARE_CALLER_CLI:
--- a/scenarios/invite_concurrent_max_out_per_account/0003_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_out_per_account/0003_test.yml.tt2
@ -63,10 +63,8 @@ flow:
  - end|ROUTE_SET_RUSER:
  - start|ROUTE_PREPARE_SST:
  - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
  - start|ROUTE_PREPARE_MOH:
  - end|ROUTE_PREPARE_MOH:
-[% END -%]
  - start|ROUTE_SET_CALLER_CLI:
  - start|ROUTE_PREPARE_CALLER_CLI:
  - end|ROUTE_PREPARE_CALLER_CLI:
--- a/scenarios/invite_concurrent_max_per_account/0007_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_per_account/0007_test.yml.tt2
@ -69,10 +69,8 @@ flow:
  - end|ROUTE_SET_RUSER:
  - start|ROUTE_PREPARE_SST:
  - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
  - start|ROUTE_PREPARE_MOH:
  - end|ROUTE_PREPARE_MOH:
-[% END -%]
  - start|ROUTE_SET_CALLER_CLI:
  - start|ROUTE_PREPARE_CALLER_CLI:
  - end|ROUTE_PREPARE_CALLER_CLI:
--- a/scenarios/invite_foreign_dom/0003_test.yml.tt2
+++ b/scenarios/invite_foreign_dom/0003_test.yml.tt2
@ -56,10 +56,8 @@ flow:
  - end|ROUTE_BRANCH_ACC_RTP:
  - start|ROUTE_PREPARE_SST:
  - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
  - start|ROUTE_PREPARE_MOH:
  - end|ROUTE_PREPARE_MOH:
-[% END -%]
  - start|ROUTE_SET_CALLER_CLI:
  - start|ROUTE_PREPARE_CALLER_CLI:
  - end|ROUTE_PREPARE_CALLER_CLI:
--- a/scenarios/invite_ignore_allowip/0005_test.yml.tt2
+++ b/scenarios/invite_ignore_allowip/0005_test.yml.tt2
@ -63,10 +63,8 @@ flow:
  - end|ROUTE_SET_RUSER:
  - start|ROUTE_PREPARE_SST:
  - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
  - start|ROUTE_PREPARE_MOH:
  - end|ROUTE_PREPARE_MOH:
-[% END -%]
  - start|ROUTE_SET_CALLER_CLI:
  - start|ROUTE_PREPARE_CALLER_CLI:
  - end|ROUTE_PREPARE_CALLER_CLI:
--- a/scenarios/invite_no_refer/0005_test.yml.tt2
+++ b/scenarios/invite_no_refer/0005_test.yml.tt2
@ -63,10 +63,8 @@ flow:
  - end|ROUTE_SET_RUSER:
  - start|ROUTE_PREPARE_SST:
  - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
  - start|ROUTE_PREPARE_MOH:
  - end|ROUTE_PREPARE_MOH:
-[% END -%]
  - start|ROUTE_SET_CALLER_CLI:
  - start|ROUTE_PREPARE_CALLER_CLI:
  - end|ROUTE_PREPARE_CALLER_CLI:
--- a/scenarios/invite_peerout/0003_test.yml.tt2
+++ b/scenarios/invite_peerout/0003_test.yml.tt2
@ -64,10 +64,8 @@ flow:
  - end|ROUTE_SET_RUSER:
  - start|ROUTE_PREPARE_SST:
  - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
  - start|ROUTE_PREPARE_MOH:
  - end|ROUTE_PREPARE_MOH:
-[% END -%]
  - start|ROUTE_SET_CALLER_CLI:
  - start|ROUTE_PREPARE_CALLER_CLI:
  - end|ROUTE_PREPARE_CALLER_CLI:
--- a/scenarios/invite_peerout_rewrite/0003_test.yml.tt2
+++ b/scenarios/invite_peerout_rewrite/0003_test.yml.tt2
@ -70,10 +70,8 @@ flow:
  - end|ROUTE_SET_RUSER:
  - start|ROUTE_PREPARE_SST:
  - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
  - start|ROUTE_PREPARE_MOH:
  - end|ROUTE_PREPARE_MOH:
-[% END -%]
  - start|ROUTE_SET_CALLER_CLI:
  - start|ROUTE_APPLY_CALLER_RWR_FIRST:
  - start|ROUTE_APPLY_REWRITE_RULE:
--- a/scenarios/invite_peerout_rewrite_pv_regex/0003_test.yml.tt2
+++ b/scenarios/invite_peerout_rewrite_pv_regex/0003_test.yml.tt2
@ -72,10 +72,8 @@ flow:
  - end|ROUTE_SET_RUSER:
  - start|ROUTE_PREPARE_SST:
  - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
  - start|ROUTE_PREPARE_MOH:
  - end|ROUTE_PREPARE_MOH:
-[% END -%]
  - start|ROUTE_SET_CALLER_CLI:
  - start|ROUTE_APPLY_CALLER_RWR_FIRST:
  - start|ROUTE_APPLY_REWRITE_RULE:
--- a/scenarios/invite_redirect/0007_test.yml.tt2
+++ b/scenarios/invite_redirect/0007_test.yml.tt2
@ -62,10 +62,8 @@ flow:
  - end|ROUTE_SET_RUSER:
  - start|ROUTE_PREPARE_SST:
  - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
  - start|ROUTE_PREPARE_MOH:
  - end|ROUTE_PREPARE_MOH:
-[% END -%]
  - start|ROUTE_SET_CALLER_CLI:
  - start|ROUTE_PREPARE_CALLER_CLI:
  - end|ROUTE_PREPARE_CALLER_CLI:
@ -129,10 +127,8 @@ flow:
  - end|ROUTE_SET_RUSER:
  - start|ROUTE_PREPARE_SST:
  - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
  - start|ROUTE_PREPARE_MOH:
  - end|ROUTE_PREPARE_MOH:
-[% END -%]
  - start|ROUTE_SET_CALLER_CLI:
  - start|ROUTE_PREPARE_CALLER_CLI:
  - end|ROUTE_PREPARE_CALLER_CLI:
--- a/scenarios/invite_speeddial/0007_test.yml.tt2
+++ b/scenarios/invite_speeddial/0007_test.yml.tt2
@ -63,10 +63,8 @@ flow:
  - end|ROUTE_SET_RUSER:
  - start|ROUTE_PREPARE_SST:
  - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
  - start|ROUTE_PREPARE_MOH:
  - end|ROUTE_PREPARE_MOH:
-[% END -%]
  - start|ROUTE_SET_CALLER_CLI:
  - start|ROUTE_PREPARE_CALLER_CLI:
  - end|ROUTE_PREPARE_CALLER_CLI:
--- a/scenarios/invite_speeddial/0016_test.yml.tt2
+++ b/scenarios/invite_speeddial/0016_test.yml.tt2
@ -63,10 +63,8 @@ flow:
  - end|ROUTE_SET_RUSER:
  - start|ROUTE_PREPARE_SST:
  - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
  - start|ROUTE_PREPARE_MOH:
  - end|ROUTE_PREPARE_MOH:
-[% END -%]
  - start|ROUTE_SET_CALLER_CLI:
  - start|ROUTE_PREPARE_CALLER_CLI:
  - end|ROUTE_PREPARE_CALLER_CLI:
--- a/scenarios/invite_tcp_udp/0005_test.yml.tt2
+++ b/scenarios/invite_tcp_udp/0005_test.yml.tt2
@ -63,10 +63,8 @@ flow:
  - end|ROUTE_SET_RUSER:
  - start|ROUTE_PREPARE_SST:
  - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
  - start|ROUTE_PREPARE_MOH:
  - end|ROUTE_PREPARE_MOH:
-[% END -%]
  - start|ROUTE_SET_CALLER_CLI:
  - start|ROUTE_PREPARE_CALLER_CLI:
  - end|ROUTE_PREPARE_CALLER_CLI:
--- a/scenarios/invite_tcp_udp_reinvite/0005_test.yml.tt2
+++ b/scenarios/invite_tcp_udp_reinvite/0005_test.yml.tt2
@ -62,10 +62,8 @@ flow:
  - end|ROUTE_SET_RUSER:
  - start|ROUTE_PREPARE_SST:
  - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
  - start|ROUTE_PREPARE_MOH:
  - end|ROUTE_PREPARE_MOH:
-[% END -%]
  - start|ROUTE_SET_CALLER_CLI:
  - start|ROUTE_PREPARE_CALLER_CLI:
  - end|ROUTE_PREPARE_CALLER_CLI: