MT#63566 Change P-Prev-Caller-UUID -> P-NGCP-Prev-Caller-UUID

Just a rename of header P-Prev-Caller-UUID to prevent it to be exposed to external endpoints. Change-Id: Ibd73a9b8dd80ee8e0f17f7b1bf8d7058f482ad87 (cherry picked from commit 9a6a02a133)
9 months ago · 0d1158a2f7
parent 8cd01437ca
commit 0d1158a2f7
15 changed files with 17 additions and 17 deletions
--- 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: <sip:testuser1001@spce.test>;ip=127.0.0.1;port=5080;primary=4311001',
--- 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: <sip:testuser1001@spce.test>;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: <sip:testuser1001@spce.test>;ip=127.0.0.1;port=5080;primary=4311001',
--- 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: <sip:testuser1001@spce.test>;ip=127.0.0.1;port=5080;primary=4311001'
--- 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: <sip:testuser1004@spce.test>;ip=127.0.0.1;port=5080;primary=43110011004',
--- 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: <sip:testuser1004@spce.test>;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: <sip:testuser1004@spce.test>;ip=127.0.0.1;port=5080;primary=43110011004',
--- 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: <sip:testuser1004@spce.test>;ip=127.0.0.1;port=5080;primary=43110011004'
--- 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: <sip:[% scenarios.0.username %]@invite-callforward-timeout.scenarios.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_callforward_timeout_scenarios_test.testuser1002.phone_number %]'
--- 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',
--- 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: <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-Forward-Info: <sip:[% scenarios.0.responders.0.username %]@invite-redirect.scenarios.test>;ip=127.0.0.1;port=5080;primary=[% invite_redirect_scenarios_test.testuser1003.phone_number %]',
      'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.1.username %]@invite-redirect.scenarios.test>;ip=127.0.0.1;port=5080'
--- 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: <sip:127.0.0.1:5080;transport=udp>'
--- 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: <sip:\+[% invite_redirect_tel_uri_scenarios_test.testuser1000.phone_number %]@invite-redirect-tel-uri.scenarios.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_redirect_tel_uri_scenarios_test.testuser1000.phone_number %]',
      'P-NGCP-Forward-Info: <sip:[% scenarios.0.responders.0.username %]@invite-redirect-tel-uri.scenarios.test>;ip=127.0.0.1;port=5080;primary=[% invite_redirect_tel_uri_scenarios_test.testuser1001.phone_number %]',
      'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.1.username %]@invite-redirect-tel-uri.scenarios.test>;ip=127.0.0.1;port=5080',
--- 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: <sip:\+[% invite_redirect_tel_uri_scenarios_test.testuser1000.phone_number %]@invite-redirect-tel-uri.scenarios.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_redirect_tel_uri_scenarios_test.testuser1000.phone_number %]'
 - 'P-NGCP-Forward-Info: <sip:[% scenarios.0.responders.0.username %]@invite-redirect-tel-uri.scenarios.test>;ip=127.0.0.1;port=5080;primary=[% invite_redirect_tel_uri_scenarios_test.testuser1001.phone_number %]'
 - 'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.1.username %]@invite-redirect-tel-uri.scenarios.test>;ip=127.0.0.1;port=5080'
--- 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',
--- 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',
--- 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',