From aea33069f13e59a56e0c275cd9b5368640ce4a85 Mon Sep 17 00:00:00 2001
From: Victor Seva <vseva@sipwise.com>
Date: Tue, 13 Apr 2021 09:48:40 +0200
Subject: [PATCH] TT#116100 scenarios/incoming_hih

* domain per scenario
* dynamic IP/port and numbers
* dynamic prefs/configs

Change-Id: I1280e6f348609d64653705ebf3192ccfeb00c049
---
 scenarios/incoming_hih/0003_test.yml.tt2      | 34 +++++------
 scenarios/incoming_hih/0005_test.yml.tt2      | 56 +++++++++----------
 scenarios/incoming_hih/0007_test.yml.tt2      | 48 ++++++++--------
 scenarios/incoming_hih/0014_test.yml.tt2      |  8 +--
 scenarios/incoming_hih/0015_test.yml.tt2      | 12 ++--
 scenarios/incoming_hih/0018_test.yml.tt2      | 16 +++---
 scenarios/incoming_hih/0019_test.yml.tt2      | 12 ++--
 scenarios/incoming_hih/0022_test.yml.tt2      |  8 +--
 scenarios/incoming_hih/0023_test.yml.tt2      |  8 +--
 .../{callforward.yml => callforward.yml.tt2}  |  4 +-
 scenarios/incoming_hih/cdr_test.yml.tt2       | 20 +++----
 scenarios/incoming_hih/peer.yml               | 16 +++---
 scenarios/incoming_hih/prefs.json             |  8 ---
 scenarios/incoming_hih/prefs.json.tt2         |  8 +++
 scenarios/incoming_hih/scenario.yml           | 20 ++++---
 scenarios/incoming_hih/sipp_scenario00.xml    |  4 +-
 16 files changed, 142 insertions(+), 140 deletions(-)
 rename scenarios/incoming_hih/{callforward.yml => callforward.yml.tt2} (67%)
 delete mode 100644 scenarios/incoming_hih/prefs.json
 create mode 100644 scenarios/incoming_hih/prefs.json.tt2

diff --git a/scenarios/incoming_hih/0003_test.yml.tt2 b/scenarios/incoming_hih/0003_test.yml.tt2
index 939469dc..d9eb8279 100644
--- a/scenarios/incoming_hih/0003_test.yml.tt2
+++ b/scenarios/incoming_hih/0003_test.yml.tt2
@@ -51,9 +51,9 @@ flow:
   - return|ROUTE_SET_CALLEE_DIALOG:
      $avp(lua_dlg_profile): [
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% incoming_hih_scenarios_test.testuser1003.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]",
+        "user:[% incoming_hih_scenarios_test.testuser1003.uuid %]",
         "peer:[% peer_00_host0.id %]", "total"
       ]
   - start|ROUTE_BLOCK_IN:
@@ -99,9 +99,9 @@ flow:
   - return|ROUTE_SET_CALLER_DIALOG:
       $avp(lua_dlg_profile): [
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% incoming_hih_scenarios_test.testuser1003.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]",
+        "user:[% incoming_hih_scenarios_test.testuser1003.uuid %]",
         "peer:[% peer_00_host0.id %]", "total"
       ]
   - start|ROUTE_SET_ACC_CALLER_CALL_COUNTERS:
@@ -136,8 +136,8 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^INVITE sip:4311003@'
-  - 'Contact: sip:004321001@'
+  - '^INVITE sip:[% incoming_hih_scenarios_test.testuser1003.phone_number %]@'
+  - 'Contact: sip:[% scenarios.0.username %]@'
   - 'CSeq: 1 INVITE'
   - 'Max-Forwards: 69'
   - 'Content-Type: application/sdp'
@@ -145,27 +145,27 @@ sip_out:
   - [
       '^SIP/2.0 100 Trying',
       'CSeq: 1 INVITE',
-      'From: <sip:004321001@',
-      'To: <sip:4311003@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% incoming_hih_scenarios_test.testuser1003.phone_number %]@'
     ]
   - [
-      '^INVITE sip:4311002@',
+      '^INVITE sip:[% incoming_hih_scenarios_test.testuser1002.phone_number %]@',
       'CSeq: 1 INVITE',
-      'From: <sip:004321001@',
-      'To: <sip:4311003@',
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% incoming_hih_scenarios_test.testuser1003.phone_number %]@',
       'Content-Type: application/sdp',
