From bf6be15f64ca538b15b11537c0cbae44c7e662f5 Mon Sep 17 00:00:00 2001
From: Victor Seva <vseva@sipwise.com>
Date: Wed, 21 Apr 2021 12:30:30 +0200
Subject: [PATCH] TT#116100 scenarios/invite_redirect

* domain per scenario
* dynamic IP/port and numbers

Change-Id: I4f7cca53468c6e720580b25df1918124f8ecf8c4
---
 scenarios/invite_redirect/0005_test.yml.tt2   | 12 +--
 scenarios/invite_redirect/0006_test.yml.tt2   |  6 +-
 scenarios/invite_redirect/0007_test.yml.tt2   | 82 +++++++++----------
 scenarios/invite_redirect/0009_test.yml.tt2   | 32 ++++----
 scenarios/invite_redirect/0012_test.yml.tt2   | 60 +++++++-------
 scenarios/invite_redirect/0014_test.yml.tt2   | 48 +++++------
 scenarios/invite_redirect/0018_test.yml.tt2   |  8 +-
 scenarios/invite_redirect/0020_test.yml.tt2   | 20 ++---
 scenarios/invite_redirect/0021_test.yml.tt2   | 12 +--
 scenarios/invite_redirect/0023_test.yml.tt2   | 16 ++--
 scenarios/invite_redirect/0026_test.yml.tt2   |  8 +-
 scenarios/invite_redirect/cdr_test.yml.tt2    | 24 +++---
 .../{prefs.json => prefs.json.tt2}            |  4 +-
 scenarios/invite_redirect/scenario.yml        | 15 ++--
 .../sipp_scenario_responder00.xml             |  2 +-
 15 files changed, 175 insertions(+), 174 deletions(-)
 rename scenarios/invite_redirect/{prefs.json => prefs.json.tt2} (51%)

diff --git a/scenarios/invite_redirect/0005_test.yml.tt2 b/scenarios/invite_redirect/0005_test.yml.tt2
index 2ed92a4e..3f696341 100644
--- a/scenarios/invite_redirect/0005_test.yml.tt2
+++ b/scenarios/invite_redirect/0005_test.yml.tt2
@@ -22,8 +22,8 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^INVITE'
-  - 'Contact: sip:testuser1002@'
-  - 'To: <sip:testuser1003@'
+  - 'Contact: sip:[% scenarios.0.username %]@'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@'
   - 'CSeq: 1 INVITE'
   - 'Max-Forwards: 69'
   - 'Content-Type: application/sdp'
@@ -31,12 +31,12 @@ sip_out:
   - [
       '^SIP/2.0 100 Trying',
       'CSeq: 1 INVITE',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1003@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
   - [
       '^SIP/2.0 407 Proxy Authentication Required',
       'CSeq: 1 INVITE',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1003@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
diff --git a/scenarios/invite_redirect/0006_test.yml.tt2 b/scenarios/invite_redirect/0006_test.yml.tt2
index 2914e5cf..295939ea 100644
--- a/scenarios/invite_redirect/0006_test.yml.tt2
+++ b/scenarios/invite_redirect/0006_test.yml.tt2
@@ -1,9 +1,9 @@
 flow:
   - start|sl:filtered-ack:
 sip_in:
-  - 'ACK sip:testuser1003@spce.test SIP/2.0'
-  - 'From: <sip:testuser1002@spce.test>;tag=[\w-]+'
-  - 'To: <sip:testuser1003@spce.test>;tag=[\w-]+'
+  - 'ACK sip:[% scenarios.0.responders.0.username %]@invite-redirect.scenarios.test SIP/2.0'
+  - 'From: <sip:[% scenarios.0.username %]@invite-redirect.scenarios.test>;tag=[\w-]+'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-redirect.scenarios.test>;tag=[\w-]+'
   - 'CSeq: \d+ ACK'
   - 'Content-Length: 0'
 sip_out: []
diff --git a/scenarios/invite_redirect/0007_test.yml.tt2 b/scenarios/invite_redirect/0007_test.yml.tt2
index 1a3153c8..81de4b6f 100644
--- a/scenarios/invite_redirect/0007_test.yml.tt2
+++ b/scenarios/invite_redirect/0007_test.yml.tt2
@@ -17,12 +17,12 @@ flow:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
   - start|ROUTE_AUTH_HELPER:
-      $x_hdr(From): spce.test
-      $var(realm_user): testuser1002
-      $var(realm_domain): spce.test
+      $x_hdr(From): invite-redirect.scenarios.test
+      $var(realm_user): [% scenarios.0.username %]
+      $var(realm_domain): invite-redirect.scenarios.test
   - return|ROUTE_AUTH_HELPER:
-      $avp(orig_acc_caller_user): ['testuser1002']
-      $avp(orig_acc_caller_domain): ['spce.test']
+      $avp(orig_acc_caller_user): ['[% scenarios.0.username %]']
+      $avp(orig_acc_caller_domain): ['invite-redirect.scenarios.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - start|ROUTE_ADD_CALLINFO_CALLER_PRIMARY:
   - return|ROUTE_ADD_CALLINFO_CALLER_PRIMARY:
@@ -65,10 +65,10 @@ flow:
   - return|ROUTE_SET_CALLEE_DIALOG:
       $avp(lua_dlg_profile): [
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_redirect_scenarios_test.testuser1003.uuid %]",
         "total",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]"
+        "user:[% invite_redirect_scenarios_test.testuser1003.uuid %]"
       ]
   - start|ROUTE_BLOCK_IN:
   - return|ROUTE_BLOCK_IN:
@@ -102,29 +102,29 @@ flow:
       $avp(lua_dlg_profile): [
         "local",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_redirect_scenarios_test.testuser1003.uuid %]",
         "total",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]"
