From 9356ab2a9d5b003d0f7e8c6597517b0b4ee0f785 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Wed, 30 Jun 2021 10:02:11 +0200 Subject: [PATCH] TT#116103 scenarios/invite_retrans * use server_ip from scenario_ids.yml * Contact with <> format * tests: - add received Contact parameter as optional Change-Id: I2026603e6415517dbd4dbde4a4c342a2ec7d868f --- scenarios/invite_retrans/0003_test.yml.tt2 | 2 +- scenarios/invite_retrans/0005_test.yml.tt2 | 2 +- scenarios/invite_retrans/0007_test.yml.tt2 | 12 ++++++------ scenarios/invite_retrans/0015_test.yml.tt2 | 4 ++-- scenarios/invite_retrans/sipp_scenario00.xml | 12 ++++++------ 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/scenarios/invite_retrans/0003_test.yml.tt2 b/scenarios/invite_retrans/0003_test.yml.tt2 index 3f696341..83287ae4 100644 --- a/scenarios/invite_retrans/0003_test.yml.tt2 +++ b/scenarios/invite_retrans/0003_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_retrans/0007_test.yml.tt2 b/scenarios/invite_retrans/0007_test.yml.tt2 index 832eca3e..5913fb0a 100644 --- a/scenarios/invite_retrans/0007_test.yml.tt2 +++ b/scenarios/invite_retrans/0007_test.yml.tt2 @@ -20,9 +20,9 @@ sip_in: - 'P-LB-Uptime: \d+' - 'P-Asserted-Identity: ' - 'P-Caller-UUID: [% invite_retrans_scenarios_test.testuser1002.uuid %]' - - 'P-NGCP-Caller-Info: ;ip=127.126.0.1;port=\d+;primary=[% invite_retrans_scenarios_test.testuser1002.phone_number %]' - - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% invite_retrans_scenarios_test.testuser1003.phone_number %]' - - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060' + - 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_retrans_scenarios_test.testuser1002.phone_number %]' + - 'P-NGCP-Callee-Info: ;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %];primary=[% invite_retrans_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+' @@ -43,9 +43,9 @@ sip_out: 'P-LB-Uptime: \d+', 'P-Asserted-Identity: ', 'P-Caller-UUID: [% invite_retrans_scenarios_test.testuser1002.uuid %]', - 'P-NGCP-Caller-Info: ;ip=127.126.0.1;port=\d+;primary=[% invite_retrans_scenarios_test.testuser1002.phone_number %]', - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% invite_retrans_scenarios_test.testuser1003.phone_number %]', - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060', + 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_retrans_scenarios_test.testuser1002.phone_number %]', + 'P-NGCP-Callee-Info: ;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %];primary=[% invite_retrans_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_retrans/0015_test.yml.tt2 b/scenarios/invite_retrans/0015_test.yml.tt2 index 85871d6c..15922627 100644 --- a/scenarios/invite_retrans/0015_test.yml.tt2 +++ b/scenarios/invite_retrans/0015_test.yml.tt2 @@ -29,7 +29,7 @@ flow: - exit|ROUTE_EXIT: sip_in: - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0' - - 'Contact: sip:[% scenarios.0.username %]@' + - 'Contact: ]+)?>' - 'CSeq: 3 BYE' - 'Max-Forwards: 69' - 'Content-Length: 0' @@ -46,7 +46,7 @@ sip_out: ] - [ '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0', - 'Contact: sip:[% scenarios.0.username %]@', + 'Contact: ]+)?>', 'CSeq: 3 BYE', 'Max-Forwards: 68', 'Content-Length: 0', diff --git a/scenarios/invite_retrans/sipp_scenario00.xml b/scenarios/invite_retrans/sipp_scenario00.xml index d3acd2f1..a481a38b 100644 --- a/scenarios/invite_retrans/sipp_scenario00.xml +++ b/scenarios/invite_retrans/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 @@ -94,7 +94,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 @@ -134,7 +134,7 @@ Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id] [routes] CSeq: 2 ACK - Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port] + Contact: Max-Forwards: 70 Content-Length: 0 @@ -159,7 +159,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"]@[local_ip]:[local_port] + Contact: [routes] Max-Forwards: 70 Content-Length: 0