-      'History-Info: <sip:\+4313012026@spce.test;user=phone\?privacy=history>;index=1',
-      'History-Info: <sip:\+4311003@spce.test;user=phone;cause=302\?privacy=id>;index=1.1',
+      'History-Info: <sip:\+4313012026@incoming-hih.scenarios.test;user=phone\?privacy=history>;index=1',
+      'History-Info: <sip:\+[% incoming_hih_scenarios_test.testuser1003.phone_number %]@incoming-hih.scenarios.test;user=phone;cause=302\?privacy=id>;index=1.1',
       'P-HIH-Cause: 302',
       'P-Caller-UUID: \w+',
-      'P-First-Caller-UPN: 004321001',
-      'P-First-Caller-NPN: 004321001',
+      'P-First-Caller-UPN: [% scenarios.0.username %]',
+      'P-First-Caller-NPN: [% scenarios.0.username %]',
       'P-Acc-Caller-User: testuser1003',
       'P-Acc-State: cfu',
       'P-From-Peer: 1',
       'P-CF-Depth: 1',
       'P-App-Param: ;profile=ngcp_cf',
       'P-App-Name: sbc',
-      'P-NGCP-Forward-Info: <sip:4311003@',
-      'P-NGCP-Callee-Info: <sip:4311002@'
+      'P-NGCP-Forward-Info: <sip:[% incoming_hih_scenarios_test.testuser1003.phone_number %]@',
+      'P-NGCP-Callee-Info: <sip:[% incoming_hih_scenarios_test.testuser1002.phone_number %]@'
     ]
diff --git a/scenarios/incoming_hih/0005_test.yml.tt2 b/scenarios/incoming_hih/0005_test.yml.tt2
index a77b7da2..149f1005 100644
--- a/scenarios/incoming_hih/0005_test.yml.tt2
+++ b/scenarios/incoming_hih/0005_test.yml.tt2
@@ -60,9 +60,9 @@ flow:
   - return|ROUTE_SET_CALLEE_DIALOG:
       $avp(lua_dlg_profile): [
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totaluser:[% incoming_hih_scenarios_test.testuser1002.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1002.uuid %]"
+        "user:[% incoming_hih_scenarios_test.testuser1002.uuid %]"
       ]
   - start|ROUTE_BLOCK_IN:
   - return|ROUTE_BLOCK_IN:
@@ -97,9 +97,9 @@ flow:
       $avp(lua_dlg_profile): [
         "local",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totaluser:[% incoming_hih_scenarios_test.testuser1002.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1002.uuid %]"
+        "user:[% incoming_hih_scenarios_test.testuser1002.uuid %]"
       ]
   - start|ROUTE_SET_CALLER_DIALOG:
   - start|ROUTE_CNT_DLG_CHECK:
@@ -107,18 +107,18 @@ flow:
   - return|ROUTE_SET_CALLER_DIALOG:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
-        "userout:[% spce_test.testuser1003.uuid %]",
+        "userout:[% incoming_hih_scenarios_test.testuser1003.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]",
+        "user:[% incoming_hih_scenarios_test.testuser1003.uuid %]",
         "totalaccountout:[% customer_test.id %]",
-        "totaluserout:[% spce_test.testuser1003.uuid %]",
+        "totaluserout:[% incoming_hih_scenarios_test.testuser1003.uuid %]",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% incoming_hih_scenarios_test.testuser1003.uuid %]",
         "local",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totaluser:[% incoming_hih_scenarios_test.testuser1002.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1002.uuid %]"
+        "user:[% incoming_hih_scenarios_test.testuser1002.uuid %]"
       ]
   - start|ROUTE_ACC_CALLER:
   - start|ROUTE_SET_ACC_CALLER_CALL_COUNTERS:
@@ -183,27 +183,27 @@ flow:
   - exit|ROUTE_EXIT:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
-        "userout:[% spce_test.testuser1003.uuid %]",
+        "userout:[% incoming_hih_scenarios_test.testuser1003.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]",
+        "user:[% incoming_hih_scenarios_test.testuser1003.uuid %]",
         "totalaccountout:[% customer_test.id %]",