+        "user:[% invite_redirect_scenarios_test.testuser1003.uuid %]"
       ]
   - start|ROUTE_CNT_DLG_CHECK:
   - return|ROUTE_CNT_DLG_CHECK:
   - return|ROUTE_SET_CALLER_DIALOG:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
-        "userout:[% spce_test.testuser1002.uuid %]",
+        "userout:[% invite_redirect_scenarios_test.testuser1002.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1002.uuid %]",
+        "user:[% invite_redirect_scenarios_test.testuser1002.uuid %]",
         "totalaccountout:[% customer_test.id %]",
-        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totaluserout:[% invite_redirect_scenarios_test.testuser1002.uuid %]",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totaluser:[% invite_redirect_scenarios_test.testuser1002.uuid %]",
         "local",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_redirect_scenarios_test.testuser1003.uuid %]",
         "total",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]"
+        "user:[% invite_redirect_scenarios_test.testuser1003.uuid %]"
       ]
   - start|ROUTE_ACC_CALLER:
   - start|ROUTE_SET_ACC_CALLER_CALL_COUNTERS:
@@ -192,58 +192,58 @@ flow:
   - exit|ROUTE_EXIT:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
-        "userout:[% spce_test.testuser1002.uuid %]",
+        "userout:[% invite_redirect_scenarios_test.testuser1002.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1002.uuid %]",
+        "user:[% invite_redirect_scenarios_test.testuser1002.uuid %]",
         "totalaccountout:[% customer_test.id %]",
-        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totaluserout:[% invite_redirect_scenarios_test.testuser1002.uuid %]",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totaluser:[% invite_redirect_scenarios_test.testuser1002.uuid %]",
         "local",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_redirect_scenarios_test.testuser1003.uuid %]",
         "total",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]"
+        "user:[% invite_redirect_scenarios_test.testuser1003.uuid %]"
       ]
 sip_in:
-  - '^INVITE sip:testuser1003@'
-  - 'From: <sip:testuser1002@'
-  - 'To: <sip:testuser1003@'
+  - '^INVITE sip:[% scenarios.0.responders.0.username %]@'
+  - 'From: <sip:[% scenarios.0.username %]@'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@'
   - 'CSeq: 2 INVITE'
-  - 'Contact: sip:testuser1002@'
+  - 'Contact: sip:[% scenarios.0.username %]@'
   - 'Max-Forwards: 69'
-  - 'Proxy-Authorization: Digest username="testuser1002"'
+  - 'Proxy-Authorization: Digest username="[% scenarios.0.username %]"'
   - 'Content-Type: application/sdp'
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1003@',
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@',
       'CSeq: 2 INVITE',
       'Content-Length: 0'
     ]
   - [
       '^SIP/2.0 101 Connecting',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1003@',
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@',
       'CSeq: 2 INVITE',
-      'P-NGCP-Authorization: testuser1002@',
+      'P-NGCP-Authorization: [% scenarios.0.username %]@',
       'P-NGCP-Authorized: 1',
       'Content-Length: 0'
     ]
   - [
-      '^INVITE sip:testuser1003@',
-      'From: <sip:4311002@',
-      'To: <sip:testuser1003@',
+      '^INVITE sip:[% scenarios.0.responders.0.username %]@',
+      'From: <sip:[% invite_redirect_scenarios_test.testuser1002.phone_number %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@',
       'CSeq: 2 INVITE',
-      'Contact: sip:testuser1002@',
+      'Contact: sip:[% scenarios.0.username %]@',
       'Content-Type: application/sdp',
-      'P-Caller-UUID: [% spce_test.testuser1002.uuid %]',
-      'P-Callee-UUID: [% spce_test.testuser1003.uuid %]',
-      'P-Asserted-Identity: <sip:4311002@',
-      'P-Called-Party-ID: <sip:testuser1003@',
+      'P-Caller-UUID: [% invite_redirect_scenarios_test.testuser1002.uuid %]',
+      'P-Callee-UUID: [% invite_redirect_scenarios_test.testuser1003.uuid %]',
+      'P-Asserted-Identity: <sip:[% invite_redirect_scenarios_test.testuser1002.phone_number %]@',
+      'P-Called-Party-ID: <sip:[% scenarios.0.responders.0.username %]@',
       'P-App-Name: sbc',
-      'P-NGCP-Caller-Info: <sip:testuser1002@',
-      'P-NGCP-Callee-Info: <sip:testuser1003@'
+      'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@',
+      'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@'
     ]
