You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2017/03/31 21:23:12 UTC

[3/3] incubator-trafficcontrol-website git commit: more fixes to deliveryservice api docs

more fixes to deliveryservice api docs


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/commit/4f075105
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/tree/4f075105
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/diff/4f075105

Branch: refs/heads/asf-site
Commit: 4f075105529b73b53f19a14e137e1aa32a29f6d6
Parents: 1214b11
Author: Jeremy Mitchell <je...@cable.comcast.com>
Authored: Fri Mar 31 15:22:59 2017 -0600
Committer: Jeremy Mitchell <je...@cable.comcast.com>
Committed: Fri Mar 31 15:22:59 2017 -0600

----------------------------------------------------------------------
 .../traffic_ops_api/v12/deliveryservice.txt     | 473 +++++++-------
 .../traffic_ops_api/v12/deliveryservice.html    | 625 +++++++++----------
 docs/latest/searchindex.js                      |   2 +-
 3 files changed, 525 insertions(+), 575 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/4f075105/docs/latest/_sources/development/traffic_ops_api/v12/deliveryservice.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/deliveryservice.txt b/docs/latest/_sources/development/traffic_ops_api/v12/deliveryservice.txt
index 4d0a575..3618141 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/deliveryservice.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/deliveryservice.txt
@@ -26,7 +26,7 @@ Delivery Service
 
 **GET /api/1.2/deliveryservices**
 
-  Retrieves all delivery services. See also `Using Traffic Ops - Delivery Service <http://trafficcontrol.apache.org/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
+  Retrieves all delivery services (if admin or ops) or all delivery services assigned to user. See also `Using Traffic Ops - Delivery Service <http://trafficcontrol.apache.org/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
 
   Authentication Required: Yes
 
@@ -54,9 +54,9 @@ Delivery Service
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``cacheurl``             | string | Cache URL rule to apply to this delivery service.                                                                                    |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``ccrDnsTtl``            | string | The TTL of the DNS response for A or AAAA queries requesting the IP address of the tr. host.                                         |
+  | ``ccrDnsTtl``            |  int   | The TTL of the DNS response for A or AAAA queries requesting the IP address of the tr. host.                                         |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``cdnId``                | string | Id of the CDN to which the delivery service belongs to.                                                                              |
+  | ``cdnId``                |  int   | Id of the CDN to which the delivery service belongs to.                                                                              |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``cdnName``              | string | Name of the CDN to which the delivery service belongs to.                                                                            |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
@@ -64,23 +64,25 @@ Delivery Service
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``displayName``          | string | The display name of the delivery service.                                                                                            |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``dnsBypassCname``       | string |                                                                                                                                      |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``dnsBypassIp``          | string | The IPv4 IP to use for bypass on a DNS deliveryservice  - bypass starts when serving more than the                                   |
   |                          |        | globalMaxMbps traffic on this deliveryservice.                                                                                       |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``dnsBypassIp6``         | string | The IPv6 IP to use for bypass on a DNS deliveryservice - bypass starts when serving more than the                                    |
   |                          |        | globalMaxMbps traffic on this deliveryservice.                                                                                       |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``dnsBypassTtl``         | string | The TTL of the DNS bypass response.                                                                                                  |
+  | ``dnsBypassTtl``         |  int   | The TTL of the DNS bypass response.                                                                                                  |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``dscp``                 | string | The Differentiated Services Code Point (DSCP) with which to mark downstream (EDGE ->  customer) traffic.                             |
+  | ``dscp``                 |  int   | The Differentiated Services Code Point (DSCP) with which to mark downstream (EDGE ->  customer) traffic.                             |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``edgeHeaderRewrite``    | string | The EDGE header rewrite actions to perform.                                                                                          |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``exampleURLs``          |  array | Entry points into the CDN for this deliveryservice.                                                                                  |
+  | ``exampleURLs``          | array  | Entry points into the CDN for this deliveryservice.                                                                                  |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``geoLimitRedirectUrl``  | string |                                                                                                                                      |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``geoLimit``             | string | - 0: None - no limitations                                                                                                           |
+  | ``geoLimit``             |  int   | - 0: None - no limitations                                                                                                           |
   |                          |        | - 1: Only route on CZF file hit                                                                                                      |
   |                          |        | - 2: Only route on CZF hit or when from USA                                                                                          |
   |                          |        |                                                                                                                                      |
@@ -89,23 +91,23 @@ Delivery Service
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``geoLimitCountries``    | string |                                                                                                                                      |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``geoProvider``          | string |                                                                                                                                      |
+  | ``geoProvider``          |  int   |                                                                                                                                      |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``globalMaxMbps``        | string | The maximum global bandwidth allowed on this deliveryservice. If exceeded, the traffic routes to the                                 |
+  | ``globalMaxMbps``        |  int   | The maximum global bandwidth allowed on this deliveryservice. If exceeded, the traffic routes to the                                 |
   |                          |        | dnsByPassIp* for DNS deliveryservices and to the httpBypassFqdn for HTTP deliveryservices.                                           |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``globalMaxTps``         | string | The maximum global transactions per second allowed on this deliveryservice. When this is exceeded                                    |