-        "totaluserout:[% spce_test.testuser1003.uuid %]",
+        "totaluserout:[% incoming_hih_scenarios_test.testuser1003.uuid %]",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% incoming_hih_scenarios_test.testuser1003.uuid %]",
         "local",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totaluser:[% incoming_hih_scenarios_test.testuser1002.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1002.uuid %]"
+        "user:[% incoming_hih_scenarios_test.testuser1002.uuid %]"
       ]
 sip_in:
-  - '^INVITE sip:4311002@'
+  - '^INVITE sip:[% incoming_hih_scenarios_test.testuser1002.phone_number %]@'
   - 'Contact: <sip:127.0.0.1:5080'
   - 'CSeq: \d+ INVITE'
   - 'Content-Type: application/sdp'
   - 'P-Caller-UUID: \w+'
-  - 'P-First-Caller-UPN: 004321001'
-  - 'P-First-Caller-NPN: 004321001'
+  - 'P-First-Caller-UPN: [% scenarios.0.username %]'
+  - 'P-First-Caller-NPN: [% scenarios.0.username %]'
   - 'P-Acc-Caller-User: testuser1003'
   - 'P-Acc-State: cfu'
   - 'P-From-Peer: 1'
@@ -212,23 +212,23 @@ sip_out:
   - [
       '^SIP/2.0 100 Trying',
       'CSeq: \d+ INVITE',
-      'From: <sip:004321001@',
-      'To: <sip:4311003@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% incoming_hih_scenarios_test.testuser1003.phone_number %]@'
     ]
   - [
       '^INVITE sip:testuser1002@',
       'CSeq: \d+ INVITE',
-      'From: <sip:004321001@',
+      'From: <sip:[% scenarios.0.username %]@',
       'Contact: <sip:127.0.0.1:5080(;transport=udp)?>',
-      'To: <sip:4311003@',
+      'To: <sip:[% incoming_hih_scenarios_test.testuser1003.phone_number %]@',
       'Content-Type: application/sdp',
-      'History-Info: <sip:\+4313012026@spce.test;user=phone\?privacy=history>;index=1',
-      'History-Info: <sip:\+4311003@spce.test;user=phone;cause=302\?privacy=id>;index=1.1',
-      'History-Info: <sip:\+4311002@spce.test:5060;user=phone;cause=302>;index=1.1.1',
+      'History-Info: <sip:\+4313012026@incoming-hih.scenarios.test;user=phone\?privacy=history>;index=1',
+      'History-Info: <sip:\+[% incoming_hih_scenarios_test.testuser1003.phone_number %]@incoming-hih.scenarios.test;user=phone;cause=302\?privacy=id>;index=1.1',
+      'History-Info: <sip:\+[% incoming_hih_scenarios_test.testuser1002.phone_number %]@incoming-hih.scenarios.test:5060;user=phone;cause=302>;index=1.1.1',
       'P-Callee-UUID: \w+',
-      'P-Asserted-Identity: <sip:004321001@',
+      'P-Asserted-Identity: <sip:[% scenarios.0.username %]@',
       'P-Called-Party-ID: <sip:testuser1002@',
       'P-App-Name: sbc',
       'P-NGCP-Caller-Info: <sip:testuser1003@',
-      'P-NGCP-Callee-Info: <sip:4311002@'
+      'P-NGCP-Callee-Info: <sip:[% incoming_hih_scenarios_test.testuser1002.phone_number %]@'
     ]
diff --git a/scenarios/incoming_hih/0007_test.yml.tt2 b/scenarios/incoming_hih/0007_test.yml.tt2
index ea29c2b4..a6a73900 100644
--- a/scenarios/incoming_hih/0007_test.yml.tt2
+++ b/scenarios/incoming_hih/0007_test.yml.tt2
@@ -13,18 +13,18 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - 'INVITE sip:testuser1002@127.1.0.2:\d+;cause=302 SIP/2.0'
-  - 'From: <sip:004321001@spce.test>;tag=[\w-]+'
-  - 'To: <sip:testuser1002@spce.test>'
+  - 'INVITE sip:testuser1002@[% scenarios.0.responders.1.ip %]:[% scenarios.0.responders.1.port %];cause=302 SIP/2.0'
+  - 'From: <sip:004321001@incoming-hih.scenarios.test>;tag=[\w-]+'
+  - 'To: <sip:testuser1002@incoming-hih.scenarios.test>'
   - 'CSeq: \d+ INVITE'