diff --git a/scenarios/invite_redirect/0009_test.yml.tt2 b/scenarios/invite_redirect/0009_test.yml.tt2
index a5d7e511..377be9c1 100644
--- a/scenarios/invite_redirect/0009_test.yml.tt2
+++ b/scenarios/invite_redirect/0009_test.yml.tt2
@@ -13,15 +13,15 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - 'INVITE sip:testuser1003@127.1.0.1:\d+ SIP/2.0'
-  - 'From: <sip:4311002@spce.test>;tag=[\w-]+'
-  - 'To: <sip:testuser1003@spce.test>'
+  - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
+  - 'From: <sip:[% invite_redirect_scenarios_test.testuser1002.phone_number %]@invite-redirect.scenarios.test>;tag=[\w-]+'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-redirect.scenarios.test>'
   - 'CSeq: \d+ INVITE'
   - 'P-LB-Uptime: \d+'
-  - 'P-Asserted-Identity: <sip:4311002@spce.test>'
-  - 'P-Caller-UUID: [% spce_test.testuser1002.uuid %]'
-  - 'P-NGCP-Caller-Info: <sip:testuser1002@spce.test>;ip=127.126.0.1;port=\d+;primary=4311002'
-  - 'P-NGCP-Callee-Info: <sip:testuser1003@spce.test>;ip=127.0.0.1;port=5060;primary=4311003'
+  - 'P-Asserted-Identity: <sip:[% invite_redirect_scenarios_test.testuser1002.phone_number %]@invite-redirect.scenarios.test>'
+  - 'P-Caller-UUID: [% invite_redirect_scenarios_test.testuser1002.uuid %]'
+  - 'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@invite-redirect.scenarios.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_redirect_scenarios_test.testuser1002.phone_number %]'
+  - 'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-redirect.scenarios.test>;ip=127.0.0.1;port=5060;primary=[% invite_redirect_scenarios_test.testuser1003.phone_number %]'
   - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060'
   - 'Content-Type: application/sdp'
   - 'Contact: <sip:127.0.0.1:508[08];transport=udp>'
