From 2de9557d7b3583d715e3cdde3c4787544bcc8651 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Mon, 28 Jun 2021 19:35:12 +0200 Subject: [PATCH] TT#116103 scenarios/invite_hm_callforward * use server_ip from scenario_ids.yml * Contact with <> format * tests: - add received Contact parameter as optional Change-Id: I800d8186fc4f3375fab7d12c779eb32b1883a07f --- scenarios/invite_hm_callforward/0003_test.yml.tt2 | 2 +- scenarios/invite_hm_callforward/0005_test.yml.tt2 | 2 +- scenarios/invite_hm_callforward/0009_test.yml.tt2 | 8 ++++---- scenarios/invite_hm_callforward/0017_test.yml.tt2 | 4 ++-- scenarios/invite_hm_callforward/0020_test.yml.tt2 | 4 ++-- scenarios/invite_hm_callforward/sipp_scenario00.xml | 10 +++++----- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/scenarios/invite_hm_callforward/0003_test.yml.tt2 b/scenarios/invite_hm_callforward/0003_test.yml.tt2 index ba2f38e2..37bc4726 100644 --- a/scenarios/invite_hm_callforward/0003_test.yml.tt2 +++ b/scenarios/invite_hm_callforward/0003_test.yml.tt2 @@ -22,7 +22,7 @@ flow: - exit|ROUTE_EXIT: sip_in: - '^INVITE sip:testuser1001@' - - 'Contact: sip:testuser1002@' + - 'Contact: ]+)?>' - 'To: ]+)?>' - 'CSeq: 2 INVITE' - 'Max-Forwards: 69' - 'Content-Type: application/sdp' diff --git a/scenarios/invite_hm_callforward/0009_test.yml.tt2 b/scenarios/invite_hm_callforward/0009_test.yml.tt2 index 87b60a7d..ce82ac80 100644 --- a/scenarios/invite_hm_callforward/0009_test.yml.tt2 +++ b/scenarios/invite_hm_callforward/0009_test.yml.tt2 @@ -20,9 +20,9 @@ sip_in: - 'P-Caller-UUID: [% invite_hm_callforward_scenarios_test.testuser1001.uuid %]' - 'P-NGCP-Caller-Info: ;ip=127.0.0.1;port=508[08];primary=[% invite_hm_callforward_scenarios_test.testuser1001.phone_number %]' - 'P-NGCP-Forward-Info: ;ip=127.0.0.1;port=508[08];primary=[% invite_hm_callforward_scenarios_test.testuser1001.phone_number %]' - - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% invite_hm_callforward_scenarios_test.testuser1003.phone_number %]' + - 'P-NGCP-Callee-Info: ;ip=[% scenarios.0.responders.1.ip %];port=[% scenarios.0.responders.1.port %];primary=[% invite_hm_callforward_scenarios_test.testuser1003.phone_number %]' - 'P-Asserted-Identity: ' - - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060' + - 'P-D-Uri: sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.0.responders.1.ip %]:[% scenarios.0.responders.1.port %];)?socket=sip:[% server_ip %]:5060' - 'Content-Type: application/sdp' - 'Content-Length:\s+\d+' - 'Contact: ' @@ -43,9 +43,9 @@ sip_out: 'P-Caller-UUID: [% invite_hm_callforward_scenarios_test.testuser1001.uuid %]', 'P-NGCP-Caller-Info: ;ip=127.0.0.1;port=508[08];primary=[% invite_hm_callforward_scenarios_test.testuser1001.phone_number %]', 'P-NGCP-Forward-Info: ;ip=127.0.0.1;port=508[08];primary=[% invite_hm_callforward_scenarios_test.testuser1001.phone_number %]', - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% invite_hm_callforward_scenarios_test.testuser1003.phone_number %]', + 'P-NGCP-Callee-Info: ;ip=[% scenarios.0.responders.1.ip %];port=[% scenarios.0.responders.1.port %];primary=[% invite_hm_callforward_scenarios_test.testuser1003.phone_number %]', 'P-Asserted-Identity: ', - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060', + 'P-D-Uri: sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.0.responders.1.ip %]:[% scenarios.0.responders.1.port %];)?socket=sip:[% server_ip %]:5060', 'Content-Type: application/sdp', 'Content-Length:\s+\d+', 'Contact: ', diff --git a/scenarios/invite_hm_callforward/0017_test.yml.tt2 b/scenarios/invite_hm_callforward/0017_test.yml.tt2 index 454122d2..d3ab8d77 100644 --- a/scenarios/invite_hm_callforward/0017_test.yml.tt2 +++ b/scenarios/invite_hm_callforward/0017_test.yml.tt2 @@ -21,7 +21,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' @@ -31,7 +31,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_hm_callforward/0020_test.yml.tt2 b/scenarios/invite_hm_callforward/0020_test.yml.tt2 index 2a179818..0f25d82c 100644 --- a/scenarios/invite_hm_callforward/0020_test.yml.tt2 +++ b/scenarios/invite_hm_callforward/0020_test.yml.tt2 @@ -27,7 +27,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' @@ -44,7 +44,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_hm_callforward/sipp_scenario00.xml b/scenarios/invite_hm_callforward/sipp_scenario00.xml index 750a70e4..b5921982 100644 --- a/scenarios/invite_hm_callforward/sipp_scenario00.xml +++ b/scenarios/invite_hm_callforward/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