Skip to content
This repository was archived by the owner on Nov 24, 2025. It is now read-only.

speeds up api/version/deliveryservices api #3

Merged
asfgit merged 1 commit into from
Oct 19, 2016
Merged

speeds up api/version/deliveryservices api #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions docs/source/development/traffic_ops_api/v11/deliveryservice.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@ Delivery Service
+--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
| ``edgeHeaderRewrite`` | string | The EDGE header rewrite actions to perform. |
+--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
| ``exampleURLs`` | array | Entry points into the CDN for this deliveryservice. |
+--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
| ``geoLimitRedirectUrl`` | string | |
+--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
| ``geoLimit`` | string | - 0: None - no limitations |
Expand Down Expand Up @@ -107,8 +105,6 @@ Delivery Service
+--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
| ``longDesc2`` | string | Description field 2. |
+--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
| ``matchList`` | array | Array of matchList hashes. |
+--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
| ``>>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. |
Expand Down
22 changes: 9 additions & 13 deletions docs/source/development/traffic_ops_api/v12/deliveryservice.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Delivery Service
/api/1.2/deliveryservices
+++++++++++++++++++++++++

**GET /api/1.2/deliveryservices.json**
**GET /api/1.2/deliveryservices**

Retrieves all delivery services. See also `Using Traffic Ops - Delivery Service <http://traffic-control-cdn.net/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.

Expand Down Expand Up @@ -64,8 +64,6 @@ Delivery Service
+--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
| ``edgeHeaderRewrite`` | string | The EDGE header rewrite actions to perform. |
+--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
| ``exampleURLs`` | array | Entry points into the CDN for this deliveryservice. |
+--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
| ``geoLimitRedirectUrl`` | string | |
+--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
| ``geoLimit`` | string | - 0: None - no limitations |
Expand Down Expand Up @@ -107,8 +105,6 @@ Delivery Service
+--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
| ``longDesc2`` | string | Description field 2. |
+--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
| ``matchList`` | array | Array of matchList hashes. |
+--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
| ``>>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. |
Expand Down Expand Up @@ -482,7 +478,7 @@ Delivery Service
Health
++++++

**GET /api/1.2/deliveryservices/:id/state.json**
**GET /api/1.2/deliveryservices/:id/state**

Retrieves the failover state for a delivery service.

Expand Down Expand Up @@ -531,7 +527,7 @@ Health

|

**GET /api/1.2/deliveryservices/:id/health.json**
**GET /api/1.2/deliveryservices/:id/health**

Retrieves the health of all locations (cache groups) for a delivery service.

Expand Down Expand Up @@ -581,7 +577,7 @@ Health

|

**GET /api/1.2/deliveryservices/:id/capacity.json**
**GET /api/1.2/deliveryservices/:id/capacity**

Retrieves the capacity percentages of a delivery service.

Expand Down Expand Up @@ -629,7 +625,7 @@ Health

|

**GET /api/1.2/deliveryservices/:id/routing.json**
**GET /api/1.2/deliveryservices/:id/routing**

Retrieves the routing method percentages of a delivery service.

Expand Down Expand Up @@ -693,7 +689,7 @@ Health
Server
++++++

**GET /api/1.2/deliveryserviceserver.json**
**GET /api/1.2/deliveryserviceserver**

Authentication Required: Yes

Expand Down Expand Up @@ -749,7 +745,7 @@ Server
SSL Keys
+++++++++

**GET /api/1.2/deliveryservices/xmlId/:xmlid/sslkeys.json**
**GET /api/1.2/deliveryservices/xmlId/:xmlid/sslkeys**

Authentication Required: Yes

Expand Down Expand Up @@ -819,7 +815,7 @@ SSL Keys

|

**GET /api/1.2/deliveryservices/hostname/:hostname/sslkeys.json**
**GET /api/1.2/deliveryservices/hostname/:hostname/sslkeys**

Authentication Required: Yes

Expand Down Expand Up @@ -889,7 +885,7 @@ SSL Keys

|

**GET /api/1.2/deliveryservices/xmlId/:xmlid/sslkeys/delete.json**
**GET /api/1.2/deliveryservices/xmlId/:xmlid/sslkeys/delete**

Authentication Required: Yes

Expand Down
19 changes: 0 additions & 19 deletions traffic_ops/app/lib/API/Deliveryservice.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,23 +50,6 @@ sub index {

my $rs_data = $self->db->resultset("Deliveryservice")->search( \%criteria, { order_by => 'me.' . $orderby } );
while ( my $row = $rs_data->next ) {
my $ds_regexes = $row->deliveryservice_regexes;
my @matchlist = ();

while ( my $ds_regex = $ds_regexes->next ) {
push(
@matchlist, {
type => $ds_regex->regex->type->name,
pattern => $ds_regex->regex->pattern,
setNumber => $ds_regex->set_number
}
);
}

my $cdn_domain = $self->get_cdn_domain_by_ds_id( $row->id );
my $regexp_set = &UI::DeliveryService::get_regexp_set( $self, $row->id );
my @example_urls = &UI::DeliveryService::get_example_urls( $self, $row->id, $regexp_set, $row, $cdn_domain, $row->protocol );

push(
@data, {
"active" => \$row->active,
Expand All @@ -82,7 +65,6 @@ sub index {
"dnsBypassTtl" => $row->dns_bypass_ttl,
"dscp" => $row->dscp,
"edgeHeaderRewrite" => $row->edge_header_rewrite,
"exampleURLs" => \@example_urls,
"geoLimitRedirectURL" => $row->geolimit_redirect_url,
"geoLimit" => $row->geo_limit,
"geoLimitCountries" => $row->geo_limit_countries,
Expand All @@ -99,7 +81,6 @@ sub index {
"longDesc" => $row->long_desc,
"longDesc1" => $row->long_desc_1,
"longDesc2" => $row->long_desc_2,
"matchList" => \@matchlist,
"maxDnsAnswers" => $row->max_dns_answers,
"midHeaderRewrite" => $row->mid_header_rewrite,
"missLat" => $row->miss_lat,
Expand Down