-  - 'History-Info: <sip:\+4313012026@spce.test;user=phone\?privacy=history>;index=1'
-  - 'History-Info: <sip:\+4311003@spce.test;user=phone;cause=302\?privacy=id>;index=1.1'
-  - 'History-Info: <sip:\+4311002@spce.test:5060;user=phone;cause=302>;index=1.1.1'
-  - 'P-Caller-UUID: [% spce_test.testuser1003.uuid %]'
-  - 'P-NGCP-Caller-Info: <sip:testuser1003@spce.test>;ip=127.0.0.1;port=508[08];primary=4311003'
-  - 'P-NGCP-Forward-Info: <sip:4311003@spce.test>;ip=127.0.0.1;port=508[08];primary=4311003'
-  - 'P-NGCP-Callee-Info: <sip:4311002@spce.test>;ip=127.0.0.1;port=5060;primary=4311002'
-  - 'P-Asserted-Identity: <sip:004321001@spce.test>'
+  - 'History-Info: <sip:\+4313012026@incoming-hih.scenarios.test;user=phone\?privacy=history>;index=1'
+  - 'History-Info: <sip:\+[% incoming_hih_scenarios_test.testuser1003.phone_number %]@incoming-hih.scenarios.test;user=phone;cause=302\?privacy=id>;index=1.1'
+  - 'History-Info: <sip:\+[% incoming_hih_scenarios_test.testuser1002.phone_number %]@incoming-hih.scenarios.test:5060;user=phone;cause=302>;index=1.1.1'
+  - 'P-Caller-UUID: [% incoming_hih_scenarios_test.testuser1003.uuid %]'
+  - 'P-NGCP-Caller-Info: <sip:testuser1003@incoming-hih.scenarios.test>;ip=127.0.0.1;port=508[08];primary=[% incoming_hih_scenarios_test.testuser1003.phone_number %]'
+  - 'P-NGCP-Forward-Info: <sip:[% incoming_hih_scenarios_test.testuser1003.phone_number %]@incoming-hih.scenarios.test>;ip=127.0.0.1;port=508[08];primary=[% incoming_hih_scenarios_test.testuser1003.phone_number %]'
+  - 'P-NGCP-Callee-Info: <sip:[% incoming_hih_scenarios_test.testuser1002.phone_number %]@incoming-hih.scenarios.test>;ip=127.0.0.1;port=5060;primary=[% incoming_hih_scenarios_test.testuser1002.phone_number %]'
+  - 'P-Asserted-Identity: <sip:004321001@incoming-hih.scenarios.test>'
   - '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>'
