From ba1839cece0c0ee3087a264638a257e3cc150028 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Wed, 30 Jun 2021 12:57:45 +0200 Subject: [PATCH] TT#116103 scenarios/lock_ported * use server_ip from scenario_ids.yml * Contact with <> format * tests: - add received Contact parameter as optional Change-Id: I0d4121a1e496fc42fce57ac8df55db804a2841b1 --- scenarios/lock_ported/0003_test.yml.tt2 | 2 +- scenarios/lock_ported/0005_test.yml.tt2 | 2 +- scenarios/lock_ported/0009_test.yml.tt2 | 8 ++++---- scenarios/lock_ported/0017_test.yml.tt2 | 4 ++-- scenarios/lock_ported/0020_test.yml.tt2 | 4 ++-- scenarios/lock_ported/0026_test.yml.tt2 | 2 +- scenarios/lock_ported/0028_test.yml.tt2 | 4 ++-- scenarios/lock_ported/sipp_scenario00.xml | 10 +++++----- scenarios/lock_ported/sipp_scenario01.xml | 6 +++--- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/scenarios/lock_ported/0003_test.yml.tt2 b/scenarios/lock_ported/0003_test.yml.tt2 index aab6ff9c..29c12be5 100644 --- a/scenarios/lock_ported/0003_test.yml.tt2 +++ b/scenarios/lock_ported/0003_test.yml.tt2 @@ -22,7 +22,7 @@ flow: - exit|ROUTE_EXIT: sip_in: - '^INVITE sip:[% scenarios.0.responders.0.username %]@' - - 'Contact: sip:[% scenarios.0.username %]@' + - 'Contact: ]+)?>' - 'To: ]+)?>' - 'CSeq: 2 INVITE' - 'Max-Forwards: 69' - 'Content-Type: application/sdp' diff --git a/scenarios/lock_ported/0009_test.yml.tt2 b/scenarios/lock_ported/0009_test.yml.tt2 index 580a368a..1dca32f9 100644 --- a/scenarios/lock_ported/0009_test.yml.tt2 +++ b/scenarios/lock_ported/0009_test.yml.tt2 @@ -20,9 +20,9 @@ sip_in: - 'P-Caller-UUID: [% lock_ported_scenarios_test.testuser1001.uuid %]' - 'P-NGCP-Caller-Info: ;ip=127.0.0.1;port=508[08];primary=[% lock_ported_scenarios_test.testuser1001.phone_number %]' - 'P-NGCP-Forward-Info: ;ip=127.0.0.1;port=508[08];primary=[% lock_ported_scenarios_test.testuser1001.phone_number %]' - - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% lock_ported_scenarios_test.testuser1003.phone_number %]' + - 'P-NGCP-Callee-Info: ;ip=[% scenarios.0.responders.1.ip %];port=[% scenarios.0.responders.1.port %];primary=[% lock_ported_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' - 'Contact: ' - 'Content-Length:\s+\d+' @@ -43,9 +43,9 @@ sip_out: 'P-Caller-UUID: [% lock_ported_scenarios_test.testuser1001.uuid %]', 'P-NGCP-Caller-Info: ;ip=127.0.0.1;port=508[08];primary=[% lock_ported_scenarios_test.testuser1001.phone_number %]', 'P-NGCP-Forward-Info: ;ip=127.0.0.1;port=508[08];primary=[% lock_ported_scenarios_test.testuser1001.phone_number %]', - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5060;primary=[% lock_ported_scenarios_test.testuser1003.phone_number %]', + 'P-NGCP-Callee-Info: ;ip=[% scenarios.0.responders.1.ip %];port=[% scenarios.0.responders.1.port %];primary=[% lock_ported_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', 'Contact: ', 'Content-Length:\s+\d+', diff --git a/scenarios/lock_ported/0017_test.yml.tt2 b/scenarios/lock_ported/0017_test.yml.tt2 index 1e536929..6c073c94 100644 --- a/scenarios/lock_ported/0017_test.yml.tt2 +++ b/scenarios/lock_ported/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:[% scenarios.0.username %]@' + - '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:[% scenarios.0.username %]@', + 'Contact: ]+)?>', 'CSeq: 2 ACK', 'Max-Forwards: 68', 'Content-Length: 0', diff --git a/scenarios/lock_ported/0020_test.yml.tt2 b/scenarios/lock_ported/0020_test.yml.tt2 index 2a68c245..d086fbc3 100644 --- a/scenarios/lock_ported/0020_test.yml.tt2 +++ b/scenarios/lock_ported/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:[% scenarios.0.username %]@' + - '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:[% scenarios.0.username %]@', + 'Contact: ]+)?>', 'CSeq: 3 BYE', 'Max-Forwards: 68', 'Content-Length: 0', diff --git a/scenarios/lock_ported/0026_test.yml.tt2 b/scenarios/lock_ported/0026_test.yml.tt2 index 947f3e00..a8eafcdc 100644 --- a/scenarios/lock_ported/0026_test.yml.tt2 +++ b/scenarios/lock_ported/0026_test.yml.tt2 @@ -22,7 +22,7 @@ flow: - exit|ROUTE_EXIT: sip_in: - '^INVITE sip:[% scenarios.1.responders.0.username %]@' - - 'Contact: sip:[% scenarios.0.responders.0.username %]@' + - 'Contact: ]+)?>' - 'To: ]+)?>' - 'CSeq: 2 INVITE' - 'Max-Forwards: 69' - 'Content-Type: application/sdp' - - 'Proxy-Authorization: Digest username="[% scenarios.0.responders.0.username %]"' + - 'Proxy-Authorization: Digest username="[% scenarios.1.username %]"' sip_out: - [ '^SIP/2.0 100 Trying', diff --git a/scenarios/lock_ported/sipp_scenario00.xml b/scenarios/lock_ported/sipp_scenario00.xml index 750a70e4..b5921982 100644 --- a/scenarios/lock_ported/sipp_scenario00.xml +++ b/scenarios/lock_ported/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 diff --git a/scenarios/lock_ported/sipp_scenario01.xml b/scenarios/lock_ported/sipp_scenario01.xml index 1a22a095..83aa1280 100644 --- a/scenarios/lock_ported/sipp_scenario01.xml +++ b/scenarios/lock_ported/sipp_scenario01.xml @@ -10,7 +10,7 @@ To: Call-ID: NGCP%[field4 file="callee.csv" line=2]%///[call_id] CSeq: 1 INVITE - Contact: sip:[field0 file="caller.csv" line=1]@[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=2]%///[call_id] CSeq: 1 ACK - Contact: sip:[field0 file="caller.csv" line=1]@[local_ip]:[local_port] + Contact: Max-Forwards: 70 Content-Length: 0 @@ -59,7 +59,7 @@ To: Call-ID: NGCP%[field4 file="callee.csv" line=2]%///[call_id] CSeq: 2 INVITE - Contact: sip:[field0 file="caller.csv" line=1]@[local_ip]:[local_port] + Contact: Max-Forwards: 70 [field1 file="caller.csv" line=1] Content-Type: application/sdp