Remove cacheurl from Delivery Services

docs/source/api/v4/deliveryservice_requests.rst

@@ -83,11 +83,6 @@ Response Structure
 
 	:active:                                A boolean that defines :ref:`ds-active`.
 	:anonymousBlockingEnabled:              A boolean that defines :ref:`ds-anonymous-blocking`
-	:cacheurl:                              A :ref:`ds-cacheurl`
-
-		.. 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
@@ -304,11 +299,6 @@ Request Structure
 
 	:active:                                        A boolean that defines :ref:`ds-active`.
 	:anonymousBlockingEnabled:      A boolean that defines :ref:`ds-anonymous-blocking`
-	:cacheurl:                                      A :ref:`ds-cacheurl`
-
-		.. 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
@@ -493,11 +483,6 @@ Response Structure
 
 	:active:                                A boolean that defines :ref:`ds-active`.
 	:anonymousBlockingEnabled:              A boolean that defines :ref:`ds-anonymous-blocking`
-	:cacheurl:                              A :ref:`ds-cacheurl`
-
-		.. 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
@@ -716,11 +701,6 @@ Request Structure
 
 	:active:                        A boolean that defines :ref:`ds-active`.
 	:anonymousBlockingEnabled:      A boolean that defines :ref:`ds-anonymous-blocking`
-	:cacheurl:                      A :ref:`ds-cacheurl`
-
-		.. 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
@@ -925,11 +905,6 @@ Response Structure
 
 	:active:                                        A boolean that defines :ref:`ds-active`.
 	:anonymousBlockingEnabled:      A boolean that defines :ref:`ds-anonymous-blocking`
-	:cacheurl:                                      A :ref:`ds-cacheurl`
-
-		.. 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

docs/source/api/v4/deliveryservice_requests_id_assign.rst

@@ -58,11 +58,6 @@ Response Structure
 
 	:active:                        A boolean that defines :ref:`ds-active`.
 	:anonymousBlockingEnabled:      A boolean that defines :ref:`ds-anonymous-blocking`
-	:cacheurl:                      A :ref:`ds-cacheurl`
-
-		.. 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

docs/source/api/v4/deliveryservice_requests_id_status.rst

@@ -59,11 +59,6 @@ Response Structure
 
 	:active:                        A boolean that defines :ref:`ds-active`.
 	:anonymousBlockingEnabled:      A boolean that defines :ref:`ds-anonymous-blocking`
-	:cacheurl:                      A :ref:`ds-cacheurl`
-
-		.. 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

docs/source/api/v4/deliveryservices.rst

@@ -73,11 +73,6 @@ Response Structure
 ------------------
 :active:                   A boolean that defines :ref:`ds-active`.
 :anonymousBlockingEnabled: A boolean that defines :ref:`ds-anonymous-blocking`
-:cacheurl:                 A :ref:`ds-cacheurl`
-
-	.. 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
@@ -268,11 +263,6 @@ Request Structure
 -----------------
 :active:                   A boolean that defines :ref:`ds-active`.
 :anonymousBlockingEnabled: A boolean that defines :ref:`ds-anonymous-blocking`
-:cacheurl:                 A :ref:`ds-cacheurl`
-
-	.. 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`
@@ -383,11 +373,6 @@ Response Structure
 ------------------
 :active:                   A boolean that defines :ref:`ds-active`.
 :anonymousBlockingEnabled: A boolean that defines :ref:`ds-anonymous-blocking`
-:cacheurl:                 A :ref:`ds-cacheurl`
-
-	.. 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

docs/source/api/v4/deliveryservices_id.rst

@@ -31,11 +31,6 @@ Request Structure
 -----------------
 :active:                   A boolean that defines :ref:`ds-active`.
 :anonymousBlockingEnabled: A boolean that defines :ref:`ds-anonymous-blocking`
-:cacheurl:                 A :ref:`ds-cacheurl`
-
-	.. 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
 

docs/source/api/v4/deliveryservices_id_safe.rst

@@ -63,11 +63,6 @@ Response Structure
 ------------------
 :active:                   A boolean that defines :ref:`ds-active`.
 :anonymousBlockingEnabled: A boolean that defines :ref:`ds-anonymous-blocking`
-:cacheurl:                 A :ref:`ds-cacheurl`
-
-	.. 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

docs/source/api/v4/servers_id_deliveryservices.rst

@@ -69,11 +69,6 @@ Response Structure
 ------------------
 :active:                   A boolean that defines :ref:`ds-active`.
 :anonymousBlockingEnabled: A boolean that defines :ref:`ds-anonymous-blocking`
-:cacheurl:                 A :ref:`ds-cacheurl`
-
-	.. 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

docs/source/overview/delivery_services.rst

@@ -54,7 +54,7 @@ Enables/Disables blocking of anonymized IP address - proxies, :abbr:`TOR (The On
 Cache URL Expression
 --------------------
 .. deprecated:: 3.0
-	This feature is no longer supported by :abbr:`ATS (Apache Traffic Server)` and consequently it will be removed from Traffic Control in the future.
+	This feature is no longer supported by :abbr:`ATS (Apache Traffic Server)` and consequently it will be removed from Traffic Control in the future. Current plans are to remove after ATC 5.X is no longer supported.
 
 Manipulates the cache key of the incoming requests. Normally, the cache key is the :term:`Origin` domain. This can be changed so that multiple services can share a cache key, can also be used to preserve cached content if service origin is changed.
 

infrastructure/cdn-in-a-box/enroller/enroller.go

@@ -270,7 +270,7 @@ func enrollDeliveryServiceServer(toSession *session, r io.Reader) error {
 	}
 
 	params := url.Values{"xmlId": []string{dss.XmlId}}
-	dses, _, err := toSession.GetDeliveryServicesV30WithHdr(nil, params)
+	dses, _, err := toSession.GetDeliveryServicesV4(nil, params)
 	if err != nil {
 		return err
 	}