@@ -29,22 +29,22 @@ sip_in:
 sip_out:
   - [
       'SIP/2.0 100 Trying',
-      'From: <sip:4311002@spce.test>;tag=[\w-]+',
-      'To: <sip:testuser1003@spce.test>',
+      'From: <sip:[% invite_redirect_scenarios_test.testuser1002.phone_number %]@invite-redirect.scenarios.test>;tag=[\w-]+',
+      'To: <sip:[% scenarios.0.responders.0.username %]@invite-redirect.scenarios.test>',
       'CSeq: \d+ INVITE',
       'Server: Sipwise NGCP Proxy',
       'Content-Length: 0',
     ]
   - [
-      'INVITE sip:testuser1003@127.1.0.1:\d+ SIP/2.0',
-      'From: <sip:4311002@spce.test>;tag=[\w-]+',
-      'To: <sip:testuser1003@spce.test>',
+      'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0',
+      'From: <sip:[% invite_redirect_scenarios_test.testuser1002.phone_number %]@invite-redirect.scenarios.test>;tag=[\w-]+',
+      'To: <sip:[% scenarios.0.responders.0.username %]@invite-redirect.scenarios.test>',
       'CSeq: \d+ INVITE',
       'P-LB-Uptime: \d+',
-      'P-Asserted-Identity: <sip:4311002@spce.test>',
-      'P-Caller-UUID: [% spce_test.testuser1002.uuid %]',
-      'P-NGCP-Caller-Info: <sip:testuser1002@spce.test>;ip=127.126.0.1;port=\d+;primary=4311002',
-      'P-NGCP-Callee-Info: <sip:testuser1003@spce.test>;ip=127.0.0.1;port=5060;primary=4311003',
+      'P-Asserted-Identity: <sip:[% invite_redirect_scenarios_test.testuser1002.phone_number %]@invite-redirect.scenarios.test>',
+      'P-Caller-UUID: [% invite_redirect_scenarios_test.testuser1002.uuid %]',
+      'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@invite-redirect.scenarios.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_redirect_scenarios_test.testuser1002.phone_number %]',
+      'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-redirect.scenarios.test>;ip=127.0.0.1;port=5060;primary=[% invite_redirect_scenarios_test.testuser1003.phone_number %]',
       'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060',
       'Content-Type: application/sdp',
       'Contact: <sip:127.0.0.1:508[08];transport=udp>',
diff --git a/scenarios/invite_redirect/0012_test.yml.tt2 b/scenarios/invite_redirect/0012_test.yml.tt2
index 33c07ffe..6c303a6f 100644
--- a/scenarios/invite_redirect/0012_test.yml.tt2
+++ b/scenarios/invite_redirect/0012_test.yml.tt2
@@ -41,19 +41,19 @@ flow:
   - return|ROUTE_SET_CALLEE_DIALOG:
       $avp(lua_dlg_profile): [
           "accountout:[% customer_test.id %]",
-          "userout:[% spce_test.testuser1002.uuid %]",
+          "userout:[% invite_redirect_scenarios_test.testuser1002.uuid %]",
           "account:[% customer_test.id %]",
-          "user:[% spce_test.testuser1002.uuid %]",
+          "user:[% invite_redirect_scenarios_test.testuser1002.uuid %]",
           "totalaccountout:[% customer_test.id %]",
-          "totaluserout:[% spce_test.testuser1002.uuid %]",
+          "totaluserout:[% invite_redirect_scenarios_test.testuser1002.uuid %]",
           "totalaccount:[% customer_test.id %]",
-          "totaluser:[% spce_test.testuser1002.uuid %]",
+          "totaluser:[% invite_redirect_scenarios_test.testuser1002.uuid %]",
           "local",
           "totalaccount:[% customer_test.id %]",
-          "totaluser:[% spce_test.testuser1003.uuid %]",
+          "totaluser:[% invite_redirect_scenarios_test.testuser1003.uuid %]",
           "total",
           "account:[% customer_test.id %]",
-          "user:[% spce_test.testuser1003.uuid %]"
+          "user:[% invite_redirect_scenarios_test.testuser1003.uuid %]"
         ]
   - start|ROUTE_BLOCK_IN:
   - return|ROUTE_BLOCK_IN:
@@ -152,51 +152,51 @@ flow:
   - exit|ROUTE_EXIT:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
-        "userout:[% spce_test.testuser1002.uuid %]",
+        "userout:[% invite_redirect_scenarios_test.testuser1002.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1002.uuid %]",
+        "user:[% invite_redirect_scenarios_test.testuser1002.uuid %]",
         "totalaccountout:[% customer_test.id %]",
-        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totaluserout:[% invite_redirect_scenarios_test.testuser1002.uuid %]",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totaluser:[% invite_redirect_scenarios_test.testuser1002.uuid %]",
         "local",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_redirect_scenarios_test.testuser1003.uuid %]",
         "total",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]"
+        "user:[% invite_redirect_scenarios_test.testuser1003.uuid %]"
       ]
   - exit|ROUTE_EXIT:
 sip_in:
   - '^SIP/2.0 302 Moved Temporarily'
-  - 'From: <sip:4311002@'
-  - 'To: <sip:testuser1003@'
+  - 'From: <sip:[% invite_redirect_scenarios_test.testuser1002.phone_number %]@'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@'
   - 'CSeq: 2 INVITE'
 sip_out:
   - [
-      '^ACK sip:testuser1003@',
-      'From: <sip:4311002@',
-      'To: <sip:testuser1003@',
+      '^ACK sip:[% scenarios.0.responders.0.username %]@',
+      'From: <sip:[% invite_redirect_scenarios_test.testuser1002.phone_number %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@',
       'CSeq: 2 ACK',
       'Max-Forwards: 68',
       'Content-Length: 0'
     ]
   - [
-      '^INVITE sip:testuser1004@',
-      'From: <sip:4311002@',
-      'To: <sip:testuser1003@',
+      '^INVITE sip:[% scenarios.0.responders.1.username %]@',
+      'From: <sip:[% invite_redirect_scenarios_test.testuser1002.phone_number %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@',
       'CSeq: 2 INVITE',
-      'Contact: sip:testuser1002@',
+      'Contact: sip:[% scenarios.0.username %]@',
       'Max-Forwards: 68',
       'Content-Type: application/sdp',
-      'P-Caller-UUID: [% spce_test.testuser1003.uuid %]',
-      'P-Callee-UUID: [% spce_test.testuser1004.uuid %]',
-      'P-Asserted-Identity: <sip:4311002@',
-      'P-Called-Party-ID: <sip:testuser1004@',
+      'P-Caller-UUID: [% invite_redirect_scenarios_test.testuser1003.uuid %]',
+      'P-Callee-UUID: [% invite_redirect_scenarios_test.testuser1004.uuid %]',
+      'P-Asserted-Identity: <sip:[% invite_redirect_scenarios_test.testuser1002.phone_number %]@',
+      'P-Called-Party-ID: <sip:[% scenarios.0.responders.1.username %]@',
       'P-App-Name: sbc',
-      'P-NGCP-Caller-Info: <sip:testuser1002@',
-      'P-NGCP-Callee-Info: <sip:testuser1004@',
-      'Diversion: <sip:testuser1003@',
-      'History-Info: <sip:testuser1003@.*;user=phone\?Reason=SIP%3bcause%3d302>;index=1',
-      'History-Info: <sip:testuser1004@.*;user=phone;cause=302>;index=1.1'
+      'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@',
+      'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.1.username %]@',
+      'Diversion: <sip:[% scenarios.0.responders.0.username %]@',
+      'History-Info: <sip:[% scenarios.0.responders.0.username %]@.*;user=phone\?Reason=SIP%3bcause%3d302>;index=1',
+      'History-Info: <sip:[% scenarios.0.responders.1.username %]@.*;user=phone;cause=302>;index=1.1'
     ]
