From 2098f7361287da70ba8ab7688227a576b040f334 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Wed, 30 Jun 2021 14:22:47 +0200 Subject: [PATCH] TT#116103 scenarios/timer_session_supported * use server_ip from scenario_ids.yml * Contact with <> format * tests: - add received Contact parameter as optional Change-Id: I3d4799ce63859318fa59ac6326dd48bc33a44e24 --- scenarios/timer_session_supported/0003_test.yml.tt2 | 10 +++++----- scenarios/timer_session_supported/0005_test.yml.tt2 | 8 ++++---- scenarios/timer_session_supported/0009_test.yml.tt2 | 4 ++-- scenarios/timer_session_supported/0010_test.yml.tt2 | 2 +- scenarios/timer_session_supported/0014_test.yml.tt2 | 8 ++++---- scenarios/timer_session_supported/0017_test.yml.tt2 | 4 ++-- scenarios/timer_session_supported/0018_test.yml.tt2 | 2 +- scenarios/timer_session_supported/0021_test.yml.tt2 | 6 +++--- scenarios/timer_session_supported/0023_test.yml.tt2 | 4 ++-- scenarios/timer_session_supported/0024_test.yml.tt2 | 2 +- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/scenarios/timer_session_supported/0003_test.yml.tt2 b/scenarios/timer_session_supported/0003_test.yml.tt2 index 4b900e8e..17bb8729 100644 --- a/scenarios/timer_session_supported/0003_test.yml.tt2 +++ b/scenarios/timer_session_supported/0003_test.yml.tt2 @@ -153,10 +153,10 @@ sip_in: - 'Content-Type: application/sdp' - 'Content-Length: 0' - 'P-NGCP-Src-Ip: [% scenarios.0.ip %]' - - 'P-NGCP-Src-Port: \d+' + - 'P-NGCP-Src-Port: [% scenarios.0.port %]' - 'P-NGCP-Src-Proto: udp' - 'P-NGCP-Src-Af: 4' - - 'P-Sock-Info: udp:127.0.0.1:5060' + - 'P-Sock-Info: udp:[% server_ip %]:5060' - 'P-LB-Uptime: \d+' sip_out: - [ @@ -164,7 +164,7 @@ sip_out: 'From: ;tag=[\w-]+', 'To: ', 'CSeq: \d+ INVITE', - 'P-Out-Socket: udp:127.0.0.1:5060', + 'P-Out-Socket: udp:[% server_ip %]:5060', 'P-NGCP-Auth-IP: [% scenarios.0.ip %]', 'P-NGCP-Auth-UA: ', 'Server: Sipwise NGCP Proxy', @@ -188,7 +188,7 @@ sip_out: 'P-App-Param: ;calltimer=21600;aleg_sst_enable=yes;aleg_sst_expires=10;aleg_sst_min_timer=2;aleg_sst_max_timer=20;aleg_sst_refresh_method=INVITE;sst_enable=yes;sst_expires=8;sst_min_timer=2;sst_max_timer=20;sst_refresh_method=INVITE;hold_alter_b2b_bleg=no;hold_alter_b2b_aleg=no;(fast_ack=no;)?b_park_domain=[% customer_test.id %]', 'P-App-Name: sbc', 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %]', - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% timer_session_supported_scenarios_test.testuser1001.phone_number %]', - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060', + 'P-NGCP-Callee-Info: ;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %];primary=[% timer_session_supported_scenarios_test.testuser1001.phone_number %]', + 'P-D-Uri: sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];)?socket=sip:[% server_ip %]:5060', 'P-Proxy-Uri: sip:127.0.0.1:5062', ] diff --git a/scenarios/timer_session_supported/0005_test.yml.tt2 b/scenarios/timer_session_supported/0005_test.yml.tt2 index 9f09dc9c..9e296163 100644 --- a/scenarios/timer_session_supported/0005_test.yml.tt2 +++ b/scenarios/timer_session_supported/0005_test.yml.tt2 @@ -23,8 +23,8 @@ sip_in: - 'P-Asserted-Identity: ' - 'P-Caller-UUID: 0' - 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %]' - - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% timer_session_supported_scenarios_test.testuser1001.phone_number %]' - - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060' + - 'P-NGCP-Callee-Info: ;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %];primary=[% timer_session_supported_scenarios_test.testuser1001.phone_number %]' + - 'P-D-Uri: sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];)?socket=sip:[% server_ip %]:5060' - 'Min-SE: 2' - 'Contact: ' - 'Content-Length: 0' @@ -47,8 +47,8 @@ sip_out: 'P-Asserted-Identity: ', 'P-Caller-UUID: 0', 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %]', - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% timer_session_supported_scenarios_test.testuser1001.phone_number %]', - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060', + 'P-NGCP-Callee-Info: ;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %];primary=[% timer_session_supported_scenarios_test.testuser1001.phone_number %]', + 'P-D-Uri: sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];)?socket=sip:[% server_ip %]:5060', 'Min-SE: 2', 'Contact: ', 'Content-Length: 0', diff --git a/scenarios/timer_session_supported/0009_test.yml.tt2 b/scenarios/timer_session_supported/0009_test.yml.tt2 index 596ca0cc..9276e543 100644 --- a/scenarios/timer_session_supported/0009_test.yml.tt2 +++ b/scenarios/timer_session_supported/0009_test.yml.tt2 @@ -21,7 +21,7 @@ sip_in: - 'Content-Type: application/sdp' - 'Content-Length: \s+0' - 'P-NGCP-Src-Ip: [% scenarios.0.responders.0.ip %]' - - 'P-NGCP-Src-Port: \d+' + - 'P-NGCP-Src-Port: [% scenarios.0.responders.0.port %]' - 'P-NGCP-Src-Proto: udp' - 'P-NGCP-Src-Af: 4' sip_out: @@ -36,7 +36,7 @@ sip_out: 'Content-Type: application/sdp', 'Content-Length: \s+0', 'P-NGCP-Src-Ip: [% scenarios.0.responders.0.ip %]', - 'P-NGCP-Src-Port: \d+', + 'P-NGCP-Src-Port: [% scenarios.0.responders.0.port %]', 'P-NGCP-Src-Proto: udp', 'P-NGCP-Src-Af: 4', ] diff --git a/scenarios/timer_session_supported/0010_test.yml.tt2 b/scenarios/timer_session_supported/0010_test.yml.tt2 index 47f6d238..985fa0c2 100644 --- a/scenarios/timer_session_supported/0010_test.yml.tt2 +++ b/scenarios/timer_session_supported/0010_test.yml.tt2 @@ -34,5 +34,5 @@ sip_out: 'Supported: timer', 'Contact: ', 'Content-Length: 0', - 'P-Out-Socket: udp:127.0.0.1:5060', + 'P-Out-Socket: udp:[% server_ip %]:5060', ] diff --git a/scenarios/timer_session_supported/0014_test.yml.tt2 b/scenarios/timer_session_supported/0014_test.yml.tt2 index 21552673..09798ee9 100644 --- a/scenarios/timer_session_supported/0014_test.yml.tt2 +++ b/scenarios/timer_session_supported/0014_test.yml.tt2 @@ -21,8 +21,8 @@ sip_in: - 'P-Asserted-Identity: ' - 'P-Caller-UUID: 0' - 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %]' - - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% timer_session_supported_scenarios_test.testuser1001.phone_number %]' - - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060' + - 'P-NGCP-Callee-Info: ;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %];primary=[% timer_session_supported_scenarios_test.testuser1001.phone_number %]' + - 'P-D-Uri: sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];)?socket=sip:[% server_ip %]:5060' - 'Supported: timer' - 'Min-SE: 2' - 'Contact: ' @@ -45,8 +45,8 @@ sip_out: 'P-Asserted-Identity: ', 'P-Caller-UUID: 0', 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %]', - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% timer_session_supported_scenarios_test.testuser1001.phone_number %]', - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060', + 'P-NGCP-Callee-Info: ;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %];primary=[% timer_session_supported_scenarios_test.testuser1001.phone_number %]', + 'P-D-Uri: sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];)?socket=sip:[% server_ip %]:5060', 'Supported: timer', 'Min-SE: 2', 'Contact: ', diff --git a/scenarios/timer_session_supported/0017_test.yml.tt2 b/scenarios/timer_session_supported/0017_test.yml.tt2 index f45fb872..aa41dac5 100644 --- a/scenarios/timer_session_supported/0017_test.yml.tt2 +++ b/scenarios/timer_session_supported/0017_test.yml.tt2 @@ -18,7 +18,7 @@ sip_in: - 'Content-Type: application/sdp' - 'Content-Length: \s+0' - 'P-NGCP-Src-Ip: [% scenarios.0.responders.0.ip %]' - - 'P-NGCP-Src-Port: \d+' + - 'P-NGCP-Src-Port: [% scenarios.0.responders.0.port %]' - 'P-NGCP-Src-Proto: udp' - 'P-NGCP-Src-Af: 4' sip_out: @@ -33,7 +33,7 @@ sip_out: 'Content-Type: application/sdp', 'Content-Length: \s+0', 'P-NGCP-Src-Ip: [% scenarios.0.responders.0.ip %]', - 'P-NGCP-Src-Port: \d+', + 'P-NGCP-Src-Port: [% scenarios.0.responders.0.port %]', 'P-NGCP-Src-Proto: udp', 'P-NGCP-Src-Af: 4', ] diff --git a/scenarios/timer_session_supported/0018_test.yml.tt2 b/scenarios/timer_session_supported/0018_test.yml.tt2 index baa70cf5..5fa940b5 100644 --- a/scenarios/timer_session_supported/0018_test.yml.tt2 +++ b/scenarios/timer_session_supported/0018_test.yml.tt2 @@ -29,5 +29,5 @@ sip_out: 'Supported: timer', 'Contact: ', 'Content-Length: 0', - 'P-Out-Socket: udp:127.0.0.1:5060', + 'P-Out-Socket: udp:[% server_ip %]:5060', ] diff --git a/scenarios/timer_session_supported/0021_test.yml.tt2 b/scenarios/timer_session_supported/0021_test.yml.tt2 index 5cdfb116..0b937d6c 100644 --- a/scenarios/timer_session_supported/0021_test.yml.tt2 +++ b/scenarios/timer_session_supported/0021_test.yml.tt2 @@ -34,10 +34,10 @@ sip_in: - 'Contact: ' - 'Content-Length: 0' - 'P-NGCP-Src-Ip: [% scenarios.0.ip %]' - - 'P-NGCP-Src-Port: \d+' + - 'P-NGCP-Src-Port: [% scenarios.0.port %]' - 'P-NGCP-Src-Proto: udp' - 'P-NGCP-Src-Af: 4' - - 'P-Sock-Info: udp:127.0.0.1:5060' + - 'P-Sock-Info: udp:[% server_ip %]:5060' - 'P-LB-Uptime: \d+' sip_out: - [ @@ -45,7 +45,7 @@ sip_out: 'From: ;tag=[\w-]+', 'To: ;tag=[\w-]+', 'CSeq: \d+ BYE', - 'P-Out-Socket: udp:127.0.0.1:5060', + 'P-Out-Socket: udp:[% server_ip %]:5060', 'P-NGCP-Auth-IP: [% scenarios.0.ip %]', 'P-NGCP-Auth-UA: ', 'Server: Sipwise NGCP Proxy', diff --git a/scenarios/timer_session_supported/0023_test.yml.tt2 b/scenarios/timer_session_supported/0023_test.yml.tt2 index 67410a1f..957efae1 100644 --- a/scenarios/timer_session_supported/0023_test.yml.tt2 +++ b/scenarios/timer_session_supported/0023_test.yml.tt2 @@ -21,7 +21,7 @@ sip_in: - 'Content-Type: application/sdp' - 'Content-Length: 0' - 'P-NGCP-Src-Ip: [% scenarios.0.responders.0.ip %]' - - 'P-NGCP-Src-Port: \d+' + - 'P-NGCP-Src-Port: [% scenarios.0.responders.0.port %]' - 'P-NGCP-Src-Proto: udp' - 'P-NGCP-Src-Af: 4' sip_out: @@ -34,7 +34,7 @@ sip_out: 'Content-Type: application/sdp', 'Content-Length: 0', 'P-NGCP-Src-Ip: [% scenarios.0.responders.0.ip %]', - 'P-NGCP-Src-Port: \d+', + 'P-NGCP-Src-Port: [% scenarios.0.responders.0.port %]', 'P-NGCP-Src-Proto: udp', 'P-NGCP-Src-Af: 4', ] diff --git a/scenarios/timer_session_supported/0024_test.yml.tt2 b/scenarios/timer_session_supported/0024_test.yml.tt2 index fe322a74..f95c0062 100644 --- a/scenarios/timer_session_supported/0024_test.yml.tt2 +++ b/scenarios/timer_session_supported/0024_test.yml.tt2 @@ -25,5 +25,5 @@ sip_out: 'To: ;tag=[\w-]+', 'CSeq: \d+ BYE', 'Content-Length: 0', - 'P-Out-Socket: udp:127.0.0.1:5060', + 'P-Out-Socket: udp:[% server_ip %]:5060', ]