+  | ``globalMaxTps``         |  int   | The maximum global transactions per second allowed on this deliveryservice. When this is exceeded                                    |
   |                          |        | traffic will be sent to the dnsByPassIp* for DNS deliveryservices and to the httpBypassFqdn for                                      |
   |                          |        | HTTP deliveryservices                                                                                                                |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``httpBypassFqdn``       | string | The HTTP destination to use for bypass on an HTTP deliveryservice - bypass starts when serving more than the                         |
   |                          |        | globalMaxMbps traffic on this deliveryservice.                                                                                       |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``id``                   | string | The deliveryservice id (database row number).                                                                                        |
+  | ``id``                   |  int   | The deliveryservice id (database row number).                                                                                        |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``infoUrl``              | string | Use this to add a URL that points to more information about that deliveryservice.                                                    |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``initialDispersion``    | string |                                                                                                                                      |
+  | ``initialDispersion``    |  int   |                                                                                                                                      |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``ipv6RoutingEnabled``   |  bool  | false: send IPv4 address of Traffic Router to client on HTTP type del.                                                               |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
@@ -113,26 +115,20 @@ Delivery Service
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``logsEnabled``          |  bool  |                                                                                                                                      |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``longDesc``             | string | Description field 1.                                                                                                                 |
+  | ``longDesc``             | string | Description field.                                                                                                                   |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``longDesc1``            | string | Description field 2.                                                                                                                 |
+  | ``longDesc1``            | string | Description field 1.                                                                                                                 |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``longDesc2``            | string | Description field 2.                                                                                                                 |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``>>type``               | string | The type of MatchList (one of :ref:to-api-v11-types use_in_table='regex').                                                           |
-  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``>>setNumber``          | string | The set Number of the matchList.                                                                                                     |
-  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``>>pattern``            | string | The regexp for the matchList.                                                                                                        |
-  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``maxDnsAnswers``        | string | The maximum number of IPs to put in a A/AAAA response for a DNS deliveryservice (0 means all                                         |
+  | ``maxDnsAnswers``        |  int   | The maximum number of IPs to put in a A/AAAA response for a DNS deliveryservice (0 means all                                         |
   |                          |        | available).                                                                                                                          |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``midHeaderRewrite``     | string | The MID header rewrite actions to perform.                                                                                           |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``missLat``              | string | The latitude to use when the client cannot be found in the CZF or the Geo lookup.                                                    |
+  | ``missLat``              | float  | The latitude to use when the client cannot be found in the CZF or the Geo lookup.                                                    |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``missLong``             | string | The longitude to use when the client cannot be found in the CZF or the Geo lookup.                                                   |
+  | ``missLong``             | float  | The longitude to use when the client cannot be found in the CZF or the Geo lookup.                                                   |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``multiSiteOrigin``      |  bool  | Is the Multi Site Origin feature enabled for this delivery service (0=false, 1=true). See :ref:`rl-multi-site-origin`                |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
@@ -143,19 +139,19 @@ Delivery Service
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``profileDescription``   | string | The description of the Traffic Router Profile with which this deliveryservice is associated.                                         |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``profileId``            | string | The id of the Traffic Router Profile with which this deliveryservice is associated.                                                  |
+  | ``profileId``            |  int   | The id of the Traffic Router Profile with which this deliveryservice is associated.                                                  |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``profileName``          | string | The name of the Traffic Router Profile with which this deliveryservice is associated.                                                |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``protocol``             | string | - 0: serve with http:// at EDGE                                                                                                      |
+  | ``protocol``             |  int   | - 0: serve with http:// at EDGE                                                                                                      |
   |                          |        | - 1: serve with https:// at EDGE                                                                                                     |
   |                          |        | - 2: serve with both http:// and https:// at EDGE                                                                                    |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``qstringIgnore``        | string | - 0: no special query string handling; it is for use in the cache-key and pass up to origin.                                         |
+  | ``qstringIgnore``        |  int   | - 0: no special query string handling; it is for use in the cache-key and pass up to origin.                                         |
   |                          |        | - 1: ignore query string in cache-key, but pass it up to parent and or origin.                                                       |
   |                          |        | - 2: drop query string at edge, and do not use it in the cache-key.                                                                  |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``rangeRequestHandling`` | string | How to treat range requests:                                                                                                         |
+  | ``rangeRequestHandling`` |  int   | How to treat range requests:                                                                                                         |
   |                          |        |                                                                                                                                      |
   |                          |        | - 0 Do not cache (ranges requested from files taht are already cached due to a non range request will be a HIT)                      |
   |                          |        | - 1 Use the `background_fetch <https://docs.trafficserver.apache.org/en/latest/reference/plugins/background_fetch.en.html>`_ plugin. |
@@ -170,15 +166,13 @@ Delivery Service
   | ``signed``               |  bool  | - false: token based auth (see :ref:token-based-auth) is not enabled for this deliveryservice.                                       |
   |                          |        | - true: token based auth is enabled for this deliveryservice.                                                                        |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``sslKeyVersion``        | string |                                                                                                                                      |
+  | ``sslKeyVersion``        |  int   |                                                                                                                                      |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``trRequestHeaders``     | string |                                                                                                                                      |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``trResponseHeaders``    | string |                                                                                                                                      |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``type``                 | string | The type of this deliveryservice (one of :ref:to-api-v11-types use_in_table='deliveryservice').                                      |
-  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``typeId``               | string | The type of this deliveryservice (one of :ref:to-api-v11-types use_in_table='deliveryservice').                                      |
+  | ``typeId``               |  int   | The type of this deliveryservice (one of :ref:to-api-v11-types use_in_table='deliveryservice').                                      |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``xmlId``                | string | Unique string that describes this deliveryservice.                                                                                   |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
@@ -201,7 +195,7 @@ Delivery Service
             "dnsBypassTtl": "30",
             "dscp": "40",
             "edgeHeaderRewrite": null,
-			"exampleURLs": [
+      		"exampleURLs": [
                 "http://edge.foo-ds.foo.bar.net"
             ],
             "geoLimit": "0",
@@ -220,13 +214,6 @@ Delivery Service
             "longDesc": "",
             "longDesc1": "",
             "longDesc2": "",
-            "matchList": [
-                {
-                    "pattern": ".*\\.foo-ds\\..*",
-                    "setNumber": "0",
-                    "type": "HOST_REGEXP"
-                }
-            ],
             "maxDnsAnswers": "0",
             "midHeaderRewrite": null,
             "missLat": "41.881944",
@@ -261,7 +248,7 @@ Delivery Service
 
 **GET /api/1.2/deliveryservices/:id**
 
-  Retrieves a specific delivery service. See also `Using Traffic Ops - Delivery Service <http://trafficcontrol.apache.org/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
+  Retrieves a specific delivery service. If not admin / ops, delivery service must be assigned to user. See also `Using Traffic Ops - Delivery Service <http://trafficcontrol.apache.org/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
 
   Authentication Required: Yes
 
@@ -284,9 +271,9 @@ Delivery Service
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``cacheurl``             | string | Cache URL rule to apply to this delivery service.                                                                                    |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``ccrDnsTtl``            | string | The TTL of the DNS response for A or AAAA queries requesting the IP address of the tr. host.                                         |
+  | ``ccrDnsTtl``            |  int   | The TTL of the DNS response for A or AAAA queries requesting the IP address of the tr. host.                                         |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``cdnId``                | string | Id of the CDN to which the delivery service belongs to.                                                                              |
+  | ``cdnId``                |  int   | Id of the CDN to which the delivery service belongs to.                                                                              |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``cdnName``              | string | Name of the CDN to which the delivery service belongs to.                                                                            |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
@@ -294,23 +281,25 @@ Delivery Service
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``displayName``          | string | The display name of the delivery service.                                                                                            |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``dnsBypassCname``       | string |                                                                                                                                      |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``dnsBypassIp``          | string | The IPv4 IP to use for bypass on a DNS deliveryservice  - bypass starts when serving more than the                                   |
   |                          |        | globalMaxMbps traffic on this deliveryservice.                                                                                       |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``dnsBypassIp6``         | string | The IPv6 IP to use for bypass on a DNS deliveryservice - bypass starts when serving more than the                                    |
   |                          |        | globalMaxMbps traffic on this deliveryservice.                                                                                       |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``dnsBypassTtl``         | string | The TTL of the DNS bypass response.                                                                                                  |
+  | ``dnsBypassTtl``         |  int   | The TTL of the DNS bypass response.                                                                                                  |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``dscp``                 | string | The Differentiated Services Code Point (DSCP) with which to mark downstream (EDGE ->  customer) traffic.                             |
+  | ``dscp``                 |  int   | The Differentiated Services Code Point (DSCP) with which to mark downstream (EDGE ->  customer) traffic.                             |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``edgeHeaderRewrite``    | string | The EDGE header rewrite actions to perform.                                                                                          |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``exampleURLs``          |  array | Entry points into the CDN for this deliveryservice.                                                                                  |
+  | ``exampleURLs``          | array  | Entry points into the CDN for this deliveryservice.                                                                                  |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``geoLimitRedirectUrl``  | string |                                                                                                                                      |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``geoLimit``             | string | - 0: None - no limitations                                                                                                           |
+  | ``geoLimit``             |  int   | - 0: None - no limitations                                                                                                           |
   |                          |        | - 1: Only route on CZF file hit                                                                                                      |
   |                          |        | - 2: Only route on CZF hit or when from USA                                                                                          |
   |                          |        |                                                                                                                                      |
@@ -319,23 +308,23 @@ Delivery Service
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``geoLimitCountries``    | string |                                                                                                                                      |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``geoProvider``          | string |                                                                                                                                      |
+  | ``geoProvider``          |  int   |                                                                                                                                      |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``globalMaxMbps``        | string | The maximum global bandwidth allowed on this deliveryservice. If exceeded, the traffic routes to the                                 |
+  | ``globalMaxMbps``        |  int   | The maximum global bandwidth allowed on this deliveryservice. If exceeded, the traffic routes to the                                 |
   |                          |        | dnsByPassIp* for DNS deliveryservices and to the httpBypassFqdn for HTTP deliveryservices.                                           |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``globalMaxTps``         | string | The maximum global transactions per second allowed on this deliveryservice. When this is exceeded                                    |
+  | ``globalMaxTps``         |  int   | The maximum global transactions per second allowed on this deliveryservice. When this is exceeded                                    |
   |                          |        | traffic will be sent to the dnsByPassIp* for DNS deliveryservices and to the httpBypassFqdn for                                      |
   |                          |        | HTTP deliveryservices                                                                                                                |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``httpBypassFqdn``       | string | The HTTP destination to use for bypass on an HTTP deliveryservice - bypass starts when serving more than the                         |
   |                          |        | globalMaxMbps traffic on this deliveryservice.                                                                                       |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``id``                   | string | The deliveryservice id (database row number).                                                                                        |
+  | ``id``                   |  int   | The deliveryservice id (database row number).                                                                                        |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``infoUrl``              | string | Use this to add a URL that points to more information about that deliveryservice.                                                    |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``initialDispersion``    | string |                                                                                                                                      |
+  | ``initialDispersion``    |  int   |                                                                                                                                      |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``ipv6RoutingEnabled``   |  bool  | false: send IPv4 address of Traffic Router to client on HTTP type del.                                                               |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
@@ -343,9 +332,9 @@ Delivery Service
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``logsEnabled``          |  bool  |                                                                                                                                      |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``longDesc``             | string | Description field 1.                                                                                                                 |
+  | ``longDesc``             | string | Description field.                                                                                                                   |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``longDesc1``            | string | Description field 2.                                                                                                                 |
+  | ``longDesc1``            | string | Description field 1.                                                                                                                 |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``longDesc2``            | string | Description field 2.                                                                                                                 |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
@@ -357,14 +346,14 @@ Delivery Service
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``>>pattern``            | string | The regexp for the matchList.                                                                                                        |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``maxDnsAnswers``        | string | The maximum number of IPs to put in a A/AAAA response for a DNS deliveryservice (0 means all                                         |
+  | ``maxDnsAnswers``        |  int   | The maximum number of IPs to put in a A/AAAA response for a DNS deliveryservice (0 means all                                         |
   |                          |        | available).                                                                                                                          |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``midHeaderRewrite``     | string | The MID header rewrite actions to perform.                                                                                           |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``missLat``              | string | The latitude to use when the client cannot be found in the CZF or the Geo lookup.                                                    |
+  | ``missLat``              | float  | The latitude to use when the client cannot be found in the CZF or the Geo lookup.                                                    |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``missLong``             | string | The longitude to use when the client cannot be found in the CZF or the Geo lookup.                                                   |
+  | ``missLong``             | float  | The longitude to use when the client cannot be found in the CZF or the Geo lookup.                                                   |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``multiSiteOrigin``      |  bool  | Is the Multi Site Origin feature enabled for this delivery service (0=false, 1=true). See :ref:`rl-multi-site-origin`                |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
@@ -375,19 +364,19 @@ Delivery Service
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``profileDescription``   | string | The description of the Traffic Router Profile with which this deliveryservice is associated.                                         |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``profileId``            | string | The id of the Traffic Router Profile with which this deliveryservice is associated.                                                  |
+  | ``profileId``            |  int   | The id of the Traffic Router Profile with which this deliveryservice is associated.                                                  |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``profileName``          | string | The name of the Traffic Router Profile with which this deliveryservice is associated.                                                |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``protocol``             | string | - 0: serve with http:// at EDGE                                                                                                      |
+  | ``protocol``             |  int   | - 0: serve with http:// at EDGE                                                                                                      |
   |                          |        | - 1: serve with https:// at EDGE                                                                                                     |
   |                          |        | - 2: serve with both http:// and https:// at EDGE                                                                                    |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``qstringIgnore``        | string | - 0: no special query string handling; it is for use in the cache-key and pass up to origin.                                         |
+  | ``qstringIgnore``        |  int   | - 0: no special query string handling; it is for use in the cache-key and pass up to origin.                                         |
   |                          |        | - 1: ignore query string in cache-key, but pass it up to parent and or origin.                                                       |
   |                          |        | - 2: drop query string at edge, and do not use it in the cache-key.                                                                  |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``rangeRequestHandling`` | string | How to treat range requests:                                                                                                         |
+  | ``rangeRequestHandling`` |  int   | How to treat range requests:                                                                                                         |
   |                          |        |                                                                                                                                      |
   |                          |        | - 0 Do not cache (ranges requested from files taht are already cached due to a non range request will be a HIT)                      |
   |                          |        | - 1 Use the `background_fetch <https://docs.trafficserver.apache.org/en/latest/reference/plugins/background_fetch.en.html>`_ plugin. |
@@ -402,15 +391,13 @@ Delivery Service
   | ``signed``               |  bool  | - false: token based auth (see :ref:token-based-auth) is not enabled for this deliveryservice.                                       |
   |                          |        | - true: token based auth is enabled for this deliveryservice.                                                                        |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``sslKeyVersion``        | string |                                                                                                                                      |
+  | ``sslKeyVersion``        |  int   |                                                                                                                                      |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``trRequestHeaders``     | string |                                                                                                                                      |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``trResponseHeaders``    | string |                                                                                                                                      |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``type``                 | string | The type of this deliveryservice (one of :ref:to-api-v11-types use_in_table='deliveryservice').                                      |
-  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``typeId``               | string | The type of this deliveryservice (one of :ref:to-api-v11-types use_in_table='deliveryservice').                                      |
+  | ``typeId``               |  int   | The type of this deliveryservice (one of :ref:to-api-v11-types use_in_table='deliveryservice').                                      |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``xmlId``                | string | Unique string that describes this deliveryservice.                                                                                   |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
@@ -490,7 +477,7 @@ Delivery Service
 
 **GET /api/1.2/deliveryservices/:id/servers**
 
-  Retrieves properties of CDN Edge servers assigned to a delivery service.
+  Retrieves properties of CDN Edge servers assigned to a delivery service. Delivery service must be assigned to user if user is not admin or operations.
 
   Authentication Required: Yes
 
@@ -652,7 +639,7 @@ Health
 
 **GET /api/1.2/deliveryservices/:id/state**
 
-  Retrieves the failover state for a delivery service.
+  Retrieves the failover state for a delivery service. Delivery service must be assigned to user if user is not admin or operations.
 
   Authentication Required: Yes
 
@@ -701,7 +688,7 @@ Health
 
 **GET /api/1.2/deliveryservices/:id/health**
 
-  Retrieves the health of all locations (cache groups) for a delivery service.
+  Retrieves the health of all locations (cache groups) for a delivery service. Delivery service must be assigned to user if user is not admin or operations.
 
   Authentication Required: Yes
 
@@ -751,7 +738,7 @@ Health
 
 **GET /api/1.2/deliveryservices/:id/capacity**
 
-  Retrieves the capacity percentages of a delivery service.
+  Retrieves the capacity percentages of a delivery service. Delivery service must be assigned to user if user is not admin or operations.
 
   Authentication Required: Yes
 
@@ -799,7 +786,7 @@ Health
 
 **GET /api/1.2/deliveryservices/:id/routing**
 
-  Retrieves the routing method percentages of a delivery service.
+  Retrieves the routing method percentages of a delivery service. Delivery service must be assigned to user if user is not admin or operations.
 
   Authentication Required: Yes
 
@@ -863,6 +850,8 @@ Server
 
 **GET /api/1.2/deliveryserviceserver**
 
+  Retrieves delivery service / server assignments.
+
   Authentication Required: Yes
 
   Role(s) Required: None
@@ -919,6 +908,8 @@ SSL Keys
 
 **GET /api/1.2/deliveryservices/xmlId/:xmlid/sslkeys**
 
+  Retrieves ssl keys for a delivery service.
+
   Authentication Required: Yes
 
   Role(s) Required: Admin
@@ -1403,13 +1394,13 @@ SSL Keys
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
   | dnsBypassTtl           | no       | The TTL of the DNS bypass response.                                                                     |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
-  | dscp                   | no       | The Differentiated Services Code Point (DSCP) with which to mark downstream (EDGE -> customer) traffic. |
+  | dscp                   | yes      | The Differentiated Services Code Point (DSCP) with which to mark downstream (EDGE -> customer) traffic. |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
   | edgeHeaderRewrite      | no       | The EDGE header rewrite actions to perform.                                                             |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
   | geoLimitRedirectURL    | no       | This is the URL Traffic Router will redirect to when Geo Limit Failure.                                 |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
-  | geoLimit               | no       | - 0: None - no limitations                                                                              |
+  | geoLimit               | yes      | - 0: None - no limitations                                                                              |
   |                        |          | - 1: Only route on CZF file hit                                                                         |
   |                        |          | - 2: Only route on CZF hit or when from geo limit countries                                             |
   |                        |          |                                                                                                         |
@@ -1418,7 +1409,7 @@ SSL Keys
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
   | geoLimitCountries      | no       | The geo limit countries.                                                                                |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
-  | geoProvider            | no       | - 0: Maxmind(default)                                                                                   |
+  | geoProvider            | yes      | - 0: Maxmind(default)                                                                                   |
   |                        |          | - 1: Neustar                                                                                            |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
   | globalMaxMbps          | no       | The maximum global bandwidth allowed on this deliveryservice. If exceeded, the traffic routes to the    |
@@ -1433,11 +1424,11 @@ SSL Keys
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
   | infoUrl                | no       | Use this to add a URL that points to more information about that deliveryservice.                       |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
-  | initialDispersion      | no       | Initial dispersion                                                                                      |
+  | initialDispersion      | yes      | Initial dispersion                                                                                      |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
-  | ipv6RoutingEnabled     | no       | false: send IPv4 address of Traffic Router to client on HTTP type del.                                  |
+  | ipv6RoutingEnabled     | yes      | false: send IPv4 address of Traffic Router to client on HTTP type del.                                  |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
-  | logsEnabled            | no       | - false: No                                                                                             |
+  | logsEnabled            | yes      | - false: No                                                                                             |
   |                        |          | - true: Yes                                                                                             |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
   | longDesc               | no       | Description field.                                                                                      |
@@ -1451,9 +1442,9 @@ SSL Keys
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
   | midHeaderRewrite       | no       | The MID header rewrite actions to perform.                                                              |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
-  | missLat                | no       | The latitude to use when the client cannot be found in the CZF or the Geo lookup.                       |
+  | missLat                | yes      | The latitude to use when the client cannot be found in the CZF or the Geo lookup.                       |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
-  | missLong               | no       | The longitude to use when the client cannot be found in the CZF or the Geo lookup.                      |
+  | missLong               | yes      | The longitude to use when the client cannot be found in the CZF or the Geo lookup.                      |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
   | multiSiteOrigin        | yes      | 1 if enabled, 0 if disabled.                                                                            |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
@@ -1468,11 +1459,11 @@ SSL Keys
   |                        |          | - 1: serve with https:// at EDGE                                                                        |
   |                        |          | - 2: serve with both http:// and https:// at EDGE                                                       |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
-  | qstringIgnore          | no       | - 0: no special query string handling; it is for use in the cache-key and pass up to origin.            |
+  | qstringIgnore          | yes      | - 0: no special query string handling; it is for use in the cache-key and pass up to origin.            |
   |                        |          | - 1: ignore query string in cache-key, but pass it up to parent and or origin.                          |
   |                        |          | - 2: drop query string at edge, and do not use it in the cache-key.                                     |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
-  | rangeRequestHandling   | no       | How to treat range requests:                                                                            |
+  | rangeRequestHandling   | yes      | How to treat range requests:                                                                            |
   |                        |          |                                                                                                         |
   |                        |          | - 0 Do not cache (ranges requested from files taht are already cached due to a non range request will   |
   |                        |          |   be a HIT)                                                                                             |
@@ -1494,7 +1485,7 @@ SSL Keys
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
   | trResponseHeaders      | no       | Traffic router additional response headers                                                              |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
-  | type                   | yes      | The type of this deliveryservice (one of :ref:to-api-v12-types use_in_table='deliveryservice').         |
+  | typeId                 | yes      | The type of this deliveryservice (one of :ref:to-api-v12-types use_in_table='deliveryservice').         |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
   | xmlId                  | yes      | Unique string that describes this deliveryservice.                                                      |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
@@ -1505,90 +1496,84 @@ SSL Keys
     {
         "xmlId": "my_ds_1",
         "displayName": "my_ds_displayname_1",
-        "protocol": "1",
+        "protocol": 1,
         "orgServerFqdn": "http://10.75.168.91",
-        "cdnName": "cdn_number_1",
-        "profileName": "CCR_CDN1",
-        "type": "HTTP",
-        "multiSiteOrigin": "0",
-        "active": "false",
-        "matchList": [
-            {
-                "type":  "HOST_REGEXP",
-                "pattern": ".*\\.ds_1\\..*"
-                "setNumber": "0"
-            },
-            {
-                "type":  "HOST_REGEXP",
-                "pattern": ".*\\.my_vod1\\..*"
-                "setNumber": "1"
-            }
-        ]
+        "cdnId": 2,
+        "typeId": 42,
+        "active": false,
+        "dscp": 10,
+        "geoLimit": 0,
+        "geoProvider": 0,
+        "initialDispersion": 1,
+        "ipv6RoutingEnabled": false,
+        "logsEnabled": false,
+        "multiSiteOrigin": false,
+        "missLat": 45,
+        "missLong": 45,
+        "qstringIgnore": 0,
+        "rangeRequestHandling": 0,
+        "regionalGeoBlocking": false,
+        "signed": false
     }
 
 
   **Response Example** ::
 
     {
-        "response":{
-            "xmlId":"my_ds_1",
-            "active":"false",
-            "protocol":"0",
-            "missLong":null,
-            "maxDnsAnswers":"0",
-            "profileName": "CCR_CDN1",
-            "multiSiteOrigin":"0",
-            "dnsBypassIp6":null,
-            "globalMaxTps":"0",
-            "orgServerFqdn":"http:\/\/10.75.168.91",
-            "infoUrl":null,
-            "rangeRequestHandling":null,
-            "id":"311",
-            "trResponseHeaders":null,
-            "ipv6RoutingEnabled":null,
-            "midHeaderRewrite":null,
-            "longDesc":null,
-            "httpBypassFqdn":null,
-            "cdnName":"cdn_number_1",
-            "protocol":"1",
-            "missLat":null,
-            "globalMaxMbps":"0",
-            "initialDispersion":null,
-            "type":"HTTP",
-            "geoLimit":null,
-            "dnsBypassTtl":null,
-            "dnsBypassCname":null,
-            "ccrDnsTtl":null,
-            "longDesc2":null,
-            "remapText":null,
-            "dnsBypassIp":null,
-            "longDesc1":null,
-            "checkPath":null,
-            "qstringIgnore":null,
-            "dscp":"1",
-            "regexRemap":null,
-            "edgeHeaderRewrite":null,
-            "sslKeyVersion":"0",
-            "displayName":"my_ds_displayname_1",
-            "cacheurl":null,
-            "signed":"0",
-            "matchList":[
-                {
-                    "type":"HOST_REGEXP",
-                    "setNumber":"0",
-                    "pattern":".*\\.ds_1\\..*"
-                },
-                {
-                    "type":"HOST_REGEXP",
-                    "setNumber":"1",
-                    "pattern":".*\\.my_vod1\\..*"
-                }
-            ],
-            "regionalGeoBlocking":0,
-            "originShield":null,
-            "trRequestHeaders":null,
-            "geoProvider":"0",
-            "logsEnabled":"false",
+        "response":
+        {
+            "active": true,
+            "cacheurl": null,
+            "ccrDnsTtl": "3600",
+            "cdnId": "2",
+            "cdnName": "over-the-top",
+            "checkPath": "",
+            "displayName": "My Cool Delivery Service",
+            "dnsBypassCname": "",
+            "dnsBypassIp": "",
+            "dnsBypassIp6": "",
+            "dnsBypassTtl": "30",
+            "dscp": "40",
+            "edgeHeaderRewrite": null,
+            "geoLimit": "0",
+            "geoLimitCountries": null,
+            "geoLimitRedirectURL": null,
+            "geoProvider": "0",
+            "globalMaxMbps": null,
+            "globalMaxTps": "0",
+            "httpBypassFqdn": "",
+            "id": "442",
+            "infoUrl": "",
+            "initialDispersion": "1",
+            "ipv6RoutingEnabled": true,
+            "lastUpdated": "2016-01-26 08:49:35",
+            "logsEnabled": false,
+            "longDesc": "",
+            "longDesc1": "",
+            "longDesc2": "",
+            "maxDnsAnswers": "0",
+            "midHeaderRewrite": null,
+            "missLat": "41.881944",
+            "missLong": "-87.627778",
+            "multiSiteOrigin": false,
+            "orgServerFqdn": "http://baz.boo.net",
+            "originShield": null,
+            "profileDescription": "Content Router for over-the-top",
+            "profileId": "5",
+            "profileName": "ROUTER_TOP",
+            "protocol": "0",
+            "qstringIgnore": "1",
+            "rangeRequestHandling": "0",
+            "regexRemap": null,
+            "regionalGeoBlocking": false,
+            "remapText": null,
+            "signed": false,
+            "sslKeyVersion": "0",
+            "trRequestHeaders": null,
+            "trResponseHeaders": "Access-Control-Allow-Origin: *",
+            "type": "HTTP",
+            "typeId": "8",
+            "xmlId": "foo-ds"
         }
         "alerts":[
             {
@@ -1643,13 +1628,13 @@ SSL Keys
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
   | dnsBypassTtl           | no       | The TTL of the DNS bypass response.                                                                     |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
-  | dscp                   | no       | The Differentiated Services Code Point (DSCP) with which to mark downstream (EDGE -> customer) traffic. |
+  | dscp                   | yes      | The Differentiated Services Code Point (DSCP) with which to mark downstream (EDGE -> customer) traffic. |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
   | edgeHeaderRewrite      | no       | The EDGE header rewrite actions to perform.                                                             |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
   | geoLimitRedirectURL    | no       | This is the URL Traffic Router will redirect to when Geo Limit Failure.                                 |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
-  | geoLimit               | no       | - 0: None - no limitations                                                                              |
+  | geoLimit               | yes      | - 0: None - no limitations                                                                              |
   |                        |          | - 1: Only route on CZF file hit                                                                         |
   |                        |          | - 2: Only route on CZF hit or when from geo limit countries                                             |
   |                        |          |                                                                                                         |
@@ -1658,7 +1643,7 @@ SSL Keys
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
   | geoLimitCountries      | no       | The geo limit countries.                                                                                |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
-  | geoProvider            | no       | - 0: Maxmind(default)                                                                                   |
+  | geoProvider            | yes      | - 0: Maxmind(default)                                                                                   |
   |                        |          | - 1: Neustar                                                                                            |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
   | globalMaxMbps          | no       | The maximum global bandwidth allowed on this deliveryservice. If exceeded, the traffic routes to the    |
@@ -1673,11 +1658,11 @@ SSL Keys
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
   | infoUrl                | no       | Use this to add a URL that points to more information about that deliveryservice.                       |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
-  | initialDispersion      | no       | Initial dispersion                                                                                      |
+  | initialDispersion      | yes      | Initial dispersion                                                                                      |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
-  | ipv6RoutingEnabled     | no       | false: send IPv4 address of Traffic Router to client on HTTP type del.                                  |
+  | ipv6RoutingEnabled     | yes      | false: send IPv4 address of Traffic Router to client on HTTP type del.                                  |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
-  | logsEnabled            | no       | - false: No                                                                                             |
+  | logsEnabled            | yes      | - false: No                                                                                             |
   |                        |          | - true: Yes                                                                                             |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
   | longDesc               | no       | Description field.                                                                                      |
@@ -1691,9 +1676,9 @@ SSL Keys
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
   | midHeaderRewrite       | no       | The MID header rewrite actions to perform.                                                              |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
-  | missLat                | no       | The latitude to use when the client cannot be found in the CZF or the Geo lookup.                       |
+  | missLat                | yes      | The latitude to use when the client cannot be found in the CZF or the Geo lookup.                       |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
-  | missLong               | no       | The longitude to use when the client cannot be found in the CZF or the Geo lookup.                      |
+  | missLong               | yes      | The longitude to use when the client cannot be found in the CZF or the Geo lookup.                      |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
   | multiSiteOrigin        | yes      | 1 if enabled, 0 if disabled.                                                                            |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
@@ -1708,11 +1693,11 @@ SSL Keys
   |                        |          | - 1: serve with https:// at EDGE                                                                        |
   |                        |          | - 2: serve with both http:// and https:// at EDGE                                                       |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
-  | qstringIgnore          | no       | - 0: no special query string handling; it is for use in the cache-key and pass up to origin.            |
+  | qstringIgnore          | yes      | - 0: no special query string handling; it is for use in the cache-key and pass up to origin.            |
   |                        |          | - 1: ignore query string in cache-key, but pass it up to parent and or origin.                          |
   |                        |          | - 2: drop query string at edge, and do not use it in the cache-key.                                     |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
-  | rangeRequestHandling   | no       | How to treat range requests:                                                                            |
+  | rangeRequestHandling   | yes      | How to treat range requests:                                                                            |
   |                        |          |                                                                                                         |
   |                        |          | - 0 Do not cache (ranges requested from files taht are already cached due to a non range request will   |
   |                        |          |   be a HIT)                                                                                             |
@@ -1734,7 +1719,7 @@ SSL Keys
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
   | trResponseHeaders      | no       | Traffic router additional response headers                                                              |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
-  | type                   | yes      | The type of this deliveryservice (one of :ref:to-api-v12-types use_in_table='deliveryservice').         |
+  | typeId                 | yes      | The type of this deliveryservice (one of :ref:to-api-v12-types use_in_table='deliveryservice').         |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
   | xmlId                  | yes      | Unique string that describes this deliveryservice.                                                      |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
@@ -1743,92 +1728,86 @@ SSL Keys
   **Request Example** ::
 
     {
-        "xmlId": "my_ds_2",
-        "displayName": "my_ds_displayname_2",
-        "protocol": "1",
+        "xmlId": "my_ds_1",
+        "displayName": "my_ds_displayname_1",
+        "protocol": 1,
         "orgServerFqdn": "http://10.75.168.91",
-        "cdnName": "cdn_number_1",
-        "profileName": "CCR_CDN1",
-        "type": "HTTP",
-        "multiSiteOrigin": "0",
-        "active": "true",
-        "matchList": [
-            {
-                "type":  "HOST_REGEXP",
-                "pattern": ".*\\.ds_1\\..*"
-                "setNumber": "0"
-            },
-            {
-                "type":  "HOST_REGEXP",
-                "pattern": ".*\\.my_vod1\\..*"
-                "setNumber": "1"
-            }
-        ]
+        "cdnId": 2,
+        "typeId": 42,
+        "active": false,
+        "dscp": 10,
+        "geoLimit": 0,
+        "geoProvider": 0,
+        "initialDispersion": 1,
+        "ipv6RoutingEnabled": false,
+        "logsEnabled": false,
+        "multiSiteOrigin": false,
+        "missLat": 45,
+        "missLong": 45,
+        "qstringIgnore": 0,
+        "rangeRequestHandling": 0,
+        "regionalGeoBlocking": false,
+        "signed": false
     }
 
 
   **Response Example** ::
 
     {
-        "response":{
-            "xmlId":"my_ds_2",
-            "active":"true",
-            "protocol":"0",
-            "missLong":null,
-            "maxDnsAnswers":"0",
-            "profileName": "CCR_CDN1",
-            "multiSiteOrigin":"0",
-            "dnsBypassIp6":null,
-            "globalMaxTps":"0",
-            "orgServerFqdn":"http:\/\/10.75.168.91",
-            "infoUrl":null,
-            "rangeRequestHandling":null,
-            "id":"311",
-            "trResponseHeaders":null,
-            "ipv6RoutingEnabled":null,
-            "midHeaderRewrite":null,
-            "longDesc":null,
-            "httpBypassFqdn":null,
-            "cdnName":"cdn_number_1",
-            "protocol":"1",
-            "missLat":null,
-            "globalMaxMbps":"0",
-            "initialDispersion":null,
-            "type":"HTTP",
-            "geoLimit":null,
-            "dnsBypassTtl":null,
-            "dnsBypassCname":null,
-            "ccrDnsTtl":null,
-            "longDesc2":null,
-            "remapText":null,
-            "dnsBypassIp":null,
-            "longDesc1":null,
-            "checkPath":null,
-            "qstringIgnore":null,
-            "dscp":"1",
-            "regexRemap":null,
-            "edgeHeaderRewrite":null,
-            "sslKeyVersion":"0",
-            "displayName":"my_ds_displayname_2",
-            "cacheurl":null,
-            "signed":"0",
-            "matchList":[
-                {
-                    "type":"HOST_REGEXP",
-                    "setNumber":"0",
-                    "pattern":".*\\.ds_1\\..*"
-                },
-                {
-                    "type":"HOST_REGEXP",
-                    "setNumber":"1",
-                    "pattern":".*\\.my_vod1\\..*"
-                }
-            ],
-            "regionalGeoBlocking":0,
-            "originShield":null,
-            "trRequestHeaders":null,
-            "geoProvider":"0",
-            "logsEnabled":"false",
+        "response":
+        {
+            "active": true,
+            "cacheurl": null,
+            "ccrDnsTtl": "3600",
+            "cdnId": "2",
+            "cdnName": "over-the-top",
+            "checkPath": "",
+            "displayName": "My Cool Delivery Service",
+            "dnsBypassCname": "",
+            "dnsBypassIp": "",
+            "dnsBypassIp6": "",
+            "dnsBypassTtl": "30",
+            "dscp": "40",
+            "edgeHeaderRewrite": null,
+            "geoLimit": "0",
+            "geoLimitCountries": null,
+            "geoLimitRedirectURL": null,
+            "geoProvider": "0",
+            "globalMaxMbps": null,
+            "globalMaxTps": "0",
+            "httpBypassFqdn": "",
+            "id": "442",
+            "infoUrl": "",
+            "initialDispersion": "1",
+            "ipv6RoutingEnabled": true,
+            "lastUpdated": "2016-01-26 08:49:35",
+            "logsEnabled": false,
+            "longDesc": "",
+            "longDesc1": "",
+            "longDesc2": "",
+            "maxDnsAnswers": "0",
+            "midHeaderRewrite": null,
+            "missLat": "41.881944",
+            "missLong": "-87.627778",
+            "multiSiteOrigin": false,
+            "orgServerFqdn": "http://baz.boo.net",
+            "originShield": null,
+            "profileDescription": "Content Router for over-the-top",
+            "profileId": "5",
+            "profileName": "ROUTER_TOP",
+            "protocol": "0",
+            "qstringIgnore": "1",
+            "rangeRequestHandling": "0",
+            "regexRemap": null,
+            "regionalGeoBlocking": false,
+            "remapText": null,
+            "signed": false,
+            "sslKeyVersion": "0",
+            "trRequestHeaders": null,
+            "trResponseHeaders": "Access-Control-Allow-Origin: *",
+            "type": "HTTP",
+            "typeId": "8",
+            "xmlId": "foo-ds"
         }
         "alerts":[
             {