From f5c4ee3430bbc3483b84a7cd9479d413902c819d Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Tue, 29 Jun 2021 16:52:02 +0200 Subject: [PATCH] TT#116103 scenarios/invite_peerout_max_out * use server_ip from scenario_ids.yml * Contact with <> format * tests: - add received Contact parameter as optional Change-Id: I6b44d1fe332cfb2f17ade7a54d8bcce48523ecb3 --- scenarios/invite_peerout_max_out/0001_test.yml.tt2 | 2 +- scenarios/invite_peerout_max_out/0003_test.yml.tt2 | 6 +++--- scenarios/invite_peerout_max_out/0004_test.yml.tt2 | 4 ++-- scenarios/invite_peerout_max_out/0011_test.yml.tt2 | 4 ++-- scenarios/invite_peerout_max_out/0013_test.yml.tt2 | 4 ++-- scenarios/invite_peerout_max_out/sipp_scenario00.xml | 10 +++++----- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/scenarios/invite_peerout_max_out/0001_test.yml.tt2 b/scenarios/invite_peerout_max_out/0001_test.yml.tt2 index 22220999..48e36304 100644 --- a/scenarios/invite_peerout_max_out/0001_test.yml.tt2 +++ b/scenarios/invite_peerout_max_out/0001_test.yml.tt2 @@ -22,7 +22,7 @@ flow: - exit|ROUTE_EXIT: sip_in: - '^INVITE sip:[% scenarios.0.responders.0.username %]@' - - 'Contact: sip:testuser1002@' + - 'Contact: ]+)?>' - 'To: ]+)?>' - 'CSeq: 2 INVITE' - 'Max-Forwards: 69' - 'Content-Type: application/sdp' @@ -215,8 +215,8 @@ sip_out: 'From: ' - 'P-Caller-UUID: [% invite_peerout_max_out_scenarios_test.testuser1002.uuid %]' - - 'P-NGCP-Caller-Info: ;ip=127.126.0.1;port=\d+;primary=[% invite_peerout_max_out_scenarios_test.testuser1002.phone_number %]' + - 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_peerout_max_out_scenarios_test.testuser1002.phone_number %]' - 'P-NGCP-Callee-Info: ;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %]' - 'P-D-Uri: sip:127.0.0.1:5060;received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %]%3blr%3btransport%3dudp' - 'Content-Type: application/sdp' @@ -43,7 +43,7 @@ sip_out: 'P-LB-Uptime: \d+', 'P-Asserted-Identity: ', 'P-Caller-UUID: [% invite_peerout_max_out_scenarios_test.testuser1002.uuid %]', - 'P-NGCP-Caller-Info: ;ip=127.126.0.1;port=\d+;primary=[% invite_peerout_max_out_scenarios_test.testuser1002.phone_number %]', + 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_peerout_max_out_scenarios_test.testuser1002.phone_number %]', 'P-NGCP-Callee-Info: ;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %]', 'P-D-Uri: sip:127.0.0.1:5060;received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %]%3blr%3btransport%3dudp', 'Content-Type: application/sdp', diff --git a/scenarios/invite_peerout_max_out/0011_test.yml.tt2 b/scenarios/invite_peerout_max_out/0011_test.yml.tt2 index 1923052c..5f671dab 100644 --- a/scenarios/invite_peerout_max_out/0011_test.yml.tt2 +++ b/scenarios/invite_peerout_max_out/0011_test.yml.tt2 @@ -26,7 +26,7 @@ flow: - exit|ROUTE_EXIT: sip_in: - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0' - - 'Contact: sip:testuser1002@' + - 'Contact: ]+)?>' - 'CSeq: 2 ACK' - 'Max-Forwards: 69' - 'Content-Length: 0' @@ -36,7 +36,7 @@ sip_in: sip_out: - [ '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0', - 'Contact: sip:testuser1002@', + 'Contact: ]+)?>', 'CSeq: 2 ACK', 'Max-Forwards: 68', 'Content-Length: 0', diff --git a/scenarios/invite_peerout_max_out/0013_test.yml.tt2 b/scenarios/invite_peerout_max_out/0013_test.yml.tt2 index 574708e0..f439cdd3 100644 --- a/scenarios/invite_peerout_max_out/0013_test.yml.tt2 +++ b/scenarios/invite_peerout_max_out/0013_test.yml.tt2 @@ -30,7 +30,7 @@ flow: - exit|ROUTE_EXIT: sip_in: - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0' - - 'Contact: sip:testuser1002@' + - 'Contact: ]+)?>' - 'CSeq: 3 BYE' - 'Max-Forwards: 69' - 'Content-Length: 0' @@ -47,7 +47,7 @@ sip_out: ] - [ '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0', - 'Contact: sip:testuser1002@', + 'Contact: ]+)?>', 'CSeq: 3 BYE', 'Max-Forwards: 68', 'Content-Length: 0', diff --git a/scenarios/invite_peerout_max_out/sipp_scenario00.xml b/scenarios/invite_peerout_max_out/sipp_scenario00.xml index 750a70e4..b5921982 100644 --- a/scenarios/invite_peerout_max_out/sipp_scenario00.xml +++ b/scenarios/invite_peerout_max_out/sipp_scenario00.xml @@ -10,7 +10,7 @@ To: Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 1 INVITE - Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port] + Contact: Max-Forwards: 70 Content-Type: application/sdp Content-Length: [len] @@ -41,7 +41,7 @@ To: [peer_tag_param] Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 1 ACK - Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port] + Contact: Max-Forwards: 70 Content-Length: 0 @@ -59,7 +59,7 @@ To: Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 2 INVITE - Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port] + Contact: Max-Forwards: 70 [field1 file="caller.csv" line=0] Content-Type: application/sdp @@ -99,7 +99,7 @@ Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] [routes] CSeq: 2 ACK - Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port] + Contact: Max-Forwards: 70 Content-Length: 0 @@ -124,7 +124,7 @@ To: [peer_tag_param] Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 3 BYE - Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port] + Contact: [routes] Max-Forwards: 70 Content-Length: 0