Vered Volansky has uploaded a new change for review. Change subject: core: changed method call for readability ......................................................................
core: changed method call for readability In LiveMigrateVmDisksCommand, changed calls to parameters.getStorageDomainId to paramaters.getTargetStorageDomainId for readability. The latter's impelementation only calls the former. Change-Id: Id1c95635d602094a7d5babb532f4e79038c43039 Signed-off-by: Vered Volansky <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/63/28963/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 2c935e6..94c5f90 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 @@ -150,7 +150,7 @@ VdcObjectType.Disk, ActionGroup.CONFIGURE_DISK_STORAGE)); } - permissionList.add(new PermissionSubject(parameters.getStorageDomainId(), + permissionList.add(new PermissionSubject(parameters.getTargetStorageDomainId(), VdcObjectType.Storage, ActionGroup.CREATE_DISK)); } @@ -256,7 +256,7 @@ parameters.getQuotaId(), null, QuotaConsumptionParameter.QuotaAction.CONSUME, - parameters.getStorageDomainId(), + parameters.getTargetStorageDomainId(), (double) diskImage.getSizeInGigabytes())); if (diskImage.getQuotaId() != null && !Guid.Empty.equals(diskImage.getQuotaId())) { @@ -283,7 +283,7 @@ for (LiveMigrateDiskParameters parameters : getParameters().getParametersList()) { getReturnValue().setCanDoAction(isDiskNotShareable(parameters.getImageId()) && isDiskSnapshotNotPluggedToOtherVmsThatAreNotDown(parameters.getImageId()) - && isTemplateInDestStorageDomain(parameters.getImageId(), parameters.getStorageDomainId()) + && isTemplateInDestStorageDomain(parameters.getImageId(), parameters.getTargetStorageDomainId()) && performStorageDomainsChecks(parameters) && isSameSourceAndDest(parameters)); @@ -297,7 +297,7 @@ private boolean performStorageDomainsChecks(LiveMigrateDiskParameters parameters) { StorageDomain sourceDomain = getImageSourceDomain(parameters.getImageId()); - StorageDomain destDomain = getStorageDomainById(parameters.getStorageDomainId(), getStoragePoolId()); + StorageDomain destDomain = getStorageDomainById(parameters.getTargetStorageDomainId(), getStoragePoolId()); return validateSourceStorageDomain(sourceDomain) && validateDestStorage(destDomain) @@ -334,7 +334,7 @@ private boolean isSameSourceAndDest(LiveMigrateDiskParameters parameters) { StorageDomain sourceDomain = getImageSourceDomain(parameters.getImageId()); - if (sourceDomain.getId().equals(parameters.getStorageDomainId())) { + if (sourceDomain.getId().equals(parameters.getTargetStorageDomainId())) { return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_SOURCE_AND_TARGET_SAME); } @@ -384,7 +384,7 @@ Map<Guid, List<DiskImage>> storageDomainsImagesMap = new HashMap<Guid, List<DiskImage>>(); for (LiveMigrateDiskParameters parameters : getParameters().getParametersList()) { - MultiValueMapUtils.addToMap(parameters.getStorageDomainId(), + MultiValueMapUtils.addToMap(parameters.getTargetStorageDomainId(), getDiskImageByImageId(parameters.getImageId()), storageDomainsImagesMap); } -- To view, visit http://gerrit.ovirt.org/28963 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id1c95635d602094a7d5babb532f4e79038c43039 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Vered Volansky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
