MT#6565 CE/PRO differences due to sems version

- fix tap-test
- fix bin/generate_test.sh: define CE too
- scenarios:
  * invite_callforward
  * invite_voicebox

Change-Id: I8ebad6ea580003e8e072204ad48bc4533eba0fe9

bin/check.py

@@ -124,7 +124,8 @@ class Test:
     @classmethod
     def compare(cls, val0, val1):
         logging.debug("val0:[%s]:'%s' val1:[%s]:'%s'" %
-            (type(val0), unicode(val0), type(val1), unicode(val1)))
+                      (type(val0), unicode(val0), type(val1),
+                       unicode(val1)))
         if isinstance(val0, basestring):
             result = re.search(val0, str(val1))
         elif isinstance(val0, int):

bin/generate_tests.sh

@@ -60,7 +60,7 @@ if [[ $# -ne 1 ]]; then
 fi
 
 if [ "${PROFILE}" == "CE" ]; then
-  TPAGE_ARGS=""
+  TPAGE_ARGS="--define CE=true"
 elif [ "${PROFILE}" == "PRO" ]; then
   TPAGE_ARGS="--define PRO=true"
 else

bin/graph_flow.pl

@@ -25,6 +25,7 @@ use Cwd 'abs_path';
 use Data::Dumper;
 use GraphViz;
 use Getopt::Long;
+use English;
 
 sub usage
 {
@@ -54,7 +55,7 @@ if($json_in) {
   use JSON;
   my $json;
   {
-    local $/; #Enable 'slurp' mode
+    local $INPUT_RECORD_SEPARATOR = undef; #Enable 'slurp' mode
     open my $fh, "<", $filename;
     $json = <$fh>;
     close $fh;

bin/show_flow.pl

@@ -24,6 +24,7 @@ use warnings;
 use Cwd 'abs_path';
 use Data::Dumper;
 use Getopt::Long;
+use English;
 
 sub usage
 {
@@ -52,7 +53,7 @@ if($json_in) {
   use JSON;
   my $json;
   {
-    local $/; #Enable 'slurp' mode
+    local $INPUT_RECORD_SEPARATOR = undef; #Enable 'slurp' mode
     open my $fh, "<", $filename;
     $json = <$fh>;
     close $fh;

scenarios/invite_callforward/0020_test.yml.tt2

@@ -1,4 +1,8 @@
 flow:
+[% IF PRO %]
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
+[% ELSE %]
   - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
   - return|ROUTE_NET_INFO:
@@ -11,14 +15,31 @@ flow:
   - return|ROUTE_STOP_RTPPROXY:
   - start|ROUTE_OUTBOUND:
   - exit|ROUTE_OUTBOUND:
+[% END %]
 sip_in:
+[% IF PRO %]
+  - '^SIP/2.0 200 OK'
+  - 'CSeq: 3 BYE'
+  - 'Content-Length: 0'
+  - 'From: <sip:testuser1002@'
+  - 'To: <sip:testuser1001@'
+[% ELSE %]
   - '^BYE sip:127.0.0.1:5080;transport=udp SIP/2.0'
   - 'CSeq: 11 BYE'
   - 'Content-Length: 0'
   - 'From: <sip:testuser1002@'
   - 'To: <sip:testuser1001@'
-
+[% END %]
 sip_out:
+[% IF PRO %]
+  - [
+      '^SIP/2.0 200 OK',
+      'CSeq: 3 BYE',
+      'Content-Length: 0',
+      'From: <sip:testuser1002@',
+      'To: <sip:testuser1001@'
+    ]
+[% ELSE %]
   - [
       '^SIP/2.0 100 Trying',
       'CSeq: 11 BYE',
@@ -34,3 +55,4 @@ sip_out:
       'From: <sip:4311002@',
       'To: <sip:testuser1001@'
     ]
+[% END %]

scenarios/invite_callforward/0021_test.yml.tt2

@@ -1,13 +1,37 @@
 flow:
+[% IF CE %]
   - start|REPLY_ROUTE_NAT:
   - exit|REPLY_ROUTE_NAT:
+[% ELSE %]
+  - start|DEFAULT_ROUTE:
+  - start|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
+  - start|ROUTE_PRX_REQUEST:
+  - start|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
+  - start|ROUTE_STOP_RTPPROXY:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_STOP_RTPPROXY:
+  - start|ROUTE_OUTBOUND:
+  - exit|ROUTE_OUTBOUND:
+[% END %]
 sip_in:
+[% IF CE %]
   - '^SIP/2.0 200 OK'
   - 'CSeq: 11 BYE'
   - 'Content-Length: 0'
   - 'From: <sip:4311002@'
   - 'To: <sip:testuser1001@'
+[% ELSE %]
+  - '^BYE sip:(testuser1003@)?127.0.0.1:5080(;transport=udp)? SIP/2.0'
+  - 'CSeq: 11 BYE'
+  - 'Content-Length: 0'
+  - 'From: <sip:testuser1002@'
+  - 'To: <sip:testuser1001@'
+[% END %]
 sip_out:
+[% IF CE %]
   - [
       '^SIP/2.0 200 OK',
       'CSeq: 11 BYE',
@@ -15,3 +39,20 @@ sip_out:
       'From: <sip:testuser1002@',
       'To: <sip:testuser1001@'
     ]
+[% ELSE %]
+  - [
+      '^SIP/2.0 100 Trying',
+      'CSeq: 11 BYE',
+      'Content-Length: 0',
+      'From: <sip:testuser1002@',
+      'To: <sip:testuser1001@'
+    ]
+  - [
+      '^BYE sip:(testuser1003@)?127.0.0.1:5080(;transport=udp)? SIP/2.0',
+      'CSeq: 11 BYE',
+      'Max-Forwards: 70',
+      'Content-Length: 0',
+      'From: <sip:4311002@',
+      'To: <sip:testuser1001@'
+    ]
+[% END %]

scenarios/invite_callforward/0022_test.yml.tt2

@@ -3,14 +3,22 @@ flow:
   - exit|REPLY_ROUTE_NAT:
 sip_in:
   - '^SIP/2.0 200 OK'
-  - 'CSeq: 3 BYE'
   - 'Content-Length: 0'
+[% IF PRO %]
+  - 'From: <sip:4311002@'
+[% ELSE %]
+  - 'CSeq: 3 BYE'
   - 'From: <sip:testuser1002@'
+[% END %]
   - 'To: <sip:testuser1001@'
 sip_out:
   - [
       '^SIP/2.0 200 OK',
+[% IF PRO %]
+      'CSeq: 11 BYE',
+[% ELSE %]
       'CSeq: 3 BYE',
+[% END %]
       'Content-Length: 0',
       'From: <sip:testuser1002@',
       'To: <sip:testuser1001@'

scenarios/invite_callforward/0029_test.yml.tt2

@@ -88,7 +88,7 @@ flow:
   - exit|ROUTE_OUTBOUND:
 sip_in:
   - '^INVITE sip:4311005@'
-  - 'Contact: <sip:127.0.0.1:5080;transport=udp>'
+  - 'Contact: <sip:(testuser1003@)?127.0.0.1:5080(;transport=udp)?>'
   - 'CSeq: 10 INVITE'
   - 'Content-Type: application/sdp'
 sip_out:
@@ -109,5 +109,9 @@ sip_out:
       'P-App-Name: sbc',
       'P-NGCP-Caller-Info: <sip:testuser1004@',
       'P-NGCP-Callee-Info: <sip:testuser1005@',
+[% IF PRO %]
+      'Max-Forwards: 70'
+[% ELSE %]
       'Max-Forwards: 69'
+[% END %]
     ]

scenarios/invite_callforward/0038_test.yml.tt2

@@ -1,24 +1,45 @@
 flow:
-- start|DEFAULT_ROUTE:
+[% IF PRO %]
-- start|ROUTE_NET_INFO:
+  - start|REPLY_ROUTE_NAT:
-- return|ROUTE_NET_INFO:
+  - exit|REPLY_ROUTE_NAT:
-- start|ROUTE_PRX_REQUEST:
+[% ELSE %]
-- start|ROUTE_INITVARS:
+  - start|DEFAULT_ROUTE:
-- return|ROUTE_INITVARS:
+  - start|ROUTE_NET_INFO:
-- start|ROUTE_STOP_RTPPROXY:
+  - return|ROUTE_NET_INFO:
-- start|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_PRX_REQUEST:
-- return|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_INITVARS:
-- return|ROUTE_STOP_RTPPROXY:
+  - return|ROUTE_INITVARS:
-- start|ROUTE_OUTBOUND:
+  - start|ROUTE_STOP_RTPPROXY:
-- exit|ROUTE_OUTBOUND:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_STOP_RTPPROXY:
+  - start|ROUTE_OUTBOUND:
+  - exit|ROUTE_OUTBOUND:
+[% END %]
 sip_in:
-  - '^BYE sip:127.0.0.1:5080;transport=udp SIP/2.0'
+[% IF PRO %]
+  - '^SIP/2.0 200 OK'
+  - 'CSeq: 3 BYE'
+  - 'Content-Length: 0'
+  - 'From: <sip:testuser1002@'
+  - 'To: <sip:testuser1004@'
+[% ELSE %]
+  - '^BYE sip:(testuser1002@)?127.0.0.1:5080(;transport=udp)? SIP/2.0'
   - 'CSeq: 11 BYE'
   - 'Content-Length: 0'
   - 'From: <sip:testuser1002@'
   - 'To: <sip:testuser1004@'
-
+[% END %]
 sip_out:
+[% IF PRO %]
+  - [
+      '^SIP/2.0 200 OK',
+      'CSeq: 3 BYE',
+      'Content-Length: 0',
+      'From: <sip:testuser1002@',
+      'To: <sip:testuser1004@'
+    ]
+[% ELSE %]
   - [
       '^SIP/2.0 100 Trying',
       'CSeq: 11 BYE',
@@ -27,10 +48,11 @@ sip_out:
       'To: <sip:testuser1004@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080;transport=udp SIP/2.0',
+      '^BYE sip:(testuser1002@)?127.0.0.1:5080(;transport=udp)? SIP/2.0',
       'CSeq: 11 BYE',
       'Max-Forwards: 69',
       'Content-Length: 0',
       'From: <sip:4311002@',
       'To: <sip:testuser1004@'
     ]
+[% END %]

scenarios/invite_callforward/0039_test.yml.tt2

@@ -1,13 +1,37 @@
 flow:
+[% IF CE %]
   - start|REPLY_ROUTE_NAT:
   - exit|REPLY_ROUTE_NAT:
+[% ELSE %]
+  - start|DEFAULT_ROUTE:
+  - start|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
+  - start|ROUTE_PRX_REQUEST:
+  - start|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
+  - start|ROUTE_STOP_RTPPROXY:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_STOP_RTPPROXY:
+  - start|ROUTE_OUTBOUND:
+  - exit|ROUTE_OUTBOUND:
+[% END %]
 sip_in:
+[% IF CE %]
   - '^SIP/2.0 200 OK'
   - 'CSeq: 11 BYE'
   - 'Content-Length: 0'
   - 'From: <sip:4311002@'
   - 'To: <sip:testuser1004@'
+[% ELSE %]
+  - '^BYE sip:(testuser1005@)?127.0.0.1:5080(;transport=udp)? SIP/2.0'
+  - 'CSeq: 11 BYE'
+  - 'Content-Length: 0'
+  - 'From: <sip:testuser1002@'
+  - 'To: <sip:testuser1004@'
+[% END %]
 sip_out:
+[% IF CE %]
   - [
       '^SIP/2.0 200 OK',
       'CSeq: 11 BYE',
@@ -15,3 +39,20 @@ sip_out:
       'From: <sip:testuser1002@',
       'To: <sip:testuser1004@'
     ]
+[% ELSE %]
+  - [
+      '^SIP/2.0 100 Trying',
+      'CSeq: 11 BYE',
+      'Content-Length: 0',
+      'From: <sip:testuser1002@',
+      'To: <sip:testuser1004@'
+    ]
+  - [
+      '^BYE sip:(testuser1005@)?127.0.0.1:5080(;transport=udp)? SIP/2.0',
+      'CSeq: 11 BYE',
+      'Max-Forwards: 70',
+      'Content-Length: 0',
+      'From: <sip:4311002@',
+      'To: <sip:testuser1004@'
+    ]
+[% END %]

scenarios/invite_callforward/0040_test.yml.tt2

@@ -3,14 +3,23 @@ flow:
   - exit|REPLY_ROUTE_NAT:
 sip_in:
   - '^SIP/2.0 200 OK'
+[% IF PRO %]
+  - 'CSeq: 11 BYE'
+  - 'From: <sip:4311002@'
+[% ELSE %]
   - 'CSeq: 3 BYE'
-  - 'Content-Length: 0'
   - 'From: <sip:testuser1002@'
+[% END %]
+  - 'Content-Length: 0'
   - 'To: <sip:testuser1004@'
 sip_out:
   - [
       '^SIP/2.0 200 OK',
+[% IF PRO %]
+      'CSeq: 11 BYE',
+[% ELSE %]
       'CSeq: 3 BYE',
+[% END %]
       'Content-Length: 0',
       'From: <sip:testuser1002@',
       'To: <sip:testuser1004@'

scenarios/invite_voicebox/0012_test.yml.tt2

@@ -1,4 +1,8 @@
 flow:
+[% IF PRO %]
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
+[% ELSE %]
   - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
   - return|ROUTE_NET_INFO:
@@ -11,13 +15,31 @@ flow:
   - return|ROUTE_STOP_RTPPROXY:
   - start|ROUTE_OUTBOUND:
   - exit|ROUTE_OUTBOUND:
+[% END %]
 sip_in:
+[% IF PRO %]
+  - '^SIP/2.0 200 OK'
+  - 'CSeq: 3 BYE'
+  - 'From: <sip:testuser1002@'
+  - 'Content-Length: 0'
+  - 'To: <sip:testuser1001@'
+[% ELSE %]
   - '^BYE sip:vmu4311001@127.0.0.1:5070 SIP/2.0'
   - 'CSeq: 11 BYE'
   - 'Content-Length: 0'
   - 'From: <sip:testuser1002@'
   - 'To: <sip:testuser1001@'
+[% END %]
 sip_out:
+[% IF PRO %]
+  - [
+      '^SIP/2.0 200 OK',
+      'CSeq: 3 BYE',
+      'Content-Length: 0',
+      'From: <sip:testuser1002@',
+      'To: <sip:testuser1001@'
+    ]
+[% ELSE %]
   - [
       '^SIP/2.0 100 Trying',
       'CSeq: 11 BYE',
@@ -33,3 +55,4 @@ sip_out:
       'From: <sip:4311002@',
       'To: <sip:testuser1001@'
     ]
+[% END %]

scenarios/invite_voicebox/0013_test.yml.tt2

@@ -0,0 +1,58 @@
+flow:
+[% IF PRO %]
+  - start|DEFAULT_ROUTE:
+  - start|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
+  - start|ROUTE_PRX_REQUEST:
+  - start|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
+  - start|ROUTE_STOP_RTPPROXY:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_STOP_RTPPROXY:
+  - start|ROUTE_OUTBOUND:
+  - exit|ROUTE_OUTBOUND:
+[% ELSE %]
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
+[% END %]
+sip_in:
+[% IF PRO %]
+  - '^BYE sip:vmu4311001@127.0.0.1:5070 SIP/2.0'
+  - 'CSeq: 11 BYE'
+  - 'Content-Length: 0'
+  - 'From: <sip:testuser1002@'
+  - 'To: <sip:testuser1001@'
+[% ELSE %]
+  - '^SIP/2.0 200 OK'
+  - 'CSeq: 11 BYE'
+  - 'From: <sip:4311002@'
+  - 'Content-Length: 0'
+  - 'To: <sip:testuser1001@'
+[% END %]
+sip_out:
+[% IF PRO %]
+  - [
+      '^SIP/2.0 100 Trying',
+      'CSeq: 11 BYE',
+      'Content-Length: 0',
+      'From: <sip:testuser1002@',
+      'To: <sip:testuser1001@'
+    ]
+  - [
+      '^BYE sip:vmu4311001@127.0.0.1:5070 SIP/2.0',
+      'CSeq: 11 BYE',
+      'Max-Forwards: 70',
+      'Content-Length: 0',
+      'From: <sip:4311002@',
+      'To: <sip:testuser1001@'
+    ]
+[% ELSE %]
+  - [
+      '^SIP/2.0 200 OK',
+      'CSeq: 11 BYE',
+      'Content-Length: 0',
+      'From: <sip:testuser1002@',
+      'To: <sip:testuser1001@'
+    ]
+[% END %]