TT#116103 scenarios/invite_outgoing_lock

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

Change-Id: I346c7c19704bd738bd1a857ebe3705187228b939

scenarios/invite_outgoing_lock/0001_test.yml.tt2

@@ -25,7 +25,7 @@ sip_in:
   - 'From: <sip:[% scenarios.0.username %]@invite-outgoing-lock.scenarios.test'
   - 'To: <sip:[% invite_outgoing_lock_scenarios_test.testuser1001.phone_number %]@invite-outgoing-lock.scenarios.test>'
   - '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_outgoing_lock/0003_test.yml.tt2

@@ -81,7 +81,7 @@ sip_in:
   - 'From: <sip:[% scenarios.0.username %]@invite-outgoing-lock.scenarios.test'
   - 'To: <sip:[% invite_outgoing_lock_scenarios_test.testuser1001.phone_number %]@invite-outgoing-lock.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'
 sip_out:
   - [

scenarios/invite_outgoing_lock/sipp_scenario00.xml

@@ -10,7 +10,7 @@
       To: <sip:[field1 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"]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv"]@[local_ip]:[local_port]>
       Max-Forwards: 70
       Content-Type: application/sdp
       Content-Length: [len]
@@ -40,7 +40,7 @@
       To: <sip:[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
 
@@ -58,7 +58,7 @@
       To: <sip:[field1 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"]@[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