Liron Ar has uploaded a new change for review.

Change subject: core: RemoveVm - fill quota release parameters when needed
......................................................................

core: RemoveVm - fill quota release parameters when needed

If the vm disks aren't going to be removed, there's no need to create
quota release parameters.

Change-Id: I666091dbc64b03b9cf19b76f26a4afb8100b8373
Signed-off-by: Liron Aravot <[email protected]>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java
1 file changed, 6 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/58/20758/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java
index 3a12f99..f646f4f 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java
@@ -321,8 +321,9 @@
 
     @Override
     public List<QuotaConsumptionParameter> 
getQuotaStorageConsumptionParameters() {
-        List<QuotaConsumptionParameter> list = new ArrayList<>();
-        for (DiskImage disk : getVm().getDiskList()) {
+        if (getParameters().isRemoveDisks()) {
+            List<QuotaConsumptionParameter> list = new ArrayList<>();
+            for (DiskImage disk : getVm().getDiskList()) {
                 ImagesHandler.fillImagesBySnapshots(getVm());
                 for (DiskImage snapshot : disk.getSnapshots()) {
                     if (snapshot.getQuotaId() != null && 
!Guid.Empty.equals(snapshot.getQuotaId())) {
@@ -343,8 +344,10 @@
                         }
                     }
                 }
+            }
+            return list;
         }
-        return list;
+        return Collections.emptyList();
     }
 
     ///////////////////////////////////////


-- 
To view, visit http://gerrit.ovirt.org/20758
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I666091dbc64b03b9cf19b76f26a4afb8100b8373
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Liron Ar <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to