TT#140851 re-enable invite_announce_before_call

Change-Id: Icfc1b88f103d7bc18f1669078c61b1947e5ed6a3

scenarios/invite_announce_before_call/0011_test.yml.tt2

@@ -123,7 +123,7 @@ sip_in:
   - 'From: <sip:[% scenarios.0.username %]@invite-announce-before-call.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-announce-before-call.scenarios.test>'
   - 'CSeq: \d+ INVITE'
-  - 'Contact: <sip:testuser1002@10.20.29.2:51602;alias=10.20.29.2~51602~1>'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'Proxy-Authorization: Digest username="testuser1002",realm="invite-announce-before-call.scenarios.test",uri="sip:[% server_ip %]:5060",nonce=".+",response=".+",algorithm=MD5'
   - 'Content-Type: application/sdp'
   - 'P-NGCP-Src-Port: \d+'

scenarios/invite_announce_before_call/0029_test.yml.tt2

@@ -142,7 +142,7 @@ sip_out:
       'From: <sip:[% scenarios.1.username %]@invite-announce-before-call.scenarios.test>;tag=[\w-]+',
       'To: <sip:[% scenarios.1.responders.0.username %]@invite-announce-before-call.scenarios.test>',
       'CSeq: \d+ INVITE',
-      'P-NGCP-Caller-Info: <sip:[% scenarios.1.username %]@invite-announce-before-call.scenarios.test>;ip=10.20.29.2;port=51604;primary=4311000',
+      'P-NGCP-Caller-Info: <sip:[% scenarios.1.username %]@invite-announce-before-call.scenarios.test>;ip=[% scenarios.1.ip %];port=[% scenarios.1.port %];primary=[% invite_announce_before_call_scenarios_test.testuser1002.phone_number %]',
       'P-Caller-UUID: [% invite_announce_before_call_scenarios_test.testuser1002.uuid %]',
       'Server: Sipwise NGCP Proxy',
       'Content-Length: 0',

scenarios/invite_announce_before_call/0031_test.yml.tt2

@@ -116,7 +116,7 @@ sip_out:
       'Content-Length: 0',
     ]
   - [
-      'INVITE sip:[% scenarios.1.responders.0.username %]@10.20.29.2:51605 SIP/2.0',
+      'INVITE sip:[% scenarios.1.responders.0.username %]@[% scenarios.1.responders.0.ip %]:[% scenarios.1.responders.0.port %] SIP/2.0',
       'From: <sip:[% invite_announce_before_call_scenarios_test.testuser1002.phone_number %]@invite-announce-before-call.scenarios.test>;tag=[\w-]+',
       'To: <sip:[% scenarios.1.responders.0.username %]@invite-announce-before-call.scenarios.test>',
       'CSeq: \d+ INVITE',

scenarios/invite_announce_before_call/0033_test.yml.tt2

@@ -28,7 +28,7 @@ sip_out:
       'Content-Length: 0',
     ]
   - [
-      'INVITE sip:[% scenarios.1.responders.0.username %]@10.20.29.2:51605 SIP/2.0',
+      'INVITE sip:[% scenarios.1.responders.0.username %]@[% scenarios.1.responders.0.ip %]:[% scenarios.1.responders.0.port %] SIP/2.0',
       'From: <sip:[% invite_announce_before_call_scenarios_test.testuser1002.phone_number %]@invite-announce-before-call.scenarios.test>;tag=[\w-]+',
       'To: <sip:[% scenarios.1.responders.0.username %]@invite-announce-before-call.scenarios.test>',
       'CSeq: \d+ INVITE',

scenarios/invite_announce_before_call/0065_test.yml.tt2

@@ -116,11 +116,11 @@ sip_out:
       'Content-Length: 0',
     ]
   - [
-      'INVITE sip:[% scenarios.3.responders.0.username %]@10.20.29.2:51609 SIP/2.0',
-      'From: <sip:4311000@invite-announce-before-call.scenarios.test>;tag=[\w-]+',
+      'INVITE sip:[% scenarios.3.responders.0.username %]@',
+      'From: <sip:[% invite_announce_before_call_scenarios_test.testuser1002.phone_number %]@invite-announce-before-call.scenarios.test>;tag=[\w-]+',
       'To: <sip:[% scenarios.3.responders.0.username %]@invite-announce-before-call.scenarios.test>',
       'CSeq: \d+ INVITE',
-      'Contact: <sip:[% scenarios.3.username %]@10.20.29.2:51608;alias=10.20.29.2~51608~1>',
+      'Contact: <sip:[% scenarios.3.username %]@[% scenarios.0.ip %]:[% scenarios.3.port %](;[^>]+)?>',
       'P-Early-Media: supported,recvonly',
       'Content-Type: application/sdp',
       'Content-Length:\s+\d+',

scenarios/invite_announce_before_call/scenario.yml

@@ -6,7 +6,7 @@ domains:
 customers:
   'customer.test':
     contacts:
-      - email: "customer.test@invite-announce-before-call.scenarios.test"
+      - email: "customer.test@spce.test"
         reseller_id: 1
     details:
       status: 'active'
@@ -48,7 +48,7 @@ subscribers:
       alias_numbers:
         - cc: 34
           ac: 96
-          sn: 5711941
+          sn: 5711948
 scenarios:
   - ip: 127.126.0.1
     username: testuser1002
@@ -58,27 +58,27 @@ scenarios:
         username: testuser1003
         domain: invite-announce-before-call.scenarios.test
         register: 'yes'
-  - ip: 127.126.0.1
+  - ip: 127.126.0.2
     username: testuser1002
     domain: invite-announce-before-call.scenarios.test
     responders:
-      - ip: 127.1.0.1
+      - ip: 127.1.0.2
         username: testuser1004
         domain: invite-announce-before-call.scenarios.test
         register: 'yes'
-  - ip: 127.126.0.1
+  - ip: 127.126.0.3
     username: testuser1002
     domain: invite-announce-before-call.scenarios.test
     responders:
-      - ip: 127.1.0.1
+      - ip: 127.1.0.3
         username: testuser1005
         domain: invite-announce-before-call.scenarios.test
         register: 'yes'
-  - ip: 127.126.0.1
+  - ip: 127.126.0.4
     username: testuser1002
     domain: invite-announce-before-call.scenarios.test
     responders:
-      - ip: 127.1.0.1
+      - ip: 127.1.0.4
         username: testuser1006
         domain: invite-announce-before-call.scenarios.test
         register: 'yes'