@@ -32,25 +32,25 @@ sip_in:
 sip_out:
   - [
       'SIP/2.0 100 Trying',
-      'From: <sip:004321001@spce.test>;tag=[\w-]+',
-      'To: <sip:testuser1002@spce.test>',
+      'From: <sip:004321001@incoming-hih.scenarios.test>;tag=[\w-]+',
+      'To: <sip:testuser1002@incoming-hih.scenarios.test>',
       'CSeq: \d+ INVITE',
       'Server: Sipwise NGCP Proxy',
       'Content-Length: 0',
     ]
   - [
-      'INVITE sip:testuser1002@127.1.0.2:\d+;cause=302 SIP/2.0',
-      'From: <sip:004321001@spce.test>;tag=[\w-]+',
-      'To: <sip:testuser1002@spce.test>',
+      'INVITE sip:testuser1002@[% scenarios.0.responders.1.ip %]:[% scenarios.0.responders.1.port %];cause=302 SIP/2.0',
+      'From: <sip:004321001@incoming-hih.scenarios.test>;tag=[\w-]+',
+      'To: <sip:testuser1002@incoming-hih.scenarios.test>',
       'CSeq: \d+ INVITE',
-      'History-Info: <sip:\+4313012026@spce.test;user=phone\?privacy=history>;index=1',
-      'History-Info: <sip:\+4311003@spce.test;user=phone;cause=302\?privacy=id>;index=1.1',
-      'History-Info: <sip:\+4311002@spce.test:5060;user=phone;cause=302>;index=1.1.1',
-      'P-Caller-UUID: [% spce_test.testuser1003.uuid %]',
-      'P-NGCP-Caller-Info: <sip:testuser1003@spce.test>;ip=127.0.0.1;port=508[08];primary=4311003',
-      'P-NGCP-Forward-Info: <sip:4311003@spce.test>;ip=127.0.0.1;port=508[08];primary=4311003',
-      'P-NGCP-Callee-Info: <sip:4311002@spce.test>;ip=127.0.0.1;port=5060;primary=4311002',
-      'P-Asserted-Identity: <sip:004321001@spce.test>',
+      'History-Info: <sip:\+4313012026@incoming-hih.scenarios.test;user=phone\?privacy=history>;index=1',
+      'History-Info: <sip:\+[% incoming_hih_scenarios_test.testuser1003.phone_number %]@incoming-hih.scenarios.test;user=phone;cause=302\?privacy=id>;index=1.1',
+      'History-Info: <sip:\+[% incoming_hih_scenarios_test.testuser1002.phone_number %]@incoming-hih.scenarios.test:5060;user=phone;cause=302>;index=1.1.1',
+      'P-Caller-UUID: [% incoming_hih_scenarios_test.testuser1003.uuid %]',
+      'P-NGCP-Caller-Info: <sip:testuser1003@incoming-hih.scenarios.test>;ip=127.0.0.1;port=508[08];primary=[% incoming_hih_scenarios_test.testuser1003.phone_number %]',
+      'P-NGCP-Forward-Info: <sip:[% incoming_hih_scenarios_test.testuser1003.phone_number %]@incoming-hih.scenarios.test>;ip=127.0.0.1;port=508[08];primary=[% incoming_hih_scenarios_test.testuser1003.phone_number %]',
+      'P-NGCP-Callee-Info: <sip:[% incoming_hih_scenarios_test.testuser1002.phone_number %]@incoming-hih.scenarios.test>;ip=127.0.0.1;port=5060;primary=[% incoming_hih_scenarios_test.testuser1002.phone_number %]',
+      'P-Asserted-Identity: <sip:004321001@incoming-hih.scenarios.test>',
       '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/incoming_hih/0014_test.yml.tt2 b/scenarios/incoming_hih/0014_test.yml.tt2
index 1d30f655..62f7419e 100644
--- a/scenarios/incoming_hih/0014_test.yml.tt2
+++ b/scenarios/incoming_hih/0014_test.yml.tt2
@@ -14,16 +14,16 @@ flow:
   - return|dialog:start:
       $avp(lua_dlg_profile): [
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% incoming_hih_scenarios_test.testuser1003.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]",
+        "user:[% incoming_hih_scenarios_test.testuser1003.uuid %]",
         "peer:[% peer_00_host0.id %]", "total"
       ]
   - return|dialog:start:
 sip_in:
   - '^SIP/2.0 200 OK'