diff --git a/scenarios/invite_redirect/0014_test.yml.tt2 b/scenarios/invite_redirect/0014_test.yml.tt2
index 3ab27195..17513812 100644
--- a/scenarios/invite_redirect/0014_test.yml.tt2
+++ b/scenarios/invite_redirect/0014_test.yml.tt2
@@ -13,19 +13,19 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - 'INVITE sip:testuser1004@127.1.0.2:\d+;cause=302 SIP/2.0'
-  - 'From: <sip:4311002@spce.test>;tag=[\w-]+'
-  - 'To: <sip:testuser1004@spce.test>'
+  - 'INVITE sip:[% scenarios.0.responders.1.username %]@[% scenarios.0.responders.1.ip %]:[% scenarios.0.responders.1.port %];cause=302 SIP/2.0'
+  - 'From: <sip:[% invite_redirect_scenarios_test.testuser1002.phone_number %]@invite-redirect.scenarios.test>;tag=[\w-]+'
+  - 'To: <sip:[% scenarios.0.responders.1.username %]@invite-redirect.scenarios.test>'
   - 'CSeq: \d+ INVITE'
   - 'P-LB-Uptime: \d+'
-  - 'P-Asserted-Identity: <sip:4311002@spce.test>'
-  - 'History-Info: <sip:testuser1003@spce\.test:5060;user=phone\?Reason=SIP%3bcause%3d302>;index=1'
-  - 'P-Caller-UUID: [% spce_test.testuser1003.uuid %]'
-  - 'Diversion: <sip:testuser1003@spce.test>;privacy=off;counter=1'
-  - 'History-Info: <sip:testuser1004@spce\.test:5060;user=phone;cause=302>;index=1\.1'
-  - 'P-NGCP-Caller-Info: <sip:testuser1002@spce.test>;ip=127.126.0.1;port=\d+;primary=4311003'
-  - 'P-NGCP-Forward-Info: <sip:testuser1004@spce.test>;ip=127.0.0.1;port=5060;primary=4311004'
-  - 'P-NGCP-Callee-Info: <sip:testuser1004@127.1.0.2>;ip=127.0.0.1;port=5060'
+  - 'P-Asserted-Identity: <sip:[% invite_redirect_scenarios_test.testuser1002.phone_number %]@invite-redirect.scenarios.test>'
+  - 'History-Info: <sip:[% scenarios.0.responders.0.username %]@invite-redirect.scenarios.test:5060;user=phone\?Reason=SIP%3bcause%3d302>;index=1'
+  - 'P-Caller-UUID: [% invite_redirect_scenarios_test.testuser1003.uuid %]'
+  - 'Diversion: <sip:[% scenarios.0.responders.0.username %]@invite-redirect.scenarios.test>;privacy=off;counter=1'
+  - 'History-Info: <sip:[% scenarios.0.responders.1.username %]@invite-redirect.scenarios.test:5060;user=phone;cause=302>;index=1\.1'
+  - 'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@invite-redirect.scenarios.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_redirect_scenarios_test.testuser1003.phone_number %]'
+  - 'P-NGCP-Forward-Info: <sip:[% scenarios.0.responders.1.username %]@invite-redirect.scenarios.test>;ip=127.0.0.1;port=5060;primary=[% invite_redirect_scenarios_test.testuser1004.phone_number %]'
+  - 'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.1.username %]@[% scenarios.0.responders.1.ip %]>;ip=127.0.0.1;port=5060'
   - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060'
   - 'Content-Type: application/sdp'
   - 'Contact: <sip:127.0.0.1:508[08];transport=udp>'
