diff --git a/disabled/invite_callforward/0011_test.yml.tt2 b/disabled/invite_callforward/0011_test.yml.tt2 index 69d6de82..a16c5991 100644 --- a/disabled/invite_callforward/0011_test.yml.tt2 +++ b/disabled/invite_callforward/0011_test.yml.tt2 @@ -207,7 +207,7 @@ sip_out: 'P-Callee-Ext-Contr-ID: ', 'P-Callee-Account-ID: [% customerpbx_test.id %]', 'P-Orig-Callee-Dialed: testuser1001', - 'P-Prev-Caller-UUID: [% spce_test.testuser1002.uuid %]', + 'P-NGCP-Prev-Caller-UUID: [% spce_test.testuser1002.uuid %]', 'P-First-Caller-RTP-Interface: ext', 'P-First-Caller-RTP-Interface-Source: default', 'P-NGCP-Forward-Info: ;ip=127.0.0.1;port=5080;primary=4311001', diff --git a/disabled/invite_callforward/0012_test.yml.tt2 b/disabled/invite_callforward/0012_test.yml.tt2 index 8e825832..d59448ac 100644 --- a/disabled/invite_callforward/0012_test.yml.tt2 +++ b/disabled/invite_callforward/0012_test.yml.tt2 @@ -162,7 +162,7 @@ sip_in: - 'P-First-Caller-PBX-Ext: 1002' - 'P-Callee-Account-ID: [% customerpbx_test.id %]' - 'P-Orig-Callee-Dialed: testuser1001' - - 'P-Prev-Caller-UUID: [% spce_test.testuser1002.uuid %]' + - 'P-NGCP-Prev-Caller-UUID: [% spce_test.testuser1002.uuid %]' - 'P-First-Caller-RTP-Interface: ext' - 'P-First-Caller-RTP-Interface-Source: default' - 'P-NGCP-Forward-Info: ;ip=127.0.0.1;port=5080;primary=4311001' @@ -204,7 +204,7 @@ sip_out: 'P-First-Caller-PBX-Ext: 1002', 'P-Callee-Account-ID: [% customerpbx_test.id %]', 'P-Orig-Callee-Dialed: 43110011003', - 'P-Prev-Caller-UUID: [% spce_test.testuser1001.uuid %]', + 'P-NGCP-Prev-Caller-UUID: [% spce_test.testuser1001.uuid %]', 'P-First-Caller-RTP-Interface: ext', 'P-First-Caller-RTP-Interface-Source: default', 'P-NGCP-Forward-Info: ;ip=127.0.0.1;port=5080;primary=4311001', diff --git a/disabled/invite_callforward/0015_test.yml.tt2 b/disabled/invite_callforward/0015_test.yml.tt2 index e291f347..4474887a 100644 --- a/disabled/invite_callforward/0015_test.yml.tt2 +++ b/disabled/invite_callforward/0015_test.yml.tt2 @@ -165,7 +165,7 @@ sip_in: - 'P-First-Caller-PBX-Ext: 1002' - 'P-Callee-Account-ID: [% customerpbx_test.id %]' - 'P-Orig-Callee-Dialed: 43110011003' - - 'P-Prev-Caller-UUID: [% spce_test.testuser1001.uuid %]' + - 'P-NGCP-Prev-Caller-UUID: [% spce_test.testuser1001.uuid %]' - 'P-First-Caller-RTP-Interface: ext' - 'P-First-Caller-RTP-Interface-Source: default' - 'P-NGCP-Forward-Info: ;ip=127.0.0.1;port=5080;primary=4311001' diff --git a/disabled/invite_callforward/0043_test.yml.tt2 b/disabled/invite_callforward/0043_test.yml.tt2 index 40644c9f..c31ac559 100644 --- a/disabled/invite_callforward/0043_test.yml.tt2 +++ b/disabled/invite_callforward/0043_test.yml.tt2 @@ -110,7 +110,7 @@ sip_out: 'P-Callee-Ext-Contr-ID: ', 'P-Callee-Account-ID: 0', 'P-Orig-Callee-Dialed: testuser1004', - 'P-Prev-Caller-UUID: [% spce_test.testuser1002.uuid %]', + 'P-NGCP-Prev-Caller-UUID: [% spce_test.testuser1002.uuid %]', 'P-First-Caller-RTP-Interface: ext', 'P-First-Caller-RTP-Interface-Source: default', 'P-NGCP-Forward-Info: ;ip=127.0.0.1;port=5080;primary=43110011004', diff --git a/disabled/invite_callforward/0044_test.yml.tt2 b/disabled/invite_callforward/0044_test.yml.tt2 index ee6aedf2..e6de27fd 100644 --- a/disabled/invite_callforward/0044_test.yml.tt2 +++ b/disabled/invite_callforward/0044_test.yml.tt2 @@ -162,7 +162,7 @@ sip_in: - 'P-First-Caller-PBX-Ext: 1002' - 'P-Callee-Account-ID: 0' - 'P-Orig-Callee-Dialed: testuser1004' - - 'P-Prev-Caller-UUID: [% spce_test.testuser1002.uuid %]' + - 'P-NGCP-Prev-Caller-UUID: [% spce_test.testuser1002.uuid %]' - 'P-First-Caller-RTP-Interface: ext' - 'P-First-Caller-RTP-Interface-Source: default' - 'P-NGCP-Forward-Info: ;ip=127.0.0.1;port=5080;primary=43110011004' @@ -204,7 +204,7 @@ sip_out: 'P-First-Caller-PBX-Ext: 1002', 'P-Callee-Account-ID: [% customerpbx_test.id %]', 'P-Orig-Callee-Dialed: 43110011005', - 'P-Prev-Caller-UUID: [% spce_test.testuser1004.uuid %]', + 'P-NGCP-Prev-Caller-UUID: [% spce_test.testuser1004.uuid %]', 'P-First-Caller-RTP-Interface: ext', 'P-First-Caller-RTP-Interface-Source: default', 'P-NGCP-Forward-Info: ;ip=127.0.0.1;port=5080;primary=43110011004', diff --git a/disabled/invite_callforward/0046_test.yml.tt2 b/disabled/invite_callforward/0046_test.yml.tt2 index fa9a4d03..2a89b311 100644 --- a/disabled/invite_callforward/0046_test.yml.tt2 +++ b/disabled/invite_callforward/0046_test.yml.tt2 @@ -165,7 +165,7 @@ sip_in: - 'P-First-Caller-PBX-Ext: 1002' - 'P-Callee-Account-ID: [% customerpbx_test.id %]' - 'P-Orig-Callee-Dialed: 43110011005' - - 'P-Prev-Caller-UUID: [% spce_test.testuser1004.uuid %]' + - 'P-NGCP-Prev-Caller-UUID: [% spce_test.testuser1004.uuid %]' - 'P-First-Caller-RTP-Interface: ext' - 'P-First-Caller-RTP-Interface-Source: default' - 'P-NGCP-Forward-Info: ;ip=127.0.0.1;port=5080;primary=43110011004' diff --git a/disabled/invite_callforward_timeout/0013_test.yml.tt2 b/disabled/invite_callforward_timeout/0013_test.yml.tt2 index d46600bb..2ddfb4ab 100644 --- a/disabled/invite_callforward_timeout/0013_test.yml.tt2 +++ b/disabled/invite_callforward_timeout/0013_test.yml.tt2 @@ -210,7 +210,7 @@ sip_in: - 'P-First-Caller-UA-Mode: strip' - 'P-Callee-Account-ID: 0' - 'P-Orig-Callee-Dialed: testuser1001' - - 'P-Prev-Caller-UUID: [% invite_callforward_timeout_scenarios_test.testuser1002.uuid %]' + - 'P-NGCP-Prev-Caller-UUID: [% invite_callforward_timeout_scenarios_test.testuser1002.uuid %]' - 'P-First-Caller-RTP-Interface: ext' - 'P-First-Caller-RTP-Interface-Source: default' - 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_callforward_timeout_scenarios_test.testuser1002.phone_number %]' diff --git a/scenarios/invite_locmap_forward/0005_test.yml.tt2 b/scenarios/invite_locmap_forward/0005_test.yml.tt2 index 77e5176c..2b8cf982 100644 --- a/scenarios/invite_locmap_forward/0005_test.yml.tt2 +++ b/scenarios/invite_locmap_forward/0005_test.yml.tt2 @@ -288,7 +288,7 @@ sip_out: 'P-Callee-Ext-Contr-ID: ', 'P-Callee-Account-ID: \d+', 'P-Orig-Callee-Dialed: testuser1001', - 'P-Prev-Caller-UUID: [% invite_locmap_forward_scenarios_test.testuser1000.uuid %]', + 'P-NGCP-Prev-Caller-UUID: [% invite_locmap_forward_scenarios_test.testuser1000.uuid %]', 'P-First-Caller-RTP-Interface: ext', 'P-First-Caller-RTP-Interface-Source: default', 'P-NGCP-Alias-DevId: 0', diff --git a/scenarios/invite_redirect/0012_test.yml.tt2 b/scenarios/invite_redirect/0012_test.yml.tt2 index e759c3cf..a74359ca 100644 --- a/scenarios/invite_redirect/0012_test.yml.tt2 +++ b/scenarios/invite_redirect/0012_test.yml.tt2 @@ -84,7 +84,7 @@ sip_out: 'P-First-Caller-NPD: invite-redirect.scenarios.test', 'P-Acc-State: cfb', 'P-CF-Depth: 1', - 'P-Prev-Caller-UUID: [% invite_redirect_scenarios_test.testuser1002.uuid %]', + 'P-NGCP-Prev-Caller-UUID: [% invite_redirect_scenarios_test.testuser1002.uuid %]', 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_redirect_scenarios_test.testuser1002.phone_number %]', 'P-NGCP-Forward-Info: ;ip=127.0.0.1;port=5080;primary=[% invite_redirect_scenarios_test.testuser1003.phone_number %]', 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5080' diff --git a/scenarios/invite_redirect/0015_test.yml.tt2 b/scenarios/invite_redirect/0015_test.yml.tt2 index e883a4ee..7f71e028 100644 --- a/scenarios/invite_redirect/0015_test.yml.tt2 +++ b/scenarios/invite_redirect/0015_test.yml.tt2 @@ -196,7 +196,7 @@ sip_in: - 'P-Acc-State: cfb' - 'P-CF-Depth: 1' - 'P-Orig-Callee-Dialed: testuser1003' - - 'P-Prev-Caller-UUID: [% invite_redirect_scenarios_test.testuser1002.uuid %]' + - 'P-NGCP-Prev-Caller-UUID: [% invite_redirect_scenarios_test.testuser1002.uuid %]' - 'Content-Type: application/sdp' - 'Content-Length:\s+\d+' - 'Contact: ' diff --git a/scenarios/invite_redirect_tel_uri/0013_test.yml.tt2 b/scenarios/invite_redirect_tel_uri/0013_test.yml.tt2 index 153dddd1..e0dc3bb7 100644 --- a/scenarios/invite_redirect_tel_uri/0013_test.yml.tt2 +++ b/scenarios/invite_redirect_tel_uri/0013_test.yml.tt2 @@ -86,7 +86,7 @@ sip_out: 'P-Acc-State: cfb', 'P-CF-Depth: 1', 'P-Orig-Callee-Dialed: testuser1001', - 'P-Prev-Caller-UUID: [% invite_redirect_tel_uri_scenarios_test.testuser1000.uuid %]', + 'P-NGCP-Prev-Caller-UUID: [% invite_redirect_tel_uri_scenarios_test.testuser1000.uuid %]', 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_redirect_tel_uri_scenarios_test.testuser1000.phone_number %]', 'P-NGCP-Forward-Info: ;ip=127.0.0.1;port=5080;primary=[% invite_redirect_tel_uri_scenarios_test.testuser1001.phone_number %]', 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5080', diff --git a/scenarios/invite_redirect_tel_uri/0015_test.yml.tt2 b/scenarios/invite_redirect_tel_uri/0015_test.yml.tt2 index a222d468..8144f5f2 100644 --- a/scenarios/invite_redirect_tel_uri/0015_test.yml.tt2 +++ b/scenarios/invite_redirect_tel_uri/0015_test.yml.tt2 @@ -204,7 +204,7 @@ sip_in: - 'P-Acc-State: cfb' - 'P-CF-Depth: 1' - 'P-Orig-Callee-Dialed: testuser1001' - - 'P-Prev-Caller-UUID: [% invite_redirect_tel_uri_scenarios_test.testuser1000.uuid %]' + - 'P-NGCP-Prev-Caller-UUID: [% invite_redirect_tel_uri_scenarios_test.testuser1000.uuid %]' - 'P-NGCP-Caller-Info: ;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_redirect_tel_uri_scenarios_test.testuser1000.phone_number %]' - 'P-NGCP-Forward-Info: ;ip=127.0.0.1;port=5080;primary=[% invite_redirect_tel_uri_scenarios_test.testuser1001.phone_number %]' - 'P-NGCP-Callee-Info: ;ip=127.0.0.1;port=5080' diff --git a/scenarios_pbx/invite_manager/0023_test.yml.tt2 b/scenarios_pbx/invite_manager/0023_test.yml.tt2 index 93fd5ef8..a00c2761 100644 --- a/scenarios_pbx/invite_manager/0023_test.yml.tt2 +++ b/scenarios_pbx/invite_manager/0023_test.yml.tt2 @@ -281,7 +281,7 @@ sip_out: 'P-Callee-Ext-Contr-ID: ', 'P-Callee-Account-ID: [% invite_manager_customerpbx_test.id %]', 'P-Orig-Callee-Dialed: manager', - 'P-Prev-Caller-UUID: [% invite_manager_scenarios_pbx_test.testuser1003.uuid %]', + 'P-NGCP-Prev-Caller-UUID: [% invite_manager_scenarios_pbx_test.testuser1003.uuid %]', 'P-First-Caller-RTP-Interface: ext', 'P-First-Caller-RTP-Interface-Source: default', 'P-NGCP-Presence-Caller: sip:[% scenarios.1.username %]@invite-manager.scenarios-pbx.test', diff --git a/scenarios_pbx/invite_manager_2sec/0025_test.yml.tt2 b/scenarios_pbx/invite_manager_2sec/0025_test.yml.tt2 index 46b8c0d7..23d2ebc2 100644 --- a/scenarios_pbx/invite_manager_2sec/0025_test.yml.tt2 +++ b/scenarios_pbx/invite_manager_2sec/0025_test.yml.tt2 @@ -281,7 +281,7 @@ sip_out: 'P-Callee-Ext-Contr-ID: ', 'P-Callee-Account-ID: [% invite_manager_2sec_customerpbx_test.id %]', 'P-Orig-Callee-Dialed: manager', - 'P-Prev-Caller-UUID: [% invite_manager_2sec_scenarios_pbx_test.testuser1003.uuid %]', + 'P-NGCP-Prev-Caller-UUID: [% invite_manager_2sec_scenarios_pbx_test.testuser1003.uuid %]', 'P-First-Caller-RTP-Interface: ext', 'P-First-Caller-RTP-Interface-Source: default', 'P-NGCP-Presence-Caller: sip:[% scenarios.1.username %]@invite-manager-2sec.scenarios-pbx.test', diff --git a/scenarios_pbx/invite_manager_2sec/0035_test.yml.tt2 b/scenarios_pbx/invite_manager_2sec/0035_test.yml.tt2 index 560dc1fa..6b542755 100644 --- a/scenarios_pbx/invite_manager_2sec/0035_test.yml.tt2 +++ b/scenarios_pbx/invite_manager_2sec/0035_test.yml.tt2 @@ -106,7 +106,7 @@ sip_out: 'P-Callee-Ext-Contr-ID: ', 'P-Callee-Account-ID: 0', 'P-Orig-Callee-Dialed: manager', - 'P-Prev-Caller-UUID: [% invite_manager_2sec_scenarios_pbx_test.testuser1003.uuid %]', + 'P-NGCP-Prev-Caller-UUID: [% invite_manager_2sec_scenarios_pbx_test.testuser1003.uuid %]', 'P-First-Caller-RTP-Interface: ext', 'P-First-Caller-RTP-Interface-Source: default', 'P-NGCP-Presence-Caller: sip:[% scenarios.1.username %]@invite-manager-2sec.scenarios-pbx.test',