From c56ba5f5569ccb848c94fefa2bd631fec3179afe Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Tue, 29 Jun 2021 19:12:25 +0200 Subject: [PATCH] TT#116103 scenarios/invite_q_forking * use server_ip from scenario_ids.yml * Contact with <> format * tests: - add received Contact parameter as optional Change-Id: I0a76230d1dc9ec70b253a48a66989678ac3b32c5 --- scenarios/invite_q_forking/0005_test.yml.tt2 | 2 +- scenarios/invite_q_forking/0007_test.yml.tt2 | 2 +- scenarios/invite_q_forking/0009_test.yml.tt2 | 8 ++++---- scenarios/invite_q_forking/sipp_scenario00.xml | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scenarios/invite_q_forking/0005_test.yml.tt2 b/scenarios/invite_q_forking/0005_test.yml.tt2 index 3f696341..83287ae4 100644 --- a/scenarios/invite_q_forking/0005_test.yml.tt2 +++ b/scenarios/invite_q_forking/0005_test.yml.tt2 @@ -22,7 +22,7 @@ flow: - exit|ROUTE_EXIT: sip_in: - '^INVITE' - - 'Contact: sip:[% scenarios.0.username %]@' + - 'Contact: ]+)?>' - 'To: ]+)?>' - 'CSeq: 2 INVITE' - 'Max-Forwards: 69' - 'Content-Type: application/sdp' diff --git a/scenarios/invite_q_forking/0009_test.yml.tt2 b/scenarios/invite_q_forking/0009_test.yml.tt2 index 8b80024e..67ac7efe 100644 --- a/scenarios/invite_q_forking/0009_test.yml.tt2 +++ b/scenarios/invite_q_forking/0009_test.yml.tt2 @@ -21,8 +21,8 @@ sip_in: - 'P-Asserted-Identity: ' - 'P-Caller-UUID: [% spce_test.testuser1002.uuid %]' - 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_q_forking_scenarios_test.testuser1002.phone_number %]' - - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% invite_q_forking_scenarios_test.testuser1003.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=[% invite_q_forking_scenarios_test.testuser1003.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' - 'Content-Type: application/sdp' - 'Contact: ' - 'Content-Length:\s+\d+' @@ -44,8 +44,8 @@ sip_out: 'P-Asserted-Identity: ', 'P-Caller-UUID: [% spce_test.testuser1002.uuid %]', 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_q_forking_scenarios_test.testuser1002.phone_number %]', - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% invite_q_forking_scenarios_test.testuser1003.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=[% invite_q_forking_scenarios_test.testuser1003.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', 'Content-Type: application/sdp', 'Contact: ', 'Content-Length:\s+\d+', diff --git a/scenarios/invite_q_forking/sipp_scenario00.xml b/scenarios/invite_q_forking/sipp_scenario00.xml index c53d6bd5..150c2eb0 100644 --- a/scenarios/invite_q_forking/sipp_scenario00.xml +++ b/scenarios/invite_q_forking/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"]@[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"]@[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"]@[local_ip]:[local_port] + Contact: Max-Forwards: 70 [field1 file="caller.csv"] Content-Type: application/sdp @@ -98,7 +98,7 @@ To: [peer_tag_param] Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] CSeq: 2 ACK - Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port] + Contact: Max-Forwards: 70 Content-Length: 0