@@ -33,26 +33,26 @@ sip_in:
 sip_out:
   - [
       'SIP/2.0 100 Trying',
-      'From: <sip:4311002@spce.test>;tag=[\w-]+',
-      'To: <sip:testuser1004@spce.test>',
+      'From: <sip:[% invite_redirect_scenarios_test.testuser1002.phone_number %]@invite-redirect.scenarios.test>;tag=[\w-]+',
+      'To: <sip:[% scenarios.0.responders.1.username %]@invite-redirect.scenarios.test>',
       'CSeq: \d+ INVITE',
       'Server: Sipwise NGCP Proxy',
       'Content-Length: 0',
     ]
   - [
-      'INVITE sip:testuser1004@127.1.0.2:\d+;cause=302 SIP/2.0',
-      'From: <sip:4311002@spce.test>;tag=[\w-]+',
-      'To: <sip:testuser1004@spce.test>',
+      'INVITE sip:[% scenarios.0.responders.1.username %]@[% scenarios.0.responders.1.ip %]:[% scenarios.0.responders.1.port %];cause=302 SIP/2.0',
+      'From: <sip:[% invite_redirect_scenarios_test.testuser1002.phone_number %]@invite-redirect.scenarios.test>;tag=[\w-]+',
+      'To: <sip:[% scenarios.0.responders.1.username %]@invite-redirect.scenarios.test>',
       'CSeq: \d+ INVITE',
       'P-LB-Uptime: \d+',
-      'P-Asserted-Identity: <sip:4311002@spce.test>',
-      'P-Caller-UUID: [% spce_test.testuser1003.uuid %]',
-      'Diversion: <sip:testuser1003@spce.test>;privacy=off;counter=1',
-      'History-Info: <sip:testuser1003@spce\.test:5060;user=phone\?Reason=SIP%3bcause%3d302>;index=1',
-      'History-Info: <sip:testuser1004@spce\.test:5060;user=phone;cause=302>;index=1\.1',
-      'P-NGCP-Caller-Info: <sip:testuser1002@spce.test>;ip=127.126.0.1;port=\d+;primary=4311003',
-      'P-NGCP-Forward-Info: <sip:testuser1004@spce.test>;ip=127.0.0.1;port=5060;primary=4311004',
-      'P-NGCP-Callee-Info: <sip:testuser1004@127.1.0.2>;ip=127.0.0.1;port=5060',
+      'P-Asserted-Identity: <sip:[% invite_redirect_scenarios_test.testuser1002.phone_number %]@invite-redirect.scenarios.test>',
+      'P-Caller-UUID: [% invite_redirect_scenarios_test.testuser1003.uuid %]',
+      'Diversion: <sip:[% scenarios.0.responders.0.username %]@invite-redirect.scenarios.test>;privacy=off;counter=1',
+      'History-Info: <sip:[% scenarios.0.responders.0.username %]@invite-redirect.scenarios.test:5060;user=phone\?Reason=SIP%3bcause%3d302>;index=1',
+      'History-Info: <sip:[% scenarios.0.responders.1.username %]@invite-redirect.scenarios.test:5060;user=phone;cause=302>;index=1\.1',
+      'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@invite-redirect.scenarios.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_redirect_scenarios_test.testuser1003.phone_number %]',
+      'P-NGCP-Forward-Info: <sip:[% scenarios.0.responders.1.username %]@invite-redirect.scenarios.test>;ip=127.0.0.1;port=5060;primary=[% invite_redirect_scenarios_test.testuser1004.phone_number %]',
+      'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.1.username %]@[% scenarios.0.responders.1.ip %]>;ip=127.0.0.1;port=5060',
       'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060',
       'Content-Type: application/sdp',
       'Contact: <sip:127.0.0.1:508[08];transport=udp>',
diff --git a/scenarios/invite_redirect/0018_test.yml.tt2 b/scenarios/invite_redirect/0018_test.yml.tt2
index 0437a2b5..d69602fe 100644
--- a/scenarios/invite_redirect/0018_test.yml.tt2
+++ b/scenarios/invite_redirect/0018_test.yml.tt2
@@ -15,12 +15,12 @@ flow:
 sip_in:
   - '^SIP/2.0 180 Ringing'
   - 'CSeq: 2 INVITE'
-  - 'From: <sip:4311002@'
-  - 'To: <sip:testuser1003@'
+  - 'From: <sip:[% invite_redirect_scenarios_test.testuser1002.phone_number %]@'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@'
 sip_out:
   - [
       '^SIP/2.0 180 Ringing',
       'CSeq: 2 INVITE',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1003@',
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@',
     ]
diff --git a/scenarios/invite_redirect/0020_test.yml.tt2 b/scenarios/invite_redirect/0020_test.yml.tt2
index c041a2dd..1bca95bf 100644
--- a/scenarios/invite_redirect/0020_test.yml.tt2
+++ b/scenarios/invite_redirect/0020_test.yml.tt2
@@ -17,30 +17,30 @@ flow:
   - return|dialog:start:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
-        "userout:[% spce_test.testuser1002.uuid %]",
+        "userout:[% invite_redirect_scenarios_test.testuser1002.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1002.uuid %]",
+        "user:[% invite_redirect_scenarios_test.testuser1002.uuid %]",
         "totalaccountout:[% customer_test.id %]",
-        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totaluserout:[% invite_redirect_scenarios_test.testuser1002.uuid %]",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totaluser:[% invite_redirect_scenarios_test.testuser1002.uuid %]",
         "local",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_redirect_scenarios_test.testuser1003.uuid %]",
         "total",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]"
