From 023e0799b3a731be754cbca57675ef9ed2241467 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Tue, 13 Apr 2021 10:04:45 +0200 Subject: [PATCH] TT#116100 scenarios/invite_allowedcli_match_alias * domain per scenario * dynamic IP/port and numbers * dynamic values in prefs.json Change-Id: Ia5ec4082542a3a3a0e79fe97989c321f47ce3eaf --- .../0003_test.yml.tt2 | 12 +-- .../0005_test.yml.tt2 | 76 +++++++++---------- .../0007_test.yml.tt2 | 32 ++++---- .../0010_test.yml.tt2 | 8 +- .../0012_test.yml.tt2 | 16 ++-- .../0013_test.yml.tt2 | 8 +- .../0015_test.yml.tt2 | 16 ++-- .../0018_test.yml.tt2 | 8 +- .../cdr_test.yml.tt2 | 12 +-- .../invite_allowedcli_match_alias/prefs.json | 11 --- .../prefs.json.tt2 | 11 +++ .../scenario.yml | 19 +++-- .../sipp_scenario00.xml | 10 +-- 13 files changed, 124 insertions(+), 115 deletions(-) delete mode 100644 scenarios/invite_allowedcli_match_alias/prefs.json create mode 100644 scenarios/invite_allowedcli_match_alias/prefs.json.tt2 diff --git a/scenarios/invite_allowedcli_match_alias/0003_test.yml.tt2 b/scenarios/invite_allowedcli_match_alias/0003_test.yml.tt2 index 2bfcc8e0..65671c1c 100644 --- a/scenarios/invite_allowedcli_match_alias/0003_test.yml.tt2 +++ b/scenarios/invite_allowedcli_match_alias/0003_test.yml.tt2 @@ -23,8 +23,8 @@ flow: - exit|ROUTE_EXIT: sip_in: - '^INVITE' - - 'Contact: sip:testuser1002@' - - 'To: allowed_clis[*]): ['43110021*', '43110029*'] - $xavp(caller_real_prefs[0]=>allowed_clis[*]): ['43110021*', '43110029*'] - $xavp(caller_usr_prefs[0]=>user_cli[*]): ['43122122'] - $xavp(caller_real_prefs[0]=>user_cli[*]): ['43122122'] + $xavp(caller_usr_prefs[0]=>allowed_clis[*]): ['[% invite_allowedcli_match_alias_scenarios_test.testuser1002.phone_number %]1*', '[% invite_allowedcli_match_alias_scenarios_test.testuser1002.phone_number %]9*'] + $xavp(caller_real_prefs[0]=>allowed_clis[*]): ['[% invite_allowedcli_match_alias_scenarios_test.testuser1002.phone_number %]1*', '[% invite_allowedcli_match_alias_scenarios_test.testuser1002.phone_number %]9*'] + $xavp(caller_usr_prefs[0]=>user_cli[*]): ['[% extra_info.phone_numbers.0 %]'] + $xavp(caller_real_prefs[0]=>user_cli[*]): ['[% extra_info.phone_numbers.0 %]'] $xavp(caller_usr_prefs[0]=>inbound_upn[*]): ['from_display'] $xavp(caller_real_prefs[0]=>inbound_upn[*]): ['from_display'] $xavp(caller_usr_prefs[0]=>extension_in_npn[*]): [1] @@ -72,10 +72,10 @@ flow: - return|ROUTE_SET_CALLEE_DIALOG: $avp(lua_dlg_profile): [ "totalaccount:[% customer_test.id %]", - "totaluser:[% spce_test.testuser1003.uuid %]", + "totaluser:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]", "total", "account:[% customer_test.id %]", - "user:[% spce_test.testuser1003.uuid %]" + "user:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]" ] - start|ROUTE_BLOCK_IN: - return|ROUTE_BLOCK_IN: @@ -109,29 +109,29 @@ flow: $avp(lua_dlg_profile): [ "local", "totalaccount:[% customer_test.id %]", - "totaluser:[% spce_test.testuser1003.uuid %]", + "totaluser:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]", "total", "account:[% customer_test.id %]", - "user:[% spce_test.testuser1003.uuid %]" + "user:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]" ] - start|ROUTE_CNT_DLG_CHECK: - return|ROUTE_CNT_DLG_CHECK: - return|ROUTE_SET_CALLER_DIALOG: $avp(lua_dlg_profile): [ 'accountout:[% customer_test.id %]', - 'userout:[% spce_test.testuser1002.uuid %]', + 'userout:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]', 'account:[% customer_test.id %]', - 'user:[% spce_test.testuser1002.uuid %]', + 'user:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]', 'totalaccountout:[% customer_test.id %]', - 'totaluserout:[% spce_test.testuser1002.uuid %]', + 'totaluserout:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]', 'totalaccount:[% customer_test.id %]', - 'totaluser:[% spce_test.testuser1002.uuid %]', + 'totaluser:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]', "local", "totalaccount:[% customer_test.id %]", - "totaluser:[% spce_test.testuser1003.uuid %]", + "totaluser:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]", "total", "account:[% customer_test.id %]", - "user:[% spce_test.testuser1003.uuid %]" + "user:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]" ] - start|ROUTE_ACC_CALLER: - start|ROUTE_SET_ACC_CALLER_CALL_COUNTERS: @@ -199,50 +199,50 @@ flow: - exit|ROUTE_EXIT: $avp(lua_dlg_profile): [ 'accountout:[% customer_test.id %]', - 'userout:[% spce_test.testuser1002.uuid %]', + 'userout:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]', 'account:[% customer_test.id %]', - 'user:[% spce_test.testuser1002.uuid %]', + 'user:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]', 'totalaccountout:[% customer_test.id %]', - 'totaluserout:[% spce_test.testuser1002.uuid %]', + 'totaluserout:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]', 'totalaccount:[% customer_test.id %]', - 'totaluser:[% spce_test.testuser1002.uuid %]', + 'totaluser:[% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]', "local", "totalaccount:[% customer_test.id %]", - "totaluser:[% spce_test.testuser1003.uuid %]", + "totaluser:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]", "total", "account:[% customer_test.id %]", - "user:[% spce_test.testuser1003.uuid %]" + "user:[% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]" ] sip_in: - '^INVITE' - - 'Contact: sip:testuser1002@' + - 'Contact: sip:[% scenarios.0.username %]@' - 'CSeq: 2 INVITE' - 'Max-Forwards: 69' - 'Content-Type: application/sdp' - - 'Proxy-Authorization: Digest username="testuser1002"' + - 'Proxy-Authorization: Digest username="[% scenarios.0.username %]"' sip_out: - [ '^SIP/2.0 100 Trying', 'CSeq: 2 INVITE', - 'From: "4311009" ;tag=[\w-]+' - - 'To: ' + - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0' + - 'From: ;tag=[\w-]+' + - 'To: ' - 'CSeq: \d+ INVITE' - 'P-LB-Uptime: \d+' - - 'P-Asserted-Identity: ' - - 'P-Caller-UUID: [% spce_test.testuser1002.uuid %]' - - 'P-NGCP-Caller-Info: ;ip=127.126.0.1;port=\d+;primary=4311002;alias=4311009' - - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=4311003' + - 'P-Asserted-Identity: ' + - 'P-Caller-UUID: [% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]' + - 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_allowedcli_match_alias_scenarios_test.testuser1002.phone_number %];alias=[% invite_allowedcli_match_alias_scenarios_test.testuser1002.alias_numbers.0.phone_number %]' + - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% invite_allowedcli_match_alias_scenarios_test.testuser1003.phone_number %]' - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060' - 'Content-Type: application/sdp' - 'Contact: ' @@ -29,22 +29,22 @@ sip_in: sip_out: - [ 'SIP/2.0 100 Trying', - 'From: ;tag=[\w-]+', - 'To: ', + 'From: ;tag=[\w-]+', + 'To: ', 'CSeq: \d+ INVITE', 'Server: Sipwise NGCP Proxy', 'Content-Length: 0', ] - [ - 'INVITE sip:testuser1003@127.1.0.1:\d+ SIP/2.0', - 'From: ;tag=[\w-]+', - 'To: ', + 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0', + 'From: ;tag=[\w-]+', + 'To: ', 'CSeq: \d+ INVITE', 'P-LB-Uptime: \d+', - 'P-Asserted-Identity: ', - 'P-Caller-UUID: [% spce_test.testuser1002.uuid %]', - 'P-NGCP-Caller-Info: ;ip=127.126.0.1;port=\d+;primary=4311002;alias=4311009', - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=4311003', + 'P-Asserted-Identity: ', + 'P-Caller-UUID: [% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]', + 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_allowedcli_match_alias_scenarios_test.testuser1002.phone_number %];alias=[% invite_allowedcli_match_alias_scenarios_test.testuser1002.alias_numbers.0.phone_number %]', + 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% invite_allowedcli_match_alias_scenarios_test.testuser1003.phone_number %]', 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060', 'Content-Type: application/sdp', 'Contact: ', diff --git a/scenarios/invite_allowedcli_match_alias/0010_test.yml.tt2 b/scenarios/invite_allowedcli_match_alias/0010_test.yml.tt2 index 7bd0b339..ae6dddeb 100644 --- a/scenarios/invite_allowedcli_match_alias/0010_test.yml.tt2 +++ b/scenarios/invite_allowedcli_match_alias/0010_test.yml.tt2 @@ -15,12 +15,12 @@ flow: sip_in: - '^SIP/2.0 180 Ringing' - 'CSeq: 2 INVITE' - - 'From: ;tag=[pid]SIPpTag00[call_number] + From: "[field5 file="caller.csv"]" ;tag=[pid]SIPpTag00[call_number] To: Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 1 INVITE @@ -37,7 +37,7 @@ ACK sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]:[remote_port] SIP/2.0 [last_Via:] - From: "4311009" ;tag=[pid]SIPpTag00[call_number] + From: "[field5 file="caller.csv"]" ;tag=[pid]SIPpTag00[call_number] To: [peer_tag_param] Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 1 ACK @@ -55,7 +55,7 @@ INVITE sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0 Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] - From: "4311009" ;tag=[pid]SIPpTag00[call_number] + From: "[field5 file="caller.csv"]" ;tag=[pid]SIPpTag00[call_number] To: Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 2 INVITE @@ -94,7 +94,7 @@ ACK [next_url] SIP/2.0 Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] - From: "4311009" ;tag=[pid]SIPpTag00[call_number] + From: "[field5 file="caller.csv"]" ;tag=[pid]SIPpTag00[call_number] To: [peer_tag_param] Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] [routes] @@ -120,7 +120,7 @@ BYE [next_url] SIP/2.0 Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] - From: "4311009" ;tag=[pid]SIPpTag00[call_number] + From: "[field5 file="caller.csv"]" ;tag=[pid]SIPpTag00[call_number] To: [peer_tag_param] Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 3 BYE