From 130e65811cbd6906701eb2c4f2176de9ccbdc824 Mon Sep 17 00:00:00 2001
From: Victor Seva <vseva@sipwise.com>
Date: Tue, 29 Jun 2021 10:23:42 +0200
Subject: [PATCH] TT#116103 scenarios/invite_hm_peerout

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

Change-Id: I868bd7d64952361f5fb54420e7e927e341b4aaa2
---
 scenarios/invite_hm_peerout/0001_test.yml.tt2   |  2 +-
 scenarios/invite_hm_peerout/0003_test.yml.tt2   |  2 +-
 scenarios/invite_hm_peerout/0011_test.yml.tt2   |  8 ++++----
 scenarios/invite_hm_peerout/0013_test.yml.tt2   |  4 ++--
 scenarios/invite_hm_peerout/sipp_scenario00.xml | 10 +++++-----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/scenarios/invite_hm_peerout/0001_test.yml.tt2 b/scenarios/invite_hm_peerout/0001_test.yml.tt2
index aab6ff9c..29c12be5 100644
--- a/scenarios/invite_hm_peerout/0001_test.yml.tt2
+++ b/scenarios/invite_hm_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: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@'
   - 'CSeq: 1 INVITE'
   - 'Max-Forwards: 69'
diff --git a/scenarios/invite_hm_peerout/0003_test.yml.tt2 b/scenarios/invite_hm_peerout/0003_test.yml.tt2
index d23b1a3e..946a39a5 100644
--- a/scenarios/invite_hm_peerout/0003_test.yml.tt2
+++ b/scenarios/invite_hm_peerout/0003_test.yml.tt2
@@ -181,7 +181,7 @@ flow:
       ]
 sip_in:
   - '^INVITE sip:[% scenarios.0.responders.0.username %]@'
-  - 'Contact: sip:[% scenarios.0.username %]@'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'CSeq: 2 INVITE'
   - 'Max-Forwards: 69'
   - 'Content-Type: application/sdp'
diff --git a/scenarios/invite_hm_peerout/0011_test.yml.tt2 b/scenarios/invite_hm_peerout/0011_test.yml.tt2
index cf6ff92e..ff0d84f4 100644
--- a/scenarios/invite_hm_peerout/0011_test.yml.tt2
+++ b/scenarios/invite_hm_peerout/0011_test.yml.tt2
@@ -28,13 +28,13 @@ sip_in:
   - 'From: <sip:[% scenarios.0.username %]@invite-hm-peerout.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-hm-peerout.scenarios.test>;tag=[\w-]+'
   - 'CSeq: \d+ ACK'
-  - 'Contact: sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %]'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'Content-Length: 0'
   - 'P-NGCP-Src-Ip: [% scenarios.0.ip %]'
   - 'P-NGCP-Src-Port: [% scenarios.0.port %]'
   - 'P-NGCP-Src-Proto: udp'
   - 'P-NGCP-Src-Af: 4'
-  - 'P-Sock-Info: udp:127.0.0.1:5060'
+  - 'P-Sock-Info: udp:[% server_ip %]:5060'
   - 'P-LB-Uptime: \d+'
 sip_out:
   - [
@@ -42,12 +42,12 @@ sip_out:
       'From: <sip:[% invite_hm_peerout_scenarios_test.testuser1002.phone_number %]@invite-hm-peerout.scenarios.test>;tag=[\w-]+',
       'To: <sip:[% scenarios.0.responders.0.username %]@invite-hm-peerout.scenarios.test>;tag=[\w-]+',
       'CSeq: \d+ ACK',
-      'Contact: sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %]',
+      'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>',
       'Content-Length: 0',
       'P-NGCP-Src-Ip: [% scenarios.0.ip %]',
       'P-NGCP-Src-Port: [% scenarios.0.port %]',
       'P-NGCP-Src-Proto: udp',
       'P-NGCP-Src-Af: 4',
-      'P-Sock-Info: udp:127.0.0.1:5060',
+      'P-Sock-Info: udp:[% server_ip %]:5060',
       'P-LB-Uptime: \d+',
     ]
diff --git a/scenarios/invite_hm_peerout/0013_test.yml.tt2 b/scenarios/invite_hm_peerout/0013_test.yml.tt2
index be0e9325..e4840cb8 100644
--- a/scenarios/invite_hm_peerout/0013_test.yml.tt2
+++ b/scenarios/invite_hm_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: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - '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: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
       'Content-Length: 0',
diff --git a/scenarios/invite_hm_peerout/sipp_scenario00.xml b/scenarios/invite_hm_peerout/sipp_scenario00.xml
index 750a70e4..b5921982 100644
--- a/scenarios/invite_hm_peerout/sipp_scenario00.xml
+++ b/scenarios/invite_hm_peerout/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" line=0]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]>
       Max-Forwards: 70
       Content-Type: application/sdp
       Content-Length: [len]
@@ -41,7 +41,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" line=0]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]>
       Max-Forwards: 70
       Content-Length: 0
 
@@ -59,7 +59,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" line=0]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]>
       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: <sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]>
       Max-Forwards: 70
       Content-Length: 0
 
@@ -124,7 +124,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: 3 BYE
-      Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]>
       [routes]
       Max-Forwards: 70
       Content-Length: 0