Gilad Chaplik has uploaded a new change for review. Change subject: core: quota permissions isn't enforce in add VM ......................................................................
core: quota permissions isn't enforce in add VM When creating a vm and its derivatives, a consume quota check should be performed. When running a VM there shouldn't be any quota permission check. Change-Id: I421ac8019cf16cc6f2a18ce6b4bcbcbf83397225 Bug-Url: https://bugzilla.redhat.com/1020201 Signed-off-by: Gilad Chaplik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java 2 files changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/74/20574/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java index a5b3399..aff8c00 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java @@ -1041,7 +1041,7 @@ if (consumptionParameters != null) { for (QuotaConsumptionParameter parameter : getQuotaConsumptionParameters()) { if (parameter.getQuotaGuid() != null && !Guid.Empty.equals(parameter.getQuotaGuid()) - && QuotaConsumptionParameter.QuotaAction.CONSUME.equals(parameter.getQuotaAction())) { + && !QuotaConsumptionParameter.QuotaAction.RELEASE.equals(parameter.getQuotaAction())) { quotaPermissionList.add(new PermissionSubject(parameter.getQuotaGuid(), VdcObjectType.Quota, ActionGroup.CONSUME_QUOTA, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java index 03a351d..7281d79 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java @@ -1051,6 +1051,10 @@ private static final Log log = LogFactory.getLog(RunVmCommand.class); @Override + public void addQuotaPermissionSubject(List<PermissionSubject> quotaPermissionList) { + } + + @Override public List<QuotaConsumptionParameter> getQuotaVdsConsumptionParameters() { List<QuotaConsumptionParameter> list = new ArrayList<QuotaConsumptionParameter>(); -- To view, visit http://gerrit.ovirt.org/20574 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I421ac8019cf16cc6f2a18ce6b4bcbcbf83397225 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Gilad Chaplik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
