[Engine-patches] Change in ovirt-engine[master]: Revert "MigrateVmDisks -get source domain by disk"

[vvolansk]

Vered Volansky has uploaded a new change for review.

Change subject: Revert "MigrateVmDisks -get source domain by disk"
......................................................................

Revert "MigrateVmDisks -get source domain by disk"

This reverts commit f083565c11d4029a7dc8e81c1aed5595268292eca.
Above commit breaks the build.

Change-Id: I6e94a8e163bd1218f562041930b722ed0280cc20
Signed-off-by: Vered Volansky <vvola...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java
1 file changed, 11 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/57/12157/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java
index 2643431..1da8ae2 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java
@@ -198,7 +198,7 @@
         for (LiveMigrateDiskParameters parameters : 
getParameters().getParametersList()) {
             
getReturnValue().setCanDoAction(isDiskNotShareable(parameters.getImageId())
                     && isTemplateInDestStorageDomain(parameters.getImageId(), 
parameters.getStorageDomainId())
-                    && validateSourceStorageDomain(parameters.getImageId())
+                    && validateSourceStorageDomain(parameters.getImageId(), 
parameters.getSourceStorageDomainId())
                     && validateDestStorage(parameters.getImageId(), 
parameters.getStorageDomainId()));
 
             if (!getReturnValue().getCanDoAction()) {
@@ -255,22 +255,24 @@
         return true;
     }
 
-    private boolean validateSourceStorageDomain(Guid imageId) {
-        DiskImage diskImage = getDiskImageById(imageId);
-        Guid domainId = diskImage.getStorageIds().get(0);
-        StorageDomainValidator validator = getValidator(domainId, 
getStoragePoolId().getValue());
+    private boolean validateSourceStorageDomain(Guid imageId, Guid 
sourceDomainId) {
+        StorageDomainValidator validator = getValidator(imageId, 
sourceDomainId);
 
         return validate(validator.isDomainExistAndActive());
     }
 
     private boolean validateDestStorage(Guid imageId, Guid destDomainId) {
-        StorageDomainValidator validator = getValidator(destDomainId, 
getStoragePoolId().getValue());
+        StorageDomainValidator validator = getValidator(imageId, destDomainId);
 
-        return validate(validator.isDomainExistAndActive()) && 
validate(validator.domainIsValidDestination());
+        return validateSourceStorageDomain(imageId, destDomainId)
+                && validate(validator.domainIsValidDestination());
     }
 
-    private StorageDomainValidator getValidator(Guid domainId, Guid 
storagePoolId) {
-        return new StorageDomainValidator(getStorageDomainById(domainId, 
storagePoolId));
+    private StorageDomainValidator getValidator(Guid imageId, Guid domainId) {
+        DiskImage diskImage = getDiskImageById(imageId);
+
+        return new StorageDomainValidator(
+                getStorageDomainById(domainId, 
diskImage.getStoragePoolId().getValue()));
     }
 
     protected boolean isValidSpaceRequirements() {


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

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