From 35a6f5259a871c4f5c388e2d788dd366bee64d65 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Wed, 30 Jun 2021 10:48:58 +0200 Subject: [PATCH] TT#116103 scenarios/invite_wrong_reg * use server_ip from scenario_ids.yml * Contact with <> format * tests: - add received Contact parameter as optional Change-Id: I9cc04a40ab5b0f7eb4400808d082b1182a7b8fff --- scenarios/invite_wrong_reg/0001_test.yml.tt2 | 4 ++-- scenarios/invite_wrong_reg/0002_test.yml.tt2 | 6 +++--- scenarios/invite_wrong_reg/0003_test.yml.tt2 | 2 +- scenarios/invite_wrong_reg/0005_test.yml.tt2 | 2 +- scenarios/invite_wrong_reg/sipp_scenario00.xml | 8 ++++---- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/scenarios/invite_wrong_reg/0001_test.yml.tt2 b/scenarios/invite_wrong_reg/0001_test.yml.tt2 index 135f4fd2..a37cc1a1 100644 --- a/scenarios/invite_wrong_reg/0001_test.yml.tt2 +++ b/scenarios/invite_wrong_reg/0001_test.yml.tt2 @@ -26,7 +26,7 @@ sip_out: 'From: ;tag=', 'To: ', 'CSeq: 1 REGISTER', - 'P-Out-Socket: udp:127.0.0.1:5060', + 'P-Out-Socket: udp:[% server_ip %]:5060', 'P-NGCP-Auth-IP: [% scenarios.0.responders.0.ip %]', 'Content-Length: 0' ] @@ -35,7 +35,7 @@ sip_out: 'From: ;tag=', 'To: ;tag=', 'CSeq: 1 REGISTER', - 'P-Out-Socket: udp:127.0.0.1:5060', + 'P-Out-Socket: udp:[% server_ip %]:5060', 'P-NGCP-Auth-IP: [% scenarios.0.responders.0.ip %]', 'WWW-Authenticate: Digest', 'Content-Length: 0' diff --git a/scenarios/invite_wrong_reg/0002_test.yml.tt2 b/scenarios/invite_wrong_reg/0002_test.yml.tt2 index 3c1b310b..c6010c4d 100644 --- a/scenarios/invite_wrong_reg/0002_test.yml.tt2 +++ b/scenarios/invite_wrong_reg/0002_test.yml.tt2 @@ -36,8 +36,8 @@ sip_in: - 'P-NGCP-Src-Port: [% scenarios.0.responders.0.port %]' - 'P-NGCP-Src-Proto: udp' - 'P-NGCP-Src-Af: 4' - - 'P-Sock-Info: udp:127.0.0.1:5060' - - 'Path: ' + - 'P-Sock-Info: udp:[% server_ip %]:5060' + - 'Path: ' sip_out: - [ '^SIP/2.0 100 Trying', @@ -51,7 +51,7 @@ sip_out: 'From: ;tag=', 'To: ;tag=', 'CSeq: 2 REGISTER', - 'P-Out-Socket: udp:127.0.0.1:5060', + 'P-Out-Socket: udp:[% server_ip %]:5060', 'P-NGCP-Auth-IP: [% scenarios.0.responders.0.ip %]', 'P-NGCP-Authorization: [% scenarios.0.responders.0.username %]@invite-wrong-reg.scenarios.test', 'P-NGCP-Authorized: 1', diff --git a/scenarios/invite_wrong_reg/0003_test.yml.tt2 b/scenarios/invite_wrong_reg/0003_test.yml.tt2 index 500f480b..93b3f6f2 100644 --- a/scenarios/invite_wrong_reg/0003_test.yml.tt2 +++ b/scenarios/invite_wrong_reg/0003_test.yml.tt2 @@ -22,7 +22,7 @@ flow: - exit|ROUTE_EXIT: sip_in: - '^INVITE' - - 'Contact: sip:[% scenarios.0.username %]@' + - 'Contact: ]+)?>' - 'CSeq: 1 INVITE' - 'Max-Forwards: 69' - 'Content-Type: application/sdp' diff --git a/scenarios/invite_wrong_reg/0005_test.yml.tt2 b/scenarios/invite_wrong_reg/0005_test.yml.tt2 index bb20975d..43d37904 100644 --- a/scenarios/invite_wrong_reg/0005_test.yml.tt2 +++ b/scenarios/invite_wrong_reg/0005_test.yml.tt2 @@ -137,7 +137,7 @@ flow: $avp(lua_dlg_profile): None sip_in: - '^INVITE sip:[% scenarios.0.responders.0.username %]@' - - 'Contact: sip:[% scenarios.0.username %]@' + - 'Contact: ]+)?>' - 'CSeq: 2 INVITE' - 'Max-Forwards: 69' - 'Content-Type: application/sdp' diff --git a/scenarios/invite_wrong_reg/sipp_scenario00.xml b/scenarios/invite_wrong_reg/sipp_scenario00.xml index f0d837d6..e8f4d079 100644 --- a/scenarios/invite_wrong_reg/sipp_scenario00.xml +++ b/scenarios/invite_wrong_reg/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] @@ -38,7 +38,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 @@ -56,7 +56,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 @@ -87,7 +87,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