-  - 'From: <sip:004321001@127.0.2.1>;tag='
-  - 'To: <sip:4311003@'
+  - 'From: <sip:[% scenarios.0.username %]@incoming-hih.host0.peer.scenarios.test>;tag='
+  - 'To: <sip:[% incoming_hih_scenarios_test.testuser1003.phone_number %]@'
   - 'CSeq: 1 INVITE'
 sip_out:
   - [
diff --git a/scenarios/incoming_hih/0015_test.yml.tt2 b/scenarios/incoming_hih/0015_test.yml.tt2
index 7bdfb7ab..e1d15323 100644
--- a/scenarios/incoming_hih/0015_test.yml.tt2
+++ b/scenarios/incoming_hih/0015_test.yml.tt2
@@ -21,20 +21,20 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
-  - 'Contact: sip:004321001@'
+  - 'Contact: sip:[% scenarios.0.username %]@'
   - 'CSeq: 1 ACK'
   - 'Max-Forwards: 69'
   - 'Content-Length: 0'
-  - 'From: <sip:004321001@'
-  - 'To: <sip:4311003@'
+  - 'From: <sip:[% scenarios.0.username %]@'
+  - 'To: <sip:[% incoming_hih_scenarios_test.testuser1003.phone_number %]@'
 
 sip_out:
   - [
       '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
-      'Contact: sip:004321001@',
+      'Contact: sip:[% scenarios.0.username %]@',
       'CSeq: 1 ACK',
       'Max-Forwards: 68',
       'Content-Length: 0',
-      'From: <sip:004321001@',
-      'To: <sip:4311003@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% incoming_hih_scenarios_test.testuser1003.phone_number %]@'
     ]
diff --git a/scenarios/incoming_hih/0018_test.yml.tt2 b/scenarios/incoming_hih/0018_test.yml.tt2
index cad5506c..d2820e6e 100644
--- a/scenarios/incoming_hih/0018_test.yml.tt2
+++ b/scenarios/incoming_hih/0018_test.yml.tt2
@@ -26,27 +26,27 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
-  - 'Contact: sip:004321001@'
+  - 'Contact: sip:[% scenarios.0.username %]@'
   - 'CSeq: 2 BYE'
   - 'Max-Forwards: 69'
   - 'Content-Length: 0'
-  - 'From: <sip:004321001@'
-  - 'To: <sip:4311003@'
+  - 'From: <sip:[% scenarios.0.username %]@'
+  - 'To: <sip:[% incoming_hih_scenarios_test.testuser1003.phone_number %]@'
 
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
       'CSeq: 2 BYE',
       'Content-Length: 0',
-      'From: <sip:004321001@',
-      'To: <sip:4311003@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% incoming_hih_scenarios_test.testuser1003.phone_number %]@'
     ]
   - [
       '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
-      'Contact: sip:004321001@',
+      'Contact: sip:[% scenarios.0.username %]@',
       'CSeq: 2 BYE',
       'Max-Forwards: 68',
       'Content-Length: 0',
-      'From: <sip:004321001@',
-      'To: <sip:4311003@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% incoming_hih_scenarios_test.testuser1003.phone_number %]@'
     ]
diff --git a/scenarios/incoming_hih/0019_test.yml.tt2 b/scenarios/incoming_hih/0019_test.yml.tt2
index 3dba58b1..c7c52ece 100644
--- a/scenarios/incoming_hih/0019_test.yml.tt2
+++ b/scenarios/incoming_hih/0019_test.yml.tt2
@@ -31,21 +31,21 @@ sip_in:
   - '^BYE sip:(testuser1002@)?127.0.0.1:5080(;transport=udp)? SIP/2.0'
   - 'CSeq: \d+ BYE'
   - 'Content-Length: 0'
-  - 'From: <sip:004321001@'
-  - 'To: <sip:4311003@'
+  - 'From: <sip:[% scenarios.0.username %]@'
+  - 'To: <sip:[% incoming_hih_scenarios_test.testuser1003.phone_number %]@'
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
       'CSeq: \d+ BYE',
       'Content-Length: 0',
-      'From: <sip:004321001@',
-      'To: <sip:4311003@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% incoming_hih_scenarios_test.testuser1003.phone_number %]@'
     ]
   - [
       '^BYE sip:(testuser1002@)?127.0.0.1:5080(;transport=udp)? SIP/2.0',
       'CSeq: \d+ BYE',
       'Max-Forwards: 69',
       'Content-Length: 0',
-      'From: <sip:004321001@',
-      'To: <sip:4311003@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% incoming_hih_scenarios_test.testuser1003.phone_number %]@'
     ]
diff --git a/scenarios/incoming_hih/0022_test.yml.tt2 b/scenarios/incoming_hih/0022_test.yml.tt2
index 8e5de233..e0fae7ff 100644
--- a/scenarios/incoming_hih/0022_test.yml.tt2
+++ b/scenarios/incoming_hih/0022_test.yml.tt2
@@ -16,13 +16,13 @@ sip_in:
   - '^SIP/2.0 200 OK'
   - 'CSeq: \d+ BYE'
   - 'Content-Length: 0'
