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
changes/63/2063/3
Victor Seva 11 years ago
parent e1a76fb1f4
commit 8df70164ea

@ -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):

@ -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

@ -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;

@ -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;

@ -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 %]

@ -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 %]

@ -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@'

@ -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 %]
]

@ -1,24 +1,45 @@
flow:
- 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:
[% IF PRO %]
- 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:
- '^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 %]

@ -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 %]

@ -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@'

@ -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 %]

@ -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 %]
Loading…
Cancel
Save