From abd9841016e98f3a8945166a44cca20e6db15bcf Mon Sep 17 00:00:00 2001
From: Victor Seva <vseva@sipwise.com>
Date: Wed, 30 Jun 2021 13:54:01 +0200
Subject: [PATCH] TT#116103 scenarios/register_tcp

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

Change-Id: I1c89268f60444e5ef400705f16cb0b457ebb5cf3
---
 scenarios/register_tcp/0001_test.yml.tt2   | 2 +-
 scenarios/register_tcp/0002_test.yml.tt2   | 2 +-
 scenarios/register_tcp/sipp_scenario00.xml | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scenarios/register_tcp/0001_test.yml.tt2 b/scenarios/register_tcp/0001_test.yml.tt2
index e56d1b66..a52e7384 100644
--- a/scenarios/register_tcp/0001_test.yml.tt2
+++ b/scenarios/register_tcp/0001_test.yml.tt2
@@ -17,7 +17,7 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^REGISTER'
-  - 'Contact: sip:[% scenarios.0.username %]@'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'Content-Length: 0'
   - 'Expires: 600'
 sip_out:
diff --git a/scenarios/register_tcp/0002_test.yml.tt2 b/scenarios/register_tcp/0002_test.yml.tt2
index ee7025a8..e85e465a 100644
--- a/scenarios/register_tcp/0002_test.yml.tt2
+++ b/scenarios/register_tcp/0002_test.yml.tt2
@@ -43,7 +43,7 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^REGISTER'
-  - 'Contact: sip:[% scenarios.0.username %]@'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'Content-Length: 0'
   - 'Expires: 600'
   - 'Authorization: Digest username="[% scenarios.0.username %]"'
diff --git a/scenarios/register_tcp/sipp_scenario00.xml b/scenarios/register_tcp/sipp_scenario00.xml
index d269bf8c..030516ea 100644
--- a/scenarios/register_tcp/sipp_scenario00.xml
+++ b/scenarios/register_tcp/sipp_scenario00.xml
@@ -11,7 +11,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 REGISTER
-      Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port]>
       Expires: 600
       Max-Forwards: 70
       Content-Length: 0
@@ -35,7 +35,7 @@
       Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 2 REGISTER
       [field2 file="callee.csv" line=0]
-      Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port]>
       Expires: 600
       Max-Forwards: 70
       Content-Length: 0