+        "user:[% invite_redirect_scenarios_test.testuser1003.uuid %]"
         ]
   - return|dialog:start:
 sip_in:
   - '^SIP/2.0 200 OK'
   - 'CSeq: 2 INVITE'
-  - 'From: <sip:4311002@'
-  - 'To: <sip:testuser1003@'
+  - 'From: <sip:[% invite_redirect_scenarios_test.testuser1002.phone_number %]@'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@'
 sip_out:
   - [
       '^SIP/2.0 200 OK',
       'CSeq: 2 INVITE',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1003@',
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@',
     ]
diff --git a/scenarios/invite_redirect/0021_test.yml.tt2 b/scenarios/invite_redirect/0021_test.yml.tt2
index 8d1a4e29..3d881ab5 100644
--- a/scenarios/invite_redirect/0021_test.yml.tt2
+++ b/scenarios/invite_redirect/0021_test.yml.tt2
@@ -25,20 +25,20 @@ 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 %]@'
   - 'CSeq: 2 ACK'
   - 'Max-Forwards: 69'
   - 'Content-Length: 0'
-  - 'From: <sip:testuser1002@'
-  - 'To: <sip:testuser1003@'
+  - 'From: <sip:[% scenarios.0.username %]@'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@'
 
 sip_out:
   - [
       '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
-      'Contact: sip:testuser1002@',
+      'Contact: sip:[% scenarios.0.username %]@',
       'CSeq: 2 ACK',
       'Max-Forwards: 68',
       'Content-Length: 0',
-      'From: <sip:4311002@',
-      'To: <sip:testuser1003@'
+      'From: <sip:[% invite_redirect_scenarios_test.testuser1002.phone_number %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
diff --git a/scenarios/invite_redirect/0023_test.yml.tt2 b/scenarios/invite_redirect/0023_test.yml.tt2
index 54eac48e..f2fecb5c 100644
--- a/scenarios/invite_redirect/0023_test.yml.tt2
+++ b/scenarios/invite_redirect/0023_test.yml.tt2
@@ -29,27 +29,27 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
-  - 'Contact: sip:testuser1002@'
+  - 'Contact: sip:[% scenarios.0.username %]@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
   - 'Content-Length: 0'
-  - 'From: <sip:testuser1002@'
-  - 'To: <sip:testuser1003@'
+  - 'From: <sip:[% scenarios.0.username %]@'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@'
 
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
       'CSeq: 3 BYE',
       'Content-Length: 0',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1003@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
   - [
       '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
-      'Contact: sip:testuser1002@',
+      'Contact: sip:[% scenarios.0.username %]@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
       'Content-Length: 0',
-      'From: <sip:4311002@',
-      'To: <sip:testuser1003@'
+      'From: <sip:[% invite_redirect_scenarios_test.testuser1002.phone_number %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
diff --git a/scenarios/invite_redirect/0026_test.yml.tt2 b/scenarios/invite_redirect/0026_test.yml.tt2
index 550fc7b1..9c098cf5 100644
--- a/scenarios/invite_redirect/0026_test.yml.tt2
+++ b/scenarios/invite_redirect/0026_test.yml.tt2
@@ -16,13 +16,13 @@ sip_in:
   - '^SIP/2.0 200 OK'
   - 'CSeq: 3 BYE'
   - 'Content-Length: 0'
-  - 'From: <sip:4311002@'
-  - 'To: <sip:testuser1003@'
+  - 'From: <sip:[% invite_redirect_scenarios_test.testuser1002.phone_number %]@'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@'
 sip_out:
   - [
       '^SIP/2.0 200 OK',
       'CSeq: 3 BYE',
       'Content-Length: 0',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1003@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
diff --git a/scenarios/invite_redirect/cdr_test.yml.tt2 b/scenarios/invite_redirect/cdr_test.yml.tt2
index 177ced8e..5a0910c7 100644
--- a/scenarios/invite_redirect/cdr_test.yml.tt2
+++ b/scenarios/invite_redirect/cdr_test.yml.tt2
@@ -1,19 +1,19 @@
 cdr:
-  - source_user: 'testuser1002'
-    source_domain: 'spce.test'
-    source_cli: '4311002'
-    destination_user: 'testuser1003'
-    destination_domain: 'spce.test'
-    destination_user_dialed: 'testuser1003'
+  - source_user: '[% scenarios.0.username %]'
+    source_domain: 'invite-redirect.scenarios.test'
+    source_cli: '[% invite_redirect_scenarios_test.testuser1002.phone_number %]'
+    destination_user: '[% scenarios.0.responders.0.username %]'
+    destination_domain: 'invite-redirect.scenarios.test'
+    destination_user_dialed: '[% scenarios.0.responders.0.username %]'
     call_type: 'call'
     call_status: 'ok'
     call_code: '200'
-  - source_user: 'testuser1003'
-    source_domain: 'spce.test'
-    source_cli: '4311003'
-    destination_user: 'testuser1004'
-    destination_domain: 'spce.test'
-    destination_user_dialed: 'testuser1004'
+  - source_user: '[% scenarios.0.responders.0.username %]'
+    source_domain: 'invite-redirect.scenarios.test'
+    source_cli: '[% invite_redirect_scenarios_test.testuser1003.phone_number %]'
+    destination_user: '[% scenarios.0.responders.1.username %]'
+    destination_domain: 'invite-redirect.scenarios.test'
+    destination_user_dialed: '[% scenarios.0.responders.1.username %]'
     call_type: 'cfb'
     call_status: 'ok'
     call_code: '200'
\ No newline at end of file
diff --git a/scenarios/invite_redirect/prefs.json b/scenarios/invite_redirect/prefs.json.tt2
similarity index 51%
rename from scenarios/invite_redirect/prefs.json
rename to scenarios/invite_redirect/prefs.json.tt2
index d77e683f..30dff0dc 100644
--- a/scenarios/invite_redirect/prefs.json
+++ b/scenarios/invite_redirect/prefs.json.tt2
@@ -1,9 +1,9 @@
 {
-    "testuser1003@spce.test": {
+    "[% scenarios.0.responders.0.username %]@invite-redirect.scenarios.test": {
         "outbound_diversion": "uprn",
         "outbound_history_info": "uprn"
     },
-    "testuser1004@spce.test": {
+    "[% scenarios.0.responders.1.username %]@invite-redirect.scenarios.test": {
         "outbound_diversion": "uprn",
         "outbound_history_info": "uprn"
     }
diff --git a/scenarios/invite_redirect/scenario.yml b/scenarios/invite_redirect/scenario.yml
index 6d3c9e19..5123997d 100644
--- a/scenarios/invite_redirect/scenario.yml
+++ b/scenarios/invite_redirect/scenario.yml
@@ -1,6 +1,7 @@
+---
 test_uuid: invite_redirect
 domains:
-  'spce.test':
+  invite-redirect.scenarios.test:
     reseller_id: 1
 customers:
   'customer.test':
@@ -13,7 +14,7 @@ customers:
       billing_profile_id: 1
       reseller_id: 1
 subscribers:
-  spce.test:
+  invite-redirect.scenarios.test:
     testuser1003:
       customer: 'customer.test'
       password: testuser
@@ -35,13 +36,13 @@ subscribers:
 scenarios:
   - ip: 127.126.0.1
     username: testuser1002
-    domain: spce.test
+    domain: invite-redirect.scenarios.test
     responders:
       - ip: 127.1.0.1
         username: testuser1003
-        domain: spce.test
-        register: yes
+        domain: invite-redirect.scenarios.test
+        register: 'yes'
       - ip: 127.1.0.2
         username: testuser1004
-        domain: spce.test
-        register: yes
+        domain: invite-redirect.scenarios.test
+        register: 'yes'
diff --git a/scenarios/invite_redirect/sipp_scenario_responder00.xml b/scenarios/invite_redirect/sipp_scenario_responder00.xml
index ec9b3eee..3f168040 100644
--- a/scenarios/invite_redirect/sipp_scenario_responder00.xml
+++ b/scenarios/invite_redirect/sipp_scenario_responder00.xml
@@ -14,7 +14,7 @@
       [last_To:];tag=[pid]SIPpTag01[call_number]
       [last_Call-ID:]
       [last_CSeq:]
-      Contact: <sip:testuser1004@spce.test;transport=[transport]>
+      Contact: <sip:testuser1004@invite-redirect.scenarios.test;transport=[transport]>
       Content-Length: 0
 
     ]]>