[Engine-patches] Change in ovirt-engine[master]: core : don't remove disk from snapshots if the whole vm is r...

[laravot]

Liron Aravot has uploaded a new change for review.

Change subject: core : don't remove disk from snapshots if the whole vm is 
removed
......................................................................

core : don't remove disk from snapshots if the whole vm is removed

in case that we remove all vm disks (happens in case that we remove the
whole vm), there's no need to update the vm snapshots ovf files as they
will be removed anyway.

Change-Id: I56d803224d498617ade875d705ccc8fb848274c8
Signed-off-by: Liron Aravot <lara...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmImagesCommand.java
M 
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RemoveImageParameters.java
2 files changed, 11 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/06/7606/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmImagesCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmImagesCommand.java
index 7e61a0b..6524306 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmImagesCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmImagesCommand.java
@@ -57,6 +57,7 @@
                 tempVar.setEntityId(getParameters().getEntityId());
                 tempVar.setForceDelete(getParameters().getForceDelete());
                 tempVar.setParentParemeters(getParameters());
+                tempVar.setRemoveFromSnapshots(false);
                 VdcReturnValueBase vdcReturnValue =
                         
Backend.getInstance().runInternalAction(VdcActionType.RemoveImage,
                                 tempVar,
diff --git 
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RemoveImageParameters.java
 
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RemoveImageParameters.java
index b96c039..ca93ea5 100644
--- 
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RemoveImageParameters.java
+++ 
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RemoveImageParameters.java
@@ -8,11 +8,13 @@
 
     private DiskImage diskImage;
     private boolean removeFromDB;
+    private boolean removeFromSnapshots;
 
     public RemoveImageParameters(Guid imageId) {
         super(imageId, null);
         setForceDelete(false);
         removeFromDB = false;
+        removeFromSnapshots = true;
     }
 
     public RemoveImageParameters() {
@@ -26,6 +28,14 @@
         diskImage = value;
     }
 
+    public boolean getRemoveFromSnapshots() {
+        return removeFromSnapshots;
+    }
+
+    public void setRemoveFromSnapshots(boolean removeFromSnapshots) {
+        this.removeFromSnapshots = removeFromSnapshots;
+    }
+
     public void setRemoveFromDB(boolean removeFromDB) {
         this.removeFromDB = removeFromDB;
     }


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I56d803224d498617ade875d705ccc8fb848274c8
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Liron Aravot <lara...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches