MT#6565 kamailio saving json using uuid for tests

- fix check.py comparation when int -> string
- disable tcpdump by default ( new option -K to enable it)
- fix graph_flow for json ( new option --json )

Change-Id: I25f49ef6303b4e2e28c34fefd7860c744e6c3250

bin/check.py

@@ -22,6 +22,9 @@ import io
 import sys
 import re
 import getopt
+import json
+import logging
+
 from yaml import load
 from pprint import pprint
 try:
@@ -120,8 +123,26 @@ class Test:
 
     @classmethod
     def compare(cls, val0, val1):
+        logging.debug("val0:[%s]:'%s' val1:[%s]:'%s'" %
+            (type(val0), unicode(val0), type(val1), unicode(val1)))
         if isinstance(val0, basestring):
             result = re.search(val0, str(val1))
+        elif isinstance(val0, int):
+            try:
+                result = (val0 == int(val1))
+            except:
+                result = false
+        elif isinstance(val0, list) and isinstance(val1, list):
+            size = len(val0)
+            if size != len(val1):
+                return False
+            result = True
+            for k in range(size):
+                try:
+                    result = result and cls.compare(val0[k], val1[k])
+                except Exception, e:
+                    logging.debug(e)
+                    return False
         else:
             result = (val0 == val1)
         return result
@@ -167,6 +188,7 @@ class Test:
 def check_flow_vars(sk, sv, cv, test):
     """ check the vars on a flow level"""
     for k in sv.iterkeys():
+        logging.debug("check k:'%s'" % k)
         if(k not in cv):
             try:
                 info = XAvp.parse(k)
@@ -176,7 +198,7 @@ def check_flow_vars(sk, sv, cv, test):
                                     (search_key, info))
                 xavp = XAvp(search_key, cv[search_key])
                 val = xavp.get(k)
-                # print "testing %s == %s" % (sv[k], val)
+                logging.debug("testing %s == %s" % (sv[k], val))
                 test.test(sv[k], val,
                           'flow[%s] expected %s == %s but is %s' %
                           (sk, k, sv[k], val),
@@ -193,6 +215,7 @@ def check_flow_vars(sk, sv, cv, test):
                     test.error(
                         'Expected var %s on flow[%s]. %s' % (k, sk, err))
         else:
+            logging.debug("sv[k]:'%s' cv[k]:'%s'" % (sv[k], cv[k]))
             test.test(sv[k], cv[k], 'flow[%s] expected %s == %s but is %s' % (
                 sk, k, sv[k], cv[k]), 'flow[%s] %s' % (sk, k))
 
@@ -224,6 +247,12 @@ def check_flow(scen, check, test):
 
 
 def check_sip(scen, msg, test):
+    if isinstance(msg, list):
+        if len(msg) != 1:
+            test.error('sip_in len != 1')
+            return
+        else:
+            msg = msg[0]
     for rule in scen:
         if rule.startswith('_:NOT:_'):
             flag = False
@@ -257,13 +286,34 @@ def check_sip_out(scen, msgs, test):
 
 
 def usage():
-    print 'Usage: check.py [-h] scenario.yml test.yml'
+    print 'Usage: check.py [-h] [-d] [-j] [-y] scenario_file test.yml'
     print '-h: this help'
+    print '-d: debug'
+
+
+def load_yaml(filepath):
+    output = None
+    with io.open(filepath, 'r') as file:
+        output = load(file, Loader=Loader)
+    file.close()
+    return output
+
+
+def load_json(filepath):
+    output = None
+    with io.open(filepath, 'r') as file:
+        output = json.load(file)
+    file.close()
+    return output
 
 
 def main():
+    # default -y
+    load_check = load_yaml
+
     try:
-        opts, args = getopt.getopt(sys.argv[1:], "h", ["help"])
+        opts, args = getopt.getopt(
+            sys.argv[1:], "hyjd", ["help", "yaml", "json", "debug"])
     except getopt.GetoptError as err:
         # print help information and exit:
         print str(err)  # will print something like "option -a not recognized"
@@ -273,6 +323,12 @@ def main():
         if o in ("-h", "--help"):
             usage()
             sys.exit()
+        elif o in ("-y", "--yaml"):
+            load_check = load_yaml
+        elif o in ("-j", "--json"):
+            load_check = load_json
+        elif o in ("-d", "--debug"):
+            logging.basicConfig(level=logging.DEBUG)
         else:
             assert False, "unhandled option"
 
@@ -280,16 +336,12 @@ def main():
         usage()
         sys.exit(1)
 
-    with io.open(args[0], 'r') as file:
-        scen = load(file, Loader=Loader)
-    file.close()
+    scen = load_yaml(args[0])
 
     test = Test()
 
     try:
-        with io.open(args[1], 'r') as file:
-            check = load(file, Loader=Loader)
-        file.close()
+        check = load_check(args[1])
     except:
         check = {'flow': [], 'sip_in': '', 'sip_out': []}
         test.error("Error loading file:%s" % args[1])

bin/check.sh

@@ -26,9 +26,14 @@
 # $2 destination png filename
 function graph
 {
+  local OPTS
+  if [ -n ${JSON_KAM} ]; then
+    OPTS="--json"
+  fi
   if [ -f $1 ]; then
-    ${BIN_DIR}/graph_flow.pl $1 $2
+    ${BIN_DIR}/graph_flow.pl $OPTS $1 $2
   else
+    echo "No $1 found"
     ERR_FLAG=1
   fi
 }
@@ -51,6 +56,8 @@ echo "$(date) - $(basename $2) NOT ok"
 function check_test
 {
   local dest=${RESULT_DIR}/$(basename $3 .tap)
+  local kam_type="--yaml"
+
   if [ ! -f $1 ]; then
     generate_error_tap $3 $1
     ERR_FLAG=1
@@ -62,8 +69,12 @@ function check_test
     return
   fi
 
+  if [ -n ${JSON_KAM} ]; then
+    kam_type="--json"
+  fi
+
   echo -n "$(date) - Testing $(basename $1) againts $(basename $2) -> $(basename $3)"
-  ${BIN_DIR}/check.py $1 $2 > $3
+  ${BIN_DIR}/check.py ${kam_type} $1 $2 > $3
   if [[ $? -ne "0" ]]; then
     echo " NOT ok"
     ERR_FLAG=1
@@ -264,8 +275,10 @@ function copy_logs
 {
   # copy the kamailio log
   cp ${KAM_LOG} ${LOG_DIR}/kamailio.log
-  # copy the sems log
-  cp ${SEMS_LOG} ${LOG_DIR}/sems.log
+  if [ -f ${SEMS_LOG} ] ; then
+    # copy the sems log
+    cp ${SEMS_LOG} ${LOG_DIR}/sems.log
+  fi
   # copy the kamailio-lb log
   cp ${KAMLB_LOG} ${LOG_DIR}/kamailio-lb.log
 }
@@ -289,6 +302,7 @@ function run_sipp
     error_helper "LOG_DIR empty" 1
   fi
   rm -rf ${LOG_DIR}
+  echo "$(date) - create ${LOG_DIR}"
   mkdir -p ${LOG_DIR}
 
   delete_locations
@@ -298,7 +312,9 @@ function run_sipp
     copy_logs
     error_helper "Restart error" 16
   fi
-  capture
+  if [ "${CAPTURE}" = "1" ] ; then
+    capture
+  fi
 
   if [ -e ${SCEN_CHECK_DIR}/presence.sh ]; then
     echo "$(date) - Presence xcap"
@@ -353,7 +369,6 @@ function run_sipp
       echo "$(date) - $base error"
       status=1
     fi
-    sleep 1
   done
 
   for res in ${responder_pid}; do
@@ -373,7 +388,9 @@ function run_sipp
     fi
   done
 
-  stop_capture
+  if [ "${CAPTURE}" = "1" ] ; then
+    stop_capture
+  fi
   copy_logs
   # if any scenario has a log... error
   if [ $(ls ${SCEN_CHECK_DIR}/sipp_scenario*errors.log 2>/dev/null|wc -l) -ne 0 ]; then
@@ -388,9 +405,21 @@ function run_sipp
   fi
 }
 
+function test_filepath
+{
+  local msg_name
+
+  if [ -z ${JSON_KAM} ]; then
+    msg_name=$(echo $1|sed 's/_test\.yml/\.yml/')
+  else
+    msg_name=$(echo $1|sed 's/_test\.yml/\.json/')
+  fi
+  msg=${LOG_DIR}/$(basename $msg_name)
+}
+
 function usage
 {
-  echo "Usage: check.sh [-hCDRTG] [-d DOMAIN ] [-p PROFILE ] check_name"
+  echo "Usage: check.sh [-hCDRTGgJ] [-d DOMAIN ] [-p PROFILE ] check_name"
   echo "Options:"
   echo -e "\t-C: skip creation of domain and subscribers"
   echo -e "\t-R: skip run sipp"
@@ -401,11 +430,13 @@ function usage
   echo -e "\t-g: creation of graphviz image only if test fails"
   echo -e "\t-d: DOMAIN"
   echo -e "\t-p CE|PRO default is CE"
+  echo -e "\t-J kamailio json output ON. PARSE skipped"
+  echo -e "\t-K enable tcpdump capture"
   echo "Arguments:"
   echo -e "\tcheck_name. Scenario name to check. This is the name of the directory on scenarios dir."
 }
 
-while getopts 'hCd:p:RDTPGg' opt; do
+while getopts 'hCd:p:RDTPGgJK' opt; do
   case $opt in
     h) usage; exit 0;;
     C) SKIP=1;;
@@ -415,8 +446,10 @@ while getopts 'hCd:p:RDTPGg' opt; do
     D) SKIP_DELDOMAIN=1;;
     T) SKIP_TESTS=1;;
     P) SKIP_PARSE=1;;
+    K) CAPTURE=1;;
     G) GRAPH=1;;
     g) GRAPH_FAIL=1;;
+    J) JSON_KAM=1;;
   esac
 done
 shift $(($OPTIND - 1))
