TT#116103 scenarios/invite_redirect_tel_uri

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

Change-Id: I2b58ba602e72b0824ac60d432e7ef9e005c4c9dd

scenarios/invite_redirect_tel_uri/0005_test.yml.tt2

@@ -35,7 +35,7 @@ sip_in:
   - 'Diversion: <tel:\+43111222333'
   - 'P-Asserted-Identity: <tel:\+[% invite_redirect_tel_uri_scenarios_test.testuser1000.phone_number %]>'
   - '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:

scenarios/invite_redirect_tel_uri/0007_test.yml.tt2

@@ -173,7 +173,7 @@ sip_in:
   - 'Diversion: <tel:\+43111222333'
   - 'P-Asserted-Identity: <tel:\+[% invite_redirect_tel_uri_scenarios_test.testuser1000.phone_number %]>'
   - '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'
   # PAI has no angles around tel value
@@ -203,8 +203,8 @@ sip_out:
       'From: <sip:[% invite_redirect_tel_uri_scenarios_test.testuser1000.phone_number %]@invite-redirect-tel-uri.scenarios.test',
       'To: <sip:\+[% invite_redirect_tel_uri_scenarios_test.testuser1001.phone_number %]@invite-redirect-tel-uri.scenarios.test',
       '_:NOT:_Diversion: \w+',
-      'P-Asserted-Identity: <sip:4311000@invite-redirect-tel-uri.scenarios.test',
+      'P-Asserted-Identity: <sip:[% invite_redirect_tel_uri_scenarios_test.testuser1000.phone_number %]@invite-redirect-tel-uri.scenarios.test',
       'CSeq: \d+ INVITE',
-      'Contact: sip:[% scenarios.0.username %]@',
+      'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>',
       'Content-Type: application/sdp'
     ]

scenarios/invite_redirect_tel_uri/0012_test.yml.tt2

@@ -146,7 +146,7 @@ sip_in:
   - 'From: <sip:[% invite_redirect_tel_uri_scenarios_test.testuser1000.phone_number %]@invite-redirect-tel-uri.scenarios.test'
   - 'To: <sip:\+[% invite_redirect_tel_uri_scenarios_test.testuser1001.phone_number %]@invite-redirect-tel-uri.scenarios.test'
   - 'CSeq: 2 INVITE'
-  - 'Contact: <sip:[% scenarios.0.responders.1.username %]@'
+  - 'Contact: <sip:[% scenarios.0.responders.1.username %]@invite-redirect-tel-uri.scenarios.test(;alias=[% scenarios.0.responders.0.ip %]~[% scenarios.0.responders.0.port %]~1)?;transport=UDP>'
   - 'Diversion: <sip:[% invite_redirect_tel_uri_scenarios_test.testuser1001.phone_number %]@invite-redirect-tel-uri.scenarios.test'
   # particular case when customer adds one more Diversion into the call
 sip_out:
@@ -165,7 +165,7 @@ sip_out:
       'From: <sip:[% invite_redirect_tel_uri_scenarios_test.testuser1000.phone_number %]@invite-redirect-tel-uri.scenarios.test>;tag=[\w-]+',
       'To: <sip:\+[% invite_redirect_tel_uri_scenarios_test.testuser1001.phone_number %]@invite-redirect-tel-uri.scenarios.test',
       'CSeq: \d+ INVITE',
-      'Contact: sip:[% scenarios.0.username %]@',
+      'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>',
       'Max-Forwards: 68',
       'Content-Type: application/sdp',
       'P-Asserted-Identity: <sip:[% invite_redirect_tel_uri_scenarios_test.testuser1000.phone_number %]@invite-redirect-tel-uri.scenarios.test',

scenarios/invite_redirect_tel_uri/0021_test.yml.tt2

@@ -27,7 +27,7 @@ sip_in:
   - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
   - 'From: <tel:\+[% invite_redirect_tel_uri_scenarios_test.testuser1000.phone_number %]>;tag=[\w-]+'
   - 'To: <tel:\+[% invite_redirect_tel_uri_scenarios_test.testuser1001.phone_number %]>;tag=[\w-]+'
-  - 'Contact: sip:[% scenarios.0.username %]@'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'CSeq: \d+ ACK'
   - 'Max-Forwards: 69'
   - 'Content-Length: 0'
@@ -38,6 +38,6 @@ sip_out:
       'To: <sip:\+[% invite_redirect_tel_uri_scenarios_test.testuser1001.phone_number %]@invite-redirect-tel-uri.scenarios.test',
       'CSeq: \d+ ACK',
       'Max-Forwards: 68',
-      'Contact: sip:[% scenarios.0.username %]@',
+      'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>',
       'Content-Length: 0'
     ]

scenarios/invite_redirect_tel_uri/sipp_scenario00.xml

@@ -16,7 +16,7 @@
       P-Asserted-Identity: <tel:+[field1 file="callee.csv" line=2]>
       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]
@@ -45,7 +45,7 @@
       To: <tel:+[field1 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
 
@@ -65,7 +65,7 @@
       P-Asserted-Identity: <tel:+[field1 file="callee.csv" line=2]>
       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
@@ -97,7 +97,7 @@
       Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       [routes]
       CSeq: 2 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