From d05899948c2926ba3ac8184dc7f2dcfb9d74a3c6 Mon Sep 17 00:00:00 2001 From: Daniel Grotti Date: Fri, 25 Nov 2022 16:07:13 +0100 Subject: [PATCH] MT#56040 KCT: fixed invite_redirect and invite_redirect_tel_uri Adjusted invite_redirect and invice_redirect_tel_uri kct based on the new rework done in review 65078 (MT55858) Change-Id: I5aef6a26032f48d77325227160e150817000728d --- scenarios/invite_redirect/0005_test.yml.tt2 | 6 +- scenarios/invite_redirect/0011_test.yml.tt2 | 38 +++ scenarios/invite_redirect/0012_test.yml.tt2 | 93 +++++++ scenarios/invite_redirect/0013_test.yml.tt2 | 215 +--------------- scenarios/invite_redirect/0014_test.yml.tt2 | 60 ----- scenarios/invite_redirect/0015_test.yml.tt2 | 212 ++++++++++++++++ scenarios/invite_redirect/0017_test.yml.tt2 | 42 ++++ scenarios/invite_redirect/0018_test.yml.tt2 | 26 -- scenarios/invite_redirect/0019_test.yml.tt2 | 29 +++ scenarios/invite_redirect/0020_test.yml.tt2 | 48 ---- scenarios/invite_redirect/0021_test.yml.tt2 | 55 ++--- scenarios/invite_redirect/0022_test.yml.tt2 | 29 +++ scenarios/invite_redirect/0026_test.yml.tt2 | 28 --- .../{0023_test.yml.tt2 => 0028_test.yml.tt2} | 32 +-- scenarios/invite_redirect/0031_test.yml.tt2 | 30 +++ .../sipp_scenario00_test.yml.tt2 | 18 +- .../sipp_scenario_responder00_test.yml.tt2 | 4 +- .../sipp_scenario_responder01_test.yml.tt2 | 12 +- .../invite_redirect_tel_uri/0007_test.yml.tt2 | 8 - .../invite_redirect_tel_uri/0013_test.yml.tt2 | 179 ++++---------- .../invite_redirect_tel_uri/0015_test.yml.tt2 | 229 ++++++++++++++++++ .../{0014_test.yml.tt2 => 0017_test.yml.tt2} | 17 +- .../invite_redirect_tel_uri/0018_test.yml.tt2 | 26 -- .../invite_redirect_tel_uri/0021_test.yml.tt2 | 43 +--- .../invite_redirect_tel_uri/0023_test.yml.tt2 | 51 ---- .../{0020_test.yml.tt2 => 0024_test.yml.tt2} | 10 +- .../invite_redirect_tel_uri/0026_test.yml.tt2 | 43 ++-- .../invite_redirect_tel_uri/0029_test.yml.tt2 | 50 ++++ .../invite_redirect_tel_uri/0031_test.yml.tt2 | 28 +++ .../sipp_scenario00_test.yml.tt2 | 18 +- .../sipp_scenario_responder00_test.yml.tt2 | 4 +- .../sipp_scenario_responder01_test.yml.tt2 | 10 +- 32 files changed, 964 insertions(+), 729 deletions(-) create mode 100644 scenarios/invite_redirect/0011_test.yml.tt2 create mode 100644 scenarios/invite_redirect/0012_test.yml.tt2 delete mode 100644 scenarios/invite_redirect/0014_test.yml.tt2 create mode 100644 scenarios/invite_redirect/0015_test.yml.tt2 create mode 100644 scenarios/invite_redirect/0017_test.yml.tt2 delete mode 100644 scenarios/invite_redirect/0018_test.yml.tt2 create mode 100644 scenarios/invite_redirect/0019_test.yml.tt2 delete mode 100644 scenarios/invite_redirect/0020_test.yml.tt2 create mode 100644 scenarios/invite_redirect/0022_test.yml.tt2 delete mode 100644 scenarios/invite_redirect/0026_test.yml.tt2 rename scenarios/invite_redirect/{0023_test.yml.tt2 => 0028_test.yml.tt2} (56%) create mode 100644 scenarios/invite_redirect/0031_test.yml.tt2 create mode 100644 scenarios/invite_redirect_tel_uri/0015_test.yml.tt2 rename scenarios/invite_redirect_tel_uri/{0014_test.yml.tt2 => 0017_test.yml.tt2} (63%) delete mode 100644 scenarios/invite_redirect_tel_uri/0018_test.yml.tt2 delete mode 100644 scenarios/invite_redirect_tel_uri/0023_test.yml.tt2 rename scenarios/invite_redirect_tel_uri/{0020_test.yml.tt2 => 0024_test.yml.tt2} (69%) create mode 100644 scenarios/invite_redirect_tel_uri/0029_test.yml.tt2 create mode 100644 scenarios/invite_redirect_tel_uri/0031_test.yml.tt2 diff --git a/scenarios/invite_redirect/0005_test.yml.tt2 b/scenarios/invite_redirect/0005_test.yml.tt2 index 83287ae4..be34990d 100644 --- a/scenarios/invite_redirect/0005_test.yml.tt2 +++ b/scenarios/invite_redirect/0005_test.yml.tt2 @@ -21,11 +21,11 @@ flow: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: sip_in: - - '^INVITE' - - 'Contact: ]+)?>' + - '^INVITE sip:[% scenarios.0.responders.0.username %]@' + - 'From: ]+)?>' - 'Content-Type: application/sdp' sip_out: - [ diff --git a/scenarios/invite_redirect/0011_test.yml.tt2 b/scenarios/invite_redirect/0011_test.yml.tt2 new file mode 100644 index 00000000..a891465d --- /dev/null +++ b/scenarios/invite_redirect/0011_test.yml.tt2 @@ -0,0 +1,38 @@ +flow: + - start|DEFAULT_ONREPLY: + - start|REPLY_ROUTE_LEG_B: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT: + - start|FAILURE_ROUTE_LEG_B: + - start|FAILURE_ROUTE_LEG_B: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT: + - start|dialog:failed: + - return|dialog:failed: + - return|dialog:failed: +sip_in: + - 'SIP/2.0 302 Moved Temporarily' + - 'From: ]+)?>', + 'Content-Type: application/sdp', + 'Content-Length:\s+\d+', + 'P-LB-Uptime:\s+\d+', + 'P-HIH-Cause: 302', + 'P-App-Param: ;profile=ngcp_cf', + 'P-App-Name: sbc', + 'P-D-Uri: sip:127.0.0.1:5062', + 'P-NGCP-Sems-Instance: sbc', + 'P-Caller-UUID: [% invite_redirect_scenarios_test.testuser1003.uuid %]', + 'P-First-Caller-UPN: [% invite_redirect_scenarios_test.testuser1002.phone_number %]', + 'P-First-Caller-NPN: [% invite_redirect_scenarios_test.testuser1002.phone_number %]', + 'P-First-Caller-UPD: invite-redirect.scenarios.test', + 'P-First-Caller-NPD: invite-redirect.scenarios.test', + 'P-Acc-State: cfb', + 'P-CF-Depth: 1', + 'P-Prev-Caller-UUID: [% invite_redirect_scenarios_test.testuser1002.uuid %]', + 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_redirect_scenarios_test.testuser1002.phone_number %]', + 'P-NGCP-Forward-Info: ;ip=127.0.0.1;port=5080;primary=[% invite_redirect_scenarios_test.testuser1003.phone_number %]', + 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5080' + ] diff --git a/scenarios/invite_redirect/0013_test.yml.tt2 b/scenarios/invite_redirect/0013_test.yml.tt2 index 2ec11081..5b8fd88b 100644 --- a/scenarios/invite_redirect/0013_test.yml.tt2 +++ b/scenarios/invite_redirect/0013_test.yml.tt2 @@ -1,214 +1,25 @@ flow: - - start|DEFAULT_ONREPLY: - - start|REPLY_ROUTE_NAT: + - start|DEFAULT_ROUTE: - start|ROUTE_ENTRY: - return|ROUTE_ENTRY: - - start|ROUTE_APPLY_HEADER_RULES: - - return|ROUTE_APPLY_HEADER_RULES: - - start|ROUTE_PREPARE_UA: - - return|ROUTE_PREPARE_UA: - - start|REPLY_ROUTE_NAT_CONTINUE: - - start|ROUTE_EXIT: - - start|ROUTE_RUNTIME: - - return|ROUTE_RUNTIME: - - start|tm:branch-failure:local: - - return|tm:branch-failure:local: - - start|FAILURE_ROUTE_LOCAL: + - start|ROUTE_NET_INFO: + - return|ROUTE_NET_INFO: + - start|ROUTE_CHECK_TEL_URI: + - return|ROUTE_CHECK_TEL_URI: + - start|ROUTE_PRX_REQUEST: - start|ROUTE_INITVARS: - return|ROUTE_INITVARS: - - start|ROUTE_STOP_RTPPROXY_BRANCH: - - start|ROUTE_RESTORE_CLUSTERSET: - - return|ROUTE_RESTORE_CLUSTERSET: - - return|ROUTE_STOP_RTPPROXY_BRANCH: - - start|ROUTE_LOAD_CALLER_PREF: - - start|ROUTE_CLEAR_CALLER_PREF: - - return|ROUTE_CLEAR_CALLER_PREF: - - start|ROUTE_CHECK_UA: - - return|ROUTE_CHECK_UA: - - start|ROUTE_LOAD_CALLER_CONTRACT_PREF: - - return|ROUTE_LOAD_CALLER_CONTRACT_PREF: - - return|ROUTE_LOAD_CALLER_PREF: - - start|ROUTE_SET_HIH_CF: - - return|ROUTE_SET_HIH_CF: - - start|ROUTE_FIND_CALLEE: - - start|ROUTE_DETECT_LOOP: - - return|ROUTE_DETECT_LOOP: - - start|ROUTE_CLEAR_CALLEE_PREF: - - return|ROUTE_CLEAR_CALLEE_PREF: - - start|ROUTE_LOAD_CALLEE_PREF: - - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - - start|ROUTE_SET_CALLEE_DIALOG: - - start|ROUTE_CNT_DLG_CHECK: - - return|ROUTE_CNT_DLG_CHECK: - - start|ROUTE_SET_CALLEE_DIALOG_BASE: - - return|ROUTE_SET_CALLEE_DIALOG_BASE: - - start|ROUTE_SET_CALLEE_DIALOG_TOTAL: - - return|ROUTE_SET_CALLEE_DIALOG_TOTAL: - - return|ROUTE_SET_CALLEE_DIALOG: - $avp(lua_dlg_profile): [ - "accountout:[% customer_test.id %]", - "userout:[% invite_redirect_scenarios_test.testuser1002.uuid %]", - "account:[% customer_test.id %]", - "user:[% invite_redirect_scenarios_test.testuser1002.uuid %]", - "totalaccountout:[% customer_test.id %]", - "totaluserout:[% invite_redirect_scenarios_test.testuser1002.uuid %]", - "totalaccount:[% customer_test.id %]", - "totaluser:[% invite_redirect_scenarios_test.testuser1002.uuid %]", - "local", - "totalaccount:[% customer_test.id %]", - "totaluser:[% invite_redirect_scenarios_test.testuser1003.uuid %]", - "total", - "account:[% customer_test.id %]", - "user:[% invite_redirect_scenarios_test.testuser1003.uuid %]" - ] - - start|ROUTE_BLOCK_IN: - - return|ROUTE_BLOCK_IN: - - return|ROUTE_LOAD_CALLEE_PREF: - - start|ROUTE_NCOS_CHECK: - - 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_NCOS: - - return|ROUTE_NCOS: - - return|ROUTE_NCOS_CHECK: - - start|ROUTE_BLOCK_OUT: - - return|ROUTE_BLOCK_OUT: - - start|ROUTE_CHECK_PBX: - - return|ROUTE_CHECK_PBX: - - start|ROUTE_CALLEE_DISPATCH: - - start|ROUTE_INVITE_TO_INT: - - start|ROUTE_APPLY_HEADER_RULES: - - return|ROUTE_APPLY_HEADER_RULES: - - start|ROUTE_CF_CFU: - - return|ROUTE_CF_CFU: - - start|ROUTE_CNT_DLG_CHECK: - - return|ROUTE_CNT_DLG_CHECK: - - start|ROUTE_CHECK_LOCATIONS: - - start|ROUTE_LOOKUP_SUBSCRIBER_LOCATIONS: - - return|ROUTE_LOOKUP_SUBSCRIBER_LOCATIONS: - - start|ROUTE_OUTBOUND: - - start|ROUTE_ACC_CALLER: - - start|ROUTE_SET_ACC_CALLER_CALL_COUNTERS: - - return|ROUTE_SET_ACC_CALLER_CALL_COUNTERS: - - return|ROUTE_ACC_CALLER: - - start|ROUTE_ACC_CALLEE: - - start|ROUTE_SET_ACC_CALLEE_CALL_COUNTERS: - - return|ROUTE_SET_ACC_CALLEE_CALL_COUNTERS: - - return|ROUTE_ACC_CALLEE: - - start|ROUTE_ADD_AOC_HEADER: - - return|ROUTE_ADD_AOC_HEADER: - - start|BRANCH_ROUTE_SBC: - - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - - start|ROUTE_SET_CALLEE_DIALOG: - - start|ROUTE_CNT_DLG_CHECK: - - return|ROUTE_CNT_DLG_CHECK: - - start|ROUTE_SET_CALLEE_DIALOG_BASE: - - return|ROUTE_SET_CALLEE_DIALOG_BASE: - - start|ROUTE_SET_CALLEE_DIALOG_TOTAL: - - return|ROUTE_SET_CALLEE_DIALOG_TOTAL: - - return|ROUTE_SET_CALLEE_DIALOG: - - start|ROUTE_SET_BRANCH_HDRS: - start|ROUTE_PREPARE_UA: - return|ROUTE_PREPARE_UA: - - return|ROUTE_SET_BRANCH_HDRS: - - start|ROUTE_SET_RUSER: - - return|ROUTE_SET_RUSER: - - start|ROUTE_BRANCH_ACC_RTP: - - return|ROUTE_BRANCH_ACC_RTP: - - start|ROUTE_FILTER_PRACK: - - return|ROUTE_FILTER_PRACK: - - start|ROUTE_PREPARE_SST: - - start|ROUTE_REMOVE_TIMER_SUPP_REQ: - - return|ROUTE_REMOVE_TIMER_SUPP_REQ: - - 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: - - 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: - - start|ROUTE_ADD_CALLINFO_CALLER_PRIMARY: - - return|ROUTE_ADD_CALLINFO_CALLER_PRIMARY: - - start|ROUTE_ADD_CALLINFO_CALLEE_PRIMARY: - - return|ROUTE_ADD_CALLINFO_CALLEE_PRIMARY: - - return|ROUTE_ADD_CALLINFO: - - start|ROUTE_APPLY_HEADER_RULES: - - return|ROUTE_APPLY_HEADER_RULES: - - return|BRANCH_ROUTE_SBC: - - start|DEFAULT_SEND: - - exit|DEFAULT_SEND: - - exit|DEFAULT_SEND: + - start|ROUTE_OUTBOUND: - start|ROUTE_EXIT: - start|ROUTE_RUNTIME: - return|ROUTE_RUNTIME: - - exit|ROUTE_EXIT: - $avp(lua_dlg_profile): [ - "accountout:[% customer_test.id %]", - "userout:[% invite_redirect_scenarios_test.testuser1002.uuid %]", - "account:[% customer_test.id %]", - "user:[% invite_redirect_scenarios_test.testuser1002.uuid %]", - "totalaccountout:[% customer_test.id %]", - "totaluserout:[% invite_redirect_scenarios_test.testuser1002.uuid %]", - "totalaccount:[% customer_test.id %]", - "totaluser:[% invite_redirect_scenarios_test.testuser1002.uuid %]", - "local", - "totalaccount:[% customer_test.id %]", - "totaluser:[% invite_redirect_scenarios_test.testuser1003.uuid %]", - "total", - "account:[% customer_test.id %]", - "user:[% invite_redirect_scenarios_test.testuser1003.uuid %]" - ] - exit|ROUTE_EXIT: sip_in: - - '^SIP/2.0 302 Moved Temporarily' - - 'From: ]+)?>', - 'Max-Forwards: 68', - 'Content-Type: application/sdp', - 'P-Caller-UUID: [% invite_redirect_scenarios_test.testuser1003.uuid %]', - 'P-Callee-UUID: [% invite_redirect_scenarios_test.testuser1004.uuid %]', - 'P-Asserted-Identity: ;index=1', - 'History-Info: ;index=1.1' - ] + - 'ACK sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0' + - 'From: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' + - 'CSeq: \d+ ACK' + - 'Content-Length:\s+0' +sip_out: [] diff --git a/scenarios/invite_redirect/0014_test.yml.tt2 b/scenarios/invite_redirect/0014_test.yml.tt2 deleted file mode 100644 index 2b11178d..00000000 --- a/scenarios/invite_redirect/0014_test.yml.tt2 +++ /dev/null @@ -1,60 +0,0 @@ -flow: - - start|DEFAULT_ROUTE: - - start|ROUTE_ENTRY: - - return|ROUTE_ENTRY: - - start|ROUTE_LEG_B: - - start|ROUTE_INITVARS: - - return|ROUTE_INITVARS: - - start|DEFAULT_SEND: - - exit|DEFAULT_SEND: - - exit|DEFAULT_SEND: - - start|ROUTE_EXIT: - - start|ROUTE_RUNTIME: - - return|ROUTE_RUNTIME: - - exit|ROUTE_EXIT: -sip_in: - - 'INVITE sip:[% scenarios.0.responders.1.username %]@[% scenarios.0.responders.1.ip %]:[% scenarios.0.responders.1.port %];cause=302 SIP/2.0' - - 'From: ;tag=[\w-]+' - - 'To: ' - - 'CSeq: \d+ INVITE' - - 'P-LB-Uptime: \d+' - - 'P-Asserted-Identity: ' - - 'History-Info: ;index=1' - - 'P-Caller-UUID: [% invite_redirect_scenarios_test.testuser1003.uuid %]' - - 'Diversion: ;privacy=off;counter=1' - - 'History-Info: ;index=1\.1' - - 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_redirect_scenarios_test.testuser1003.phone_number %]' - - 'P-NGCP-Forward-Info: ;ip=[% scenarios.0.responders.1.ip %];port=[% scenarios.0.responders.1.port %];primary=[% invite_redirect_scenarios_test.testuser1004.phone_number %]' - - 'P-NGCP-Callee-Info: ;ip=[% scenarios.0.responders.1.ip %];port=[% scenarios.0.responders.1.port %]' - - 'P-D-Uri: sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.0.responders.1.ip %]:[% scenarios.0.responders.1.port %];)?socket=sip:[% server_ip %]:5060' - - 'Content-Type: application/sdp' - - 'Contact: ' - - 'Content-Length:\s+\d+' -sip_out: - - [ - 'SIP/2.0 100 Trying', - 'From: ;tag=[\w-]+', - 'To: ', - 'CSeq: \d+ INVITE', - 'Server: Sipwise NGCP Proxy', - 'Content-Length: 0', - ] - - [ - 'INVITE sip:[% scenarios.0.responders.1.username %]@[% scenarios.0.responders.1.ip %]:[% scenarios.0.responders.1.port %];cause=302 SIP/2.0', - 'From: ;tag=[\w-]+', - 'To: ', - 'CSeq: \d+ INVITE', - 'P-LB-Uptime: \d+', - 'P-Asserted-Identity: ', - 'P-Caller-UUID: [% invite_redirect_scenarios_test.testuser1003.uuid %]', - 'Diversion: ;privacy=off;counter=1', - 'History-Info: ;index=1', - 'History-Info: ;index=1\.1', - 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_redirect_scenarios_test.testuser1003.phone_number %]', - 'P-NGCP-Forward-Info: ;ip=[% scenarios.0.responders.1.ip %];port=[% scenarios.0.responders.1.port %];primary=[% invite_redirect_scenarios_test.testuser1004.phone_number %]', - 'P-NGCP-Callee-Info: ;ip=[% scenarios.0.responders.1.ip %];port=[% scenarios.0.responders.1.port %]', - 'P-D-Uri: sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.0.responders.1.ip %]:[% scenarios.0.responders.1.port %];)?socket=sip:[% server_ip %]:5060', - 'Content-Type: application/sdp', - 'Contact: ', - 'Content-Length:\s+\d+', - ] diff --git a/scenarios/invite_redirect/0015_test.yml.tt2 b/scenarios/invite_redirect/0015_test.yml.tt2 new file mode 100644 index 00000000..eadee0f0 --- /dev/null +++ b/scenarios/invite_redirect/0015_test.yml.tt2 @@ -0,0 +1,212 @@ +flow: + - start|DEFAULT_ROUTE: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: + - start|ROUTE_NET_INFO: + - return|ROUTE_NET_INFO: + - start|ROUTE_CHECK_TEL_URI: + - return|ROUTE_CHECK_TEL_URI: + - start|ROUTE_PRX_REQUEST: + - start|ROUTE_INITVARS: + - return|ROUTE_INITVARS: + - start|ROUTE_INVITE: + - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF: + - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF: + - return|ROUTE_CLEAR_CALLEE_DOMAIN_PREF: + - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF: + - start|ROUTE_FIND_CALLER: + - start|ROUTE_CONSUME_CF_HDRS: + - start|ROUTE_RESTORE_DEVALIAS_HEADERS: + - return|ROUTE_RESTORE_DEVALIAS_HEADERS: + - return|ROUTE_CONSUME_CF_HDRS: + - return|ROUTE_FIND_CALLER: + - start|ROUTE_LOAD_CALLER_PREF: + - start|ROUTE_CLEAR_CALLER_PREF: + - return|ROUTE_CLEAR_CALLER_PREF: + - start|ROUTE_CHECK_UA: + - return|ROUTE_CHECK_UA: + - start|ROUTE_LOAD_CALLER_CONTRACT_PREF: + - return|ROUTE_LOAD_CALLER_CONTRACT_PREF: + - return|ROUTE_LOAD_CALLER_PREF: + - start|ROUTE_APPLY_HEADER_RULES: + - return|ROUTE_APPLY_HEADER_RULES: + - start|ROUTE_GET_FORWARDER_CLI: + - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: + - start|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_CHECK_CLI_ALLOWED: + - return|ROUTE_CHECK_CLI_ALLOWED: + - return|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_CHECK_CLI_ALLOWED: + - return|ROUTE_CHECK_CLI_ALLOWED: + - return|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: + - start|ROUTE_DETECT_LOOP: + - return|ROUTE_DETECT_LOOP: + - start|ROUTE_CLEAR_CALLEE_PREF: + - return|ROUTE_CLEAR_CALLEE_PREF: + - start|ROUTE_LOAD_CALLEE_PREF: + - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF: + - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF: + - start|ROUTE_SET_CALLEE_DIALOG: + - start|ROUTE_CNT_DLG_CHECK: + - start|ROUTE_DLG_MANAGE: + - return|ROUTE_DLG_MANAGE: + - return|ROUTE_CNT_DLG_CHECK: + - start|ROUTE_SET_CALLEE_DIALOG_BASE: + - return|ROUTE_SET_CALLEE_DIALOG_BASE: + - start|ROUTE_SET_CALLEE_DIALOG_TOTAL: + - return|ROUTE_SET_CALLEE_DIALOG_TOTAL: + - return|ROUTE_SET_CALLEE_DIALOG: + - start|ROUTE_BLOCK_IN: + - return|ROUTE_BLOCK_IN: + - return|ROUTE_LOAD_CALLEE_PREF: + - start|ROUTE_NCOS_CHECK: + - 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_NCOS: + - return|ROUTE_NCOS: + - return|ROUTE_NCOS_CHECK: + - start|ROUTE_BLOCK_OUT: + - return|ROUTE_BLOCK_OUT: + - start|ROUTE_CHECK_PBX: + - return|ROUTE_CHECK_PBX: + - start|ROUTE_CALLEE_DISPATCH: + - start|ROUTE_INVITE_TO_INT: + - start|ROUTE_APPLY_HEADER_RULES: + - return|ROUTE_APPLY_HEADER_RULES: + - start|ROUTE_CF_CFU: + - return|ROUTE_CF_CFU: + - start|ROUTE_CNT_DLG_CHECK: + - return|ROUTE_CNT_DLG_CHECK: + - start|ROUTE_CHECK_LOCATIONS: + - start|ROUTE_LOOKUP_SUBSCRIBER_LOCATIONS: + - return|ROUTE_LOOKUP_SUBSCRIBER_LOCATIONS: + - start|ROUTE_OUTBOUND: + - start|ROUTE_SET_CALLER_DIALOG: + - start|ROUTE_CNT_DLG_CHECK: + - return|ROUTE_CNT_DLG_CHECK: + - start|ROUTE_SET_CALLER_DIALOG_TOTAL: + - return|ROUTE_SET_CALLER_DIALOG_TOTAL: + - start|ROUTE_SET_CALLER_DIALOG_BASE: + - return|ROUTE_SET_CALLER_DIALOG_BASE: + - return|ROUTE_SET_CALLER_DIALOG: + - start|ROUTE_ACC_CALLER: + - start|ROUTE_SET_ACC_CALLER_CALL_COUNTERS: + - return|ROUTE_SET_ACC_CALLER_CALL_COUNTERS: + - return|ROUTE_ACC_CALLER: + - start|ROUTE_ACC_CALLEE: + - start|ROUTE_SET_ACC_CALLEE_CALL_COUNTERS: + - return|ROUTE_SET_ACC_CALLEE_CALL_COUNTERS: + - return|ROUTE_ACC_CALLEE: + - start|BRANCH_ROUTE_SBC: + - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF: + - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF: + - start|ROUTE_SET_CALLEE_DIALOG: + - start|ROUTE_CNT_DLG_CHECK: + - return|ROUTE_CNT_DLG_CHECK: + - start|ROUTE_SET_CALLEE_DIALOG_BASE: + - return|ROUTE_SET_CALLEE_DIALOG_BASE: + - start|ROUTE_SET_CALLEE_DIALOG_TOTAL: + - return|ROUTE_SET_CALLEE_DIALOG_TOTAL: + - return|ROUTE_SET_CALLEE_DIALOG: + - start|ROUTE_SET_BRANCH_HDRS: + - start|ROUTE_PREPARE_UA: + - return|ROUTE_PREPARE_UA: + - return|ROUTE_SET_BRANCH_HDRS: + - start|ROUTE_SET_RUSER: + - return|ROUTE_SET_RUSER: + - start|ROUTE_BRANCH_ACC_RTP: + - return|ROUTE_BRANCH_ACC_RTP: + - start|ROUTE_FILTER_PRACK: + - return|ROUTE_FILTER_PRACK: + - start|ROUTE_PREPARE_SST: + - start|ROUTE_REMOVE_TIMER_SUPP_REQ: + - return|ROUTE_REMOVE_TIMER_SUPP_REQ: + - 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: + - 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: + - start|ROUTE_ADD_CALLINFO_CALLER_PRIMARY: + - return|ROUTE_ADD_CALLINFO_CALLER_PRIMARY: + - start|ROUTE_ADD_CALLINFO_CALLEE_PRIMARY: + - return|ROUTE_ADD_CALLINFO_CALLEE_PRIMARY: + - return|ROUTE_ADD_CALLINFO: + - start|ROUTE_APPLY_HEADER_RULES: + - return|ROUTE_APPLY_HEADER_RULES: + - return|BRANCH_ROUTE_SBC: + - start|DEFAULT_SEND: + - exit|DEFAULT_SEND: + - exit|DEFAULT_SEND: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT: +sip_in: + - 'INVITE sip:[% scenarios.0.responders.1.username %]@invite-redirect.scenarios.test SIP/2.0' + - 'From: ' +sip_out: + - [ + 'SIP/2.0 100 Trying', + 'From: ', + 'P-Callee-UUID: [% invite_redirect_scenarios_test.testuser1004.uuid %]', + 'P-Called-Party-ID: ', + 'P-App-Name: sbc', + 'P-D-Uri: sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.0.responders.1.ip %]:[% scenarios.0.responders.1.port %];)?socket=sip:[% server_ip %]:5060', + 'P-Proxy-Uri: sip:127.0.0.1:5062', + ] diff --git a/scenarios/invite_redirect/0017_test.yml.tt2 b/scenarios/invite_redirect/0017_test.yml.tt2 new file mode 100644 index 00000000..3ed7138d --- /dev/null +++ b/scenarios/invite_redirect/0017_test.yml.tt2 @@ -0,0 +1,42 @@ +flow: + - start|DEFAULT_ROUTE: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: + - start|ROUTE_LEG_B: + - start|ROUTE_INITVARS: + - return|ROUTE_INITVARS: + - start|DEFAULT_SEND: + - exit|DEFAULT_SEND: + - exit|DEFAULT_SEND: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT: +sip_in: + - 'INVITE sip:[% scenarios.0.responders.1.username %]@[% scenarios.0.responders.1.ip %]:[% scenarios.0.responders.1.port %];cause=302 SIP/2.0' + - 'From: ' +sip_out: + - [ + 'SIP/2.0 100 Trying', + 'From: ' + ] diff --git a/scenarios/invite_redirect/0018_test.yml.tt2 b/scenarios/invite_redirect/0018_test.yml.tt2 deleted file mode 100644 index d69602fe..00000000 --- a/scenarios/invite_redirect/0018_test.yml.tt2 +++ /dev/null @@ -1,26 +0,0 @@ -flow: - - start|DEFAULT_ONREPLY: - - start|REPLY_ROUTE_NAT: - - start|ROUTE_ENTRY: - - return|ROUTE_ENTRY: - - start|ROUTE_APPLY_HEADER_RULES: - - return|ROUTE_APPLY_HEADER_RULES: - - start|ROUTE_PREPARE_UA: - - return|ROUTE_PREPARE_UA: - - start|REPLY_ROUTE_NAT_CONTINUE: - - start|ROUTE_EXIT: - - start|ROUTE_RUNTIME: - - return|ROUTE_RUNTIME: - - exit|ROUTE_EXIT: -sip_in: - - '^SIP/2.0 180 Ringing' - - 'CSeq: 2 INVITE' - - 'From: ' + - 'Content-Length:\s+0' +sip_out: + - [ + 'SIP/2.0 180 Ringing', + 'Record-Route: ', + 'From: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', + 'CSeq: \d+ INVITE', + 'Contact: ', + 'Content-Length:\s+0' + ] diff --git a/scenarios/invite_redirect/0020_test.yml.tt2 b/scenarios/invite_redirect/0020_test.yml.tt2 deleted file mode 100644 index e96e76ea..00000000 --- a/scenarios/invite_redirect/0020_test.yml.tt2 +++ /dev/null @@ -1,48 +0,0 @@ -flow: - - start|DEFAULT_ONREPLY: - - start|REPLY_ROUTE_NAT: - - start|ROUTE_ENTRY: - - return|ROUTE_ENTRY: - - start|ROUTE_APPLY_HEADER_RULES: - - return|ROUTE_APPLY_HEADER_RULES: - - start|ROUTE_PREPARE_UA: - - return|ROUTE_PREPARE_UA: - - start|ROUTE_REMOVE_TIMER_SUPP_REQ: - - return|ROUTE_REMOVE_TIMER_SUPP_REQ: - - start|REPLY_ROUTE_RTPENGINE: - - return|REPLY_ROUTE_RTPENGINE: - - start|REPLY_ROUTE_NAT_CONTINUE: - - start|ROUTE_EXIT: - - start|ROUTE_RUNTIME: - - return|ROUTE_RUNTIME: - - start|dialog:start: - - return|dialog:start: - $avp(lua_dlg_profile): [ - "accountout:[% customer_test.id %]", - "userout:[% invite_redirect_scenarios_test.testuser1002.uuid %]", - "account:[% customer_test.id %]", - "user:[% invite_redirect_scenarios_test.testuser1002.uuid %]", - "totalaccountout:[% customer_test.id %]", - "totaluserout:[% invite_redirect_scenarios_test.testuser1002.uuid %]", - "totalaccount:[% customer_test.id %]", - "totaluser:[% invite_redirect_scenarios_test.testuser1002.uuid %]", - "local", - "totalaccount:[% customer_test.id %]", - "totaluser:[% invite_redirect_scenarios_test.testuser1003.uuid %]", - "total", - "account:[% customer_test.id %]", - "user:[% invite_redirect_scenarios_test.testuser1003.uuid %]" - ] - - return|dialog:start: -sip_in: - - '^SIP/2.0 200 OK' - - 'CSeq: 2 INVITE' - - 'From: ]+)?>' - - 'CSeq: 2 ACK' - - 'Max-Forwards: 69' - - 'Content-Length: 0' - - 'From: ' + - 'Record-Route: ' + - 'Record-Route: ' + - 'From: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' + - 'CSeq: \d+ INVITE' + - 'Contact: ' + - 'Content-Length:\s+0' sip_out: - [ - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0', - 'Contact: ]+)?>', - 'CSeq: 2 ACK', - 'Max-Forwards: 68', - 'Content-Length: 0', - 'From: ', + 'Record-Route: ', + 'Record-Route: ', + 'From: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', + 'CSeq: \d+ INVITE', + 'Contact: ', + 'Content-Length:\s+0', + 'P-Out-Socket: udp:[% server_ip %]:5060' ] diff --git a/scenarios/invite_redirect/0022_test.yml.tt2 b/scenarios/invite_redirect/0022_test.yml.tt2 new file mode 100644 index 00000000..d6d56d19 --- /dev/null +++ b/scenarios/invite_redirect/0022_test.yml.tt2 @@ -0,0 +1,29 @@ +flow: + - start|DEFAULT_ONREPLY: + - start|REPLY_ROUTE_LEG_B: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - start|dialog:start: + - return|dialog:start: + - return|dialog:start: +sip_in: + - 'SIP/2.0 200 OK' + - 'From: ' + - 'Content-Type: application/sdp' + - 'Content-Length:\s+\d+' +sip_out: + - [ + 'SIP/2.0 200 OK', + 'From: ', + 'Content-Type: application/sdp', + 'Content-Length:\s+\d+' + ] diff --git a/scenarios/invite_redirect/0026_test.yml.tt2 b/scenarios/invite_redirect/0026_test.yml.tt2 deleted file mode 100644 index 9c098cf5..00000000 --- a/scenarios/invite_redirect/0026_test.yml.tt2 +++ /dev/null @@ -1,28 +0,0 @@ -flow: - - start|DEFAULT_ONREPLY: - - start|REPLY_ROUTE_NAT: - - start|ROUTE_ENTRY: - - return|ROUTE_ENTRY: - - start|ROUTE_APPLY_HEADER_RULES: - - return|ROUTE_APPLY_HEADER_RULES: - - start|ROUTE_PREPARE_UA: - - return|ROUTE_PREPARE_UA: - - start|REPLY_ROUTE_NAT_CONTINUE: - - start|ROUTE_EXIT: - - start|ROUTE_RUNTIME: - - return|ROUTE_RUNTIME: - - exit|ROUTE_EXIT: -sip_in: - - '^SIP/2.0 200 OK' - - 'CSeq: 3 BYE' - - 'Content-Length: 0' - - 'From: ]+)?>' - - 'CSeq: 3 BYE' - - 'Max-Forwards: 69' - - 'Content-Length: 0' + - 'BYE sip:127.0.0.1:5080;prxroute=1 SIP/2.0' - 'From: ]+)?>', - 'CSeq: 3 BYE', - 'Max-Forwards: 68', - 'Content-Length: 0', - 'From: ' + - 'Content-Length:\s+0' +sip_out: + - [ + 'SIP/2.0 200 OK', + 'From: ', + 'Content-Length:\s+0' + ] diff --git a/scenarios/invite_redirect/sipp_scenario00_test.yml.tt2 b/scenarios/invite_redirect/sipp_scenario00_test.yml.tt2 index fd3c4521..719b8364 100644 --- a/scenarios/invite_redirect/sipp_scenario00_test.yml.tt2 +++ b/scenarios/invite_redirect/sipp_scenario00_test.yml.tt2 @@ -4,38 +4,38 @@ messages: - 'To: ' - 'CSeq: \d+ INVITE' - 'Server: Sipwise NGCP LB' - - 'Content-Length: 0' + - 'Content-Length:\s+0' - - 'SIP/2.0 407 Proxy Authentication Required' - 'From: ;tag=[\w-]+' - 'To: ;tag=[\w-]+' - 'CSeq: \d+ INVITE' - 'Proxy-Authenticate: Digest realm="invite-redirect.scenarios.test", nonce="[^"]+"' - 'Server: Sipwise NGCP Proxy' - - 'Content-Length: 0' + - 'Content-Length:\s+0' - - 'SIP/2.0 100 Trying' - 'From: ;tag=[\w-]+' - 'To: ' - 'CSeq: \d+ INVITE' - 'Server: Sipwise NGCP LB' - - 'Content-Length: 0' + - 'Content-Length:\s+0' - - 'SIP/2.0 180 Ringing' - - 'Record-Route: ' + - 'Record-Route: ' - 'Record-Route: ' - 'Record-Route: ' - 'From: ;tag=[\w-]+' - 'To: ;tag=[\w-]+' - 'CSeq: \d+ INVITE' - - 'Content-Length: 0' + - 'Content-Length:\s+0' - 'Contact: ' - - 'SIP/2.0 200 OK' - - 'Record-Route: ' + - 'Record-Route: ' - 'Record-Route: ' - 'Record-Route: ' - 'From: ;tag=[\w-]+' - 'To: ;tag=[\w-]+' - 'CSeq: \d+ INVITE' - 'Content-Type: application/sdp' - - 'Content-Length: \d+' + - 'Content-Length:\s+\d+' - 'Contact: ' - 'v=0' - 'o=user1 \d+ \d+ IN IP4 [% server_ip %]' @@ -48,10 +48,10 @@ messages: - 'a=rtcp:\d+' - 'a=ptime:50' - - 'SIP/2.0 200 OK' - - 'Record-Route: ' + - 'Record-Route: ' - 'Record-Route: ' - 'Record-Route: ' - 'From: ;tag=[\w-]+' - 'To: ;tag=[\w-]+' - 'CSeq: \d+ BYE' - - 'Content-Length: 0' + - 'Content-Length:\s+0' diff --git a/scenarios/invite_redirect/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_redirect/sipp_scenario_responder00_test.yml.tt2 index c0c359cf..5f2632f9 100644 --- a/scenarios/invite_redirect/sipp_scenario_responder00_test.yml.tt2 +++ b/scenarios/invite_redirect/sipp_scenario_responder00_test.yml.tt2 @@ -8,7 +8,7 @@ messages: - 'CSeq: \d+ INVITE' - 'P-Asserted-Identity: ' - 'Content-Type: application/sdp' - - 'Content-Length: \d+' + - 'Content-Length:\s+\d+' - 'Contact: ' - 'v=0' - 'o=user1 \d+ \d+ IN IP4 [% server_ip %]' @@ -24,4 +24,4 @@ messages: - 'From: ;tag=[\w-]+' - 'To: ;tag=[\w-]+' - 'CSeq: \d+ ACK' - - 'Content-Length: 0' + - 'Content-Length:\s+0' diff --git a/scenarios/invite_redirect/sipp_scenario_responder01_test.yml.tt2 b/scenarios/invite_redirect/sipp_scenario_responder01_test.yml.tt2 index 1154681d..e83bf7d9 100644 --- a/scenarios/invite_redirect/sipp_scenario_responder01_test.yml.tt2 +++ b/scenarios/invite_redirect/sipp_scenario_responder01_test.yml.tt2 @@ -6,12 +6,12 @@ messages: - 'From: ;tag=[\w-]+' - 'To: ' - 'CSeq: \d+ INVITE' - - 'P-Asserted-Identity: ' - - 'Diversion: ;privacy=off;counter=1' - 'History-Info: ;index=1' - 'History-Info: ;index=1.1' + - 'P-Asserted-Identity: ' + - 'Diversion: ;reason=unconditional;privacy=off;counter=1' - 'Content-Type: application/sdp' - - 'Content-Length: \d+' + - 'Content-Length:\s+\d+' - 'Contact: ' - 'v=0' - 'o=user1 \d+ \d+ IN IP4 [% server_ip %]' @@ -30,14 +30,14 @@ messages: - 'From: ;tag=[\w-]+' - 'To: ;tag=[\w-]+' - 'CSeq: \d+ ACK' - - 'Content-Length: 0' + - 'Content-Length:\s+0' - 'Contact: ' - - 'BYE sip:[% scenarios.0.responders.1.ip %]:[% scenarios.0.responders.1.port %];transport=UDP SIP/2.0' - 'Record-Route: ' - 'Record-Route: ' - - 'Record-Route: ' + - 'Record-Route: ' - 'From: ;tag=[\w-]+' - 'To: ;tag=[\w-]+' - 'CSeq: \d+ BYE' - 'P-Asserted-Identity: ' - - 'Content-Length: 0' + - 'Content-Length:\s+0' diff --git a/scenarios/invite_redirect_tel_uri/0007_test.yml.tt2 b/scenarios/invite_redirect_tel_uri/0007_test.yml.tt2 index 336404f3..b354ac50 100644 --- a/scenarios/invite_redirect_tel_uri/0007_test.yml.tt2 +++ b/scenarios/invite_redirect_tel_uri/0007_test.yml.tt2 @@ -5,15 +5,7 @@ flow: - start|ROUTE_NET_INFO: - return|ROUTE_NET_INFO: - start|ROUTE_CHECK_TEL_URI: - $x_hdr(From): ;tag=\w+ - $x_hdr(Diversion): ;reason=unconditional;privacy=off;counter=1 - $x_hdr(P-Asserted-Identity): - $x_tu: tel:\+[% invite_redirect_tel_uri_scenarios_test.testuser1001.phone_number %] - exit|ROUTE_CHECK_TEL_URI: - $x_hdr(From): ;tag=\w+ - $x_hdr(Diversion): ;reason=unconditional;privacy=off;counter=1 - $x_hdr(P-Asserted-Identity): - $x_tu: sip:\+[% invite_redirect_tel_uri_scenarios_test.testuser1001.phone_number %]@invite-redirect-tel-uri.scenarios.test - start|ROUTE_PRX_REQUEST: - start|ROUTE_INITVARS: - return|ROUTE_INITVARS: diff --git a/scenarios/invite_redirect_tel_uri/0013_test.yml.tt2 b/scenarios/invite_redirect_tel_uri/0013_test.yml.tt2 index 0c9c0b95..23e61b6a 100644 --- a/scenarios/invite_redirect_tel_uri/0013_test.yml.tt2 +++ b/scenarios/invite_redirect_tel_uri/0013_test.yml.tt2 @@ -20,119 +20,19 @@ flow: - start|ROUTE_RESTORE_CLUSTERSET: - return|ROUTE_RESTORE_CLUSTERSET: - return|ROUTE_STOP_RTPPROXY_BRANCH: - - start|ROUTE_LOAD_CALLER_PREF: - - start|ROUTE_CLEAR_CALLER_PREF: - - return|ROUTE_CLEAR_CALLER_PREF: - - start|ROUTE_CHECK_UA: - - return|ROUTE_CHECK_UA: - - start|ROUTE_LOAD_CALLER_CONTRACT_PREF: - - return|ROUTE_LOAD_CALLER_CONTRACT_PREF: - - return|ROUTE_LOAD_CALLER_PREF: - - start|ROUTE_SET_HIH_CF: - - return|ROUTE_SET_HIH_CF: - - start|ROUTE_FIND_CALLEE: - - start|ROUTE_DETECT_LOOP: - - return|ROUTE_DETECT_LOOP: - - start|ROUTE_CLEAR_CALLEE_PREF: - - return|ROUTE_CLEAR_CALLEE_PREF: - - start|ROUTE_LOAD_CALLEE_PREF: - - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - - start|ROUTE_SET_CALLEE_DIALOG: - - start|ROUTE_CNT_DLG_CHECK: - - return|ROUTE_CNT_DLG_CHECK: - - start|ROUTE_SET_CALLEE_DIALOG_BASE: - - return|ROUTE_SET_CALLEE_DIALOG_BASE: - - start|ROUTE_SET_CALLEE_DIALOG_TOTAL: - - return|ROUTE_SET_CALLEE_DIALOG_TOTAL: - - return|ROUTE_SET_CALLEE_DIALOG: - - start|ROUTE_BLOCK_IN: - - return|ROUTE_BLOCK_IN: - - return|ROUTE_LOAD_CALLEE_PREF: - - start|ROUTE_NCOS_CHECK: - - 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_NCOS: - - return|ROUTE_NCOS: - - return|ROUTE_NCOS_CHECK: - - start|ROUTE_BLOCK_OUT: - - return|ROUTE_BLOCK_OUT: - - start|ROUTE_CHECK_PBX: - - return|ROUTE_CHECK_PBX: - - start|ROUTE_CALLEE_DISPATCH: - - start|ROUTE_INVITE_TO_INT: - - start|ROUTE_APPLY_HEADER_RULES: - - return|ROUTE_APPLY_HEADER_RULES: - - start|ROUTE_CF_CFU: - - return|ROUTE_CF_CFU: - - start|ROUTE_CNT_DLG_CHECK: - - return|ROUTE_CNT_DLG_CHECK: - - start|ROUTE_CHECK_LOCATIONS: - - start|ROUTE_LOOKUP_SUBSCRIBER_LOCATIONS: - - return|ROUTE_LOOKUP_SUBSCRIBER_LOCATIONS: - - start|ROUTE_OUTBOUND: - - start|ROUTE_ACC_CALLER: - - start|ROUTE_SET_ACC_CALLER_CALL_COUNTERS: - - return|ROUTE_SET_ACC_CALLER_CALL_COUNTERS: - - return|ROUTE_ACC_CALLER: - - start|ROUTE_ACC_CALLEE: - - start|ROUTE_SET_ACC_CALLEE_CALL_COUNTERS: - - return|ROUTE_SET_ACC_CALLEE_CALL_COUNTERS: - - return|ROUTE_ACC_CALLEE: + - start|ROUTE_CF_REDIRECT: + - start|ROUTE_CHECK_CF: + - return|ROUTE_CHECK_CF: + - start|ROUTE_EXECUTE_CF_LOOP: - start|ROUTE_ADD_AOC_HEADER: - return|ROUTE_ADD_AOC_HEADER: - - start|BRANCH_ROUTE_SBC: - - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF: - - start|ROUTE_SET_CALLEE_DIALOG: - - start|ROUTE_CNT_DLG_CHECK: - - return|ROUTE_CNT_DLG_CHECK: - - start|ROUTE_SET_CALLEE_DIALOG_BASE: - - return|ROUTE_SET_CALLEE_DIALOG_BASE: - - start|ROUTE_SET_CALLEE_DIALOG_TOTAL: - - return|ROUTE_SET_CALLEE_DIALOG_TOTAL: - - return|ROUTE_SET_CALLEE_DIALOG: - - start|ROUTE_SET_BRANCH_HDRS: - - start|ROUTE_PREPARE_UA: - - return|ROUTE_PREPARE_UA: - - return|ROUTE_SET_BRANCH_HDRS: - - start|ROUTE_SET_RUSER: - - return|ROUTE_SET_RUSER: - - start|ROUTE_BRANCH_ACC_RTP: - - return|ROUTE_BRANCH_ACC_RTP: - - start|ROUTE_FILTER_PRACK: - - return|ROUTE_FILTER_PRACK: - - start|ROUTE_PREPARE_SST: - - start|ROUTE_REMOVE_TIMER_SUPP_REQ: - - return|ROUTE_REMOVE_TIMER_SUPP_REQ: - - return|ROUTE_PREPARE_SST: - - start|ROUTE_PREPARE_MOH: - - return|ROUTE_PREPARE_MOH: - - start|ROUTE_SET_CALLER_CLI: - $avp(forwarder_domain_userprov): ['invite-redirect-tel-uri.scenarios.test'] - - 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: - - start|ROUTE_PREPARE_CALLER_CLI: - - return|ROUTE_PREPARE_CALLER_CLI: - - return|ROUTE_SET_CALLER_CLI: - $var(ccli_domain): invite-redirect-tel-uri.scenarios.test - $var(diversion_uri): sip:\+[% invite_redirect_tel_uri_scenarios_test.testuser1001.phone_number %]@invite-redirect-tel-uri.scenarios.test - - start|ROUTE_SET_CALLEE: - - return|ROUTE_SET_CALLEE: + - start|BRANCH_ROUTE_FWD_LOOP: + - start|ROUTE_SET_HIH_CF: + - return|ROUTE_SET_HIH_CF: + - start|ROUTE_APPEND_CF_HDRS: + - start|ROUTE_ADD_DEVALIAS_HEADERS: + - return|ROUTE_ADD_DEVALIAS_HEADERS: + - return|ROUTE_APPEND_CF_HDRS: - start|ROUTE_ADD_CALLINFO: - start|ROUTE_ADD_CALLINFO_CALLER_PRIMARY: - return|ROUTE_ADD_CALLINFO_CALLER_PRIMARY: @@ -141,7 +41,7 @@ flow: - return|ROUTE_ADD_CALLINFO: - start|ROUTE_APPLY_HEADER_RULES: - return|ROUTE_APPLY_HEADER_RULES: - - return|BRANCH_ROUTE_SBC: + - return|BRANCH_ROUTE_FWD_LOOP: - start|DEFAULT_SEND: - exit|DEFAULT_SEND: - exit|DEFAULT_SEND: @@ -151,36 +51,45 @@ flow: - exit|ROUTE_EXIT: - exit|ROUTE_EXIT: sip_in: - # From: ;tag= - # To: - # Diversion: - - '^SIP/2.0 302 Moved Temporarily' - - 'From: ' - - 'Diversion: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' + - 'CSeq: 2 INVITE' + - 'Diversion: ' + - 'Contact: ' sip_out: - [ '^ACK sip:[% scenarios.0.responders.0.username %]@', - 'From: ', + 'To: ', 'CSeq: \d+ ACK', - 'Max-Forwards: 68', - 'Content-Length: 0' ] - [ - # we make sure that Diversion has domain part - # we make sure that From/To/Diversion/PAI headers have SIP scheme - '^INVITE sip:[% scenarios.0.responders.1.username %]@[% scenarios.0.ip %]', - 'From: ;tag=[\w-]+', - 'To: ', + 'To: ', 'CSeq: \d+ INVITE', 'Contact: ]+)?>', - 'Max-Forwards: 68', 'Content-Type: application/sdp', - 'P-Asserted-Identity: ;index=1', + 'P-HIH-Cause: 302', + 'P-App-Param: ;profile=ngcp_cf', + 'P-App-Name: sbc', + 'P-NGCP-Sems-Instance: sbc', + 'P-Caller-UUID: [% invite_redirect_tel_uri_scenarios_test.testuser1001.uuid %]', + 'P-First-Caller-UPN: [% invite_redirect_tel_uri_scenarios_test.testuser1000.phone_number %]', + 'P-First-Caller-NPN: [% invite_redirect_tel_uri_scenarios_test.testuser1000.phone_number %]', + 'P-First-Caller-UPD: invite-redirect-tel-uri.scenarios.test', + 'P-First-Caller-NPD: invite-redirect-tel-uri.scenarios.test', + 'P-Acc-Caller-User: testuser1001', + 'P-Acc-Caller-Domain: invite-redirect-tel-uri.scenarios.test', + 'P-Acc-State: cfb', + 'P-CF-Depth: 1', + 'P-Orig-Callee-Dialed: testuser1001', + 'P-Prev-Caller-UUID: [% invite_redirect_tel_uri_scenarios_test.testuser1000.uuid %]', + 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_redirect_tel_uri_scenarios_test.testuser1000.phone_number %]', + 'P-NGCP-Forward-Info: ;ip=127.0.0.1;port=5080;primary=[% invite_redirect_tel_uri_scenarios_test.testuser1001.phone_number %]', + 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5080', ] diff --git a/scenarios/invite_redirect_tel_uri/0015_test.yml.tt2 b/scenarios/invite_redirect_tel_uri/0015_test.yml.tt2 new file mode 100644 index 00000000..185c9383 --- /dev/null +++ b/scenarios/invite_redirect_tel_uri/0015_test.yml.tt2 @@ -0,0 +1,229 @@ +flow: + - start|DEFAULT_ROUTE: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: + - start|ROUTE_NET_INFO: + - return|ROUTE_NET_INFO: + - start|ROUTE_CHECK_TEL_URI: + - return|ROUTE_CHECK_TEL_URI: + - start|ROUTE_PRX_REQUEST: + - start|ROUTE_INITVARS: + - return|ROUTE_INITVARS: + - start|ROUTE_INVITE: + - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF: + - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF: + - return|ROUTE_CLEAR_CALLEE_DOMAIN_PREF: + - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF: + - start|ROUTE_FIND_CALLER: + - start|ROUTE_CONSUME_CF_HDRS: + - start|ROUTE_RESTORE_DEVALIAS_HEADERS: + - return|ROUTE_RESTORE_DEVALIAS_HEADERS: + - return|ROUTE_CONSUME_CF_HDRS: + - return|ROUTE_FIND_CALLER: + - start|ROUTE_LOAD_CALLER_PREF: + - start|ROUTE_CLEAR_CALLER_PREF: + - return|ROUTE_CLEAR_CALLER_PREF: + - start|ROUTE_CHECK_UA: + - return|ROUTE_CHECK_UA: + - start|ROUTE_LOAD_CALLER_CONTRACT_PREF: + - return|ROUTE_LOAD_CALLER_CONTRACT_PREF: + - return|ROUTE_LOAD_CALLER_PREF: + - start|ROUTE_APPLY_HEADER_RULES: + - return|ROUTE_APPLY_HEADER_RULES: + - start|ROUTE_GET_FORWARDER_CLI: + - return|ROUTE_GET_FORWARDER_CLI: + - start|ROUTE_CLIR: + - return|ROUTE_CLIR: + - start|ROUTE_CALLER_BLOCK_CLI: + - return|ROUTE_CALLER_BLOCK_CLI: + - start|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_CHECK_CLI_ALLOWED: + - return|ROUTE_CHECK_CLI_ALLOWED: + - return|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_CHECK_CLI_ALLOWED: + - return|ROUTE_CHECK_CLI_ALLOWED: + - return|ROUTE_CHECK_USERPROV_CLI: + - start|ROUTE_FIND_CALLEE: + - start|ROUTE_DETECT_LOOP: + - return|ROUTE_DETECT_LOOP: + - start|ROUTE_CLEAR_CALLEE_PREF: + - return|ROUTE_CLEAR_CALLEE_PREF: + - start|ROUTE_LOAD_CALLEE_PREF: + - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF: + - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF: + - start|ROUTE_SET_CALLEE_DIALOG: + - start|ROUTE_CNT_DLG_CHECK: + - start|ROUTE_DLG_MANAGE: + - return|ROUTE_DLG_MANAGE: + - return|ROUTE_CNT_DLG_CHECK: + - start|ROUTE_SET_CALLEE_DIALOG_BASE: + - return|ROUTE_SET_CALLEE_DIALOG_BASE: + - start|ROUTE_SET_CALLEE_DIALOG_TOTAL: + - return|ROUTE_SET_CALLEE_DIALOG_TOTAL: + - return|ROUTE_SET_CALLEE_DIALOG: + - start|ROUTE_BLOCK_IN: + - return|ROUTE_BLOCK_IN: + - return|ROUTE_LOAD_CALLEE_PREF: + - start|ROUTE_NCOS_CHECK: + - 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_NCOS: + - return|ROUTE_NCOS: + - return|ROUTE_NCOS_CHECK: + - start|ROUTE_BLOCK_OUT: + - return|ROUTE_BLOCK_OUT: + - start|ROUTE_CHECK_PBX: + - return|ROUTE_CHECK_PBX: + - start|ROUTE_CALLEE_DISPATCH: + - start|ROUTE_INVITE_TO_INT: + - start|ROUTE_APPLY_HEADER_RULES: + - return|ROUTE_APPLY_HEADER_RULES: + - start|ROUTE_CF_CFU: + - return|ROUTE_CF_CFU: + - start|ROUTE_CNT_DLG_CHECK: + - return|ROUTE_CNT_DLG_CHECK: + - start|ROUTE_CHECK_LOCATIONS: + - start|ROUTE_LOOKUP_SUBSCRIBER_LOCATIONS: + - return|ROUTE_LOOKUP_SUBSCRIBER_LOCATIONS: + - start|ROUTE_OUTBOUND: + - start|ROUTE_SET_CALLER_DIALOG: + - start|ROUTE_CNT_DLG_CHECK: + - return|ROUTE_CNT_DLG_CHECK: + - start|ROUTE_SET_CALLER_DIALOG_TOTAL: + - return|ROUTE_SET_CALLER_DIALOG_TOTAL: + - start|ROUTE_SET_CALLER_DIALOG_BASE: + - return|ROUTE_SET_CALLER_DIALOG_BASE: + - return|ROUTE_SET_CALLER_DIALOG: + - start|ROUTE_ACC_CALLER: + - start|ROUTE_SET_ACC_CALLER_CALL_COUNTERS: + - return|ROUTE_SET_ACC_CALLER_CALL_COUNTERS: + - return|ROUTE_ACC_CALLER: + - start|ROUTE_ACC_CALLEE: + - start|ROUTE_SET_ACC_CALLEE_CALL_COUNTERS: + - return|ROUTE_SET_ACC_CALLEE_CALL_COUNTERS: + - return|ROUTE_ACC_CALLEE: + - start|BRANCH_ROUTE_SBC: + - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF: + - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF: + - start|ROUTE_SET_CALLEE_DIALOG: + - start|ROUTE_CNT_DLG_CHECK: + - return|ROUTE_CNT_DLG_CHECK: + - start|ROUTE_SET_CALLEE_DIALOG_BASE: + - return|ROUTE_SET_CALLEE_DIALOG_BASE: + - start|ROUTE_SET_CALLEE_DIALOG_TOTAL: + - return|ROUTE_SET_CALLEE_DIALOG_TOTAL: + - return|ROUTE_SET_CALLEE_DIALOG: + - start|ROUTE_SET_BRANCH_HDRS: + - start|ROUTE_PREPARE_UA: + - return|ROUTE_PREPARE_UA: + - return|ROUTE_SET_BRANCH_HDRS: + - start|ROUTE_SET_RUSER: + - return|ROUTE_SET_RUSER: + - start|ROUTE_BRANCH_ACC_RTP: + - return|ROUTE_BRANCH_ACC_RTP: + - start|ROUTE_FILTER_PRACK: + - return|ROUTE_FILTER_PRACK: + - start|ROUTE_PREPARE_SST: + - start|ROUTE_REMOVE_TIMER_SUPP_REQ: + - return|ROUTE_REMOVE_TIMER_SUPP_REQ: + - return|ROUTE_PREPARE_SST: + - start|ROUTE_PREPARE_MOH: + - return|ROUTE_PREPARE_MOH: + - start|ROUTE_SET_CALLER_CLI: + $avp(forwarder_domain_userprov): ['invite-redirect-tel-uri.scenarios.test'] + - 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: + - start|ROUTE_PREPARE_CALLER_CLI: + - return|ROUTE_PREPARE_CALLER_CLI: + - return|ROUTE_SET_CALLER_CLI: + $var(ccli_domain): invite-redirect-tel-uri.scenarios.test + $var(diversion_uri): sip:[% invite_redirect_tel_uri_scenarios_test.testuser1001.phone_number %]@invite-redirect-tel-uri.scenarios.test + - start|ROUTE_SET_CALLEE: + - return|ROUTE_SET_CALLEE: + - start|ROUTE_ADD_CALLINFO: + - start|ROUTE_ADD_CALLINFO_CALLER_PRIMARY: + - return|ROUTE_ADD_CALLINFO_CALLER_PRIMARY: + - start|ROUTE_ADD_CALLINFO_CALLEE_PRIMARY: + - return|ROUTE_ADD_CALLINFO_CALLEE_PRIMARY: + - return|ROUTE_ADD_CALLINFO: + - start|ROUTE_APPLY_HEADER_RULES: + - return|ROUTE_APPLY_HEADER_RULES: + - return|BRANCH_ROUTE_SBC: + - start|DEFAULT_SEND: + - exit|DEFAULT_SEND: + - exit|DEFAULT_SEND: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT: +sip_in: + - '^INVITE sip:[% scenarios.0.responders.1.username %]@invite-redirect-tel-uri.scenarios.test SIP/2.0' + - 'From: ' + - 'To: ' + - 'CSeq: \d+ INVITE' + - 'History-Info: ;index=1' + - 'P-HIH-Cause: 302' + - 'P-NGCP-Sems-Instance: sbc' + - 'P-Caller-UUID: [% invite_redirect_tel_uri_scenarios_test.testuser1001.uuid %]' + - 'P-First-Caller-UPN: [% invite_redirect_tel_uri_scenarios_test.testuser1000.phone_number %]' + - 'P-First-Caller-NPN: [% invite_redirect_tel_uri_scenarios_test.testuser1000.phone_number %]' + - 'P-First-Caller-UPD: invite-redirect-tel-uri.scenarios.test' + - 'P-First-Caller-NPD: invite-redirect-tel-uri.scenarios.test' + - 'P-Acc-Caller-User: testuser1001' + - 'P-Acc-Caller-Domain: invite-redirect-tel-uri.scenarios.test' + - 'P-Acc-State: cfb' + - 'P-CF-Depth: 1' + - 'P-Orig-Callee-Dialed: testuser1001' + - 'P-Prev-Caller-UUID: [% invite_redirect_tel_uri_scenarios_test.testuser1000.uuid %]' + - 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_redirect_tel_uri_scenarios_test.testuser1000.phone_number %]' + - 'P-NGCP-Forward-Info: ;ip=127.0.0.1;port=5080;primary=[% invite_redirect_tel_uri_scenarios_test.testuser1001.phone_number %]' + - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5080' + - 'Content-Type: application/sdp' + - 'Content-Length:\s+\d+' + - 'Contact: ' +sip_out: + - [ + 'SIP/2.0 100 Trying', + 'From: ', + 'To: ', + 'CSeq: \d+ INVITE', + 'Server: Sipwise NGCP Proxy', + 'Content-Length:\s+0', + ] + - [ + 'INVITE sip:[% scenarios.0.responders.1.username %]@[% scenarios.0.responders.1.ip %]:[% scenarios.0.responders.1.port %];cause=302 SIP/2.0', + 'From: ;tag=[\w-]+', + 'To: ', + 'CSeq: \d+ INVITE', + 'History-Info: ;index=1', + 'History-Info: ;index=1.1', + 'P-Caller-UUID: [% invite_redirect_tel_uri_scenarios_test.testuser1001.uuid %]', + 'P-CF-Depth: 1', + 'P-NGCP-Caller-Info: ;ip=127.0.0.1;port=5080;primary=[% invite_redirect_tel_uri_scenarios_test.testuser1001.phone_number %]', + 'P-NGCP-Forward-Info: ;ip=127.0.0.1;port=5080;primary=[% invite_redirect_tel_uri_scenarios_test.testuser1001.phone_number %]', + 'P-NGCP-Callee-Info: ;ip=[% scenarios.0.responders.1.ip %];port=[% scenarios.0.responders.1.port %];primary=[% invite_redirect_tel_uri_scenarios_test.testuser1002.phone_number %]', + 'Content-Type: application/sdp', + 'Content-Length:\s+\d+', + 'Contact: ', + 'P-Asserted-Identity: ', + 'P-Callee-UUID: [% invite_redirect_tel_uri_scenarios_test.testuser1002.uuid %]', + 'P-Called-Party-ID: ', + 'Diversion: ;reason=unconditional;privacy=off;counter=1', + 'P-App-Name: sbc', + 'P-D-Uri: sip:lb@127.0.0.1;lr;received=sip:[% scenarios.0.responders.1.ip %]:[% scenarios.0.responders.1.port %];socket=sip:[% server_ip %]:5060', + ] diff --git a/scenarios/invite_redirect_tel_uri/0014_test.yml.tt2 b/scenarios/invite_redirect_tel_uri/0017_test.yml.tt2 similarity index 63% rename from scenarios/invite_redirect_tel_uri/0014_test.yml.tt2 rename to scenarios/invite_redirect_tel_uri/0017_test.yml.tt2 index 98b83275..6c6fdb57 100644 --- a/scenarios/invite_redirect_tel_uri/0014_test.yml.tt2 +++ b/scenarios/invite_redirect_tel_uri/0017_test.yml.tt2 @@ -13,11 +13,10 @@ flow: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: sip_in: - # this part of the scenario is less interesting for us, so just make sure INVITE passes through from B2B - - '^INVITE sip:[% scenarios.0.responders.1.username %]@' - - 'From: ;tag=[\w-]+' - - 'To: ' - - 'CSeq: \d+ INVITE' + - '^INVITE sip:[% scenarios.0.responders.1.username %]@' + - 'From: ;tag=[\w-]+' + - 'To: ' + - 'CSeq: \d+ INVITE' sip_out: - [ 'SIP/2.0 100 Trying', @@ -25,11 +24,11 @@ sip_out: 'To: ', 'CSeq: \d+ INVITE', 'Server: Sipwise NGCP Proxy', - 'Content-Length: 0' + 'Content-Length:\s+0', ] - [ - '^INVITE sip:[% scenarios.0.responders.1.username %]@', + 'INVITE sip:[% scenarios.0.responders.1.username %]@', 'From: ;tag=[\w-]+', 'To: ', - 'CSeq: \d+ INVITE' - ] \ No newline at end of file + 'CSeq: \d+ INVITE', + ] diff --git a/scenarios/invite_redirect_tel_uri/0018_test.yml.tt2 b/scenarios/invite_redirect_tel_uri/0018_test.yml.tt2 deleted file mode 100644 index 5fb3c482..00000000 --- a/scenarios/invite_redirect_tel_uri/0018_test.yml.tt2 +++ /dev/null @@ -1,26 +0,0 @@ -flow: - - start|DEFAULT_ONREPLY: - - start|REPLY_ROUTE_NAT: - - start|ROUTE_ENTRY: - - return|ROUTE_ENTRY: - - start|ROUTE_APPLY_HEADER_RULES: - - return|ROUTE_APPLY_HEADER_RULES: - - start|ROUTE_PREPARE_UA: - - return|ROUTE_PREPARE_UA: - - start|REPLY_ROUTE_NAT_CONTINUE: - - start|ROUTE_EXIT: - - start|ROUTE_RUNTIME: - - return|ROUTE_RUNTIME: - - exit|ROUTE_EXIT: -sip_in: - - '^SIP/2.0 180 Ringing' - - 'From: ;tag=[\w-]+' - - 'To: ;tag=[\w-]+', - 'To: ;tag=[\w-]+', - 'CSeq: \d+ INVITE' - ] diff --git a/scenarios/invite_redirect_tel_uri/0021_test.yml.tt2 b/scenarios/invite_redirect_tel_uri/0021_test.yml.tt2 index 9a710f5e..10892144 100644 --- a/scenarios/invite_redirect_tel_uri/0021_test.yml.tt2 +++ b/scenarios/invite_redirect_tel_uri/0021_test.yml.tt2 @@ -1,43 +1,26 @@ flow: - - start|DEFAULT_ROUTE: + - start|DEFAULT_ONREPLY: + - start|REPLY_ROUTE_NAT: - start|ROUTE_ENTRY: - return|ROUTE_ENTRY: - - start|ROUTE_NET_INFO: - - return|ROUTE_NET_INFO: - - start|ROUTE_CHECK_TEL_URI: - - exit|ROUTE_CHECK_TEL_URI: - - start|ROUTE_PRX_REQUEST: - - start|ROUTE_INITVARS: - - return|ROUTE_INITVARS: + - start|ROUTE_APPLY_HEADER_RULES: + - return|ROUTE_APPLY_HEADER_RULES: - start|ROUTE_PREPARE_UA: - return|ROUTE_PREPARE_UA: - - start|ROUTE_RESTORE_CLUSTERSET: - - return|ROUTE_RESTORE_CLUSTERSET: - - start|ROUTE_WITHINDLG_RTPENGINE: - - return|ROUTE_WITHINDLG_RTPENGINE: - - start|ROUTE_OUTBOUND: - - start|DEFAULT_SEND: - - exit|DEFAULT_SEND: - - exit|DEFAULT_SEND: + - start|REPLY_ROUTE_NAT_CONTINUE: - start|ROUTE_EXIT: - start|ROUTE_RUNTIME: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: sip_in: - - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0' - - 'From: ;tag=[\w-]+' - - 'To: ;tag=[\w-]+' - - 'Contact: ]+)?>' - - 'CSeq: \d+ ACK' - - 'Max-Forwards: 69' - - 'Content-Length: 0' + - '^SIP/2.0 180 Ringing' + - 'From: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' + - 'CSeq: \d+ INVITE' sip_out: - [ - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0', - 'From: ;tag=[\w-]+', - 'To: ]+)?>', - 'Content-Length: 0' + '^SIP/2.0 180 Ringing', + 'From: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', + 'CSeq: \d+ INVITE', ] diff --git a/scenarios/invite_redirect_tel_uri/0023_test.yml.tt2 b/scenarios/invite_redirect_tel_uri/0023_test.yml.tt2 deleted file mode 100644 index eb729493..00000000 --- a/scenarios/invite_redirect_tel_uri/0023_test.yml.tt2 +++ /dev/null @@ -1,51 +0,0 @@ -flow: - - start|DEFAULT_ROUTE: - - start|ROUTE_ENTRY: - - return|ROUTE_ENTRY: - - start|ROUTE_NET_INFO: - - return|ROUTE_NET_INFO: - - start|ROUTE_CHECK_TEL_URI: - - exit|ROUTE_CHECK_TEL_URI: - - start|ROUTE_PRX_REQUEST: - - start|ROUTE_INITVARS: - - return|ROUTE_INITVARS: - - start|dialog:end: - - return|dialog:end: - - return|dialog:end: - - start|ROUTE_STOP_RTPPROXY: - - start|ROUTE_RESTORE_CLUSTERSET: - - return|ROUTE_RESTORE_CLUSTERSET: - - return|ROUTE_STOP_RTPPROXY: - - start|ROUTE_PREPARE_UA: - - return|ROUTE_PREPARE_UA: - - start|ROUTE_OUTBOUND: - - start|DEFAULT_SEND: - - exit|DEFAULT_SEND: - - exit|DEFAULT_SEND: - - start|ROUTE_EXIT: - - start|ROUTE_RUNTIME: - - return|ROUTE_RUNTIME: - - exit|ROUTE_EXIT: -sip_in: - - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0' - - 'From: ;tag=[\w-]+' - - 'To: ;tag=[\w-]+' - - 'CSeq: \d+ BYE' - - 'Max-Forwards: 69' - - 'Content-Length: 0' -sip_out: - - [ - '^SIP/2.0 100 Trying', - 'From: ;tag=[\w-]+', - 'To: ;tag=[\w-]+', - 'CSeq: \d+ BYE', - 'Content-Length: 0' - ] - - [ - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0', - 'CSeq: \d+ BYE', - 'Max-Forwards: 68', - 'Content-Length: 0', - 'From: ;tag=[\w-]+', - 'To: ;tag=[\w-]+' - - 'To: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' + - 'CSeq: \d+ INVITE' sip_out: - [ '^SIP/2.0 200 OK', 'From: ;tag=[\w-]+', 'To: ;tag=[\w-]+', - 'CSeq: \d+ INVITE' + 'CSeq: \d+ INVITE', ] diff --git a/scenarios/invite_redirect_tel_uri/0026_test.yml.tt2 b/scenarios/invite_redirect_tel_uri/0026_test.yml.tt2 index 71d758c6..09284fa1 100644 --- a/scenarios/invite_redirect_tel_uri/0026_test.yml.tt2 +++ b/scenarios/invite_redirect_tel_uri/0026_test.yml.tt2 @@ -1,28 +1,41 @@ flow: - - start|DEFAULT_ONREPLY: - - start|REPLY_ROUTE_NAT: + - start|DEFAULT_ROUTE: - start|ROUTE_ENTRY: - return|ROUTE_ENTRY: - - start|ROUTE_APPLY_HEADER_RULES: - - return|ROUTE_APPLY_HEADER_RULES: + - start|ROUTE_NET_INFO: + - return|ROUTE_NET_INFO: + - start|ROUTE_CHECK_TEL_URI: + - return|ROUTE_CHECK_TEL_URI: + - start|ROUTE_PRX_REQUEST: + - start|ROUTE_INITVARS: + - return|ROUTE_INITVARS: - start|ROUTE_PREPARE_UA: - return|ROUTE_PREPARE_UA: - - start|REPLY_ROUTE_NAT_CONTINUE: + - start|ROUTE_RESTORE_CLUSTERSET: + - return|ROUTE_RESTORE_CLUSTERSET: + - start|ROUTE_WITHINDLG_RTPENGINE: + - return|ROUTE_WITHINDLG_RTPENGINE: + - start|ROUTE_OUTBOUND: + - start|DEFAULT_SEND: + - exit|DEFAULT_SEND: + - exit|DEFAULT_SEND: - start|ROUTE_EXIT: - start|ROUTE_RUNTIME: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: sip_in: - - '^SIP/2.0 200 OK' - - 'From: ;tag=[\w-]+' - - 'To: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' + - 'CSeq: \d+ ACK' + - 'Content-Length:\s+0' + - 'Contact: ' sip_out: - [ - '^SIP/2.0 200 OK', - 'From: ;tag=[\w-]+', - 'To: ;tag=[\w-]+', - 'CSeq: \d+ BYE', - 'Content-Length: 0' + '^ACK sip:127.0.0.1:5080;transport=udp SIP/2.0', + 'From: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', + 'CSeq: \d+ ACK', + 'Content-Length:\s+0', + 'Contact: ', ] diff --git a/scenarios/invite_redirect_tel_uri/0029_test.yml.tt2 b/scenarios/invite_redirect_tel_uri/0029_test.yml.tt2 new file mode 100644 index 00000000..cae548c4 --- /dev/null +++ b/scenarios/invite_redirect_tel_uri/0029_test.yml.tt2 @@ -0,0 +1,50 @@ +flow: + - start|DEFAULT_ROUTE: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: + - start|ROUTE_NET_INFO: + - return|ROUTE_NET_INFO: + - start|ROUTE_CHECK_TEL_URI: + - return|ROUTE_CHECK_TEL_URI: + - start|ROUTE_PRX_REQUEST: + - start|ROUTE_INITVARS: + - return|ROUTE_INITVARS: + - start|dialog:end: + - return|dialog:end: + - return|dialog:end: + - start|ROUTE_STOP_RTPPROXY: + - start|ROUTE_RESTORE_CLUSTERSET: + - return|ROUTE_RESTORE_CLUSTERSET: + - return|ROUTE_STOP_RTPPROXY: + - start|ROUTE_PREPARE_UA: + - return|ROUTE_PREPARE_UA: + - start|ROUTE_OUTBOUND: + - start|DEFAULT_SEND: + - exit|DEFAULT_SEND: + - exit|DEFAULT_SEND: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT: +sip_in: + - '^BYE sip:127.0.0.1:5080;transport=udp SIP/2.0' + - 'From: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' + - 'CSeq: \d+ BYE' + - 'Content-Length:\s+0' +sip_out: + - [ + 'SIP/2.0 100 Trying', + 'From: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', + 'CSeq: \d+ BYE', + 'Server: Sipwise NGCP Proxy', + 'Content-Length:\s+0', + ] + - [ + 'BYE sip:127.0.0.1:5080;transport=udp SIP/2.0', + 'From: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', + 'CSeq: \d+ BYE', + 'Content-Length:\s+0', + ] diff --git a/scenarios/invite_redirect_tel_uri/0031_test.yml.tt2 b/scenarios/invite_redirect_tel_uri/0031_test.yml.tt2 new file mode 100644 index 00000000..d97738dc --- /dev/null +++ b/scenarios/invite_redirect_tel_uri/0031_test.yml.tt2 @@ -0,0 +1,28 @@ +flow: + - start|DEFAULT_ONREPLY: + - start|REPLY_ROUTE_NAT: + - start|ROUTE_ENTRY: + - return|ROUTE_ENTRY: + - start|ROUTE_APPLY_HEADER_RULES: + - return|ROUTE_APPLY_HEADER_RULES: + - start|ROUTE_PREPARE_UA: + - return|ROUTE_PREPARE_UA: + - start|REPLY_ROUTE_NAT_CONTINUE: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT: +sip_in: + - '^SIP/2.0 200 OK' + - 'From: ;tag=[\w-]+' + - 'To: ;tag=[\w-]+' + - 'CSeq: \d+ BYE' + - 'Content-Length:\s+0' +sip_out: + - [ + '^SIP/2.0 200 OK', + 'From: ;tag=[\w-]+', + 'To: ;tag=[\w-]+', + 'CSeq: \d+ BYE', + 'Content-Length:\s+0', + ] diff --git a/scenarios/invite_redirect_tel_uri/sipp_scenario00_test.yml.tt2 b/scenarios/invite_redirect_tel_uri/sipp_scenario00_test.yml.tt2 index 53e9d527..1772aa77 100644 --- a/scenarios/invite_redirect_tel_uri/sipp_scenario00_test.yml.tt2 +++ b/scenarios/invite_redirect_tel_uri/sipp_scenario00_test.yml.tt2 @@ -4,38 +4,38 @@ messages: - 'To: ' - 'CSeq: \d+ INVITE' - 'Server: Sipwise NGCP LB' - - 'Content-Length: 0' + - 'Content-Length:\s+0' - - 'SIP/2.0 407 Proxy Authentication Required' - 'From: ;tag=[\w-]+' - 'To: ;tag=[\w-]+' - 'CSeq: \d+ INVITE' - 'Proxy-Authenticate: Digest realm="invite-redirect-tel-uri.scenarios.test", nonce="[^"]+"' - 'Server: Sipwise NGCP Proxy' - - 'Content-Length: 0' + - 'Content-Length:\s+0' - - 'SIP/2.0 100 Trying' - 'From: ;tag=[\w-]+' - 'To: ' - 'CSeq: \d+ INVITE' - 'Server: Sipwise NGCP LB' - - 'Content-Length: 0' + - 'Content-Length:\s+0' - - 'SIP/2.0 180 Ringing' - - 'Record-Route: ' + - 'Record-Route: ' - 'Record-Route: ' - 'Record-Route: ' - 'From: ;tag=[\w-]+' - 'To: ;tag=[\w-]+' - 'CSeq: \d+ INVITE' - - 'Content-Length: 0' + - 'Content-Length:\s+0' - 'Contact: ' - - 'SIP/2.0 200 OK' - - 'Record-Route: ' + - 'Record-Route: ' - 'Record-Route: ' - 'Record-Route: ' - 'From: ;tag=[\w-]+' - 'To: ;tag=[\w-]+' - 'CSeq: \d+ INVITE' - 'Content-Type: application/sdp' - - 'Content-Length: \d+' + - 'Content-Length:\s+\d+' - 'Contact: ' - 'v=0' - 'o=user1 \d+ \d+ IN IP4 [% server_ip %]' @@ -48,10 +48,10 @@ messages: - 'a=rtcp:\d+' - 'a=ptime:50' - - 'SIP/2.0 200 OK' - - 'Record-Route: ' + - 'Record-Route: ' - 'Record-Route: ' - 'Record-Route: ' - 'From: ;tag=[\w-]+' - 'To: ;tag=[\w-]+' - 'CSeq: \d+ BYE' - - 'Content-Length: 0' + - 'Content-Length:\s+0' diff --git a/scenarios/invite_redirect_tel_uri/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_redirect_tel_uri/sipp_scenario_responder00_test.yml.tt2 index 2c23ef39..85b42c14 100644 --- a/scenarios/invite_redirect_tel_uri/sipp_scenario_responder00_test.yml.tt2 +++ b/scenarios/invite_redirect_tel_uri/sipp_scenario_responder00_test.yml.tt2 @@ -8,7 +8,7 @@ messages: - 'CSeq: \d+ INVITE' - 'P-Asserted-Identity: ' - 'Content-Type: application/sdp' - - 'Content-Length: \d+' + - 'Content-Length:\s+\d+' - 'Contact: ' - 'v=0' - 'o=user1 \d+ \d+ IN IP4 [% server_ip %]' @@ -24,4 +24,4 @@ messages: - 'From: ;tag=[\w-]+' - 'To: ;tag=[\w-]+' - 'CSeq: \d+ ACK' - - 'Content-Length: 0' + - 'Content-Length:\s+0' diff --git a/scenarios/invite_redirect_tel_uri/sipp_scenario_responder01_test.yml.tt2 b/scenarios/invite_redirect_tel_uri/sipp_scenario_responder01_test.yml.tt2 index f88fe2e9..85816f27 100644 --- a/scenarios/invite_redirect_tel_uri/sipp_scenario_responder01_test.yml.tt2 +++ b/scenarios/invite_redirect_tel_uri/sipp_scenario_responder01_test.yml.tt2 @@ -6,12 +6,12 @@ messages: - 'From: ;tag=[\w-]+' - 'To: ' - 'CSeq: \d+ INVITE' - - 'P-Asserted-Identity: ' - - 'Diversion: ;privacy=off;counter=1' - 'History-Info: ;index=1' - 'History-Info: ;index=1.1' + - 'P-Asserted-Identity: ' + - 'Diversion: ;reason=unconditional;privacy=off;counter=1' - 'Content-Type: application/sdp' - - 'Content-Length: \d+' + - 'Content-Length:\s+\d+' - 'Contact: ' - 'v=0' - 'o=user1 \d+ \d+ IN IP4 [% server_ip %]' @@ -30,7 +30,7 @@ messages: - 'From: ;tag=[\w-]+' - 'To: ;tag=[\w-]+' - 'CSeq: \d+ ACK' - - 'Content-Length: 0' + - 'Content-Length:\s+0' - 'Contact: ' - - 'BYE sip:[% scenarios.0.responders.1.ip %]:[% scenarios.0.responders.1.port %];transport=UDP SIP/2.0' - 'Record-Route: ' @@ -40,4 +40,4 @@ messages: - 'To: ;tag=[\w-]+' - 'CSeq: \d+ BYE' - 'P-Asserted-Identity: ' - - 'Content-Length: 0' + - 'Content-Length:\s+0'