From b0cd867928bdc46e2330ad56f95721ca81168cd9 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Tue, 29 Jun 2021 10:42:37 +0200 Subject: [PATCH] TT#116103 scenarios/invite_locmap_add * use server_ip from scenario_ids.yml * Contact with <> format * tests: - add received Contact parameter as optional Change-Id: I2586f57808d79c79d4f7184fe0f083f1a3489e2f --- scenarios/invite_locmap_add/0005_test.yml.tt2 | 2 +- scenarios/invite_locmap_add/0007_test.yml.tt2 | 10 +++++----- scenarios/invite_locmap_add/0022_test.yml.tt2 | 4 ++-- scenarios/invite_locmap_add/sipp_scenario00.xml | 10 +++++----- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/scenarios/invite_locmap_add/0005_test.yml.tt2 b/scenarios/invite_locmap_add/0005_test.yml.tt2 index d60605be..9358deb1 100644 --- a/scenarios/invite_locmap_add/0005_test.yml.tt2 +++ b/scenarios/invite_locmap_add/0005_test.yml.tt2 @@ -25,7 +25,7 @@ sip_in: - 'From: ;tag=[\w-]+' - 'To: ' - 'CSeq: \d+ INVITE' - - 'Contact: sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %]' + - 'Contact: ]+)?>' - 'Content-Type: application/sdp' - 'Content-Length:\s+\d+' sip_out: diff --git a/scenarios/invite_locmap_add/0007_test.yml.tt2 b/scenarios/invite_locmap_add/0007_test.yml.tt2 index 488954ac..686f3ad1 100644 --- a/scenarios/invite_locmap_add/0007_test.yml.tt2 +++ b/scenarios/invite_locmap_add/0007_test.yml.tt2 @@ -204,15 +204,15 @@ sip_in: - 'From: ;tag=[\w-]+' - 'To: ' - 'CSeq: \d+ INVITE' - - 'Contact: sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %]' - - 'Proxy-Authorization: Digest username="[% scenarios.0.username %]",realm="invite-locmap-add.scenarios.test",uri="sip:127.0.0.1:5060",nonce=".+",response=".+",algorithm=MD5' + - 'Contact: ]+)?>' + - 'Proxy-Authorization: Digest username="[% scenarios.0.username %]",realm="invite-locmap-add.scenarios.test",uri="sip:[% server_ip %]:5060",nonce=".+",response=".+",algorithm=MD5' - 'Content-Type: application/sdp' - 'Content-Length:\s+\d+' - 'P-NGCP-Src-Ip: [% scenarios.0.ip %]' - 'P-NGCP-Src-Port: \d+' - '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: - [ @@ -234,7 +234,7 @@ sip_out: 'From: ;tag=[\w-]+', 'To: ', 'CSeq: \d+ INVITE', - 'Contact: sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %]', + 'Contact: ]+)?>', 'Content-Type: application/sdp', 'Content-Length:\s+\d+', 'P-Asserted-Identity: ', @@ -244,7 +244,7 @@ sip_out: 'From: ;tag=[\w-]+', 'To: ', 'CSeq: \d+ INVITE', - 'Contact: sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %]', + 'Contact: ]+)?>', 'Content-Type: application/sdp', 'Content-Length:\s+\d+', 'P-Asserted-Identity: ', diff --git a/scenarios/invite_locmap_add/0022_test.yml.tt2 b/scenarios/invite_locmap_add/0022_test.yml.tt2 index 03025690..f24522b8 100644 --- a/scenarios/invite_locmap_add/0022_test.yml.tt2 +++ b/scenarios/invite_locmap_add/0022_test.yml.tt2 @@ -28,7 +28,7 @@ sip_in: - 'From: ;tag=[\w-]+' - 'To: ;tag=[\w-]+' - 'CSeq: \d+ ACK' - - 'Contact: sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %]' + - 'Contact: ]+)?>' - 'Content-Length: 0' sip_out: - [ @@ -36,6 +36,6 @@ sip_out: 'From: ;tag=[\w-]+', 'To: ;tag=[\w-]+', 'CSeq: \d+ ACK', - 'Contact: sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %]', + 'Contact: ]+)?>', 'Content-Length: 0', ] diff --git a/scenarios/invite_locmap_add/sipp_scenario00.xml b/scenarios/invite_locmap_add/sipp_scenario00.xml index cb1a4224..180eeffe 100644 --- a/scenarios/invite_locmap_add/sipp_scenario00.xml +++ b/scenarios/invite_locmap_add/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] @@ -40,7 +40,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 @@ -58,7 +58,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 @@ 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 @@ -119,7 +119,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