-  - 'From: <sip:004321001@'
-  - 'To: <sip:4311003@'
+  - 'From: <sip:[% scenarios.0.username %]@'
+  - 'To: <sip:[% incoming_hih_scenarios_test.testuser1003.phone_number %]@'
 sip_out:
   - [
       '^SIP/2.0 200 OK',
       'CSeq: \d+ BYE',
       'Content-Length: 0',
-      'From: <sip:004321001@',
-      'To: <sip:4311003@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% incoming_hih_scenarios_test.testuser1003.phone_number %]@'
     ]
diff --git a/scenarios/incoming_hih/0023_test.yml.tt2 b/scenarios/incoming_hih/0023_test.yml.tt2
index 311de021..ffb0ad75 100644
--- a/scenarios/incoming_hih/0023_test.yml.tt2
+++ b/scenarios/incoming_hih/0023_test.yml.tt2
@@ -16,13 +16,13 @@ sip_in:
   - '^SIP/2.0 200 OK'
   - 'Content-Length: 0'
   - 'CSeq: 2 BYE'
-  - 'From: <sip:004321001@'
-  - 'To: <sip:4311003@'
+  - 'From: <sip:[% scenarios.0.username %]@'
+  - 'To: <sip:[% incoming_hih_scenarios_test.testuser1003.phone_number %]@'
 sip_out:
   - [
       '^SIP/2.0 200 OK',
       'CSeq: 2 BYE',
       'Content-Length: 0',
-      'From: <sip:004321001@',
-      'To: <sip:4311003@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% incoming_hih_scenarios_test.testuser1003.phone_number %]@'
     ]
diff --git a/scenarios/incoming_hih/callforward.yml b/scenarios/incoming_hih/callforward.yml.tt2
similarity index 67%
rename from scenarios/incoming_hih/callforward.yml
rename to scenarios/incoming_hih/callforward.yml.tt2
index f8525c8b..7ec28743 100644
--- a/scenarios/incoming_hih/callforward.yml
+++ b/scenarios/incoming_hih/callforward.yml.tt2
@@ -1,8 +1,8 @@
 ---
-testuser1003@spce.test:
+testuser1003@incoming-hih.scenarios.test:
   destinations:
     destinations:
-      - destination: sip:4311002@spce.test
+      - destination: sip:[% incoming_hih_scenarios_test.testuser1002.phone_number %]@incoming-hih.scenarios.test
         priority: 0
         timeout: 25
     name: dest1003
diff --git a/scenarios/incoming_hih/cdr_test.yml.tt2 b/scenarios/incoming_hih/cdr_test.yml.tt2
index 48b2f7f2..7ff27fae 100644
--- a/scenarios/incoming_hih/cdr_test.yml.tt2
+++ b/scenarios/incoming_hih/cdr_test.yml.tt2
@@ -1,19 +1,19 @@
 cdr:
-  - source_user: '004321001'
-    source_domain: '127.0.2.1'
-    source_cli: '004321001'
+  - source_user: '[% scenarios.0.username %]'
+    source_domain: '[% scenarios.0.ip %]'
+    source_cli: '[% scenarios.0.username %]'
     destination_user: 'testuser1003'
-    destination_domain: 'spce.test'
-    destination_user_dialed: '4311003'
+    destination_domain: 'incoming-hih.scenarios.test'
+    destination_user_dialed: '[% incoming_hih_scenarios_test.testuser1003.phone_number %]'
     call_type: 'call'
     call_status: 'ok'
     call_code: '200'
   - source_user: 'testuser1003'
-    source_domain: 'spce.test'
-    source_cli: '4311003'
+    source_domain: 'incoming-hih.scenarios.test'
+    source_cli: '[% incoming_hih_scenarios_test.testuser1003.phone_number %]'
     destination_user: 'testuser1002'
-    destination_domain: 'spce.test'
-    destination_user_dialed: '4311002'
+    destination_domain: 'incoming-hih.scenarios.test'
+    destination_user_dialed: '[% incoming_hih_scenarios_test.testuser1002.phone_number %]'
     call_type: 'cfu'
     call_status: 'ok'
-    call_code: '200'
\ No newline at end of file
+    call_code: '200'
diff --git a/scenarios/incoming_hih/peer.yml b/scenarios/incoming_hih/peer.yml
index 0852a726..155b97b3 100644
--- a/scenarios/incoming_hih/peer.yml
+++ b/scenarios/incoming_hih/peer.yml
@@ -1,25 +1,25 @@
 ---
