From 987011ddefa00a19d5971f40bb2b5cbbea591ad2 Mon Sep 17 00:00:00 2001 From: Marco Capetta Date: Wed, 11 Dec 2019 12:08:15 +0100 Subject: [PATCH] TT#71821 Fix PBX scenarios * OPTIONS and SUBSCRIBE messages now use a different call_id in order to don't be intercepted by the cfgt module and don't create random packet ordering * scenarios yml file reordering due to the removing of OPTIONS and SUBSCRIBE messages Change-Id: Ia804aca8d096bb949f5c35f8a81bc7d58f8bb9b4 --- .../incoming_shared_line/0001_test.yml.tt2 | 37 ++- .../{0010_test.yml.tt2 => 0002_test.yml.tt2} | 0 .../incoming_shared_line/0003_test.yml.tt2 | 57 ++-- .../{0012_test.yml.tt2 => 0004_test.yml.tt2} | 0 .../incoming_shared_line/0005_test.yml.tt2 | 50 ++-- .../incoming_shared_line/0007_test.yml.tt2 | 196 ++++++++++--- .../incoming_shared_line/0009_test.yml.tt2 | 270 +++++++++++++++-- .../incoming_shared_line/0011_test.yml.tt2 | 58 ++-- .../{0037_test.yml.tt2 => 0013_test.yml.tt2} | 12 +- .../{0025_test.yml.tt2 => 0014_test.yml.tt2} | 0 .../incoming_shared_line/0015_test.yml.tt2 | 64 ++--- .../{0028_test.yml.tt2 => 0016_test.yml.tt2} | 0 .../{0027_test.yml.tt2 => 0018_test.yml.tt2} | 0 .../incoming_shared_line/0019_test.yml.tt2 | 271 +++--------------- .../{0033_test.yml.tt2 => 0021_test.yml.tt2} | 0 .../incoming_shared_line/0022_test.yml.tt2 | 47 ++- .../incoming_shared_line/0023_test.yml.tt2 | 12 +- .../incoming_shared_line/0024_test.yml.tt2 | 14 +- .../incoming_shared_line/0029_test.yml.tt2 | 75 ----- .../incoming_shared_line/0036_test.yml.tt2 | 51 ---- .../incoming_shared_line/0038_test.yml.tt2 | 31 -- .../incoming_shared_line/sipp_scenario00.xml | 2 +- .../incoming_shared_line/sipp_scenario01.xml | 2 +- .../sipp_scenario_responder00.xml | 14 +- .../sipp_scenario_responder01.xml | 20 +- scenarios_pbx/invite/0010_test.yml.tt2 | 33 +-- scenarios_pbx/invite/0011_test.yml.tt2 | 31 +- .../invite_shared_line/0001_test.yml.tt2 | 34 --- .../invite_shared_line/0002_test.yml.tt2 | 57 ---- .../invite_shared_line/0003_test.yml.tt2 | 41 +++ .../0005_test.yml.tt2} | 93 +++--- .../invite_shared_line/0007_test.yml.tt2 | 199 +++++++++++++ .../invite_shared_line/0008_test.yml.tt2 | 44 --- .../invite_shared_line/0009_test.yml.tt2 | 74 +---- .../{0020_test.yml.tt2 => 0010_test.yml.tt2} | 0 .../{0023_test.yml.tt2 => 0011_test.yml.tt2} | 0 .../invite_shared_line/0012_test.yml.tt2 | 69 +++-- .../{0026_test.yml.tt2 => 0013_test.yml.tt2} | 0 .../invite_shared_line/0014_test.yml.tt2 | 218 ++------------ .../{0028_test.yml.tt2 => 0015_test.yml.tt2} | 0 .../{0030_test.yml.tt2 => 0016_test.yml.tt2} | 0 .../invite_shared_line/0017_test.yml.tt2 | 195 +------------ .../{0032_test.yml.tt2 => 0018_test.yml.tt2} | 0 .../invite_shared_line/0019_test.yml.tt2 | 27 -- .../invite_shared_line/0024_test.yml.tt2 | 58 ---- .../invite_shared_line/0027_test.yml.tt2 | 42 --- .../invite_shared_line/0031_test.yml.tt2 | 28 -- .../invite_shared_line/0033_test.yml.tt2 | 44 --- .../invite_shared_line/0034_test.yml.tt2 | 75 ----- .../invite_shared_line/sipp_scenario00.xml | 2 +- .../invite_shared_line/sipp_scenario01.xml | 2 +- .../sipp_scenario_responder00.xml | 14 +- .../sipp_scenario_responder01.xml | 6 +- 53 files changed, 1053 insertions(+), 1616 deletions(-) rename scenarios_pbx/incoming_shared_line/{0010_test.yml.tt2 => 0002_test.yml.tt2} (100%) rename scenarios_pbx/incoming_shared_line/{0012_test.yml.tt2 => 0004_test.yml.tt2} (100%) rename scenarios_pbx/incoming_shared_line/{0037_test.yml.tt2 => 0013_test.yml.tt2} (65%) rename scenarios_pbx/incoming_shared_line/{0025_test.yml.tt2 => 0014_test.yml.tt2} (100%) rename scenarios_pbx/incoming_shared_line/{0028_test.yml.tt2 => 0016_test.yml.tt2} (100%) rename scenarios_pbx/incoming_shared_line/{0027_test.yml.tt2 => 0018_test.yml.tt2} (100%) rename scenarios_pbx/incoming_shared_line/{0033_test.yml.tt2 => 0021_test.yml.tt2} (100%) delete mode 100644 scenarios_pbx/incoming_shared_line/0029_test.yml.tt2 delete mode 100644 scenarios_pbx/incoming_shared_line/0036_test.yml.tt2 delete mode 100644 scenarios_pbx/incoming_shared_line/0038_test.yml.tt2 delete mode 100644 scenarios_pbx/invite_shared_line/0001_test.yml.tt2 delete mode 100644 scenarios_pbx/invite_shared_line/0002_test.yml.tt2 create mode 100644 scenarios_pbx/invite_shared_line/0003_test.yml.tt2 rename scenarios_pbx/{incoming_shared_line/0017_test.yml.tt2 => invite_shared_line/0005_test.yml.tt2} (65%) create mode 100644 scenarios_pbx/invite_shared_line/0007_test.yml.tt2 delete mode 100644 scenarios_pbx/invite_shared_line/0008_test.yml.tt2 rename scenarios_pbx/invite_shared_line/{0020_test.yml.tt2 => 0010_test.yml.tt2} (100%) rename scenarios_pbx/invite_shared_line/{0023_test.yml.tt2 => 0011_test.yml.tt2} (100%) rename scenarios_pbx/invite_shared_line/{0026_test.yml.tt2 => 0013_test.yml.tt2} (100%) rename scenarios_pbx/invite_shared_line/{0028_test.yml.tt2 => 0015_test.yml.tt2} (100%) rename scenarios_pbx/invite_shared_line/{0030_test.yml.tt2 => 0016_test.yml.tt2} (100%) rename scenarios_pbx/invite_shared_line/{0032_test.yml.tt2 => 0018_test.yml.tt2} (100%) delete mode 100644 scenarios_pbx/invite_shared_line/0019_test.yml.tt2 delete mode 100644 scenarios_pbx/invite_shared_line/0024_test.yml.tt2 delete mode 100644 scenarios_pbx/invite_shared_line/0027_test.yml.tt2 delete mode 100644 scenarios_pbx/invite_shared_line/0031_test.yml.tt2 delete mode 100644 scenarios_pbx/invite_shared_line/0033_test.yml.tt2 delete mode 100644 scenarios_pbx/invite_shared_line/0034_test.yml.tt2 diff --git a/scenarios_pbx/incoming_shared_line/0001_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0001_test.yml.tt2 index 3af313a0..ed10400b 100644 --- a/scenarios_pbx/incoming_shared_line/0001_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0001_test.yml.tt2 @@ -6,36 +6,47 @@ flow: - return|ROUTE_NET_INFO: - start|ROUTE_CHECK_TEL_URI: - return|ROUTE_CHECK_TEL_URI: - - start|ROUTE_IMP_REQUEST: - - start|ROUTE_IMP_WITHINDLG: - - return|ROUTE_IMP_WITHINDLG: + - start|ROUTE_REG_REQUEST: + - start|ROUTE_REG_HANDLE: - start|ROUTE_AUTH: - start|ROUTE_EXIT: - start|ROUTE_RUNTIME: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: sip_in: - - '^SUBSCRIBE sip:testuser1002@spce.test SIP/2.0' + - '^REGISTER sip:testuser1002@spce.test SIP/2.0' - 'From: ;tag=' - 'To: ' - - 'CSeq: 1 SUBSCRIBE' - - 'Contact: ' - - 'Expires: 20' - - 'Event: call-info' - - 'Content-Length:\s+0' - - 'P-NGCP-Src-Ip: 127.1.0.1' + - 'CSeq: 1 REGISTER' + - 'Contact: sip:testuser1002@127.1.0.3:\d+;transport=UDP' + - 'Expires: 600' + - 'Max-Forwards: 69' + - 'Content-Length: 0' + - 'P-NGCP-Src-Ip: 127.1.0.3' - 'P-NGCP-Src-Port: \d+' - 'P-NGCP-Src-Proto: udp' - 'P-NGCP-Src-Af: 4' - 'P-Sock-Info: udp:127.0.0.1:5060' + - 'Path: ' sip_out: - [ '^SIP/2.0 100 Trying', - 'CSeq: 1 SUBSCRIBE' + 'From: ;tag=', + 'To: ', + 'CSeq: 1 REGISTER', + 'P-Out-Socket: udp:127.0.0.1:5060', + 'P-NGCP-Auth-IP: 127.1.0.3', + 'P-NGCP-Auth-UA: ', + 'Content-Length: 0', ] - [ - '^SIP/2.0 407 Proxy Authentication Required', + '^SIP/2.0 401 Unauthorized', 'From: ;tag=', 'To: ;tag=', - 'CSeq: 1 SUBSCRIBE' + 'CSeq: 1 REGISTER', + 'P-Out-Socket: udp:127.0.0.1:5060', + 'P-NGCP-Auth-IP: 127.1.0.3', + 'P-NGCP-Auth-UA: ', + 'WWW-Authenticate: Digest', + 'Content-Length: 0', ] diff --git a/scenarios_pbx/incoming_shared_line/0010_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0002_test.yml.tt2 similarity index 100% rename from scenarios_pbx/incoming_shared_line/0010_test.yml.tt2 rename to scenarios_pbx/incoming_shared_line/0002_test.yml.tt2 diff --git a/scenarios_pbx/incoming_shared_line/0003_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0003_test.yml.tt2 index 6539f7c0..c42e98f1 100644 --- a/scenarios_pbx/incoming_shared_line/0003_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0003_test.yml.tt2 @@ -6,72 +6,47 @@ flow: - return|ROUTE_NET_INFO: - start|ROUTE_CHECK_TEL_URI: - return|ROUTE_CHECK_TEL_URI: - - start|ROUTE_IMP_REQUEST: - - start|ROUTE_IMP_WITHINDLG: - - return|ROUTE_IMP_WITHINDLG: + - start|ROUTE_REG_REQUEST: + - start|ROUTE_REG_HANDLE: - start|ROUTE_AUTH: - - start|ROUTE_AUTH_HELPER: - - return|ROUTE_AUTH_HELPER: - - start|ROUTE_ADD_CALLINFO_REPLY: - - return|ROUTE_ADD_CALLINFO_REPLY: - - return|ROUTE_AUTH: - - start|ROUTE_IMP_PRESENCE: - start|ROUTE_EXIT: - start|ROUTE_RUNTIME: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: sip_in: - - '^SUBSCRIBE sip:testuser1002@spce.test SIP/2.0' + - '^REGISTER sip:testuser1002@spce.test SIP/2.0' - 'From: ;tag=' - 'To: ' - - 'Proxy-Authorization: Digest' - - 'CSeq: 2 SUBSCRIBE' - - 'Contact: ' - - 'Expires: 20' - - 'Event: call-info' - - 'Content-Length:\s+0' - - 'P-NGCP-Src-Ip: 127.1.0.1' + - 'CSeq: 1 REGISTER' + - 'Contact: sip:testuser1002@127.1.0.4:\d+;transport=UDP' + - 'Expires: 600' + - 'Max-Forwards: 69' + - 'Content-Length: 0' + - 'P-NGCP-Src-Ip: 127.1.0.4' - 'P-NGCP-Src-Port: \d+' - 'P-NGCP-Src-Proto: udp' - 'P-NGCP-Src-Af: 4' - 'P-Sock-Info: udp:127.0.0.1:5060' + - 'Path: ' sip_out: - [ '^SIP/2.0 100 Trying', 'From: ;tag=', 'To: ', - 'CSeq: 2 SUBSCRIBE', + 'CSeq: 1 REGISTER', 'P-Out-Socket: udp:127.0.0.1:5060', - 'P-NGCP-Auth-IP: 127.1.0.1', + 'P-NGCP-Auth-IP: 127.1.0.4', 'P-NGCP-Auth-UA: ', 'Content-Length: 0', ] - [ - '^SIP/2.0 202 Accepted', + '^SIP/2.0 401 Unauthorized', 'From: ;tag=', 'To: ;tag=', - 'CSeq: 2 SUBSCRIBE', + 'CSeq: 1 REGISTER', 'P-Out-Socket: udp:127.0.0.1:5060', - 'P-NGCP-Auth-IP: 127.1.0.1', + 'P-NGCP-Auth-IP: 127.1.0.4', 'P-NGCP-Auth-UA: ', - 'P-NGCP-Authorization: testuser1002@spce.test', - 'P-NGCP-Authorized: 1', - 'P-Caller-UUID: [% spce_test.testuser1002.uuid %]', - 'Event: call-info', - 'Contact: sip:127.0.0.1:5062', - 'Allow-Events: call-info, line-seize', - 'Expires: 20', + 'WWW-Authenticate: Digest', 'Content-Length: 0', ] - - [ - '^NOTIFY sip:testuser1002@127.1.0.1:\d+ SIP/2.0', - 'To: ;tag=', - 'From: ;tag=', - 'CSeq: 1 NOTIFY', - 'Max-Forwards: 70', - 'Content-Length: 0', - 'Contact: sip:127.0.0.1:5062', - 'Call-Info: ;appearance-index=\*;appearance-state=idle', - 'Event: call-info', - 'Subscription-State: active', - ] diff --git a/scenarios_pbx/incoming_shared_line/0012_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0004_test.yml.tt2 similarity index 100% rename from scenarios_pbx/incoming_shared_line/0012_test.yml.tt2 rename to scenarios_pbx/incoming_shared_line/0004_test.yml.tt2 diff --git a/scenarios_pbx/incoming_shared_line/0005_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0005_test.yml.tt2 index 4adeafed..84f30334 100644 --- a/scenarios_pbx/incoming_shared_line/0005_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0005_test.yml.tt2 @@ -6,24 +6,31 @@ flow: - return|ROUTE_NET_INFO: - start|ROUTE_CHECK_TEL_URI: - return|ROUTE_CHECK_TEL_URI: - - start|ROUTE_IMP_REQUEST: - - start|ROUTE_IMP_WITHINDLG: - - return|ROUTE_IMP_WITHINDLG: + - 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_AUTH: - start|ROUTE_EXIT: - start|ROUTE_RUNTIME: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: sip_in: - - '^SUBSCRIBE sip:testuser1002@spce.test SIP/2.0' - - 'From: ;tag=' - - 'To: ' - - 'CSeq: 1 SUBSCRIBE' - - 'Contact: ' - - 'Expires: 20' - - 'Event: call-info' - - 'Content-Length:\s+0' - - 'P-NGCP-Src-Ip: 127.1.0.2' + - '^INVITE sip:1002@spce.test SIP/2.0' + - 'From: ;tag=' + - 'To: ' + - 'Call-Info: ;appearance-index=1' + - 'CSeq: 1 INVITE' + - 'Contact: sip:testuser1003@127.126.0.3:\d+' + - 'Max-Forwards: 69' + - 'Content-Type: application/sdp' + - 'Content-Length:\s+\d+' + - 'P-NGCP-Src-Ip: 127.126.0.3' - 'P-NGCP-Src-Port: \d+' - 'P-NGCP-Src-Proto: udp' - 'P-NGCP-Src-Af: 4' @@ -31,11 +38,22 @@ sip_in: sip_out: - [ '^SIP/2.0 100 Trying', - 'CSeq: 1 SUBSCRIBE' + 'From: ;tag=', + 'To: ', + 'CSeq: 1 INVITE', + 'P-Out-Socket: udp:127.0.0.1:5060', + 'P-NGCP-Auth-IP: 127.126.0.3', + 'P-NGCP-Auth-UA: ', + 'Content-Length: 0', ] - [ '^SIP/2.0 407 Proxy Authentication Required', - 'From: ;tag=', - 'To: ;tag=', - 'CSeq: 1 SUBSCRIBE' + 'From: ;tag=', + 'To: ;tag=', + 'CSeq: 1 INVITE', + 'P-Out-Socket: udp:127.0.0.1:5060', + 'P-NGCP-Auth-IP: 127.126.0.3', + 'P-NGCP-Auth-UA: ', + 'Proxy-Authenticate: Digest', + 'Content-Length: 0', ] diff --git a/scenarios_pbx/incoming_shared_line/0007_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0007_test.yml.tt2 index f46af7b8..6f505b3d 100644 --- a/scenarios_pbx/incoming_shared_line/0007_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0007_test.yml.tt2 @@ -6,31 +6,132 @@ flow: - return|ROUTE_NET_INFO: - start|ROUTE_CHECK_TEL_URI: - return|ROUTE_CHECK_TEL_URI: - - start|ROUTE_IMP_REQUEST: - - start|ROUTE_IMP_WITHINDLG: - - return|ROUTE_IMP_WITHINDLG: + - 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_AUTH: - start|ROUTE_AUTH_HELPER: - return|ROUTE_AUTH_HELPER: - start|ROUTE_ADD_CALLINFO_REPLY: + - start|ROUTE_ADD_CALLINFO_CALLER_PRIMARY: + - return|ROUTE_ADD_CALLINFO_CALLER_PRIMARY: - return|ROUTE_ADD_CALLINFO_REPLY: - return|ROUTE_AUTH: - - start|ROUTE_IMP_PRESENCE: + - 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: + - start|ROUTE_DLG_MANAGE: + - return|ROUTE_DLG_MANAGE: + - return|ROUTE_LOAD_CALLER_PREF: + - start|ROUTE_DLG_MANAGE: + - return|ROUTE_DLG_MANAGE: + - start|ROUTE_APPLY_HEADER_RULES: + - return|ROUTE_APPLY_HEADER_RULES: + - start|ROUTE_GET_CALLER_CLI: + - return|ROUTE_GET_CALLER_CLI: + - 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_FIND_CALLEE: + - 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: + - return|ROUTE_SET_CALLEE_DIALOG: + - start|ROUTE_BLOCK_IN: + - return|ROUTE_BLOCK_IN: + - start|ROUTE_ORDER_CF_MAP_ID: + - return|ROUTE_ORDER_CF_MAP_ID: + - 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: + - return|ROUTE_NCOS_CHECK: + - start|ROUTE_CHECK_PBX: + - start|ROUTE_APPEND_PBX_HDRS: + - start|ROUTE_ADD_EVENTMON_HEADERS: + - return|ROUTE_ADD_EVENTMON_HEADERS: + - return|ROUTE_APPEND_PBX_HDRS: + - start|ROUTE_OUTBOUND: + - start|ROUTE_SET_CALLER_DIALOG: + - start|ROUTE_CNT_DLG_CHECK: + - return|ROUTE_CNT_DLG_CHECK: + - return|ROUTE_SET_CALLER_DIALOG: + - start|ROUTE_ACC_CALLER: + - return|ROUTE_ACC_CALLER: + - start|ROUTE_ACC_CALLEE: + - return|ROUTE_ACC_CALLEE: + - start|ROUTE_SCA_UPDATE: + - return|ROUTE_SCA_UPDATE: + - start|BRANCH_ROUTE_NO_SBC: + - start|ROUTE_BRANCH_ACC_RTP: + - return|ROUTE_BRANCH_ACC_RTP: + - start|ROUTE_SET_BRANCH_HDRS: + - start|ROUTE_PREPARE_UA: + - return|ROUTE_PREPARE_UA: + - return|ROUTE_SET_BRANCH_HDRS: + - start|ROUTE_FILTER_PRACK: + - return|ROUTE_FILTER_PRACK: + - start|ROUTE_PREPARE_MOH_PBX: + - return|ROUTE_PREPARE_MOH_PBX: + - start|ROUTE_LOAD_PBXSRV: + - return|ROUTE_LOAD_PBXSRV: + - 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_NO_SBC: + - start|DEFAULT_SEND: + - exit|DEFAULT_SEND: + - exit|DEFAULT_SEND: - start|ROUTE_EXIT: - start|ROUTE_RUNTIME: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: sip_in: - - '^SUBSCRIBE sip:testuser1002@spce.test SIP/2.0' - - 'From: ;tag=' - - 'To: ' + - '^INVITE sip:1002@spce.test SIP/2.0' + - 'From: ;tag=' + - 'To: ' + - 'Call-Info: ;appearance-index=1' + - 'CSeq: 2 INVITE' + - 'Contact: sip:testuser1003@127.126.0.3:\d+' + - 'Max-Forwards: 69' - 'Proxy-Authorization: Digest' - - 'CSeq: 2 SUBSCRIBE' - - 'Contact: ' - - 'Expires: 20' - - 'Event: call-info' - - 'Content-Length:\s+0' - - 'P-NGCP-Src-Ip: 127.1.0.2' + - 'Content-Type: application/sdp' + - 'Content-Length:\s+\d+' + - 'P-NGCP-Src-Ip: 127.126.0.3' - 'P-NGCP-Src-Port: \d+' - 'P-NGCP-Src-Proto: udp' - 'P-NGCP-Src-Af: 4' @@ -38,40 +139,59 @@ sip_in: sip_out: - [ '^SIP/2.0 100 Trying', - 'From: ;tag=', - 'To: ', - 'CSeq: 2 SUBSCRIBE', + 'From: ;tag=', + 'To: ', + 'CSeq: 2 INVITE', 'P-Out-Socket: udp:127.0.0.1:5060', - 'P-NGCP-Auth-IP: 127.1.0.2', + 'P-NGCP-Auth-IP: 127.126.0.3', 'P-NGCP-Auth-UA: ', 'Content-Length: 0', ] - [ - '^SIP/2.0 202 Accepted', - 'From: ;tag=', - 'To: ;tag=', - 'CSeq: 2 SUBSCRIBE', + '^SIP/2.0 101 Connecting', + 'From: ;tag=', + 'To: ', + 'CSeq: 2 INVITE', 'P-Out-Socket: udp:127.0.0.1:5060', - 'P-NGCP-Auth-IP: 127.1.0.2', + 'P-NGCP-Auth-IP: 127.126.0.3', 'P-NGCP-Auth-UA: ', - 'P-NGCP-Authorization: testuser1002@spce.test', + 'P-NGCP-Authorization: testuser1003@spce.test', 'P-NGCP-Authorized: 1', - 'P-Caller-UUID: [% spce_test.testuser1002.uuid %]', - 'Event: call-info', - 'Contact: sip:127.0.0.1:5062', - 'Allow-Events: call-info, line-seize', - 'Expires: 20', + 'P-NGCP-Caller-Info: ;ip=127.126.0.3;port=\d+;primary=43110021003', + 'P-Caller-UUID: [% spce_test.testuser1003.uuid %]', 'Content-Length: 0', ] - [ - '^NOTIFY sip:testuser1002@127.1.0.2:\d+ SIP/2.0', - 'To: ;tag=', - 'From: ;tag=', - 'CSeq: 1 NOTIFY', - 'Max-Forwards: 70', - 'Content-Length: 0', - 'Contact: sip:127.0.0.1:5062', - 'Call-Info: ;appearance-index=\*;appearance-state=idle', - 'Event: call-info', - 'Subscription-State: active', + '^INVITE sip:testuser1002@spce.test SIP/2.0', + 'From: ;tag=', + 'To: ', + 'CSeq: 2 INVITE', + 'Contact: sip:testuser1003@127.126.0.3:\d+', + 'Max-Forwards: 68', + 'Content-Type: application/sdp', + 'Content-Length:\s+\d+', + 'P-NGCP-Src-Ip: 127.126.0.3', + 'P-NGCP-Src-Port: \d+', + 'P-NGCP-Src-Proto: udp', + 'P-NGCP-Src-Af: 4', + 'P-NGCP-Src-Nat: 0', + 'P-Caller-CLIR: 0', + 'P-NGCP-Orig-User: 4311002', + 'P-NGCP-Orig-Domain: spce.test', + 'P-NGCP-Orig-Dialed: 1002', + 'P-NGCP-Orig-PBX-Ext: 1002', + 'P-First-Caller-Cloud-PBX: \d+', + 'P-NGCP-Lookup-Type: ext', + 'P-NGCP-BlockOut-Override: 0', + 'P-NGCP-AdmBlockOut-Override: 0', + 'P-NGCP-ContBlockOut-Override: 0', + 'P-NGCP-ContAdmBlockOut-Override: 0', + 'P-Caller-UUID: [% spce_test.testuser1003.uuid %]', + 'P-Callee-UUID: [% spce_test.testuser1002.uuid %]', + 'P-App-Name: sbc', + 'P-App-Param: ;a_park_domain=\d+;b_park_domain=\d+', + 'P-NGCP-Acc-Src-Leg: \w+', + 'P-NGCP-Acc-Dst-Leg: \w+', + 'P-NGCP-Caller-Info: ;ip=127.126.0.3;port=\d+;primary=43110021003', + 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5085;primary=4311002', ] diff --git a/scenarios_pbx/incoming_shared_line/0009_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0009_test.yml.tt2 index ed10400b..ab2cc3a2 100644 --- a/scenarios_pbx/incoming_shared_line/0009_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0009_test.yml.tt2 @@ -6,47 +6,259 @@ flow: - return|ROUTE_NET_INFO: - start|ROUTE_CHECK_TEL_URI: - return|ROUTE_CHECK_TEL_URI: - - start|ROUTE_REG_REQUEST: - - start|ROUTE_REG_HANDLE: - - start|ROUTE_AUTH: + - 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_RESTORE_EVENTMON_HEADERS: + - return|ROUTE_RESTORE_EVENTMON_HEADERS: + - start|ROUTE_CNT_DLG_CHECK: + - start|ROUTE_DLG_MANAGE: + - return|ROUTE_DLG_MANAGE: + - return|ROUTE_CNT_DLG_CHECK: + - 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: + - start|ROUTE_DLG_MANAGE: + - return|ROUTE_DLG_MANAGE: + - return|ROUTE_LOAD_CALLER_PREF: + - start|ROUTE_DLG_MANAGE: + - return|ROUTE_DLG_MANAGE: + - start|ROUTE_APPLY_HEADER_RULES: + - return|ROUTE_APPLY_HEADER_RULES: + - start|ROUTE_GET_CALLER_CLI: + - return|ROUTE_GET_CALLER_CLI: + - 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_FIND_CALLEE: + - 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: + - return|ROUTE_SET_CALLEE_DIALOG: + - start|ROUTE_BLOCK_IN: + - return|ROUTE_BLOCK_IN: + - start|ROUTE_ORDER_CF_MAP_ID: + - return|ROUTE_ORDER_CF_MAP_ID: + - return|ROUTE_LOAD_CALLEE_PREF: + - 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_OUTBOUND: + - start|ROUTE_SET_CALLER_DIALOG: + - start|ROUTE_CNT_DLG_CHECK: + - return|ROUTE_CNT_DLG_CHECK: + - return|ROUTE_SET_CALLER_DIALOG: + - 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: + - 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: + - 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: + - 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|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: + - 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: + - 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: + - 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: + - exit|DEFAULT_SEND: - start|ROUTE_EXIT: - start|ROUTE_RUNTIME: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: sip_in: - - '^REGISTER sip:testuser1002@spce.test SIP/2.0' - - 'From: ;tag=' - - 'To: ' - - 'CSeq: 1 REGISTER' - - 'Contact: sip:testuser1002@127.1.0.3:\d+;transport=UDP' - - 'Expires: 600' - - 'Max-Forwards: 69' - - 'Content-Length: 0' - - 'P-NGCP-Src-Ip: 127.1.0.3' + - 'INVITE sip:testuser1002@spce.test SIP/2.0' + - 'From: ;tag=' + - 'To: ' + - 'CSeq: \d+ INVITE' + - 'Route: ' + - 'Max-Forwards: 70' + - 'P-NGCP-Src-Ip: 127.126.0.3' - 'P-NGCP-Src-Port: \d+' - 'P-NGCP-Src-Proto: udp' - 'P-NGCP-Src-Af: 4' - - 'P-Sock-Info: udp:127.0.0.1:5060' - - 'Path: ' + - 'P-NGCP-Src-Nat: 0' + - 'P-Caller-CLIR: 0' + - 'P-NGCP-Orig-User: 4311002' + - 'P-NGCP-Orig-Domain: spce.test' + - 'P-NGCP-Orig-Dialed: 1002' + - 'P-NGCP-Orig-PBX-Ext: 1002' + - 'P-First-Caller-Cloud-PBX: \d+' + - 'P-NGCP-Lookup-Type: ext' + - 'P-NGCP-BlockOut-Override: 0' + - 'P-NGCP-AdmBlockOut-Override: 0' + - 'P-NGCP-ContBlockOut-Override: 0' + - 'P-NGCP-ContAdmBlockOut-Override: 0' + - 'P-Caller-UUID: [% spce_test.testuser1003.uuid %]' + - 'P-Callee-UUID: [% spce_test.testuser1002.uuid %]' + - 'P-NGCP-Acc-Src-Leg: \w+' + - 'P-NGCP-Acc-Dst-Leg: \w+' + - 'P-NGCP-Caller-Info: ;ip=127.126.0.3;port=\d+;primary=43110021003' + - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5085;primary=4311002' + - 'P-To-Device: 1' + - 'Content-Type: application/sdp' + - 'Content-Length: \d+' + - 'Contact: ' sip_out: - [ '^SIP/2.0 100 Trying', - 'From: ;tag=', - 'To: ', - 'CSeq: 1 REGISTER', - 'P-Out-Socket: udp:127.0.0.1:5060', - 'P-NGCP-Auth-IP: 127.1.0.3', - 'P-NGCP-Auth-UA: ', + 'From: ;tag=', + 'To: ', + 'CSeq: \d+ INVITE', 'Content-Length: 0', ] - [ - '^SIP/2.0 401 Unauthorized', - 'From: ;tag=', - 'To: ;tag=', - 'CSeq: 1 REGISTER', - 'P-Out-Socket: udp:127.0.0.1:5060', - 'P-NGCP-Auth-IP: 127.1.0.3', - 'P-NGCP-Auth-UA: ', - 'WWW-Authenticate: Digest', - 'Content-Length: 0', + '^INVITE sip:testuser1002@127.1.0.3:\d+ SIP/2.0', + 'From: ;tag=', + 'To: ', + 'CSeq: \d+ INVITE', + 'Route: ', + 'Max-Forwards: 69', + 'P-NGCP-Orig-PBX-Ext: 1002', + 'P-NGCP-Acc-Src-Leg: \w+', + 'P-NGCP-Acc-Dst-Leg: \w+', + 'Content-Type: application/sdp', + 'Content-Length: \d+', + 'Contact: ', + 'P-Caller-UUID: [% spce_test.testuser1003.uuid %]', + 'P-Callee-UUID: [% spce_test.testuser1002.uuid %]', + 'P-Asserted-Identity: ', + 'P-Called-Party-ID: ', + 'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no', + 'P-App-Name: sbc', + 'P-NGCP-Caller-Info: ;ip=127.126.0.3;port=\d+;primary=43110021003', + 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=4311002', + 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060', + ] + - [ + '^INVITE sip:testuser1002@127.1.0.4:\d+ SIP/2.0', + 'From: ;tag=', + 'To: ', + 'CSeq: \d+ INVITE', + 'Route: ', + 'Max-Forwards: 69', + 'P-NGCP-Orig-PBX-Ext: 1002', + 'P-NGCP-Acc-Src-Leg: \w+', + 'P-NGCP-Acc-Dst-Leg: \w+', + 'Content-Type: application/sdp', + 'Content-Length: \d+', + 'Contact: ', + 'P-Caller-UUID: [% spce_test.testuser1003.uuid %]', + 'P-Callee-UUID: [% spce_test.testuser1002.uuid %]', + 'P-Asserted-Identity: ', + 'P-Called-Party-ID: ', + 'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no', + 'P-App-Name: sbc', + 'P-NGCP-Caller-Info: ;ip=127.126.0.3;port=\d+;primary=43110021003', + 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=4311002', + 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060', ] diff --git a/scenarios_pbx/incoming_shared_line/0011_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0011_test.yml.tt2 index c42e98f1..90a8b632 100644 --- a/scenarios_pbx/incoming_shared_line/0011_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0011_test.yml.tt2 @@ -1,52 +1,32 @@ 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: - - return|ROUTE_CHECK_TEL_URI: - - start|ROUTE_REG_REQUEST: - - start|ROUTE_REG_HANDLE: - - start|ROUTE_AUTH: + - 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: - - '^REGISTER sip:testuser1002@spce.test SIP/2.0' - - 'From: ;tag=' - - 'To: ' - - 'CSeq: 1 REGISTER' - - 'Contact: sip:testuser1002@127.1.0.4:\d+;transport=UDP' - - 'Expires: 600' - - 'Max-Forwards: 69' + - '^SIP/2.0 180 Ringing' + - 'From: ;tag=' + - 'To: ;tag=' + - 'CSeq: \d+ INVITE' + - 'Call-Info: ;appearance-index=1' + - 'Contact: ' - 'Content-Length: 0' - - 'P-NGCP-Src-Ip: 127.1.0.4' - - 'P-NGCP-Src-Port: \d+' - - 'P-NGCP-Src-Proto: udp' - - 'P-NGCP-Src-Af: 4' - - 'P-Sock-Info: udp:127.0.0.1:5060' - - 'Path: ' sip_out: - [ - '^SIP/2.0 100 Trying', - 'From: ;tag=', - 'To: ', - 'CSeq: 1 REGISTER', - 'P-Out-Socket: udp:127.0.0.1:5060', - 'P-NGCP-Auth-IP: 127.1.0.4', - 'P-NGCP-Auth-UA: ', - 'Content-Length: 0', - ] - - [ - '^SIP/2.0 401 Unauthorized', - 'From: ;tag=', - 'To: ;tag=', - 'CSeq: 1 REGISTER', - 'P-Out-Socket: udp:127.0.0.1:5060', - 'P-NGCP-Auth-IP: 127.1.0.4', - 'P-NGCP-Auth-UA: ', - 'WWW-Authenticate: Digest', + '^SIP/2.0 180 Ringing', + 'From: ;tag=', + 'To: ;tag=', + 'CSeq: \d+ INVITE', + 'Call-Info: ;appearance-index=1', + 'Contact: ', 'Content-Length: 0', ] diff --git a/scenarios_pbx/incoming_shared_line/0037_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0013_test.yml.tt2 similarity index 65% rename from scenarios_pbx/incoming_shared_line/0037_test.yml.tt2 rename to scenarios_pbx/incoming_shared_line/0013_test.yml.tt2 index f2fc90d7..f59336d1 100644 --- a/scenarios_pbx/incoming_shared_line/0037_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0013_test.yml.tt2 @@ -13,16 +13,20 @@ flow: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: sip_in: - - '^SIP/2.0 200 OK' + - '^SIP/2.0 180 Ringing' - 'From: ;tag=' - 'To: ;tag=' - - 'CSeq: \d+ BYE' + - 'CSeq: \d+ INVITE' + - 'Call-Info: ;appearance-index=1' + - 'Contact: ' - 'Content-Length: 0' sip_out: - [ - '^SIP/2.0 200 OK', + '^SIP/2.0 180 Ringing', 'From: ;tag=', 'To: ;tag=', - 'CSeq: \d+ BYE', + 'CSeq: \d+ INVITE', + 'Call-Info: ;appearance-index=1', + 'Contact: ', 'Content-Length: 0', ] diff --git a/scenarios_pbx/incoming_shared_line/0025_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0014_test.yml.tt2 similarity index 100% rename from scenarios_pbx/incoming_shared_line/0025_test.yml.tt2 rename to scenarios_pbx/incoming_shared_line/0014_test.yml.tt2 diff --git a/scenarios_pbx/incoming_shared_line/0015_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0015_test.yml.tt2 index 84f30334..8a36d27e 100644 --- a/scenarios_pbx/incoming_shared_line/0015_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0015_test.yml.tt2 @@ -1,59 +1,37 @@ 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: - - 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_AUTH: + - start|ROUTE_APPLY_HEADER_RULES: + - return|ROUTE_APPLY_HEADER_RULES: + - start|REPLY_SCA_UPDATE: + - return|REPLY_SCA_UPDATE: + - 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: - - '^INVITE sip:1002@spce.test SIP/2.0' + - '^SIP/2.0 180 Ringing' - 'From: ;tag=' - - 'To: ' + - 'To: ;tag=' + - 'CSeq: 2 INVITE' + - 'Allow: INVITE, PRACK, ACK, BYE, CANCEL, OPTIONS, NOTIFY, REGISTER, SUBSCRIBE, REFER, PUBLISH, UPDATE, MESSAGE' - 'Call-Info: ;appearance-index=1' - - 'CSeq: 1 INVITE' - - 'Contact: sip:testuser1003@127.126.0.3:\d+' - - 'Max-Forwards: 69' - - 'Content-Type: application/sdp' - - 'Content-Length:\s+\d+' - - 'P-NGCP-Src-Ip: 127.126.0.3' - - 'P-NGCP-Src-Port: \d+' - - 'P-NGCP-Src-Proto: udp' - - 'P-NGCP-Src-Af: 4' - - 'P-Sock-Info: udp:127.0.0.1:5060' + - 'Contact: ' + - 'Content-Length: 0' sip_out: - [ - '^SIP/2.0 100 Trying', - 'From: ;tag=', - 'To: ', - 'CSeq: 1 INVITE', - 'P-Out-Socket: udp:127.0.0.1:5060', - 'P-NGCP-Auth-IP: 127.126.0.3', - 'P-NGCP-Auth-UA: ', - 'Content-Length: 0', - ] - - [ - '^SIP/2.0 407 Proxy Authentication Required', + '^SIP/2.0 180 Ringing', 'From: ;tag=', 'To: ;tag=', - 'CSeq: 1 INVITE', - 'P-Out-Socket: udp:127.0.0.1:5060', - 'P-NGCP-Auth-IP: 127.126.0.3', - 'P-NGCP-Auth-UA: ', - 'Proxy-Authenticate: Digest', + 'CSeq: 2 INVITE', + 'Allow: INVITE, PRACK, ACK, BYE, CANCEL, OPTIONS, NOTIFY, REGISTER, SUBSCRIBE, REFER, PUBLISH, UPDATE, MESSAGE', + 'Contact: ', 'Content-Length: 0', + 'P-COLP-Identity: \"1002\" ', + 'P-Out-Socket: udp:127.0.0.1:5060', ] diff --git a/scenarios_pbx/incoming_shared_line/0028_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0016_test.yml.tt2 similarity index 100% rename from scenarios_pbx/incoming_shared_line/0028_test.yml.tt2 rename to scenarios_pbx/incoming_shared_line/0016_test.yml.tt2 diff --git a/scenarios_pbx/incoming_shared_line/0027_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0018_test.yml.tt2 similarity index 100% rename from scenarios_pbx/incoming_shared_line/0027_test.yml.tt2 rename to scenarios_pbx/incoming_shared_line/0018_test.yml.tt2 diff --git a/scenarios_pbx/incoming_shared_line/0019_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0019_test.yml.tt2 index ab2cc3a2..44428871 100644 --- a/scenarios_pbx/incoming_shared_line/0019_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0019_test.yml.tt2 @@ -9,256 +9,67 @@ flow: - 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_RESTORE_EVENTMON_HEADERS: - - return|ROUTE_RESTORE_EVENTMON_HEADERS: - - start|ROUTE_CNT_DLG_CHECK: - - start|ROUTE_DLG_MANAGE: - - return|ROUTE_DLG_MANAGE: - - return|ROUTE_CNT_DLG_CHECK: - - 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: - - start|ROUTE_DLG_MANAGE: - - return|ROUTE_DLG_MANAGE: - - return|ROUTE_LOAD_CALLER_PREF: - - start|ROUTE_DLG_MANAGE: - - return|ROUTE_DLG_MANAGE: - - start|ROUTE_APPLY_HEADER_RULES: - - return|ROUTE_APPLY_HEADER_RULES: - - start|ROUTE_GET_CALLER_CLI: - - return|ROUTE_GET_CALLER_CLI: - - 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_FIND_CALLEE: - - 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: - - return|ROUTE_SET_CALLEE_DIALOG: - - start|ROUTE_BLOCK_IN: - - return|ROUTE_BLOCK_IN: - - start|ROUTE_ORDER_CF_MAP_ID: - - return|ROUTE_ORDER_CF_MAP_ID: - - return|ROUTE_LOAD_CALLEE_PREF: - - 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_OUTBOUND: - - start|ROUTE_SET_CALLER_DIALOG: - - start|ROUTE_CNT_DLG_CHECK: - - return|ROUTE_CNT_DLG_CHECK: - - return|ROUTE_SET_CALLER_DIALOG: - - 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: - - 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: - - 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: - - 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|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: - - return|ROUTE_SET_CALLEE_DIALOG: - - start|ROUTE_SET_BRANCH_HDRS: + - start|ROUTE_SCA_UPDATE: + - return|ROUTE_SCA_UPDATE: - 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: - - 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: - - 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|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: - - exit|DEFAULT_SEND: - start|ROUTE_EXIT: - start|ROUTE_RUNTIME: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: sip_in: - - 'INVITE sip:testuser1002@spce.test SIP/2.0' + - '^ACK sip:127.0.0.1:5085;prxroute=1 SIP/2.0' - 'From: ;tag=' - - 'To: ' - - 'CSeq: \d+ INVITE' - - 'Route: ' - - 'Max-Forwards: 70' + - 'To: ;tag=' + - 'Call-Info: ;appearance-index=1' + - 'CSeq: 2 ACK' + - 'Contact: sip:testuser1003@127.126.0.3:\d+' + - 'Content-Length: 0' - 'P-NGCP-Src-Ip: 127.126.0.3' - 'P-NGCP-Src-Port: \d+' - 'P-NGCP-Src-Proto: udp' - 'P-NGCP-Src-Af: 4' - - 'P-NGCP-Src-Nat: 0' - - 'P-Caller-CLIR: 0' - - 'P-NGCP-Orig-User: 4311002' - - 'P-NGCP-Orig-Domain: spce.test' - - 'P-NGCP-Orig-Dialed: 1002' - - 'P-NGCP-Orig-PBX-Ext: 1002' - - 'P-First-Caller-Cloud-PBX: \d+' - - 'P-NGCP-Lookup-Type: ext' - - 'P-NGCP-BlockOut-Override: 0' - - 'P-NGCP-AdmBlockOut-Override: 0' - - 'P-NGCP-ContBlockOut-Override: 0' - - 'P-NGCP-ContAdmBlockOut-Override: 0' - - 'P-Caller-UUID: [% spce_test.testuser1003.uuid %]' - - 'P-Callee-UUID: [% spce_test.testuser1002.uuid %]' - - 'P-NGCP-Acc-Src-Leg: \w+' - - 'P-NGCP-Acc-Dst-Leg: \w+' - - 'P-NGCP-Caller-Info: ;ip=127.126.0.3;port=\d+;primary=43110021003' - - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5085;primary=4311002' - - 'P-To-Device: 1' - - 'Content-Type: application/sdp' - - 'Content-Length: \d+' - - 'Contact: ' + - 'P-Sock-Info: udp:127.0.0.1:5060' sip_out: - [ - '^SIP/2.0 100 Trying', - 'From: ;tag=', - 'To: ', - 'CSeq: \d+ INVITE', + '^NOTIFY sip:testuser1002@127.1.0.2:\d+ SIP/2.0', + 'To: ;tag=', + 'From: ;tag=', + 'CSeq: 2 NOTIFY', + 'Max-Forwards: 70', 'Content-Length: 0', + 'Contact: sip:127.0.0.1:5062', + 'Call-Info: ;appearance-index=1;appearance-state=active;appearance-uri=\"\",;appearance-index=\*;appearance-state=idle', + 'Event: call-info', + 'Subscription-State: active;expires=\d+', ] - [ - '^INVITE sip:testuser1002@127.1.0.3:\d+ SIP/2.0', - 'From: ;tag=', - 'To: ', - 'CSeq: \d+ INVITE', - 'Route: ', - 'Max-Forwards: 69', - 'P-NGCP-Orig-PBX-Ext: 1002', - 'P-NGCP-Acc-Src-Leg: \w+', - 'P-NGCP-Acc-Dst-Leg: \w+', - 'Content-Type: application/sdp', - 'Content-Length: \d+', - 'Contact: ', - 'P-Caller-UUID: [% spce_test.testuser1003.uuid %]', - 'P-Callee-UUID: [% spce_test.testuser1002.uuid %]', - 'P-Asserted-Identity: ', - 'P-Called-Party-ID: ', - 'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no', - 'P-App-Name: sbc', - 'P-NGCP-Caller-Info: ;ip=127.126.0.3;port=\d+;primary=43110021003', - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=4311002', - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060', + '^NOTIFY sip:testuser1002@127.1.0.1:\d+ SIP/2.0', + 'To: ;tag=', + 'From: ;tag=', + 'CSeq: 2 NOTIFY', + 'Max-Forwards: 70', + 'Content-Length: 0', + 'Contact: sip:127.0.0.1:5062', + 'Call-Info: ;appearance-index=1;appearance-state=active;appearance-uri=\"\",;appearance-index=\*;appearance-state=idle', + 'Event: call-info', + 'Subscription-State: active;expires=\d+', ] - [ - '^INVITE sip:testuser1002@127.1.0.4:\d+ SIP/2.0', - 'From: ;tag=', - 'To: ', - 'CSeq: \d+ INVITE', - 'Route: ', - 'Max-Forwards: 69', - 'P-NGCP-Orig-PBX-Ext: 1002', - 'P-NGCP-Acc-Src-Leg: \w+', - 'P-NGCP-Acc-Dst-Leg: \w+', - 'Content-Type: application/sdp', - 'Content-Length: \d+', - 'Contact: ', - 'P-Caller-UUID: [% spce_test.testuser1003.uuid %]', - 'P-Callee-UUID: [% spce_test.testuser1002.uuid %]', - 'P-Asserted-Identity: ', - 'P-Called-Party-ID: ', - 'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no', - 'P-App-Name: sbc', - 'P-NGCP-Caller-Info: ;ip=127.126.0.3;port=\d+;primary=43110021003', - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=4311002', - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060', + '^ACK sip:127.0.0.1:5085;prxroute=1 SIP/2.0', + 'From: ;tag=', + 'To: ;tag=', + 'Call-Info: ;appearance-index=1', + 'CSeq: 2 ACK', + 'Contact: sip:testuser1003@127.126.0.3:\d+', + 'Max-Forwards: 68', + 'Content-Length: 0', ] diff --git a/scenarios_pbx/incoming_shared_line/0033_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0021_test.yml.tt2 similarity index 100% rename from scenarios_pbx/incoming_shared_line/0033_test.yml.tt2 rename to scenarios_pbx/incoming_shared_line/0021_test.yml.tt2 diff --git a/scenarios_pbx/incoming_shared_line/0022_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0022_test.yml.tt2 index 90a8b632..99ee6fba 100644 --- a/scenarios_pbx/incoming_shared_line/0022_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0022_test.yml.tt2 @@ -1,32 +1,51 @@ 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|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|REPLY_ROUTE_NAT_CONTINUE: + - 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 180 Ringing' - - 'From: ;tag=' + - '^BYE sip:127.0.0.1:5080;transport=udp SIP/2.0' + - 'From: ;tag=' - 'To: ;tag=' - - 'CSeq: \d+ INVITE' - - 'Call-Info: ;appearance-index=1' - - 'Contact: ' + - 'CSeq: \d+ BYE' + - 'Max-Forwards: 70' - 'Content-Length: 0' sip_out: - [ - '^SIP/2.0 180 Ringing', + '^SIP/2.0 100 Trying', 'From: ;tag=', 'To: ;tag=', - 'CSeq: \d+ INVITE', - 'Call-Info: ;appearance-index=1', - 'Contact: ', + 'CSeq: \d+ BYE', + 'Content-Length: 0', + ] + - [ + '^BYE sip:127.0.0.1:5080;transport=udp SIP/2.0', + 'From: ;tag=', + 'To: ;tag=', + 'CSeq: \d+ BYE', + 'Max-Forwards: 69', 'Content-Length: 0', ] diff --git a/scenarios_pbx/incoming_shared_line/0023_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0023_test.yml.tt2 index f59336d1..f2fc90d7 100644 --- a/scenarios_pbx/incoming_shared_line/0023_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0023_test.yml.tt2 @@ -13,20 +13,16 @@ flow: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: sip_in: - - '^SIP/2.0 180 Ringing' + - '^SIP/2.0 200 OK' - 'From: ;tag=' - 'To: ;tag=' - - 'CSeq: \d+ INVITE' - - 'Call-Info: ;appearance-index=1' - - 'Contact: ' + - 'CSeq: \d+ BYE' - 'Content-Length: 0' sip_out: - [ - '^SIP/2.0 180 Ringing', + '^SIP/2.0 200 OK', 'From: ;tag=', 'To: ;tag=', - 'CSeq: \d+ INVITE', - 'Call-Info: ;appearance-index=1', - 'Contact: ', + 'CSeq: \d+ BYE', 'Content-Length: 0', ] diff --git a/scenarios_pbx/incoming_shared_line/0024_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0024_test.yml.tt2 index 8a36d27e..8776fb40 100644 --- a/scenarios_pbx/incoming_shared_line/0024_test.yml.tt2 +++ b/scenarios_pbx/incoming_shared_line/0024_test.yml.tt2 @@ -15,23 +15,17 @@ flow: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: sip_in: - - '^SIP/2.0 180 Ringing' + - '^SIP/2.0 200 OK' - 'From: ;tag=' - 'To: ;tag=' - - 'CSeq: 2 INVITE' - - 'Allow: INVITE, PRACK, ACK, BYE, CANCEL, OPTIONS, NOTIFY, REGISTER, SUBSCRIBE, REFER, PUBLISH, UPDATE, MESSAGE' - - 'Call-Info: ;appearance-index=1' - - 'Contact: ' + - 'CSeq: 3 BYE' - 'Content-Length: 0' sip_out: - [ - '^SIP/2.0 180 Ringing', + '^SIP/2.0 200 OK', 'From: ;tag=', 'To: ;tag=', - 'CSeq: 2 INVITE', - 'Allow: INVITE, PRACK, ACK, BYE, CANCEL, OPTIONS, NOTIFY, REGISTER, SUBSCRIBE, REFER, PUBLISH, UPDATE, MESSAGE', - 'Contact: ', + 'CSeq: 3 BYE', 'Content-Length: 0', - 'P-COLP-Identity: \"1002\" ', 'P-Out-Socket: udp:127.0.0.1:5060', ] diff --git a/scenarios_pbx/incoming_shared_line/0029_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0029_test.yml.tt2 deleted file mode 100644 index 44428871..00000000 --- a/scenarios_pbx/incoming_shared_line/0029_test.yml.tt2 +++ /dev/null @@ -1,75 +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: - - return|ROUTE_CHECK_TEL_URI: - - start|ROUTE_PRX_REQUEST: - - start|ROUTE_INITVARS: - - return|ROUTE_INITVARS: - - start|ROUTE_SCA_UPDATE: - - return|ROUTE_SCA_UPDATE: - - 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|ROUTE_EXIT: - - start|ROUTE_RUNTIME: - - return|ROUTE_RUNTIME: - - exit|ROUTE_EXIT: -sip_in: - - '^ACK sip:127.0.0.1:5085;prxroute=1 SIP/2.0' - - 'From: ;tag=' - - 'To: ;tag=' - - 'Call-Info: ;appearance-index=1' - - 'CSeq: 2 ACK' - - 'Contact: sip:testuser1003@127.126.0.3:\d+' - - 'Content-Length: 0' - - 'P-NGCP-Src-Ip: 127.126.0.3' - - 'P-NGCP-Src-Port: \d+' - - 'P-NGCP-Src-Proto: udp' - - 'P-NGCP-Src-Af: 4' - - 'P-Sock-Info: udp:127.0.0.1:5060' -sip_out: - - [ - '^NOTIFY sip:testuser1002@127.1.0.2:\d+ SIP/2.0', - 'To: ;tag=', - 'From: ;tag=', - 'CSeq: 2 NOTIFY', - 'Max-Forwards: 70', - 'Content-Length: 0', - 'Contact: sip:127.0.0.1:5062', - 'Call-Info: ;appearance-index=1;appearance-state=active;appearance-uri=\"\",;appearance-index=\*;appearance-state=idle', - 'Event: call-info', - 'Subscription-State: active;expires=\d+', - ] - - [ - '^NOTIFY sip:testuser1002@127.1.0.1:\d+ SIP/2.0', - 'To: ;tag=', - 'From: ;tag=', - 'CSeq: 2 NOTIFY', - 'Max-Forwards: 70', - 'Content-Length: 0', - 'Contact: sip:127.0.0.1:5062', - 'Call-Info: ;appearance-index=1;appearance-state=active;appearance-uri=\"\",;appearance-index=\*;appearance-state=idle', - 'Event: call-info', - 'Subscription-State: active;expires=\d+', - ] - - [ - '^ACK sip:127.0.0.1:5085;prxroute=1 SIP/2.0', - 'From: ;tag=', - 'To: ;tag=', - 'Call-Info: ;appearance-index=1', - 'CSeq: 2 ACK', - 'Contact: sip:testuser1003@127.126.0.3:\d+', - 'Max-Forwards: 68', - 'Content-Length: 0', - ] diff --git a/scenarios_pbx/incoming_shared_line/0036_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0036_test.yml.tt2 deleted file mode 100644 index 99ee6fba..00000000 --- a/scenarios_pbx/incoming_shared_line/0036_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: - - 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=' - - 'To: ;tag=' - - 'CSeq: \d+ BYE' - - 'Max-Forwards: 70' - - 'Content-Length: 0' -sip_out: - - [ - '^SIP/2.0 100 Trying', - 'From: ;tag=', - 'To: ;tag=', - 'CSeq: \d+ BYE', - 'Content-Length: 0', - ] - - [ - '^BYE sip:127.0.0.1:5080;transport=udp SIP/2.0', - 'From: ;tag=', - 'To: ;tag=', - 'CSeq: \d+ BYE', - 'Max-Forwards: 69', - 'Content-Length: 0', - ] diff --git a/scenarios_pbx/incoming_shared_line/0038_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0038_test.yml.tt2 deleted file mode 100644 index 8776fb40..00000000 --- a/scenarios_pbx/incoming_shared_line/0038_test.yml.tt2 +++ /dev/null @@ -1,31 +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|REPLY_SCA_UPDATE: - - return|REPLY_SCA_UPDATE: - - 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=' - - 'To: ;tag=' - - 'CSeq: 3 BYE' - - 'Content-Length: 0' -sip_out: - - [ - '^SIP/2.0 200 OK', - 'From: ;tag=', - 'To: ;tag=', - 'CSeq: 3 BYE', - 'Content-Length: 0', - 'P-Out-Socket: udp:127.0.0.1:5060', - ] diff --git a/scenarios_pbx/incoming_shared_line/sipp_scenario00.xml b/scenarios_pbx/incoming_shared_line/sipp_scenario00.xml index 00136819..5ee799ca 100644 --- a/scenarios_pbx/incoming_shared_line/sipp_scenario00.xml +++ b/scenarios_pbx/incoming_shared_line/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: NGCP%[field4 file="callee.csv" line=0]%///[call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]_opt%///[call_id] CSeq: 1 OPTIONS Contact: Content-Length: [len] diff --git a/scenarios_pbx/incoming_shared_line/sipp_scenario01.xml b/scenarios_pbx/incoming_shared_line/sipp_scenario01.xml index fad679f6..b832dc4f 100644 --- a/scenarios_pbx/incoming_shared_line/sipp_scenario01.xml +++ b/scenarios_pbx/incoming_shared_line/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: - Call-ID: NGCP%[field4 file="callee.csv" line=1]%///[call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=1]_opt%///[call_id] CSeq: 1 OPTIONS Contact: Content-Length: [len] diff --git a/scenarios_pbx/incoming_shared_line/sipp_scenario_responder00.xml b/scenarios_pbx/incoming_shared_line/sipp_scenario_responder00.xml index 7d0ed0f8..777fe31e 100644 --- a/scenarios_pbx/incoming_shared_line/sipp_scenario_responder00.xml +++ b/scenarios_pbx/incoming_shared_line/sipp_scenario_responder00.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: NGCP%[field4 file="callee.csv" line=0]%///[call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]_sub%///[call_id] CSeq: 1 SUBSCRIBE Contact: Allow: INVITE,ACK,CANCEL,BYE,PRACK,INFO,UPDATE,OPTIONS,MESSAGE,NOTIFY,REFER @@ -29,12 +29,12 @@ Content-Length: 0 @@ -49,7 +49,7 @@ From: ;tag=[pid]SIPpTag00[call_number] To: [field1 file="caller.csv" line=0] - Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]_sub%///[call_id] CSeq: 2 SUBSCRIBE Contact: Allow: INVITE,ACK,CANCEL,BYE,PRACK,INFO,UPDATE,OPTIONS,MESSAGE,NOTIFY,REFER @@ -123,7 +123,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]_sub%///[call_id] CSeq: 1 SUBSCRIBE Contact: Allow: INVITE,ACK,CANCEL,BYE,PRACK,INFO,UPDATE,OPTIONS,MESSAGE,NOTIFY,REFER @@ -143,7 +143,7 @@ ;tag=[pid]SIPpTag00[call_number] To: [field1 file="caller.csv" line=0] - Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]_sub%///[call_id] CSeq: 2 SUBSCRIBE Contact: Allow: INVITE,ACK,CANCEL,BYE,PRACK,INFO,UPDATE,OPTIONS,MESSAGE,NOTIFY,REFER diff --git a/scenarios_pbx/incoming_shared_line/sipp_scenario_responder01.xml b/scenarios_pbx/incoming_shared_line/sipp_scenario_responder01.xml index 8f76da2f..32dcfd8d 100644 --- a/scenarios_pbx/incoming_shared_line/sipp_scenario_responder01.xml +++ b/scenarios_pbx/incoming_shared_line/sipp_scenario_responder01.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: NGCP%[field4 file="callee.csv" line=1]%///[call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=1]_sub%///[call_id] CSeq: 1 SUBSCRIBE Contact: Allow: INVITE,ACK,CANCEL,BYE,PRACK,INFO,UPDATE,OPTIONS,MESSAGE,NOTIFY,REFER @@ -29,15 +29,15 @@ - Max-Forwards: 70 - Content-Length: [len] + [last_CSeq:] + Contact: + Content-Length: 0 + ]]> @@ -50,7 +50,7 @@ From: ;tag=[pid]SIPpTag00[call_number] To: [field1 file="caller.csv" line=1] - Call-ID: NGCP%[field4 file="callee.csv" line=1]%///[call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=1]_sub%///[call_id] CSeq: 2 SUBSCRIBE Contact: Allow: INVITE,ACK,CANCEL,BYE,PRACK,INFO,UPDATE,OPTIONS,MESSAGE,NOTIFY,REFER @@ -124,7 +124,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - Call-ID: NGCP%[field4 file="callee.csv" line=1]%///[call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=1]_sub%///[call_id] CSeq: 1 SUBSCRIBE Contact: Allow: INVITE,ACK,CANCEL,BYE,PRACK,INFO,UPDATE,OPTIONS,MESSAGE,NOTIFY,REFER @@ -144,7 +144,7 @@ ;tag=[pid]SIPpTag00[call_number] To: [field1 file="caller.csv" line=1] - Call-ID: NGCP%[field4 file="callee.csv" line=1]%///[call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=1]_sub%///[call_id] CSeq: 2 SUBSCRIBE Contact: Allow: INVITE,ACK,CANCEL,BYE,PRACK,INFO,UPDATE,OPTIONS,MESSAGE,NOTIFY,REFER diff --git a/scenarios_pbx/invite/0010_test.yml.tt2 b/scenarios_pbx/invite/0010_test.yml.tt2 index 5c7545d7..17cf938b 100644 --- a/scenarios_pbx/invite/0010_test.yml.tt2 +++ b/scenarios_pbx/invite/0010_test.yml.tt2 @@ -1,31 +1,32 @@ flow: - start|DEFAULT_ONREPLY: - start|REPLY_ROUTE_NAT: - $avp(lua_dlg_profile): [ - "totalaccountout:[% customerpbx_test.id %]", - "totaluserout:[% spce_test.testuser1002.uuid %]", - "totalaccount:[% customerpbx_test.id %]", - "totaluser:[% spce_test.testuser1002.uuid %]", - "totalaccount:[% customerpbx_test.id %]", - "totaluser:[% spce_test.testuser1003.uuid %]", - "total" - ] - start|ROUTE_ENTRY: - return|ROUTE_ENTRY: - - start|REPLY_SCA_UPDATE: - - return|REPLY_SCA_UPDATE: + - start|ROUTE_APPLY_HEADER_RULES: + - return|ROUTE_APPLY_HEADER_RULES: - start|ROUTE_PREPARE_UA: - return|ROUTE_PREPARE_UA: + - start|REPLY_ROUTE_RTPENGINE: + - return|REPLY_ROUTE_RTPENGINE: - start|REPLY_ROUTE_NAT_CONTINUE: - start|ROUTE_EXIT: - start|ROUTE_RUNTIME: - return|ROUTE_RUNTIME: - - exit|ROUTE_EXIT: + - start|dialog:start: + - return|dialog:start: + $avp(lua_dlg_profile): [ + "local", + "total" + ] + - return|dialog:start: sip_in: - - '^SIP/2.0 180 Ringing' - - 'CSeq: 2 INVITE' + - '^SIP/2.0 200 OK' + - 'CSeq: \d+ INVITE' sip_out: - [ - '^SIP/2.0 180 Ringing', - 'CSeq: 2 INVITE', + '^SIP/2.0 200 OK', + 'CSeq: \d+ INVITE', + 'From: ;tag=' - - 'To: ' - - 'CSeq: 1 SUBSCRIBE' - - 'Contact: ' - - 'Expires: 10' - - 'Event: call-info' - - 'Content-Length:\s+0' -sip_out: - - [ - '^SIP/2.0 100 Trying', - 'CSeq: 1 SUBSCRIBE' - ] - - [ - '^SIP/2.0 407 Proxy Authentication Required', - 'CSeq: 1 SUBSCRIBE' - ] diff --git a/scenarios_pbx/invite_shared_line/0002_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0002_test.yml.tt2 deleted file mode 100644 index 13ce2d5b..00000000 --- a/scenarios_pbx/invite_shared_line/0002_test.yml.tt2 +++ /dev/null @@ -1,57 +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: - - return|ROUTE_CHECK_TEL_URI: - - start|ROUTE_IMP_REQUEST: - - start|ROUTE_IMP_WITHINDLG: - - return|ROUTE_IMP_WITHINDLG: - - start|ROUTE_AUTH: - - start|ROUTE_AUTH_HELPER: - - return|ROUTE_AUTH_HELPER: - - start|ROUTE_ADD_CALLINFO_REPLY: - - return|ROUTE_ADD_CALLINFO_REPLY: - - return|ROUTE_AUTH: - - start|ROUTE_IMP_PRESENCE: - - start|ROUTE_EXIT: - - start|ROUTE_RUNTIME: - - return|ROUTE_RUNTIME: - - exit|ROUTE_EXIT: -sip_in: - - '^SUBSCRIBE sip:testuser1002@spce.test SIP/2.0' - - 'From: ;tag=' - - 'To: ' - - 'CSeq: 2 SUBSCRIBE' - - 'Contact: ' - - 'Expires: 10' - - 'Event: call-info' - - 'Content-Length:\s+0' -sip_out: - - [ - '^SIP/2.0 100 Trying', - 'CSeq: 2 SUBSCRIBE' - ] - - [ - '^SIP/2.0 202 Accepted', - 'P-NGCP-Authorized: 1', - 'Event: call-info', - 'Contact: sip:127.0.0.1:5062', - 'Allow-Events: call-info, line-seize', - 'Expires: 10', - 'Content-Length: 0' - ] - - [ - '^NOTIFY sip:testuser1002@127.1.0.1:\d+ SIP/2.0', - 'To: ;tag=', - 'From: ;tag=', - 'CSeq: 1 NOTIFY', - 'Max-Forwards: 70', - 'Content-Length:\s+0', - 'Contact: sip:127.0.0.1:5062', - 'Call-Info: ;appearance-index=\*;appearance-state=idle', - 'Event: call-info', - 'Subscription-State: active' - ] diff --git a/scenarios_pbx/invite_shared_line/0003_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0003_test.yml.tt2 new file mode 100644 index 00000000..ff72f6a6 --- /dev/null +++ b/scenarios_pbx/invite_shared_line/0003_test.yml.tt2 @@ -0,0 +1,41 @@ +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_AUTH: + - start|ROUTE_EXIT: + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT: +sip_in: + - '^INVITE sip:1003@spce.test SIP/2.0' + - 'From: ;tag=' + - 'To: ' + - 'Call-Info: ;appearance-index=1' + - 'CSeq: 1 INVITE' + - 'Contact: sip:testuser1002@127.126.0.1:\d+' + - 'Content-Type: application/sdp' + - 'Content-Length:\s+\d+' +sip_out: + - [ + '^SIP/2.0 100 Trying', + 'From: ;tag=', + 'To: ', + 'CSeq: 1 INVITE', + ] + - [ + '^SIP/2.0 407 Proxy Authentication Required' + ] diff --git a/scenarios_pbx/incoming_shared_line/0017_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0005_test.yml.tt2 similarity index 65% rename from scenarios_pbx/incoming_shared_line/0017_test.yml.tt2 rename to scenarios_pbx/invite_shared_line/0005_test.yml.tt2 index 6f505b3d..56ddca32 100644 --- a/scenarios_pbx/incoming_shared_line/0017_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0005_test.yml.tt2 @@ -60,6 +60,11 @@ flow: - start|ROUTE_CNT_DLG_CHECK: - return|ROUTE_CNT_DLG_CHECK: - return|ROUTE_SET_CALLEE_DIALOG: + $avp(lua_dlg_profile): [ + "totalaccount:[% customerpbx_test.id %]", + "totaluser:[% spce_test.testuser1003.uuid %]", + "total" + ] - start|ROUTE_BLOCK_IN: - return|ROUTE_BLOCK_IN: - start|ROUTE_ORDER_CF_MAP_ID: @@ -85,6 +90,15 @@ flow: - start|ROUTE_CNT_DLG_CHECK: - return|ROUTE_CNT_DLG_CHECK: - return|ROUTE_SET_CALLER_DIALOG: + $avp(lua_dlg_profile): [ + "totalaccountout:[% customerpbx_test.id %]", + "totaluserout:[% spce_test.testuser1002.uuid %]", + "totalaccount:[% customerpbx_test.id %]", + "totaluser:[% spce_test.testuser1002.uuid %]", + "totalaccount:[% customerpbx_test.id %]", + "totaluser:[% spce_test.testuser1003.uuid %]", + "total" + ] - start|ROUTE_ACC_CALLER: - return|ROUTE_ACC_CALLER: - start|ROUTE_ACC_CALLEE: @@ -117,21 +131,27 @@ flow: - exit|DEFAULT_SEND: - exit|DEFAULT_SEND: - start|ROUTE_EXIT: + $avp(lua_dlg_profile): [ + "totalaccountout:[% customerpbx_test.id %]", + "totaluserout:[% spce_test.testuser1002.uuid %]", + "totalaccount:[% customerpbx_test.id %]", + "totaluser:[% spce_test.testuser1002.uuid %]", + "totalaccount:[% customerpbx_test.id %]", + "totaluser:[% spce_test.testuser1003.uuid %]", + "total" + ] - start|ROUTE_RUNTIME: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: sip_in: - - '^INVITE sip:1002@spce.test SIP/2.0' - - 'From: ;tag=' - - 'To: ' - - 'Call-Info: ;appearance-index=1' + - '^INVITE sip:1003@spce.test SIP/2.0' + - 'From: ;tag=' + - 'To: ' - 'CSeq: 2 INVITE' - - 'Contact: sip:testuser1003@127.126.0.3:\d+' - - 'Max-Forwards: 69' - - 'Proxy-Authorization: Digest' + - 'Contact: sip:testuser1002@127.126.0.1:\d+' - 'Content-Type: application/sdp' - 'Content-Length:\s+\d+' - - 'P-NGCP-Src-Ip: 127.126.0.3' + - 'P-NGCP-Src-Ip: 127.126.0.1' - 'P-NGCP-Src-Port: \d+' - 'P-NGCP-Src-Proto: udp' - 'P-NGCP-Src-Af: 4' @@ -139,59 +159,68 @@ sip_in: sip_out: - [ '^SIP/2.0 100 Trying', - 'From: ;tag=', - 'To: ', + 'From: ;tag=', + 'To: ', 'CSeq: 2 INVITE', 'P-Out-Socket: udp:127.0.0.1:5060', - 'P-NGCP-Auth-IP: 127.126.0.3', + 'P-NGCP-Auth-IP: 127.126.0.1', 'P-NGCP-Auth-UA: ', - 'Content-Length: 0', + 'Content-Length: 0' ] - [ '^SIP/2.0 101 Connecting', - 'From: ;tag=', - 'To: ', + 'From: ;tag=', + 'To: ', 'CSeq: 2 INVITE', 'P-Out-Socket: udp:127.0.0.1:5060', - 'P-NGCP-Auth-IP: 127.126.0.3', + 'P-NGCP-Auth-IP: 127.126.0.1', 'P-NGCP-Auth-UA: ', - 'P-NGCP-Authorization: testuser1003@spce.test', + 'P-NGCP-Authorization: testuser1002@spce.test', 'P-NGCP-Authorized: 1', - 'P-NGCP-Caller-Info: ;ip=127.126.0.3;port=\d+;primary=43110021003', - 'P-Caller-UUID: [% spce_test.testuser1003.uuid %]', + 'P-NGCP-Caller-Info: ;ip=127.126.0.1;port=\d+;primary=4311002', + 'P-Caller-UUID: [% spce_test.testuser1002.uuid %]', + 'Content-Length: 0' + ] + - [ + '^NOTIFY sip:testuser1002@127.1.0.1:\d+ SIP/2.0', + 'To: ;tag=', + 'From: ;tag=', + 'CSeq: 3 NOTIFY', 'Content-Length: 0', + 'Contact: sip:127.0.0.1:5062', + 'Call-Info: ;appearance-index=1;appearance-state=seized,;appearance-index=\*;appearance-state=idle', + 'Event: call-info', + 'Subscription-State: active;expires=\d+' ] - [ - '^INVITE sip:testuser1002@spce.test SIP/2.0', - 'From: ;tag=', - 'To: ', + '^INVITE sip:testuser1003@spce.test SIP/2.0', + 'From: ;tag=', + 'To: ', 'CSeq: 2 INVITE', - 'Contact: sip:testuser1003@127.126.0.3:\d+', - 'Max-Forwards: 68', + 'Contact: sip:testuser1002@127.126.0.1:\d+', 'Content-Type: application/sdp', - 'Content-Length:\s+\d+', - 'P-NGCP-Src-Ip: 127.126.0.3', + 'P-NGCP-Src-Ip: 127.126.0.1', 'P-NGCP-Src-Port: \d+', 'P-NGCP-Src-Proto: udp', 'P-NGCP-Src-Af: 4', 'P-NGCP-Src-Nat: 0', 'P-Caller-CLIR: 0', - 'P-NGCP-Orig-User: 4311002', + 'P-NGCP-Orig-User: 43110021003', 'P-NGCP-Orig-Domain: spce.test', - 'P-NGCP-Orig-Dialed: 1002', - 'P-NGCP-Orig-PBX-Ext: 1002', + 'P-NGCP-Orig-Dialed: 1003', + 'P-NGCP-Orig-PBX-Ext: 1003', 'P-First-Caller-Cloud-PBX: \d+', 'P-NGCP-Lookup-Type: ext', 'P-NGCP-BlockOut-Override: 0', 'P-NGCP-AdmBlockOut-Override: 0', 'P-NGCP-ContBlockOut-Override: 0', 'P-NGCP-ContAdmBlockOut-Override: 0', - 'P-Caller-UUID: [% spce_test.testuser1003.uuid %]', - 'P-Callee-UUID: [% spce_test.testuser1002.uuid %]', + 'P-Caller-UUID: [% spce_test.testuser1002.uuid %]', + 'P-Callee-UUID: [% spce_test.testuser1003.uuid %]', 'P-App-Name: sbc', 'P-App-Param: ;a_park_domain=\d+;b_park_domain=\d+', 'P-NGCP-Acc-Src-Leg: \w+', 'P-NGCP-Acc-Dst-Leg: \w+', - 'P-NGCP-Caller-Info: ;ip=127.126.0.3;port=\d+;primary=43110021003', - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5085;primary=4311002', + 'P-NGCP-Caller-Info: ;ip=127.126.0.1;port=\d+;primary=4311002', + 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5085;primary=43110021003', ] diff --git a/scenarios_pbx/invite_shared_line/0007_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0007_test.yml.tt2 new file mode 100644 index 00000000..ae0c29b4 --- /dev/null +++ b/scenarios_pbx/invite_shared_line/0007_test.yml.tt2 @@ -0,0 +1,199 @@ +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_RESTORE_EVENTMON_HEADERS: + - return|ROUTE_RESTORE_EVENTMON_HEADERS: + - start|ROUTE_CNT_DLG_CHECK: + - start|ROUTE_DLG_MANAGE: + - return|ROUTE_DLG_MANAGE: + - return|ROUTE_CNT_DLG_CHECK: + - 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: + - start|ROUTE_DLG_MANAGE: + - return|ROUTE_DLG_MANAGE: + - return|ROUTE_LOAD_CALLER_PREF: + - start|ROUTE_DLG_MANAGE: + - return|ROUTE_DLG_MANAGE: + - start|ROUTE_APPLY_HEADER_RULES: + - return|ROUTE_APPLY_HEADER_RULES: + - start|ROUTE_GET_CALLER_CLI: + - return|ROUTE_GET_CALLER_CLI: + - 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_FIND_CALLEE: + - 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: + - return|ROUTE_SET_CALLEE_DIALOG: + $avp(lua_dlg_profile): [ + "total" + ] + - start|ROUTE_BLOCK_IN: + - return|ROUTE_BLOCK_IN: + - start|ROUTE_ORDER_CF_MAP_ID: + - return|ROUTE_ORDER_CF_MAP_ID: + - return|ROUTE_LOAD_CALLEE_PREF: + - 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_OUTBOUND: + $avp(lua_dlg_profile): [ + "local", + "total" + ] + - start|ROUTE_SET_CALLER_DIALOG: + - start|ROUTE_CNT_DLG_CHECK: + - return|ROUTE_CNT_DLG_CHECK: + - return|ROUTE_SET_CALLER_DIALOG: + - 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: + - 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: + - 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: + - 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: + $avp(lua_dlg_profile): [ + "local", + "total" + ] + - start|ROUTE_RUNTIME: + - return|ROUTE_RUNTIME: + - exit|ROUTE_EXIT: +sip_in: + - '^INVITE sip:testuser1003@spce.test SIP/2.0' + - 'From: ;tag=' + - 'To: ' + - 'P-NGCP-Src-Ip: 127.126.0.1' + - 'P-NGCP-Src-Port: \d+' + - 'P-NGCP-Src-Proto: udp' + - 'P-NGCP-Src-Af: 4' + - 'P-NGCP-Src-Nat: 0' + - 'P-Caller-CLIR: 0' + - 'P-NGCP-Orig-User: 43110021003' + - 'P-NGCP-Orig-Domain: spce.test' + - 'P-NGCP-Orig-Dialed: 1003' + - 'P-NGCP-Orig-PBX-Ext: 1003' + - 'P-First-Caller-Cloud-PBX: \d+' + - 'P-NGCP-Lookup-Type: ext' + - 'P-NGCP-BlockOut-Override: 0' + - 'P-NGCP-AdmBlockOut-Override: 0' + - 'P-NGCP-ContBlockOut-Override: 0' + - 'P-NGCP-ContAdmBlockOut-Override: 0' + - 'P-Caller-UUID: [% spce_test.testuser1002.uuid %]' + - 'P-Callee-UUID: [% spce_test.testuser1003.uuid %]' + - 'P-NGCP-Acc-Src-Leg: \w+' + - 'P-NGCP-Acc-Dst-Leg: \w+' + - 'P-NGCP-Caller-Info: ;ip=127.126.0.1;port=\d+;primary=4311002' + - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5085;primary=43110021003' + - 'P-To-Device: 1' + - 'Content-Type: application/sdp' + - 'Contact: ' +sip_out: + - [ + '^SIP/2.0 100 Trying', + 'From: ;tag=', + 'To: ', + 'CSeq: \d+ INVITE' + ] + - [ + '^INVITE sip:testuser1003@127.1.0.3:\d+ SIP/2.0', + 'From: ;tag=', + 'To: ', + 'P-NGCP-Orig-PBX-Ext: 1003', + 'P-NGCP-Acc-Src-Leg: \w+', + 'P-NGCP-Acc-Dst-Leg: \w+', + 'Content-Type: application/sdp', + 'Contact: ', + 'P-Caller-UUID: [% spce_test.testuser1002.uuid %]', + 'P-Callee-UUID: [% spce_test.testuser1003.uuid %]', + 'P-Asserted-Identity: ', + 'P-Called-Party-ID: ', + 'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no', + 'P-App-Name: sbc', + 'P-NGCP-Caller-Info: ;ip=127.126.0.1;port=51602;primary=4311002', + 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=43110021003', + 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060' + ] diff --git a/scenarios_pbx/invite_shared_line/0008_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0008_test.yml.tt2 deleted file mode 100644 index 76365aca..00000000 --- a/scenarios_pbx/invite_shared_line/0008_test.yml.tt2 +++ /dev/null @@ -1,44 +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: - - return|ROUTE_CHECK_TEL_URI: - - start|ROUTE_IMP_REQUEST: - - start|ROUTE_IMP_WITHINDLG: - - return|ROUTE_IMP_WITHINDLG: - - start|ROUTE_AUTH: - - start|ROUTE_EXIT: - - start|ROUTE_RUNTIME: - - return|ROUTE_RUNTIME: - - exit|ROUTE_EXIT: -sip_in: - - '^SUBSCRIBE sip:testuser1002@spce.test SIP/2.0' - - 'From: ;tag=' - - 'To: ' - - 'CSeq: 30 SUBSCRIBE' - - 'Contact: ' - - 'Expires: 20' - - 'Event: line-seize' - - 'Content-Length:\s+0' - - 'P-NGCP-Src-Ip: 127.1.0.2' - - 'P-NGCP-Src-Port: \d+' - - 'P-NGCP-Src-Proto: udp' - - 'P-NGCP-Src-Af: 4' - - 'P-Sock-Info: udp:127.0.0.1:5060' -sip_out: - - [ - '^SIP/2.0 100 Trying', - 'From: ;tag=', - 'To: ', - 'CSeq: 30 SUBSCRIBE', - 'P-Out-Socket: udp:127.0.0.1:5060', - 'P-NGCP-Auth-IP: 127.1.0.2', - 'P-NGCP-Auth-UA: ', - 'Content-Length: 0' - ] - - [ - '^SIP/2.0 407 Proxy Authentication Required' - ] diff --git a/scenarios_pbx/invite_shared_line/0009_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0009_test.yml.tt2 index ac6fd3be..bdd54a78 100644 --- a/scenarios_pbx/invite_shared_line/0009_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0009_test.yml.tt2 @@ -1,75 +1,27 @@ 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: - - return|ROUTE_CHECK_TEL_URI: - - start|ROUTE_IMP_REQUEST: - - start|ROUTE_IMP_WITHINDLG: - - return|ROUTE_IMP_WITHINDLG: - - start|ROUTE_AUTH: - - start|ROUTE_AUTH_HELPER: - - return|ROUTE_AUTH_HELPER: - - start|ROUTE_ADD_CALLINFO_REPLY: - - return|ROUTE_ADD_CALLINFO_REPLY: - - return|ROUTE_AUTH: - - start|ROUTE_IMP_PRESENCE: + - 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: - - '^SUBSCRIBE sip:testuser1002@spce.test SIP/2.0' - - 'From: ;tag=' - - 'To: ' - - 'CSeq: 31 SUBSCRIBE' - - 'Contact: ' - - 'Max-Forwards: 69' - - 'Expires: 20' - - 'Event: line-seize' + - '^SIP/2.0 180 Ringing' + - 'Contact: ' - 'Content-Length:\s+0' sip_out: - [ - '^SIP/2.0 100 Trying', + '^SIP/2.0 180 Ringing', 'From: ;tag=', - 'To: ', - 'CSeq: 31 SUBSCRIBE', - ] - - [ - '^SIP/2.0 200 OK', - 'From: ;tag=', - 'To: ;tag=', - 'CSeq: 31 SUBSCRIBE', - 'P-NGCP-Authorization: testuser1002@spce.test', - 'P-NGCP-Authorized: 1', - 'P-Caller-UUID: [% spce_test.testuser1002.uuid %]', - 'Event: line-seize', - 'Contact: sip:127.0.0.1:5062', - 'Allow-Events: call-info, line-seize', - 'Expires: \d+', + 'To: ;tag=', + 'CSeq: \d+ INVITE', + 'Contact: ', 'Content-Length:\s+0' ] - - [ - '^NOTIFY sip:testuser1002@127.1.0.2:\d+ SIP/2.0', - 'From: ;tag=', - 'To: ;tag=', - 'CSeq: 1 NOTIFY', - 'Content-Length:\s+0', - 'Contact: sip:127.0.0.1:5062', - 'Call-Info: ;appearance-index=1', - 'Event: line-seize', - 'Subscription-State: active' - ] - - [ - '^NOTIFY sip:testuser1002@127.1.0.1:\d+ SIP/2.0', - 'From: ;tag=', - 'To: ;tag=', - 'CSeq: 2 NOTIFY', - 'Content-Length:\s+0', - 'Contact: sip:127.0.0.1:5062', - 'Call-Info: ;appearance-index=1;appearance-state=seized,;appearance-index=\*;appearance-state=idle', - 'Event: call-info', - 'Subscription-State: active;expires=\d+' - ] diff --git a/scenarios_pbx/invite_shared_line/0020_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0010_test.yml.tt2 similarity index 100% rename from scenarios_pbx/invite_shared_line/0020_test.yml.tt2 rename to scenarios_pbx/invite_shared_line/0010_test.yml.tt2 diff --git a/scenarios_pbx/invite_shared_line/0023_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0011_test.yml.tt2 similarity index 100% rename from scenarios_pbx/invite_shared_line/0023_test.yml.tt2 rename to scenarios_pbx/invite_shared_line/0011_test.yml.tt2 diff --git a/scenarios_pbx/invite_shared_line/0012_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0012_test.yml.tt2 index ff72f6a6..f73d4589 100644 --- a/scenarios_pbx/invite_shared_line/0012_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0012_test.yml.tt2 @@ -1,41 +1,58 @@ 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: - - 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_AUTH: + - start|ROUTE_APPLY_HEADER_RULES: + - return|ROUTE_APPLY_HEADER_RULES: + - start|REPLY_SCA_UPDATE: + - return|REPLY_SCA_UPDATE: + - start|ROUTE_PREPARE_UA: + - return|ROUTE_PREPARE_UA: + - start|REPLY_ROUTE_RTPENGINE: + - return|REPLY_ROUTE_RTPENGINE: + - start|REPLY_ROUTE_NAT_CONTINUE: - start|ROUTE_EXIT: - start|ROUTE_RUNTIME: - return|ROUTE_RUNTIME: - - exit|ROUTE_EXIT: + - start|dialog:start: + - return|dialog:start: + $avp(lua_dlg_profile): [ + "totalaccountout:[% customerpbx_test.id %]", + "totaluserout:[% spce_test.testuser1002.uuid %]", + "totalaccount:[% customerpbx_test.id %]", + "totaluser:[% spce_test.testuser1002.uuid %]", + "totalaccount:[% customerpbx_test.id %]", + "totaluser:[% spce_test.testuser1003.uuid %]", + "total" + ] + - return|dialog:start: sip_in: - - '^INVITE sip:1003@spce.test SIP/2.0' + - '^SIP/2.0 200 OK' - 'From: ;tag=' - - 'To: ' - - 'Call-Info: ;appearance-index=1' - - 'CSeq: 1 INVITE' - - 'Contact: sip:testuser1002@127.126.0.1:\d+' + - 'To: ;tag=' + - 'CSeq: 2 INVITE' + - 'Contact: ' - 'Content-Type: application/sdp' - - 'Content-Length:\s+\d+' sip_out: - [ - '^SIP/2.0 100 Trying', + '^NOTIFY sip:testuser1002@127.1.0.1:\d+ SIP/2.0', + 'To: ;tag=', 'From: ;tag=', - 'To: ', - 'CSeq: 1 INVITE', + 'CSeq: 5 NOTIFY', + 'Contact: sip:127.0.0.1:5062', + 'Call-Info: ;appearance-index=1;appearance-state=active;appearance-uri=\"\",;appearance-index=\*;appearance-state=idle', + 'Event: call-info', + 'Subscription-State: active;expires=\d+' ] - [ - '^SIP/2.0 407 Proxy Authentication Required' + '^SIP/2.0 200 OK', + 'From: ;tag=', + 'To: ;tag=', + 'CSeq: 2 INVITE', + 'Contact: ', + 'Content-Type: application/sdp', + 'P-COLP-Identity: \"1003\" ', + 'P-Asserted-Identity: ', + 'P-Out-Socket: udp:127.0.0.1:5060' ] diff --git a/scenarios_pbx/invite_shared_line/0026_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0013_test.yml.tt2 similarity index 100% rename from scenarios_pbx/invite_shared_line/0026_test.yml.tt2 rename to scenarios_pbx/invite_shared_line/0013_test.yml.tt2 diff --git a/scenarios_pbx/invite_shared_line/0014_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0014_test.yml.tt2 index 56ddca32..843f9c8a 100644 --- a/scenarios_pbx/invite_shared_line/0014_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0014_test.yml.tt2 @@ -9,218 +9,34 @@ flow: - 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_AUTH: - - start|ROUTE_AUTH_HELPER: - - return|ROUTE_AUTH_HELPER: - - start|ROUTE_ADD_CALLINFO_REPLY: - - start|ROUTE_ADD_CALLINFO_CALLER_PRIMARY: - - return|ROUTE_ADD_CALLINFO_CALLER_PRIMARY: - - return|ROUTE_ADD_CALLINFO_REPLY: - - return|ROUTE_AUTH: - - 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: - - start|ROUTE_DLG_MANAGE: - - return|ROUTE_DLG_MANAGE: - - return|ROUTE_LOAD_CALLER_PREF: - - start|ROUTE_DLG_MANAGE: - - return|ROUTE_DLG_MANAGE: - - start|ROUTE_APPLY_HEADER_RULES: - - return|ROUTE_APPLY_HEADER_RULES: - - start|ROUTE_GET_CALLER_CLI: - - return|ROUTE_GET_CALLER_CLI: - - 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_FIND_CALLEE: - - 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: - - return|ROUTE_SET_CALLEE_DIALOG: - $avp(lua_dlg_profile): [ - "totalaccount:[% customerpbx_test.id %]", - "totaluser:[% spce_test.testuser1003.uuid %]", - "total" - ] - - start|ROUTE_BLOCK_IN: - - return|ROUTE_BLOCK_IN: - - start|ROUTE_ORDER_CF_MAP_ID: - - return|ROUTE_ORDER_CF_MAP_ID: - - 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: - - return|ROUTE_NCOS_CHECK: - - start|ROUTE_CHECK_PBX: - - start|ROUTE_APPEND_PBX_HDRS: - - start|ROUTE_ADD_EVENTMON_HEADERS: - - return|ROUTE_ADD_EVENTMON_HEADERS: - - return|ROUTE_APPEND_PBX_HDRS: - - start|ROUTE_OUTBOUND: - - start|ROUTE_SET_CALLER_DIALOG: - - start|ROUTE_CNT_DLG_CHECK: - - return|ROUTE_CNT_DLG_CHECK: - - return|ROUTE_SET_CALLER_DIALOG: - $avp(lua_dlg_profile): [ - "totalaccountout:[% customerpbx_test.id %]", - "totaluserout:[% spce_test.testuser1002.uuid %]", - "totalaccount:[% customerpbx_test.id %]", - "totaluser:[% spce_test.testuser1002.uuid %]", - "totalaccount:[% customerpbx_test.id %]", - "totaluser:[% spce_test.testuser1003.uuid %]", - "total" - ] - - start|ROUTE_ACC_CALLER: - - return|ROUTE_ACC_CALLER: - - start|ROUTE_ACC_CALLEE: - - return|ROUTE_ACC_CALLEE: - - start|ROUTE_SCA_UPDATE: - - return|ROUTE_SCA_UPDATE: - - start|BRANCH_ROUTE_NO_SBC: - - start|ROUTE_BRANCH_ACC_RTP: - - return|ROUTE_BRANCH_ACC_RTP: - - start|ROUTE_SET_BRANCH_HDRS: - start|ROUTE_PREPARE_UA: - return|ROUTE_PREPARE_UA: - - return|ROUTE_SET_BRANCH_HDRS: - - start|ROUTE_FILTER_PRACK: - - return|ROUTE_FILTER_PRACK: - - start|ROUTE_PREPARE_MOH_PBX: - - return|ROUTE_PREPARE_MOH_PBX: - - start|ROUTE_LOAD_PBXSRV: - - return|ROUTE_LOAD_PBXSRV: - - 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_NO_SBC: + - 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: - $avp(lua_dlg_profile): [ - "totalaccountout:[% customerpbx_test.id %]", - "totaluserout:[% spce_test.testuser1002.uuid %]", - "totalaccount:[% customerpbx_test.id %]", - "totaluser:[% spce_test.testuser1002.uuid %]", - "totalaccount:[% customerpbx_test.id %]", - "totaluser:[% spce_test.testuser1003.uuid %]", - "total" - ] - start|ROUTE_RUNTIME: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: sip_in: - - '^INVITE sip:1003@spce.test SIP/2.0' + - '^ACK sip:127.0.0.1:5080;transport=udp SIP/2.0' - 'From: ;tag=' - - 'To: ' - - 'CSeq: 2 INVITE' - - 'Contact: sip:testuser1002@127.126.0.1:\d+' - - 'Content-Type: application/sdp' - - 'Content-Length:\s+\d+' - - 'P-NGCP-Src-Ip: 127.126.0.1' - - 'P-NGCP-Src-Port: \d+' - - 'P-NGCP-Src-Proto: udp' - - 'P-NGCP-Src-Af: 4' - - 'P-Sock-Info: udp:127.0.0.1:5060' + - 'To: ;tag=' + - 'CSeq: \d+ ACK' + - 'Max-Forwards: 70' + - 'Content-Length:\s+0' + - 'Contact: ' sip_out: - [ - '^SIP/2.0 100 Trying', - 'From: ;tag=', - 'To: ', - 'CSeq: 2 INVITE', - 'P-Out-Socket: udp:127.0.0.1:5060', - 'P-NGCP-Auth-IP: 127.126.0.1', - 'P-NGCP-Auth-UA: ', - 'Content-Length: 0' - ] - - [ - '^SIP/2.0 101 Connecting', - 'From: ;tag=', - 'To: ', - 'CSeq: 2 INVITE', - 'P-Out-Socket: udp:127.0.0.1:5060', - 'P-NGCP-Auth-IP: 127.126.0.1', - 'P-NGCP-Auth-UA: ', - 'P-NGCP-Authorization: testuser1002@spce.test', - 'P-NGCP-Authorized: 1', - 'P-NGCP-Caller-Info: ;ip=127.126.0.1;port=\d+;primary=4311002', - 'P-Caller-UUID: [% spce_test.testuser1002.uuid %]', - 'Content-Length: 0' - ] - - [ - '^NOTIFY sip:testuser1002@127.1.0.1:\d+ SIP/2.0', - 'To: ;tag=', - 'From: ;tag=', - 'CSeq: 3 NOTIFY', - 'Content-Length: 0', - 'Contact: sip:127.0.0.1:5062', - 'Call-Info: ;appearance-index=1;appearance-state=seized,;appearance-index=\*;appearance-state=idle', - 'Event: call-info', - 'Subscription-State: active;expires=\d+' - ] - - [ - '^INVITE sip:testuser1003@spce.test SIP/2.0', - 'From: ;tag=', - 'To: ', - 'CSeq: 2 INVITE', - 'Contact: sip:testuser1002@127.126.0.1:\d+', - 'Content-Type: application/sdp', - 'P-NGCP-Src-Ip: 127.126.0.1', - 'P-NGCP-Src-Port: \d+', - 'P-NGCP-Src-Proto: udp', - 'P-NGCP-Src-Af: 4', - 'P-NGCP-Src-Nat: 0', - 'P-Caller-CLIR: 0', - 'P-NGCP-Orig-User: 43110021003', - 'P-NGCP-Orig-Domain: spce.test', - 'P-NGCP-Orig-Dialed: 1003', - 'P-NGCP-Orig-PBX-Ext: 1003', - 'P-First-Caller-Cloud-PBX: \d+', - 'P-NGCP-Lookup-Type: ext', - 'P-NGCP-BlockOut-Override: 0', - 'P-NGCP-AdmBlockOut-Override: 0', - 'P-NGCP-ContBlockOut-Override: 0', - 'P-NGCP-ContAdmBlockOut-Override: 0', - 'P-Caller-UUID: [% spce_test.testuser1002.uuid %]', - 'P-Callee-UUID: [% spce_test.testuser1003.uuid %]', - 'P-App-Name: sbc', - 'P-App-Param: ;a_park_domain=\d+;b_park_domain=\d+', - 'P-NGCP-Acc-Src-Leg: \w+', - 'P-NGCP-Acc-Dst-Leg: \w+', - 'P-NGCP-Caller-Info: ;ip=127.126.0.1;port=\d+;primary=4311002', - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5085;primary=43110021003', + '^ACK sip:127.0.0.1:5080;transport=udp SIP/2.0', + 'From: ;tag=', + 'To: ;tag=', + 'CSeq: \d+ ACK', + 'Content-Length:\s+0', + 'Contact: ' ] diff --git a/scenarios_pbx/invite_shared_line/0028_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0015_test.yml.tt2 similarity index 100% rename from scenarios_pbx/invite_shared_line/0028_test.yml.tt2 rename to scenarios_pbx/invite_shared_line/0015_test.yml.tt2 diff --git a/scenarios_pbx/invite_shared_line/0030_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0016_test.yml.tt2 similarity index 100% rename from scenarios_pbx/invite_shared_line/0030_test.yml.tt2 rename to scenarios_pbx/invite_shared_line/0016_test.yml.tt2 diff --git a/scenarios_pbx/invite_shared_line/0017_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0017_test.yml.tt2 index ae0c29b4..cab3f343 100644 --- a/scenarios_pbx/invite_shared_line/0017_test.yml.tt2 +++ b/scenarios_pbx/invite_shared_line/0017_test.yml.tt2 @@ -1,199 +1,28 @@ 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: - - 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_RESTORE_EVENTMON_HEADERS: - - return|ROUTE_RESTORE_EVENTMON_HEADERS: - - start|ROUTE_CNT_DLG_CHECK: - - start|ROUTE_DLG_MANAGE: - - return|ROUTE_DLG_MANAGE: - - return|ROUTE_CNT_DLG_CHECK: - - 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: - - start|ROUTE_DLG_MANAGE: - - return|ROUTE_DLG_MANAGE: - - return|ROUTE_LOAD_CALLER_PREF: - - start|ROUTE_DLG_MANAGE: - - return|ROUTE_DLG_MANAGE: - start|ROUTE_APPLY_HEADER_RULES: - return|ROUTE_APPLY_HEADER_RULES: - - start|ROUTE_GET_CALLER_CLI: - - return|ROUTE_GET_CALLER_CLI: - - 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_FIND_CALLEE: - - 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: - - return|ROUTE_SET_CALLEE_DIALOG: - $avp(lua_dlg_profile): [ - "total" - ] - - start|ROUTE_BLOCK_IN: - - return|ROUTE_BLOCK_IN: - - start|ROUTE_ORDER_CF_MAP_ID: - - return|ROUTE_ORDER_CF_MAP_ID: - - return|ROUTE_LOAD_CALLEE_PREF: - - 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_OUTBOUND: - $avp(lua_dlg_profile): [ - "local", - "total" - ] - - start|ROUTE_SET_CALLER_DIALOG: - - start|ROUTE_CNT_DLG_CHECK: - - return|ROUTE_CNT_DLG_CHECK: - - return|ROUTE_SET_CALLER_DIALOG: - - 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: - - 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: - - 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: - - 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|REPLY_ROUTE_NAT_CONTINUE: - start|ROUTE_EXIT: - $avp(lua_dlg_profile): [ - "local", - "total" - ] - start|ROUTE_RUNTIME: - return|ROUTE_RUNTIME: - exit|ROUTE_EXIT: sip_in: - - '^INVITE sip:testuser1003@spce.test SIP/2.0' - - 'From: ;tag=' - - 'To: ' - - 'P-NGCP-Src-Ip: 127.126.0.1' - - 'P-NGCP-Src-Port: \d+' - - 'P-NGCP-Src-Proto: udp' - - 'P-NGCP-Src-Af: 4' - - 'P-NGCP-Src-Nat: 0' - - 'P-Caller-CLIR: 0' - - 'P-NGCP-Orig-User: 43110021003' - - 'P-NGCP-Orig-Domain: spce.test' - - 'P-NGCP-Orig-Dialed: 1003' - - 'P-NGCP-Orig-PBX-Ext: 1003' - - 'P-First-Caller-Cloud-PBX: \d+' - - 'P-NGCP-Lookup-Type: ext' - - 'P-NGCP-BlockOut-Override: 0' - - 'P-NGCP-AdmBlockOut-Override: 0' - - 'P-NGCP-ContBlockOut-Override: 0' - - 'P-NGCP-ContAdmBlockOut-Override: 0' - - 'P-Caller-UUID: [% spce_test.testuser1002.uuid %]' - - 'P-Callee-UUID: [% spce_test.testuser1003.uuid %]' - - 'P-NGCP-Acc-Src-Leg: \w+' - - 'P-NGCP-Acc-Dst-Leg: \w+' - - 'P-NGCP-Caller-Info: ;ip=127.126.0.1;port=\d+;primary=4311002' - - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5085;primary=43110021003' - - 'P-To-Device: 1' - - 'Content-Type: application/sdp' - - 'Contact: ' + - '^SIP/2.0 200 OK' + - 'From: ;tag=' + - 'To: ;tag=' + - 'CSeq: \d+ BYE' + - 'Content-Length: 0' sip_out: - [ - '^SIP/2.0 100 Trying', + '^SIP/2.0 200 OK', 'From: ;tag=', - 'To: ', - 'CSeq: \d+ INVITE' - ] - - [ - '^INVITE sip:testuser1003@127.1.0.3:\d+ SIP/2.0', - 'From: ;tag=', - 'To: ', - 'P-NGCP-Orig-PBX-Ext: 1003', - 'P-NGCP-Acc-Src-Leg: \w+', - 'P-NGCP-Acc-Dst-Leg: \w+', - 'Content-Type: application/sdp', - 'Contact: ', - 'P-Caller-UUID: [% spce_test.testuser1002.uuid %]', - 'P-Callee-UUID: [% spce_test.testuser1003.uuid %]', - 'P-Asserted-Identity: ', - 'P-Called-Party-ID: ', - 'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no', - 'P-App-Name: sbc', - 'P-NGCP-Caller-Info: ;ip=127.126.0.1;port=51602;primary=4311002', - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=43110021003', - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060' + 'To: ;tag=', + 'CSeq: \d+ BYE', + 'Content-Length: 0' ] diff --git a/scenarios_pbx/invite_shared_line/0032_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0018_test.yml.tt2 similarity index 100% rename from scenarios_pbx/invite_shared_line/0032_test.yml.tt2 rename to scenarios_pbx/invite_shared_line/0018_test.yml.tt2 diff --git a/scenarios_pbx/invite_shared_line/0019_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0019_test.yml.tt2 deleted file mode 100644 index bdd54a78..00000000 --- a/scenarios_pbx/invite_shared_line/0019_test.yml.tt2 +++ /dev/null @@ -1,27 +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' - - 'Contact: ' - - 'Content-Length:\s+0' -sip_out: - - [ - '^SIP/2.0 180 Ringing', - 'From: ;tag=', - 'To: ;tag=', - 'CSeq: \d+ INVITE', - 'Contact: ', - 'Content-Length:\s+0' - ] diff --git a/scenarios_pbx/invite_shared_line/0024_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0024_test.yml.tt2 deleted file mode 100644 index f73d4589..00000000 --- a/scenarios_pbx/invite_shared_line/0024_test.yml.tt2 +++ /dev/null @@ -1,58 +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|REPLY_SCA_UPDATE: - - return|REPLY_SCA_UPDATE: - - start|ROUTE_PREPARE_UA: - - return|ROUTE_PREPARE_UA: - - 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): [ - "totalaccountout:[% customerpbx_test.id %]", - "totaluserout:[% spce_test.testuser1002.uuid %]", - "totalaccount:[% customerpbx_test.id %]", - "totaluser:[% spce_test.testuser1002.uuid %]", - "totalaccount:[% customerpbx_test.id %]", - "totaluser:[% spce_test.testuser1003.uuid %]", - "total" - ] - - return|dialog:start: -sip_in: - - '^SIP/2.0 200 OK' - - 'From: ;tag=' - - 'To: ;tag=' - - 'CSeq: 2 INVITE' - - 'Contact: ' - - 'Content-Type: application/sdp' -sip_out: - - [ - '^NOTIFY sip:testuser1002@127.1.0.1:\d+ SIP/2.0', - 'To: ;tag=', - 'From: ;tag=', - 'CSeq: 5 NOTIFY', - 'Contact: sip:127.0.0.1:5062', - 'Call-Info: ;appearance-index=1;appearance-state=active;appearance-uri=\"\",;appearance-index=\*;appearance-state=idle', - 'Event: call-info', - 'Subscription-State: active;expires=\d+' - ] - - [ - '^SIP/2.0 200 OK', - 'From: ;tag=', - 'To: ;tag=', - 'CSeq: 2 INVITE', - 'Contact: ', - 'Content-Type: application/sdp', - 'P-COLP-Identity: \"1003\" ', - 'P-Asserted-Identity: ', - 'P-Out-Socket: udp:127.0.0.1:5060' - ] diff --git a/scenarios_pbx/invite_shared_line/0027_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0027_test.yml.tt2 deleted file mode 100644 index 843f9c8a..00000000 --- a/scenarios_pbx/invite_shared_line/0027_test.yml.tt2 +++ /dev/null @@ -1,42 +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: - - return|ROUTE_CHECK_TEL_URI: - - start|ROUTE_PRX_REQUEST: - - start|ROUTE_INITVARS: - - return|ROUTE_INITVARS: - - 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|ROUTE_EXIT: - - start|ROUTE_RUNTIME: - - return|ROUTE_RUNTIME: - - exit|ROUTE_EXIT: -sip_in: - - '^ACK sip:127.0.0.1:5080;transport=udp SIP/2.0' - - 'From: ;tag=' - - 'To: ;tag=' - - 'CSeq: \d+ ACK' - - 'Max-Forwards: 70' - - 'Content-Length:\s+0' - - 'Contact: ' -sip_out: - - [ - '^ACK sip:127.0.0.1:5080;transport=udp SIP/2.0', - 'From: ;tag=', - 'To: ;tag=', - 'CSeq: \d+ ACK', - 'Content-Length:\s+0', - 'Contact: ' - ] diff --git a/scenarios_pbx/invite_shared_line/0031_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0031_test.yml.tt2 deleted file mode 100644 index cab3f343..00000000 --- a/scenarios_pbx/invite_shared_line/0031_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' - - 'From: ;tag=' - - 'To: ;tag=' - - 'CSeq: \d+ BYE' - - 'Content-Length: 0' -sip_out: - - [ - '^SIP/2.0 200 OK', - 'From: ;tag=', - 'To: ;tag=', - 'CSeq: \d+ BYE', - 'Content-Length: 0' - ] diff --git a/scenarios_pbx/invite_shared_line/0033_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0033_test.yml.tt2 deleted file mode 100644 index 04b3c4c5..00000000 --- a/scenarios_pbx/invite_shared_line/0033_test.yml.tt2 +++ /dev/null @@ -1,44 +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: - - return|ROUTE_CHECK_TEL_URI: - - start|ROUTE_IMP_REQUEST: - - start|ROUTE_IMP_WITHINDLG: - - return|ROUTE_IMP_WITHINDLG: - - start|ROUTE_AUTH: - - start|ROUTE_EXIT: - - start|ROUTE_RUNTIME: - - return|ROUTE_RUNTIME: - - exit|ROUTE_EXIT: -sip_in: - - '^SUBSCRIBE sip:testuser1002@spce.test SIP/2.0' - - 'From: ;tag=' - - 'To: ' - - 'CSeq: 1 SUBSCRIBE' - - 'Contact: ' - - 'Expires: 0' - - 'Event: call-info' - - 'Content-Length:\s+0' - - 'P-NGCP-Src-Ip: 127.1.0.1' - - 'P-NGCP-Src-Port: \d+' - - 'P-NGCP-Src-Proto: udp' - - 'P-NGCP-Src-Af: 4' - - 'P-Sock-Info: udp:127.0.0.1:5060' -sip_out: - - [ - '^SIP/2.0 100 Trying', - 'From: ;tag=', - 'To: ', - 'CSeq: 1 SUBSCRIBE', - 'P-Out-Socket: udp:127.0.0.1:5060', - 'P-NGCP-Auth-IP: 127.1.0.1', - 'P-NGCP-Auth-UA: ', - 'Content-Length: 0' - ] - - [ - '^SIP/2.0 407 Proxy Authentication Required' - ] diff --git a/scenarios_pbx/invite_shared_line/0034_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0034_test.yml.tt2 deleted file mode 100644 index 9ecb11d8..00000000 --- a/scenarios_pbx/invite_shared_line/0034_test.yml.tt2 +++ /dev/null @@ -1,75 +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: - - return|ROUTE_CHECK_TEL_URI: - - start|ROUTE_IMP_REQUEST: - - start|ROUTE_IMP_WITHINDLG: - - return|ROUTE_IMP_WITHINDLG: - - start|ROUTE_AUTH: - - start|ROUTE_AUTH_HELPER: - - return|ROUTE_AUTH_HELPER: - - start|ROUTE_ADD_CALLINFO_REPLY: - - return|ROUTE_ADD_CALLINFO_REPLY: - - return|ROUTE_AUTH: - - start|ROUTE_IMP_PRESENCE: - - start|ROUTE_EXIT: - - start|ROUTE_RUNTIME: - - return|ROUTE_RUNTIME: - - exit|ROUTE_EXIT: -sip_in: - - '^SUBSCRIBE sip:testuser1002@spce.test SIP/2.0' - - 'From: ;tag=' - - 'To: ' - - 'CSeq: 2 SUBSCRIBE' - - 'Contact: ' - - 'Expires: 0' - - 'Event: call-info' - - 'Content-Length:\s+0' - - 'P-NGCP-Src-Ip: 127.1.0.1' - - 'P-NGCP-Src-Port: \d+' - - 'P-NGCP-Src-Proto: udp' - - 'P-NGCP-Src-Af: 4' - - 'P-Sock-Info: udp:127.0.0.1:5060' -sip_out: - - [ - '^SIP/2.0 100 Trying', - 'From: ;tag=', - 'To: ', - 'CSeq: 2 SUBSCRIBE', - 'P-Out-Socket: udp:127.0.0.1:5060', - 'P-NGCP-Auth-IP: 127.1.0.1', - 'P-NGCP-Auth-UA: ', - 'Content-Length: 0' - ] - - [ - '^SIP/2.0 202 Accepted', - 'From: ;tag=', - 'To: ;tag=', - 'CSeq: 2 SUBSCRIBE', - 'P-Out-Socket: udp:127.0.0.1:5060', - 'P-NGCP-Auth-IP: 127.1.0.1', - 'P-NGCP-Auth-UA: ', - 'P-NGCP-Authorization: testuser1002@spce.test', - 'P-NGCP-Authorized: 1', - 'P-Caller-UUID: [% spce_test.testuser1002.uuid %]', - 'Event: call-info', - 'Contact: sip:127.0.0.1:5062', - 'Allow-Events: call-info, line-seize', - 'Expires: 0', - 'Content-Length: 0' - ] - - [ - '^NOTIFY sip:testuser1002@127.1.0.1:\d+ SIP/2.0', - 'To: ;tag=', - 'From: ;tag=', - 'CSeq: 7 NOTIFY', - 'Content-Length: 0', - 'Contact: sip:127.0.0.1:5062', - 'Call-Info: ;appearance-index=\*;appearance-state=idle', - 'Event: call-info', - 'Subscription-State: terminated' - ] diff --git a/scenarios_pbx/invite_shared_line/sipp_scenario00.xml b/scenarios_pbx/invite_shared_line/sipp_scenario00.xml index 00136819..5ee799ca 100644 --- a/scenarios_pbx/invite_shared_line/sipp_scenario00.xml +++ b/scenarios_pbx/invite_shared_line/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: NGCP%[field4 file="callee.csv" line=0]%///[call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]_opt%///[call_id] CSeq: 1 OPTIONS Contact: Content-Length: [len] diff --git a/scenarios_pbx/invite_shared_line/sipp_scenario01.xml b/scenarios_pbx/invite_shared_line/sipp_scenario01.xml index fad679f6..b832dc4f 100644 --- a/scenarios_pbx/invite_shared_line/sipp_scenario01.xml +++ b/scenarios_pbx/invite_shared_line/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: - Call-ID: NGCP%[field4 file="callee.csv" line=1]%///[call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=1]_opt%///[call_id] CSeq: 1 OPTIONS Contact: Content-Length: [len] diff --git a/scenarios_pbx/invite_shared_line/sipp_scenario_responder00.xml b/scenarios_pbx/invite_shared_line/sipp_scenario_responder00.xml index 5e8cc61c..145c5ce1 100644 --- a/scenarios_pbx/invite_shared_line/sipp_scenario_responder00.xml +++ b/scenarios_pbx/invite_shared_line/sipp_scenario_responder00.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: NGCP%[field4 file="callee.csv" line=0]%///[call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]_sub%///[call_id] CSeq: 1 SUBSCRIBE Contact: Allow: INVITE,ACK,CANCEL,BYE,PRACK,INFO,UPDATE,OPTIONS,MESSAGE,NOTIFY,REFER @@ -29,7 +29,7 @@ ;tag=[pid]SIPpTag00[call_number] To: [field1 file="caller.csv" line=0] - Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]_sub%///[call_id] CSeq: 2 SUBSCRIBE Contact: Allow: INVITE,ACK,CANCEL,BYE,PRACK,INFO,UPDATE,OPTIONS,MESSAGE,NOTIFY,REFER @@ -123,7 +123,7 @@ Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: ;tag=[pid]SIPpTag00[call_number] To: - Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]_sub%///[call_id] CSeq: 1 SUBSCRIBE Contact: Allow: INVITE,ACK,CANCEL,BYE,PRACK,INFO,UPDATE,OPTIONS,MESSAGE,NOTIFY,REFER @@ -143,11 +143,11 @@ ;tag=[pid]SIPpTag00[call_number] To: [peer_tag_param] - Call-ID: NGCP%[field4 file="caller.csv" line=0]%///[call_id] + Call-ID: NGCP%[field4 file="caller.csv" line=0]_sub%///[call_id] CSeq: 1 ACK Contact: Max-Forwards: 70 @@ -164,7 +164,7 @@ From: ;tag=[pid]SIPpTag00[call_number] To: [field1 file="caller.csv" line=0] - Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=0]_sub%///[call_id] CSeq: 2 SUBSCRIBE Contact: Allow: INVITE,ACK,CANCEL,BYE,PRACK,INFO,UPDATE,OPTIONS,MESSAGE,NOTIFY,REFER diff --git a/scenarios_pbx/invite_shared_line/sipp_scenario_responder01.xml b/scenarios_pbx/invite_shared_line/sipp_scenario_responder01.xml index 3ee04b90..0f63d277 100644 --- a/scenarios_pbx/invite_shared_line/sipp_scenario_responder01.xml +++ b/scenarios_pbx/invite_shared_line/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: NGCP%[field4 file="callee.csv" line=1]%///[call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=1]_sub%///[call_id] CSeq: 30 SUBSCRIBE Contact: Allow: INVITE,ACK,CANCEL,BYE,PRACK,INFO,UPDATE,OPTIONS,MESSAGE,NOTIFY,REFER @@ -32,7 +32,7 @@ ;tag=[pid]SIPpTag00[call_number] To: [field1 file="caller.csv" line=1] - Call-ID: NGCP%[field4 file="callee.csv" line=1]%///[call_id] + Call-ID: NGCP%[field4 file="callee.csv" line=1]_sub%///[call_id] CSeq: 31 SUBSCRIBE Contact: Allow: INVITE,ACK,CANCEL,BYE,PRACK,INFO,UPDATE,OPTIONS,MESSAGE,NOTIFY,REFER