From 7b56efb97a0bf00fa02c4f7d42f79a15cdc840a8 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Tue, 29 Jun 2021 11:45:37 +0200 Subject: [PATCH] TT#116103 scenarios/invite_peerout * use server_ip from scenario_ids.yml * Contact with <> format * tests: - add received Contact parameter as optional Change-Id: I4b873a511e84b438d42a92566029b7ac5ffba050 --- scenarios/invite_peerout/0001_test.yml.tt2 | 2 +- scenarios/invite_peerout/0003_test.yml.tt2 | 2 +- scenarios/invite_peerout/0011_test.yml.tt2 | 4 ++-- scenarios/invite_peerout/0013_test.yml.tt2 | 4 ++-- scenarios/invite_peerout/sipp_scenario00.xml | 10 +++++----- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/scenarios/invite_peerout/0001_test.yml.tt2 b/scenarios/invite_peerout/0001_test.yml.tt2 index aab6ff9c..29c12be5 100644 --- a/scenarios/invite_peerout/0001_test.yml.tt2 +++ b/scenarios/invite_peerout/0001_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/invite_peerout/0011_test.yml.tt2 b/scenarios/invite_peerout/0011_test.yml.tt2 index 91c21df4..74780e4f 100644 --- a/scenarios/invite_peerout/0011_test.yml.tt2 +++ b/scenarios/invite_peerout/0011_test.yml.tt2 @@ -26,7 +26,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' @@ -36,7 +36,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/invite_peerout/0013_test.yml.tt2 b/scenarios/invite_peerout/0013_test.yml.tt2 index 2a32d4c8..9976dea2 100644 --- a/scenarios/invite_peerout/0013_test.yml.tt2 +++ b/scenarios/invite_peerout/0013_test.yml.tt2 @@ -30,7 +30,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' @@ -47,7 +47,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_peerout/sipp_scenario00.xml b/scenarios/invite_peerout/sipp_scenario00.xml index 750a70e4..b5921982 100644 --- a/scenarios/invite_peerout/sipp_scenario00.xml +++ b/scenarios/invite_peerout/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