@@ -428,6 +461,7 @@ if [[ $# != 1 ]]; then
 fi
 
 NAME_CHECK="$1"
+KAM_DIR="${KAM_DIR:-/var/run/kamailio/cfgtest}"
 BASE_DIR="${BASE_DIR:-/usr/share/kamailio-config-tests}"
 BIN_DIR="${BASE_DIR}/bin"
 LOG_DIR="${BASE_DIR}/log/${NAME_CHECK}"
@@ -457,6 +491,13 @@ if [ ! -f ${SCEN_CHECK_DIR}/scenario.yml ]; then
   exit 14
 fi
 
+if [ -n ${JSON_KAM} ] ; then
+  echo "$(date) - dir and perms for ${KAM_DIR}"
+  rm -rf "${KAM_DIR}/${NAME_CHECK}"
+  mkdir -p ${KAM_DIR}
+  chown -R kamailio:kamailio ${KAM_DIR}
+fi
+
 if [ -z $SKIP ]; then
   echo "$(date) - Deleting all info for ${DOMAIN} domain"
   delete_voip ${DOMAIN} # just to be sure nothing is there
@@ -493,24 +534,45 @@ if [ -z ${SKIP_DELDOMAIN} ]; then
 fi
 
 if [ -z ${SKIP_PARSE} ]; then
-  echo "$(date) - Parsing ${LOG_DIR}/kamailio.log"
-  ${BIN_DIR}/ulog_parser.pl ${LOG_DIR}/kamailio.log ${LOG_DIR}
-  echo "$(date) - Done"
+  if [ -z ${JSON_KAM} ]; then
+    echo "$(date) - Parsing ${LOG_DIR}/kamailio.log"
+    ${BIN_DIR}/ulog_parser.pl ${LOG_DIR}/kamailio.log ${LOG_DIR}
+    echo "$(date) - Done"
+  fi
+fi
+
+if [ -z $SKIP_RUNSIPP ] && [ -n ${JSON_KAM} ] ; then
+  echo "$(date) - get kamailio cfgt files"
+  if [ -d "${KAM_DIR}/${NAME_CHECK}" ] ; then
+    for i in "${KAM_DIR}/${NAME_CHECK}"/*.json ; do
+      expand -t1 $i > ${LOG_DIR}/$(printf '%04d.json' $(basename $i .json))
+    done
+  else
+    echo "no cfgt files found"
+  fi
 fi
 
 # let's check the results
 ERR_FLAG=0
 if [ -z ${SKIP_TESTS} ]; then
+  if [ -d ${RESULT_DIR} ]; then
+    echo "$(date) - Cleaning result dir"
+    rm -rf ${RESULT_DIR}
+  fi
   mkdir -p ${RESULT_DIR}
   echo "$(date) - Cleaning tests files"
   find ${SCEN_CHECK_DIR} -type f -name '*test.yml' -exec rm {} \;
   echo "$(date) - Generating tests files"
   ${BIN_DIR}/generate_tests.sh -d ${SCEN_CHECK_DIR} ${PROFILE}
   echo "$(date) - Done"
+
+  if [ -n ${JSON_KAM} ]; then
+    file_type=".json"
+  fi
+
   for t in ${SCEN_CHECK_DIR}/*_test.yml; do
-    echo "$(date) - check test $t"
-    msg_name=$(echo $t|sed 's/_test\.yml/\.yml/')
-    msg=${LOG_DIR}/$(basename $msg_name)
+    test_filepath $t
+    echo "$(date) - check test $t on $msg"
     dest=${RESULT_DIR}/$(basename $t .yml)
     check_test $t $msg ${dest}.tap
     echo "$(date) - Done"

bin/config_debug.pl

@@ -90,8 +90,10 @@ else
 {
   copy($file, $file.".orig") or die "Copy failed: $ERRNO" unless(-e $file.".orig");
   $yaml = YAML::Tiny->read($file) or die "File $file could not be read";
+  $yaml->[0]->{kamailio}{lb}{children} = 1;
   $yaml->[0]->{kamailio}{lb}{debug} = 'yes';
   $yaml->[0]->{kamailio}{lb}{use_dns_cache} = 'off';
+  $yaml->[0]->{kamailio}{proxy}{children} = 1;
   $yaml->[0]->{kamailio}{proxy}{debug} = 'yes';
   $yaml->[0]->{kamailio}{proxy}{presence}{enable} = 'yes';
   $yaml->[0]->{kamailio}{proxy}{fritzbox_prefixes} = [ '112', '110', '118[0-9]{2}' ];

bin/graph_flow.pl

@@ -21,7 +21,6 @@
 use 5.014;
 use strict;
 use warnings;
-use YAML;
 use Cwd 'abs_path';
 use Data::Dumper;
 use GraphViz;
@@ -29,14 +28,16 @@ use Getopt::Long;
 
 sub usage
 {
-  my $output = "usage: graph_flow.pl [-h] file_in.yml file_out.png\n";
+  my $output = "usage: graph_flow.pl [-h] [-j] file_in file_out.png\n";
   $output .= "Options:\n";
   $output .= "\t-h: this help\n";
-  return $output
+  $output .= "\t-j: file_in is json\n";
+  return $output;
 }
 
 my $help = 0;
-GetOptions ("h|help" => \$help)
+my $json_in = 0;
+GetOptions ("h|help" => \$help, "j|json" => \$json_in)
   or die("Error in command line arguments\n".usage());
 
 if($#ARGV!=1)
@@ -47,8 +48,23 @@ if($#ARGV!=1)
 my $g = GraphViz->new();
 my $filename = abs_path($ARGV[0]);
 my $outfilename = $ARGV[1];
-my $ylog = YAML::LoadFile($filename);
-
+my $inlog;
+if($json_in) {
+  use utf8;
+  use JSON;
+  my $json;
+  {
+    local $/; #Enable 'slurp' mode
+    open my $fh, "<", $filename;
+    $json = <$fh>;
+    close $fh;
+  }
+  $inlog = decode_json($json);
+}
+else {
+  use YAML;
+  $inlog = YAML::LoadFile($filename);
+}
 my @prevs = ();
 my $name = '';
 my $action = '';
@@ -56,12 +72,12 @@ my $prev;
 my $cont = 1;
 $g->add_node(name => 'END', shape =>'box');
 
-foreach my $i (@{$ylog->{'flow'}})
+foreach my $i (@{$inlog->{'flow'}})
 {
   foreach my $key (keys %{$i})
   {
     #print "$key\n";
-    if(($action, $name) = ($key =~ m/(exit|start|end)\|(\w+)/))
+    if(($action, $name) = ($key =~ m/(start|exit|drop|return)\|(\w+)/))
     {
       if ($action eq "start")
       {
@@ -82,7 +98,7 @@ foreach my $i (@{$ylog->{'flow'}})
       {
         pop(@prevs); # this is me.
         $prev = $prevs[-1];
-        if ($action eq "end") { $g->add_edge($name => $prev, label => $cont++); }
+        if ($action eq "return") { $g->add_edge($name => $prev, label => $cont++); }
         else { @prevs = ();  $g->add_edge($name => 'END', label => $cont++); }
       }
     }

bin/restart_log.sh

@@ -18,7 +18,7 @@
 # On Debian systems, the complete text of the GNU General
 # Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
 #
-ngcp-sercmd proxy dbg.reset_msgid
+#ngcp-sercmd proxy dbg.reset_msgid
 rm -rf /var/log/ngcp/kamailio-proxy.log
 rm -rf /var/log/ngcp/sems.log
 rm -rf /var/log/ngcp/kamailio-lb.log

bin/scenario.pl

@@ -110,6 +110,7 @@ sub generate
     my $io_scenario = new IO::File(File::Spec->catfile($base_check_dir, "scenario.csv"), "w")
         or die("Cannot create file scenario.csv");
     my $seq = ["SEQUENTIAL"];
+    my $test_uuid = $data->{test_uuid};
 
     $csv->{caller}->print($io_caller, $seq);
     $csv->{callee}->print($io_callee, $seq);
@@ -126,7 +127,7 @@ sub generate
             $_->{password} = "wrongpass";
         }
         my $auth   = "[authentication username=$_->{username} password=$_->{password}]";
-        my $csv_data = [$_->{username}, $auth, $_->{domain}];
+        my $csv_data = [$_->{username}, $auth, $_->{domain}, $test_uuid];
         $csv->{caller}->print($io_caller, $csv_data);
         $csv_data = ["sipp_scenario".sprintf("%02i", $id).".xml", $_->{proto}, $_->{ip}];
         $csv->{scenario}->print($io_scenario, $csv_data);
@@ -146,13 +147,13 @@ sub generate
             # by default proto is udp
             $_->{proto} = "udp" unless defined($_->{proto});
             $auth   = "[authentication username=$_->{username} password=$_->{password}]";
-            $csv_data = [$_->{username}, $_->{number}, $auth, $_->{domain}];
+            $csv_data = [$_->{username}, $_->{number}, $auth, $_->{domain}, $test_uuid];
             $csv->{callee}->print($io_callee, $csv_data);
             $csv_data = ["sipp_scenario_responder".sprintf("%02i", $res_id).".xml", $_->{proto}, $_->{ip}, $_->{peer_host}, $_->{foreign}];
             $csv->{scenario}->print($io_scenario, $csv_data);
             if($_->{register} eq "yes" && $_->{active} eq "yes")
             {
-                generate_reg($res_id)
+                generate_reg($res_id, $test_uuid);
             }
             if($_->{foreign} eq "yes")
             {
@@ -167,8 +168,8 @@ sub generate
 
 sub generate_reg
 {
-    my ($num) = @_;
-    my $vars = { line => $num };
+    my ($num, $test_uuid) = @_;
+    my $vars = { line => $num, test_uuid => $test_uuid };
     my $fn = File::Spec->catfile($base_check_dir, "sipp_scenario_responder".(sprintf "%02i", $num)."_reg.xml");
     $tt->process($template_reg, $vars, $fn) or die($tt->error(), "\n");
     return;

bin/show_flow.pl

@@ -21,23 +21,24 @@
 use 5.014;
 use strict;
 use warnings;
-use YAML;
 use Cwd 'abs_path';
 use Data::Dumper;
 use Getopt::Long;
 
 sub usage
 {
-  my $output = "usage: show_flow.pl [-h] file.yml\n";
+  my $output = "usage: show_flow.pl [-h] file\n";
   $output .= "\tOptions:\n";
   $output .= "-h --help: this help\n";
   $output .= "-y --yml: yaml output\n";
+  $output .= "-j --json: json input\n";
   return $output
 }
 
 my $yml = '';
 my $help = 0;
-GetOptions ("y|yml+" => \$yml, "h|help" => \$help)
+my $json_in = 0;
+GetOptions ("y|yml+" => \$yml, "h|help" => \$help, "j|json" => \$json_in)
   or die("Error in command line arguments\n".usage());
 
 if($#ARGV!=0 || $help)
@@ -45,9 +46,25 @@ if($#ARGV!=0 || $help)
   die(usage())
 }
 my $filename = abs_path($ARGV[0]);
-my $ylog = YAML::LoadFile($filename);
+my $inlog;
+if($json_in) {
+  use utf8;
+  use JSON;
+  my $json;
+  {
+    local $/; #Enable 'slurp' mode
+    open my $fh, "<", $filename;
+    $json = <$fh>;
+    close $fh;
+  }
+  $inlog = decode_json($json);
+}
+else {
+  use YAML;
+  $inlog = YAML::LoadFile($filename);
+}
 
-foreach my $i (@{$ylog->{'flow'}})
+foreach my $i (@{$inlog->{'flow'}})
 {
   foreach my $key (keys %{$i})
   {

get_results.sh

@@ -64,13 +64,10 @@ if [ "${PROFILE}" != "CE" ] && [ "${PROFILE}" != "PRO" ]; then
   exit 2
 fi
 
-echo "$(date) - Clean result dir"
-rm -rf ${RESULT_DIR}
-
 get_scenarios
 
 echo ${SCENARIOS} |  tr ' ' '\n' \
- | parallel "${BIN_DIR}/check.sh ${GRAPH} -C -R ${OPTS} -d ${DOMAIN} -p ${PROFILE}"
+ | parallel "${BIN_DIR}/check.sh ${GRAPH} -J -C -R ${OPTS} -d ${DOMAIN} -p ${PROFILE}"
 status=$?
 echo "$(date) - All done[$status]"
 exit $status

run_tests.sh

@@ -14,6 +14,7 @@ function usage
   echo "Usage: run_test.sh [-p PROFILE] [-c] [-t]"
   echo "-p CE|PRO default is CE"
   echo "-c skips configuration of the environment"
+  echo "-K capture messages with tcpdump"
   echo "-h this help"
 
   echo "BASE_DIR:${BASE_DIR}"
@@ -57,12 +58,13 @@ function cfg_debug_off
   fi
 }
 
-while getopts 'hlcp:' opt; do
+while getopts 'hlcp:K' opt; do
   case $opt in
     h) usage; exit 0;;
     l) get_scenarios; echo "${SCENARIOS}"; exit 0;;
     c) SKIP=1;;
     p) PROFILE=$OPTARG;;
+    K) SKIP_CAPTURE=1;;
   esac
 done
 shift $(($OPTIND - 1))
@@ -79,8 +81,8 @@ if [ "${PROFILE}" != "CE" ] && [ "${PROFILE}" != "PRO" ]; then
   exit 2
 fi
 
-echo "$(date) - Clean log dir"
-rm -rf ${LOG_DIR}
+echo "$(date) - Clean mem log dir"
+rm -rf ${MLOG_DIR}
 mkdir -p ${MLOG_DIR} ${LOG_DIR}
 
 if [ -z $SKIP ]; then
@@ -116,10 +118,20 @@ ${BIN_DIR}/mem_stats.py --private_file=${MLOG_DIR}/${VERSION}initial_pvm.cvs \
 
 get_scenarios
 
+if [[ ${SKIP_CAPTURE} = 1 ]] ; then
+  echo "$(date) enable capture"
+  OPTS+="-K"
+fi
+
 for t in ${SCENARIOS}; do
   echo "$(date) - Run[${PROFILE}]: $t ================================================="
-  ${BIN_DIR}/check.sh -P -T -d ${DOMAIN} -p ${PROFILE} $t
+  if [ -d "${LOG_DIR}/${t}" ]; then
+    echo "$(date) - Clean log dir"
+    rm -rf "${LOG_DIR}/${t}"
+  fi
+  ${BIN_DIR}/check.sh ${OPTS} -P -T -d ${DOMAIN} -p ${PROFILE} $t
   if [ $? -ne 0 ]; then
+    echo "ERROR: $t"
     error_flag=1
   fi
   echo "$(date) - ================================================================================="

scenarios/auth_fail/0001_test.yml.tt2

@@ -1,12 +1,11 @@
-# REGISTER scenario
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
       $fU: testuser1003
       $tU: testuser1003
   - start|ROUTE_NET_INFO:
       $fU: testuser1003
       $tU: testuser1003
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_REG_REQUEST:
   - start|ROUTE_REG_HANDLE:
   - start|ROUTE_AUTH:

scenarios/auth_fail/0002_test.yml.tt2

@@ -1,8 +1,7 @@
-# REGISTER scenario
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_REG_REQUEST:
   - start|ROUTE_REG_HANDLE:
   - start|ROUTE_AUTH:

scenarios/auth_fail/0003_test.yml.tt2

@@ -1,8 +1,7 @@
-# REGISTER scenario
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_REG_REQUEST:
   - start|ROUTE_REG_HANDLE:
   - start|ROUTE_AUTH:

scenarios/auth_fail/0004_test.yml.tt2

@@ -1,8 +1,7 @@
-# REGISTER scenario
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_REG_REQUEST:
   - start|ROUTE_REG_HANDLE:
   - start|ROUTE_AUTH:

scenarios/auth_fail/scenario.yml

@@ -1,3 +1,4 @@
+test_uuid: auth_fail
 subscribers:
   spce.test:
     testuser1003:

scenarios/auth_fail/sipp_scenario00.xml

@@ -10,7 +10,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: [cseq] REGISTER
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Expires: 600
@@ -30,7 +30,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: [cseq] REGISTER
       [field1 file="caller.csv"]
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
@@ -51,7 +51,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: [cseq] REGISTER
       [field1 file="caller.csv"]
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
@@ -72,7 +72,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: [cseq] REGISTER
       [field1 file="caller.csv"]
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
@@ -93,7 +93,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: [cseq] REGISTER
       [field1 file="caller.csv"]
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]

scenarios/incoming_foreign_dom/0003_test.yml.tt2

@@ -1,96 +1,92 @@
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
-  - end|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
       $xavp(callee_dom_prefs[0]=>unauth_inbound_calls[*]): [1]
-  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
   - start|ROUTE_ADD_CALLINFO_REPLY:
-  - end|ROUTE_ADD_CALLINFO_REPLY:
-  - end|ROUTE_AUTH:
-  - end|ROUTE_FIND_CALLER:
+  - return|ROUTE_ADD_CALLINFO_REPLY:
+  - return|ROUTE_AUTH:
+  - return|ROUTE_FIND_CALLER:
   - start|ROUTE_LOAD_CALLER_PREF:
   - start|ROUTE_CLEAR_CALLER_PREF:
-  - end|ROUTE_CLEAR_CALLER_PREF:
-  - end|ROUTE_LOAD_CALLER_PREF:
+  - return|ROUTE_CLEAR_CALLER_PREF:
+  - return|ROUTE_LOAD_CALLER_PREF:
   - start|ROUTE_GET_CALLER_CLI:
-  - end|ROUTE_GET_CALLER_CLI:
+  - return|ROUTE_GET_CALLER_CLI:
   - start|ROUTE_GET_FORWARDER_CLI:
-  - end|ROUTE_GET_FORWARDER_CLI:
+  - return|ROUTE_GET_FORWARDER_CLI:
   - start|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_CHECK_CLI_ALLOWED:
-  - end|ROUTE_CHECK_CLI_ALLOWED:
-  - end|ROUTE_CHECK_USERPROV_CLI:
+  - return|ROUTE_CHECK_CLI_ALLOWED:
+  - return|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_FIND_CALLEE:
   - start|ROUTE_CLIR:
-  - end|ROUTE_CLIR:
+  - return|ROUTE_CLIR:
   - start|ROUTE_CLEAR_CALLEE_PREF:
-  - end|ROUTE_CLEAR_CALLEE_PREF:
+  - return|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_BLOCK_OUT:
-  - end|ROUTE_BLOCK_OUT:
+  - return|ROUTE_BLOCK_OUT:
   - start|ROUTE_LOAD_CALLEE_PREF:
   - start|ROUTE_BLOCK_IN:
-  - end|ROUTE_BLOCK_IN:
-  - end|ROUTE_LOAD_CALLEE_PREF:
+  - return|ROUTE_BLOCK_IN:
+  - return|ROUTE_LOAD_CALLEE_PREF:
   - start|ROUTE_CHECK_PBX:
   - return|ROUTE_CHECK_PBX:
   - start|ROUTE_INVITE_TO_INT:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_SET_CALLER_DIALOG:
-  - end|ROUTE_SET_CALLER_DIALOG:
+  - return|ROUTE_SET_CALLER_DIALOG:
   - start|ROUTE_ACC_CALLER:
-  - end|ROUTE_ACC_CALLER:
+  - return|ROUTE_ACC_CALLER:
   - start|ROUTE_ACC_CALLEE:
-  - end|ROUTE_ACC_CALLEE:
+  - return|ROUTE_ACC_CALLEE:
   - start|BRANCH_ROUTE_SBC:
   - start|ROUTE_BRANCH_ACC_RTP:
-  - end|ROUTE_BRANCH_ACC_RTP:
+  - return|ROUTE_BRANCH_ACC_RTP:
   - start|ROUTE_SET_RUSER:
-  - end|ROUTE_SET_RUSER:
+  - return|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
-  - end|ROUTE_PREPARE_SST:
+  - return|ROUTE_PREPARE_SST:
   - start|ROUTE_PREPARE_MOH:
-  - end|ROUTE_PREPARE_MOH:
+  - return|ROUTE_PREPARE_MOH:
   - start|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_SET_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_SET_CALLEE:
-  - end|ROUTE_SET_CALLEE:
+  - return|ROUTE_SET_CALLEE:
   - start|ROUTE_ADD_CALLINFO:
-  - end|ROUTE_ADD_CALLINFO:
-  - end|BRANCH_ROUTE_SBC:
+  - return|ROUTE_ADD_CALLINFO:
+  - return|BRANCH_ROUTE_SBC:
+  # branch ?
+  - return|BRANCH_ROUTE_SBC:
   - exit|ROUTE_OUTBOUND:
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
 sip_in:
   - '^INVITE sip:4311003@'
   - 'From: <sip:external@external.test>'
@@ -128,17 +124,3 @@ sip_out:
       'P-Called-Party-ID: <sip:testuser1003@',
       'P-App-Name: sbc'
     ]
-  - [
-      '^SIP/2.0 180 Ringing',
-      'CSeq: 1 INVITE',
-      'From: <sip:external@external.test>',
-      'To: <sip:4311003@',
-      'Content-Length: 0'
-    ]
-  - [
-      '^SIP/2.0 200 OK',
-      'CSeq: 1 INVITE',
-      'From: <sip:external@external.test>',
-      'To: <sip:4311003@',
-      'Content-Type: application/sdp'
-    ]

scenarios/incoming_foreign_dom/0005_test.yml.tt2

@@ -0,0 +1,11 @@
+flow:
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
+sip_in:
+  - '^SIP/2.0 180 Ringing'
+  - 'CSeq: 1 INVITE'
+sip_out:
+  - [
+      '^SIP/2.0 180 Ringing',
+      'CSeq: 1 INVITE',
+    ]

scenarios/incoming_foreign_dom/0006_test.yml.tt2

@@ -0,0 +1,15 @@
+flow:
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
+sip_in:
+  - '^SIP/2.0 200 OK'
+  - 'CSeq: 1 INVITE'
+  - 'From: <sip:external@'
+  - 'To: <sip:4311003@'
+sip_out:
+  - [
+      '^SIP/2.0 200 OK',
+      'CSeq: 1 INVITE',
+      'From: <sip:external@',
+      'To: <sip:4311003@'
+    ]

scenarios/incoming_foreign_dom/0007_test.yml.tt2

@@ -1,27 +1,21 @@
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
-  - end|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
   - start|ROUTE_OUTBOUND:
+  - return|ROUTE_OUTBOUND:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
-  - 'Contact: sip:external@'
+  - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0'
   - 'CSeq: 1 ACK'
-  - 'Max-Forwards: 69'
-  - 'Content-Length: 0'
-  - 'From: <sip:external@external.test>'
+  - 'From: <sip:external@'
   - 'To: <sip:4311003@'
-
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
-      'Contact: sip:external@',
+      '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0',
       'CSeq: 1 ACK',
-      'Max-Forwards: 68',
-      'Content-Length: 0',
-      'From: <sip:external@external.test>',
+      'From: <sip:external@',
       'To: <sip:4311003@'
     ]

scenarios/incoming_foreign_dom/0008_test.yml.tt2

@@ -1,31 +1,35 @@
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
-  - end|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
+  - start|BRANCH_ROUTE_SBC:
+  - return|BRANCH_ROUTE_SBC:
+  # branch ??
+  - return|BRANCH_ROUTE_SBC:
   - start|ROUTE_STOP_RTPPROXY:
-  - end|ROUTE_STOP_RTPPROXY:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_STOP_RTPPROXY:
   - start|ROUTE_OUTBOUND:
   - exit|ROUTE_OUTBOUND:
-  # 200 OK
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
 sip_in:
   - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
   - 'Contact: sip:external@'
   - 'CSeq: 2 BYE'
   - 'Max-Forwards: 69'
   - 'Content-Length: 0'
-  - 'From: <sip:external@external.test>'
+  - 'From: <sip:external@'
   - 'To: <sip:4311003@'
+
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
       'CSeq: 2 BYE',
       'Content-Length: 0',
-      'From: <sip:external@external.test>',
+      'From: <sip:external@',
       'To: <sip:4311003@'
     ]
   - [
@@ -34,13 +38,6 @@ sip_out:
       'CSeq: 2 BYE',
       'Max-Forwards: 68',
       'Content-Length: 0',
-      'From: <sip:external@external.test>',
-      'To: <sip:4311003@'
-    ]
-  - [
-      '^SIP/2.0 200 OK',
-      'CSeq: 2 BYE',
-      'Content-Length: 0',
-      'From: <sip:external@external.test>',
+      'From: <sip:external@',
       'To: <sip:4311003@'
     ]

scenarios/incoming_foreign_dom/0009_test.yml.tt2

@@ -0,0 +1,17 @@
+flow:
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
+sip_in:
+  - '^SIP/2.0 200 OK'
+  - 'CSeq: 2 BYE'
+  - 'Content-Length: 0'
+  - 'From: <sip:external@'
+  - 'To: <sip:4311003@'
+sip_out:
+  - [
+      '^SIP/2.0 200 OK',
+      'CSeq: 2 BYE',
+      'Content-Length: 0',
+      'From: <sip:external@',
+      'To: <sip:4311003@'
+    ]

scenarios/incoming_foreign_dom/scenario.yml

@@ -1,3 +1,4 @@
+test_uuid: incoming_foreign_dom
 subscribers:
   spce.test:
     testuser1003:

scenarios/incoming_foreign_dom/sipp_scenario00.xml

@@ -8,7 +8,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 1 INVITE
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -49,7 +49,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       [routes]
       CSeq: 1 ACK
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
@@ -75,7 +75,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 2 BYE
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       [routes]

scenarios/incoming_peer/0003_test.yml.tt2

@@ -1,93 +1,86 @@
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
-  - end|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_CLEAR_PEER_IN_PREF:
-  - end|ROUTE_CLEAR_PEER_IN_PREF:
+  - return|ROUTE_CLEAR_PEER_IN_PREF:
   - start|ROUTE_LOAD_PEER_IN_PREF:
-  - end|ROUTE_LOAD_PEER_IN_PREF:
-  - end|ROUTE_FIND_CALLER:
+  - return|ROUTE_LOAD_PEER_IN_PREF:
+  - return|ROUTE_FIND_CALLER:
   - start|ROUTE_GET_CALLER_CLI:
-  - end|ROUTE_GET_CALLER_CLI:
+  - return|ROUTE_GET_CALLER_CLI:
   - start|ROUTE_GET_CALLER_CLI:
-  - end|ROUTE_GET_CALLER_CLI:
+  - return|ROUTE_GET_CALLER_CLI:
   - start|ROUTE_GET_FORWARDER_CLI:
-  - end|ROUTE_GET_FORWARDER_CLI:
+  - return|ROUTE_GET_FORWARDER_CLI:
   - start|ROUTE_FIND_CALLEE:
   - start|ROUTE_CLIR:
-  - end|ROUTE_CLIR:
+  - return|ROUTE_CLIR:
   - start|ROUTE_CLEAR_CALLEE_PREF:
-  - end|ROUTE_CLEAR_CALLEE_PREF:
+  - return|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_BLOCK_OUT:
-  - end|ROUTE_BLOCK_OUT:
+  - return|ROUTE_BLOCK_OUT:
   - start|ROUTE_LOAD_CALLEE_PREF:
   - start|ROUTE_BLOCK_IN:
-  - end|ROUTE_BLOCK_IN:
-  - end|ROUTE_LOAD_CALLEE_PREF:
+  - return|ROUTE_BLOCK_IN:
+  - return|ROUTE_LOAD_CALLEE_PREF:
       $xavp(caller_peer_prefs[0]=>concurrent_max[*]): [1]
   - start|ROUTE_CHECK_PBX:
   - return|ROUTE_CHECK_PBX:
   - start|ROUTE_INVITE_TO_INT:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_SET_CALLER_DIALOG:
-  - end|ROUTE_SET_CALLER_DIALOG:
+  - return|ROUTE_SET_CALLER_DIALOG:
   - start|ROUTE_ACC_CALLER:
-  - end|ROUTE_ACC_CALLER:
+  - return|ROUTE_ACC_CALLER:
   - start|ROUTE_ACC_CALLEE:
-  - end|ROUTE_ACC_CALLEE:
+  - return|ROUTE_ACC_CALLEE:
   - start|BRANCH_ROUTE_SBC:
   - start|ROUTE_BRANCH_ACC_RTP:
-  - end|ROUTE_BRANCH_ACC_RTP:
+  - return|ROUTE_BRANCH_ACC_RTP:
   - start|ROUTE_SET_RUSER:
-  - end|ROUTE_SET_RUSER:
+  - return|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
-  - end|ROUTE_PREPARE_SST:
+  - return|ROUTE_PREPARE_SST:
   - start|ROUTE_PREPARE_MOH:
-  - end|ROUTE_PREPARE_MOH:
+  - return|ROUTE_PREPARE_MOH:
   - start|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_SET_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_SET_CALLEE:
-  - end|ROUTE_SET_CALLEE:
+  - return|ROUTE_SET_CALLEE:
   - start|ROUTE_ADD_CALLINFO:
-  - end|ROUTE_ADD_CALLINFO:
-  - end|BRANCH_ROUTE_SBC:
+  - return|ROUTE_ADD_CALLINFO:
+  - return|BRANCH_ROUTE_SBC:
+  # branch ??
+  - return|BRANCH_ROUTE_SBC:
   - exit|ROUTE_OUTBOUND:
-  # 100 Conecting
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
-  # 180 Ringing
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
-  # 200 OK
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
 sip_in:
   - '^INVITE sip:4311003@'
   - 'Contact: sip:004321001@'
@@ -115,16 +108,3 @@ sip_out:
       'P-App-Param: ;aleg_sst_enable=no;sst_enable=no',
       'P-App-Name: sbc'
     ]
-  - [
-      '^SIP/2.0 180 Ringing',
-      'CSeq: 1 INVITE',
-      'From: <sip:004321001@',
-      'To: <sip:4311003@'
-    ]
-  - [
-      '^SIP/2.0 200 OK',
-      'CSeq: 1 INVITE',
-      'From: <sip:004321001@',
-      'To: <sip:4311003@'
-    ]
-

scenarios/incoming_peer/0005_test.yml.tt2

@@ -0,0 +1,12 @@
+# INVITE_OFFLINE scenario
+flow:
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
+sip_in:
+  - '^SIP/2.0 180 Ringing'
+  - 'CSeq: 1 INVITE'
+sip_out:
+  - [
+      '^SIP/2.0 180 Ringing',
+      'CSeq: 1 INVITE',
+    ]

scenarios/incoming_peer/0006_test.yml.tt2

@@ -0,0 +1,15 @@
+flow:
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
+sip_in:
+  - '^SIP/2.0 200 OK'
+  - 'CSeq: 1 INVITE'
+  - 'From: <sip:004321001@'
+  - 'To: <sip:4311003@'
+sip_out:
+  - [
+      '^SIP/2.0 200 OK',
+      'CSeq: 1 INVITE',
+      'From: <sip:004321001@',
+      'To: <sip:4311003@',
+    ]

scenarios/incoming_peer/0007_test.yml.tt2

@@ -1,27 +1,21 @@
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
-  - end|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
   - start|ROUTE_OUTBOUND:
+  - return|ROUTE_OUTBOUND:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
-  - 'Contact: sip:004321001@'
+  - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0'
   - 'CSeq: 1 ACK'
-  - 'Max-Forwards: 69'
-  - 'Content-Length: 0'
   - 'From: <sip:004321001@'
   - 'To: <sip:4311003@'
-
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
-      'Contact: sip:004321001@',
+      '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0',
       'CSeq: 1 ACK',
-      'Max-Forwards: 68',
-      'Content-Length: 0',
       'From: <sip:004321001@',
       'To: <sip:4311003@'
     ]

scenarios/incoming_peer/0008_test.yml.tt2

@@ -1,20 +1,21 @@
 # INVITE_OFFLINE scenario
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
-  - end|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
+  - start|BRANCH_ROUTE_SBC:
+  - return|BRANCH_ROUTE_SBC:
+  # branch ??
+  - return|BRANCH_ROUTE_SBC:
   - start|ROUTE_STOP_RTPPROXY:
   - start|ROUTE_RESTORE_CLUSTERSET:
-  - end|ROUTE_RESTORE_CLUSTERSET:
-  - end|ROUTE_STOP_RTPPROXY:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_STOP_RTPPROXY:
   - start|ROUTE_OUTBOUND:
   - exit|ROUTE_OUTBOUND:
-  # 200 OK
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
 sip_in:
   - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
   - 'Contact: sip:004321001@'
@@ -23,6 +24,7 @@ sip_in:
   - 'Content-Length: 0'
   - 'From: <sip:004321001@'
   - 'To: <sip:4311003@'
+
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
@@ -40,10 +42,3 @@ sip_out:
       'From: <sip:004321001@',
       'To: <sip:4311003@'
     ]
-  - [
-      '^SIP/2.0 200 OK',
-      'CSeq: 2 BYE',
-      'Content-Length: 0',
-      'From: <sip:004321001@',
-      'To: <sip:4311003@'
-    ]

scenarios/incoming_peer/0009_test.yml.tt2

@@ -0,0 +1,17 @@
+flow:
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
+sip_in:
+  - '^SIP/2.0 200 OK'
+  - 'CSeq: 2 BYE'
+  - 'Content-Length: 0'
+  - 'From: <sip:004321001@'
+  - 'To: <sip:4311003@'
+sip_out:
+  - [
+      '^SIP/2.0 200 OK',
+      'CSeq: 2 BYE',
+      'Content-Length: 0',
+      'From: <sip:004321001@',
+      'To: <sip:4311003@'
+    ]

scenarios/incoming_peer/scenario.yml

@@ -1,3 +1,4 @@
+test_uuid: incoming_peer
 subscribers:
   spce.test:
     testuser1003:

scenarios/incoming_peer/sipp_scenario00.xml

@@ -8,7 +8,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 1 INVITE
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -46,7 +46,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       [routes]
       CSeq: 1 ACK
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
@@ -62,8 +62,8 @@
       <exec play_pcap_audio="scenarios/media181sec.pcap"/>
     </action>
   </nop>
-  
-  <pause milliseconds="1000"/> 
+
+  <pause milliseconds="1000"/>
 
   <send>
     <![CDATA[
@@ -72,7 +72,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 2 BYE
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       [routes]
@@ -81,7 +81,7 @@
 
     ]]>
   </send>
-  
+
   <recv response="100" optional="true">
   </recv>
 

scenarios/incoming_peer/sipp_scenario_responder00.xml

@@ -20,7 +20,7 @@
     ]]>
   </send>
 
-  <pause milliseconds="500"/> 
+  <pause milliseconds="500"/>
 
   <send>
     <![CDATA[
@@ -70,7 +70,7 @@
 
     ]]>
   </send>
-  
+
   <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
   <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
 

scenarios/invite/0003_test.yml.tt2

@@ -1,16 +1,15 @@
-# REGISTER scenario
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
-  - end|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
   - exit|ROUTE_AUTH:

scenarios/invite/0005_test.yml.tt2

@@ -1,99 +1,90 @@
-# INVITE_OFFLINE scenario
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
-  - end|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
   - start|ROUTE_ADD_CALLINFO_REPLY:
-  - end|ROUTE_ADD_CALLINFO_REPLY:
-  - end|ROUTE_AUTH:
-  - end|ROUTE_FIND_CALLER:
+  - return|ROUTE_ADD_CALLINFO_REPLY:
+  - return|ROUTE_AUTH:
+  - return|ROUTE_FIND_CALLER:
   - start|ROUTE_LOAD_CALLER_PREF:
   - start|ROUTE_CLEAR_CALLER_PREF:
-  - end|ROUTE_CLEAR_CALLER_PREF:
-  - end|ROUTE_LOAD_CALLER_PREF:
+  - return|ROUTE_CLEAR_CALLER_PREF:
+  - return|ROUTE_LOAD_CALLER_PREF:
   - start|ROUTE_GET_CALLER_CLI:
-  - end|ROUTE_GET_CALLER_CLI:
+  - return|ROUTE_GET_CALLER_CLI:
   - start|ROUTE_GET_FORWARDER_CLI:
-  - end|ROUTE_GET_FORWARDER_CLI:
+  - return|ROUTE_GET_FORWARDER_CLI:
   - start|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_CHECK_CLI_ALLOWED:
-  - end|ROUTE_CHECK_CLI_ALLOWED:
-  - end|ROUTE_CHECK_USERPROV_CLI:
+  - return|ROUTE_CHECK_CLI_ALLOWED:
+  - return|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_FIND_CALLEE:
   - start|ROUTE_CLIR:
-  - end|ROUTE_CLIR:
+  - return|ROUTE_CLIR:
   - start|ROUTE_CLEAR_CALLEE_PREF:
-  - end|ROUTE_CLEAR_CALLEE_PREF:
+  - return|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_BLOCK_OUT:
-  - end|ROUTE_BLOCK_OUT:
+  - return|ROUTE_BLOCK_OUT:
   - start|ROUTE_LOAD_CALLEE_PREF:
   - start|ROUTE_BLOCK_IN:
-  - end|ROUTE_BLOCK_IN:
-  - end|ROUTE_LOAD_CALLEE_PREF:
+  - return|ROUTE_BLOCK_IN:
+  - return|ROUTE_LOAD_CALLEE_PREF:
   - start|ROUTE_CHECK_PBX:
   - return|ROUTE_CHECK_PBX:
   - start|ROUTE_INVITE_TO_INT:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_SET_CALLER_DIALOG:
-  - end|ROUTE_SET_CALLER_DIALOG:
+  - return|ROUTE_SET_CALLER_DIALOG:
   - start|ROUTE_ACC_CALLER:
-  - end|ROUTE_ACC_CALLER:
+  - return|ROUTE_ACC_CALLER:
   - start|ROUTE_ACC_CALLEE:
-  - end|ROUTE_ACC_CALLEE:
+  - return|ROUTE_ACC_CALLEE:
   - start|BRANCH_ROUTE_SBC:
   - start|ROUTE_BRANCH_ACC_RTP:
-  - end|ROUTE_BRANCH_ACC_RTP:
+  - return|ROUTE_BRANCH_ACC_RTP:
   - start|ROUTE_SET_RUSER:
-  - end|ROUTE_SET_RUSER:
+  - return|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
-  - end|ROUTE_PREPARE_SST:
+  - return|ROUTE_PREPARE_SST:
   - start|ROUTE_PREPARE_MOH:
-  - end|ROUTE_PREPARE_MOH:
+  - return|ROUTE_PREPARE_MOH:
   - start|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_SET_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_SET_CALLEE:
-  - end|ROUTE_SET_CALLEE:
+  - return|ROUTE_SET_CALLEE:
   - start|ROUTE_ADD_CALLINFO:
-  - end|ROUTE_ADD_CALLINFO:
-  - end|BRANCH_ROUTE_SBC:
+  - return|ROUTE_ADD_CALLINFO:
+  - return|BRANCH_ROUTE_SBC:
+  - return|BRANCH_ROUTE_SBC:
   - exit|ROUTE_OUTBOUND:
-  # 101 Connecting
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
-  # 180 Ringing
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
-  # 200 OK
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
 sip_in:
   - '^INVITE'
   - 'Contact: sip:testuser1002@'
@@ -127,16 +118,3 @@ sip_out:
       'P-App-Param: ;aleg_sst_enable=no;sst_enable=no',
       'P-App-Name: sbc'
     ]
-  - [
-      '^SIP/2.0 180 Ringing',
-      'CSeq: 2 INVITE',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1003@'
-    ]
-  - [
-      '^SIP/2.0 200 OK',
-      'CSeq: 2 INVITE',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1003@'
-    ]
-

scenarios/invite/0007_test.yml.tt2

@@ -0,0 +1,11 @@
+flow:
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
+sip_in:
+  - '^SIP/2.0 180 Ringing'
+  - 'CSeq: 2 INVITE'
+sip_out:
+  - [
+      '^SIP/2.0 180 Ringing',
+      'CSeq: 2 INVITE',
+    ]

scenarios/invite/0008_test.yml.tt2

@@ -0,0 +1,13 @@
+flow:
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
+sip_in:
+  - '^SIP/2.0 200 OK'
+  - 'CSeq: 2 INVITE'
+sip_out:
+  - [
+      '^SIP/2.0 200 OK',
+      'CSeq: 2 INVITE',
+      'From: <sip:testuser1002@',
+      'To: <sip:testuser1003@'
+    ]

scenarios/invite/0009_test.yml.tt2

@@ -1,28 +1,21 @@
-# INVITE_OFFLINE scenario
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
-  - end|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
   - start|ROUTE_OUTBOUND:
+  - return|ROUTE_OUTBOUND:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
-  - 'Contact: sip:testuser1002@'
+  - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0'
   - 'CSeq: 2 ACK'
-  - 'Max-Forwards: 69'
-  - 'Content-Length: 0'
   - 'From: <sip:testuser1002@'
   - 'To: <sip:testuser1003@'
-
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
-      'Contact: sip:testuser1002@',
+      '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0',
       'CSeq: 2 ACK',
-      'Max-Forwards: 68',
-      'Content-Length: 0',
       'From: <sip:4311002@',
       'To: <sip:testuser1003@'
     ]

scenarios/invite/0010_test.yml.tt2

@@ -1,20 +1,20 @@
-# INVITE_OFFLINE scenario
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
-  - end|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
+  - start|BRANCH_ROUTE_SBC:
+  - return|BRANCH_ROUTE_SBC:
+  # branch ??
+  - return|BRANCH_ROUTE_SBC:
   - start|ROUTE_STOP_RTPPROXY:
   - start|ROUTE_RESTORE_CLUSTERSET:
-  - end|ROUTE_RESTORE_CLUSTERSET:
-  - end|ROUTE_STOP_RTPPROXY:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_STOP_RTPPROXY:
   - start|ROUTE_OUTBOUND:
   - exit|ROUTE_OUTBOUND:
-  # 200 OK
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
 sip_in:
   - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
@@ -41,10 +41,3 @@ sip_out:
       'From: <sip:4311002@',
       'To: <sip:testuser1003@'
     ]
-  - [
-      '^SIP/2.0 200 OK',
-      'CSeq: 3 BYE',
-      'Content-Length: 0',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1003@'
-    ]

scenarios/invite/0011_test.yml.tt2

@@ -0,0 +1,17 @@
+flow:
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
+sip_in:
+  - '^SIP/2.0 200 OK'
+  - 'CSeq: 3 BYE'
+  - 'Content-Length: 0'
+  - 'From: <sip:4311002@'
+  - 'To: <sip:testuser1003@'
+sip_out:
+  - [
+      '^SIP/2.0 200 OK',
+      'CSeq: 3 BYE',
+      'Content-Length: 0',
+      'From: <sip:testuser1002@',
+      'To: <sip:testuser1003@'
+    ]

scenarios/invite/scenario.yml

@@ -1,3 +1,4 @@
+test_uuid: invite
 subscribers:
   spce.test:
     testuser1003:

scenarios/invite/sipp_scenario00.xml

@@ -8,7 +8,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 1 INVITE
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -29,9 +29,9 @@
 
   <recv response="100" rtd="1" optional="true">
   </recv>
-  
+
   <recv response="407" rtd="2" auth="true"/>
-  
+
   <send>
     <![CDATA[
 
@@ -39,7 +39,7 @@
       [last_Via:]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 1 ACK
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -57,7 +57,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 2 INVITE
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -96,7 +96,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       [routes]
       CSeq: 2 ACK
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
@@ -112,8 +112,8 @@
       <exec play_pcap_audio="scenarios/media181sec.pcap"/>
     </action>
   </nop>
-  
-  <pause milliseconds="1000"/> 
+
+  <pause milliseconds="1000"/>
 
   <send start_rtd="4">
     <![CDATA[
@@ -122,7 +122,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 3 BYE
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
       [routes]
@@ -131,7 +131,7 @@
 
     ]]>
   </send>
-  
+
   <recv response="100" optional="true">
   </recv>
 
@@ -140,7 +140,7 @@
 
   <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200, 500, 1000"/>
 
-<!-- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/> >
+<!-- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/> -->
 
 </scenario>
 

scenarios/invite/sipp_scenario_responder00.xml

@@ -20,7 +20,7 @@
     ]]>
   </send>
 
-  <pause milliseconds="500"/> 
+  <pause milliseconds="500"/>
 
   <send>
     <![CDATA[
@@ -70,7 +70,7 @@
 
     ]]>
   </send>
-  
+
   <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
   <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
 

scenarios/invite_allowedcli_match/0003_test.yml.tt2

@@ -1,16 +1,15 @@
-# REGISTER scenario
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
-  - end|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
   - exit|ROUTE_AUTH:

scenarios/invite_allowedcli_match/0005_test.yml.tt2

@@ -1,106 +1,98 @@
-# INVITE_OFFLINE scenario
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
-  - end|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
   - start|ROUTE_ADD_CALLINFO_REPLY:
-  - end|ROUTE_ADD_CALLINFO_REPLY:
-  - end|ROUTE_AUTH:
-  - end|ROUTE_FIND_CALLER:
+  - return|ROUTE_ADD_CALLINFO_REPLY:
+  - return|ROUTE_AUTH:
+  - return|ROUTE_FIND_CALLER:
   - start|ROUTE_LOAD_CALLER_PREF:
   - start|ROUTE_CLEAR_CALLER_PREF:
-  - end|ROUTE_CLEAR_CALLER_PREF:
-  - end|ROUTE_LOAD_CALLER_PREF:
+  - return|ROUTE_CLEAR_CALLER_PREF:
+  - return|ROUTE_LOAD_CALLER_PREF:
       $xavp(caller_usr_prefs[0]=>allowed_clis[*]): ['43110021*', '43110029*']
       $xavp(caller_real_prefs[0]=>allowed_clis[*]): ['43110021*', '43110029*']
-      $xavp(caller_usr_prefs[0]=>user_cli[*]): [43122122]
-      $xavp(caller_real_prefs[0]=>user_cli[*]): [43122122]
+      $xavp(caller_usr_prefs[0]=>user_cli[*]): ['43122122']
+      $xavp(caller_real_prefs[0]=>user_cli[*]): ['43122122']
       $xavp(caller_usr_prefs[0]=>inbound_upn[*]): ['from_display']
       $xavp(caller_real_prefs[0]=>inbound_upn[*]): ['from_display']
   - start|ROUTE_GET_CALLER_CLI:
-  - end|ROUTE_GET_CALLER_CLI:
+  - return|ROUTE_GET_CALLER_CLI:
   - start|ROUTE_GET_FORWARDER_CLI:
-  - end|ROUTE_GET_FORWARDER_CLI:
+  - return|ROUTE_GET_FORWARDER_CLI:
   - start|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_CHECK_CLI_ALLOWED:
       $xavp(caller_real_prefs[0]=>allowed_clis[*]): ['43110021*', '43110029*']
-  - end|ROUTE_CHECK_CLI_ALLOWED:
-  - end|ROUTE_CHECK_USERPROV_CLI:
+  - return|ROUTE_CHECK_CLI_ALLOWED:
+  - return|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_FIND_CALLEE:
   - start|ROUTE_CLIR:
-  - end|ROUTE_CLIR:
+  - return|ROUTE_CLIR:
   - start|ROUTE_CLEAR_CALLEE_PREF:
-  - end|ROUTE_CLEAR_CALLEE_PREF:
+  - return|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_BLOCK_OUT:
-  - end|ROUTE_BLOCK_OUT:
+  - return|ROUTE_BLOCK_OUT:
   - start|ROUTE_LOAD_CALLEE_PREF:
   - start|ROUTE_BLOCK_IN:
-  - end|ROUTE_BLOCK_IN:
-  - end|ROUTE_LOAD_CALLEE_PREF:
+  - return|ROUTE_BLOCK_IN:
+  - return|ROUTE_LOAD_CALLEE_PREF:
   - start|ROUTE_CHECK_PBX:
   - return|ROUTE_CHECK_PBX:
   - start|ROUTE_INVITE_TO_INT:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_SET_CALLER_DIALOG:
-  - end|ROUTE_SET_CALLER_DIALOG:
+  - return|ROUTE_SET_CALLER_DIALOG:
   - start|ROUTE_ACC_CALLER:
-  - end|ROUTE_ACC_CALLER:
+  - return|ROUTE_ACC_CALLER:
   - start|ROUTE_ACC_CALLEE:
-  - end|ROUTE_ACC_CALLEE:
+  - return|ROUTE_ACC_CALLEE:
   - start|BRANCH_ROUTE_SBC:
   - start|ROUTE_BRANCH_ACC_RTP:
-  - end|ROUTE_BRANCH_ACC_RTP:
+  - return|ROUTE_BRANCH_ACC_RTP:
   - start|ROUTE_SET_RUSER:
-  - end|ROUTE_SET_RUSER:
+  - return|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
-  - end|ROUTE_PREPARE_SST:
+  - return|ROUTE_PREPARE_SST:
   - start|ROUTE_PREPARE_MOH:
-  - end|ROUTE_PREPARE_MOH:
+  - return|ROUTE_PREPARE_MOH:
   - start|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_SET_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_SET_CALLEE:
-  - end|ROUTE_SET_CALLEE:
+  - return|ROUTE_SET_CALLEE:
   - start|ROUTE_ADD_CALLINFO:
-  - end|ROUTE_ADD_CALLINFO:
-  - end|BRANCH_ROUTE_SBC:
+  - return|ROUTE_ADD_CALLINFO:
+  - return|BRANCH_ROUTE_SBC:
+  # branch ??
+  - return|BRANCH_ROUTE_SBC:
   - exit|ROUTE_OUTBOUND:
-  # 101 Connecting
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
-  # 180 Ringing
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
-  # 200 OK
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
 sip_in:
   - '^INVITE'
   - 'Contact: sip:testuser1002@'
@@ -134,16 +126,3 @@ sip_out:
       'P-App-Param: ;aleg_sst_enable=no;sst_enable=no',
       'P-App-Name: sbc'
     ]
-  - [
-      '^SIP/2.0 180 Ringing',
-      'CSeq: 2 INVITE',
-      'From: "431100299" <sip:testuser1002@',
-      'To: <sip:testuser1003@'
-    ]
-  - [
-      '^SIP/2.0 200 OK',
-      'CSeq: 2 INVITE',
-      'From: "431100299" <sip:testuser1002@',
-      'To: <sip:testuser1003@'
-    ]
-

scenarios/invite_allowedcli_match/0007_test.yml.tt2

@@ -0,0 +1,15 @@
+flow:
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
+sip_in:
+  - '^SIP/2.0 180 Ringing'
+  - 'CSeq: 2 INVITE'
+  - 'From: <sip:431100299@'
+  - 'To: <sip:testuser1003@'
+sip_out:
+  - [
+      '^SIP/2.0 180 Ringing',
+      'CSeq: 2 INVITE',
+      'From: "431100299" <sip:testuser1002@',
+      'To: <sip:testuser1003@'
+    ]

scenarios/invite_allowedcli_match/0008_test.yml.tt2

@@ -0,0 +1,13 @@
+flow:
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
+sip_in:
+  - '^SIP/2.0 200 OK'
+  - 'CSeq: 2 INVITE'
+sip_out:
+  - [
+      '^SIP/2.0 200 OK',
+      'CSeq: 2 INVITE',
+      'From: "431100299" <sip:testuser1002@',
+      'To: <sip:testuser1003@'
+    ]

scenarios/invite_allowedcli_match/0009_test.yml.tt2

@@ -1,28 +1,21 @@
-# INVITE_OFFLINE scenario
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
-  - end|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
   - start|ROUTE_OUTBOUND:
+  - return|ROUTE_OUTBOUND:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
-  - 'Contact: sip:testuser1002@'
+  - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0'
   - 'CSeq: 2 ACK'
-  - 'Max-Forwards: 69'
-  - 'Content-Length: 0'
   - 'From: "431100299" <sip:testuser1002@'
   - 'To: <sip:testuser1003@'
-
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
-      'Contact: sip:testuser1002@',
+      '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0',
       'CSeq: 2 ACK',
-      'Max-Forwards: 68',
-      'Content-Length: 0',
       'From: "431100299" <sip:431100299@',
       'To: <sip:testuser1003@'
     ]

scenarios/invite_allowedcli_match/0010_test.yml.tt2

@@ -1,20 +1,20 @@
-# INVITE_OFFLINE scenario
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
-  - end|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
+  - start|BRANCH_ROUTE_SBC:
+  - return|BRANCH_ROUTE_SBC:
+  # branch ??
+  - return|BRANCH_ROUTE_SBC:
   - start|ROUTE_STOP_RTPPROXY:
   - start|ROUTE_RESTORE_CLUSTERSET:
-  - end|ROUTE_RESTORE_CLUSTERSET:
-  - end|ROUTE_STOP_RTPPROXY:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_STOP_RTPPROXY:
   - start|ROUTE_OUTBOUND:
   - exit|ROUTE_OUTBOUND:
-  # 200 OK
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
 sip_in:
   - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
@@ -41,10 +41,3 @@ sip_out:
       'From: "431100299" <sip:431100299@',
       'To: <sip:testuser1003@'
     ]
-  - [
-      '^SIP/2.0 200 OK',
-      'CSeq: 3 BYE',
-      'Content-Length: 0',
-      'From: "431100299" <sip:testuser1002@',
-      'To: <sip:testuser1003@'
-    ]

scenarios/invite_allowedcli_match/0011_test.yml.tt2

@@ -0,0 +1,17 @@
+flow:
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
+sip_in:
+  - '^SIP/2.0 200 OK'
+  - 'CSeq: 3 BYE'
+  - 'Content-Length: 0'
+  - 'From: "431100299" <sip:431100299@'
+  - 'To: <sip:testuser1003@'
+sip_out:
+  - [
+      '^SIP/2.0 200 OK',
+      'CSeq: 3 BYE',
+      'Content-Length: 0',
+      'From: "431100299" <sip:testuser1002@',
+      'To: <sip:testuser1003@'
+    ]

scenarios/invite_allowedcli_match/scenario.yml

@@ -1,3 +1,4 @@
+test_uuid: invite_allowedcli_match
 subscribers:
   spce.test:
     testuser1003:

scenarios/invite_allowedcli_match/sipp_scenario00.xml

@@ -8,7 +8,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: "431100299" <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 1 INVITE
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -29,9 +29,9 @@
 
   <recv response="100" rtd="1" optional="true">
   </recv>
-  
+
   <recv response="407" rtd="2" auth="true"/>
-  
+
   <send>
     <![CDATA[
 
@@ -39,7 +39,7 @@
       [last_Via:]
       From: "431100299" <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 1 ACK
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -57,7 +57,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: "431100299" <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 2 INVITE
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -96,7 +96,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: "431100299" <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       [routes]
       CSeq: 2 ACK
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
@@ -112,8 +112,8 @@
       <exec play_pcap_audio="scenarios/media181sec.pcap"/>
     </action>
   </nop>
-  
-  <pause milliseconds="1000"/> 
+
+  <pause milliseconds="1000"/>
 
   <send start_rtd="4">
     <![CDATA[
@@ -122,7 +122,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: "431100299" <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 3 BYE
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
       [routes]
@@ -131,7 +131,7 @@
 
     ]]>
   </send>
-  
+
   <recv response="100" optional="true">
   </recv>
 
@@ -140,7 +140,7 @@
 
   <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200, 500, 1000"/>
 
-<!-- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/> >
+<!-- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/> -->
 
 </scenario>
 

scenarios/invite_allowedcli_match/sipp_scenario_responder00.xml

@@ -20,7 +20,7 @@
     ]]>
   </send>
 
-  <pause milliseconds="500"/> 
+  <pause milliseconds="500"/>
 
   <send>
     <![CDATA[
@@ -70,7 +70,7 @@
 
     ]]>
   </send>
-  
+
   <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
   <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
 

scenarios/invite_allowedcli_match_alias/0003_test.yml.tt2

@@ -1,16 +1,16 @@
 # REGISTER scenario
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
-  - end|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
   - exit|ROUTE_AUTH:

scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2

@@ -1,105 +1,98 @@
 # INVITE_OFFLINE scenario
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
-  - end|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
   - start|ROUTE_ADD_CALLINFO_REPLY:
-  - end|ROUTE_ADD_CALLINFO_REPLY:
-  - end|ROUTE_AUTH:
-  - end|ROUTE_FIND_CALLER:
+  - return|ROUTE_ADD_CALLINFO_REPLY:
+  - return|ROUTE_AUTH:
+  - return|ROUTE_FIND_CALLER:
   - start|ROUTE_LOAD_CALLER_PREF:
   - start|ROUTE_CLEAR_CALLER_PREF:
-  - end|ROUTE_CLEAR_CALLER_PREF:
-  - end|ROUTE_LOAD_CALLER_PREF:
+  - return|ROUTE_CLEAR_CALLER_PREF:
+  - return|ROUTE_LOAD_CALLER_PREF:
       $xavp(caller_usr_prefs[0]=>allowed_clis[*]): ['43110021*', '43110029*']
       $xavp(caller_real_prefs[0]=>allowed_clis[*]): ['43110021*', '43110029*']
-      $xavp(caller_usr_prefs[0]=>user_cli[*]): [43122122]
-      $xavp(caller_real_prefs[0]=>user_cli[*]): [43122122]
+      $xavp(caller_usr_prefs[0]=>user_cli[*]): ['43122122']
+      $xavp(caller_real_prefs[0]=>user_cli[*]): ['43122122']
       $xavp(caller_usr_prefs[0]=>inbound_upn[*]): ['from_display']
       $xavp(caller_real_prefs[0]=>inbound_upn[*]): ['from_display']
       $xavp(caller_usr_prefs[0]=>extension_in_npn[*]): [1]
       $xavp(caller_real_prefs[0]=>extension_in_npn[*]): [1]
   - start|ROUTE_GET_CALLER_CLI:
-  - end|ROUTE_GET_CALLER_CLI:
+  - return|ROUTE_GET_CALLER_CLI:
   - start|ROUTE_GET_FORWARDER_CLI:
-  - end|ROUTE_GET_FORWARDER_CLI:
+  - return|ROUTE_GET_FORWARDER_CLI:
   - start|ROUTE_CHECK_USERPROV_CLI:
-  - end|ROUTE_CHECK_USERPROV_CLI:
+  - return|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_FIND_CALLEE:
   - start|ROUTE_CLIR:
-  - end|ROUTE_CLIR:
+  - return|ROUTE_CLIR:
   - start|ROUTE_CLEAR_CALLEE_PREF:
-  - end|ROUTE_CLEAR_CALLEE_PREF:
+  - return|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_BLOCK_OUT:
-  - end|ROUTE_BLOCK_OUT:
+  - return|ROUTE_BLOCK_OUT:
   - start|ROUTE_LOAD_CALLEE_PREF:
   - start|ROUTE_BLOCK_IN:
-  - end|ROUTE_BLOCK_IN:
-  - end|ROUTE_LOAD_CALLEE_PREF:
+  - return|ROUTE_BLOCK_IN:
+  - return|ROUTE_LOAD_CALLEE_PREF:
   - start|ROUTE_CHECK_PBX:
   - return|ROUTE_CHECK_PBX:
   - start|ROUTE_INVITE_TO_INT:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_SET_CALLER_DIALOG:
-  - end|ROUTE_SET_CALLER_DIALOG:
+  - return|ROUTE_SET_CALLER_DIALOG:
   - start|ROUTE_ACC_CALLER:
-  - end|ROUTE_ACC_CALLER:
+  - return|ROUTE_ACC_CALLER:
   - start|ROUTE_ACC_CALLEE:
-  - end|ROUTE_ACC_CALLEE:
+  - return|ROUTE_ACC_CALLEE:
   - start|BRANCH_ROUTE_SBC:
   - start|ROUTE_BRANCH_ACC_RTP:
-  - end|ROUTE_BRANCH_ACC_RTP:
+  - return|ROUTE_BRANCH_ACC_RTP:
   - start|ROUTE_SET_RUSER:
-  - end|ROUTE_SET_RUSER:
+  - return|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
-  - end|ROUTE_PREPARE_SST:
+  - return|ROUTE_PREPARE_SST:
   - start|ROUTE_PREPARE_MOH:
-  - end|ROUTE_PREPARE_MOH:
+  - return|ROUTE_PREPARE_MOH:
   - start|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_SET_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_SET_CALLEE:
-  - end|ROUTE_SET_CALLEE:
+  - return|ROUTE_SET_CALLEE:
   - start|ROUTE_ADD_CALLINFO:
-  - end|ROUTE_ADD_CALLINFO:
-  - end|BRANCH_ROUTE_SBC:
+  - return|ROUTE_ADD_CALLINFO:
+  - return|BRANCH_ROUTE_SBC:
+  # branch ??
+  - return|BRANCH_ROUTE_SBC:
   - exit|ROUTE_OUTBOUND:
-  # 101 Connecting
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
-  # 180 Ringing
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
-  # 200 OK
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
 sip_in:
   - '^INVITE'
   - 'Contact: sip:testuser1002@'
@@ -133,16 +126,3 @@ sip_out:
       'P-App-Param: ;aleg_sst_enable=no;sst_enable=no',
       'P-App-Name: sbc'
     ]
-  - [
-      '^SIP/2.0 180 Ringing',
-      'CSeq: 2 INVITE',
-      'From: "4311009" <sip:testuser1002@',
-      'To: <sip:testuser1003@'
-    ]
-  - [
-      '^SIP/2.0 200 OK',
-      'CSeq: 2 INVITE',
-      'From: "4311009" <sip:testuser1002@',
-      'To: <sip:testuser1003@'
-    ]
-

scenarios/invite_allowedcli_match_alias/0007_test.yml.tt2

@@ -0,0 +1,15 @@
+flow:
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
+sip_in:
+  - '^SIP/2.0 180 Ringing'
+  - 'CSeq: 2 INVITE'
+  - 'From: <sip:4311009@'
+  - 'To: <sip:testuser1003@'
+sip_out:
+  - [
+      '^SIP/2.0 180 Ringing',
+      'CSeq: 2 INVITE',
+      'From: "4311009" <sip:testuser1002@',
+      'To: <sip:testuser1003@'
+    ]

scenarios/invite_allowedcli_match_alias/0008_test.yml.tt2

@@ -0,0 +1,13 @@
+flow:
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
+sip_in:
+  - '^SIP/2.0 200 OK'
+  - 'CSeq: 2 INVITE'
+sip_out:
+  - [
+      '^SIP/2.0 200 OK',
+      'CSeq: 2 INVITE',
+      'From: "4311009" <sip:testuser1002@',
+      'To: <sip:testuser1003@'
+    ]

scenarios/invite_allowedcli_match_alias/0009_test.yml.tt2

@@ -1,28 +1,21 @@
-# INVITE_OFFLINE scenario
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
-  - end|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
   - start|ROUTE_OUTBOUND:
+  - return|ROUTE_OUTBOUND:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
-  - 'Contact: sip:testuser1002@'
+  - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0'
   - 'CSeq: 2 ACK'
-  - 'Max-Forwards: 69'
-  - 'Content-Length: 0'
   - 'From: "4311009" <sip:testuser1002@'
   - 'To: <sip:testuser1003@'
-
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
-      'Contact: sip:testuser1002@',
+      '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0',
       'CSeq: 2 ACK',
-      'Max-Forwards: 68',
-      'Content-Length: 0',
       'From: "4311009" <sip:4311009@',
       'To: <sip:testuser1003@'
     ]

scenarios/invite_allowedcli_match_alias/0010_test.yml.tt2

@@ -1,20 +1,20 @@
-# INVITE_OFFLINE scenario
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
-  - end|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
+  - start|BRANCH_ROUTE_SBC:
+  - return|BRANCH_ROUTE_SBC:
+  # branch ??
+  - return|BRANCH_ROUTE_SBC:
   - start|ROUTE_STOP_RTPPROXY:
   - start|ROUTE_RESTORE_CLUSTERSET:
-  - end|ROUTE_RESTORE_CLUSTERSET:
-  - end|ROUTE_STOP_RTPPROXY:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_STOP_RTPPROXY:
   - start|ROUTE_OUTBOUND:
   - exit|ROUTE_OUTBOUND:
-  # 200 OK
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
 sip_in:
   - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
@@ -41,10 +41,3 @@ sip_out:
       'From: "4311009" <sip:4311009@',
       'To: <sip:testuser1003@'
     ]
-  - [
-      '^SIP/2.0 200 OK',
-      'CSeq: 3 BYE',
-      'Content-Length: 0',
-      'From: "4311009" <sip:testuser1002@',
-      'To: <sip:testuser1003@'
-    ]

scenarios/invite_allowedcli_match_alias/0011_test.yml.tt2

@@ -0,0 +1,17 @@
+flow:
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
+sip_in:
+  - '^SIP/2.0 200 OK'
+  - 'CSeq: 3 BYE'
+  - 'Content-Length: 0'
+  - 'From: "4311009" <sip:4311009@'
+  - 'To: <sip:testuser1003@'
+sip_out:
+  - [
+      '^SIP/2.0 200 OK',
+      'CSeq: 3 BYE',
+      'Content-Length: 0',
+      'From: "4311009" <sip:testuser1002@',
+      'To: <sip:testuser1003@'
+    ]

scenarios/invite_allowedcli_match_alias/scenario.yml

@@ -1,3 +1,4 @@
+test_uuid: invite_allowedcli_match_alias
 subscribers:
   spce.test:
     testuser1003:

scenarios/invite_allowedcli_match_alias/sipp_scenario00.xml

@@ -8,7 +8,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: "4311009" <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 1 INVITE
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -29,9 +29,9 @@
 
   <recv response="100" rtd="1" optional="true">
   </recv>
-  
+
   <recv response="407" rtd="2" auth="true"/>
-  
+
   <send>
     <![CDATA[
 
@@ -39,7 +39,7 @@
       [last_Via:]
       From: "4311009" <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 1 ACK
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -57,7 +57,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: "4311009" <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 2 INVITE
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -96,7 +96,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: "4311009" <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       [routes]
       CSeq: 2 ACK
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
@@ -112,8 +112,8 @@
       <exec play_pcap_audio="scenarios/media181sec.pcap"/>
     </action>
   </nop>
-  
-  <pause milliseconds="1000"/> 
+
+  <pause milliseconds="1000"/>
 
   <send start_rtd="4">
     <![CDATA[
@@ -122,7 +122,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: "4311009" <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 3 BYE
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
       [routes]
@@ -131,7 +131,7 @@
 
     ]]>
   </send>
-  
+
   <recv response="100" optional="true">
   </recv>
 
@@ -140,7 +140,7 @@
 
   <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200, 500, 1000"/>
 
-<!-- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/> >
+<!-- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/> -->
 
 </scenario>
 

scenarios/invite_allowedcli_match_alias/sipp_scenario_responder00.xml

@@ -20,7 +20,7 @@
     ]]>
   </send>
 
-  <pause milliseconds="500"/> 
+  <pause milliseconds="500"/>
 
   <send>
     <![CDATA[
@@ -70,7 +70,7 @@
 
     ]]>
   </send>
-  
+
   <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
   <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
 

scenarios/invite_allowedcli_nonmatch/0003_test.yml.tt2

@@ -1,16 +1,16 @@
 # REGISTER scenario
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
-  - end|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
   - exit|ROUTE_AUTH:

scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2

@@ -1,106 +1,99 @@
 # INVITE_OFFLINE scenario
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
-  - end|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
   - start|ROUTE_ADD_CALLINFO_REPLY:
-  - end|ROUTE_ADD_CALLINFO_REPLY:
-  - end|ROUTE_AUTH:
-  - end|ROUTE_FIND_CALLER:
+  - return|ROUTE_ADD_CALLINFO_REPLY:
+  - return|ROUTE_AUTH:
+  - return|ROUTE_FIND_CALLER:
   - start|ROUTE_LOAD_CALLER_PREF:
   - start|ROUTE_CLEAR_CALLER_PREF:
-  - end|ROUTE_CLEAR_CALLER_PREF:
-  - end|ROUTE_LOAD_CALLER_PREF:
+  - return|ROUTE_CLEAR_CALLER_PREF:
+  - return|ROUTE_LOAD_CALLER_PREF:
       $xavp(caller_usr_prefs[0]=>allowed_clis[*]): ['43110021*', '43110029*']
       $xavp(caller_real_prefs[0]=>allowed_clis[*]): ['43110021*', '43110029*']
-      $xavp(caller_usr_prefs[0]=>user_cli[*]): [43122122]
-      $xavp(caller_real_prefs[0]=>user_cli[*]): [43122122]
+      $xavp(caller_usr_prefs[0]=>user_cli[*]): ['43122122']
+      $xavp(caller_real_prefs[0]=>user_cli[*]): ['43122122']
       $xavp(caller_usr_prefs[0]=>inbound_upn[*]): ['from_display']
       $xavp(caller_real_prefs[0]=>inbound_upn[*]): ['from_display']
   - start|ROUTE_GET_CALLER_CLI:
-  - end|ROUTE_GET_CALLER_CLI:
+  - return|ROUTE_GET_CALLER_CLI:
   - start|ROUTE_GET_FORWARDER_CLI:
-  - end|ROUTE_GET_FORWARDER_CLI:
+  - return|ROUTE_GET_FORWARDER_CLI:
   - start|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_CHECK_CLI_ALLOWED:
       $xavp(caller_real_prefs[0]=>allowed_clis[*]): ['43110021*', '43110029*']
-  - end|ROUTE_CHECK_CLI_ALLOWED:
-  - end|ROUTE_CHECK_USERPROV_CLI:
+  - return|ROUTE_CHECK_CLI_ALLOWED:
+  - return|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_FIND_CALLEE:
   - start|ROUTE_CLIR:
-  - end|ROUTE_CLIR:
+  - return|ROUTE_CLIR:
   - start|ROUTE_CLEAR_CALLEE_PREF:
-  - end|ROUTE_CLEAR_CALLEE_PREF:
+  - return|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_BLOCK_OUT:
-  - end|ROUTE_BLOCK_OUT:
+  - return|ROUTE_BLOCK_OUT:
   - start|ROUTE_LOAD_CALLEE_PREF:
   - start|ROUTE_BLOCK_IN:
-  - end|ROUTE_BLOCK_IN:
-  - end|ROUTE_LOAD_CALLEE_PREF:
+  - return|ROUTE_BLOCK_IN:
+  - return|ROUTE_LOAD_CALLEE_PREF:
   - start|ROUTE_CHECK_PBX:
   - return|ROUTE_CHECK_PBX:
   - start|ROUTE_INVITE_TO_INT:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_SET_CALLER_DIALOG:
-  - end|ROUTE_SET_CALLER_DIALOG:
+  - return|ROUTE_SET_CALLER_DIALOG:
   - start|ROUTE_ACC_CALLER:
-  - end|ROUTE_ACC_CALLER:
+  - return|ROUTE_ACC_CALLER:
   - start|ROUTE_ACC_CALLEE:
-  - end|ROUTE_ACC_CALLEE:
+  - return|ROUTE_ACC_CALLEE:
   - start|BRANCH_ROUTE_SBC:
   - start|ROUTE_BRANCH_ACC_RTP:
-  - end|ROUTE_BRANCH_ACC_RTP:
+  - return|ROUTE_BRANCH_ACC_RTP:
   - start|ROUTE_SET_RUSER:
-  - end|ROUTE_SET_RUSER:
+  - return|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
-  - end|ROUTE_PREPARE_SST:
+  - return|ROUTE_PREPARE_SST:
   - start|ROUTE_PREPARE_MOH:
-  - end|ROUTE_PREPARE_MOH:
+  - return|ROUTE_PREPARE_MOH:
   - start|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_SET_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_SET_CALLEE:
-  - end|ROUTE_SET_CALLEE:
+  - return|ROUTE_SET_CALLEE:
   - start|ROUTE_ADD_CALLINFO:
-  - end|ROUTE_ADD_CALLINFO:
-  - end|BRANCH_ROUTE_SBC:
+  - return|ROUTE_ADD_CALLINFO:
+  - return|BRANCH_ROUTE_SBC:
+  # branch ??
+  - return|BRANCH_ROUTE_SBC:
   - exit|ROUTE_OUTBOUND:
-  # 101 Connecting
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
-  # 180 Ringing
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
-  # 200 OK
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
 sip_in:
   - '^INVITE'
   - 'Contact: sip:testuser1002@'
@@ -134,16 +127,3 @@ sip_out:
       'P-App-Param: ;aleg_sst_enable=no;sst_enable=no',
       'P-App-Name: sbc'
     ]
-  - [
-      '^SIP/2.0 180 Ringing',
-      'CSeq: 2 INVITE',
-      'From: "431100222" <sip:testuser1002@',
-      'To: <sip:testuser1003@'
-    ]
-  - [
-      '^SIP/2.0 200 OK',
-      'CSeq: 2 INVITE',
-      'From: "431100222" <sip:testuser1002@',
-      'To: <sip:testuser1003@'
-    ]
-

scenarios/invite_allowedcli_nonmatch/0007_test.yml.tt2

@@ -0,0 +1,15 @@
+flow:
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
+sip_in:
+  - '^SIP/2.0 180 Ringing'
+  - 'CSeq: 2 INVITE'
+  - 'From: <sip:43122122@'
+  - 'To: <sip:testuser1003@'
+sip_out:
+  - [
+      '^SIP/2.0 180 Ringing',
+      'CSeq: 2 INVITE',
+      'From: "431100222" <sip:testuser1002@',
+      'To: <sip:testuser1003@'
+    ]

scenarios/invite_allowedcli_nonmatch/0008_test.yml.tt2

@@ -0,0 +1,13 @@
+flow:
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
+sip_in:
+  - '^SIP/2.0 200 OK'
+  - 'CSeq: 2 INVITE'
+sip_out:
+  - [
+      '^SIP/2.0 200 OK',
+      'CSeq: 2 INVITE',
+      'From: "431100222" <sip:testuser1002@',
+      'To: <sip:testuser1003@'
+    ]

scenarios/invite_allowedcli_nonmatch/0009_test.yml.tt2

@@ -1,28 +1,21 @@
-# INVITE_OFFLINE scenario
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
-  - end|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
   - start|ROUTE_OUTBOUND:
+  - return|ROUTE_OUTBOUND:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
-  - 'Contact: sip:testuser1002@'
+  - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0'
   - 'CSeq: 2 ACK'
-  - 'Max-Forwards: 69'
-  - 'Content-Length: 0'
   - 'From: "431100222" <sip:testuser1002@'
   - 'To: <sip:testuser1003@'
-
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
-      'Contact: sip:testuser1002@',
+      '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0',
       'CSeq: 2 ACK',
-      'Max-Forwards: 68',
-      'Content-Length: 0',
       'From: "431100222" <sip:43122122@',
       'To: <sip:testuser1003@'
     ]

scenarios/invite_allowedcli_nonmatch/0010_test.yml.tt2

@@ -1,20 +1,20 @@
-# INVITE_OFFLINE scenario
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
-  - end|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
+  - start|BRANCH_ROUTE_SBC:
+  - return|BRANCH_ROUTE_SBC:
+  # branch ??
+  - return|BRANCH_ROUTE_SBC:
   - start|ROUTE_STOP_RTPPROXY:
   - start|ROUTE_RESTORE_CLUSTERSET:
-  - end|ROUTE_RESTORE_CLUSTERSET:
-  - end|ROUTE_STOP_RTPPROXY:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_STOP_RTPPROXY:
   - start|ROUTE_OUTBOUND:
   - exit|ROUTE_OUTBOUND:
-  # 200 OK
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
 sip_in:
   - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
@@ -41,10 +41,3 @@ sip_out:
       'From: "431100222" <sip:43122122@',
       'To: <sip:testuser1003@'
     ]
-  - [
-      '^SIP/2.0 200 OK',
-      'CSeq: 3 BYE',
-      'Content-Length: 0',
-      'From: "431100222" <sip:testuser1002@',
-      'To: <sip:testuser1003@'
-    ]

scenarios/invite_allowedcli_nonmatch/0011_test.yml.tt2

@@ -0,0 +1,17 @@
+flow:
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
+sip_in:
+  - '^SIP/2.0 200 OK'
+  - 'CSeq: 3 BYE'
+  - 'Content-Length: 0'
+  - 'From: "431100222" <sip:43122122@'
+  - 'To: <sip:testuser1003@'
+sip_out:
+  - [
+      '^SIP/2.0 200 OK',
+      'CSeq: 3 BYE',
+      'Content-Length: 0',
+      'From: "431100222" <sip:testuser1002@',
+      'To: <sip:testuser1003@'
+    ]

scenarios/invite_allowedcli_nonmatch/scenario.yml

@@ -1,3 +1,4 @@
+test_uuid: invite_allowedcli_nonmatch
 subscribers:
   spce.test:
     testuser1003:

scenarios/invite_allowedcli_nonmatch/sipp_scenario00.xml

@@ -8,7 +8,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: "431100222" <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 1 INVITE
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -29,9 +29,9 @@
 
   <recv response="100" rtd="1" optional="true">
   </recv>
-  
+
   <recv response="407" rtd="2" auth="true"/>
-  
+
   <send>
     <![CDATA[
 
@@ -39,7 +39,7 @@
       [last_Via:]
       From: "431100222" <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 1 ACK
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -57,7 +57,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: "431100222" <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 2 INVITE
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -96,7 +96,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: "431100222" <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       [routes]
       CSeq: 2 ACK
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
@@ -112,8 +112,8 @@
       <exec play_pcap_audio="scenarios/media181sec.pcap"/>
     </action>
   </nop>
-  
-  <pause milliseconds="1000"/> 
+
+  <pause milliseconds="1000"/>
 
   <send start_rtd="4">
     <![CDATA[
@@ -122,7 +122,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: "431100222" <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 3 BYE
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       [routes]
@@ -131,7 +131,7 @@
 
     ]]>
   </send>
-  
+
   <recv response="100" optional="true">
   </recv>
 
@@ -140,7 +140,7 @@
 
   <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200, 500, 1000"/>
 
-<!-- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/> >
+<!-- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/> -->
 
 </scenario>
 

scenarios/invite_allowedcli_nonmatch/sipp_scenario_responder00.xml

@@ -20,7 +20,7 @@
     ]]>
   </send>
 
-  <pause milliseconds="500"/> 
+  <pause milliseconds="500"/>
 
   <send>
     <![CDATA[
@@ -55,7 +55,7 @@
 
   <recv request="BYE">
   </recv>
-  
+
   <send>
     <![CDATA[
 

scenarios/invite_allowip/0001_test.yml.tt2

@@ -1,16 +1,15 @@
-# REGISTER scenario
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
-  - end|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
   - exit|ROUTE_AUTH:

scenarios/invite_allowip/0003_test.yml.tt2

@@ -1,36 +1,40 @@
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
-  - end|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
   - start|ROUTE_ADD_CALLINFO_REPLY:
-  - end|ROUTE_ADD_CALLINFO_REPLY:
-  - end|ROUTE_AUTH:
-  - end|ROUTE_FIND_CALLER:
+  - return|ROUTE_ADD_CALLINFO_REPLY:
+  - return|ROUTE_AUTH:
+  - return|ROUTE_FIND_CALLER:
   - start|ROUTE_LOAD_CALLER_PREF:
   - start|ROUTE_CLEAR_CALLER_PREF:
-  - end|ROUTE_CLEAR_CALLER_PREF:
-  - end|ROUTE_LOAD_CALLER_PREF:
+  - return|ROUTE_CLEAR_CALLER_PREF:
+  - return|ROUTE_LOAD_CALLER_PREF:
       $xavp(caller_usr_prefs[0]=>allowed_ips_grp[*]): '\d+'
       $xavp(caller_real_prefs[0]=>allowed_ips_grp[*]): '\d+'
   - start|ROUTE_ACC_FAILURE:
   - start|ROUTE_ACC_CALLER:
-  - end|ROUTE_ACC_CALLER:
+  - return|ROUTE_ACC_CALLER:
   - start|ROUTE_ACC_CALLEE:
-  - end|ROUTE_ACC_CALLEE:
-  - end|ROUTE_ACC_FAILURE:
+  - return|ROUTE_ACC_CALLEE:
+  - return|ROUTE_ACC_FAILURE:
   - start|ROUTE_EARLY_REJECT:
   - start|ROUTE_ADD_CALLINFO_REPLY:
-  - end|ROUTE_ADD_CALLINFO_REPLY:
+  - return|ROUTE_ADD_CALLINFO_REPLY:
+  - start|BRANCH_ROUTE_SBC:
+  - return|BRANCH_ROUTE_SBC:
+  # branch ??
+  - return|BRANCH_ROUTE_SBC:
   - exit|ROUTE_EARLY_REJECT:
 sip_in:
   - '^INVITE'

scenarios/invite_allowip/scenario.yml

@@ -1,3 +1,4 @@
+test_uuid: invite_allowip
 subscribers:
   spce.test:
     testuser1003:

scenarios/invite_allowip/sipp_scenario00.xml

@@ -8,7 +8,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 1 INVITE
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -29,9 +29,9 @@
 
   <recv response="100" rtd="1" optional="true">
   </recv>
-  
+
   <recv response="407" rtd="2" auth="true"/>
-  
+
   <send>
     <![CDATA[
 
@@ -39,7 +39,7 @@
       [last_Via:]
       From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 1 ACK
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -57,7 +57,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 2 INVITE
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -90,7 +90,7 @@
       [last_Via:]
       From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 2 ACK
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -101,7 +101,7 @@
 
   <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200, 500, 1000"/>
 
-<!-- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/> >
+<!-- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/> -->
 
 </scenario>
 

scenarios/invite_blockin_blst/0001_test.yml.tt2

@@ -1,16 +1,15 @@
-# REGISTER scenario
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
-  - end|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
   - exit|ROUTE_AUTH:

scenarios/invite_blockin_blst/0003_test.yml.tt2

@@ -1,60 +1,63 @@
-# REGISTER scenario
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
-  - end|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
   - start|ROUTE_ADD_CALLINFO_REPLY:
-  - end|ROUTE_ADD_CALLINFO_REPLY:
-  - end|ROUTE_AUTH:
-  - end|ROUTE_FIND_CALLER:
+  - return|ROUTE_ADD_CALLINFO_REPLY:
+  - return|ROUTE_AUTH:
+  - return|ROUTE_FIND_CALLER:
   - start|ROUTE_LOAD_CALLER_PREF:
   - start|ROUTE_CLEAR_CALLER_PREF:
-  - end|ROUTE_CLEAR_CALLER_PREF:
-  - end|ROUTE_LOAD_CALLER_PREF:
+  - return|ROUTE_CLEAR_CALLER_PREF:
+  - return|ROUTE_LOAD_CALLER_PREF:
   - start|ROUTE_GET_CALLER_CLI:
-  - end|ROUTE_GET_CALLER_CLI:
+  - return|ROUTE_GET_CALLER_CLI:
   - start|ROUTE_GET_FORWARDER_CLI:
-  - end|ROUTE_GET_FORWARDER_CLI:
+  - return|ROUTE_GET_FORWARDER_CLI:
   - start|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_CHECK_CLI_ALLOWED:
-  - end|ROUTE_CHECK_CLI_ALLOWED:
-  - end|ROUTE_CHECK_USERPROV_CLI:
+  - return|ROUTE_CHECK_CLI_ALLOWED:
+  - return|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_FIND_CALLEE:
   - start|ROUTE_CLIR:
-  - end|ROUTE_CLIR:
+  - return|ROUTE_CLIR:
   - start|ROUTE_CLEAR_CALLEE_PREF:
-  - end|ROUTE_CLEAR_CALLEE_PREF:
+  - return|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_BLOCK_OUT:
-  - end|ROUTE_BLOCK_OUT:
+  - return|ROUTE_BLOCK_OUT:
   - start|ROUTE_LOAD_CALLEE_PREF:
   - start|ROUTE_BLOCK_IN:
   - start|ROUTE_ACC_FAILURE:
   - start|ROUTE_ACC_CALLER:
-  - end|ROUTE_ACC_CALLER:
+  - return|ROUTE_ACC_CALLER:
   - start|ROUTE_ACC_CALLEE:
-  - end|ROUTE_ACC_CALLEE:
-  - end|ROUTE_ACC_FAILURE:
+  - return|ROUTE_ACC_CALLEE:
+  - return|ROUTE_ACC_FAILURE:
   - start|ROUTE_EARLY_REJECT:
   - start|ROUTE_ADD_CALLINFO_REPLY:
-  - end|ROUTE_ADD_CALLINFO_REPLY:
+  - return|ROUTE_ADD_CALLINFO_REPLY:
+  - start|BRANCH_ROUTE_SBC:
+  - return|BRANCH_ROUTE_SBC:
+  # branch ??
+  - return|BRANCH_ROUTE_SBC:
   - exit|ROUTE_EARLY_REJECT:
 sip_in:
   - '^INVITE'

scenarios/invite_blockin_blst/scenario.yml

@@ -1,3 +1,4 @@
+test_uuid: invite_blockin_blst
 subscribers:
   spce.test:
     testuser1003:

scenarios/invite_blockin_blst/sipp_scenario00.xml

@@ -8,7 +8,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 1 INVITE
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -29,9 +29,9 @@
 
   <recv response="100" rtd="1" optional="true">
   </recv>
-  
+
   <recv response="407" rtd="2" auth="true"/>
-  
+
   <send>
     <![CDATA[
 
@@ -39,7 +39,7 @@
       [last_Via:]
       From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 1 ACK
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -57,7 +57,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 2 INVITE
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -90,7 +90,7 @@
       [last_Via:]
       From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 2 ACK
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -101,7 +101,7 @@
 
   <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200, 500, 1000"/>
 
-<!-- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/> >
+<!-- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/> -->
 
 </scenario>
 

scenarios/invite_blockin_clir/0001_test.yml.tt2

@@ -1,16 +1,15 @@
-# REGISTER scenario
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
-  - end|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
   - exit|ROUTE_AUTH:

scenarios/invite_blockin_clir/0003_test.yml.tt2

@@ -1,60 +1,63 @@
-# REGISTER scenario
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
-  - end|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
   - start|ROUTE_ADD_CALLINFO_REPLY:
-  - end|ROUTE_ADD_CALLINFO_REPLY:
-  - end|ROUTE_AUTH:
-  - end|ROUTE_FIND_CALLER:
+  - return|ROUTE_ADD_CALLINFO_REPLY:
+  - return|ROUTE_AUTH:
+  - return|ROUTE_FIND_CALLER:
   - start|ROUTE_LOAD_CALLER_PREF:
   - start|ROUTE_CLEAR_CALLER_PREF:
-  - end|ROUTE_CLEAR_CALLER_PREF:
-  - end|ROUTE_LOAD_CALLER_PREF:
+  - return|ROUTE_CLEAR_CALLER_PREF:
+  - return|ROUTE_LOAD_CALLER_PREF:
   - start|ROUTE_GET_CALLER_CLI:
-  - end|ROUTE_GET_CALLER_CLI:
+  - return|ROUTE_GET_CALLER_CLI:
   - start|ROUTE_GET_FORWARDER_CLI:
-  - end|ROUTE_GET_FORWARDER_CLI:
+  - return|ROUTE_GET_FORWARDER_CLI:
   - start|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_CHECK_CLI_ALLOWED:
-  - end|ROUTE_CHECK_CLI_ALLOWED:
-  - end|ROUTE_CHECK_USERPROV_CLI:
+  - return|ROUTE_CHECK_CLI_ALLOWED:
+  - return|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_FIND_CALLEE:
   - start|ROUTE_CLIR:
-  - end|ROUTE_CLIR:
+  - return|ROUTE_CLIR:
   - start|ROUTE_CLEAR_CALLEE_PREF:
-  - end|ROUTE_CLEAR_CALLEE_PREF:
+  - return|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_BLOCK_OUT:
-  - end|ROUTE_BLOCK_OUT:
+  - return|ROUTE_BLOCK_OUT:
   - start|ROUTE_LOAD_CALLEE_PREF:
   - start|ROUTE_BLOCK_IN:
   - start|ROUTE_ACC_FAILURE:
   - start|ROUTE_ACC_CALLER:
-  - end|ROUTE_ACC_CALLER:
+  - return|ROUTE_ACC_CALLER:
   - start|ROUTE_ACC_CALLEE:
-  - end|ROUTE_ACC_CALLEE:
-  - end|ROUTE_ACC_FAILURE:
+  - return|ROUTE_ACC_CALLEE:
+  - return|ROUTE_ACC_FAILURE:
   - start|ROUTE_EARLY_REJECT:
   - start|ROUTE_ADD_CALLINFO_REPLY:
-  - end|ROUTE_ADD_CALLINFO_REPLY:
+  - return|ROUTE_ADD_CALLINFO_REPLY:
+  - start|BRANCH_ROUTE_SBC:
+  - return|BRANCH_ROUTE_SBC:
+  # branch ??
+  - return|BRANCH_ROUTE_SBC:
   - exit|ROUTE_EARLY_REJECT:
 sip_in:
   - '^INVITE'

scenarios/invite_blockin_clir/scenario.yml

@@ -1,3 +1,4 @@
+test_uuid: invite_blockin_clir
 subscribers:
   spce.test:
     testuser1003:

scenarios/invite_blockin_clir/sipp_scenario00.xml

@@ -8,7 +8,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 1 INVITE
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -29,9 +29,9 @@
 
   <recv response="100" rtd="1" optional="true">
   </recv>
-  
+
   <recv response="407" rtd="2" auth="true"/>
-  
+
   <send>
     <![CDATA[
 
@@ -39,7 +39,7 @@
       [last_Via:]
       From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 1 ACK
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -57,7 +57,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 2 INVITE
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -90,7 +90,7 @@
       [last_Via:]
       From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 2 ACK
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -101,7 +101,7 @@
 
   <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200, 500, 1000"/>
 
-<!-- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/> >
+<!-- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/> -->
 
 </scenario>
 

scenarios/invite_blockin_wlst/0001_test.yml.tt2

@@ -1,16 +1,15 @@
-# REGISTER scenario
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
-  - end|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
   - exit|ROUTE_AUTH:

scenarios/invite_blockin_wlst/0003_test.yml.tt2

@@ -1,60 +1,63 @@
-# REGISTER scenario
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
-  - end|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
   - start|ROUTE_ADD_CALLINFO_REPLY:
-  - end|ROUTE_ADD_CALLINFO_REPLY:
-  - end|ROUTE_AUTH:
-  - end|ROUTE_FIND_CALLER:
+  - return|ROUTE_ADD_CALLINFO_REPLY:
+  - return|ROUTE_AUTH:
+  - return|ROUTE_FIND_CALLER:
   - start|ROUTE_LOAD_CALLER_PREF:
   - start|ROUTE_CLEAR_CALLER_PREF:
-  - end|ROUTE_CLEAR_CALLER_PREF:
-  - end|ROUTE_LOAD_CALLER_PREF:
+  - return|ROUTE_CLEAR_CALLER_PREF:
+  - return|ROUTE_LOAD_CALLER_PREF:
   - start|ROUTE_GET_CALLER_CLI:
-  - end|ROUTE_GET_CALLER_CLI:
+  - return|ROUTE_GET_CALLER_CLI:
   - start|ROUTE_GET_FORWARDER_CLI:
-  - end|ROUTE_GET_FORWARDER_CLI:
+  - return|ROUTE_GET_FORWARDER_CLI:
   - start|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_CHECK_CLI_ALLOWED:
-  - end|ROUTE_CHECK_CLI_ALLOWED:
-  - end|ROUTE_CHECK_USERPROV_CLI:
+  - return|ROUTE_CHECK_CLI_ALLOWED:
+  - return|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_FIND_CALLEE:
   - start|ROUTE_CLIR:
-  - end|ROUTE_CLIR:
+  - return|ROUTE_CLIR:
   - start|ROUTE_CLEAR_CALLEE_PREF:
-  - end|ROUTE_CLEAR_CALLEE_PREF:
+  - return|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_BLOCK_OUT:
-  - end|ROUTE_BLOCK_OUT:
+  - return|ROUTE_BLOCK_OUT:
   - start|ROUTE_LOAD_CALLEE_PREF:
   - start|ROUTE_BLOCK_IN:
   - start|ROUTE_ACC_FAILURE:
   - start|ROUTE_ACC_CALLER:
-  - end|ROUTE_ACC_CALLER:
+  - return|ROUTE_ACC_CALLER:
   - start|ROUTE_ACC_CALLEE:
-  - end|ROUTE_ACC_CALLEE:
-  - end|ROUTE_ACC_FAILURE:
+  - return|ROUTE_ACC_CALLEE:
+  - return|ROUTE_ACC_FAILURE:
   - start|ROUTE_EARLY_REJECT:
   - start|ROUTE_ADD_CALLINFO_REPLY:
-  - end|ROUTE_ADD_CALLINFO_REPLY:
+  - return|ROUTE_ADD_CALLINFO_REPLY:
+  - start|BRANCH_ROUTE_SBC:
+  - return|BRANCH_ROUTE_SBC:
+  # branch ??
+  - return|BRANCH_ROUTE_SBC:
   - exit|ROUTE_EARLY_REJECT:
 sip_in:
   - '^INVITE'

scenarios/invite_blockin_wlst/scenario.yml

@@ -1,3 +1,4 @@
+test_uuid: invite_blockin_wlst
 subscribers:
   spce.test:
     testuser1003:

scenarios/invite_blockin_wlst/sipp_scenario00.xml

@@ -8,7 +8,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 1 INVITE
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -29,9 +29,9 @@
 
   <recv response="100" rtd="1" optional="true">
   </recv>
-  
+
   <recv response="407" rtd="2" auth="true"/>
-  
+
   <send>
     <![CDATA[
 
@@ -39,7 +39,7 @@
       [last_Via:]
       From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 1 ACK
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -57,7 +57,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 2 INVITE
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -90,7 +90,7 @@
       [last_Via:]
       From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 2 ACK
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -101,7 +101,7 @@
 
   <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200, 500, 1000"/>
 
-<!-- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/> >
+<!-- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/> -->
 
 </scenario>
 

scenarios/invite_blockout_blst/0001_test.yml.tt2

@@ -1,16 +1,15 @@
-# REGISTER scenario
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
-  - end|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
   - exit|ROUTE_AUTH:

scenarios/invite_blockout_blst/0003_test.yml.tt2

@@ -1,59 +1,62 @@
-# REGISTER scenario
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
-  - end|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
   - start|ROUTE_ADD_CALLINFO_REPLY:
-  - end|ROUTE_ADD_CALLINFO_REPLY:
-  - end|ROUTE_AUTH:
-  - end|ROUTE_FIND_CALLER:
+  - return|ROUTE_ADD_CALLINFO_REPLY:
+  - return|ROUTE_AUTH:
+  - return|ROUTE_FIND_CALLER:
   - start|ROUTE_LOAD_CALLER_PREF:
   - start|ROUTE_CLEAR_CALLER_PREF:
-  - end|ROUTE_CLEAR_CALLER_PREF:
-  - end|ROUTE_LOAD_CALLER_PREF:
+  - return|ROUTE_CLEAR_CALLER_PREF:
+  - return|ROUTE_LOAD_CALLER_PREF:
   - start|ROUTE_GET_CALLER_CLI:
-  - end|ROUTE_GET_CALLER_CLI:
+  - return|ROUTE_GET_CALLER_CLI:
   - start|ROUTE_GET_FORWARDER_CLI:
-  - end|ROUTE_GET_FORWARDER_CLI:
+  - return|ROUTE_GET_FORWARDER_CLI:
   - start|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_CHECK_CLI_ALLOWED:
-  - end|ROUTE_CHECK_CLI_ALLOWED:
-  - end|ROUTE_CHECK_USERPROV_CLI:
+  - return|ROUTE_CHECK_CLI_ALLOWED:
+  - return|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_FIND_CALLEE:
   - start|ROUTE_CLIR:
-  - end|ROUTE_CLIR:
+  - return|ROUTE_CLIR:
   - start|ROUTE_CLEAR_CALLEE_PREF:
-  - end|ROUTE_CLEAR_CALLEE_PREF:
+  - return|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_BLOCK_OUT:
-      $xavp(caller_usr_prefs[0]=>block_out_list[*]): [4311001, 4311003]
-      $xavp(caller_real_prefs[0]=>block_out_list[*]): [4311001, 4311003]
+      $xavp(caller_usr_prefs[0]=>block_out_list[*]): ['4311001', '4311003']
+      $xavp(caller_real_prefs[0]=>block_out_list[*]): ['4311001', '4311003']
   - start|ROUTE_ACC_FAILURE:
   - start|ROUTE_ACC_CALLER:
-  - end|ROUTE_ACC_CALLER:
+  - return|ROUTE_ACC_CALLER:
   - start|ROUTE_ACC_CALLEE:
-  - end|ROUTE_ACC_CALLEE:
-  - end|ROUTE_ACC_FAILURE:
+  - return|ROUTE_ACC_CALLEE:
+  - return|ROUTE_ACC_FAILURE:
   - start|ROUTE_EARLY_REJECT:
   - start|ROUTE_ADD_CALLINFO_REPLY:
-  - end|ROUTE_ADD_CALLINFO_REPLY:
+  - return|ROUTE_ADD_CALLINFO_REPLY:
+  - start|BRANCH_ROUTE_SBC:
+  - return|BRANCH_ROUTE_SBC:
+  # branch ??
+  - return|BRANCH_ROUTE_SBC:
   - exit|ROUTE_EARLY_REJECT:
 sip_in:
   - '^INVITE'

scenarios/invite_blockout_blst/scenario.yml

@@ -1,3 +1,4 @@
+test_uuid: invite_blockout_blst
 subscribers:
   spce.test:
     testuser1003:

scenarios/invite_blockout_blst/sipp_scenario00.xml

@@ -8,7 +8,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 1 INVITE
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -29,9 +29,9 @@
 
   <recv response="100" rtd="1" optional="true">
   </recv>
-  
+
   <recv response="407" rtd="2" auth="true"/>
-  
+
   <send>
     <![CDATA[
 
@@ -39,7 +39,7 @@
       [last_Via:]
       From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 1 ACK
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -57,7 +57,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 2 INVITE
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -90,7 +90,7 @@
       [last_Via:]
       From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 2 ACK
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -101,7 +101,7 @@
 
   <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200, 500, 1000"/>
 
-<!-- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/> >
+<!-- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/> -->
 
 </scenario>
 

scenarios/invite_blockout_ncos/0001_test.yml.tt2

@@ -1,16 +1,15 @@
-# REGISTER scenario
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
-  - end|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
   - exit|ROUTE_AUTH:

scenarios/invite_blockout_ncos/0003_test.yml.tt2

@@ -1,55 +1,58 @@
-# REGISTER scenario
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
-  - end|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
   - start|ROUTE_ADD_CALLINFO_REPLY:
-  - end|ROUTE_ADD_CALLINFO_REPLY:
-  - end|ROUTE_AUTH:
-  - end|ROUTE_FIND_CALLER:
+  - return|ROUTE_ADD_CALLINFO_REPLY:
+  - return|ROUTE_AUTH:
+  - return|ROUTE_FIND_CALLER:
   - start|ROUTE_LOAD_CALLER_PREF:
   - start|ROUTE_CLEAR_CALLER_PREF:
-  - end|ROUTE_CLEAR_CALLER_PREF:
-  - end|ROUTE_LOAD_CALLER_PREF:
+  - return|ROUTE_CLEAR_CALLER_PREF:
+  - return|ROUTE_LOAD_CALLER_PREF:
   - start|ROUTE_GET_CALLER_CLI:
-  - end|ROUTE_GET_CALLER_CLI:
+  - return|ROUTE_GET_CALLER_CLI:
   - start|ROUTE_GET_FORWARDER_CLI:
-  - end|ROUTE_GET_FORWARDER_CLI:
+  - return|ROUTE_GET_FORWARDER_CLI:
   - start|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_CHECK_CLI_ALLOWED:
-  - end|ROUTE_CHECK_CLI_ALLOWED:
-  - end|ROUTE_CHECK_USERPROV_CLI:
+  - return|ROUTE_CHECK_CLI_ALLOWED:
+  - return|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_FIND_CALLEE:
   - start|ROUTE_CLIR:
-  - end|ROUTE_CLIR:
+  - return|ROUTE_CLIR:
   - start|ROUTE_CLEAR_CALLEE_PREF:
-  - end|ROUTE_CLEAR_CALLEE_PREF:
+  - return|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_NCOS:
   - start|ROUTE_ACC_FAILURE:
   - start|ROUTE_ACC_CALLER:
-  - end|ROUTE_ACC_CALLER:
+  - return|ROUTE_ACC_CALLER:
   - start|ROUTE_ACC_CALLEE:
-  - end|ROUTE_ACC_CALLEE:
-  - end|ROUTE_ACC_FAILURE:
+  - return|ROUTE_ACC_CALLEE:
+  - return|ROUTE_ACC_FAILURE:
   - start|ROUTE_EARLY_REJECT:
   - start|ROUTE_ADD_CALLINFO_REPLY:
-  - end|ROUTE_ADD_CALLINFO_REPLY:
+  - return|ROUTE_ADD_CALLINFO_REPLY:
+  - start|BRANCH_ROUTE_SBC:
+  - return|BRANCH_ROUTE_SBC:
+  # branch ??
+  - return|BRANCH_ROUTE_SBC:
   - exit|ROUTE_EARLY_REJECT:
 sip_in:
   - '^INVITE'

scenarios/invite_blockout_ncos/scenario.yml

@@ -1,3 +1,4 @@
+test_uuid: invite_blockout_ncos
 subscribers:
   spce.test:
     testuser1003:

scenarios/invite_blockout_ncos/sipp_scenario00.xml

@@ -8,7 +8,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 1 INVITE
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -29,9 +29,9 @@
 
   <recv response="100" rtd="1" optional="true">
   </recv>
-  
+
   <recv response="407" rtd="2" auth="true"/>
-  
+
   <send>
     <![CDATA[
 
@@ -39,7 +39,7 @@
       [last_Via:]
       From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 1 ACK
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -57,7 +57,7 @@
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 2 INVITE
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -90,7 +90,7 @@
       [last_Via:]
       From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
-      Call-ID: [call_id]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 2 ACK
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
       Max-Forwards: 70
@@ -101,7 +101,7 @@
 
   <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200, 500, 1000"/>
 
-<!-- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/> >
+<!-- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/> -->
 
 </scenario>
 

scenarios/invite_blockout_pinoverride/0003_test.yml.tt2

@@ -1,16 +1,15 @@
-# REGISTER scenario
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
-  - end|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
   - exit|ROUTE_AUTH:

scenarios/invite_blockout_pinoverride/0005_test.yml.tt2

@@ -1,97 +1,89 @@
-# INVITE_OFFLINE scenario
 flow:
-  - start|MAIN:
+  - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
-  - end|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
   - start|ROUTE_INVITE:
   - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
   - start|ROUTE_ADD_CALLINFO_REPLY:
-  - end|ROUTE_ADD_CALLINFO_REPLY:
-  - end|ROUTE_AUTH:
-  - end|ROUTE_FIND_CALLER:
+  - return|ROUTE_ADD_CALLINFO_REPLY:
+  - return|ROUTE_AUTH:
+  - return|ROUTE_FIND_CALLER:
   - start|ROUTE_LOAD_CALLER_PREF:
   - start|ROUTE_CLEAR_CALLER_PREF:
-  - end|ROUTE_CLEAR_CALLER_PREF:
-  - end|ROUTE_LOAD_CALLER_PREF:
+  - return|ROUTE_CLEAR_CALLER_PREF:
+  - return|ROUTE_LOAD_CALLER_PREF:
   - start|ROUTE_GET_CALLER_CLI:
-  - end|ROUTE_GET_CALLER_CLI:
+  - return|ROUTE_GET_CALLER_CLI:
   - start|ROUTE_GET_FORWARDER_CLI:
-  - end|ROUTE_GET_FORWARDER_CLI:
+  - return|ROUTE_GET_FORWARDER_CLI:
   - start|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_CHECK_CLI_ALLOWED:
-  - end|ROUTE_CHECK_CLI_ALLOWED:
-  - end|ROUTE_CHECK_USERPROV_CLI:
+  - return|ROUTE_CHECK_CLI_ALLOWED:
+  - return|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_FIND_CALLEE:
   - start|ROUTE_CLIR:
-  - end|ROUTE_CLIR:
+  - return|ROUTE_CLIR:
   - start|ROUTE_CLEAR_CALLEE_PREF:
-  - end|ROUTE_CLEAR_CALLEE_PREF:
+  - return|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
   - start|ROUTE_BLOCK_OUT:
   - return|ROUTE_BLOCK_OUT:
   - start|ROUTE_LOAD_CALLEE_PREF:
   - start|ROUTE_BLOCK_IN:
-  - end|ROUTE_BLOCK_IN:
-  - end|ROUTE_LOAD_CALLEE_PREF:
+  - return|ROUTE_BLOCK_IN:
+  - return|ROUTE_LOAD_CALLEE_PREF:
   - start|ROUTE_CHECK_PBX:
   - return|ROUTE_CHECK_PBX:
   - start|ROUTE_INVITE_TO_INT:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_SET_CALLER_DIALOG:
-  - end|ROUTE_SET_CALLER_DIALOG:
+  - return|ROUTE_SET_CALLER_DIALOG:
   - start|ROUTE_ACC_CALLER:
-  - end|ROUTE_ACC_CALLER:
+  - return|ROUTE_ACC_CALLER:
   - start|ROUTE_ACC_CALLEE:
-  - end|ROUTE_ACC_CALLEE:
+  - return|ROUTE_ACC_CALLEE:
   - start|BRANCH_ROUTE_SBC:
   - start|ROUTE_BRANCH_ACC_RTP:
-  - end|ROUTE_BRANCH_ACC_RTP:
+  - return|ROUTE_BRANCH_ACC_RTP:
   - start|ROUTE_SET_RUSER:
-  - end|ROUTE_SET_RUSER:
+  - return|ROUTE_SET_RUSER:
   - start|ROUTE_PREPARE_SST:
-  - end|ROUTE_PREPARE_SST:
+  - return|ROUTE_PREPARE_SST:
   - start|ROUTE_PREPARE_MOH:
-  - end|ROUTE_PREPARE_MOH:
+  - return|ROUTE_PREPARE_MOH:
   - start|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_SET_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_SET_CALLEE:
-  - end|ROUTE_SET_CALLEE:
+  - return|ROUTE_SET_CALLEE:
   - start|ROUTE_ADD_CALLINFO:
-  - end|ROUTE_ADD_CALLINFO:
-  - end|BRANCH_ROUTE_SBC:
+  - return|ROUTE_ADD_CALLINFO:
+  - return|BRANCH_ROUTE_SBC:
+  # branch ??
+  - return|BRANCH_ROUTE_SBC:
   - exit|ROUTE_OUTBOUND:
-  # 101 Connecting
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
-  # 180 Ringing
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
-  # 200 OK
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
 sip_in:
   - '^INVITE'
   - 'Contact: sip:testuser1002@'
@@ -125,16 +117,3 @@ sip_out:
       'P-App-Param: ;aleg_sst_enable=no;sst_enable=no',
       'P-App-Name: sbc'
     ]
-  - [
-      '^SIP/2.0 180 Ringing',
-      'CSeq: 2 INVITE',
-      'From: <sip:testuser1002@',
-      'To: <sip:\*80\*4444311003@'
-    ]
-  - [
-      '^SIP/2.0 200 OK',
-      'CSeq: 2 INVITE',
-      'From: <sip:testuser1002@',
-      'To: <sip:\*80\*4444311003@'
-    ]
-

scenarios/invite_blockout_pinoverride/0007_test.yml.tt2

@@ -0,0 +1,11 @@
+flow:
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
+sip_in:
+  - '^SIP/2.0 180 Ringing'
+  - 'CSeq: 2 INVITE'
+sip_out:
+  - [
+      '^SIP/2.0 180 Ringing',
+      'CSeq: 2 INVITE',
+    ]

scenarios/invite_blockout_pinoverride/0008_test.yml.tt2

@@ -0,0 +1,13 @@
+flow:
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
+sip_in:
+  - '^SIP/2.0 200 OK'
+  - 'CSeq: 2 INVITE'
+sip_out:
+  - [
+      '^SIP/2.0 200 OK',
+      'CSeq: 2 INVITE',
+      'From: <sip:testuser1002@',
+      'To: <sip:\*80\*4444311003@'
+    ]