Add Delete Container Force action
This patch adds "Delete Container Forcely" action for each containers. This action is too dangerous for batch action, so implemented as only item action. Change-Id: Id839f2ce4beb17d7c4280cecf31b29e63f59197f
This commit is contained in:
parent
dbc4d98752
commit
b56de185aa
@ -38,6 +38,14 @@ class Container(generic.View):
|
||||
"""Get a specific container"""
|
||||
return change_to_id(client.container_show(request, id).to_dict())
|
||||
|
||||
@rest_utils.ajax(data_required=True)
|
||||
def delete(self, request, id):
|
||||
"""Delete single Container forcely by id.
|
||||
|
||||
Returns HTTP 204 (no content) on successful deletion.
|
||||
"""
|
||||
return client.container_delete(request, id, force=True)
|
||||
|
||||
|
||||
@urls.register
|
||||
class ContainerActions(generic.View):
|
||||
|
@ -30,6 +30,7 @@
|
||||
'horizon.framework.util.i18n.gettext',
|
||||
'horizon.dashboard.container.containers.create.service',
|
||||
'horizon.dashboard.container.containers.delete.service',
|
||||
'horizon.dashboard.container.containers.delete-force.service',
|
||||
'horizon.dashboard.container.containers.start.service',
|
||||
'horizon.dashboard.container.containers.stop.service',
|
||||
'horizon.dashboard.container.containers.reboot.service',
|
||||
@ -45,6 +46,7 @@
|
||||
gettext,
|
||||
createContainerService,
|
||||
deleteContainerService,
|
||||
deleteContainerForceService,
|
||||
startContainerService,
|
||||
stopContainerService,
|
||||
rebootContainerService,
|
||||
@ -133,6 +135,14 @@
|
||||
type: 'delete',
|
||||
text: gettext('Delete Container')
|
||||
}
|
||||
})
|
||||
.append({
|
||||
id: 'deleteContainerForceAction',
|
||||
service: deleteContainerForceService,
|
||||
template: {
|
||||
type: 'delete',
|
||||
text: gettext('Delete Container Forcely')
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -0,0 +1,149 @@
|
||||
/**
|
||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
* not use self file except in compliance with the License. You may obtain
|
||||
* a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
* License for the specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
(function() {
|
||||
'use strict';
|
||||
|
||||
angular
|
||||
.module('horizon.dashboard.container.containers')
|
||||
.factory('horizon.dashboard.container.containers.delete-force.service', deleteForceService);
|
||||
|
||||
deleteForceService.$inject = [
|
||||
'$location',
|
||||
'$q',
|
||||
'horizon.app.core.openstack-service-api.zun',
|
||||
'horizon.app.core.openstack-service-api.policy',
|
||||
'horizon.framework.util.actions.action-result.service',
|
||||
'horizon.framework.util.i18n.gettext',
|
||||
'horizon.framework.util.q.extensions',
|
||||
'horizon.framework.widgets.modal.deleteModalService',
|
||||
'horizon.framework.widgets.toast.service',
|
||||
'horizon.dashboard.container.containers.resourceType',
|
||||
'horizon.dashboard.container.containers.events'
|
||||
];
|
||||
|
||||
/**
|
||||
* @ngDoc factory
|
||||
* @name horizon.dashboard.container.containers.delete-force.service
|
||||
* @Description
|
||||
* Brings up the delete container forcely confirmation modal dialog.
|
||||
* On submit, delete selected resources.
|
||||
* On cancel, do nothing.
|
||||
*/
|
||||
function deleteForceService(
|
||||
$location, $q, zun, policy, actionResult, gettext, $qExtensions, deleteModal, toast, resourceType, events
|
||||
) {
|
||||
var scope;
|
||||
var context = {
|
||||
labels: null,
|
||||
deleteEntity: deleteEntity,
|
||||
successEvent: events.DELETE_SUCCESS
|
||||
};
|
||||
var service = {
|
||||
initAction: initAction,
|
||||
allowed: allowed,
|
||||
perform: perform
|
||||
};
|
||||
var notAllowedMessage = gettext("You are not allowed to delete container forcely: %s");
|
||||
|
||||
return service;
|
||||
|
||||
//////////////
|
||||
|
||||
function initAction() {
|
||||
}
|
||||
|
||||
function allowed() {
|
||||
return $qExtensions.booleanAsPromise(true);
|
||||
}
|
||||
|
||||
// delete selected resource objects
|
||||
function perform(selected, newScope) {
|
||||
scope = newScope;
|
||||
var selected = angular.isArray(selected) ? selected : [selected];
|
||||
context.labels = labelize(selected.length);
|
||||
return $qExtensions.allSettled(selected.map(checkPermission)).then(afterCheck);
|
||||
}
|
||||
|
||||
function labelize(count){
|
||||
return {
|
||||
title: ngettext('Confirm Delete Container Forcely',
|
||||
'Confirm Delete Containers Forcely', count),
|
||||
/* eslint-disable max-len */
|
||||
message: ngettext('You have selected "%s". Please confirm your selection. Deleted container is not recoverable.',
|
||||
'You have selected "%s". Please confirm your selection. Deleted containers are not recoverable.', count),
|
||||
/* eslint-enable max-len */
|
||||
submit: ngettext('Delete Container Forcely',
|
||||
'Delete Containers Forcely', count),
|
||||
success: ngettext('Deleted Container Forcely: %s.',
|
||||
'Deleted Containers Forcely: %s.', count),
|
||||
error: ngettext('Unable to delete Container forcely: %s.',
|
||||
'Unable to delete Containers forcely: %s.', count)
|
||||
};
|
||||
}
|
||||
|
||||
// for batch delete
|
||||
function checkPermission(selected) {
|
||||
return {promise: allowed(selected), context: selected};
|
||||
}
|
||||
|
||||
// for batch delete
|
||||
function afterCheck(result){
|
||||
var outcome = $q.reject(); // Reject the promise by default
|
||||
if (result.fail.length > 0) {
|
||||
toast.add('error', getMessage(notAllowedMessage, result.fail));
|
||||
outcome = $q.reject(result.fail);
|
||||
}
|
||||
if (result.pass.length > 0) {
|
||||
outcome = deleteModal.open(scope, result.pass.map(getEntity), context).then(createResult);
|
||||
}
|
||||
return outcome;
|
||||
}
|
||||
|
||||
function createResult(deleteModalResult) {
|
||||
// To make the result of this action generically useful, reformat the return
|
||||
// from the deleteModal into a standard form
|
||||
var result = actionResult.getActionResult();
|
||||
deleteModalResult.pass.forEach(function markDeleted(item) {
|
||||
result.deleted(resourceType, getEntity(item).id);
|
||||
});
|
||||
deleteModalResult.fail.forEach(function markFailed(item) {
|
||||
result.failed(resourceType, getEntity(item).id);
|
||||
});
|
||||
if(result.result.failed.length == 0 && result.result.deleted.length > 0){
|
||||
$location.path('/project/container/containers');
|
||||
}else{
|
||||
return result.result;
|
||||
}
|
||||
}
|
||||
|
||||
function getMessage(message, entities) {
|
||||
return interpolate(message, [entities.map(getName).join(", ")]);
|
||||
}
|
||||
|
||||
function getName(result) {
|
||||
return getEntity(result).name;
|
||||
}
|
||||
|
||||
// for batch delete
|
||||
function getEntity(result) {
|
||||
return result.context;
|
||||
}
|
||||
|
||||
// call delete REST API
|
||||
function deleteEntity(id){
|
||||
return zun.deleteContainerForce(id, true);
|
||||
}
|
||||
}
|
||||
})();
|
@ -33,6 +33,7 @@
|
||||
getContainers: getContainers,
|
||||
deleteContainer: deleteContainer,
|
||||
deleteContainers: deleteContainers,
|
||||
deleteContainerForce: deleteContainerForce,
|
||||
startContainer: startContainer,
|
||||
stopContainer: stopContainer,
|
||||
logsContainer: logsContainer,
|
||||
@ -78,6 +79,14 @@
|
||||
return apiService.delete(containersPath, ids).error(error(msg));
|
||||
}
|
||||
|
||||
function deleteContainerForce(id, suppressError) {
|
||||
var promise = apiService.delete(containersPath + id, [id]);
|
||||
return suppressError ? promise : promise.error(function() {
|
||||
var msg = gettext('Unable to delete forcely the Container with id: %(id)s');
|
||||
toastService.add('error', interpolate(msg, { id: id }, true));
|
||||
});
|
||||
}
|
||||
|
||||
function startContainer(id) {
|
||||
var msg = gettext('Unable to start Container.');
|
||||
return apiService.post(containersPath + id + '/start').error(error(msg));
|
||||
|
Loading…
x
Reference in New Issue
Block a user