ofri masad has uploaded a new change for review. Change subject: core: Quota refactor - AddVmTemplate, CreateAllSnapshotsFromVm ......................................................................
core: Quota refactor - AddVmTemplate, CreateAllSnapshotsFromVm Changed implementation of CreateAllSnapshotsFromVmCommand Changed implementation of AddVmTemplateCommand Change-Id: Iccf665977fd82db4056a5a77d889b5e274071901 Signed-off-by: Ofri Masad <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java 1 file changed, 11 insertions(+), 38 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/99/8999/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java index cb7443d..80dd5ee 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java @@ -8,11 +8,11 @@ import org.apache.commons.lang.exception.ExceptionUtils; import org.ovirt.engine.core.bll.job.ExecutionHandler; -import org.ovirt.engine.core.bll.quota.Quotable; -import org.ovirt.engine.core.bll.quota.StorageQuotaValidationParameter; +import org.ovirt.engine.core.bll.quota.QuotaConsumptionParameter; +import org.ovirt.engine.core.bll.quota.QuotaStorageDependent; +import org.ovirt.engine.core.bll.quota.QuotaStorageConsumptionParameter; import org.ovirt.engine.core.bll.snapshots.SnapshotsManager; import org.ovirt.engine.core.bll.snapshots.SnapshotsValidator; -import org.ovirt.engine.core.bll.utils.PermissionSubject; import org.ovirt.engine.core.bll.validator.VmValidator; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.VdcObjectType; @@ -44,7 +44,7 @@ @DisableInPrepareMode @LockIdNameAttribute -public class CreateAllSnapshotsFromVmCommand<T extends CreateAllSnapshotsFromVmParameters> extends VmCommand<T> implements Quotable { +public class CreateAllSnapshotsFromVmCommand<T extends CreateAllSnapshotsFromVmParameters> extends VmCommand<T> implements QuotaStorageDependent{ private static final long serialVersionUID = -2407757772735253053L; List<DiskImage> selectedActiveDisks; @@ -290,44 +290,17 @@ } @Override - public boolean validateAndSetQuota() { - if (isInternalExecution()) { - return true; - } - return getQuotaManager().validateAndSetStorageQuota(getStoragePool(), - getStorageQuotaListParameters(), - getReturnValue().getCanDoActionMessages()); - } - - @Override - public void rollbackQuota() { - if (isInternalExecution()) { - return; - } - getQuotaManager().rollbackQuota(getStoragePool(), - getQuotaManager().getQuotaListFromParameters(getStorageQuotaListParameters())); - } - - private List<StorageQuotaValidationParameter> getStorageQuotaListParameters() { - List<StorageQuotaValidationParameter> list = new ArrayList<StorageQuotaValidationParameter>(); + public List<QuotaStorageConsumptionParameter> getQuotaStorageConsumptionParameters() { + List<QuotaStorageConsumptionParameter> list = new ArrayList<QuotaStorageConsumptionParameter>(); for (DiskImage disk : getDisksList()) { - list.add(new StorageQuotaValidationParameter(disk.getQuotaId() != null ? disk.getQuotaId() - : getVm().getQuotaId(), - //TODO: shared disk? + list.add(new QuotaStorageConsumptionParameter( + disk.getQuotaId(), + null, + QuotaConsumptionParameter.QuotaAction.CONSUME, disk.getstorage_ids().get(0), disk.getActualSize())); } + return list; } - - @Override - public Guid getQuotaId() { - return null; - } - - @Override - public void addQuotaPermissionSubject(List<PermissionSubject> quotaPermissionList) { - // no need to check permissions for snapshots, it is inherited from the disk - } - } -- To view, visit http://gerrit.ovirt.org/8999 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iccf665977fd82db4056a5a77d889b5e274071901 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: ofri masad <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
