You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by da...@apache.org on 2017/04/26 23:55:21 UTC
[2/6] incubator-trafficcontrol git commit: changes format of
deliveryservice server api
changes format of deliveryservice server api
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/a3bcd7c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/a3bcd7c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/a3bcd7c7
Branch: refs/heads/master
Commit: a3bcd7c75d59fa36adacd07087b2fe1adaef351f
Parents: 9944b7f
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Tue Apr 25 08:03:35 2017 -0600
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Wed Apr 26 17:54:08 2017 -0600
----------------------------------------------------------------------
.../development/traffic_ops_api/v12/deliveryservice.rst | 6 +++---
traffic_ops/app/lib/API/DeliveryServiceServer.pm | 8 ++++----
traffic_ops/app/lib/TrafficOpsRoutes.pm | 2 +-
traffic_ops/app/t/api/1.2/deliveryservice_server.t | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a3bcd7c7/docs/source/development/traffic_ops_api/v12/deliveryservice.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/deliveryservice.rst b/docs/source/development/traffic_ops_api/v12/deliveryservice.rst
index 3ae4d24..8e21e98 100644
--- a/docs/source/development/traffic_ops_api/v12/deliveryservice.rst
+++ b/docs/source/development/traffic_ops_api/v12/deliveryservice.rst
@@ -910,7 +910,7 @@ Server
}
-**DELETE /api/1.2/deliveryservices/:dsId/servers/:id**
+**DELETE /api/1.2/deliveryservice_server/:dsId/:serverId**
Removes a server (cache) from a delivery service.
@@ -925,7 +925,7 @@ Server
+=================+==========+===================================================+
| ``dsId`` | yes | Delivery service ID. |
+-----------------+----------+---------------------------------------------------+
- | ``id`` | yes | Server (cache) ID. |
+ | ``serverId`` | yes | Server (cache) ID. |
+-----------------+----------+---------------------------------------------------+
**Response Example** ::
@@ -934,7 +934,7 @@ Server
"alerts": [
{
"level": "success",
- "text": "Server removed from delivery service."
+ "text": "Server unlinked from delivery service."
}
],
}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a3bcd7c7/traffic_ops/app/lib/API/DeliveryServiceServer.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/DeliveryServiceServer.pm b/traffic_ops/app/lib/API/DeliveryServiceServer.pm
index f2e9d88..a75b5cc 100644
--- a/traffic_ops/app/lib/API/DeliveryServiceServer.pm
+++ b/traffic_ops/app/lib/API/DeliveryServiceServer.pm
@@ -179,7 +179,7 @@ sub assign_ds_to_cachegroup {
sub remove_server_from_ds {
my $self = shift;
my $ds_id = $self->param('dsId');
- my $server_id = $self->param('id');
+ my $server_id = $self->param('serverId');
if ( !&is_privileged($self) && !$self->is_delivery_service_assigned($ds_id) ) {
$self->forbidden("Forbidden. Delivery service not assigned to user.");
@@ -193,11 +193,11 @@ sub remove_server_from_ds {
my $row = $ds_server->next;
my $rs = $ds_server->delete();
if ($rs) {
- &log( $self, "Server [ " . $row->server->id . " | " . $row->server->host_name . " ] was removed from deliveryservice [ " . $row->deliveryservice->id . " | " . $row->deliveryservice->xml_id . " ].", "APICHANGE" );
- return $self->success_message("Server removed from delivery service.");
+ &log( $self, "Server [ " . $row->server->id . " | " . $row->server->host_name . " ] unlinked from deliveryservice [ " . $row->deliveryservice->id . " | " . $row->deliveryservice->xml_id . " ].", "APICHANGE" );
+ return $self->success_message("Server unlinked from delivery service.");
}
- return $self->alert( "Failed to remove server from delivery service." );
+ return $self->alert( "Failed to unlink server from delivery service." );
}
1;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a3bcd7c7/traffic_ops/app/lib/TrafficOpsRoutes.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/TrafficOpsRoutes.pm b/traffic_ops/app/lib/TrafficOpsRoutes.pm
index 683df81..483de16 100644
--- a/traffic_ops/app/lib/TrafficOpsRoutes.pm
+++ b/traffic_ops/app/lib/TrafficOpsRoutes.pm
@@ -498,7 +498,7 @@ sub api_routes {
# delivery service / server assignments
$r->post("/api/$version/deliveryservices/:xml_id/servers")->over( authenticated => 1 )
->to( 'Deliveryservice2#assign_servers', namespace => $namespace );
- $r->delete("/api/$version/deliveryservices/:dsId/servers/:id" => [ dsId => qr/\d+/, id => qr/\d+/ ] )->over( authenticated => 1 )->to( 'DeliveryServiceServer#remove_server_from_ds', namespace => $namespace );
+ $r->delete("/api/$version/deliveryservice_server/:dsId/:serverId" => [ dsId => qr/\d+/, serverId => qr/\d+/ ] )->over( authenticated => 1 )->to( 'DeliveryServiceServer#remove_server_from_ds', namespace => $namespace );
# alternate deliveryservice routes
$r->get("/api/$version/deliveryservices/list")->over( authenticated => 1 )->to( 'Deliveryservice2#delivery_services', namespace => $namespace );
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a3bcd7c7/traffic_ops/app/t/api/1.2/deliveryservice_server.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.2/deliveryservice_server.t b/traffic_ops/app/t/api/1.2/deliveryservice_server.t
index cf4b1c6..17539ca 100644
--- a/traffic_ops/app/t/api/1.2/deliveryservice_server.t
+++ b/traffic_ops/app/t/api/1.2/deliveryservice_server.t
@@ -60,8 +60,8 @@ ok $t->get_ok('/api/1.2/deliveryserviceserver')
->json_is( "/response/2/server" => 600 )
, 'Does the delivery services servers details return?';
-ok $t->delete_ok('/api/1.2/deliveryservices/100/servers/100')->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } );
-ok $t->delete_ok('/api/1.2/deliveryservices/100/servers/100')->status_is(404)->or( sub { diag $t->tx->res->content->asset->{content}; } );
+ok $t->delete_ok('/api/1.2/deliveryservice_server/100/100')->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } );
+ok $t->delete_ok('/api/1.2/deliveryservice_server/100/100')->status_is(404)->or( sub { diag $t->tx->res->content->asset->{content}; } );
ok $t->get_ok('/logout')->status_is(302)->or( sub { diag $t->tx->res->content->asset->{content}; } );
$dbh->disconnect();