TT#116103 scenarios/invite_conference_update

* Contact with <> format
* tests:
  - add received Contact parameter as optional
* soundsets.yml: use unique name

Change-Id: I18fa24635f93a40a5b50580ab73a8a06561ce933

scenarios/invite_conference_update/0001_test.yml.tt2

@@ -22,7 +22,7 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^INVITE sip:testuser1001@'
-  - 'Contact: sip:testuser1002@'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'To: <sip:testuser1001@'
   - 'CSeq: 1 INVITE'
   - 'Max-Forwards: 69'

scenarios/invite_conference_update/0003_test.yml.tt2

@@ -159,7 +159,7 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^INVITE'
-  - 'Contact: sip:testuser1002@'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'CSeq: 2 INVITE'
   - 'Max-Forwards: 69'
   - 'Content-Type: application/sdp'

scenarios/invite_conference_update/0008_test.yml.tt2

@@ -21,7 +21,7 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
-  - 'Contact: sip:testuser1002@'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'CSeq: 2 ACK'
   - 'Max-Forwards: 69'
   - 'Content-Length: 0'
@@ -30,7 +30,7 @@ sip_in:
 sip_out:
   - [
       '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
-      'Contact: sip:testuser1002@',
+      'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>',
       'CSeq: 2 ACK',
       'Max-Forwards: 68',
       'Content-Length: 0',

scenarios/invite_conference_update/0010_test.yml.tt2

@@ -21,7 +21,7 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^UPDATE sip:127.0.0.1:5080(;prxroute=1)?(;transport=udp)? SIP/2.0'
-  - 'Contact: sip:testuser1002@'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'CSeq: 3 UPDATE'
   - 'Max-Forwards: 69'
   - 'Content-Length: 0'
@@ -38,7 +38,7 @@ sip_out:
     ]
   - [
       '^UPDATE sip:127.0.0.1:5080(;prxroute=1)?(;transport=udp)? SIP/2.0',
-      'Contact: sip:testuser1002@',
+      'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>',
       'CSeq: 3 UPDATE',
       'Max-Forwards: 68',
       'Content-Length: 0',

scenarios/invite_conference_update/0013_test.yml.tt2

@@ -27,7 +27,7 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^BYE sip:127.0.0.1:5080(;prxroute=1)?(;transport=udp)? SIP/2.0'
-  - 'Contact: sip:testuser1002@'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'CSeq: 4 BYE'
   - 'Max-Forwards: 69'
   - 'Content-Length: 0'
@@ -44,7 +44,7 @@ sip_out:
     ]
   - [
       '^BYE sip:127.0.0.1:5080(;prxroute=1)?(;transport=udp)? SIP/2.0',
-      'Contact: sip:testuser1002@',
+      'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>',
       'CSeq: 4 BYE',
       'Max-Forwards: 68',
       'Content-Length: 0',

scenarios/invite_conference_update/prefs.json.tt2

@@ -1,5 +1,5 @@
 {
     "@invite-conference-update.scenarios.test": {
-            "sound_set": "default_soundset"
+            "sound_set": "invite_conference_update"
     }
 }

scenarios/invite_conference_update/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"]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv"]@[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"]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv"]@[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"]@[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
@@ -102,7 +102,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
 
@@ -127,7 +127,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 UPDATE
-      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv"]@[local_ip]:[local_port]>
       [routes]
       Max-Forwards: 70
       Content-Length: 0
@@ -150,7 +150,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: 4 BYE
-      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv"]@[local_ip]:[local_port]>
       [routes]
       Max-Forwards: 70
       Content-Length: 0

scenarios/invite_conference_update/soundsets.yml

@@ -1,6 +1,6 @@
 ---
 soundsets:
-  'default_soundset':
+  'invite_conference_update':
     reseller_id: 1
     sounds:
       conference_first: