TT#116103 scenarios/invite_trusted_anonymous

* use server_ip from scenario_ids.yml
* Contact with <> format
* tests:
  - add received Contact parameter as optional
* trusted: add domain to from_pattern
  so it doesn't affect other scenarios

Change-Id: I070ed048309b5ec8d4d801e5084d9c3dd5c35971

scenarios/invite_trusted_anonymous/0003_test.yml.tt2

@@ -189,7 +189,7 @@ flow:
 sip_in:
   - '^INVITE'
   - 'From: "Anonymous" <sip:anonymous@anonymous.invalid>;tag='
-  - 'Contact: sip:[% scenarios.0.username %]@'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'CSeq: 1 INVITE'
   - 'P-Asserted-Identity: "long name here" <sip:[% scenarios.0.username %]@invite-trusted-anonymous.scenarios.test>'
   - 'Max-Forwards: 69'

scenarios/invite_trusted_anonymous/0005_test.yml.tt2

@@ -20,9 +20,9 @@ sip_in:
   - 'P-LB-Uptime: \d+'
   - 'Privacy: id'
   - 'P-Caller-UUID: [% invite_trusted_anonymous_scenarios_test.testuser1002.uuid %]'
-  - 'P-NGCP-Caller-Info: <sip:anonymous@anonymous.invalid>;ip=127.126.0.1;port=\d+;primary=[% invite_trusted_anonymous_scenarios_test.testuser1002.phone_number %]'
-  - 'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-trusted-anonymous.scenarios.test>;ip=127.0.0.1;port=5060;primary=[% invite_trusted_anonymous_scenarios_test.testuser1003.phone_number %]'
-  - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060'
+  - 'P-NGCP-Caller-Info: <sip:anonymous@anonymous.invalid>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_trusted_anonymous_scenarios_test.testuser1002.phone_number %]'
+  - 'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-trusted-anonymous.scenarios.test>;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %];primary=[% invite_trusted_anonymous_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+'
@@ -43,9 +43,9 @@ sip_out:
       'P-LB-Uptime: \d+',
       'Privacy: id',
       'P-Caller-UUID: [% invite_trusted_anonymous_scenarios_test.testuser1002.uuid %]',
-      'P-NGCP-Caller-Info: <sip:anonymous@anonymous.invalid>;ip=127.126.0.1;port=\d+;primary=[% invite_trusted_anonymous_scenarios_test.testuser1002.phone_number %]',
-      'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-trusted-anonymous.scenarios.test>;ip=127.0.0.1;port=5060;primary=[% invite_trusted_anonymous_scenarios_test.testuser1003.phone_number %]',
-      'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060',
+      'P-NGCP-Caller-Info: <sip:anonymous@anonymous.invalid>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_trusted_anonymous_scenarios_test.testuser1002.phone_number %]',
+      'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-trusted-anonymous.scenarios.test>;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %];primary=[% invite_trusted_anonymous_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_trusted_anonymous/0013_test.yml.tt2

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

scenarios/invite_trusted_anonymous/sipp_scenario00.xml

@@ -11,7 +11,7 @@
       Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 1 INVITE
       P-Asserted-Identity: "long name here" <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>
-      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]
@@ -51,7 +51,7 @@
       [routes]
       CSeq: 1 ACK
       P-Asserted-Identity: "long name here" <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>
-      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
 
@@ -77,7 +77,7 @@
       Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 2 BYE
       P-Asserted-Identity: "long name here" <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>
-      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_trusted_anonymous/trusted.yml.tt2

@@ -1,5 +1,5 @@
 ---
 [% scenarios.0.username %]@invite-trusted-anonymous.scenarios.test:
-  from_pattern: 1002
+  from_pattern: 1002@invite-trusted-anonymous.scenarios.test
   protocol: UDP
   src_ip: [% scenarios.0.ip %]