[Engine-patches] Change in ovirt-engine[master]: core: AddDiskCommand - added disk can never be a disk snapshot

[laravot]

Liron Ar has uploaded a new change for review.

Change subject: core: AddDiskCommand - added disk can never be a disk snapshot
......................................................................

core: AddDiskCommand - added disk can never be a disk snapshot

When adding a disk the added disk can never be a disk snapshot,
Currently when adding DiskImages the disk's Image object is "active"
member has a default value of false, which leads to wrongly treat that
disk as a disk snapshot through validations rather than a regular added
disk.

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


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/95/24395/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java
index 10e3ca1..6daa301 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java
@@ -74,6 +74,10 @@
 
     public AddDiskCommand(T parameters) {
         super(parameters);
+        Disk diskInfo = getParameters().getDiskInfo();
+        if (diskInfo.getDiskStorageType() == DiskStorageType.IMAGE) {
+            ((DiskImage) parameters.getDiskInfo()).setDiskSnapshot(false);
+        }
     }
 
     @Override
diff --git 
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImage.java
 
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImage.java
index 3719d13..e0fbdfc 100644
--- 
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImage.java
+++ 
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImage.java
@@ -72,6 +72,10 @@
         return !getActive();
     }
 
+    public void setDiskSnapshot(boolean diskSnapshot) {
+        setActive(!diskSnapshot);
+    }
+
     @JsonIgnore
     public Guid getSnapshotId() {
         return isDiskSnapshot() ? getVmSnapshotId() : null;


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

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