diff --git a/cache-config/t3c-generate/cfgfile/cfgfile_test.go b/cache-config/t3c-generate/cfgfile/cfgfile_test.go
index ed019561c7..8370ebd3a4 100644
--- a/cache-config/t3c-generate/cfgfile/cfgfile_test.go
+++ b/cache-config/t3c-generate/cfgfile/cfgfile_test.go
@@ -161,7 +161,7 @@ func randDS() *atscfg.DeliveryService {
ds.TRRequestHeaders = util.StrPtr(test.RandStr())
ds.Active = util.BoolPtr(test.RandBool())
ds.AnonymousBlockingEnabled = util.BoolPtr(test.RandBool())
- ds.CCRDNSTTL = util.IntPtr(test.RandInt())
+ ds.TRDNSTTL = util.IntPtr(test.RandInt())
ds.CDNID = util.IntPtr(test.RandInt())
ds.CDNName = util.StrPtr(test.RandStr())
ds.CheckPath = util.StrPtr(test.RandStr())
diff --git a/cache-config/testing/ort-tests/tc-fixtures.json b/cache-config/testing/ort-tests/tc-fixtures.json
index 8c835e7c77..3a6969d0d5 100644
--- a/cache-config/testing/ort-tests/tc-fixtures.json
+++ b/cache-config/testing/ort-tests/tc-fixtures.json
@@ -271,7 +271,7 @@
"deliveryService": {
"active": true,
"cdnName": "cdn1",
- "ccrDnsTtl": 30,
+ "trDnsTtl": 30,
"deepCachingType": "NEVER",
"displayName": "Good Kabletown CDN",
"dscp": 1,
@@ -293,7 +293,7 @@
"deliveryService": {
"active": true,
"cdnName": "cdn1",
- "ccrDnsTtl": 30,
+ "trDnsTtl": 30,
"deepCachingType": "NEVER",
"displayName": "Bad Tenant",
"dscp": 0,
@@ -312,7 +312,7 @@
{
"changeType": "create",
"deliveryService": {
- "ccrDnsTtl": 30,
+ "trDnsTtl": 30,
"deepCachingType": "NEVER",
"displayName": "Bad Test Case CDN",
"dscp": 0,
@@ -336,7 +336,7 @@
"deliveryService": {
"active": false,
"cdnName": "cdn1",
- "ccrDnsTtl": 30,
+ "trDnsTtl": 30,
"deepCachingType": "NEVER",
"displayName": "Testing transitions",
"dscp": 3,
@@ -359,7 +359,7 @@
"active": true,
"cdnName": "cdn1",
"cacheurl": "cacheUrl1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -425,7 +425,7 @@
"active": true,
"cdnName": "cdn1",
"cacheurl": "cacheUrl2",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [
"fmt",
@@ -497,7 +497,7 @@
"active": true,
"cdnName": "cdn1",
"cacheurl": "cacheUrl3",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": null,
"deepCachingType": "NEVER",
@@ -565,7 +565,7 @@
"active": true,
"cdnName": "cdn1",
"cacheurl": "",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"deepCachingType": "NEVER",
"displayName": "anymap-ds",
@@ -623,7 +623,7 @@
"active": true,
"cdnName": "cdn1",
"cacheurl": "cacheUrl1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [
"a",
@@ -686,7 +686,7 @@
"active": true,
"cdnName": "cdn1",
"cacheurl": "cacheUrl1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -753,7 +753,7 @@
"active": true,
"cdnName": "cdn1",
"cacheurl": "cacheUrl1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -820,7 +820,7 @@
"active": true,
"cdnName": "cdn1",
"cacheurl": "",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -887,7 +887,7 @@
"active": true,
"cdnName": "cdn2",
"cacheurl": "",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -951,7 +951,7 @@
"active": true,
"cdnName": "cdn1",
"cacheurl": "",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -1015,7 +1015,7 @@
"active": true,
"cdnName": "cdn1",
"cacheurl": "",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -1079,7 +1079,7 @@
"active": true,
"cdnName": "cdn1",
"cacheurl": "",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -1142,7 +1142,7 @@
"active": true,
"cdnName": "cdn1",
"cacheurl": "",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
diff --git a/docs/source/admin/traffic_router.rst b/docs/source/admin/traffic_router.rst
index b640741d23..bcdac12ea5 100644
--- a/docs/source/admin/traffic_router.rst
+++ b/docs/source/admin/traffic_router.rst
@@ -33,9 +33,6 @@ Requirements
Installing Traffic Router
=========================
#. If no suitable :term:`Profile` exists, create a new :term:`Profile` for Traffic Router via the :guilabel:`+` button on the :ref:`tp-configure-profiles` page in Traffic Portal
-
- .. warning:: Traffic Ops will *only* recognize a :term:`Profile` as assignable to a Traffic Router if its :ref:`profile-name` starts with the prefix ``ccr-``. The reason for this is a legacy limitation related to the old name for Traffic Router (Comcast Cloud Router), and will (hopefully) be rectified in the future.
-
#. Enter the Traffic Router server into Traffic Portal on the :ref:`tp-configure-servers` page (or via the :ref:`to-api`), assign to it a Traffic Router :term:`Profile`, and ensure that its status is set to ``ONLINE``.
#. Ensure the :abbr:`FQDN (Fully Qualified Domain Name)` of the Traffic Router is resolvable in DNS. This :abbr:`FQDN (Fully Qualified Domain Name)` must be resolvable by the clients expected to use this CDN.
#. Install a Traffic Router server package, either from source or using a :file:`traffic_router-{version string}.rpm` package generated using the instructions in :ref:`dev-building`.
diff --git a/docs/source/api/v3/deliveryservice_requests.rst b/docs/source/api/v3/deliveryservice_requests.rst
index 33035027d9..f6269117a5 100644
--- a/docs/source/api/v3/deliveryservice_requests.rst
+++ b/docs/source/api/v3/deliveryservice_requests.rst
@@ -94,7 +94,6 @@ Response Structure
.. deprecated:: ATCv3.0
This field has been deprecated in Traffic Control 3.x and is subject to removal in Traffic Control 4.x or later
- :ccrDnsTtl: The :ref:`ds-dns-ttl` - named "ccrDnsTtl" for legacy reasons
:cdnId: The integral, unique identifier of the :ref:`ds-cdn` to which the :term:`Delivery Service` belongs
:cdnName: Name of the :ref:`ds-cdn` to which the :term:`Delivery Service` belongs
:checkPath: A :ref:`ds-check-path`
@@ -160,6 +159,7 @@ Response Structure
:tenant: The name of the :term:`Tenant` who owns this :term:`Origin`
:tenantId: The integral, unique identifier of the :ref:`ds-tenant` who owns this :term:`Delivery Service`
:topology: The unique name of the :term:`Topology` that this :term:`Delivery Service` is assigned to
+ :trDnsTtl: The :ref:`ds-dns-ttl`
:trRequestHeaders: If defined, this defines the :ref:`ds-tr-req-headers` used by Traffic Router for this :term:`Delivery Service`
:trResponseHeaders: If defined, this defines the :ref:`ds-tr-resp-headers` used by Traffic Router for this :term:`Delivery Service`
:type: The :ref:`ds-types` of this :term:`Delivery Service`
@@ -203,7 +203,6 @@ Response Structure
"active": false,
"anonymousBlockingEnabled": false,
"cacheurl": null,
- "ccrDnsTtl": null,
"cdnId": 2,
"cdnName": "CDN-in-a-Box",
"checkPath": null,
@@ -272,6 +271,7 @@ Response Structure
"fqPacingRate": null,
"signingAlgorithm": null,
"tenant": "root",
+ "trDnsTtl": null,
"trResponseHeaders": null,
"trRequestHeaders": null,
"consistentHashRegex": null,
@@ -315,7 +315,6 @@ Request Structure
.. deprecated:: ATCv3.0
This field has been deprecated in Traffic Control 3.x and is subject to removal in Traffic Control 4.x or later
- :ccrDnsTtl: The :ref:`ds-dns-ttl` - named "ccrDnsTtl" for legacy reasons
:cdnId: The integral, unique identifier of the :ref:`ds-cdn` to which the :term:`Delivery Service` belongs
:cdnName: Name of the :ref:`ds-cdn` to which the :term:`Delivery Service` belongs
:checkPath: A :ref:`ds-check-path`
@@ -381,6 +380,7 @@ Request Structure
:tenant: The name of the :term:`Tenant` who owns this :term:`Origin`
:tenantId: The integral, unique identifier of the :ref:`ds-tenant` who owns this :term:`Delivery Service`
:topology: The unique name of the :term:`Topology` that this :term:`Delivery Service` is assigned to
+ :trDnsTtl: The :ref:`ds-dns-ttl`
:trRequestHeaders: If defined, this defines the :ref:`ds-tr-req-headers` used by Traffic Router for this :term:`Delivery Service`
:trResponseHeaders: If defined, this defines the :ref:`ds-tr-resp-headers` used by Traffic Router for this :term:`Delivery Service`
:type: The :ref:`ds-types` of this :term:`Delivery Service`
@@ -405,7 +405,6 @@ Request Structure
"active": false,
"anonymousBlockingEnabled": false,
"cacheurl": null,
- "ccrDnsTtl": null,
"cdnId": 2,
"cdnName": "CDN-in-a-Box",
"checkPath": null,
@@ -474,6 +473,7 @@ Request Structure
"signingAlgorithm": null,
"tenant": "root",
"topology": null,
+ "trDnsTtl": null,
"trResponseHeaders": null,
"trRequestHeaders": null,
"consistentHashRegex": null,
@@ -504,7 +504,6 @@ Response Structure
.. deprecated:: ATCv3.0
This field has been deprecated in Traffic Control 3.x and is subject to removal in Traffic Control 4.x or later
- :ccrDnsTtl: The :ref:`ds-dns-ttl` - named "ccrDnsTtl" for legacy reasons
:cdnId: The integral, unique identifier of the :ref:`ds-cdn` to which the :term:`Delivery Service` belongs
:cdnName: Name of the :ref:`ds-cdn` to which the :term:`Delivery Service` belongs
:checkPath: A :ref:`ds-check-path`
@@ -570,6 +569,7 @@ Response Structure
:tenant: The name of the :term:`Tenant` who owns this :term:`Origin`
:tenantId: The integral, unique identifier of the :ref:`ds-tenant` who owns this :term:`Delivery Service`
:topology: The unique name of the :term:`Topology` that this :term:`Delivery Service` is assigned to
+ :trDnsTtl: The :ref:`ds-dns-ttl`
:trRequestHeaders: If defined, this defines the :ref:`ds-tr-req-headers` used by Traffic Router for this :term:`Delivery Service`
:trResponseHeaders: If defined, this defines the :ref:`ds-tr-resp-headers` used by Traffic Router for this :term:`Delivery Service`
:type: The :ref:`ds-types` of this :term:`Delivery Service`
@@ -618,7 +618,6 @@ Response Structure
"active": false,
"anonymousBlockingEnabled": false,
"cacheurl": null,
- "ccrDnsTtl": null,
"cdnId": 2,
"cdnName": "CDN-in-a-Box",
"checkPath": null,
@@ -687,6 +686,7 @@ Response Structure
"fqPacingRate": null,
"signingAlgorithm": null,
"tenant": "root",
+ "trDnsTtl": null,
"trResponseHeaders": null,
"trRequestHeaders": null,
"consistentHashRegex": null,
@@ -724,7 +724,6 @@ Request Structure
.. deprecated:: ATCv3.0
This field has been deprecated in Traffic Control 3.x and is subject to removal in Traffic Control 4.x or later
- :ccrDnsTtl: The :ref:`ds-dns-ttl` - named "ccrDnsTtl" for legacy reasons
:cdnId: The integral, unique identifier of the :ref:`ds-cdn` to which the :term:`Delivery Service` belongs
:cdnName: Name of the :ref:`ds-cdn` to which the :term:`Delivery Service` belongs
:checkPath: A :ref:`ds-check-path`
@@ -790,6 +789,7 @@ Request Structure
:tenant: The name of the :term:`Tenant` who owns this :term:`Origin`
:tenantId: The integral, unique identifier of the :ref:`ds-tenant` who owns this :term:`Delivery Service`
:topology: The unique name of the :term:`Topology` that this :term:`Delivery Service` is assigned to
+ :trDnsTtl: The :ref:`ds-dns-ttl`
:trRequestHeaders: If defined, this defines the :ref:`ds-tr-req-headers` used by Traffic Router for this :term:`Delivery Service`
:trResponseHeaders: If defined, this defines the :ref:`ds-tr-resp-headers` used by Traffic Router for this :term:`Delivery Service`
:type: The :ref:`ds-types` of this :term:`Delivery Service`
@@ -832,7 +832,6 @@ Request Structure
"active": false,
"anonymousBlockingEnabled": false,
"cacheurl": null,
- "ccrDnsTtl": null,
"cdnId": 2,
"cdnName": "CDN-in-a-Box",
"checkPath": null,
@@ -901,6 +900,7 @@ Request Structure
"fqPacingRate": null,
"signingAlgorithm": null,
"tenant": "root",
+ "trDnsTtl": null,
"trResponseHeaders": "",
"trRequestHeaders": null,
"consistentHashRegex": null,
@@ -928,7 +928,6 @@ Response Structure
.. deprecated:: ATCv3.0
This field has been deprecated in Traffic Control 3.x and is subject to removal in Traffic Control 4.x or later
- :ccrDnsTtl: The :ref:`ds-dns-ttl` - named "ccrDnsTtl" for legacy reasons
:cdnId: The integral, unique identifier of the :ref:`ds-cdn` to which the :term:`Delivery Service` belongs
:cdnName: Name of the :ref:`ds-cdn` to which the :term:`Delivery Service` belongs
:checkPath: A :ref:`ds-check-path`
@@ -994,6 +993,7 @@ Response Structure
:tenant: The name of the :term:`Tenant` who owns this :term:`Origin`
:tenantId: The integral, unique identifier of the :ref:`ds-tenant` who owns this :term:`Delivery Service`
:topology: The unique name of the :term:`Topology` that this :term:`Delivery Service` is assigned to
+ :trDnsTtl: The :ref:`ds-dns-ttl`
:trRequestHeaders: If defined, this defines the :ref:`ds-tr-req-headers` used by Traffic Router for this :term:`Delivery Service`
:trResponseHeaders: If defined, this defines the :ref:`ds-tr-resp-headers` used by Traffic Router for this :term:`Delivery Service`
:type: The :ref:`ds-types` of this :term:`Delivery Service`
@@ -1042,7 +1042,6 @@ Response Structure
"active": false,
"anonymousBlockingEnabled": false,
"cacheurl": null,
- "ccrDnsTtl": null,
"cdnId": 2,
"cdnName": "CDN-in-a-Box",
"checkPath": null,
@@ -1111,6 +1110,7 @@ Response Structure
"fqPacingRate": null,
"signingAlgorithm": null,
"tenant": "root",
+ "trDnsTtl": null,
"trResponseHeaders": "",
"trRequestHeaders": null,
"consistentHashRegex": null,
diff --git a/docs/source/api/v3/deliveryservice_requests_id_assign.rst b/docs/source/api/v3/deliveryservice_requests_id_assign.rst
index 0af1a9a71e..9608ae03e6 100644
--- a/docs/source/api/v3/deliveryservice_requests_id_assign.rst
+++ b/docs/source/api/v3/deliveryservice_requests_id_assign.rst
@@ -63,7 +63,6 @@ Response Structure
.. deprecated:: ATCv3.0
This field has been deprecated in Traffic Control 3.x and is subject to removal in Traffic Control 4.x or later
- :ccrDnsTtl: The :ref:`ds-dns-ttl` - named "ccrDnsTtl" for legacy reasons
:cdnId: The integral, unique identifier of the :ref:`ds-cdn` to which the :term:`Delivery Service` belongs
:cdnName: Name of the :ref:`ds-cdn` to which the :term:`Delivery Service` belongs
:checkPath: A :ref:`ds-check-path`
@@ -129,6 +128,7 @@ Response Structure
:tenant: The name of the :term:`Tenant` who owns this :term:`Origin`
:tenantId: The integral, unique identifier of the :ref:`ds-tenant` who owns this :term:`Delivery Service`
:topology: The unique name of the :term:`Topology` that this :term:`Delivery Service` is assigned to
+ :trDnsTtl: The :ref:`ds-dns-ttl`
:trRequestHeaders: If defined, this defines the :ref:`ds-tr-req-headers` used by Traffic Router for this :term:`Delivery Service`
:trResponseHeaders: If defined, this defines the :ref:`ds-tr-resp-headers` used by Traffic Router for this :term:`Delivery Service`
:type: The :ref:`ds-types` of this :term:`Delivery Service`
@@ -179,7 +179,6 @@ Response Structure
"active": true,
"anonymousBlockingEnabled": false,
"cacheurl": null,
- "ccrDnsTtl": null,
"cdnId": 2,
"cdnName": "CDN-in-a-Box",
"checkPath": null,
@@ -248,6 +247,7 @@ Response Structure
"fqPacingRate": null,
"signingAlgorithm": null,
"tenant": "root",
+ "trDnsTtl": null,
"trResponseHeaders": null,
"trRequestHeaders": null,
"consistentHashRegex": null,
diff --git a/docs/source/api/v3/deliveryservice_requests_id_status.rst b/docs/source/api/v3/deliveryservice_requests_id_status.rst
index b2e6aa64e6..dacc60b024 100644
--- a/docs/source/api/v3/deliveryservice_requests_id_status.rst
+++ b/docs/source/api/v3/deliveryservice_requests_id_status.rst
@@ -64,7 +64,6 @@ Response Structure
.. deprecated:: ATCv3.0
This field has been deprecated in Traffic Control 3.x and is subject to removal in Traffic Control 4.x or later
- :ccrDnsTtl: The :ref:`ds-dns-ttl` - named "ccrDnsTtl" for legacy reasons
:cdnId: The integral, unique identifier of the :ref:`ds-cdn` to which the :term:`Delivery Service` belongs
:cdnName: Name of the :ref:`ds-cdn` to which the :term:`Delivery Service` belongs
:checkPath: A :ref:`ds-check-path`
@@ -130,6 +129,7 @@ Response Structure
:tenant: The name of the :term:`Tenant` who owns this :term:`Origin`
:tenantId: The integral, unique identifier of the :ref:`ds-tenant` who owns this :term:`Delivery Service`
:topology: The unique name of the :term:`Topology` that this :term:`Delivery Service` is assigned to
+ :trDnsTtl: A :ref:`ds-dns-ttl`
:trRequestHeaders: If defined, this defines the :ref:`ds-tr-req-headers` used by Traffic Router for this :term:`Delivery Service`
:trResponseHeaders: If defined, this defines the :ref:`ds-tr-resp-headers` used by Traffic Router for this :term:`Delivery Service`
:type: The :ref:`ds-types` of this :term:`Delivery Service`
@@ -180,7 +180,6 @@ Response Structure
"active": true,
"anonymousBlockingEnabled": false,
"cacheurl": null,
- "ccrDnsTtl": null,
"cdnId": 2,
"cdnName": "CDN-in-a-Box",
"checkPath": null,
@@ -249,6 +248,7 @@ Response Structure
"fqPacingRate": null,
"signingAlgorithm": null,
"tenant": "root",
+ "trDnsTtl": null,
"trResponseHeaders": null,
"trRequestHeaders": null,
"consistentHashRegex": null,
diff --git a/docs/source/api/v3/deliveryservices.rst b/docs/source/api/v3/deliveryservices.rst
index ff50793129..e481196571 100644
--- a/docs/source/api/v3/deliveryservices.rst
+++ b/docs/source/api/v3/deliveryservices.rst
@@ -78,7 +78,6 @@ Response Structure
.. deprecated:: ATCv3.0
This field has been deprecated in Traffic Control 3.x and is subject to removal in Traffic Control 4.x or later
-:ccrDnsTtl: The :ref:`ds-dns-ttl` - named "ccrDnsTtl" for legacy reasons
:cdnId: The integral, unique identifier of the :ref:`ds-cdn` to which the :term:`Delivery Service` belongs
:cdnName: Name of the :ref:`ds-cdn` to which the :term:`Delivery Service` belongs
:checkPath: A :ref:`ds-check-path`
@@ -145,6 +144,7 @@ Response Structure
:sslKeyVersion: This integer indicates the :ref:`ds-ssl-key-version`
:tenantId: The integral, unique identifier of the :ref:`ds-tenant` who owns this :term:`Delivery Service`
:topology: The unique name of the :term:`Topology` that this :term:`Delivery Service` is assigned to
+:trDnsTtl: A :ref:`ds-dns-ttl`
:trRequestHeaders: If defined, this defines the :ref:`ds-tr-req-headers` used by Traffic Router for this :term:`Delivery Service`
:trResponseHeaders: If defined, this defines the :ref:`ds-tr-resp-headers` used by Traffic Router for this :term:`Delivery Service`
:type: The :ref:`ds-types` of this :term:`Delivery Service`
@@ -170,7 +170,6 @@ Response Structure
"active": true,
"anonymousBlockingEnabled": false,
"cacheurl": null,
- "ccrDnsTtl": null,
"cdnId": 2,
"cdnName": "CDN-in-a-Box",
"checkPath": null,
@@ -238,6 +237,7 @@ Response Structure
"fqPacingRate": null,
"signingAlgorithm": null,
"tenant": "root",
+ "trDnsTtl": null,
"trResponseHeaders": null,
"trRequestHeaders": null,
"consistentHashRegex": null,
@@ -273,7 +273,6 @@ Request Structure
.. deprecated:: ATCv3.0
This field has been deprecated in Traffic Control 3.x and is subject to removal in Traffic Control 4.x or later
-:ccrDnsTtl: The :ref:`ds-dns-ttl` - named "ccrDnsTtl" for legacy reasons
:cdnId: The integral, unique identifier of the :ref:`ds-cdn` to which the :term:`Delivery Service` belongs
:checkPath: A :ref:`ds-check-path`
:consistentHashRegex: A :ref:`ds-consistent-hashing-regex`
@@ -324,10 +323,11 @@ Request Structure
:serviceCategory: The name of the :ref:`ds-service-category` with which the :term:`Delivery Service` is associated - or ``null`` if there is to be no such category
:signed: ``true`` if and only if ``signingAlgorithm`` is not ``null``, ``false`` otherwise
:signingAlgorithm: Either a :ref:`ds-signing-algorithm` or ``null`` to indicate URL/URI signing is not implemented on this :term:`Delivery Service`
-:rangeSliceBlockSize: An integer that defines the byte block size for the ATS Slice Plugin. It can only and must be set if ``rangeRequestHandling`` is set to 3. It can only be between (inclusive) 262144 (256KB) - 33554432 (32MB).
+:rangeSliceBlockSize: An integer that defines the byte block size for the ATS Slice Plugin. It can only and must be set if ``rangeRequestHandling`` is set to 3. It can only be between (inclusive) 262144 (256KB) - 33554432 (32MB).
:sslKeyVersion: This integer indicates the :ref:`ds-ssl-key-version`
:tenantId: The integral, unique identifier of the :ref:`ds-tenant` who owns this :term:`Delivery Service`
:topology: The unique name of the :term:`Topology` that this :term:`Delivery Service` is assigned to
+:trDnsTtl: A :ref:`ds-dns-ttl`
:trRequestHeaders: If defined, this defines the :ref:`ds-tr-req-headers` used by Traffic Router for this :term:`Delivery Service`
:trResponseHeaders: If defined, this defines the :ref:`ds-tr-resp-headers` used by Traffic Router for this :term:`Delivery Service`
:type: The :ref:`ds-types` of this :term:`Delivery Service`
@@ -388,7 +388,6 @@ Response Structure
.. deprecated:: ATCv3.0
This field has been deprecated in Traffic Control 3.x and is subject to removal in Traffic Control 4.x or later
-:ccrDnsTtl: The :ref:`ds-dns-ttl` - named "ccrDnsTtl" for legacy reasons
:cdnId: The integral, unique identifier of the :ref:`ds-cdn` to which the :term:`Delivery Service` belongs
:cdnName: Name of the :ref:`ds-cdn` to which the :term:`Delivery Service` belongs
:checkPath: A :ref:`ds-check-path`
@@ -455,6 +454,7 @@ Response Structure
:sslKeyVersion: This integer indicates the :ref:`ds-ssl-key-version`
:tenantId: The integral, unique identifier of the :ref:`ds-tenant` who owns this :term:`Delivery Service`
:topology: The unique name of the :term:`Topology` that this :term:`Delivery Service` is assigned to
+:trDnsTtl: A :ref:`ds-dns-ttl`
:trRequestHeaders: If defined, this defines the :ref:`ds-tr-req-headers` used by Traffic Router for this :term:`Delivery Service`
:trResponseHeaders: If defined, this defines the :ref:`ds-tr-resp-headers` used by Traffic Router for this :term:`Delivery Service`
:type: The :ref:`ds-types` of this :term:`Delivery Service`
@@ -487,7 +487,6 @@ Response Structure
"active": false,
"anonymousBlockingEnabled": false,
"cacheurl": null,
- "ccrDnsTtl": null,
"cdnId": 2,
"cdnName": "CDN-in-a-Box",
"checkPath": null,
@@ -547,6 +546,7 @@ Response Structure
"signed": false,
"sslKeyVersion": null,
"tenantId": 1,
+ "trDnsTtl": null,
"type": "HTTP",
"typeId": 1,
"xmlId": "test",
diff --git a/docs/source/api/v3/deliveryservices_id.rst b/docs/source/api/v3/deliveryservices_id.rst
index 9e4ab6895e..807ec0f7cd 100644
--- a/docs/source/api/v3/deliveryservices_id.rst
+++ b/docs/source/api/v3/deliveryservices_id.rst
@@ -36,7 +36,6 @@ Request Structure
.. deprecated:: ATCv3.0
This field has been deprecated in Traffic Control 3.x and is subject to removal in Traffic Control 4.x or later
-:ccrDnsTtl: The :ref:`ds-dns-ttl` - named "ccrDnsTtl" for legacy reasons
:cdnId: The integral, unique identifier of the :ref:`ds-cdn` to which the :term:`Delivery Service` belongs
.. note:: If the Delivery Service has SSL Keys, then cdnId is not allowed to change as that would invalidate the SSL Key
@@ -92,10 +91,11 @@ Request Structure
:signed: ``true`` if and only if ``signingAlgorithm`` is not ``null``, ``false`` otherwise
:signingAlgorithm: Either a :ref:`ds-signing-algorithm` or ``null`` to indicate URL/URI signing is not implemented on this :term:`Delivery Service`
-:rangeSliceBlockSize: An integer that defines the byte block size for the ATS Slice Plugin. It can only and must be set if ``rangeRequestHandling`` is set to 3. It can only be between (inclusive) 262144 (256KB) - 33554432 (32MB).
+:rangeSliceBlockSize: An integer that defines the byte block size for the ATS Slice Plugin. It can only and must be set if ``rangeRequestHandling`` is set to 3. It can only be between (inclusive) 262144 (256KB) - 33554432 (32MB).
:sslKeyVersion: This integer indicates the :ref:`ds-ssl-key-version`
:tenantId: The integral, unique identifier of the :ref:`ds-tenant` who owns this :term:`Delivery Service`
:topology: The unique name of the :term:`Topology` that this :term:`Delivery Service` is assigned to
+:trDnsTtl: A :ref:`ds-dns-ttl`
:trRequestHeaders: If defined, this defines the :ref:`ds-tr-req-headers` used by Traffic Router for this :term:`Delivery Service`
:trResponseHeaders: If defined, this defines the :ref:`ds-tr-resp-headers` used by Traffic Router for this :term:`Delivery Service`
:typeId: The integral, unique identifier of the :ref:`ds-types` of this :term:`Delivery Service`
diff --git a/docs/source/api/v3/deliveryservices_id_safe.rst b/docs/source/api/v3/deliveryservices_id_safe.rst
index d8aa0692c8..afe63d85db 100644
--- a/docs/source/api/v3/deliveryservices_id_safe.rst
+++ b/docs/source/api/v3/deliveryservices_id_safe.rst
@@ -68,7 +68,6 @@ Response Structure
.. deprecated:: ATCv3.0
This field has been deprecated in Traffic Control 3.x and is subject to removal in Traffic Control 4.x or later
-:ccrDnsTtl: The :ref:`ds-dns-ttl` - named "ccrDnsTtl" for legacy reasons
:cdnId: The integral, unique identifier of the :ref:`ds-cdn` to which the :term:`Delivery Service` belongs
:cdnName: Name of the :ref:`ds-cdn` to which the :term:`Delivery Service` belongs
:checkPath: A :ref:`ds-check-path`
@@ -129,10 +128,11 @@ Response Structure
:remapText: :ref:`ds-raw-remap`
:signed: ``true`` if and only if ``signingAlgorithm`` is not ``null``, ``false`` otherwise
:signingAlgorithm: Either a :ref:`ds-signing-algorithm` or ``null`` to indicate URL/URI signing is not implemented on this :term:`Delivery Service`
-:rangeSliceBlockSize: An integer that defines the byte block size for the ATS Slice Plugin. It can only and must be set if ``rangeRequestHandling`` is set to 3.
+:rangeSliceBlockSize: An integer that defines the byte block size for the ATS Slice Plugin. It can only and must be set if ``rangeRequestHandling`` is set to 3.
:sslKeyVersion: This integer indicates the :ref:`ds-ssl-key-version`
:tenantId: The integral, unique identifier of the :ref:`ds-tenant` who owns this :term:`Delivery Service`
:topology: The unique name of the :term:`Topology` that this :term:`Delivery Service` is assigned to
+:trDnsTtl: A :ref:`ds-dns-ttl`
:trRequestHeaders: If defined, this defines the :ref:`ds-tr-req-headers` used by Traffic Router for this :term:`Delivery Service`
:trResponseHeaders: If defined, this defines the :ref:`ds-tr-resp-headers` used by Traffic Router for this :term:`Delivery Service`
:type: The :ref:`ds-types` of this :term:`Delivery Service`
@@ -161,7 +161,6 @@ Response Structure
"active": true,
"anonymousBlockingEnabled": false,
"cacheurl": null,
- "ccrDnsTtl": null,
"cdnId": 2,
"cdnName": "CDN-in-a-Box",
"checkPath": null,
@@ -229,6 +228,7 @@ Response Structure
"fqPacingRate": null,
"signingAlgorithm": null,
"tenant": "root",
+ "trDnsTtl": null,
"trResponseHeaders": null,
"trRequestHeaders": null,
"consistentHashRegex": null,
diff --git a/docs/source/api/v3/servers_id_deliveryservices.rst b/docs/source/api/v3/servers_id_deliveryservices.rst
index 4d404857b6..59c6e12bc1 100644
--- a/docs/source/api/v3/servers_id_deliveryservices.rst
+++ b/docs/source/api/v3/servers_id_deliveryservices.rst
@@ -74,7 +74,6 @@ Response Structure
.. deprecated:: ATCv3.0
This field has been deprecated in Traffic Control 3.x and is subject to removal in Traffic Control 4.x or later
-:ccrDnsTtl: The :ref:`ds-dns-ttl` - named "ccrDnsTtl" for legacy reasons
:cdnId: The integral, unique identifier of the :ref:`ds-cdn` to which the :term:`Delivery Service` belongs
:cdnName: Name of the :ref:`ds-cdn` to which the :term:`Delivery Service` belongs
:checkPath: A :ref:`ds-check-path`
@@ -135,10 +134,11 @@ Response Structure
:remapText: :ref:`ds-raw-remap`
:signed: ``true`` if and only if ``signingAlgorithm`` is not ``null``, ``false`` otherwise
:signingAlgorithm: Either a :ref:`ds-signing-algorithm` or ``null`` to indicate URL/URI signing is not implemented on this :term:`Delivery Service`
-:rangeSliceBlockSize: An integer that defines the byte block size for the ATS Slice Plugin. It can only and must be set if ``rangeRequestHandling`` is set to 3.
+:rangeSliceBlockSize: An integer that defines the byte block size for the ATS Slice Plugin. It can only and must be set if ``rangeRequestHandling`` is set to 3.
:sslKeyVersion: This integer indicates the :ref:`ds-ssl-key-version`
:tenantId: The integral, unique identifier of the :ref:`ds-tenant` who owns this :term:`Delivery Service`
:topology: The unique name of the :term:`Topology` that this :term:`Delivery Service` is assigned to
+:trDnsTtl: A :ref:`ds-dns-ttl`
:trRequestHeaders: If defined, this defines the :ref:`ds-tr-req-headers` used by Traffic Router for this :term:`Delivery Service`
:trResponseHeaders: If defined, this defines the :ref:`ds-tr-resp-headers` used by Traffic Router for this :term:`Delivery Service`
:type: The :ref:`ds-types` of this :term:`Delivery Service`
@@ -164,7 +164,6 @@ Response Structure
"active": true,
"anonymousBlockingEnabled": false,
"cacheurl": null,
- "ccrDnsTtl": null,
"cdnId": 2,
"cdnName": "CDN-in-a-Box",
"checkPath": null,
@@ -232,6 +231,7 @@ Response Structure
"fqPacingRate": null,
"signingAlgorithm": null,
"tenant": "root",
+ "trDnsTtl": null,
"trResponseHeaders": null,
"trRequestHeaders": null,
"consistentHashRegex": null,
diff --git a/docs/source/api/v4/deliveryservice_requests.rst b/docs/source/api/v4/deliveryservice_requests.rst
index dd628cd4d3..768eda6dcc 100644
--- a/docs/source/api/v4/deliveryservice_requests.rst
+++ b/docs/source/api/v4/deliveryservice_requests.rst
@@ -111,7 +111,6 @@ The response is an array of representations of :term:`Delivery Service Requests`
"active": false,
"anonymousBlockingEnabled": false,
"cacheurl": null,
- "ccrDnsTtl": null,
"cdnId": 2,
"cdnName": "CDN-in-a-Box",
"checkPath": null,
@@ -179,6 +178,7 @@ The response is an array of representations of :term:`Delivery Service Requests`
"fqPacingRate": null,
"signingAlgorithm": null,
"tenant": "root",
+ "trDnsTtl": null,
"trResponseHeaders": null,
"trRequestHeaders": null,
"consistentHashRegex": null,
@@ -228,7 +228,6 @@ The request must be a well-formed representation of a :term:`Delivery Service Re
"active": false,
"anonymousBlockingEnabled": false,
"cacheurl": null,
- "ccrDnsTtl": null,
"cdnId": 2,
"cdnName": "CDN-in-a-Box",
"checkPath": null,
@@ -296,6 +295,7 @@ The request must be a well-formed representation of a :term:`Delivery Service Re
"signingAlgorithm": null,
"tenant": "root",
"topology": null,
+ "trDnsTtl": null,
"trResponseHeaders": null,
"trRequestHeaders": null,
"consistentHashRegex": null,
@@ -353,7 +353,6 @@ The response will be a representation of the created :term:`Delivery Service Req
"active": false,
"anonymousBlockingEnabled": false,
"cacheurl": null,
- "ccrDnsTtl": null,
"cdnId": 2,
"cdnName": "CDN-in-a-Box",
"checkPath": null,
@@ -421,6 +420,7 @@ The response will be a representation of the created :term:`Delivery Service Req
"fqPacingRate": null,
"signingAlgorithm": null,
"tenant": "root",
+ "trDnsTtl": null,
"trResponseHeaders": null,
"trRequestHeaders": null,
"consistentHashRegex": null,
@@ -438,7 +438,6 @@ The response will be a representation of the created :term:`Delivery Service Req
"active": true,
"anonymousBlockingEnabled": false,
"cacheurl": null,
- "ccrDnsTtl": null,
"cdnId": 2,
"cdnName": "CDN-in-a-Box",
"checkPath": null,
@@ -506,6 +505,7 @@ The response will be a representation of the created :term:`Delivery Service Req
"signingAlgorithm": null,
"tenant": "root",
"topology": null,
+ "trDnsTtl": null,
"trResponseHeaders": null,
"trRequestHeaders": null,
"consistentHashRegex": null,
@@ -563,7 +563,6 @@ The request body must be a representation of a :term:`Delivery Service Request`
"requested": {
"active": true,
"cdnId": 2,
- "ccrDnsTtl": 30,
"deepCachingType": "NEVER",
"displayName": "Demo 1 but I modified the DSR",
"dscp": 0,
@@ -575,6 +574,7 @@ The request body must be a representation of a :term:`Delivery Service Request`
"regional": false,
"regionalGeoBlocking": false,
"tenantId": 1,
+ "trDnsTtl": 30,
"typeId": 8,
"xmlId": "demo1",
"id": 1
@@ -618,7 +618,6 @@ The response is a full representation of the edited :term:`Delivery Service Requ
"active": true,
"anonymousBlockingEnabled": false,
"cacheurl": null,
- "ccrDnsTtl": null,
"cdnId": 2,
"cdnName": "CDN-in-a-Box",
"checkPath": null,
@@ -682,6 +681,7 @@ The response is a full representation of the edited :term:`Delivery Service Requ
"fqPacingRate": null,
"signingAlgorithm": null,
"tenant": "root",
+ "trDnsTtl": null,
"trResponseHeaders": null,
"trRequestHeaders": null,
"consistentHashRegex": null,
@@ -705,7 +705,6 @@ The response is a full representation of the edited :term:`Delivery Service Requ
"active": true,
"anonymousBlockingEnabled": false,
"cacheurl": null,
- "ccrDnsTtl": 30,
"cdnId": 2,
"cdnName": null,
"checkPath": null,
@@ -760,6 +759,7 @@ The response is a full representation of the edited :term:`Delivery Service Requ
"fqPacingRate": null,
"signingAlgorithm": null,
"tenant": null,
+ "trDnsTtl": 30,
"trResponseHeaders": null,
"trRequestHeaders": null,
"consistentHashRegex": null,
diff --git a/docs/source/api/v4/deliveryservice_requests_id_assign.rst b/docs/source/api/v4/deliveryservice_requests_id_assign.rst
index 9a9710acec..3ad94911f8 100644
--- a/docs/source/api/v4/deliveryservice_requests_id_assign.rst
+++ b/docs/source/api/v4/deliveryservice_requests_id_assign.rst
@@ -149,7 +149,6 @@ The response contains a full representation of the newly assigned :term:`Deliver
"active": true,
"anonymousBlockingEnabled": false,
"cacheurl": null,
- "ccrDnsTtl": null,
"cdnId": 2,
"cdnName": "CDN-in-a-Box",
"checkPath": null,
@@ -213,6 +212,7 @@ The response contains a full representation of the newly assigned :term:`Deliver
"fqPacingRate": null,
"signingAlgorithm": null,
"tenant": "root",
+ "trDnsTtl": null,
"trResponseHeaders": null,
"trRequestHeaders": null,
"consistentHashRegex": null,
@@ -236,7 +236,6 @@ The response contains a full representation of the newly assigned :term:`Deliver
"active": true,
"anonymousBlockingEnabled": false,
"cacheurl": null,
- "ccrDnsTtl": 30,
"cdnId": 2,
"cdnName": null,
"checkPath": null,
@@ -291,6 +290,7 @@ The response contains a full representation of the newly assigned :term:`Deliver
"fqPacingRate": null,
"signingAlgorithm": null,
"tenant": null,
+ "trDnsTtl": 30,
"trResponseHeaders": null,
"trRequestHeaders": null,
"consistentHashRegex": null,
diff --git a/docs/source/api/v4/deliveryservice_requests_id_status.rst b/docs/source/api/v4/deliveryservice_requests_id_status.rst
index 933e8abe25..52546b4298 100644
--- a/docs/source/api/v4/deliveryservice_requests_id_status.rst
+++ b/docs/source/api/v4/deliveryservice_requests_id_status.rst
@@ -146,7 +146,6 @@ The response is a full representation of the modified :term:`DSR`.
"active": true,
"anonymousBlockingEnabled": false,
"cacheurl": null,
- "ccrDnsTtl": null,
"cdnId": 2,
"cdnName": "CDN-in-a-Box",
"checkPath": null,
@@ -210,6 +209,7 @@ The response is a full representation of the modified :term:`DSR`.
"fqPacingRate": null,
"signingAlgorithm": null,
"tenant": "root",
+ "trDnsTtl": null,
"trResponseHeaders": null,
"trRequestHeaders": null,
"consistentHashRegex": null,
@@ -233,7 +233,6 @@ The response is a full representation of the modified :term:`DSR`.
"active": true,
"anonymousBlockingEnabled": false,
"cacheurl": null,
- "ccrDnsTtl": 30,
"cdnId": 2,
"cdnName": null,
"checkPath": null,
@@ -288,6 +287,7 @@ The response is a full representation of the modified :term:`DSR`.
"fqPacingRate": null,
"signingAlgorithm": null,
"tenant": null,
+ "trDnsTtl": 30,
"trResponseHeaders": null,
"trRequestHeaders": null,
"consistentHashRegex": null,
diff --git a/docs/source/api/v4/deliveryservices.rst b/docs/source/api/v4/deliveryservices.rst
index f6e3934d9b..d7b519ee89 100644
--- a/docs/source/api/v4/deliveryservices.rst
+++ b/docs/source/api/v4/deliveryservices.rst
@@ -85,7 +85,6 @@ Response Structure
------------------
:active: A boolean that defines :ref:`ds-active`.
:anonymousBlockingEnabled: A boolean that defines :ref:`ds-anonymous-blocking`
-:ccrDnsTtl: The :ref:`ds-dns-ttl` - named "ccrDnsTtl" for legacy reasons
:cdnId: The integral, unique identifier of the :ref:`ds-cdn` to which the :term:`Delivery Service` belongs
:cdnName: Name of the :ref:`ds-cdn` to which the :term:`Delivery Service` belongs
:checkPath: A :ref:`ds-check-path`
@@ -159,6 +158,7 @@ Response Structure
.. versionadded:: 4.0
:topology: The unique name of the :term:`Topology` that this :term:`Delivery Service` is assigned to
+:trDnsTtl: The :ref:`ds-dns-ttl`
:trRequestHeaders: If defined, this defines the :ref:`ds-tr-req-headers` used by Traffic Router for this :term:`Delivery Service`
:trResponseHeaders: If defined, this defines the :ref:`ds-tr-resp-headers` used by Traffic Router for this :term:`Delivery Service`
:type: The :ref:`ds-types` of this :term:`Delivery Service`
@@ -186,7 +186,6 @@ Response Structure
{
"active": true,
"anonymousBlockingEnabled": false,
- "ccrDnsTtl": null,
"cdnId": 2,
"cdnName": "CDN-in-a-Box",
"checkPath": null,
@@ -259,6 +258,7 @@ Response Structure
"tenantId": 1,
"tlsVersions": null,
"topology": "demo1-top",
+ "trDnsTtl": null,
"trResponseHeaders": null,
"trRequestHeaders": null,
"type": "DNS",
@@ -281,7 +281,6 @@ Request Structure
-----------------
:active: A boolean that defines :ref:`ds-active`.
:anonymousBlockingEnabled: A boolean that defines :ref:`ds-anonymous-blocking`
-:ccrDnsTtl: The :ref:`ds-dns-ttl` - named "ccrDnsTtl" for legacy reasons
:cdnId: The integral, unique identifier of the :ref:`ds-cdn` to which the :term:`Delivery Service` belongs
:checkPath: A :ref:`ds-check-path`
:consistentHashRegex: A :ref:`ds-consistent-hashing-regex`
@@ -339,6 +338,7 @@ Request Structure
.. versionadded:: 4.0
:topology: The unique name of the :term:`Topology` that this :term:`Delivery Service` is assigned to
+:trDnsTtl: The :ref:`ds-dns-ttl`
:trRequestHeaders: If defined, this defines the :ref:`ds-tr-req-headers` used by Traffic Router for this :term:`Delivery Service`
:trResponseHeaders: If defined, this defines the :ref:`ds-tr-resp-headers` used by Traffic Router for this :term:`Delivery Service`
:type: The :ref:`ds-types` of this :term:`Delivery Service`
@@ -361,7 +361,6 @@ Request Structure
{
"active": false,
"anonymousBlockingEnabled": false,
- "ccrDnsTtl": null,
"cdnId": 2,
"checkPath": null,
"consistentHashRegex": null,
@@ -420,6 +419,7 @@ Request Structure
"1.3"
],
"topology": null,
+ "trDnsTtl": null,
"trRequestHeaders": null,
"trResponseHeaders": null,
"type": "HTTP",
@@ -432,7 +432,6 @@ Response Structure
------------------
:active: A boolean that defines :ref:`ds-active`.
:anonymousBlockingEnabled: A boolean that defines :ref:`ds-anonymous-blocking`
-:ccrDnsTtl: The :ref:`ds-dns-ttl` - named "ccrDnsTtl" for legacy reasons
:cdnId: The integral, unique identifier of the :ref:`ds-cdn` to which the :term:`Delivery Service` belongs
:cdnName: Name of the :ref:`ds-cdn` to which the :term:`Delivery Service` belongs
:checkPath: A :ref:`ds-check-path`
@@ -506,6 +505,7 @@ Response Structure
.. versionadded:: 4.0
:topology: The unique name of the :term:`Topology` that this :term:`Delivery Service` is assigned to
+:trDnsTtl: The :ref:`ds-dns-ttl`
:trRequestHeaders: If defined, this defines the :ref:`ds-tr-req-headers` used by Traffic Router for this :term:`Delivery Service`
:trResponseHeaders: If defined, this defines the :ref:`ds-tr-resp-headers` used by Traffic Router for this :term:`Delivery Service`
:type: The :ref:`ds-types` of this :term:`Delivery Service`
@@ -543,7 +543,6 @@ Response Structure
"response": [{
"active": false,
"anonymousBlockingEnabled": false,
- "ccrDnsTtl": null,
"cdnId": 2,
"cdnName": null,
"checkPath": null,
@@ -618,6 +617,7 @@ Response Structure
"1.3"
],
"topology": null,
+ "trDnsTtl": null,
"trResponseHeaders": null,
"trRequestHeaders": null,
"type": "HTTP",
diff --git a/docs/source/api/v4/deliveryservices_id.rst b/docs/source/api/v4/deliveryservices_id.rst
index c2ce373d9f..45188799fb 100644
--- a/docs/source/api/v4/deliveryservices_id.rst
+++ b/docs/source/api/v4/deliveryservices_id.rst
@@ -32,7 +32,6 @@ Request Structure
-----------------
:active: A boolean that defines :ref:`ds-active`.
:anonymousBlockingEnabled: A boolean that defines :ref:`ds-anonymous-blocking`
-:ccrDnsTtl: The :ref:`ds-dns-ttl` - named "ccrDnsTtl" for legacy reasons
:cdnId: The integral, unique identifier of the :ref:`ds-cdn` to which the :term:`Delivery Service` belongs
.. note:: If the Delivery Service has SSL Keys, then cdnId is not allowed to change as that would invalidate the SSL Key
@@ -95,6 +94,7 @@ Request Structure
.. versionadded:: 4.0
:topology: The unique name of the :term:`Topology` that this :term:`Delivery Service` is assigned to
+:trDnsTtl: The :ref:`ds-dns-ttl`
:trRequestHeaders: If defined, this defines the :ref:`ds-tr-req-headers` used by Traffic Router for this :term:`Delivery Service`
:trResponseHeaders: If defined, this defines the :ref:`ds-tr-resp-headers` used by Traffic Router for this :term:`Delivery Service`
:typeId: The integral, unique identifier of the :ref:`ds-types` of this :term:`Delivery Service`
@@ -119,7 +119,6 @@ Request Structure
{
"active": false,
"anonymousBlockingEnabled": false,
- "ccrDnsTtl": null,
"cdnId": 2,
"checkPath": null,
"consistentHashRegex": null,
@@ -175,6 +174,7 @@ Request Structure
"tenantId": 1,
"tlsVersions": null,
"topology": null,
+ "trDnsTtl": null,
"trRequestHeaders": null,
"trResponseHeaders": null,
"type": "HTTP",
@@ -187,7 +187,6 @@ Response Structure
------------------
:active: A boolean that defines :ref:`ds-active`.
:anonymousBlockingEnabled: A boolean that defines :ref:`ds-anonymous-blocking`
-:ccrDnsTtl: The :ref:`ds-dns-ttl` - named "ccrDnsTtl" for legacy reasons
:cdnId: The integral, unique identifier of the :ref:`ds-cdn` to which the :term:`Delivery Service` belongs
:cdnName: Name of the :ref:`ds-cdn` to which the :term:`Delivery Service` belongs
:checkPath: A :ref:`ds-check-path`
@@ -261,6 +260,7 @@ Response Structure
.. versionadded:: 4.0
:topology: The unique name of the :term:`Topology` that this :term:`Delivery Service` is assigned to
+:trDnsTtl: The :ref:`ds-dns-ttl`
:trRequestHeaders: If defined, this defines the :ref:`ds-tr-req-headers` used by Traffic Router for this :term:`Delivery Service`
:trResponseHeaders: If defined, this defines the :ref:`ds-tr-resp-headers` used by Traffic Router for this :term:`Delivery Service`
:type: The :ref:`ds-types` of this :term:`Delivery Service`
@@ -294,7 +294,6 @@ Response Structure
"response": [{
"active": false,
"anonymousBlockingEnabled": false,
- "ccrDnsTtl": null,
"cdnId": 2,
"cdnName": null,
"checkPath": null,
@@ -364,6 +363,7 @@ Response Structure
"tenantId": 1,
"tlsVersions": null,
"topology": null,
+ "trDnsTtl": null,
"trResponseHeaders": null,
"trRequestHeaders": null,
"type": "HTTP",
diff --git a/docs/source/api/v4/deliveryservices_id_safe.rst b/docs/source/api/v4/deliveryservices_id_safe.rst
index 8bafe33110..23cc7e059d 100644
--- a/docs/source/api/v4/deliveryservices_id_safe.rst
+++ b/docs/source/api/v4/deliveryservices_id_safe.rst
@@ -64,7 +64,6 @@ Response Structure
------------------
:active: A boolean that defines :ref:`ds-active`.
:anonymousBlockingEnabled: A boolean that defines :ref:`ds-anonymous-blocking`
-:ccrDnsTtl: The :ref:`ds-dns-ttl` - named "ccrDnsTtl" for legacy reasons
:cdnId: The integral, unique identifier of the :ref:`ds-cdn` to which the :term:`Delivery Service` belongs
:cdnName: Name of the :ref:`ds-cdn` to which the :term:`Delivery Service` belongs
:checkPath: A :ref:`ds-check-path`
@@ -136,6 +135,7 @@ Response Structure
.. versionadded:: 4.0
:topology: The unique name of the :term:`Topology` that this :term:`Delivery Service` is assigned to
+:trDnsTtl: The :ref:`ds-dns-ttl`
:trRequestHeaders: If defined, this defines the :ref:`ds-tr-req-headers` used by Traffic Router for this :term:`Delivery Service`
:trResponseHeaders: If defined, this defines the :ref:`ds-tr-resp-headers` used by Traffic Router for this :term:`Delivery Service`
:type: The :ref:`ds-types` of this :term:`Delivery Service`
@@ -163,7 +163,6 @@ Response Structure
"response": [{
"active": true,
"anonymousBlockingEnabled": false,
- "ccrDnsTtl": null,
"cdnId": 2,
"cdnName": "CDN-in-a-Box",
"checkPath": null,
@@ -236,6 +235,7 @@ Response Structure
"tenantId": 1,
"tlsVersions": null,
"topology": "demo1-top",
+ "trDnsTtl": null,
"trResponseHeaders": null,
"trRequestHeaders": null,
"type": "DNS",
diff --git a/docs/source/api/v4/servers_id_deliveryservices.rst b/docs/source/api/v4/servers_id_deliveryservices.rst
index 386de7532a..df953b368e 100644
--- a/docs/source/api/v4/servers_id_deliveryservices.rst
+++ b/docs/source/api/v4/servers_id_deliveryservices.rst
@@ -72,7 +72,6 @@ Response Structure
------------------
:active: A boolean that defines :ref:`ds-active`.
:anonymousBlockingEnabled: A boolean that defines :ref:`ds-anonymous-blocking`
-:ccrDnsTtl: The :ref:`ds-dns-ttl` - named "ccrDnsTtl" for legacy reasons
:cdnId: The integral, unique identifier of the :ref:`ds-cdn` to which the :term:`Delivery Service` belongs
:cdnName: Name of the :ref:`ds-cdn` to which the :term:`Delivery Service` belongs
:checkPath: A :ref:`ds-check-path`
@@ -144,6 +143,7 @@ Response Structure
.. versionadded:: 4.0
:topology: The unique name of the :term:`Topology` that this :term:`Delivery Service` is assigned to
+:trDnsTtl: The :ref:`ds-dns-ttl`
:trRequestHeaders: If defined, this defines the :ref:`ds-tr-req-headers` used by Traffic Router for this :term:`Delivery Service`
:trResponseHeaders: If defined, this defines the :ref:`ds-tr-resp-headers` used by Traffic Router for this :term:`Delivery Service`
:type: The :ref:`ds-types` of this :term:`Delivery Service`
@@ -171,7 +171,6 @@ Response Structure
{ "response": [{
"active": false,
"anonymousBlockingEnabled": false,
- "ccrDnsTtl": 3600,
"cdnId": 2,
"cdnName": "CDN-in-a-Box",
"checkPath": null,
@@ -243,6 +242,7 @@ Response Structure
"tenantId": 1,
"tlsVersions": null,
"topology": null,
+ "trDnsTtl": 3600,
"trResponseHeaders": null,
"trRequestHeaders": null,
"type": "HTTP",
diff --git a/experimental/graphql.sample/README.md b/experimental/graphql.sample/README.md
index 511c6ffc03..cea94da28e 100644
--- a/experimental/graphql.sample/README.md
+++ b/experimental/graphql.sample/README.md
@@ -80,7 +80,7 @@
}
}
}
- ccrDnsTtl
+ trDnsTtl
globalMaxTps
globalMaxMbps
longDesc
diff --git a/experimental/traffic-portal/src/app/models/deliveryservice.ts b/experimental/traffic-portal/src/app/models/deliveryservice.ts
index 78e027dbd8..cd0ee0d302 100644
--- a/experimental/traffic-portal/src/app/models/deliveryservice.ts
+++ b/experimental/traffic-portal/src/app/models/deliveryservice.ts
@@ -178,8 +178,6 @@ export interface DeliveryService {
active: boolean;
/** Whether or not anonymization services are blocked. */
anonymousBlockingEnabled: boolean;
- /** The TTL of DNS responses from the Traffic Router, in seconds. */
- ccrDnsTtl?: number;
/** The ID of the CDN to which the Delivery Service belongs. */
cdnId: number;
/** The Name of the CDN to which the Delivery Service belongs. */
@@ -358,6 +356,8 @@ export interface DeliveryService {
* Service belongs.
*/
tenantId: number;
+ /** The TTL of DNS responses from the Traffic Router, in seconds. */
+ trDnsTtl?: number;
/**
* HTTP headers that should be logged from client requests by Traffic
* Router.
diff --git a/infrastructure/ansible/roles/dataset_loader/defaults/main.yml b/infrastructure/ansible/roles/dataset_loader/defaults/main.yml
index 72a0fba1c5..ab19083509 100644
--- a/infrastructure/ansible/roles/dataset_loader/defaults/main.yml
+++ b/infrastructure/ansible/roles/dataset_loader/defaults/main.yml
@@ -1831,7 +1831,6 @@ dl_ds_lookup_rangeRequestHandling:
dl_ds_default_ds:
active: true
anonymousBlockingEnabled: false
- ccrDnsTtl: 3600
checkPath: "/crossdomain.xml"
deepCachingType: NEVER
dscp: 0
@@ -1850,6 +1849,7 @@ dl_ds_default_ds:
regionalGeoBlocking: false
routingName: edge
tenantName: root
+ trDnsTtl: 3600
typeName: HTTP
serveFromATS: true
serveFromGrove: false
diff --git a/infrastructure/ansible/roles/dataset_loader/tasks/ds_loader.yml b/infrastructure/ansible/roles/dataset_loader/tasks/ds_loader.yml
index f023868cb5..5c41cb291e 100644
--- a/infrastructure/ansible/roles/dataset_loader/tasks/ds_loader.yml
+++ b/infrastructure/ansible/roles/dataset_loader/tasks/ds_loader.yml
@@ -60,7 +60,6 @@
targetds:
active: "{{ item.1.active | default(dl_ds_default_ds.active) | default(omit) }}"
anonymousBlockingEnabled: "{{ item.1.anonymousBlockingEnabled | default(dl_ds_default_ds.anonymousBlockingEnabled) | default(omit) }}"
- ccrDnsTtl: "{{ item.1.ccrDnsTtl | default(dl_ds_default_ds.ccrDnsTtl) | default(omit) }}"
cdnId: "{{ Target_cdn_id | default(omit, true) }}"
checkPath: "{{ item.1.checkPath | default(dl_ds_default_ds.checkPath) | default(omit) }}"
deepCachingType: "{{ item.1.deepCachingType | default(dl_ds_default_ds.deepCachingType) | default(omit) }}"
@@ -105,6 +104,7 @@
signingAlgorithm: "{{ item.1.signingAlgorithm | default(dl_ds_default_ds.signingAlgorithm) | default(omit) }}"
sslKeyVersion: "{{ item.1.sslKeyVersion | default(dl_ds_default_ds.sslKeyVersion) | default(omit) }}"
tenantId: "{{ tenant_id | default(omit, true) }}"
+ trDnsTtl: "{{ item.1.trDnsTtl | default(dl_ds_default_ds.trDnsTtl) | default(omit) }}"
trRequestHeaders: "{{ item.1.trRequestHeaders | default(dl_ds_default_ds.trRequestHeaders) | default(omit) }}"
trResponseHeaders: "{{ item.1.trResponseHeaders | default(dl_ds_default_ds.trResponseHeaders) | default(omit) }}"
typeId: "{{ type_id | default(omit, true) }}"
diff --git a/infrastructure/ansible/roles/dataset_loader/templates/deliveryservice.j2 b/infrastructure/ansible/roles/dataset_loader/templates/deliveryservice.j2
index 76bded3172..0a01a15f34 100644
--- a/infrastructure/ansible/roles/dataset_loader/templates/deliveryservice.j2
+++ b/infrastructure/ansible/roles/dataset_loader/templates/deliveryservice.j2
@@ -17,9 +17,6 @@
{% endif %}
{% if targetds.anonymousBlockingEnabled is defined and targetds.anonymousBlockingEnabled is not none and targetds.anonymousBlockingEnabled != omit %}
"anonymousBlockingEnabled": {{ targetds.anonymousBlockingEnabled | bool | lower }},
- {% endif %}
- {% if targetds.ccrDnsTtl is defined and targetds.ccrDnsTtl is not none and targetds.ccrDnsTtl != omit %}
- "ccrDnsTtl": {{ targetds.ccrDnsTtl | int }},
{% endif %}
{% if targetds.cdnId is defined and targetds.cdnId is not none and targetds.cdnId != omit %}
"cdnId": {{ targetds.cdnId | int }},
@@ -152,6 +149,9 @@
{% endif %}
{% if targetds.tenantId is defined and targetds.tenantId is not none and targetds.tenantId != omit %}
"tenantId": {{ targetds.tenantId | int }},
+ {% endif %}
+ {% if targetds.trDnsTtl is defined and targetds.trDnsTtl is not none and targetds.trDnsTtl != omit %}
+ "trDnsTtl": {{ targetds.trDnsTtl | int }},
{% endif %}
{% if targetds.trRequestHeaders is defined and targetds.trRequestHeaders is not none and targetds.trRequestHeaders != omit %}
"trRequestHeaders": "{{ targetds.trRequestHeaders }}",
diff --git a/infrastructure/ansible/roles/traffic_portal/defaults/main.yml b/infrastructure/ansible/roles/traffic_portal/defaults/main.yml
index 9ab7fc62ec..7c5601917b 100644
--- a/infrastructure/ansible/roles/traffic_portal/defaults/main.yml
+++ b/infrastructure/ansible/roles/traffic_portal/defaults/main.yml
@@ -135,7 +135,7 @@ tp_default_properties_template:
logsEnabled: false
geoProvider: 0
geoLimit: 0
- ccrDnsTtl: 30
+ trDnsTtl: 30
serviceCategory: other
anonymousBlockingEnabled: false
DNS:
@@ -154,7 +154,7 @@ tp_default_properties_template:
missLong: -87.627778
serviceCategory: other
signingAlgorithm:
- ccrDnsTtl: 30
+ trDnsTtl: 30
regionalGeoBlocking: false
maxDnsAnswers: 6
anonymousBlockingEnabled: false
@@ -179,7 +179,7 @@ tp_default_properties_template:
missLong: -87.627778
serviceCategory: other
signingAlgorithm:
- ccrDnsTtl: 3600
+ trDnsTtl: 3600
anonymousBlockingEnabled: false
consistentHashQueryParams: []
ecsEnabled: false
@@ -192,7 +192,7 @@ tp_default_properties_template:
geoLimit: 0
regionalGeoBlocking: false
maxDnsAnswers: 6
- ccrDnsTtl: 30
+ trDnsTtl: 30
serviceCategory: other
anonymousBlockingEnabled: false
ecsEnabled: false
diff --git a/lib/go-tc/deliveryservices.go b/lib/go-tc/deliveryservices.go
index 082501a237..687bc4e705 100644
--- a/lib/go-tc/deliveryservices.go
+++ b/lib/go-tc/deliveryservices.go
@@ -169,7 +169,6 @@ type DeliveryServiceV11 struct {
Active bool `json:"active"`
AnonymousBlockingEnabled bool `json:"anonymousBlockingEnabled"`
CacheURL string `json:"cacheurl"`
- CCRDNSTTL int `json:"ccrDnsTtl"`
CDNID int `json:"cdnId"`
CDNName string `json:"cdnName"`
CheckPath string `json:"checkPath"`
@@ -216,6 +215,7 @@ type DeliveryServiceV11 struct {
Signed bool `json:"signed"`
TypeID int `json:"typeId"`
Type DSType `json:"type"`
+ TRDNSTTL int `json:"trDnsTtl"`
TRResponseHeaders string `json:"trResponseHeaders"`
TenantID int `json:"tenantId"`
XMLID string `json:"xmlId"`
@@ -671,9 +671,9 @@ type DeliveryServiceNullableFieldsV11 struct {
// (e.g. Tor exit nodes) should be restricted from accessing the Delivery
// Service's content.
AnonymousBlockingEnabled *bool `json:"anonymousBlockingEnabled" db:"anonymous_blocking_enabled"`
- // CCRDNSTTL sets the Time-to-Live - in seconds - for DNS responses for this
+ // TRDNSTTL sets the Time-to-Live - in seconds - for DNS responses for this
// Delivery Service from Traffic Router.
- CCRDNSTTL *int `json:"ccrDnsTtl" db:"ccr_dns_ttl"`
+ TRDNSTTL *int `json:"trDnsTtl" db:"tr_dns_ttl"`
// CDNID is the integral, unique identifier for the CDN to which the
// Delivery Service belongs.
CDNID *int `json:"cdnId" db:"cdn_id"`
diff --git a/lib/go-tc/deliveryservices_test.go b/lib/go-tc/deliveryservices_test.go
index 55179041d1..addd2256cd 100644
--- a/lib/go-tc/deliveryservices_test.go
+++ b/lib/go-tc/deliveryservices_test.go
@@ -31,10 +31,10 @@ func compareV31DSes(a, b DeliveryServiceNullableV30, t *testing.T) {
} else if a.AnonymousBlockingEnabled != nil && *a.AnonymousBlockingEnabled != *b.AnonymousBlockingEnabled {
t.Errorf("Mismatched 'AnonymousBlockingEnabled' property; one was '%v', the other was '%v'", *a.AnonymousBlockingEnabled, *b.AnonymousBlockingEnabled)
}
- if (a.CCRDNSTTL == nil && b.CCRDNSTTL != nil) || (a.CCRDNSTTL != nil && b.CCRDNSTTL == nil) {
- t.Error("Mismatched 'CCRDNSTTL' property; one was nil but the other was not.")
- } else if a.CCRDNSTTL != nil && *a.CCRDNSTTL != *b.CCRDNSTTL {
- t.Errorf("Mismatched 'CCRDNSTTL' property; one was '%v', the other was '%v'", *a.CCRDNSTTL, *b.CCRDNSTTL)
+ if (a.TRDNSTTL == nil && b.TRDNSTTL != nil) || (a.TRDNSTTL != nil && b.TRDNSTTL == nil) {
+ t.Error("Mismatched 'TRDNSTTL' property; one was nil but the other was not.")
+ } else if a.TRDNSTTL != nil && *a.TRDNSTTL != *b.TRDNSTTL {
+ t.Errorf("Mismatched 'TRDNSTTL' property; one was '%v', the other was '%v'", *a.TRDNSTTL, *b.TRDNSTTL)
}
if (a.CDNID == nil && b.CDNID != nil) || (a.CDNID != nil && b.CDNID == nil) {
t.Error("Mismatched 'CDNID' property; one was nil but the other was not.")
@@ -394,7 +394,6 @@ func compareV31DSes(a, b DeliveryServiceNullableV30, t *testing.T) {
func dsUpgradeAndDowngradeTestingPair() (DeliveryServiceNullableV30, DeliveryServiceV4) {
anonymousBlockingEnabled := false
cacheURL := "testquest"
- cCRDNSTTL := 42
cdnID := -12
cdnName := "cdnName"
checkPath := "checkPath"
@@ -459,6 +458,7 @@ func dsUpgradeAndDowngradeTestingPair() (DeliveryServiceNullableV30, DeliverySer
tenant := "tenant"
tenantID := -6551
topology := "topology"
+ trDNSTTL := 42
trResponseHeaders := "trResponseHeaders"
trRequestHeaders := "trRequestHeaders"
typ := DSTypeDNS
@@ -468,7 +468,6 @@ func dsUpgradeAndDowngradeTestingPair() (DeliveryServiceNullableV30, DeliverySer
newDS := DeliveryServiceV4{}
newDS.Active = new(bool)
newDS.AnonymousBlockingEnabled = &anonymousBlockingEnabled
- newDS.CCRDNSTTL = &cCRDNSTTL
newDS.CDNID = &cdnID
newDS.CDNName = &cdnName
newDS.CheckPath = &checkPath
@@ -533,6 +532,7 @@ func dsUpgradeAndDowngradeTestingPair() (DeliveryServiceNullableV30, DeliverySer
newDS.TenantID = &tenantID
newDS.TLSVersions = []string{"1.0", "1.1", "1.2", "1.3"}
newDS.Topology = &topology
+ newDS.TRDNSTTL = &trDNSTTL
newDS.TRResponseHeaders = &trResponseHeaders
newDS.TRRequestHeaders = &trRequestHeaders
newDS.Type = &typ
@@ -550,7 +550,6 @@ func dsUpgradeAndDowngradeTestingPair() (DeliveryServiceNullableV30, DeliverySer
DeliveryServiceNullableFieldsV11: DeliveryServiceNullableFieldsV11{
Active: &active,
AnonymousBlockingEnabled: &anonymousBlockingEnabled,
- CCRDNSTTL: &cCRDNSTTL,
CDNID: &cdnID,
CDNName: &cdnName,
CheckPath: &checkPath,
@@ -599,6 +598,7 @@ func dsUpgradeAndDowngradeTestingPair() (DeliveryServiceNullableV30, DeliverySer
Signed: signed,
SSLKeyVersion: &sSLKeyVersion,
TenantID: &tenantID,
+ TRDNSTTL: &trDNSTTL,
Type: &typ,
TypeID: &typeID,
XMLID: &xmlid,
diff --git a/traffic_ops/app/bin/checks/ToRTRCheck.pl b/traffic_ops/app/bin/checks/ToRTRCheck.pl
index 6e43ba12a1..daea386c1b 100755
--- a/traffic_ops/app/bin/checks/ToRTRCheck.pl
+++ b/traffic_ops/app/bin/checks/ToRTRCheck.pl
@@ -133,7 +133,7 @@
next unless ( $server->{type} eq 'CCR' );
DEBUG Dumper($server);
- # next unless ( $server->{host_name} eq 'odol-ccr-chi-08');
+ # next unless ( $server->{host_name} eq 'odol-tr-chi-08');
my $new_ccr;
$new_ccr->{status} = "OPERATIONAL"; # we are optimistic!
$new_ccr->{cmsStatus} = $server->{status};
diff --git a/traffic_ops/testing/api/v3/deliveryservice_requests_test.go b/traffic_ops/testing/api/v3/deliveryservice_requests_test.go
index c60813840b..7bb73e5e03 100644
--- a/traffic_ops/testing/api/v3/deliveryservice_requests_test.go
+++ b/traffic_ops/testing/api/v3/deliveryservice_requests_test.go
@@ -100,7 +100,6 @@ func TestDeliveryServiceRequests(t *testing.T) {
RequestBody: map[string]interface{}{
"changeType": "create",
"deliveryService": generateDeliveryService(t, map[string]interface{}{
- "ccrDnsTtl": 30,
"deepCachingType": "NEVER",
"initialDispersion": 3,
"ipv6RoutingEnabled": true,
@@ -108,6 +107,7 @@ func TestDeliveryServiceRequests(t *testing.T) {
"orgServerFqdn": "http://example.test",
"profileName": nil,
"tenant": "root",
+ "trDnsTtl": 30,
"xmlId": "test-ds2",
}),
"status": "draft",
@@ -131,7 +131,6 @@ func TestDeliveryServiceRequests(t *testing.T) {
RequestBody: map[string]interface{}{
"changeType": "create",
"deliveryService": map[string]interface{}{
- "ccrDnsTtl": 30,
"deepCachingType": "NEVER",
"displayName": strings.Repeat("X", 49),
"dscp": 0,
@@ -152,6 +151,7 @@ func TestDeliveryServiceRequests(t *testing.T) {
"regionalGeoBlocking": true,
"routingName": strings.Repeat("X", 1) + "." + strings.Repeat("X", 48),
"tenant": "tenant1",
+ "trDnsTtl": 30,
"type": "HTTP",
"xmlId": "X " + strings.Repeat("X", 46),
},
diff --git a/traffic_ops/testing/api/v3/tc-fixtures.json b/traffic_ops/testing/api/v3/tc-fixtures.json
index 0fe0efbe0e..6d227ee576 100644
--- a/traffic_ops/testing/api/v3/tc-fixtures.json
+++ b/traffic_ops/testing/api/v3/tc-fixtures.json
@@ -303,7 +303,7 @@
"deliveryService": {
"active": true,
"cdnName": "cdn1",
- "ccrDnsTtl": 30,
+ "trDnsTtl": 30,
"deepCachingType": "NEVER",
"displayName": "Good Kabletown CDN",
"dscp": 1,
@@ -325,7 +325,7 @@
"deliveryService": {
"active": true,
"cdnName": "cdn1",
- "ccrDnsTtl": 30,
+ "trDnsTtl": 30,
"deepCachingType": "NEVER",
"displayName": "Good Kabletown CDN",
"dscp": 1,
@@ -348,7 +348,7 @@
"active": true,
"cdnName": "cdn1",
"cacheurl": "cacheUrl1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -416,7 +416,7 @@
"active": true,
"cdnName": "cdn1",
"cacheurl": "cacheUrl2",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": ["fmt", "limit", "somethingelse"],
"deepCachingType": "NEVER",
@@ -485,7 +485,7 @@
"active": true,
"cdnName": "cdn1",
"cacheurl": "cacheUrl3",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": null,
"deepCachingType": "NEVER",
@@ -554,7 +554,7 @@
"active": true,
"cdnName": "cdn1",
"cacheurl": "",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"deepCachingType": "NEVER",
"displayName": "anymap-ds",
@@ -613,7 +613,7 @@
"active": true,
"cdnName": "cdn1",
"cacheurl": "cacheUrl1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": ["a", "b", "c"],
"consistentHashRegex": "foo",
@@ -673,7 +673,7 @@
"active": true,
"cdnName": "cdn1",
"cacheurl": "cacheUrl1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -741,7 +741,7 @@
"active": true,
"cdnName": "cdn1",
"cacheurl": "cacheUrl1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -809,7 +809,7 @@
"active": true,
"cdnName": "cdn1",
"cacheurl": "",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -877,7 +877,7 @@
"active": true,
"cdnName": "cdn1",
"cacheurl": "",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -942,7 +942,7 @@
"active": true,
"cdnName": "cdn1",
"cacheurl": "",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -1007,7 +1007,7 @@
"active": true,
"cdnName": "cdn1",
"cacheurl": "",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -1071,7 +1071,7 @@
"active": true,
"cdnName": "cdn2",
"cacheurl": "",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -1136,7 +1136,7 @@
"active": true,
"cdnName": "cdn1",
"cacheurl": "",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -1201,7 +1201,7 @@
"active": true,
"cdnName": "cdn1",
"cacheurl": "",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -1266,7 +1266,7 @@
"active": true,
"cdnName": "cdn2",
"cacheurl": "",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -1331,7 +1331,7 @@
"active": false,
"cdnName": "cdn1",
"cacheurl": "cacheUrl1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -1423,7 +1423,7 @@
"active": false,
"cdnName": "cdn1",
"cacheurl": "cacheUrl3",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": null,
"deepCachingType": "NEVER",
diff --git a/traffic_ops/testing/api/v4/deliveryservice_requests_test.go b/traffic_ops/testing/api/v4/deliveryservice_requests_test.go
index 07e2e12111..54020503f5 100644
--- a/traffic_ops/testing/api/v4/deliveryservice_requests_test.go
+++ b/traffic_ops/testing/api/v4/deliveryservice_requests_test.go
@@ -139,7 +139,6 @@ func TestDeliveryServiceRequests(t *testing.T) {
RequestBody: map[string]interface{}{
"changeType": "create",
"requested": generateDeliveryService(t, map[string]interface{}{
- "ccrDnsTtl": 30,
"deepCachingType": "NEVER",
"initialDispersion": 3,
"ipv6RoutingEnabled": true,
@@ -147,6 +146,7 @@ func TestDeliveryServiceRequests(t *testing.T) {
"orgServerFqdn": "http://example.test",
"profileName": nil,
"tenant": "root",
+ "trDnsTtl": 30,
"xmlId": "test-ds2",
}),
"status": "draft",
@@ -170,7 +170,6 @@ func TestDeliveryServiceRequests(t *testing.T) {
RequestBody: map[string]interface{}{
"changeType": "create",
"requested": map[string]interface{}{
- "ccrDnsTtl": 30,
"deepCachingType": "NEVER",
"displayName": strings.Repeat("X", 49),
"dscp": 0,
@@ -191,6 +190,7 @@ func TestDeliveryServiceRequests(t *testing.T) {
"regionalGeoBlocking": true,
"routingName": strings.Repeat("X", 1) + "." + strings.Repeat("X", 48),
"tenant": "tenant1",
+ "trDnsTtl": 30,
"type": "HTTP",
"xmlId": "X " + strings.Repeat("X", 46),
},
diff --git a/traffic_ops/testing/api/v4/tc-fixtures.json b/traffic_ops/testing/api/v4/tc-fixtures.json
index 167b8fd32c..e8ecffbdcd 100644
--- a/traffic_ops/testing/api/v4/tc-fixtures.json
+++ b/traffic_ops/testing/api/v4/tc-fixtures.json
@@ -343,7 +343,7 @@
"requested": {
"active": true,
"cdnName": "cdn1",
- "ccrDnsTtl": 30,
+ "trDnsTtl": 30,
"deepCachingType": "NEVER",
"displayName": "Good Kabletown CDN",
"dscp": 1,
@@ -373,7 +373,7 @@
"requested": {
"active": true,
"cdnName": "cdn1",
- "ccrDnsTtl": 30,
+ "trDnsTtl": 30,
"deepCachingType": "NEVER",
"displayName": "Good Kabletown CDN",
"dscp": 1,
@@ -403,7 +403,7 @@
{
"active": true,
"cdnName": "cdn1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -469,7 +469,7 @@
{
"active": true,
"cdnName": "cdn1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [
"fmt",
@@ -540,7 +540,7 @@
{
"active": true,
"cdnName": "cdn1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": null,
"deepCachingType": "NEVER",
@@ -607,7 +607,7 @@
{
"active": true,
"cdnName": "cdn1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"deepCachingType": "NEVER",
"displayName": "anymap-ds",
@@ -664,7 +664,7 @@
{
"active": true,
"cdnName": "cdn1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [
"a",
@@ -727,7 +727,7 @@
{
"active": true,
"cdnName": "cdn1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -793,7 +793,7 @@
{
"active": true,
"cdnName": "cdn1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -859,7 +859,7 @@
{
"active": true,
"cdnName": "cdn1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -925,7 +925,7 @@
{
"active": true,
"cdnName": "cdn1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -988,7 +988,7 @@
{
"active": true,
"cdnName": "cdn1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -1051,7 +1051,7 @@
{
"active": true,
"cdnName": "cdn1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -1113,7 +1113,7 @@
{
"active": true,
"cdnName": "cdn2",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -1176,7 +1176,7 @@
{
"active": true,
"cdnName": "cdn1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -1239,7 +1239,7 @@
{
"active": true,
"cdnName": "cdn1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -1302,7 +1302,7 @@
{
"active": true,
"cdnName": "cdn2",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -1364,7 +1364,7 @@
{
"active": true,
"cdnName": "cdn2",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -1427,7 +1427,7 @@
{
"active": false,
"cdnName": "cdn1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -1518,7 +1518,7 @@
"active": false,
"cdnName": "cdn1",
"cacheurl": "cacheUrl3",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": null,
"deepCachingType": "NEVER",
@@ -1586,7 +1586,7 @@
"active": false,
"cdnName": "cdn1",
"cacheurl": "cacheUrl3",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": null,
"deepCachingType": "NEVER",
@@ -1655,7 +1655,7 @@
{
"active": true,
"cdnName": "cdn1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"deepCachingType": "NEVER",
"displayName": "steering-ds",
diff --git a/traffic_ops/testing/api/v5/deliveryservice_requests_test.go b/traffic_ops/testing/api/v5/deliveryservice_requests_test.go
index c6e478a152..d7ffeb643b 100644
--- a/traffic_ops/testing/api/v5/deliveryservice_requests_test.go
+++ b/traffic_ops/testing/api/v5/deliveryservice_requests_test.go
@@ -139,7 +139,6 @@ func TestDeliveryServiceRequests(t *testing.T) {
RequestBody: map[string]interface{}{
"changeType": "create",
"requested": generateDeliveryService(t, map[string]interface{}{
- "ccrDnsTtl": 30,
"deepCachingType": "NEVER",
"initialDispersion": 3,
"ipv6RoutingEnabled": true,
@@ -147,6 +146,7 @@ func TestDeliveryServiceRequests(t *testing.T) {
"orgServerFqdn": "http://example.test",
"profileName": nil,
"tenant": "root",
+ "trDnsTtl": 30,
"xmlId": "test-ds2",
}),
"status": "draft",
@@ -170,7 +170,6 @@ func TestDeliveryServiceRequests(t *testing.T) {
RequestBody: map[string]interface{}{
"changeType": "create",
"requested": map[string]interface{}{
- "ccrDnsTtl": 30,
"deepCachingType": "NEVER",
"displayName": strings.Repeat("X", 49),
"dscp": 0,
@@ -191,6 +190,7 @@ func TestDeliveryServiceRequests(t *testing.T) {
"regionalGeoBlocking": true,
"routingName": strings.Repeat("X", 1) + "." + strings.Repeat("X", 48),
"tenant": "tenant1",
+ "trDnsTtl": 30,
"type": "HTTP",
"xmlId": "X " + strings.Repeat("X", 46),
},
diff --git a/traffic_ops/testing/api/v5/tc-fixtures.json b/traffic_ops/testing/api/v5/tc-fixtures.json
index 3258ce828f..ad5868447b 100644
--- a/traffic_ops/testing/api/v5/tc-fixtures.json
+++ b/traffic_ops/testing/api/v5/tc-fixtures.json
@@ -343,7 +343,7 @@
"requested": {
"active": true,
"cdnName": "cdn1",
- "ccrDnsTtl": 30,
+ "trDnsTtl": 30,
"deepCachingType": "NEVER",
"displayName": "Good Kabletown CDN",
"dscp": 1,
@@ -373,7 +373,7 @@
"requested": {
"active": true,
"cdnName": "cdn1",
- "ccrDnsTtl": 30,
+ "trDnsTtl": 30,
"deepCachingType": "NEVER",
"displayName": "Good Kabletown CDN",
"dscp": 1,
@@ -403,7 +403,7 @@
{
"active": true,
"cdnName": "cdn1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -469,7 +469,7 @@
{
"active": true,
"cdnName": "cdn1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [
"fmt",
@@ -540,7 +540,7 @@
{
"active": true,
"cdnName": "cdn1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": null,
"deepCachingType": "NEVER",
@@ -607,7 +607,7 @@
{
"active": true,
"cdnName": "cdn1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"deepCachingType": "NEVER",
"displayName": "anymap-ds",
@@ -664,7 +664,7 @@
{
"active": true,
"cdnName": "cdn1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [
"a",
@@ -727,7 +727,7 @@
{
"active": true,
"cdnName": "cdn1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -793,7 +793,7 @@
{
"active": true,
"cdnName": "cdn1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -859,7 +859,7 @@
{
"active": true,
"cdnName": "cdn1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -925,7 +925,7 @@
{
"active": true,
"cdnName": "cdn1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -988,7 +988,7 @@
{
"active": true,
"cdnName": "cdn1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -1051,7 +1051,7 @@
{
"active": true,
"cdnName": "cdn1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -1113,7 +1113,7 @@
{
"active": true,
"cdnName": "cdn2",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -1176,7 +1176,7 @@
{
"active": true,
"cdnName": "cdn1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -1239,7 +1239,7 @@
{
"active": true,
"cdnName": "cdn1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -1302,7 +1302,7 @@
{
"active": true,
"cdnName": "cdn2",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -1364,7 +1364,7 @@
{
"active": true,
"cdnName": "cdn2",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -1427,7 +1427,7 @@
{
"active": false,
"cdnName": "cdn1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": [],
"deepCachingType": "NEVER",
@@ -1518,7 +1518,7 @@
"active": false,
"cdnName": "cdn1",
"cacheurl": "cacheUrl3",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": null,
"deepCachingType": "NEVER",
@@ -1586,7 +1586,7 @@
"active": false,
"cdnName": "cdn1",
"cacheurl": "cacheUrl3",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"consistentHashQueryParams": null,
"deepCachingType": "NEVER",
@@ -1655,7 +1655,7 @@
{
"active": true,
"cdnName": "cdn1",
- "ccrDnsTtl": 3600,
+ "trDnsTtl": 3600,
"checkPath": "",
"deepCachingType": "NEVER",
"displayName": "steering-ds",
diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservices.go b/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservices.go
index b918638c7a..9b85405716 100644
--- a/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservices.go
+++ b/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservices.go
@@ -343,7 +343,7 @@ func createV41(w http.ResponseWriter, r *http.Request, inf *api.APIInfo, dsV4 tc
resultRows, err = tx.Query(insertQueryWithoutLD1AndLD2(),
ds.Active,
ds.AnonymousBlockingEnabled,
- ds.CCRDNSTTL,
+ ds.TRDNSTTL,
ds.CDNID,
ds.CheckPath,
ds.ConsistentHashRegex,
@@ -404,7 +404,7 @@ func createV41(w http.ResponseWriter, r *http.Request, inf *api.APIInfo, dsV4 tc
resultRows, err = tx.Query(insertQuery(),
ds.Active,
ds.AnonymousBlockingEnabled,
- ds.CCRDNSTTL,
+ ds.TRDNSTTL,
ds.CDNID,
ds.CheckPath,
ds.ConsistentHashRegex,
@@ -924,7 +924,7 @@ func updateV41(w http.ResponseWriter, r *http.Request, inf *api.APIInfo, dsV4 *t
}
resultRows, err = tx.Query(updateDSQueryWithoutLD1AndLD2(),
ds.Active,
- ds.CCRDNSTTL,
+ ds.TRDNSTTL,
ds.CDNID,
ds.CheckPath,
deepCachingType,
@@ -986,7 +986,7 @@ func updateV41(w http.ResponseWriter, r *http.Request, inf *api.APIInfo, dsV4 *t
} else {
resultRows, err = tx.Query(updateDSQuery(),
ds.Active,
- ds.CCRDNSTTL,
+ ds.TRDNSTTL,
ds.CDNID,
ds.CheckPath,
deepCachingType,
@@ -1684,7 +1684,7 @@ func GetDeliveryServices(query string, queryValues map[string]interface{}, tx *s
err := rows.Scan(
&ds.Active,
&ds.AnonymousBlockingEnabled,
- &ds.CCRDNSTTL,
+ &ds.TRDNSTTL,
&ds.CDNID,
&ds.CDNName,
&ds.CheckPath,
diff --git a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.DNS.tpl.html b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.DNS.tpl.html
index 6676ac730e..a4f9acf361 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.DNS.tpl.html
+++ b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.DNS.tpl.html
@@ -1081,17 +1081,17 @@