From e1a76fb1f4468079a3dd706b18f50b4c68c94169 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Wed, 11 Jun 2014 14:20:30 +0200 Subject: [PATCH] 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 | 70 ++++++- bin/check.sh | 92 +++++++-- bin/config_debug.pl | 2 + bin/graph_flow.pl | 34 ++- bin/restart_log.sh | 2 +- bin/scenario.pl | 11 +- bin/show_flow.pl | 27 ++- get_results.sh | 5 +- run_tests.sh | 20 +- scenarios/auth_fail/0001_test.yml.tt2 | 5 +- scenarios/auth_fail/0002_test.yml.tt2 | 5 +- scenarios/auth_fail/0003_test.yml.tt2 | 5 +- scenarios/auth_fail/0004_test.yml.tt2 | 5 +- scenarios/auth_fail/scenario.yml | 1 + scenarios/auth_fail/sipp_scenario00.xml | 10 +- .../incoming_foreign_dom/0003_test.yml.tt2 | 100 ++++----- .../incoming_foreign_dom/0005_test.yml.tt2 | 11 + .../incoming_foreign_dom/0006_test.yml.tt2 | 15 ++ .../incoming_foreign_dom/0007_test.yml.tt2 | 22 +- .../incoming_foreign_dom/0008_test.yml.tt2 | 31 ++- .../incoming_foreign_dom/0009_test.yml.tt2 | 17 ++ scenarios/incoming_foreign_dom/scenario.yml | 1 + .../incoming_foreign_dom/sipp_scenario00.xml | 6 +- scenarios/incoming_peer/0003_test.yml.tt2 | 96 ++++----- scenarios/incoming_peer/0005_test.yml.tt2 | 12 ++ scenarios/incoming_peer/0006_test.yml.tt2 | 15 ++ scenarios/incoming_peer/0007_test.yml.tt2 | 18 +- scenarios/incoming_peer/0008_test.yml.tt2 | 25 +-- scenarios/incoming_peer/0009_test.yml.tt2 | 17 ++ scenarios/incoming_peer/scenario.yml | 1 + scenarios/incoming_peer/sipp_scenario00.xml | 12 +- .../sipp_scenario_responder00.xml | 4 +- scenarios/invite/0003_test.yml.tt2 | 11 +- scenarios/invite/0005_test.yml.tt2 | 102 ++++----- scenarios/invite/0007_test.yml.tt2 | 11 + scenarios/invite/0008_test.yml.tt2 | 13 ++ scenarios/invite/0009_test.yml.tt2 | 19 +- scenarios/invite/0010_test.yml.tt2 | 25 +-- scenarios/invite/0011_test.yml.tt2 | 17 ++ scenarios/invite/scenario.yml | 1 + scenarios/invite/sipp_scenario00.xml | 22 +- .../invite/sipp_scenario_responder00.xml | 4 +- .../invite_allowedcli_match/0003_test.yml.tt2 | 11 +- .../invite_allowedcli_match/0005_test.yml.tt2 | 107 ++++------ .../invite_allowedcli_match/0007_test.yml.tt2 | 15 ++ .../invite_allowedcli_match/0008_test.yml.tt2 | 13 ++ .../invite_allowedcli_match/0009_test.yml.tt2 | 19 +- .../invite_allowedcli_match/0010_test.yml.tt2 | 25 +-- .../invite_allowedcli_match/0011_test.yml.tt2 | 17 ++ .../invite_allowedcli_match/scenario.yml | 1 + .../sipp_scenario00.xml | 22 +- .../sipp_scenario_responder00.xml | 4 +- .../0003_test.yml.tt2 | 10 +- .../0005_test.yml.tt2 | 104 ++++------ .../0007_test.yml.tt2 | 15 ++ .../0008_test.yml.tt2 | 13 ++ .../0009_test.yml.tt2 | 19 +- .../0010_test.yml.tt2 | 25 +-- .../0011_test.yml.tt2 | 17 ++ .../scenario.yml | 1 + .../sipp_scenario00.xml | 22 +- .../sipp_scenario_responder00.xml | 4 +- .../0003_test.yml.tt2 | 10 +- .../0005_test.yml.tt2 | 106 ++++------ .../0007_test.yml.tt2 | 15 ++ .../0008_test.yml.tt2 | 13 ++ .../0009_test.yml.tt2 | 19 +- .../0010_test.yml.tt2 | 25 +-- .../0011_test.yml.tt2 | 17 ++ .../invite_allowedcli_nonmatch/scenario.yml | 1 + .../sipp_scenario00.xml | 22 +- .../sipp_scenario_responder00.xml | 4 +- scenarios/invite_allowip/0001_test.yml.tt2 | 11 +- scenarios/invite_allowip/0003_test.yml.tt2 | 32 +-- scenarios/invite_allowip/scenario.yml | 1 + scenarios/invite_allowip/sipp_scenario00.xml | 14 +- .../invite_blockin_blst/0001_test.yml.tt2 | 11 +- .../invite_blockin_blst/0003_test.yml.tt2 | 55 ++--- scenarios/invite_blockin_blst/scenario.yml | 1 + .../invite_blockin_blst/sipp_scenario00.xml | 14 +- .../invite_blockin_clir/0001_test.yml.tt2 | 11 +- .../invite_blockin_clir/0003_test.yml.tt2 | 55 ++--- scenarios/invite_blockin_clir/scenario.yml | 1 + .../invite_blockin_clir/sipp_scenario00.xml | 14 +- .../invite_blockin_wlst/0001_test.yml.tt2 | 11 +- .../invite_blockin_wlst/0003_test.yml.tt2 | 55 ++--- scenarios/invite_blockin_wlst/scenario.yml | 1 + .../invite_blockin_wlst/sipp_scenario00.xml | 14 +- .../invite_blockout_blst/0001_test.yml.tt2 | 11 +- .../invite_blockout_blst/0003_test.yml.tt2 | 57 ++--- scenarios/invite_blockout_blst/scenario.yml | 1 + .../invite_blockout_blst/sipp_scenario00.xml | 14 +- .../invite_blockout_ncos/0001_test.yml.tt2 | 11 +- .../invite_blockout_ncos/0003_test.yml.tt2 | 51 ++--- scenarios/invite_blockout_ncos/scenario.yml | 1 + .../invite_blockout_ncos/sipp_scenario00.xml | 14 +- .../0003_test.yml.tt2 | 11 +- .../0005_test.yml.tt2 | 99 ++++----- .../0007_test.yml.tt2 | 11 + .../0008_test.yml.tt2 | 13 ++ .../0009_test.yml.tt2 | 19 +- .../0010_test.yml.tt2 | 25 +-- .../0011_test.yml.tt2 | 17 ++ .../invite_blockout_pinoverride/scenario.yml | 1 + .../sipp_scenario00.xml | 22 +- .../sipp_scenario_responder00.xml | 4 +- .../invite_blockout_wlst/0001_test.yml.tt2 | 11 +- .../invite_blockout_wlst/0003_test.yml.tt2 | 53 ++--- scenarios/invite_blockout_wlst/scenario.yml | 1 + .../invite_blockout_wlst/sipp_scenario00.xml | 14 +- .../invite_callforward/0007_test.yml.tt2 | 11 +- .../invite_callforward/0009_test.yml.tt2 | 63 +++--- .../invite_callforward/0011_test.yml.tt2 | 117 ++++------- .../invite_callforward/0017_test.yml.tt2 | 8 +- .../invite_callforward/0018_test.yml.tt2 | 25 --- .../invite_callforward/0019_test.yml.tt2 | 41 ++++ .../invite_callforward/0020_test.yml.tt2 | 36 ++++ .../invite_callforward/0021_test.yml.tt2 | 17 ++ .../invite_callforward/0022_test.yml.tt2 | 17 ++ .../invite_callforward/0023_test.yml.tt2 | 11 +- .../invite_callforward/0025_test.yml.tt2 | 135 ++++-------- .../invite_callforward/0029_test.yml.tt2 | 136 ++++-------- .../invite_callforward/0031_test.yml.tt2 | 11 + .../invite_callforward/0032_test.yml.tt2 | 11 + .../invite_callforward/0033_test.yml.tt2 | 19 ++ .../invite_callforward/0034_test.yml.tt2 | 19 ++ .../invite_callforward/0037_test.yml.tt2 | 41 ++++ .../invite_callforward/0038_test.yml.tt2 | 36 ++++ .../invite_callforward/0039_test.yml.tt2 | 17 ++ .../invite_callforward/0040_test.yml.tt2 | 17 ++ scenarios/invite_callforward/scenario.yml | 1 + .../invite_callforward/sipp_scenario00.xml | 22 +- .../invite_callforward/sipp_scenario01.xml | 22 +- .../sipp_scenario_responder01.xml | 2 +- .../sipp_scenario_responder03.xml | 2 +- .../invite_concurrent_max/0005_test.yml.tt2 | 11 +- .../invite_concurrent_max/0007_test.yml.tt2 | 105 ++++------ .../invite_concurrent_max/0012_test.yml.tt2 | 11 +- .../invite_concurrent_max/0014_test.yml.tt2 | 57 ++--- .../invite_concurrent_max/0016_test.yml.tt2 | 43 ++++ .../invite_concurrent_max/0017_test.yml.tt2 | 17 ++ scenarios/invite_concurrent_max/scenario.yml | 1 + .../invite_concurrent_max/sipp_scenario00.xml | 22 +- .../sipp_scenario_responder00.xml | 4 +- .../sipp_scenario_responder01.xml | 17 +- .../0005_test.yml.tt2 | 11 +- .../0007_test.yml.tt2 | 103 ++++----- .../0012_test.yml.tt2 | 11 +- .../0014_test.yml.tt2 | 21 +- .../0016_test.yml.tt2 | 13 ++ .../0018_test.yml.tt2 | 58 +++--- .../0020_test.yml.tt2 | 43 ++++ .../0021_test.yml.tt2 | 17 ++ .../invite_concurrent_max_out/scenario.yml | 1 + .../sipp_scenario00.xml | 8 +- .../sipp_scenario_responder01.xml | 10 +- .../0001_test.yml.tt2 | 11 +- .../0003_test.yml.tt2 | 101 ++++----- .../0005_test.yml.tt2 | 11 + .../0006_test.yml.tt2 | 13 ++ .../0008_test.yml.tt2 | 20 +- .../0010_test.yml.tt2 | 13 ++ .../0012_test.yml.tt2 | 13 +- .../0014_test.yml.tt2 | 58 +++--- .../0016_test.yml.tt2 | 22 +- .../0017_test.yml.tt2 | 17 ++ .../scenario.yml | 1 + .../sipp_scenario00.xml | 18 +- .../0005_test.yml.tt2 | 10 +- .../0007_test.yml.tt2 | 104 ++++------ .../0009_test.yml.tt2 | 11 + .../0010_test.yml.tt2 | 13 ++ .../0012_test.yml.tt2 | 10 +- .../0014_test.yml.tt2 | 56 ++--- .../0015_test.yml.tt2 | 39 ++++ .../0016_test.yml.tt2 | 17 ++ .../scenario.yml | 1 + .../sipp_scenario00.xml | 22 +- .../sipp_scenario_responder00.xml | 4 +- .../sipp_scenario_responder01.xml | 10 +- .../invite_foreign_dom/0001_test.yml.tt2 | 10 +- .../invite_foreign_dom/0003_test.yml.tt2 | 92 ++++----- .../invite_foreign_dom/0005_test.yml.tt2 | 11 + .../invite_foreign_dom/0006_test.yml.tt2 | 13 ++ .../invite_foreign_dom/0007_test.yml.tt2 | 7 +- .../invite_foreign_dom/0008_test.yml.tt2 | 25 +-- .../invite_foreign_dom/0009_test.yml.tt2 | 17 ++ scenarios/invite_foreign_dom/scenario.yml | 1 + .../invite_foreign_dom/sipp_scenario00.xml | 22 +- .../sipp_scenario_responder00.xml | 4 +- .../invite_ignore_allowip/0003_test.yml.tt2 | 11 +- .../invite_ignore_allowip/0005_test.yml.tt2 | 103 ++++----- .../invite_ignore_allowip/0007_test.yml.tt2 | 11 + .../invite_ignore_allowip/0008_test.yml.tt2 | 13 ++ .../invite_ignore_allowip/0009_test.yml.tt2 | 19 +- .../invite_ignore_allowip/0010_test.yml.tt2 | 25 +-- .../invite_ignore_allowip/0011_test.yml.tt2 | 17 ++ scenarios/invite_ignore_allowip/scenario.yml | 1 + .../invite_ignore_allowip/sipp_scenario00.xml | 22 +- .../sipp_scenario_responder00.xml | 4 +- scenarios/invite_no_refer/0003_test.yml.tt2 | 11 +- scenarios/invite_no_refer/0005_test.yml.tt2 | 104 ++++------ scenarios/invite_no_refer/0007_test.yml.tt2 | 11 + scenarios/invite_no_refer/0008_test.yml.tt2 | 14 ++ scenarios/invite_no_refer/0009_test.yml.tt2 | 19 +- scenarios/invite_no_refer/0010_test.yml.tt2 | 25 +-- scenarios/invite_no_refer/0011_test.yml.tt2 | 17 ++ scenarios/invite_no_refer/scenario.yml | 1 + scenarios/invite_no_refer/sipp_scenario00.xml | 22 +- .../sipp_scenario_responder00.xml | 2 +- scenarios/invite_offline/0001_test.yml.tt2 | 10 +- scenarios/invite_offline/0003_test.yml.tt2 | 58 +++--- scenarios/invite_offline/0005_test.yml.tt2 | 58 +++--- scenarios/invite_offline/scenario.yml | 1 + scenarios/invite_offline/sipp_scenario00.xml | 18 +- scenarios/invite_peerout/0001_test.yml.tt2 | 11 +- scenarios/invite_peerout/0003_test.yml.tt2 | 103 ++++----- scenarios/invite_peerout/0005_test.yml.tt2 | 15 ++ scenarios/invite_peerout/0006_test.yml.tt2 | 15 ++ scenarios/invite_peerout/0007_test.yml.tt2 | 7 +- scenarios/invite_peerout/0008_test.yml.tt2 | 24 +-- scenarios/invite_peerout/0009_test.yml.tt2 | 17 ++ scenarios/invite_peerout/scenario.yml | 1 + scenarios/invite_peerout/sipp_scenario00.xml | 22 +- .../sipp_scenario_responder00.xml | 4 +- .../invite_peerout_rewrite/0001_test.yml.tt2 | 11 +- .../invite_peerout_rewrite/0003_test.yml.tt2 | 107 ++++------ .../invite_peerout_rewrite/0005_test.yml.tt2 | 15 ++ .../invite_peerout_rewrite/0006_test.yml.tt2 | 15 ++ .../invite_peerout_rewrite/0007_test.yml.tt2 | 8 +- .../invite_peerout_rewrite/0008_test.yml.tt2 | 25 +-- .../invite_peerout_rewrite/0009_test.yml.tt2 | 17 ++ scenarios/invite_peerout_rewrite/scenario.yml | 1 + .../sipp_scenario00.xml | 22 +- .../sipp_scenario_responder00.xml | 4 +- scenarios/invite_redirect/0005_test.yml.tt2 | 10 +- scenarios/invite_redirect/0007_test.yml.tt2 | 195 ++++-------------- scenarios/invite_redirect/0009_test.yml.tt2 | 99 +++++++++ scenarios/invite_redirect/0011_test.yml.tt2 | 15 ++ scenarios/invite_redirect/0012_test.yml.tt2 | 15 ++ .../0013_test.yml.tt2} | 8 +- scenarios/invite_redirect/0014_test.yml.tt2 | 43 ++++ scenarios/invite_redirect/0015_test.yml.tt2 | 17 ++ scenarios/invite_redirect/scenario.yml | 1 + scenarios/invite_redirect/sipp_scenario00.xml | 22 +- .../sipp_scenario_responder01.xml | 4 +- scenarios/invite_speeddial/0005_test.yml.tt2 | 11 +- scenarios/invite_speeddial/0007_test.yml.tt2 | 106 ++++------ scenarios/invite_speeddial/0009_test.yml.tt2 | 15 ++ scenarios/invite_speeddial/0010_test.yml.tt2 | 15 ++ scenarios/invite_speeddial/0011_test.yml.tt2 | 8 +- scenarios/invite_speeddial/0012_test.yml.tt2 | 25 +-- scenarios/invite_speeddial/0013_test.yml.tt2 | 15 ++ scenarios/invite_speeddial/0014_test.yml.tt2 | 11 +- scenarios/invite_speeddial/0016_test.yml.tt2 | 106 ++++------ scenarios/invite_speeddial/0018_test.yml.tt2 | 16 ++ scenarios/invite_speeddial/0019_test.yml.tt2 | 19 ++ scenarios/invite_speeddial/0020_test.yml.tt2 | 8 +- scenarios/invite_speeddial/0021_test.yml.tt2 | 24 +-- scenarios/invite_speeddial/0022_test.yml.tt2 | 15 ++ scenarios/invite_speeddial/0023_test.yml.tt2 | 10 +- scenarios/invite_speeddial/0025_test.yml.tt2 | 54 ++--- scenarios/invite_speeddial/0027_test.yml.tt2 | 11 +- scenarios/invite_speeddial/0029_test.yml.tt2 | 41 ++-- scenarios/invite_speeddial/scenario.yml | 1 + .../invite_speeddial/sipp_scenario00.xml | 22 +- .../invite_speeddial/sipp_scenario01.xml | 22 +- .../invite_speeddial/sipp_scenario02.xml | 14 +- .../invite_speeddial/sipp_scenario03.xml | 14 +- .../sipp_scenario_responder01.xml | 4 +- scenarios/invite_tcp_udp/0003_test.yml.tt2 | 10 +- scenarios/invite_tcp_udp/0005_test.yml.tt2 | 103 ++++----- scenarios/invite_tcp_udp/0010_test.yml.tt2 | 24 +-- scenarios/invite_tcp_udp/scenario.yml | 1 + scenarios/invite_tcp_udp/sipp_scenario00.xml | 22 +- .../sipp_scenario_responder00.xml | 4 +- .../invite_tcp_udp_reinvite/0003_test.yml.tt2 | 10 +- .../invite_tcp_udp_reinvite/0005_test.yml.tt2 | 102 ++++----- .../invite_tcp_udp_reinvite/0009_test.yml.tt2 | 28 --- .../invite_tcp_udp_reinvite/0010_test.yml.tt2 | 17 +- .../invite_tcp_udp_reinvite/0013_test.yml.tt2 | 24 +-- .../invite_tcp_udp_reinvite/scenario.yml | 1 + .../sipp_scenario00.xml | 12 +- scenarios/invite_voicebox/0001_test.yml.tt2 | 11 +- scenarios/invite_voicebox/0003_test.yml.tt2 | 62 +++--- scenarios/invite_voicebox/0005_test.yml.tt2 | 77 +++---- scenarios/invite_voicebox/0009_test.yml.tt2 | 8 +- scenarios/invite_voicebox/0010_test.yml.tt2 | 25 --- scenarios/invite_voicebox/0011_test.yml.tt2 | 27 +-- ...est.yml.tt2.disabled => 0012_test.yml.tt2} | 25 +-- scenarios/invite_voicebox/scenario.yml | 1 + scenarios/invite_voicebox/sipp_scenario00.xml | 22 +- scenarios/register/0001_test.yml.tt2 | 5 +- scenarios/register/0002_test.yml.tt2 | 9 +- scenarios/register/scenario.yml | 1 + scenarios/register/sipp_scenario00.xml | 10 +- scenarios/register_allowip/0001_test.yml.tt2 | 5 +- scenarios/register_allowip/0002_test.yml.tt2 | 7 +- scenarios/register_allowip/scenario.yml | 1 + .../register_allowip/sipp_scenario00.xml | 10 +- scenarios/register_bria/0001_test.yml.tt2 | 5 +- scenarios/register_bria/0002_test.yml.tt2 | 9 +- scenarios/register_bria/0003_test.yml.tt2 | 5 +- scenarios/register_bria/0004_test.yml.tt2 | 9 +- scenarios/register_bria/0005_test.yml.tt2 | 5 +- scenarios/register_bria/0006_test.yml.tt2 | 9 +- scenarios/register_bria/scenario.yml | 1 + scenarios/register_bria/sipp_scenario00.xml | 4 +- scenarios/register_bria/sipp_scenario01.xml | 4 +- scenarios/register_bria/sipp_scenario02.xml | 10 +- .../register_ignore_allowip/0001_test.yml.tt2 | 5 +- .../register_ignore_allowip/0002_test.yml.tt2 | 9 +- .../register_ignore_allowip/scenario.yml | 1 + .../sipp_scenario00.xml | 10 +- scenarios/register_tcp/0001_test.yml.tt2 | 5 +- scenarios/register_tcp/0002_test.yml.tt2 | 9 +- scenarios/register_tcp/scenario.yml | 1 + scenarios/register_tcp/sipp_scenario00.xml | 4 +- scenarios/reminder/0001_test.yml.tt2 | 11 +- scenarios/reminder/0003_test.yml.tt2 | 71 +++---- scenarios/reminder/0005_test.yml.tt2 | 21 ++ scenarios/reminder/scenario.yml | 1 + scenarios/reminder/sipp_scenario00.xml | 14 +- .../sipp_scenario_responder_reg.xml.tt2 | 10 +- .../sipp_scenario00.xml | 10 +- .../0001_test.yml.tt2 | 11 +- .../0003_test.yml.tt2 | 107 ++++------ .../0004_test.yml.tt2 | 15 ++ .../0005_test.yml.tt2 | 15 ++ .../0006_test.yml.tt2 | 7 +- .../0007_test.yml.tt2 | 24 +-- .../0008_test.yml.tt2 | 17 ++ .../invite_peerout_rewrite_pv_regex/peer.yml | 0 .../invite_peerout_rewrite_pv_regex/prefs.yml | 0 .../rewrite.yml | 0 .../scenario.yml | 1 + .../sipp_scenario00.xml | 20 +- .../sipp_scenario_responder00.xml | 4 +- .../presence/sipp_scenario00.xml | 30 +-- .../presence/sipp_scenario_responder01.xml | 12 +- 340 files changed, 4218 insertions(+), 3607 deletions(-) create mode 100644 scenarios/incoming_foreign_dom/0005_test.yml.tt2 create mode 100644 scenarios/incoming_foreign_dom/0006_test.yml.tt2 create mode 100644 scenarios/incoming_foreign_dom/0009_test.yml.tt2 create mode 100644 scenarios/incoming_peer/0005_test.yml.tt2 create mode 100644 scenarios/incoming_peer/0006_test.yml.tt2 create mode 100644 scenarios/incoming_peer/0009_test.yml.tt2 create mode 100644 scenarios/invite/0007_test.yml.tt2 create mode 100644 scenarios/invite/0008_test.yml.tt2 create mode 100644 scenarios/invite/0011_test.yml.tt2 create mode 100644 scenarios/invite_allowedcli_match/0007_test.yml.tt2 create mode 100644 scenarios/invite_allowedcli_match/0008_test.yml.tt2 create mode 100644 scenarios/invite_allowedcli_match/0011_test.yml.tt2 create mode 100644 scenarios/invite_allowedcli_match_alias/0007_test.yml.tt2 create mode 100644 scenarios/invite_allowedcli_match_alias/0008_test.yml.tt2 create mode 100644 scenarios/invite_allowedcli_match_alias/0011_test.yml.tt2 create mode 100644 scenarios/invite_allowedcli_nonmatch/0007_test.yml.tt2 create mode 100644 scenarios/invite_allowedcli_nonmatch/0008_test.yml.tt2 create mode 100644 scenarios/invite_allowedcli_nonmatch/0011_test.yml.tt2 create mode 100644 scenarios/invite_blockout_pinoverride/0007_test.yml.tt2 create mode 100644 scenarios/invite_blockout_pinoverride/0008_test.yml.tt2 create mode 100644 scenarios/invite_blockout_pinoverride/0011_test.yml.tt2 delete mode 100644 scenarios/invite_callforward/0018_test.yml.tt2 create mode 100644 scenarios/invite_callforward/0019_test.yml.tt2 create mode 100644 scenarios/invite_callforward/0020_test.yml.tt2 create mode 100644 scenarios/invite_callforward/0021_test.yml.tt2 create mode 100644 scenarios/invite_callforward/0022_test.yml.tt2 create mode 100644 scenarios/invite_callforward/0031_test.yml.tt2 create mode 100644 scenarios/invite_callforward/0032_test.yml.tt2 create mode 100644 scenarios/invite_callforward/0033_test.yml.tt2 create mode 100644 scenarios/invite_callforward/0034_test.yml.tt2 create mode 100644 scenarios/invite_callforward/0037_test.yml.tt2 create mode 100644 scenarios/invite_callforward/0038_test.yml.tt2 create mode 100644 scenarios/invite_callforward/0039_test.yml.tt2 create mode 100644 scenarios/invite_callforward/0040_test.yml.tt2 create mode 100644 scenarios/invite_concurrent_max/0016_test.yml.tt2 create mode 100644 scenarios/invite_concurrent_max/0017_test.yml.tt2 create mode 100644 scenarios/invite_concurrent_max_out/0016_test.yml.tt2 create mode 100644 scenarios/invite_concurrent_max_out/0020_test.yml.tt2 create mode 100644 scenarios/invite_concurrent_max_out/0021_test.yml.tt2 create mode 100644 scenarios/invite_concurrent_max_out_per_account/0005_test.yml.tt2 create mode 100644 scenarios/invite_concurrent_max_out_per_account/0006_test.yml.tt2 create mode 100644 scenarios/invite_concurrent_max_out_per_account/0010_test.yml.tt2 create mode 100644 scenarios/invite_concurrent_max_out_per_account/0017_test.yml.tt2 create mode 100644 scenarios/invite_concurrent_max_per_account/0009_test.yml.tt2 create mode 100644 scenarios/invite_concurrent_max_per_account/0010_test.yml.tt2 create mode 100644 scenarios/invite_concurrent_max_per_account/0015_test.yml.tt2 create mode 100644 scenarios/invite_concurrent_max_per_account/0016_test.yml.tt2 create mode 100644 scenarios/invite_foreign_dom/0005_test.yml.tt2 create mode 100644 scenarios/invite_foreign_dom/0006_test.yml.tt2 create mode 100644 scenarios/invite_foreign_dom/0009_test.yml.tt2 create mode 100644 scenarios/invite_ignore_allowip/0007_test.yml.tt2 create mode 100644 scenarios/invite_ignore_allowip/0008_test.yml.tt2 create mode 100644 scenarios/invite_ignore_allowip/0011_test.yml.tt2 create mode 100644 scenarios/invite_no_refer/0007_test.yml.tt2 create mode 100644 scenarios/invite_no_refer/0008_test.yml.tt2 create mode 100644 scenarios/invite_no_refer/0011_test.yml.tt2 create mode 100644 scenarios/invite_peerout/0005_test.yml.tt2 create mode 100644 scenarios/invite_peerout/0006_test.yml.tt2 create mode 100644 scenarios/invite_peerout/0009_test.yml.tt2 create mode 100644 scenarios/invite_peerout_rewrite/0005_test.yml.tt2 create mode 100644 scenarios/invite_peerout_rewrite/0006_test.yml.tt2 create mode 100644 scenarios/invite_peerout_rewrite/0009_test.yml.tt2 create mode 100644 scenarios/invite_redirect/0009_test.yml.tt2 create mode 100644 scenarios/invite_redirect/0011_test.yml.tt2 create mode 100644 scenarios/invite_redirect/0012_test.yml.tt2 rename scenarios/{invite_tcp_udp/0009_test.yml.tt2 => invite_redirect/0013_test.yml.tt2} (84%) create mode 100644 scenarios/invite_redirect/0014_test.yml.tt2 create mode 100644 scenarios/invite_redirect/0015_test.yml.tt2 create mode 100644 scenarios/invite_speeddial/0009_test.yml.tt2 create mode 100644 scenarios/invite_speeddial/0010_test.yml.tt2 create mode 100644 scenarios/invite_speeddial/0013_test.yml.tt2 create mode 100644 scenarios/invite_speeddial/0018_test.yml.tt2 create mode 100644 scenarios/invite_speeddial/0019_test.yml.tt2 create mode 100644 scenarios/invite_speeddial/0022_test.yml.tt2 delete mode 100644 scenarios/invite_tcp_udp_reinvite/0009_test.yml.tt2 delete mode 100644 scenarios/invite_voicebox/0010_test.yml.tt2 rename scenarios/invite_voicebox/{0013_test.yml.tt2.disabled => 0012_test.yml.tt2} (62%) create mode 100644 scenarios/reminder/0005_test.yml.tt2 rename {scenarios => scenarios_disabled}/invite_peerout_rewrite_pv_regex/0001_test.yml.tt2 (81%) rename {scenarios => scenarios_disabled}/invite_peerout_rewrite_pv_regex/0003_test.yml.tt2 (62%) create mode 100644 scenarios_disabled/invite_peerout_rewrite_pv_regex/0004_test.yml.tt2 create mode 100644 scenarios_disabled/invite_peerout_rewrite_pv_regex/0005_test.yml.tt2 rename scenarios/invite_peerout_rewrite_pv_regex/0007_test.yml.tt2 => scenarios_disabled/invite_peerout_rewrite_pv_regex/0006_test.yml.tt2 (84%) rename scenarios/invite_peerout_rewrite_pv_regex/0008_test.yml.tt2 => scenarios_disabled/invite_peerout_rewrite_pv_regex/0007_test.yml.tt2 (71%) create mode 100644 scenarios_disabled/invite_peerout_rewrite_pv_regex/0008_test.yml.tt2 rename {scenarios => scenarios_disabled}/invite_peerout_rewrite_pv_regex/peer.yml (100%) rename {scenarios => scenarios_disabled}/invite_peerout_rewrite_pv_regex/prefs.yml (100%) rename {scenarios => scenarios_disabled}/invite_peerout_rewrite_pv_regex/rewrite.yml (100%) rename {scenarios => scenarios_disabled}/invite_peerout_rewrite_pv_regex/scenario.yml (89%) rename {scenarios => scenarios_disabled}/invite_peerout_rewrite_pv_regex/sipp_scenario00.xml (91%) rename {scenarios => scenarios_disabled}/invite_peerout_rewrite_pv_regex/sipp_scenario_responder00.xml (97%) diff --git a/bin/check.py b/bin/check.py index 9bc75722..3111f926 100755 --- a/bin/check.py +++ b/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]) diff --git a/bin/check.sh b/bin/check.sh index 5d190c29..6fb27786 100755 --- a/bin/check.sh +++ b/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" diff --git a/bin/config_debug.pl b/bin/config_debug.pl index e58cbc94..229b6f81 100755 --- a/bin/config_debug.pl +++ b/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}' ]; diff --git a/bin/graph_flow.pl b/bin/graph_flow.pl index c89eebd3..7e908b4b 100755 --- a/bin/graph_flow.pl +++ b/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++); } } } diff --git a/bin/restart_log.sh b/bin/restart_log.sh index 8b5ee931..128fa280 100755 --- a/bin/restart_log.sh +++ b/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 diff --git a/bin/scenario.pl b/bin/scenario.pl index bc4721bc..56019903 100755 --- a/bin/scenario.pl +++ b/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; diff --git a/bin/show_flow.pl b/bin/show_flow.pl index f3441256..29141adc 100755 --- a/bin/show_flow.pl +++ b/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}) { diff --git a/get_results.sh b/get_results.sh index de8535f3..6af431a3 100755 --- a/get_results.sh +++ b/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 diff --git a/run_tests.sh b/run_tests.sh index 842bf187..406e5b63 100755 --- a/run_tests.sh +++ b/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) - =================================================================================" diff --git a/scenarios/auth_fail/0001_test.yml.tt2 b/scenarios/auth_fail/0001_test.yml.tt2 index 002055f6..9b4e5e7e 100644 --- a/scenarios/auth_fail/0001_test.yml.tt2 +++ b/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: diff --git a/scenarios/auth_fail/0002_test.yml.tt2 b/scenarios/auth_fail/0002_test.yml.tt2 index c3dc8c1f..df18dde1 100644 --- a/scenarios/auth_fail/0002_test.yml.tt2 +++ b/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: diff --git a/scenarios/auth_fail/0003_test.yml.tt2 b/scenarios/auth_fail/0003_test.yml.tt2 index c3dc8c1f..df18dde1 100644 --- a/scenarios/auth_fail/0003_test.yml.tt2 +++ b/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: diff --git a/scenarios/auth_fail/0004_test.yml.tt2 b/scenarios/auth_fail/0004_test.yml.tt2 index c3dc8c1f..df18dde1 100644 --- a/scenarios/auth_fail/0004_test.yml.tt2 +++ b/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: diff --git a/scenarios/auth_fail/scenario.yml b/scenarios/auth_fail/scenario.yml index fc2f185b..b3dda463 100644 --- a/scenarios/auth_fail/scenario.yml +++ b/scenarios/auth_fail/scenario.yml @@ -1,3 +1,4 @@ +test_uuid: auth_fail subscribers: spce.test: testuser1003: diff --git a/scenarios/auth_fail/sipp_scenario00.xml b/scenarios/auth_fail/sipp_scenario00.xml index d843459e..35fba14d 100644 --- a/scenarios/auth_fail/sipp_scenario00.xml +++ b/scenarios/auth_fail/sipp_scenario00.xml @@ -10,7 +10,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - 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: ;tag=[pid]SIPpTag00[call_number] To: - 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: ;tag=[pid]SIPpTag00[call_number] To: - 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: ;tag=[pid]SIPpTag00[call_number] To: - 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: ;tag=[pid]SIPpTag00[call_number] To: - 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] diff --git a/scenarios/incoming_foreign_dom/0003_test.yml.tt2 b/scenarios/incoming_foreign_dom/0003_test.yml.tt2 index 718efcc1..f751b15a 100644 --- a/scenarios/incoming_foreign_dom/0003_test.yml.tt2 +++ b/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: ' @@ -128,17 +124,3 @@ sip_out: 'P-Called-Party-ID: ', - 'To: ', - 'To: ' + - 'From: ', + 'From: ' + - 'From: ', + 'From: ', - 'To: ', + 'From: ;tag=[pid]SIPpTag00[call_number] To: - 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: ;tag=[pid]SIPpTag00[call_number] To: [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: ;tag=[pid]SIPpTag00[call_number] To: [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] diff --git a/scenarios/incoming_peer/0003_test.yml.tt2 b/scenarios/incoming_peer/0003_test.yml.tt2 index be8c7e91..59b43acc 100644 --- a/scenarios/incoming_peer/0003_test.yml.tt2 +++ b/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: ;tag=[pid]SIPpTag00[call_number] To: - 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: ;tag=[pid]SIPpTag00[call_number] To: [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 @@ - - + + ;tag=[pid]SIPpTag00[call_number] To: [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 @@ ]]> - + diff --git a/scenarios/incoming_peer/sipp_scenario_responder00.xml b/scenarios/incoming_peer/sipp_scenario_responder00.xml index 4d1ca6b6..da77f415 100644 --- a/scenarios/incoming_peer/sipp_scenario_responder00.xml +++ b/scenarios/incoming_peer/sipp_scenario_responder00.xml @@ -20,7 +20,7 @@ ]]> - + - + diff --git a/scenarios/invite/0003_test.yml.tt2 b/scenarios/invite/0003_test.yml.tt2 index 246173da..dfd92c95 100644 --- a/scenarios/invite/0003_test.yml.tt2 +++ b/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: diff --git a/scenarios/invite/0005_test.yml.tt2 b/scenarios/invite/0005_test.yml.tt2 index 53c42244..d612d4f2 100644 --- a/scenarios/invite/0005_test.yml.tt2 +++ b/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: ;tag=[pid]SIPpTag00[call_number] To: - 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 @@ - + - + ;tag=[pid]SIPpTag00[call_number] To: [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: ;tag=[pid]SIPpTag00[call_number] To: - 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: ;tag=[pid]SIPpTag00[call_number] To: [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 @@ - - + + ;tag=[pid]SIPpTag00[call_number] To: [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 @@ ]]> - + @@ -140,7 +140,7 @@ - diff --git a/scenarios/invite/sipp_scenario_responder00.xml b/scenarios/invite/sipp_scenario_responder00.xml index 4d1ca6b6..da77f415 100644 --- a/scenarios/invite/sipp_scenario_responder00.xml +++ b/scenarios/invite/sipp_scenario_responder00.xml @@ -20,7 +20,7 @@ ]]> - + - + diff --git a/scenarios/invite_allowedcli_match/0003_test.yml.tt2 b/scenarios/invite_allowedcli_match/0003_test.yml.tt2 index 9969da72..214aea8d 100644 --- a/scenarios/invite_allowedcli_match/0003_test.yml.tt2 +++ b/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: diff --git a/scenarios/invite_allowedcli_match/0005_test.yml.tt2 b/scenarios/invite_allowedcli_match/0005_test.yml.tt2 index da83fafd..597271a9 100644 --- a/scenarios/invite_allowedcli_match/0005_test.yml.tt2 +++ b/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" ;tag=[pid]SIPpTag00[call_number] To: - 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 @@ - + - + ;tag=[pid]SIPpTag00[call_number] To: [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" ;tag=[pid]SIPpTag00[call_number] To: - 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" ;tag=[pid]SIPpTag00[call_number] To: [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 @@ - - + + ;tag=[pid]SIPpTag00[call_number] To: [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 @@ ]]> - + @@ -140,7 +140,7 @@ - diff --git a/scenarios/invite_allowedcli_match/sipp_scenario_responder00.xml b/scenarios/invite_allowedcli_match/sipp_scenario_responder00.xml index 4d1ca6b6..da77f415 100644 --- a/scenarios/invite_allowedcli_match/sipp_scenario_responder00.xml +++ b/scenarios/invite_allowedcli_match/sipp_scenario_responder00.xml @@ -20,7 +20,7 @@ ]]> - + - + diff --git a/scenarios/invite_allowedcli_match_alias/0003_test.yml.tt2 b/scenarios/invite_allowedcli_match_alias/0003_test.yml.tt2 index 7bf05d2b..5e9a4399 100644 --- a/scenarios/invite_allowedcli_match_alias/0003_test.yml.tt2 +++ b/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: diff --git a/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2 b/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2 index b6affcc7..e0b6cc86 100644 --- a/scenarios/invite_allowedcli_match_alias/0005_test.yml.tt2 +++ b/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" ;tag=[pid]SIPpTag00[call_number] To: - 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 @@ - + - + ;tag=[pid]SIPpTag00[call_number] To: [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" ;tag=[pid]SIPpTag00[call_number] To: - 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" ;tag=[pid]SIPpTag00[call_number] To: [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 @@ - - + + ;tag=[pid]SIPpTag00[call_number] To: [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 @@ ]]> - + @@ -140,7 +140,7 @@ - diff --git a/scenarios/invite_allowedcli_match_alias/sipp_scenario_responder00.xml b/scenarios/invite_allowedcli_match_alias/sipp_scenario_responder00.xml index 4d1ca6b6..da77f415 100644 --- a/scenarios/invite_allowedcli_match_alias/sipp_scenario_responder00.xml +++ b/scenarios/invite_allowedcli_match_alias/sipp_scenario_responder00.xml @@ -20,7 +20,7 @@ ]]> - + - + diff --git a/scenarios/invite_allowedcli_nonmatch/0003_test.yml.tt2 b/scenarios/invite_allowedcli_nonmatch/0003_test.yml.tt2 index cb44ac58..72807c7c 100644 --- a/scenarios/invite_allowedcli_nonmatch/0003_test.yml.tt2 +++ b/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: diff --git a/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2 b/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2 index ee445783..86f6b8a8 100644 --- a/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2 +++ b/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" ;tag=[pid]SIPpTag00[call_number] To: - 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 @@ - + - + ;tag=[pid]SIPpTag00[call_number] To: [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" ;tag=[pid]SIPpTag00[call_number] To: - 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" ;tag=[pid]SIPpTag00[call_number] To: [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 @@ - - + + ;tag=[pid]SIPpTag00[call_number] To: [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 @@ ]]> - + @@ -140,7 +140,7 @@ - diff --git a/scenarios/invite_allowedcli_nonmatch/sipp_scenario_responder00.xml b/scenarios/invite_allowedcli_nonmatch/sipp_scenario_responder00.xml index d8cbf14f..da77f415 100644 --- a/scenarios/invite_allowedcli_nonmatch/sipp_scenario_responder00.xml +++ b/scenarios/invite_allowedcli_nonmatch/sipp_scenario_responder00.xml @@ -20,7 +20,7 @@ ]]> - + - + 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' diff --git a/scenarios/invite_allowip/scenario.yml b/scenarios/invite_allowip/scenario.yml index c1f9766d..8ca7b878 100644 --- a/scenarios/invite_allowip/scenario.yml +++ b/scenarios/invite_allowip/scenario.yml @@ -1,3 +1,4 @@ +test_uuid: invite_allowip subscribers: spce.test: testuser1003: diff --git a/scenarios/invite_allowip/sipp_scenario00.xml b/scenarios/invite_allowip/sipp_scenario00.xml index ceecc71a..c2855979 100644 --- a/scenarios/invite_allowip/sipp_scenario00.xml +++ b/scenarios/invite_allowip/sipp_scenario00.xml @@ -8,7 +8,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - 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 @@ - + - + ;tag=[pid]SIPpTag00[call_number] To: [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: ;tag=[pid]SIPpTag00[call_number] To: - 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: ;tag=[pid]SIPpTag00[call_number] To: [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 @@ - diff --git a/scenarios/invite_blockin_blst/0001_test.yml.tt2 b/scenarios/invite_blockin_blst/0001_test.yml.tt2 index 2c914937..bc4420e6 100644 --- a/scenarios/invite_blockin_blst/0001_test.yml.tt2 +++ b/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: diff --git a/scenarios/invite_blockin_blst/0003_test.yml.tt2 b/scenarios/invite_blockin_blst/0003_test.yml.tt2 index efb3d95f..f1214004 100644 --- a/scenarios/invite_blockin_blst/0003_test.yml.tt2 +++ b/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' diff --git a/scenarios/invite_blockin_blst/scenario.yml b/scenarios/invite_blockin_blst/scenario.yml index c1f9766d..369ab272 100644 --- a/scenarios/invite_blockin_blst/scenario.yml +++ b/scenarios/invite_blockin_blst/scenario.yml @@ -1,3 +1,4 @@ +test_uuid: invite_blockin_blst subscribers: spce.test: testuser1003: diff --git a/scenarios/invite_blockin_blst/sipp_scenario00.xml b/scenarios/invite_blockin_blst/sipp_scenario00.xml index 395f24ad..3aa49c59 100644 --- a/scenarios/invite_blockin_blst/sipp_scenario00.xml +++ b/scenarios/invite_blockin_blst/sipp_scenario00.xml @@ -8,7 +8,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - 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 @@ - + - + ;tag=[pid]SIPpTag00[call_number] To: [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: ;tag=[pid]SIPpTag00[call_number] To: - 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: ;tag=[pid]SIPpTag00[call_number] To: [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 @@ - diff --git a/scenarios/invite_blockin_clir/0001_test.yml.tt2 b/scenarios/invite_blockin_clir/0001_test.yml.tt2 index 2c914937..bc4420e6 100644 --- a/scenarios/invite_blockin_clir/0001_test.yml.tt2 +++ b/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: diff --git a/scenarios/invite_blockin_clir/0003_test.yml.tt2 b/scenarios/invite_blockin_clir/0003_test.yml.tt2 index efb3d95f..f1214004 100644 --- a/scenarios/invite_blockin_clir/0003_test.yml.tt2 +++ b/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' diff --git a/scenarios/invite_blockin_clir/scenario.yml b/scenarios/invite_blockin_clir/scenario.yml index c1f9766d..e112a4db 100644 --- a/scenarios/invite_blockin_clir/scenario.yml +++ b/scenarios/invite_blockin_clir/scenario.yml @@ -1,3 +1,4 @@ +test_uuid: invite_blockin_clir subscribers: spce.test: testuser1003: diff --git a/scenarios/invite_blockin_clir/sipp_scenario00.xml b/scenarios/invite_blockin_clir/sipp_scenario00.xml index 395f24ad..3aa49c59 100644 --- a/scenarios/invite_blockin_clir/sipp_scenario00.xml +++ b/scenarios/invite_blockin_clir/sipp_scenario00.xml @@ -8,7 +8,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - 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 @@ - + - + ;tag=[pid]SIPpTag00[call_number] To: [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: ;tag=[pid]SIPpTag00[call_number] To: - 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: ;tag=[pid]SIPpTag00[call_number] To: [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 @@ - diff --git a/scenarios/invite_blockin_wlst/0001_test.yml.tt2 b/scenarios/invite_blockin_wlst/0001_test.yml.tt2 index 2c914937..bc4420e6 100644 --- a/scenarios/invite_blockin_wlst/0001_test.yml.tt2 +++ b/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: diff --git a/scenarios/invite_blockin_wlst/0003_test.yml.tt2 b/scenarios/invite_blockin_wlst/0003_test.yml.tt2 index efb3d95f..f1214004 100644 --- a/scenarios/invite_blockin_wlst/0003_test.yml.tt2 +++ b/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' diff --git a/scenarios/invite_blockin_wlst/scenario.yml b/scenarios/invite_blockin_wlst/scenario.yml index c1f9766d..6147c983 100644 --- a/scenarios/invite_blockin_wlst/scenario.yml +++ b/scenarios/invite_blockin_wlst/scenario.yml @@ -1,3 +1,4 @@ +test_uuid: invite_blockin_wlst subscribers: spce.test: testuser1003: diff --git a/scenarios/invite_blockin_wlst/sipp_scenario00.xml b/scenarios/invite_blockin_wlst/sipp_scenario00.xml index 395f24ad..3aa49c59 100644 --- a/scenarios/invite_blockin_wlst/sipp_scenario00.xml +++ b/scenarios/invite_blockin_wlst/sipp_scenario00.xml @@ -8,7 +8,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - 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 @@ - + - + ;tag=[pid]SIPpTag00[call_number] To: [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: ;tag=[pid]SIPpTag00[call_number] To: - 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: ;tag=[pid]SIPpTag00[call_number] To: [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 @@ - diff --git a/scenarios/invite_blockout_blst/0001_test.yml.tt2 b/scenarios/invite_blockout_blst/0001_test.yml.tt2 index 2c914937..bc4420e6 100644 --- a/scenarios/invite_blockout_blst/0001_test.yml.tt2 +++ b/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: diff --git a/scenarios/invite_blockout_blst/0003_test.yml.tt2 b/scenarios/invite_blockout_blst/0003_test.yml.tt2 index 8eceab50..68ff7521 100644 --- a/scenarios/invite_blockout_blst/0003_test.yml.tt2 +++ b/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' diff --git a/scenarios/invite_blockout_blst/scenario.yml b/scenarios/invite_blockout_blst/scenario.yml index c1f9766d..db1e2496 100644 --- a/scenarios/invite_blockout_blst/scenario.yml +++ b/scenarios/invite_blockout_blst/scenario.yml @@ -1,3 +1,4 @@ +test_uuid: invite_blockout_blst subscribers: spce.test: testuser1003: diff --git a/scenarios/invite_blockout_blst/sipp_scenario00.xml b/scenarios/invite_blockout_blst/sipp_scenario00.xml index 395f24ad..3aa49c59 100644 --- a/scenarios/invite_blockout_blst/sipp_scenario00.xml +++ b/scenarios/invite_blockout_blst/sipp_scenario00.xml @@ -8,7 +8,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - 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 @@ - + - + ;tag=[pid]SIPpTag00[call_number] To: [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: ;tag=[pid]SIPpTag00[call_number] To: - 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: ;tag=[pid]SIPpTag00[call_number] To: [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 @@ - diff --git a/scenarios/invite_blockout_ncos/0001_test.yml.tt2 b/scenarios/invite_blockout_ncos/0001_test.yml.tt2 index 2c914937..bc4420e6 100644 --- a/scenarios/invite_blockout_ncos/0001_test.yml.tt2 +++ b/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: diff --git a/scenarios/invite_blockout_ncos/0003_test.yml.tt2 b/scenarios/invite_blockout_ncos/0003_test.yml.tt2 index f2f2c74e..00fcced6 100644 --- a/scenarios/invite_blockout_ncos/0003_test.yml.tt2 +++ b/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' diff --git a/scenarios/invite_blockout_ncos/scenario.yml b/scenarios/invite_blockout_ncos/scenario.yml index c1f9766d..ac22868b 100644 --- a/scenarios/invite_blockout_ncos/scenario.yml +++ b/scenarios/invite_blockout_ncos/scenario.yml @@ -1,3 +1,4 @@ +test_uuid: invite_blockout_ncos subscribers: spce.test: testuser1003: diff --git a/scenarios/invite_blockout_ncos/sipp_scenario00.xml b/scenarios/invite_blockout_ncos/sipp_scenario00.xml index 395f24ad..3aa49c59 100644 --- a/scenarios/invite_blockout_ncos/sipp_scenario00.xml +++ b/scenarios/invite_blockout_ncos/sipp_scenario00.xml @@ -8,7 +8,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - 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 @@ - + - + ;tag=[pid]SIPpTag00[call_number] To: [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: ;tag=[pid]SIPpTag00[call_number] To: - 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: ;tag=[pid]SIPpTag00[call_number] To: [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 @@ - diff --git a/scenarios/invite_blockout_pinoverride/0003_test.yml.tt2 b/scenarios/invite_blockout_pinoverride/0003_test.yml.tt2 index 3dbe6815..f0898e8b 100644 --- a/scenarios/invite_blockout_pinoverride/0003_test.yml.tt2 +++ b/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: diff --git a/scenarios/invite_blockout_pinoverride/0005_test.yml.tt2 b/scenarios/invite_blockout_pinoverride/0005_test.yml.tt2 index ebf06589..eb2451e2 100644 --- a/scenarios/invite_blockout_pinoverride/0005_test.yml.tt2 +++ b/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: ;tag=[pid]SIPpTag00[call_number] To: - 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 @@ - + - + ;tag=[pid]SIPpTag00[call_number] To: [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: ;tag=[pid]SIPpTag00[call_number] To: - 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: ;tag=[pid]SIPpTag00[call_number] To: [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 @@ - - + + ;tag=[pid]SIPpTag00[call_number] To: [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 @@ ]]> - + @@ -140,7 +140,7 @@ - diff --git a/scenarios/invite_blockout_pinoverride/sipp_scenario_responder00.xml b/scenarios/invite_blockout_pinoverride/sipp_scenario_responder00.xml index d8cbf14f..da77f415 100644 --- a/scenarios/invite_blockout_pinoverride/sipp_scenario_responder00.xml +++ b/scenarios/invite_blockout_pinoverride/sipp_scenario_responder00.xml @@ -20,7 +20,7 @@ ]]> - + - + ;tag=[pid]SIPpTag00[call_number] To: - 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 @@ - + - + ;tag=[pid]SIPpTag00[call_number] To: [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: ;tag=[pid]SIPpTag00[call_number] To: - 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: ;tag=[pid]SIPpTag00[call_number] To: [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 @@ - diff --git a/scenarios/invite_callforward/0007_test.yml.tt2 b/scenarios/invite_callforward/0007_test.yml.tt2 index a23771e5..baecd4f5 100644 --- a/scenarios/invite_callforward/0007_test.yml.tt2 +++ b/scenarios/invite_callforward/0007_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: diff --git a/scenarios/invite_callforward/0009_test.yml.tt2 b/scenarios/invite_callforward/0009_test.yml.tt2 index cc98b808..20473727 100644 --- a/scenarios/invite_callforward/0009_test.yml.tt2 +++ b/scenarios/invite_callforward/0009_test.yml.tt2 @@ -1,73 +1,74 @@ -# 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_LOAD_CF_MAP: - - end|ROUTE_LOAD_CF_MAP: + - return|ROUTE_LOAD_CF_MAP: - start|ROUTE_CHECK_CF_PERIOD: - return|ROUTE_CHECK_CF_PERIOD: - start|ROUTE_ACC_CF: - start|ROUTE_ACC_CALLER: - - end|ROUTE_ACC_CALLER: + - return|ROUTE_ACC_CALLER: - start|ROUTE_ACC_CALLEE: - - end|ROUTE_ACC_CALLEE: - - end|ROUTE_ACC_CF: + - return|ROUTE_ACC_CALLEE: + - return|ROUTE_ACC_CF: - start|ROUTE_EXECUTE_CF_LOOP: - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: + - return|ROUTE_SET_CALLER_DIALOG: - start|BRANCH_ROUTE_FWD_LOOP: - start|ROUTE_ADD_CALLINFO: - - end|ROUTE_ADD_CALLINFO: - - end|BRANCH_ROUTE_FWD_LOOP: + - return|ROUTE_ADD_CALLINFO: + - return|BRANCH_ROUTE_FWD_LOOP: + # branch ?? + - return|BRANCH_ROUTE_FWD_LOOP: - exit|ROUTE_EXECUTE_CF_LOOP: sip_in: - '^INVITE sip:testuser1001@' diff --git a/scenarios/invite_callforward/0011_test.yml.tt2 b/scenarios/invite_callforward/0011_test.yml.tt2 index 46b045f6..c035b1d9 100644 --- a/scenarios/invite_callforward/0011_test.yml.tt2 +++ b/scenarios/invite_callforward/0011_test.yml.tt2 @@ -1,96 +1,91 @@ -# INVITE callforward 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: - - end|ROUTE_FIND_CALLER: + - 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_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_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_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@' - 'Contact: ', - ] - - [ - '^SIP/2.0 180 Ringing', - 'CSeq: 2 INVITE', - 'From: ', - ] - - [ - '^SIP/2.0 200 OK', - 'CSeq: 10 INVITE', - 'From: ', - 'Content-Type: application/sdp' - ] - - [ - '^SIP/2.0 200 OK', - 'CSeq: 2 INVITE', - 'From: ', - 'Content-Type: application/sdp' - ] diff --git a/scenarios/invite_callforward/0017_test.yml.tt2 b/scenarios/invite_callforward/0017_test.yml.tt2 index 2ade05c1..7e96250d 100644 --- a/scenarios/invite_callforward/0017_test.yml.tt2 +++ b/scenarios/invite_callforward/0017_test.yml.tt2 @@ -1,12 +1,12 @@ -# 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@' diff --git a/scenarios/invite_callforward/0018_test.yml.tt2 b/scenarios/invite_callforward/0018_test.yml.tt2 deleted file mode 100644 index f2d8d9e0..00000000 --- a/scenarios/invite_callforward/0018_test.yml.tt2 +++ /dev/null @@ -1,25 +0,0 @@ -# INVITE_OFFLINE scenario -flow: - - start|MAIN: - - start|ROUTE_NET_INFO: - - end|ROUTE_NET_INFO: - - start|ROUTE_PRX_REQUEST: - - start|ROUTE_INITVARS: - - end|ROUTE_INITVARS: - - start|ROUTE_OUTBOUND: -sip_in: - - '^ACK sip:(testuser1003@)?127.0.0.1:5080(;transport=udp)? SIP/2.0' - - 'Contact: ' - - 'CSeq: 10 ACK' - - 'Content-Length: 0' - - 'From: ', - 'CSeq: 10 ACK', - 'Content-Length: 0', - 'From: ' + - 'Contact: ' - 'CSeq: 10 INVITE' - 'Content-Type: application/sdp' - - 'P-Caller-UUID: \w+' - - 'P-First-Caller-UPN: 4311002' - - 'P-First-Caller-NPN: 4311002' - - 'P-Acc-Caller-User: testuser1004' - - 'P-Acc-State: cfb' - - 'P-From-Peer: 0' - - 'P-CF-Depth: 1' - - 'P-Callee-Account-ID: \d+' sip_out: - [ '^SIP/2.0 100 Trying', @@ -119,43 +102,12 @@ sip_out: '^INVITE sip:testuser1005@', 'CSeq: 10 INVITE', 'From: ', 'To: ' - ] - - [ - '^SIP/2.0 180 Ringing', - 'CSeq: 2 INVITE', - 'From: ' - ] - - [ - '^SIP/2.0 200 OK', - 'CSeq: 10 INVITE', - 'From: ', - 'Content-Type: application/sdp' - ] - - [ - '^SIP/2.0 200 OK', - 'CSeq: 2 INVITE', - 'From: ', - 'Content-Type: application/sdp' + 'P-NGCP-Callee-Info: ;tag=[pid]SIPpTag00[call_number] To: - 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 @@ - + - + ;tag=[pid]SIPpTag00[call_number] To: [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: ;tag=[pid]SIPpTag00[call_number] To: - 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: ;tag=[pid]SIPpTag00[call_number] To: [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 @@ - - + + ;tag=[pid]SIPpTag00[call_number] To: [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 @@ ]]> - + @@ -140,7 +140,7 @@ - diff --git a/scenarios/invite_callforward/sipp_scenario01.xml b/scenarios/invite_callforward/sipp_scenario01.xml index 91c7ca01..5de29229 100644 --- a/scenarios/invite_callforward/sipp_scenario01.xml +++ b/scenarios/invite_callforward/sipp_scenario01.xml @@ -8,7 +8,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - 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=1]@[local_ip]:[local_port] Max-Forwards: 70 @@ -29,9 +29,9 @@ - + - + ;tag=[pid]SIPpTag00[call_number] To: [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=1]@[local_ip]:[local_port] Max-Forwards: 70 @@ -57,7 +57,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - 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=1]@[local_ip]:[local_port] Max-Forwards: 70 @@ -96,7 +96,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: [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=1]@[local_ip]:[local_port] @@ -112,8 +112,8 @@ - - + + ;tag=[pid]SIPpTag00[call_number] To: [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=1]@[local_ip]:[local_port] [routes] @@ -131,7 +131,7 @@ ]]> - + @@ -140,7 +140,7 @@ - diff --git a/scenarios/invite_callforward/sipp_scenario_responder01.xml b/scenarios/invite_callforward/sipp_scenario_responder01.xml index 71c162db..da77f415 100644 --- a/scenarios/invite_callforward/sipp_scenario_responder01.xml +++ b/scenarios/invite_callforward/sipp_scenario_responder01.xml @@ -20,7 +20,7 @@ ]]> - + - + concurrent_max[*]): [1] $xavp(callee_real_prefs[0]=>concurrent_max_out[*]): None $xavp(callee_real_prefs[0]=>concurrent_max_per_account[*]): None $xavp(callee_real_prefs[0]=>concurrent_max_per_account_out[*]): None - $avp(size): [1] + $avp(size): ['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: - # 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@' @@ -132,16 +124,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: concurrent_max[*]): [1] $xavp(callee_real_prefs[0]=>concurrent_max_out[*]): None $xavp(callee_real_prefs[0]=>concurrent_max_per_account[*]): None $xavp(callee_real_prefs[0]=>concurrent_max_per_account_out[*]): None - $avp(size): [2] + $avp(size): ['2'] - 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 sip:testuser1003@' diff --git a/scenarios/invite_concurrent_max/0016_test.yml.tt2 b/scenarios/invite_concurrent_max/0016_test.yml.tt2 new file mode 100644 index 00000000..8a557769 --- /dev/null +++ b/scenarios/invite_concurrent_max/0016_test.yml.tt2 @@ -0,0 +1,43 @@ +flow: + - start|DEFAULT_ROUTE: + - start|ROUTE_NET_INFO: + - return|ROUTE_NET_INFO: + - start|ROUTE_PRX_REQUEST: + - start|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: + - return|ROUTE_RESTORE_CLUSTERSET: + - return|ROUTE_STOP_RTPPROXY: + - start|ROUTE_OUTBOUND: + - exit|ROUTE_OUTBOUND: +sip_in: + - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0' + - 'Contact: sip:testuser1002@' + - 'CSeq: 3 BYE' + - 'Max-Forwards: 69' + - 'Content-Length: 0' + - 'From: ;tag=[pid]SIPpTag00[call_number] To: - 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 @@ - + - + ;tag=[pid]SIPpTag00[call_number] To: [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: ;tag=[pid]SIPpTag00[call_number] To: - 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: ;tag=[pid]SIPpTag00[call_number] To: [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 @@ - - + + ;tag=[pid]SIPpTag00[call_number] To: [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 @@ ]]> - + @@ -140,7 +140,7 @@ - diff --git a/scenarios/invite_concurrent_max/sipp_scenario_responder00.xml b/scenarios/invite_concurrent_max/sipp_scenario_responder00.xml index 4d1ca6b6..da77f415 100644 --- a/scenarios/invite_concurrent_max/sipp_scenario_responder00.xml +++ b/scenarios/invite_concurrent_max/sipp_scenario_responder00.xml @@ -20,7 +20,7 @@ ]]> - + - + diff --git a/scenarios/invite_concurrent_max/sipp_scenario_responder01.xml b/scenarios/invite_concurrent_max/sipp_scenario_responder01.xml index d9828361..00a029ca 100644 --- a/scenarios/invite_concurrent_max/sipp_scenario_responder01.xml +++ b/scenarios/invite_concurrent_max/sipp_scenario_responder01.xml @@ -11,7 +11,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 1 INVITE Contact: sip:[field0 file="callee.csv" line=1]@[local_ip]:[local_port] Max-Forwards: 70 @@ -42,7 +42,7 @@ [last_Via:] From: ;tag=[pid]SIPpTag00[call_number] To: [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="callee.csv" line=1]@[local_ip]:[local_port] Max-Forwards: 70 @@ -60,7 +60,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 2 INVITE Contact: sip:[field0 file="callee.csv" line=1]@[local_ip]:[local_port] Max-Forwards: 70 @@ -83,18 +83,17 @@ - + ;tag=[pid]SIPpTag00[call_number] To: [peer_tag_param] - Call-ID: [call_id] - [routes] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 2 ACK Contact: sip:[field0 file="callee.csv" line=1]@[local_ip]:[local_port] Max-Forwards: 70 @@ -105,7 +104,7 @@ - diff --git a/scenarios/invite_concurrent_max_out/0005_test.yml.tt2 b/scenarios/invite_concurrent_max_out/0005_test.yml.tt2 index 246173da..dfd92c95 100644 --- a/scenarios/invite_concurrent_max_out/0005_test.yml.tt2 +++ b/scenarios/invite_concurrent_max_out/0005_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: diff --git a/scenarios/invite_concurrent_max_out/0007_test.yml.tt2 b/scenarios/invite_concurrent_max_out/0007_test.yml.tt2 index 53c42244..c0de36d4 100644 --- a/scenarios/invite_concurrent_max_out/0007_test.yml.tt2 +++ b/scenarios/invite_concurrent_max_out/0007_test.yml.tt2 @@ -1,99 +1,91 @@ -# 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: + # 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@' @@ -127,16 +119,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: ', - 'Content-Type: application/sdp', - 'a=recvonly' - ] diff --git a/scenarios/invite_concurrent_max_out/0016_test.yml.tt2 b/scenarios/invite_concurrent_max_out/0016_test.yml.tt2 new file mode 100644 index 00000000..fdc9014c --- /dev/null +++ b/scenarios/invite_concurrent_max_out/0016_test.yml.tt2 @@ -0,0 +1,13 @@ +flow: + - start|REPLY_ROUTE_NAT: + - exit|REPLY_ROUTE_NAT: +sip_in: + - '^SIP/2.0 200 OK' + - 'CSeq: 3 INVITE' +sip_out: + - [ + '^SIP/2.0 200 OK', + 'CSeq: 3 INVITE', + 'From: ;tag=[pid]SIPpTag00[call_number] To: - 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 @@ -39,7 +39,7 @@ [last_Via:] From: ;tag=[pid]SIPpTag00[call_number] To: [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: ;tag=[pid]SIPpTag00[call_number] To: - 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 @@ -192,7 +192,7 @@ - diff --git a/scenarios/invite_concurrent_max_out/sipp_scenario_responder01.xml b/scenarios/invite_concurrent_max_out/sipp_scenario_responder01.xml index 36d7a1ec..2d723206 100644 --- a/scenarios/invite_concurrent_max_out/sipp_scenario_responder01.xml +++ b/scenarios/invite_concurrent_max_out/sipp_scenario_responder01.xml @@ -11,7 +11,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - 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 @@ -42,7 +42,7 @@ [last_Via:] From: ;tag=[pid]SIPpTag00[call_number] To: [peer_tag_param] - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: [cseq] ACK Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port] Max-Forwards: 70 @@ -60,7 +60,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: [cseq] INVITE Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port] Max-Forwards: 70 @@ -93,7 +93,7 @@ [last_Via:] From: ;tag=[pid]SIPpTag00[call_number] To: [peer_tag_param] - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: [cseq] ACK Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port] Max-Forwards: 70 @@ -104,7 +104,7 @@ - diff --git a/scenarios/invite_concurrent_max_out_per_account/0001_test.yml.tt2 b/scenarios/invite_concurrent_max_out_per_account/0001_test.yml.tt2 index 0170de24..cf91b29e 100644 --- a/scenarios/invite_concurrent_max_out_per_account/0001_test.yml.tt2 +++ b/scenarios/invite_concurrent_max_out_per_account/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: diff --git a/scenarios/invite_concurrent_max_out_per_account/0003_test.yml.tt2 b/scenarios/invite_concurrent_max_out_per_account/0003_test.yml.tt2 index e3374b9a..62e1e97e 100644 --- a/scenarios/invite_concurrent_max_out_per_account/0003_test.yml.tt2 +++ b/scenarios/invite_concurrent_max_out_per_account/0003_test.yml.tt2 @@ -1,99 +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: - - 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_CHECK_PBX: - return|ROUTE_CHECK_PBX: - start|ROUTE_INVITE_TO_EXT: - start|ROUTE_PSTN: - start|ROUTE_CLEAR_PEER_OUT_PREF: - - end|ROUTE_CLEAR_PEER_OUT_PREF: + - return|ROUTE_CLEAR_PEER_OUT_PREF: - start|ROUTE_LOAD_PEER_OUT_PREF: - - end|ROUTE_LOAD_PEER_OUT_PREF: + - return|ROUTE_LOAD_PEER_OUT_PREF: - 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 sip:004321001@' - 'Contact: sip:testuser1002@' @@ -127,15 +120,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: ;tag=[pid]SIPpTag00[call_number] To: - 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 @@ -39,7 +39,7 @@ [last_Via:] From: ;tag=[pid]SIPpTag00[call_number] To: [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: ;tag=[pid]SIPpTag00[call_number] To: - 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 @@ -173,7 +173,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag01[call_number] To: - Call-ID: NEW///[call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%NEW///[call_id] CSeq: 1 INVITE Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port] Max-Forwards: 70 @@ -204,7 +204,7 @@ [last_Via:] From: ;tag=[pid]SIPpTag01[call_number] To: [peer_tag_param] - Call-ID: NEW///[call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%NEW///[call_id] CSeq: 1 ACK Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port] Max-Forwards: 70 @@ -222,7 +222,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag01[call_number] To: - Call-ID: NEW///[call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%NEW///[call_id] CSeq: 2 INVITE Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port] Max-Forwards: 70 @@ -264,7 +264,7 @@ [last_Via:] From: ;tag=[pid]SIPpTag01[call_number] To: ;tag=[$3] - Call-ID: NEW///[call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%NEW///[call_id] CSeq: 2 ACK Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port] Max-Forwards: 70 @@ -282,7 +282,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: ;tag=[$2] - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: [cseq] BYE Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port] [routes] @@ -300,7 +300,7 @@ - diff --git a/scenarios/invite_concurrent_max_per_account/0005_test.yml.tt2 b/scenarios/invite_concurrent_max_per_account/0005_test.yml.tt2 index 246173da..4c0f5c81 100644 --- a/scenarios/invite_concurrent_max_per_account/0005_test.yml.tt2 +++ b/scenarios/invite_concurrent_max_per_account/0005_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: diff --git a/scenarios/invite_concurrent_max_per_account/0007_test.yml.tt2 b/scenarios/invite_concurrent_max_per_account/0007_test.yml.tt2 index f95bded8..fa8387c6 100644 --- a/scenarios/invite_concurrent_max_per_account/0007_test.yml.tt2 +++ b/scenarios/invite_concurrent_max_per_account/0007_test.yml.tt2 @@ -1,104 +1,97 @@ # 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: $xavp(callee_real_prefs[0]=>concurrent_max[*]): None $xavp(callee_real_prefs[0]=>concurrent_max_out[*]): None $xavp(callee_real_prefs[0]=>concurrent_max_per_account[*]): [2] $xavp(callee_real_prefs[0]=>concurrent_max_per_account_out[*]): None - $avp(size): [1] + $avp(size): ['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: - # 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@' @@ -132,16 +125,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: concurrent_max[*]): None $xavp(callee_real_prefs[0]=>concurrent_max_out[*]): None $xavp(callee_real_prefs[0]=>concurrent_max_per_account[*]): [2] $xavp(callee_real_prefs[0]=>concurrent_max_per_account_out[*]): None - $avp(size): [3] + $avp(size): ['3'] - 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 sip:testuser1004@' diff --git a/scenarios/invite_concurrent_max_per_account/0015_test.yml.tt2 b/scenarios/invite_concurrent_max_per_account/0015_test.yml.tt2 new file mode 100644 index 00000000..d3786d8a --- /dev/null +++ b/scenarios/invite_concurrent_max_per_account/0015_test.yml.tt2 @@ -0,0 +1,39 @@ +flow: + - start|DEFAULT_ROUTE: + - start|ROUTE_NET_INFO: + - return|ROUTE_NET_INFO: + - start|ROUTE_PRX_REQUEST: + - start|ROUTE_INITVARS: + - return|ROUTE_INITVARS: + - start|BRANCH_ROUTE_SBC: + - return|BRANCH_ROUTE_SBC: + - return|BRANCH_ROUTE_SBC: + - start|ROUTE_STOP_RTPPROXY: + - start|ROUTE_RESTORE_CLUSTERSET: + - return|ROUTE_RESTORE_CLUSTERSET: + - return|ROUTE_STOP_RTPPROXY: + - start|ROUTE_OUTBOUND: + - exit|ROUTE_OUTBOUND: +sip_in: + - '^BYE' + - 'Contact: sip:testuser1002@' + - 'From: ;tag=[pid]SIPpTag00[call_number] To: - 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 @@ - + - + ;tag=[pid]SIPpTag00[call_number] To: [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: ;tag=[pid]SIPpTag00[call_number] To: - 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: ;tag=[pid]SIPpTag00[call_number] To: [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 @@ - - + + ;tag=[pid]SIPpTag00[call_number] To: [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 @@ ]]> - + @@ -140,7 +140,7 @@ - diff --git a/scenarios/invite_concurrent_max_per_account/sipp_scenario_responder00.xml b/scenarios/invite_concurrent_max_per_account/sipp_scenario_responder00.xml index 4d1ca6b6..da77f415 100644 --- a/scenarios/invite_concurrent_max_per_account/sipp_scenario_responder00.xml +++ b/scenarios/invite_concurrent_max_per_account/sipp_scenario_responder00.xml @@ -20,7 +20,7 @@ ]]> - + - + diff --git a/scenarios/invite_concurrent_max_per_account/sipp_scenario_responder01.xml b/scenarios/invite_concurrent_max_per_account/sipp_scenario_responder01.xml index e3321083..bda0d280 100644 --- a/scenarios/invite_concurrent_max_per_account/sipp_scenario_responder01.xml +++ b/scenarios/invite_concurrent_max_per_account/sipp_scenario_responder01.xml @@ -11,7 +11,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - 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 @@ -42,7 +42,7 @@ [last_Via:] From: ;tag=[pid]SIPpTag00[call_number] To: - 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 @@ -60,7 +60,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - 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 @@ -93,7 +93,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - 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] @@ -105,7 +105,7 @@ - diff --git a/scenarios/invite_foreign_dom/0001_test.yml.tt2 b/scenarios/invite_foreign_dom/0001_test.yml.tt2 index ec8913c4..cf91b29e 100644 --- a/scenarios/invite_foreign_dom/0001_test.yml.tt2 +++ b/scenarios/invite_foreign_dom/0001_test.yml.tt2 @@ -1,15 +1,15 @@ 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: diff --git a/scenarios/invite_foreign_dom/0003_test.yml.tt2 b/scenarios/invite_foreign_dom/0003_test.yml.tt2 index 42cd6b81..0b98a8a0 100644 --- a/scenarios/invite_foreign_dom/0003_test.yml.tt2 +++ b/scenarios/invite_foreign_dom/0003_test.yml.tt2 @@ -1,89 +1,85 @@ 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_CHECK_PBX: - return|ROUTE_CHECK_PBX: - start|ROUTE_INVITE_TO_EXT: - 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_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:004321001@' - 'Contact: sip:testuser1002@' @@ -116,15 +112,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: ;tag=[pid]SIPpTag00[call_number] To: - 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 @@ - + - + ;tag=[pid]SIPpTag00[call_number] To: [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: ;tag=[pid]SIPpTag00[call_number] To: - 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: ;tag=[pid]SIPpTag00[call_number] To: [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 @@ - - + + ;tag=[pid]SIPpTag00[call_number] To: [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 @@ ]]> - + @@ -140,7 +140,7 @@ - diff --git a/scenarios/invite_foreign_dom/sipp_scenario_responder00.xml b/scenarios/invite_foreign_dom/sipp_scenario_responder00.xml index d8cbf14f..da77f415 100644 --- a/scenarios/invite_foreign_dom/sipp_scenario_responder00.xml +++ b/scenarios/invite_foreign_dom/sipp_scenario_responder00.xml @@ -20,7 +20,7 @@ ]]> - + - + ;tag=[pid]SIPpTag00[call_number] To: - 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 @@ - + - + ;tag=[pid]SIPpTag00[call_number] To: [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: ;tag=[pid]SIPpTag00[call_number] To: - 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: ;tag=[pid]SIPpTag00[call_number] To: [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 @@ - - + + ;tag=[pid]SIPpTag00[call_number] To: [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 @@ ]]> - + @@ -140,7 +140,7 @@ - diff --git a/scenarios/invite_ignore_allowip/sipp_scenario_responder00.xml b/scenarios/invite_ignore_allowip/sipp_scenario_responder00.xml index d8cbf14f..da77f415 100644 --- a/scenarios/invite_ignore_allowip/sipp_scenario_responder00.xml +++ b/scenarios/invite_ignore_allowip/sipp_scenario_responder00.xml @@ -20,7 +20,7 @@ ]]> - + - + ;tag=[pid]SIPpTag00[call_number] To: - 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] Allow: INVITE, OPTIONS, BYE, CANCEL, ACK, PRACK, COMET, REFER, SUBSCRIBE, NOTIFY, INFO, UPDATE, REGISTER @@ -30,9 +30,9 @@ - + - + ;tag=[pid]SIPpTag00[call_number] To: [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 @@ -58,7 +58,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - 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] Allow: INVITE, OPTIONS, BYE, CANCEL, ACK, PRACK, COMET, REFER, SUBSCRIBE, NOTIFY, INFO, UPDATE, REGISTER @@ -98,7 +98,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: [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] @@ -114,8 +114,8 @@ - - + + ;tag=[pid]SIPpTag00[call_number] To: [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] @@ -133,7 +133,7 @@ ]]> - + @@ -142,7 +142,7 @@ - diff --git a/scenarios/invite_no_refer/sipp_scenario_responder00.xml b/scenarios/invite_no_refer/sipp_scenario_responder00.xml index 3cc86266..6f8cfc63 100644 --- a/scenarios/invite_no_refer/sipp_scenario_responder00.xml +++ b/scenarios/invite_no_refer/sipp_scenario_responder00.xml @@ -71,7 +71,7 @@ ]]> - + diff --git a/scenarios/invite_offline/0001_test.yml.tt2 b/scenarios/invite_offline/0001_test.yml.tt2 index 2c914937..2191e403 100644 --- a/scenarios/invite_offline/0001_test.yml.tt2 +++ b/scenarios/invite_offline/0001_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: diff --git a/scenarios/invite_offline/0003_test.yml.tt2 b/scenarios/invite_offline/0003_test.yml.tt2 index 678a6263..e8c04c62 100644 --- a/scenarios/invite_offline/0003_test.yml.tt2 +++ b/scenarios/invite_offline/0003_test.yml.tt2 @@ -1,65 +1,69 @@ # 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: - - 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_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 sip:testuser1003@' diff --git a/scenarios/invite_offline/0005_test.yml.tt2 b/scenarios/invite_offline/0005_test.yml.tt2 index ae6f80d2..da1eff1b 100644 --- a/scenarios/invite_offline/0005_test.yml.tt2 +++ b/scenarios/invite_offline/0005_test.yml.tt2 @@ -1,65 +1,69 @@ # 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: - - 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_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 sip:4311003@' diff --git a/scenarios/invite_offline/scenario.yml b/scenarios/invite_offline/scenario.yml index e966f255..476d07fd 100644 --- a/scenarios/invite_offline/scenario.yml +++ b/scenarios/invite_offline/scenario.yml @@ -1,3 +1,4 @@ +test_uuid: invite_offline subscribers: spce.test: testuser1003: diff --git a/scenarios/invite_offline/sipp_scenario00.xml b/scenarios/invite_offline/sipp_scenario00.xml index 5c87fd72..a15da5be 100644 --- a/scenarios/invite_offline/sipp_scenario00.xml +++ b/scenarios/invite_offline/sipp_scenario00.xml @@ -8,7 +8,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - 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 @@ -28,9 +28,9 @@ - + - + @@ -40,7 +40,7 @@ [last_Via:] From: ;tag=[pid]SIPpTag00[call_number] To: [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 @@ -58,7 +58,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - 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 @@ [last_Via:] From: ;tag=[pid]SIPpTag00[call_number] To: [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 @@ -114,7 +114,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 3 INVITE Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port] Max-Forwards: 70 @@ -152,7 +152,7 @@ [last_Via:] From: ;tag=[pid]SIPpTag00[call_number] To: [peer_tag_param] - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 3 ACK Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port] Max-Forwards: 70 @@ -164,7 +164,7 @@ - diff --git a/scenarios/invite_peerout/0001_test.yml.tt2 b/scenarios/invite_peerout/0001_test.yml.tt2 index 0170de24..cf91b29e 100644 --- a/scenarios/invite_peerout/0001_test.yml.tt2 +++ b/scenarios/invite_peerout/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: diff --git a/scenarios/invite_peerout/0003_test.yml.tt2 b/scenarios/invite_peerout/0003_test.yml.tt2 index 1a94fdf8..62e1e97e 100644 --- a/scenarios/invite_peerout/0003_test.yml.tt2 +++ b/scenarios/invite_peerout/0003_test.yml.tt2 @@ -1,100 +1,92 @@ -# 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_CHECK_PBX: - return|ROUTE_CHECK_PBX: - start|ROUTE_INVITE_TO_EXT: - start|ROUTE_PSTN: - start|ROUTE_CLEAR_PEER_OUT_PREF: - - end|ROUTE_CLEAR_PEER_OUT_PREF: + - return|ROUTE_CLEAR_PEER_OUT_PREF: - start|ROUTE_LOAD_PEER_OUT_PREF: - - end|ROUTE_LOAD_PEER_OUT_PREF: + - return|ROUTE_LOAD_PEER_OUT_PREF: - 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 sip:004321001@' - 'Contact: sip:testuser1002@' @@ -128,16 +120,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: ;tag=[pid]SIPpTag00[call_number] To: - 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 @@ - + - + ;tag=[pid]SIPpTag00[call_number] To: [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: ;tag=[pid]SIPpTag00[call_number] To: - 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: ;tag=[pid]SIPpTag00[call_number] To: [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 @@ - - + + ;tag=[pid]SIPpTag00[call_number] To: [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 @@ ]]> - + @@ -140,7 +140,7 @@ - diff --git a/scenarios/invite_peerout/sipp_scenario_responder00.xml b/scenarios/invite_peerout/sipp_scenario_responder00.xml index d8cbf14f..da77f415 100644 --- a/scenarios/invite_peerout/sipp_scenario_responder00.xml +++ b/scenarios/invite_peerout/sipp_scenario_responder00.xml @@ -20,7 +20,7 @@ ]]> - + - + ;tag=[pid]SIPpTag00[call_number] To: - 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 @@ - + - + ;tag=[pid]SIPpTag00[call_number] To: [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: ;tag=[pid]SIPpTag00[call_number] To: - 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: ;tag=[pid]SIPpTag00[call_number] To: [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 @@ - - + + ;tag=[pid]SIPpTag00[call_number] To: [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 @@ ]]> - + @@ -140,7 +140,7 @@ - diff --git a/scenarios/invite_peerout_rewrite/sipp_scenario_responder00.xml b/scenarios/invite_peerout_rewrite/sipp_scenario_responder00.xml index d8cbf14f..da77f415 100644 --- a/scenarios/invite_peerout_rewrite/sipp_scenario_responder00.xml +++ b/scenarios/invite_peerout_rewrite/sipp_scenario_responder00.xml @@ -20,7 +20,7 @@ ]]> - + - + ', - 'Content-Length: 0' - ] - - [ - '^SIP/2.0 200 OK', - 'From: ', - 'Content-Type: application/sdp' - ] diff --git a/scenarios/invite_redirect/0009_test.yml.tt2 b/scenarios/invite_redirect/0009_test.yml.tt2 new file mode 100644 index 00000000..8b612fb9 --- /dev/null +++ b/scenarios/invite_redirect/0009_test.yml.tt2 @@ -0,0 +1,99 @@ +flow: +- start|REPLY_ROUTE_NAT: +- start|BRANCH_ROUTE_SBC: +- start|ROUTE_STOP_RTPPROXY_BRANCH: +- start|ROUTE_RESTORE_CLUSTERSET: +- return|ROUTE_RESTORE_CLUSTERSET: +- return|ROUTE_STOP_RTPPROXY_BRANCH: +- start|ROUTE_INITVARS: +- return|ROUTE_INITVARS: +- start|ROUTE_LOAD_CALLER_PREF: +- start|ROUTE_CLEAR_CALLER_PREF: +- return|ROUTE_CLEAR_CALLER_PREF: +- return|ROUTE_LOAD_CALLER_PREF: +- start|ROUTE_FIND_CALLEE: +- start|ROUTE_CLEAR_CALLEE_PREF: +- return|ROUTE_CLEAR_CALLEE_PREF: +- start|ROUTE_NCOS: +- return|ROUTE_NCOS: +- start|ROUTE_NCOS: +- return|ROUTE_NCOS: +- start|ROUTE_NCOS: +- return|ROUTE_NCOS: +- start|ROUTE_NCOS: +- return|ROUTE_NCOS: +- start|ROUTE_BLOCK_OUT: +- return|ROUTE_BLOCK_OUT: +- start|ROUTE_LOAD_CALLEE_PREF: +- start|ROUTE_BLOCK_IN: +- 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: +- return|ROUTE_SET_CALLER_DIALOG: +- start|ROUTE_ACC_CALLER: +- return|ROUTE_ACC_CALLER: +- start|ROUTE_ACC_CALLEE: +- return|ROUTE_ACC_CALLEE: +- start|BRANCH_ROUTE_SBC: +- start|ROUTE_BRANCH_ACC_RTP: +- return|ROUTE_BRANCH_ACC_RTP: +- start|ROUTE_SET_RUSER: +- return|ROUTE_SET_RUSER: +- start|ROUTE_PREPARE_SST: +- return|ROUTE_PREPARE_SST: +- start|ROUTE_PREPARE_MOH: +- return|ROUTE_PREPARE_MOH: +- start|ROUTE_SET_CALLER_CLI: +- start|ROUTE_PREPARE_CALLER_CLI: +- return|ROUTE_PREPARE_CALLER_CLI: +- start|ROUTE_PREPARE_CALLER_CLI: +- return|ROUTE_PREPARE_CALLER_CLI: +- start|ROUTE_PREPARE_CALLER_CLI: +- return|ROUTE_PREPARE_CALLER_CLI: +- start|ROUTE_PREPARE_CALLER_CLI: +- return|ROUTE_PREPARE_CALLER_CLI: +- start|ROUTE_PREPARE_CALLER_CLI: +- return|ROUTE_PREPARE_CALLER_CLI: +- return|ROUTE_SET_CALLER_CLI: +- start|ROUTE_SET_CALLEE: +- return|ROUTE_SET_CALLEE: +- start|ROUTE_ADD_CALLINFO: +- return|ROUTE_ADD_CALLINFO: +- return|BRANCH_ROUTE_SBC: +- return|BRANCH_ROUTE_SBC: +- exit|ROUTE_OUTBOUND: +- exit|ROUTE_OUTBOUND: +sip_in: + - '^SIP/2.0 302 Moved Temporarily' + - 'From: ;tag=[pid]SIPpTag00[call_number] To: - 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 @@ - + - + ;tag=[pid]SIPpTag00[call_number] To: [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: ;tag=[pid]SIPpTag00[call_number] To: - 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: ;tag=[pid]SIPpTag00[call_number] To: [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 @@ - - + + ;tag=[pid]SIPpTag00[call_number] To: [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 @@ ]]> - + @@ -140,7 +140,7 @@ - diff --git a/scenarios/invite_redirect/sipp_scenario_responder01.xml b/scenarios/invite_redirect/sipp_scenario_responder01.xml index 4d1ca6b6..da77f415 100644 --- a/scenarios/invite_redirect/sipp_scenario_responder01.xml +++ b/scenarios/invite_redirect/sipp_scenario_responder01.xml @@ -20,7 +20,7 @@ ]]> - + - + diff --git a/scenarios/invite_speeddial/0005_test.yml.tt2 b/scenarios/invite_speeddial/0005_test.yml.tt2 index a60dc74f..2e17e2ef 100644 --- a/scenarios/invite_speeddial/0005_test.yml.tt2 +++ b/scenarios/invite_speeddial/0005_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: diff --git a/scenarios/invite_speeddial/0007_test.yml.tt2 b/scenarios/invite_speeddial/0007_test.yml.tt2 index 10f5f691..5b70ca65 100644 --- a/scenarios/invite_speeddial/0007_test.yml.tt2 +++ b/scenarios/invite_speeddial/0007_test.yml.tt2 @@ -1,99 +1,91 @@ -# INVITE speeddial 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: + # branch ?? + - return|BRANCH_ROUTE_SBC: - exit|ROUTE_OUTBOUND: - # 100 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 sip:\*0@' - 'Contact: sip:testuser1002@' @@ -130,19 +122,3 @@ sip_out: 'P-NGCP-Caller-Info: ', - 'CSeq: 2 INVITE', - 'Content-Length: 0', - 'From: ', - 'CSeq: 2 INVITE', - 'From: ' + - 'From: ' +sip_out: + - [ + '^SIP/2.0 200 OK', + 'Contact: ', + 'CSeq: 2 INVITE', + 'From: ;tag=[pid]SIPpTag00[call_number] To: - 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 @@ - + - + ;tag=[pid]SIPpTag00[call_number] To: [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: ;tag=[pid]SIPpTag00[call_number] To: - 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: ;tag=[pid]SIPpTag00[call_number] To: [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 @@ - - + + ;tag=[pid]SIPpTag00[call_number] To: [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 @@ ]]> - + @@ -140,7 +140,7 @@ - diff --git a/scenarios/invite_speeddial/sipp_scenario01.xml b/scenarios/invite_speeddial/sipp_scenario01.xml index a1f5ce7b..713ecb9a 100644 --- a/scenarios/invite_speeddial/sipp_scenario01.xml +++ b/scenarios/invite_speeddial/sipp_scenario01.xml @@ -8,7 +8,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - 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=1]@[local_ip]:[local_port] Max-Forwards: 70 @@ -29,9 +29,9 @@ - + - + ;tag=[pid]SIPpTag00[call_number] To: [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=1]@[local_ip]:[local_port] Max-Forwards: 70 @@ -57,7 +57,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - 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=1]@[local_ip]:[local_port] Max-Forwards: 70 @@ -96,7 +96,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: [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=1]@[local_ip]:[local_port] @@ -112,8 +112,8 @@ - - + + ;tag=[pid]SIPpTag00[call_number] To: [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=1]@[local_ip]:[local_port] [routes] @@ -131,7 +131,7 @@ ]]> - + @@ -140,7 +140,7 @@ - diff --git a/scenarios/invite_speeddial/sipp_scenario02.xml b/scenarios/invite_speeddial/sipp_scenario02.xml index 03f5e326..611a5382 100644 --- a/scenarios/invite_speeddial/sipp_scenario02.xml +++ b/scenarios/invite_speeddial/sipp_scenario02.xml @@ -8,7 +8,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - 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=2]@[local_ip]:[local_port] Max-Forwards: 70 @@ -29,9 +29,9 @@ - + - + ;tag=[pid]SIPpTag00[call_number] To: [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=2]@[local_ip]:[local_port] Max-Forwards: 70 @@ -57,7 +57,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - 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=2]@[local_ip]:[local_port] Max-Forwards: 70 @@ -96,7 +96,7 @@ [last_Via:] From: ;tag=[pid]SIPpTag00[call_number] To: [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=2]@[local_ip]:[local_port] Max-Forwards: 70 @@ -107,7 +107,7 @@ - diff --git a/scenarios/invite_speeddial/sipp_scenario03.xml b/scenarios/invite_speeddial/sipp_scenario03.xml index 3eee023e..aacf24ec 100644 --- a/scenarios/invite_speeddial/sipp_scenario03.xml +++ b/scenarios/invite_speeddial/sipp_scenario03.xml @@ -8,7 +8,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - 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=3]@[local_ip]:[local_port] Max-Forwards: 70 @@ -29,9 +29,9 @@ - + - + ;tag=[pid]SIPpTag00[call_number] To: [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=3]@[local_ip]:[local_port] Max-Forwards: 70 @@ -57,7 +57,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - 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=3]@[local_ip]:[local_port] Max-Forwards: 70 @@ -90,7 +90,7 @@ [last_Via:] From: ;tag=[pid]SIPpTag00[call_number] To: [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=3]@[local_ip]:[local_port] Max-Forwards: 70 @@ -101,7 +101,7 @@ - diff --git a/scenarios/invite_speeddial/sipp_scenario_responder01.xml b/scenarios/invite_speeddial/sipp_scenario_responder01.xml index d8cbf14f..da77f415 100644 --- a/scenarios/invite_speeddial/sipp_scenario_responder01.xml +++ b/scenarios/invite_speeddial/sipp_scenario_responder01.xml @@ -20,7 +20,7 @@ ]]> - + - + ;tag=[pid]SIPpTag00[call_number] To: - 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 @@ - + - + ;tag=[pid]SIPpTag00[call_number] To: [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: ;tag=[pid]SIPpTag00[call_number] To: - 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: ;tag=[pid]SIPpTag00[call_number] To: [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 @@ - - + + ;tag=[pid]SIPpTag00[call_number] To: [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 @@ ]]> - + @@ -140,7 +140,7 @@ - diff --git a/scenarios/invite_tcp_udp/sipp_scenario_responder00.xml b/scenarios/invite_tcp_udp/sipp_scenario_responder00.xml index 4d1ca6b6..da77f415 100644 --- a/scenarios/invite_tcp_udp/sipp_scenario_responder00.xml +++ b/scenarios/invite_tcp_udp/sipp_scenario_responder00.xml @@ -20,7 +20,7 @@ ]]> - + - + diff --git a/scenarios/invite_tcp_udp_reinvite/0003_test.yml.tt2 b/scenarios/invite_tcp_udp_reinvite/0003_test.yml.tt2 index 87235a4b..a9bfc83f 100644 --- a/scenarios/invite_tcp_udp_reinvite/0003_test.yml.tt2 +++ b/scenarios/invite_tcp_udp_reinvite/0003_test.yml.tt2 @@ -1,15 +1,15 @@ 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: diff --git a/scenarios/invite_tcp_udp_reinvite/0005_test.yml.tt2 b/scenarios/invite_tcp_udp_reinvite/0005_test.yml.tt2 index 9911965b..3eddc456 100644 --- a/scenarios/invite_tcp_udp_reinvite/0005_test.yml.tt2 +++ b/scenarios/invite_tcp_udp_reinvite/0005_test.yml.tt2 @@ -1,99 +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: - - 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: $avp(proto): ["tcp"] - # 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: ' @@ -31,10 +29,3 @@ sip_out: 'To: ;tag=[pid]SIPpTag00[call_number] To: - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: [cseq] INVITE Contact: Max-Forwards: 70 @@ -39,7 +39,7 @@ [last_Via:] From: ;tag=[pid]SIPpTag00[call_number] To: [peer_tag_param] - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: [cseq] ACK Contact: Max-Forwards: 70 @@ -57,7 +57,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: [cseq] INVITE Contact: Max-Forwards: 70 @@ -96,7 +96,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: [peer_tag_param] - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] [routes] CSeq: [cseq] ACK Contact: @@ -153,7 +153,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: [peer_tag_param] - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: [cseq] BYE Contact: [routes] @@ -171,7 +171,7 @@ - diff --git a/scenarios/invite_voicebox/0001_test.yml.tt2 b/scenarios/invite_voicebox/0001_test.yml.tt2 index a23771e5..baecd4f5 100644 --- a/scenarios/invite_voicebox/0001_test.yml.tt2 +++ b/scenarios/invite_voicebox/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: diff --git a/scenarios/invite_voicebox/0003_test.yml.tt2 b/scenarios/invite_voicebox/0003_test.yml.tt2 index 3dd72edc..fdc4e631 100644 --- a/scenarios/invite_voicebox/0003_test.yml.tt2 +++ b/scenarios/invite_voicebox/0003_test.yml.tt2 @@ -1,73 +1,75 @@ # 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_LOAD_CF_MAP: - - end|ROUTE_LOAD_CF_MAP: + - return|ROUTE_LOAD_CF_MAP: - start|ROUTE_CHECK_CF_PERIOD: - return|ROUTE_CHECK_CF_PERIOD: - start|ROUTE_ACC_CF: - start|ROUTE_ACC_CALLER: - - end|ROUTE_ACC_CALLER: + - return|ROUTE_ACC_CALLER: - start|ROUTE_ACC_CALLEE: - - end|ROUTE_ACC_CALLEE: - - end|ROUTE_ACC_CF: + - return|ROUTE_ACC_CALLEE: + - return|ROUTE_ACC_CF: - start|ROUTE_EXECUTE_CF_LOOP: - start|ROUTE_SET_CALLER_DIALOG: - - end|ROUTE_SET_CALLER_DIALOG: + - return|ROUTE_SET_CALLER_DIALOG: - start|BRANCH_ROUTE_FWD_LOOP: - start|ROUTE_ADD_CALLINFO: - - end|ROUTE_ADD_CALLINFO: - - end|BRANCH_ROUTE_FWD_LOOP: + - return|ROUTE_ADD_CALLINFO: + - return|BRANCH_ROUTE_FWD_LOOP: + # branch ?? + - return|BRANCH_ROUTE_FWD_LOOP: - exit|ROUTE_EXECUTE_CF_LOOP: sip_in: - '^INVITE' diff --git a/scenarios/invite_voicebox/0005_test.yml.tt2 b/scenarios/invite_voicebox/0005_test.yml.tt2 index 613d2e80..82849887 100644 --- a/scenarios/invite_voicebox/0005_test.yml.tt2 +++ b/scenarios/invite_voicebox/0005_test.yml.tt2 @@ -1,69 +1,67 @@ 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: - - end|ROUTE_FIND_CALLER: + - 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_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_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_CHECK_PBX: - return|ROUTE_CHECK_PBX: - start|ROUTE_VOICEBOX: - 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_NO_SBC: - start|ROUTE_BRANCH_ACC_RTP: - - end|ROUTE_BRANCH_ACC_RTP: + - return|ROUTE_BRANCH_ACC_RTP: - 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_NO_SBC: + - return|ROUTE_ADD_CALLINFO: + - return|BRANCH_ROUTE_NO_SBC: + # branch ?? + - return|BRANCH_ROUTE_NO_SBC: - exit|ROUTE_OUTBOUND: - - start|REPLY_ROUTE_NAT: - - exit|REPLY_ROUTE_NAT: - - start|REPLY_ROUTE_NAT: - - exit|REPLY_ROUTE_NAT: sip_in: - '^INVITE sip:vmu4311001@voicebox.local SIP/2.0' - 'Contact: ' @@ -89,20 +87,3 @@ sip_out: 'Contact: ', 'Content-Type: application/sdp' ] - - [ - '^SIP/2.0 200 OK', - 'CSeq: 10 INVITE', - 'From: ', - 'User-Agent: NGCP Voicebox Server', - 'Content-Type: application/sdp' - ] - - [ - '^SIP/2.0 200 OK', - 'CSeq: 2 INVITE', - 'From: ', - 'Content-Type: application/sdp' - ] diff --git a/scenarios/invite_voicebox/0009_test.yml.tt2 b/scenarios/invite_voicebox/0009_test.yml.tt2 index 7fddf03d..6953dd85 100644 --- a/scenarios/invite_voicebox/0009_test.yml.tt2 +++ b/scenarios/invite_voicebox/0009_test.yml.tt2 @@ -1,12 +1,12 @@ -# 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@' diff --git a/scenarios/invite_voicebox/0010_test.yml.tt2 b/scenarios/invite_voicebox/0010_test.yml.tt2 deleted file mode 100644 index 50d686c0..00000000 --- a/scenarios/invite_voicebox/0010_test.yml.tt2 +++ /dev/null @@ -1,25 +0,0 @@ -# INVITE_OFFLINE scenario -flow: - - start|MAIN: - - start|ROUTE_NET_INFO: - - end|ROUTE_NET_INFO: - - start|ROUTE_PRX_REQUEST: - - start|ROUTE_INITVARS: - - end|ROUTE_INITVARS: - - start|ROUTE_OUTBOUND: -sip_in: - - '^ACK sip:vmu4311001@127.0.0.1:5070 SIP/2.0' - - 'Contact: ' - - 'CSeq: 10 ACK' - - 'Content-Length: 0' - - 'From: ', - 'CSeq: 10 ACK', - 'Content-Length: 0', - 'From: ;tag=[pid]SIPpTag00[call_number] To: - 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 @@ - + - + ;tag=[pid]SIPpTag00[call_number] To: [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: ;tag=[pid]SIPpTag00[call_number] To: - 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: ;tag=[pid]SIPpTag00[call_number] To: [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 @@ - - + + ;tag=[pid]SIPpTag00[call_number] To: [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 @@ ]]> - + @@ -140,7 +140,7 @@ - diff --git a/scenarios/register/0001_test.yml.tt2 b/scenarios/register/0001_test.yml.tt2 index 002055f6..9b4e5e7e 100644 --- a/scenarios/register/0001_test.yml.tt2 +++ b/scenarios/register/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: diff --git a/scenarios/register/0002_test.yml.tt2 b/scenarios/register/0002_test.yml.tt2 index 407acc22..f8c51b14 100644 --- a/scenarios/register/0002_test.yml.tt2 +++ b/scenarios/register/0002_test.yml.tt2 @@ -1,20 +1,19 @@ -# 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: - start|ROUTE_ADD_CALLINFO_REPLY: - return|ROUTE_ADD_CALLINFO_REPLY: - - end|ROUTE_AUTH: + - return|ROUTE_AUTH: - start|ROUTE_PREFERENCES: - - end|ROUTE_PREFERENCES: + - return|ROUTE_PREFERENCES: $xavp(caller_dom_prefs[0]=>dummy[*]): ['caller'] $xavp(caller_dom_prefs[0]=>ac[*]): None $xavp(caller_dom_prefs[0]=>cc[*]): None diff --git a/scenarios/register/scenario.yml b/scenarios/register/scenario.yml index 2bc2dfed..05fccf13 100644 --- a/scenarios/register/scenario.yml +++ b/scenarios/register/scenario.yml @@ -1,3 +1,4 @@ +test_uuid: register subscribers: spce.test: testuser1003: diff --git a/scenarios/register/sipp_scenario00.xml b/scenarios/register/sipp_scenario00.xml index d9cc4973..d269bf8c 100644 --- a/scenarios/register/sipp_scenario00.xml +++ b/scenarios/register/sipp_scenario00.xml @@ -9,7 +9,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 1 REGISTER Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port] Expires: 600 @@ -22,9 +22,9 @@ - + - + ;tag=[pid]SIPpTag00[call_number] To: - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 2 REGISTER [field2 file="callee.csv" line=0] Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port] @@ -42,7 +42,7 @@ ]]> - + diff --git a/scenarios/register_allowip/0001_test.yml.tt2 b/scenarios/register_allowip/0001_test.yml.tt2 index 002055f6..9b4e5e7e 100644 --- a/scenarios/register_allowip/0001_test.yml.tt2 +++ b/scenarios/register_allowip/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: diff --git a/scenarios/register_allowip/0002_test.yml.tt2 b/scenarios/register_allowip/0002_test.yml.tt2 index 1aa41a28..0f0ae9c7 100644 --- a/scenarios/register_allowip/0002_test.yml.tt2 +++ b/scenarios/register_allowip/0002_test.yml.tt2 @@ -1,18 +1,17 @@ -# 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: - start|ROUTE_ADD_CALLINFO_REPLY: - return|ROUTE_ADD_CALLINFO_REPLY: - - end|ROUTE_AUTH: + - return|ROUTE_AUTH: - start|ROUTE_PREFERENCES: - exit|ROUTE_PREFERENCES: $xavp(callee_dom_prefs): None diff --git a/scenarios/register_allowip/scenario.yml b/scenarios/register_allowip/scenario.yml index 2bc2dfed..bf6ed38b 100644 --- a/scenarios/register_allowip/scenario.yml +++ b/scenarios/register_allowip/scenario.yml @@ -1,3 +1,4 @@ +test_uuid: register_allowip subscribers: spce.test: testuser1003: diff --git a/scenarios/register_allowip/sipp_scenario00.xml b/scenarios/register_allowip/sipp_scenario00.xml index f6d1241e..45997674 100644 --- a/scenarios/register_allowip/sipp_scenario00.xml +++ b/scenarios/register_allowip/sipp_scenario00.xml @@ -9,7 +9,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 1 REGISTER Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port] Expires: 600 @@ -22,9 +22,9 @@ - + - + ;tag=[pid]SIPpTag00[call_number] To: - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 2 REGISTER [field2 file="callee.csv" line=0] Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port] @@ -42,7 +42,7 @@ ]]> - + diff --git a/scenarios/register_bria/0001_test.yml.tt2 b/scenarios/register_bria/0001_test.yml.tt2 index 40021c8f..edde0c78 100644 --- a/scenarios/register_bria/0001_test.yml.tt2 +++ b/scenarios/register_bria/0001_test.yml.tt2 @@ -1,12 +1,11 @@ -# REGISTER scenario flow: - - start|MAIN: + - start|DEFAULT_ROUTE: $fU: testuser1004 $tU: testuser1004 - start|ROUTE_NET_INFO: $fU: testuser1004 $tU: testuser1004 - - end|ROUTE_NET_INFO: + - return|ROUTE_NET_INFO: - start|ROUTE_REG_REQUEST: - start|ROUTE_REG_HANDLE: - start|ROUTE_AUTH: diff --git a/scenarios/register_bria/0002_test.yml.tt2 b/scenarios/register_bria/0002_test.yml.tt2 index 0d36cb79..caf5710f 100644 --- a/scenarios/register_bria/0002_test.yml.tt2 +++ b/scenarios/register_bria/0002_test.yml.tt2 @@ -1,20 +1,19 @@ -# REGISTER scenario flow: - - start|MAIN: + - start|DEFAULT_ROUTE: $fU: testuser1004 $tU: testuser1004 - start|ROUTE_NET_INFO: $fU: testuser1004 $tU: testuser1004 - - end|ROUTE_NET_INFO: + - return|ROUTE_NET_INFO: - start|ROUTE_REG_REQUEST: - start|ROUTE_REG_HANDLE: - start|ROUTE_AUTH: - start|ROUTE_ADD_CALLINFO_REPLY: - return|ROUTE_ADD_CALLINFO_REPLY: - - end|ROUTE_AUTH: + - return|ROUTE_AUTH: - start|ROUTE_PREFERENCES: - - end|ROUTE_PREFERENCES: + - return|ROUTE_PREFERENCES: - exit|ROUTE_REG_HANDLE: sip_in: - '^REGISTER' diff --git a/scenarios/register_bria/0003_test.yml.tt2 b/scenarios/register_bria/0003_test.yml.tt2 index 3d73ba27..00381d6b 100644 --- a/scenarios/register_bria/0003_test.yml.tt2 +++ b/scenarios/register_bria/0003_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: diff --git a/scenarios/register_bria/0004_test.yml.tt2 b/scenarios/register_bria/0004_test.yml.tt2 index ffb5e2a6..678ff4a3 100644 --- a/scenarios/register_bria/0004_test.yml.tt2 +++ b/scenarios/register_bria/0004_test.yml.tt2 @@ -1,20 +1,19 @@ -# 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: - start|ROUTE_ADD_CALLINFO_REPLY: - return|ROUTE_ADD_CALLINFO_REPLY: - - end|ROUTE_AUTH: + - return|ROUTE_AUTH: - start|ROUTE_PREFERENCES: - - end|ROUTE_PREFERENCES: + - return|ROUTE_PREFERENCES: - exit|ROUTE_REG_HANDLE: sip_in: - '^REGISTER' diff --git a/scenarios/register_bria/0005_test.yml.tt2 b/scenarios/register_bria/0005_test.yml.tt2 index 89f489cc..53bfe816 100644 --- a/scenarios/register_bria/0005_test.yml.tt2 +++ b/scenarios/register_bria/0005_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: diff --git a/scenarios/register_bria/0006_test.yml.tt2 b/scenarios/register_bria/0006_test.yml.tt2 index 43b759b1..8004ef9f 100644 --- a/scenarios/register_bria/0006_test.yml.tt2 +++ b/scenarios/register_bria/0006_test.yml.tt2 @@ -1,20 +1,19 @@ -# 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: - start|ROUTE_ADD_CALLINFO_REPLY: - return|ROUTE_ADD_CALLINFO_REPLY: - - end|ROUTE_AUTH: + - return|ROUTE_AUTH: - start|ROUTE_PREFERENCES: - - end|ROUTE_PREFERENCES: + - return|ROUTE_PREFERENCES: - exit|ROUTE_REG_HANDLE: sip_in: - '^REGISTER' diff --git a/scenarios/register_bria/scenario.yml b/scenarios/register_bria/scenario.yml index b3f25f75..3418a92c 100644 --- a/scenarios/register_bria/scenario.yml +++ b/scenarios/register_bria/scenario.yml @@ -1,3 +1,4 @@ +test_uuid: register_bria subscribers: spce.test: testuser1004: diff --git a/scenarios/register_bria/sipp_scenario00.xml b/scenarios/register_bria/sipp_scenario00.xml index db12e31a..81034c10 100644 --- a/scenarios/register_bria/sipp_scenario00.xml +++ b/scenarios/register_bria/sipp_scenario00.xml @@ -9,7 +9,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: "TestBria" - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 1 REGISTER Contact: "TestBria" ;reg-id=1;+sip.instance="" Expires: 600 @@ -32,7 +32,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: "TestBria" - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 2 REGISTER [field2 file="callee.csv" line=0] Contact: "TestBria" ;reg-id=1;+sip.instance="" diff --git a/scenarios/register_bria/sipp_scenario01.xml b/scenarios/register_bria/sipp_scenario01.xml index 77c53079..2203d824 100644 --- a/scenarios/register_bria/sipp_scenario01.xml +++ b/scenarios/register_bria/sipp_scenario01.xml @@ -9,7 +9,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: "TestBria" - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 1 REGISTER Contact: "TestBria" ;reg-id=1;+sip.instance="" Expires: 600 @@ -32,7 +32,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: "TestBria" - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 2 REGISTER [field2 file="callee.csv" line=1] Contact: "TestBria" ;reg-id=1;+sip.instance="" diff --git a/scenarios/register_bria/sipp_scenario02.xml b/scenarios/register_bria/sipp_scenario02.xml index b208c735..a011b5ed 100644 --- a/scenarios/register_bria/sipp_scenario02.xml +++ b/scenarios/register_bria/sipp_scenario02.xml @@ -9,7 +9,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: "TestBria" - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 3 REGISTER Contact: "TestBria" ;reg-id=1;+sip.instance="" Contact: "TestBria" ;expires=0 @@ -23,9 +23,9 @@ - + - + ;tag=[pid]SIPpTag00[call_number] To: "TestBria" - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 4 REGISTER [field2 file="callee.csv" line=1] Contact: "TestBria" ;reg-id=1;+sip.instance="" @@ -44,7 +44,7 @@ ]]> - + diff --git a/scenarios/register_ignore_allowip/0001_test.yml.tt2 b/scenarios/register_ignore_allowip/0001_test.yml.tt2 index adee3c78..03825836 100644 --- a/scenarios/register_ignore_allowip/0001_test.yml.tt2 +++ b/scenarios/register_ignore_allowip/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: $fU: testuser1003 $tU: testuser1003 - start|ROUTE_REG_REQUEST: diff --git a/scenarios/register_ignore_allowip/0002_test.yml.tt2 b/scenarios/register_ignore_allowip/0002_test.yml.tt2 index e4df406a..ae771ad8 100644 --- a/scenarios/register_ignore_allowip/0002_test.yml.tt2 +++ b/scenarios/register_ignore_allowip/0002_test.yml.tt2 @@ -1,18 +1,17 @@ -# 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: - start|ROUTE_ADD_CALLINFO_REPLY: - return|ROUTE_ADD_CALLINFO_REPLY: - - end|ROUTE_AUTH: + - return|ROUTE_AUTH: - start|ROUTE_PREFERENCES: $xavp(callee_dom_prefs): None $xavp(callee_peer_prefs): None @@ -22,7 +21,7 @@ flow: $xavp(caller_peer_prefs): None $xavp(caller_real_prefs): None $xavp(caller_usr_prefs): None - - end|ROUTE_PREFERENCES: + - return|ROUTE_PREFERENCES: $xavp(callee_dom_prefs): None $xavp(callee_peer_prefs): None $xavp(callee_real_prefs): None diff --git a/scenarios/register_ignore_allowip/scenario.yml b/scenarios/register_ignore_allowip/scenario.yml index 2bc2dfed..7fe7e708 100644 --- a/scenarios/register_ignore_allowip/scenario.yml +++ b/scenarios/register_ignore_allowip/scenario.yml @@ -1,3 +1,4 @@ +test_uuid: register_ignore_allowip subscribers: spce.test: testuser1003: diff --git a/scenarios/register_ignore_allowip/sipp_scenario00.xml b/scenarios/register_ignore_allowip/sipp_scenario00.xml index d9cc4973..d269bf8c 100644 --- a/scenarios/register_ignore_allowip/sipp_scenario00.xml +++ b/scenarios/register_ignore_allowip/sipp_scenario00.xml @@ -9,7 +9,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 1 REGISTER Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port] Expires: 600 @@ -22,9 +22,9 @@ - + - + ;tag=[pid]SIPpTag00[call_number] To: - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 2 REGISTER [field2 file="callee.csv" line=0] Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port] @@ -42,7 +42,7 @@ ]]> - + diff --git a/scenarios/register_tcp/0001_test.yml.tt2 b/scenarios/register_tcp/0001_test.yml.tt2 index 54ccd3ca..537de289 100644 --- a/scenarios/register_tcp/0001_test.yml.tt2 +++ b/scenarios/register_tcp/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: $avp(proto): ["tcp"] - start|ROUTE_REG_REQUEST: - start|ROUTE_REG_HANDLE: diff --git a/scenarios/register_tcp/0002_test.yml.tt2 b/scenarios/register_tcp/0002_test.yml.tt2 index d380df57..fb0cd387 100644 --- a/scenarios/register_tcp/0002_test.yml.tt2 +++ b/scenarios/register_tcp/0002_test.yml.tt2 @@ -1,21 +1,20 @@ -# 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: $avp(proto): ["tcp"] - start|ROUTE_REG_REQUEST: - start|ROUTE_REG_HANDLE: - start|ROUTE_AUTH: - start|ROUTE_ADD_CALLINFO_REPLY: - return|ROUTE_ADD_CALLINFO_REPLY: - - end|ROUTE_AUTH: + - return|ROUTE_AUTH: - start|ROUTE_PREFERENCES: - - end|ROUTE_PREFERENCES: + - return|ROUTE_PREFERENCES: $xavp(caller_dom_prefs[0]=>dummy[*]): ['caller'] $xavp(caller_dom_prefs[0]=>ac[*]): None $xavp(caller_dom_prefs[0]=>cc[*]): None diff --git a/scenarios/register_tcp/scenario.yml b/scenarios/register_tcp/scenario.yml index ce1548ed..dd6c2d6d 100644 --- a/scenarios/register_tcp/scenario.yml +++ b/scenarios/register_tcp/scenario.yml @@ -1,3 +1,4 @@ +test_uuid: register_tcp subscribers: spce.test: testuser1003: diff --git a/scenarios/register_tcp/sipp_scenario00.xml b/scenarios/register_tcp/sipp_scenario00.xml index 3be5735d..d269bf8c 100644 --- a/scenarios/register_tcp/sipp_scenario00.xml +++ b/scenarios/register_tcp/sipp_scenario00.xml @@ -9,7 +9,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 1 REGISTER Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port] Expires: 600 @@ -32,7 +32,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 2 REGISTER [field2 file="callee.csv" line=0] Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port] diff --git a/scenarios/reminder/0001_test.yml.tt2 b/scenarios/reminder/0001_test.yml.tt2 index 96895325..366627ce 100644 --- a/scenarios/reminder/0001_test.yml.tt2 +++ b/scenarios/reminder/0001_test.yml.tt2 @@ -1,16 +1,15 @@ -# REMINDER 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: diff --git a/scenarios/reminder/0003_test.yml.tt2 b/scenarios/reminder/0003_test.yml.tt2 index d38b3d18..27d5df3b 100644 --- a/scenarios/reminder/0003_test.yml.tt2 +++ b/scenarios/reminder/0003_test.yml.tt2 @@ -1,71 +1,69 @@ -# 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_TO_APPSRV: - start|ROUTE_LOAD_APPSRV: - - end|ROUTE_LOAD_APPSRV: + - return|ROUTE_LOAD_APPSRV: - 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_NO_SBC: - start|ROUTE_BRANCH_ACC_RTP: - - end|ROUTE_BRANCH_ACC_RTP: + - return|ROUTE_BRANCH_ACC_RTP: - 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_NO_SBC: + - return|ROUTE_ADD_CALLINFO: + - return|BRANCH_ROUTE_NO_SBC: + # branch ?? + - return|BRANCH_ROUTE_NO_SBC: - exit|ROUTE_OUTBOUND: - # 200 OK - - start|REPLY_ROUTE_NAT: - - exit|REPLY_ROUTE_NAT: sip_in: - '^INVITE' - 'Contact: sip:testuser1001@' @@ -96,10 +94,3 @@ sip_out: 'P-Callee-UUID: \w+', 'P-App-Name: sw_vsc' ] - - [ - '^SIP/2.0 200 OK', - 'CSeq: 2 INVITE', - 'From: ;tag=[pid]SIPpTag00[call_number] To: - 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 @@ - + - + ;tag=[pid]SIPpTag00[call_number] To: [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: ;tag=[pid]SIPpTag00[call_number] To: - 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: ;tag=[pid]SIPpTag00[call_number] To: [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] @@ -108,7 +108,7 @@ - diff --git a/scenarios/templates/sipp_scenario_responder_reg.xml.tt2 b/scenarios/templates/sipp_scenario_responder_reg.xml.tt2 index 391ffa32..94598282 100644 --- a/scenarios/templates/sipp_scenario_responder_reg.xml.tt2 +++ b/scenarios/templates/sipp_scenario_responder_reg.xml.tt2 @@ -9,7 +9,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 1 REGISTER Contact: sip:[field0 file="callee.csv" line=[% line -%]]@[local_ip]:[local_port];transport=[transport] Expires: 600 @@ -22,9 +22,9 @@ - + - + ;tag=[pid]SIPpTag00[call_number] To: - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 2 REGISTER [field2 file="callee.csv" line=[% line -%]] Contact: sip:[field0 file="callee.csv" line=[% line -%]]@[local_ip]:[local_port];transport=[transport] @@ -42,7 +42,7 @@ ]]> - + diff --git a/scenarios_disabled/invite_peerout_emergency/sipp_scenario00.xml b/scenarios_disabled/invite_peerout_emergency/sipp_scenario00.xml index 5434e8e2..66e637bf 100644 --- a/scenarios_disabled/invite_peerout_emergency/sipp_scenario00.xml +++ b/scenarios_disabled/invite_peerout_emergency/sipp_scenario00.xml @@ -8,7 +8,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - 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 @@ -39,7 +39,7 @@ [last_Via:] From: ;tag=[pid]SIPpTag00[call_number] To: [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: ;tag=[pid]SIPpTag00[call_number] To: - 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: ;tag=[pid]SIPpTag00[call_number] To: [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] @@ -122,7 +122,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: [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] diff --git a/scenarios/invite_peerout_rewrite_pv_regex/0001_test.yml.tt2 b/scenarios_disabled/invite_peerout_rewrite_pv_regex/0001_test.yml.tt2 similarity index 81% rename from scenarios/invite_peerout_rewrite_pv_regex/0001_test.yml.tt2 rename to scenarios_disabled/invite_peerout_rewrite_pv_regex/0001_test.yml.tt2 index 0170de24..cf91b29e 100644 --- a/scenarios/invite_peerout_rewrite_pv_regex/0001_test.yml.tt2 +++ b/scenarios_disabled/invite_peerout_rewrite_pv_regex/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: diff --git a/scenarios/invite_peerout_rewrite_pv_regex/0003_test.yml.tt2 b/scenarios_disabled/invite_peerout_rewrite_pv_regex/0003_test.yml.tt2 similarity index 62% rename from scenarios/invite_peerout_rewrite_pv_regex/0003_test.yml.tt2 rename to scenarios_disabled/invite_peerout_rewrite_pv_regex/0003_test.yml.tt2 index 356189f2..f0e0696c 100644 --- a/scenarios/invite_peerout_rewrite_pv_regex/0003_test.yml.tt2 +++ b/scenarios_disabled/invite_peerout_rewrite_pv_regex/0003_test.yml.tt2 @@ -1,81 +1,80 @@ -# 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_APPLY_CALLER_RWR: - start|ROUTE_APPLY_REWRITE_RULE: - return|ROUTE_APPLY_REWRITE_RULE: $var(dp_user): 0 - - end|ROUTE_APPLY_CALLER_RWR: + - return|ROUTE_APPLY_CALLER_RWR: - 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_APPLY_REWRITE_RULE: - return|ROUTE_APPLY_REWRITE_RULE: $var(dp_user): 4321001 - 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_CHECK_PBX: - return|ROUTE_CHECK_PBX: - start|ROUTE_INVITE_TO_EXT: - start|ROUTE_PSTN: - start|ROUTE_CLEAR_PEER_OUT_PREF: - - end|ROUTE_CLEAR_PEER_OUT_PREF: + - return|ROUTE_CLEAR_PEER_OUT_PREF: - start|ROUTE_LOAD_PEER_OUT_PREF: - - end|ROUTE_LOAD_PEER_OUT_PREF: + - return|ROUTE_LOAD_PEER_OUT_PREF: - 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_APPLY_CALLER_RWR_FIRST: - start|ROUTE_APPLY_REWRITE_RULE: @@ -84,36 +83,29 @@ flow: - start|ROUTE_APPLY_REWRITE_RULE: - return|ROUTE_APPLY_REWRITE_RULE: $var(dp_user): 1002 - - end|ROUTE_APPLY_CALLER_RWR_FIRST: + - return|ROUTE_APPLY_CALLER_RWR_FIRST: - 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: - start|ROUTE_APPLY_REWRITE_RULE: - return|ROUTE_APPLY_REWRITE_RULE: $var(dp_user): 0 - - 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 sip:004321001@' - 'Contact: sip:testuser1002@' @@ -147,16 +139,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: ;tag=[pid]SIPpTag00[call_number] To: - 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 @@ - + - + ;tag=[pid]SIPpTag00[call_number] To: [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: ;tag=[pid]SIPpTag00[call_number] To: - 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: ;tag=[pid]SIPpTag00[call_number] To: [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 @@ - - + + ;tag=[pid]SIPpTag00[call_number] To: [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 @@ ]]> - + diff --git a/scenarios/invite_peerout_rewrite_pv_regex/sipp_scenario_responder00.xml b/scenarios_disabled/invite_peerout_rewrite_pv_regex/sipp_scenario_responder00.xml similarity index 97% rename from scenarios/invite_peerout_rewrite_pv_regex/sipp_scenario_responder00.xml rename to scenarios_disabled/invite_peerout_rewrite_pv_regex/sipp_scenario_responder00.xml index d8cbf14f..da77f415 100644 --- a/scenarios/invite_peerout_rewrite_pv_regex/sipp_scenario_responder00.xml +++ b/scenarios_disabled/invite_peerout_rewrite_pv_regex/sipp_scenario_responder00.xml @@ -20,7 +20,7 @@ ]]> - + - + ;tag=[pid]SIPpTag00[call_number] To: - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: [cseq] SUBSCRIBE Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port] Max-Forwards: 70 @@ -33,7 +33,7 @@ [last_Via:] From: ;tag=[pid]SIPpTag00[call_number] To: [peer_tag_param] - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: [cseq] ACK Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port] Max-Forwards: 70 @@ -49,7 +49,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: [cseq] SUBSCRIBE Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port] [field1 file="caller.csv"] @@ -81,7 +81,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: [peer_tag_param] - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] [routes] CSeq: [cseq] ACK Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port] @@ -115,7 +115,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: [peer_tag_param] - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: [cseq] NOTIFY Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port] Max-Forwards: 70 @@ -148,7 +148,7 @@ [last_Via:] From: ;tag=[pid]SIPpTag00[call_number] To: [peer_tag_param] - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: [cseq] ACK Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port] Max-Forwards: 70 @@ -183,7 +183,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: [peer_tag_param] - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: [cseq] NOTIFY Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port] [field1 file="caller.csv"] @@ -224,7 +224,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: [peer_tag_param] - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] [routes] CSeq: [cseq] ACK Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port] @@ -241,7 +241,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: [cseq] PUBLISH Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port] Max-Forwards: 70 @@ -269,7 +269,7 @@ [last_Via:] From: ;tag=[pid]SIPpTag00[call_number] To: [peer_tag_param] - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: [cseq] ACK Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port] Max-Forwards: 70 @@ -287,7 +287,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: [cseq] PUBLISH Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port] [field1 file="caller.csv"] @@ -323,7 +323,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: [peer_tag_param] - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] [routes] CSeq: [cseq] ACK Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port] @@ -341,7 +341,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: [peer_tag_param] - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: [cseq] SUBSCRIBE Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port] Max-Forwards: 70 @@ -365,7 +365,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: [peer_tag_param] - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: [cseq] SUBSCRIBE Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port] [field1 file="caller.csv"] @@ -397,7 +397,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: [peer_tag_param] - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] [routes] CSeq: [cseq] ACK Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port] diff --git a/scenarios_disabled/presence/sipp_scenario_responder01.xml b/scenarios_disabled/presence/sipp_scenario_responder01.xml index f1133efa..64c668a6 100644 --- a/scenarios_disabled/presence/sipp_scenario_responder01.xml +++ b/scenarios_disabled/presence/sipp_scenario_responder01.xml @@ -8,7 +8,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] To: From: ;tag=[pid] - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: [cseq] SUBSCRIBE Max-Forwards: 70 Event: presence @@ -32,7 +32,7 @@ [last_Via:] From: ;tag=[pid] To: [peer_tag_param] - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: [cseq] ACK Contact: Max-Forwards: 70 @@ -47,7 +47,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] To: From: ;tag=[pid] - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: [cseq] SUBSCRIBE Max-Forwards: 70 [field2 file="callee.csv" line=1] @@ -91,7 +91,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] To: From: ;tag=[pid] - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: [cseq] SUBSCRIBE Max-Forwards: 70 Event: presence @@ -115,7 +115,7 @@ [last_Via:] From: ;tag=[pid] To: [peer_tag_param] - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: [cseq] ACK Contact: Max-Forwards: 70 @@ -130,7 +130,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] To: From: ;tag=[pid] - Call-ID: [call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: [cseq] SUBSCRIBE Max-Forwards: 70 [field2 file="callee.csv" line=1]