TT#116103 scenarios/invite_tcp_udp_reinvite

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

Change-Id: Ie25f6bd8ef086a77c42e6edd8e2b4ac03dbe57ab

scenarios/invite_tcp_udp_reinvite/0003_test.yml.tt2

@@ -23,7 +23,7 @@ flow:
       $avp(proto): ["tcp"]
 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_reinvite/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_reinvite/0023_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: \d+ 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: \d+ BYE',
       'Max-Forwards: 68',
       'Content-Length: 0',