From f49a6b4a32ccafab16b430f789d2e76a2f5d5a0a Mon Sep 17 00:00:00 2001
From: Victor Seva <vseva@sipwise.com>
Date: Fri, 25 Jun 2021 12:35:13 +0200
Subject: [PATCH] TT#116103 scenarios/invite_callforward_but_callee_locked_cfna

* use server_ip from scenario_ids.yml
* Contact with <> format
* tests:
  - add received Contact parameter as optional

Change-Id: Ic25733585186c6f97f4978de7da7e879262de185
---
 .../0003_test.yml.tt2                                       | 2 +-
 .../0005_test.yml.tt2                                       | 4 ++--
 .../0010_test.yml.tt2                                       | 2 +-
 .../0015_test.yml.tt2                                       | 2 +-
 .../sipp_scenario00.xml                                     | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scenarios/invite_callforward_but_callee_locked_cfna/0003_test.yml.tt2 b/scenarios/invite_callforward_but_callee_locked_cfna/0003_test.yml.tt2
index 2631b76b..4fa5e300 100644
--- a/scenarios/invite_callforward_but_callee_locked_cfna/0003_test.yml.tt2
+++ b/scenarios/invite_callforward_but_callee_locked_cfna/0003_test.yml.tt2
@@ -25,7 +25,7 @@ sip_in:
   - 'From: <sip:[% scenarios.0.username %]@invite-callforward-but-callee-locked-cfna.scenarios.test'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-callforward-but-callee-locked-cfna.scenarios.test>'
   - 'CSeq: \d+ INVITE'
-  - 'Contact: sip:[% scenarios.0.username %]@'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'Max-Forwards: 69'
   - 'Content-Type: application/sdp'
 sip_out:
diff --git a/scenarios/invite_callforward_but_callee_locked_cfna/0005_test.yml.tt2 b/scenarios/invite_callforward_but_callee_locked_cfna/0005_test.yml.tt2
index c2fa64d3..b81a597e 100644
--- a/scenarios/invite_callforward_but_callee_locked_cfna/0005_test.yml.tt2
+++ b/scenarios/invite_callforward_but_callee_locked_cfna/0005_test.yml.tt2
@@ -158,7 +158,7 @@ sip_in:
   - 'From: <sip:[% scenarios.0.username %]@invite-callforward-but-callee-locked-cfna.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-callforward-but-callee-locked-cfna.scenarios.test>'
   - 'CSeq: \d+ INVITE'
-  - 'Contact: sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:\d+'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'Content-Type: application/sdp'
   - 'Content-Length:\s+\d+'
 sip_out:
@@ -181,7 +181,7 @@ sip_out:
       'From: <sip:[% invite_callforward_but_callee_locked_cfna_scenarios_test.testuser1000.phone_number %]@invite-callforward-but-callee-locked-cfna.scenarios.test>;tag=[\w-]+',
       'To: <sip:[% scenarios.0.responders.0.username %]@invite-callforward-but-callee-locked-cfna.scenarios.test>',
       'CSeq: \d+ INVITE',
-      'Contact: sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:\d+',
+      'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>',
       'Content-Type: application/sdp',
       'Content-Length:\s+\d+',
       'P-Asserted-Identity: <sip:[% invite_callforward_but_callee_locked_cfna_scenarios_test.testuser1000.phone_number %]@invite-callforward-but-callee-locked-cfna.scenarios.test>',
diff --git a/scenarios/invite_callforward_but_callee_locked_cfna/0010_test.yml.tt2 b/scenarios/invite_callforward_but_callee_locked_cfna/0010_test.yml.tt2
index 46d12cd5..0da02954 100644
--- a/scenarios/invite_callforward_but_callee_locked_cfna/0010_test.yml.tt2
+++ b/scenarios/invite_callforward_but_callee_locked_cfna/0010_test.yml.tt2
@@ -80,7 +80,7 @@ sip_out:
       'From: <sip:[% scenarios.0.username %]@invite-callforward-but-callee-locked-cfna.scenarios.test>;tag=[\w-]+',
       'To: <sip:[% scenarios.0.responders.0.username %]@invite-callforward-but-callee-locked-cfna.scenarios.test>',
       'CSeq: \d+ INVITE',
-      'Contact: sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %]',
+      'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>',
       'Content-Type: application/sdp',
       'Content-Length:\s+\d+',
       'P-Acc-Caller-User: [% scenarios.0.responders.0.username %]',
diff --git a/scenarios/invite_callforward_but_callee_locked_cfna/0015_test.yml.tt2 b/scenarios/invite_callforward_but_callee_locked_cfna/0015_test.yml.tt2
index ccdae46a..c3289c3a 100644
--- a/scenarios/invite_callforward_but_callee_locked_cfna/0015_test.yml.tt2
+++ b/scenarios/invite_callforward_but_callee_locked_cfna/0015_test.yml.tt2
@@ -30,7 +30,7 @@ sip_in:
   - 'Content-Length: 0'
 sip_out:
   - [
-      'ACK sip:4311002@invite-callforward-but-callee-locked-cfna.scenarios.test SIP/2.0',
+      'ACK sip:[% invite_callforward_but_callee_locked_cfna_scenarios_test.testuser1002.phone_number %]@invite-callforward-but-callee-locked-cfna.scenarios.test SIP/2.0',
       'From: <sip:[% scenarios.0.username %]@invite-callforward-but-callee-locked-cfna.scenarios.test>;tag=[\w-]+',
       'To: <sip:[% scenarios.0.responders.0.username %]@invite-callforward-but-callee-locked-cfna.scenarios.test>;tag=[\w-]+',
       'CSeq: \d+ ACK',
diff --git a/scenarios/invite_callforward_but_callee_locked_cfna/sipp_scenario00.xml b/scenarios/invite_callforward_but_callee_locked_cfna/sipp_scenario00.xml
index 32ff9d89..35d2082a 100644
--- a/scenarios/invite_callforward_but_callee_locked_cfna/sipp_scenario00.xml
+++ b/scenarios/invite_callforward_but_callee_locked_cfna/sipp_scenario00.xml
@@ -10,7 +10,7 @@
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       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: <sip:[field0 file="caller.csv"]@[local_ip]:[local_port]>
       Max-Forwards: 70
       Content-Type: application/sdp
       Content-Length: [len]
@@ -40,7 +40,7 @@
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[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: <sip:[field0 file="caller.csv"]@[local_ip]:[local_port]>
       Max-Forwards: 70
       Content-Length: 0
 
@@ -58,7 +58,7 @@
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       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: <sip:[field0 file="caller.csv"]@[local_ip]:[local_port]>
       Max-Forwards: 70
       [field1 file="caller.csv"]
       Content-Type: application/sdp