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:23 UTC
[4/6] incubator-trafficcontrol git commit: hooks to ui into api to
remove cache from a ds
hooks to ui into api to remove cache from a ds
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/fb7c24b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/fb7c24b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/fb7c24b5
Branch: refs/heads/master
Commit: fb7c24b5f00ad061329cedbc4ffe1bc16885ed54
Parents: 29eea41
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Thu Apr 20 12:27:26 2017 -0600
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Wed Apr 26 17:54:08 2017 -0600
----------------------------------------------------------------------
.../ui/app/src/common/api/DeliveryServiceService.js | 12 ++++++++++++
.../TableDeliveryServiceServersController.js | 13 +++++++++----
.../table.deliveryServiceServers.tpl.html | 2 +-
3 files changed, 22 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/fb7c24b5/traffic_ops/experimental/ui/app/src/common/api/DeliveryServiceService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/DeliveryServiceService.js b/traffic_ops/experimental/ui/app/src/common/api/DeliveryServiceService.js
index 2178fcf..8c9f052 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/DeliveryServiceService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/DeliveryServiceService.js
@@ -72,6 +72,18 @@ var DeliveryServiceService = function(Restangular, locationUtils, messageModel)
return Restangular.one('users', userId).getList('deliveryservices');
};
+ this.deleteDeliveryServiceServer = function(dsId, serverId) {
+ return Restangular.one('deliveryservices', dsId).one('servers', serverId).remove()
+ .then(
+ function() {
+ messageModel.setMessages([ { level: 'success', text: 'Server removed' } ], false);
+ },
+ function(fault) {
+ messageModel.setMessages(fault.data.alerts, true);
+ }
+ );
+ };
+
};
DeliveryServiceService.$inject = ['Restangular', 'locationUtils', 'messageModel'];
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/fb7c24b5/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceServers/TableDeliveryServiceServersController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceServers/TableDeliveryServiceServersController.js b/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceServers/TableDeliveryServiceServersController.js
index 405a7fb..408d7a6 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceServers/TableDeliveryServiceServersController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceServers/TableDeliveryServiceServersController.js
@@ -17,7 +17,7 @@
* under the License.
*/
-var TableDeliveryServiceServersController = function(deliveryService, servers, $scope, $state, locationUtils, serverUtils) {
+var TableDeliveryServiceServersController = function(deliveryService, servers, $scope, $state, locationUtils, serverUtils, deliveryServiceService) {
$scope.deliveryService = deliveryService;
@@ -27,8 +27,13 @@ var TableDeliveryServiceServersController = function(deliveryService, servers, $
alert('not hooked up yet: addServer to ds');
};
- $scope.removeServer = function() {
- alert('not hooked up yet: removeServer from ds');
+ $scope.removeServer = function(dsId, serverId) {
+ deliveryServiceService.deleteDeliveryServiceServer(dsId, serverId)
+ .then(
+ function() {
+ $scope.refresh();
+ }
+ );
};
$scope.refresh = function() {
@@ -51,5 +56,5 @@ var TableDeliveryServiceServersController = function(deliveryService, servers, $
};
-TableDeliveryServiceServersController.$inject = ['deliveryService', 'servers', '$scope', '$state', 'locationUtils', 'serverUtils'];
+TableDeliveryServiceServersController.$inject = ['deliveryService', 'servers', '$scope', '$state', 'locationUtils', 'serverUtils', 'deliveryServiceService'];
module.exports = TableDeliveryServiceServersController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/fb7c24b5/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceServers/table.deliveryServiceServers.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceServers/table.deliveryServiceServers.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceServers/table.deliveryServiceServers.tpl.html
index 91feddc..e4fc578 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceServers/table.deliveryServiceServers.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/table/deliveryServiceServers/table.deliveryServiceServers.tpl.html
@@ -72,7 +72,7 @@ under the License.
<td>{{server.profile}}</td>
<td>{{server.iloIpAddress}}</td>
<td>{{server.iloIpGateway}}</td>
- <td><button type="button" class="btn btn-link" title="Remove Server" ng-show="server.type == 'EDGE'" ng-click="removeServer()"><i class="fa fa-trash-o"></i></button></td>
+ <td><button type="button" class="btn btn-link" title="Remove Server" ng-show="server.type == 'EDGE'" ng-click="removeServer(deliveryService.id, server.id)"><i class="fa fa-trash-o"></i></button></td>
</tr>
</tbody>
</table>