TT#116103 scenarios/invite_tcp_udp

* use server_ip from scenario_ids.yml

Change-Id: I128315b7f6e625409d480c5754044caa21d591ec

scenarios/invite_tcp_udp/0003_test.yml.tt2

@@ -23,7 +23,7 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^INVITE'
-  - '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'

scenarios/invite_tcp_udp/0005_test.yml.tt2

@@ -209,7 +209,7 @@ flow:
       ]
 sip_in:
   - '^INVITE'
-  - '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'

scenarios/invite_tcp_udp/0006_test.yml.tt2

@@ -21,8 +21,8 @@ sip_in:
   - 'P-Asserted-Identity: <sip:[% invite_tcp_udp_scenarios_test.testuser1002.phone_number %]@invite-tcp-udp.scenarios.test>'
   - 'P-Caller-UUID: [% invite_tcp_udp_scenarios_test.testuser1002.uuid %]'
   - 'P-NGCP-Caller-Info: <sip:testuser1002@invite-tcp-udp.scenarios.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_tcp_udp_scenarios_test.testuser1002.phone_number %]'
-  - 'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-tcp-udp.scenarios.test>;ip=127.0.0.1;port=5060;primary=[% invite_tcp_udp_scenarios_test.testuser1003.phone_number %]'
-  - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060'
+  - 'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-tcp-udp.scenarios.test>;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %];primary=[% invite_tcp_udp_scenarios_test.testuser1003.phone_number %]'
+  - 'P-D-Uri: sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];)?socket=sip:[% server_ip %]:5060'
   - 'Content-Type: application/sdp'
   - 'Contact: <sip:127.0.0.1:508[08];transport=udp>'
   - 'Content-Length:\s+\d+'
@@ -44,8 +44,8 @@ sip_out:
       'P-Asserted-Identity: <sip:[% invite_tcp_udp_scenarios_test.testuser1002.phone_number %]@invite-tcp-udp.scenarios.test>',
       'P-Caller-UUID: [% invite_tcp_udp_scenarios_test.testuser1002.uuid %]',
       'P-NGCP-Caller-Info: <sip:testuser1002@invite-tcp-udp.scenarios.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_tcp_udp_scenarios_test.testuser1002.phone_number %]',
-      'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-tcp-udp.scenarios.test>;ip=127.0.0.1;port=5060;primary=[% invite_tcp_udp_scenarios_test.testuser1003.phone_number %]',
-      'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060',
+      'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-tcp-udp.scenarios.test>;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %];primary=[% invite_tcp_udp_scenarios_test.testuser1003.phone_number %]',
+      'P-D-Uri: sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];)?socket=sip:[% server_ip %]:5060',
       'Content-Type: application/sdp',
       'Contact: <sip:127.0.0.1:508[08];transport=udp>',
       'Content-Length:\s+\d+',

scenarios/invite_tcp_udp/0015_test.yml.tt2

@@ -30,7 +30,7 @@ flow:
       $avp(proto): ["tcp"]
 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',