-peer_00:
+peer_incoming_hih:
   contact:
-    company: peer_00
-    email: peer_00@host0.not
+    company: peer_incoming_hih
+    email: peer_incoming_hih@host0.not
   contract:
     billing_profile_id: 1
     status: active
     type: sippeering
   groups:
-    - name: peer_00_group
+    - name: peer_incoming_hih_group
       priority: 1
       description:
   inboundrules:
-    - group_id: peer_00_group
+    - group_id: peer_incoming_hih_group
       field: "ruri_uri"
-      pattern: '.*'
+      pattern: '.*@incoming-hih.scenarios.test'
       priority: 50
       enabled: 1
   hosts:
-    - group_id: peer_00_group
-      name: peer_00_host0
+    - group_id: peer_incoming_hih_group
+      name: peer_incoming_hih_host0
       ip: 127.0.2.1
       port: 51602
       host:
diff --git a/scenarios/incoming_hih/prefs.json b/scenarios/incoming_hih/prefs.json
deleted file mode 100644
index 03003c28..00000000
--- a/scenarios/incoming_hih/prefs.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "testuser1002@spce.test": {
-        "outbound_history_info": "uprn" 
-    },
-    "testuser1003@spce.test": {
-        "clir": true 
-    }
-}
diff --git a/scenarios/incoming_hih/prefs.json.tt2 b/scenarios/incoming_hih/prefs.json.tt2
new file mode 100644
index 00000000..16a2778d
--- /dev/null
+++ b/scenarios/incoming_hih/prefs.json.tt2
@@ -0,0 +1,8 @@
+{
+    "testuser1002@incoming-hih.scenarios.test": {
+        "outbound_history_info": "uprn"
+    },
+    "testuser1003@incoming-hih.scenarios.test": {
+        "clir": true
+    }
+}
diff --git a/scenarios/incoming_hih/scenario.yml b/scenarios/incoming_hih/scenario.yml
index a062af4b..ab08c7d1 100644
--- a/scenarios/incoming_hih/scenario.yml
+++ b/scenarios/incoming_hih/scenario.yml
@@ -1,6 +1,7 @@
+---
 test_uuid: incoming_hih
 domains:
-  'spce.test':
+  incoming-hih.scenarios.test:
     reseller_id: 1
 customers:
   'customer.test':
@@ -13,7 +14,7 @@ customers:
       billing_profile_id: 1
       reseller_id: 1
 subscribers:
-  spce.test:
+  incoming-hih.scenarios.test:
     testuser1002:
       customer: 'customer.test'
       password: testuser
@@ -29,14 +30,15 @@ subscribers:
 scenarios:
   - ip: 127.0.2.1
     username: 004321001
-    domain: 127.0.2.1
+    domain: incoming-hih.host0.peer.scenarios.test
+    peer_host: peer_incoming_hih_host0
     responders:
       - ip: 127.1.0.1
         username: testuser1003
-        domain: spce.test
-        register: no
-        active: no
+        domain: incoming-hih.scenarios.test
+        register: 'no'
+        active: 'no'
       - ip: 127.1.0.2
-        username: testuser1002 
-        domain: spce.test
-        register: yes
+        username: testuser1002
+        domain: incoming-hih.scenarios.test
+        register: 'yes'
diff --git a/scenarios/incoming_hih/sipp_scenario00.xml b/scenarios/incoming_hih/sipp_scenario00.xml
index 94a7ece0..0b01878f 100644
--- a/scenarios/incoming_hih/sipp_scenario00.xml
+++ b/scenarios/incoming_hih/sipp_scenario00.xml
@@ -11,8 +11,8 @@
       Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 1 INVITE
       Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
-      History-Info: <sip:+4313012026@spce.test;user=phone?privacy=history>;index=1
-      History-Info: <sip:+4311003@spce.test;user=phone;cause=302>;index=1.1
+      History-Info: <sip:+4313012026@incoming-hih.scenarios.test;user=phone?privacy=history>;index=1
+      History-Info: <sip:+[field1 file="callee.csv" line=0]@incoming-hih.scenarios.test;user=phone;cause=302>;index=1.1
       Max-Forwards: 70
       Content-Type: application/sdp
       Content-Length: [len]