Arik Hadas has uploaded a new change for review. Change subject: core: remove compatibility version from IrsBaseVDSCommandParameters ......................................................................
core: remove compatibility version from IrsBaseVDSCommandParameters The IrsBaseVDSCommandParameters class had a compatibility version field that was really used only by UpgradeStoragePoolVDSCommand, thus it is moved to UpgradeStoragePoolVDSCommandParameters. This patch also contains other kinds of minor refactoring: 1. move field declarations to the beginning of the classes 2. remove 'private' prefix from field names Change-Id: I785e868a1a192af5e5722c5c4562870c69c96b9c Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CopyImageGroupCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateCloneOfTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateImageTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateSnapshotCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveTemplateSnapshotCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreFromSnapshotCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/CreateImagePlaceholderTaskHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/VmReplicateDiskFinishTaskHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/LiveSnapshotMemoryImageBuilder.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryImageRemover.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CopyImageVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateImageVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateSnapshotVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DeleteImageGroupVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DestroyImageVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/IrsBaseVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MergeSnapshotsVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MoveImageGroupVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UpgradeStoragePoolVDSCommandParameters.java 25 files changed, 69 insertions(+), 99 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/10/16710/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java index 3e5fcb4..15b1564 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java @@ -83,8 +83,7 @@ new CreateImageVDSCommandParameters(getParameters().getStoragePoolId(), getParameters() .getStorageDomainId(), getImageGroupId(), getParameters().getDiskInfo().getSize(), getParameters().getDiskInfo().getVolumeType(), getParameters().getDiskInfo() - .getVolumeFormat(), getDestinationImageId(), "", getStoragePool() - .getcompatibility_version().toString())); + .getVolumeFormat(), getDestinationImageId(), "")); if (vdsReturnValue.getSucceeded()) { getParameters().setVdsmTaskIds(new ArrayList<Guid>()); getParameters().getVdsmTaskIds().add( diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java index 45e7724..80df197 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java @@ -1698,10 +1698,10 @@ taskIdAsList); // call revert task only if ended successfully if (tasksStatuses.get(0).getTaskEndedSuccessfully()) { - SPMTaskGuidBaseVDSCommandParameters tempVar = new SPMTaskGuidBaseVDSCommandParameters( - getStoragePool().getId(), taskId); - tempVar.setCompatibilityVersion(getStoragePool().getcompatibility_version().toString()); - getBackend().getResourceManager().RunVdsCommand(VDSCommandType.SPMRevertTask, tempVar); + getBackend().getResourceManager().RunVdsCommand( + VDSCommandType.SPMRevertTask, + new SPMTaskGuidBaseVDSCommandParameters( + getStoragePool().getId(), taskId)); } taskIdAsList.clear(); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CopyImageGroupCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CopyImageGroupCommand.java index 343f4be..265a80d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CopyImageGroupCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CopyImageGroupCommand.java @@ -78,8 +78,7 @@ .getVolumeType(), isWipeAfterDelete(), getParameters() - .getForceOverride(), - getStoragePool().getcompatibility_version().toString())); + .getForceOverride())); } else { vdsReturnValue = runVdsCommand( VDSCommandType.MoveImageGroup, @@ -93,8 +92,7 @@ getParameters().getContainerId(), ImageOperation.Copy, isWipeAfterDelete(), - getParameters().getForceOverride(), - getStoragePool().getcompatibility_version().toString())); + getParameters().getForceOverride())); } if (vdsReturnValue.getSucceeded()) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateCloneOfTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateCloneOfTemplateCommand.java index c73e037..8ee8da3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateCloneOfTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateCloneOfTemplateCommand.java @@ -60,12 +60,11 @@ .RunVdsCommand( VDSCommandType.CopyImage, new CopyImageVDSCommandParameters(storagePoolID, getDiskImage().getStorageIds().get(0), - getVmTemplateId(), getDiskImage().getimage_group_id(), getImage() - .getImageId(), mNewCreatedDiskImage.getimage_group_id(), getDestinationImageId(), - "", getDestinationStorageDomainId(), - CopyVolumeType.LeafVol, mNewCreatedDiskImage.getVolumeFormat(), - mNewCreatedDiskImage.getVolumeType(), getDiskImage().isWipeAfterDelete(), - false, getStoragePool().getcompatibility_version().toString())); + getVmTemplateId(), getDiskImage().getimage_group_id(), getImage().getImageId(), + mNewCreatedDiskImage.getimage_group_id(), getDestinationImageId(), + "", getDestinationStorageDomainId(), CopyVolumeType.LeafVol, + mNewCreatedDiskImage.getVolumeFormat(), mNewCreatedDiskImage.getVolumeType(), + getDiskImage().isWipeAfterDelete(), false)); if (vdsReturnValue.getSucceeded()) { getReturnValue().getInternalVdsmTaskIdList().add( diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateImageTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateImageTemplateCommand.java index 414521b..ac066e8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateImageTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateImageTemplateCommand.java @@ -65,8 +65,7 @@ getDestinationImageId(), StringUtils.defaultString(newImage.getDescription()), getParameters() .getDestinationStorageDomainId(), CopyVolumeType.SharedVol, newImage .getVolumeFormat(), newImage.getVolumeType(), getDiskImage() - .isWipeAfterDelete(), false, getStoragePool().getcompatibility_version() - .toString())); + .isWipeAfterDelete(), false)); getReturnValue().getInternalVdsmTaskIdList().add( createTask(taskId, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateSnapshotCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateSnapshotCommand.java index 5c377a0..fbf6a1f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateSnapshotCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateSnapshotCommand.java @@ -110,8 +110,7 @@ mNewCreatedDiskImage.getVolumeFormat(), getDiskImage().getimage_group_id(), getDestinationImageId(), - "", - getStoragePool().getcompatibility_version().toString())); + "")); if (vdsReturnValue.getSucceeded()) { getParameters().setVdsmTaskIds(new java.util.ArrayList<Guid>()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java index 265f008..034a058 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java @@ -135,8 +135,7 @@ getMemoryVolumeType(), VolumeFormat.RAW, hiberVol1, - "", - getStoragePool().getcompatibility_version().toString())); + "")); if (!ret1.getSucceeded()) { return; @@ -177,9 +176,7 @@ VolumeType.Sparse, VolumeFormat.COW, hiberVol2, - "", - getStoragePool().getcompatibility_version() - .toString())); + "")); if (!ret2.getSucceeded()) { return; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java index 502324f..2dbb35c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java @@ -316,12 +316,10 @@ getDiskImage().setImageStatus(ImageStatus.ILLEGAL); lockImageWithCompensation(); } - VDSReturnValue returnValue = runVdsCommand(VDSCommandType.DeleteImageGroup, + return runVdsCommand(VDSCommandType.DeleteImageGroup, new DeleteImageGroupVDSCommandParameters(getDiskImage().getStoragePoolId(), getStorageDomainId(), getDiskImage().getId(), - getDiskImage().isWipeAfterDelete(), getParameters() - .getForceDelete(), getStoragePool().getcompatibility_version().toString())); - return returnValue; + getDiskImage().isWipeAfterDelete(), getParameters().getForceDelete())); } protected VmDeviceDAO getVmDeviceDAO() { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskCommand.java index dd1c814..790b22a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskCommand.java @@ -42,8 +42,7 @@ VDSCommandType.MergeSnapshots, new MergeSnapshotsVDSCommandParameters(storagePoolId, storageDomainId, getVmId(), imageGroupId, getDiskImage().getImageId(), getDestinationDiskImage().getImageId(), - getDiskImage().isWipeAfterDelete(), getStoragePool().getcompatibility_version() - .toString())); + getDiskImage().isWipeAfterDelete())); if (vdsReturnValue != null && vdsReturnValue.getCreationInfo() != null) { getReturnValue().getInternalVdsmTaskIdList().add( diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveTemplateSnapshotCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveTemplateSnapshotCommand.java index e7e7325..eedfd92 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveTemplateSnapshotCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveTemplateSnapshotCommand.java @@ -29,7 +29,7 @@ VDSCommandType.DeleteImageGroup, new DeleteImageGroupVDSCommandParameters(getParameters().getStoragePoolId(), getParameters() .getStorageDomainId(), getParameters().getImageGroupID(), getParameters() - .getWipeAfterDelete(), false, getStoragePool().getcompatibility_version().toString())); + .getWipeAfterDelete(), false)); if (vdsReturnValue.getSucceeded()) { getReturnValue().getInternalVdsmTaskIdList().add( diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreFromSnapshotCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreFromSnapshotCommand.java index 99a9504..b5efbe6 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreFromSnapshotCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreFromSnapshotCommand.java @@ -102,8 +102,7 @@ vdsReturnValue = runVdsCommand( VDSCommandType.DestroyImage, new DestroyImageVDSCommandParameters(storagePoolId, storageDomainId, imageGroupId, - _imagesToDelete, getDiskImage().isWipeAfterDelete(), true, getStoragePool() - .getcompatibility_version().toString())); + _imagesToDelete, getDiskImage().isWipeAfterDelete(), true)); if (vdsReturnValue.getSucceeded()) { getReturnValue().getInternalVdsmTaskIdList().add( diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java index 3c683ed..5a5bf94 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java @@ -281,8 +281,8 @@ // the next 'DeleteImageGroup' command should also take care of the image removal: VDSReturnValue vdsRetValue = runVdsCommand( VDSCommandType.DeleteImageGroup, - new DeleteImageGroupVDSCommandParameters(guids.get(1), guids.get(0), guids.get(2), - postZero, false, getVm().getVdsGroupCompatibilityVersion().toString())); + new DeleteImageGroupVDSCommandParameters(guids.get(1), + guids.get(0), guids.get(2), postZero, false)); if (!vdsRetValue.getSucceeded()) { return false; @@ -297,8 +297,8 @@ // the next 'DeleteImageGroup' command should also take care of the image removal: vdsRetValue = runVdsCommand( VDSCommandType.DeleteImageGroup, - new DeleteImageGroupVDSCommandParameters(guids.get(1), guids.get(0), guids.get(4), - postZero, false, getVm().getVdsGroupCompatibilityVersion().toString())); + new DeleteImageGroupVDSCommandParameters(guids.get(1), + guids.get(0), guids.get(4), postZero, false)); if (!vdsRetValue.getSucceeded()) { if (startPollingTasks) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/CreateImagePlaceholderTaskHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/CreateImagePlaceholderTaskHandler.java index dfa03fa..2810672 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/CreateImagePlaceholderTaskHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/CreateImagePlaceholderTaskHandler.java @@ -88,7 +88,6 @@ .getDiskImageDao() .get(getEnclosingCommand().getParameters().getDestinationImageId()) .isWipeAfterDelete(), - getEnclosingCommand().getParameters().getForceDelete(), - null); + getEnclosingCommand().getParameters().getForceDelete()); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/VmReplicateDiskFinishTaskHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/VmReplicateDiskFinishTaskHandler.java index 0647a51..af1478b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/VmReplicateDiskFinishTaskHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/VmReplicateDiskFinishTaskHandler.java @@ -143,8 +143,7 @@ .getDiskImageDao() .get(getEnclosingCommand().getParameters().getDestinationImageId()) .isWipeAfterDelete(), - getEnclosingCommand().getParameters().getForceDelete(), - null); + getEnclosingCommand().getParameters().getForceDelete()); } @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/LiveSnapshotMemoryImageBuilder.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/LiveSnapshotMemoryImageBuilder.java index 52f2570..da40077 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/LiveSnapshotMemoryImageBuilder.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/LiveSnapshotMemoryImageBuilder.java @@ -63,8 +63,7 @@ VolumeType.Sparse, VolumeFormat.COW, vmConfVolumeId, - "", - storagePool.getcompatibility_version().toString())); + "")); if (!retVal.getSucceeded()) { throw new VdcBLLException(VdcBllErrors.VolumeCreationError, @@ -94,8 +93,7 @@ HibernateVmCommand.getMemoryVolumeTypeForPool(storagePool.getStorageType()), VolumeFormat.RAW, memoryDumpVolumeId, - "", - storagePool.getcompatibility_version().toString())); + "")); if (!retVal.getSucceeded()) { throw new VdcBLLException(VdcBllErrors.VolumeCreationError, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryImageRemover.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryImageRemover.java index 3e3412a..a72725a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryImageRemover.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryImageRemover.java @@ -80,8 +80,7 @@ .RunVdsCommand( VDSCommandType.DeleteImageGroup, new DeleteImageGroupVDSCommandParameters(guids.get(1), guids.get(0), - guids.get(2), postZero, false, - vm.getVdsGroupCompatibilityVersion().toString())); + guids.get(2), postZero, false)); if (!vdsRetValue.getSucceeded()) { return false; @@ -102,8 +101,7 @@ .RunVdsCommand( VDSCommandType.DeleteImageGroup, new DeleteImageGroupVDSCommandParameters(guids.get(1), guids.get(0), - guids.get(4), postZero, false, - vm.getVdsGroupCompatibilityVersion().toString())); + guids.get(4), postZero, false)); if (!vdsRetValue.getSucceeded()) { if (startPollingTasks) { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CopyImageVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CopyImageVDSCommandParameters.java index 4d27053..3ca2c42 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CopyImageVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CopyImageVDSCommandParameters.java @@ -9,7 +9,7 @@ public CopyImageVDSCommandParameters(Guid storagePoolId, Guid storageDomainId, Guid vmId, Guid imageGroupId, Guid srcImageId, Guid dstImageGroupId, Guid dstVolUUID, String description, Guid dstStorageDomainId, CopyVolumeType copyVolumeType, VolumeFormat volumeFormat, VolumeType preallocate, boolean postZero, - boolean force, String compatibilityVersion) { + boolean force) { super(storagePoolId, storageDomainId, imageGroupId, srcImageId); this.setdstImageGroupId(dstImageGroupId); setVmId(vmId); @@ -21,7 +21,6 @@ setCopyVolumeType(copyVolumeType); setVolumeFormat(volumeFormat); setPreallocate(preallocate); - setCompatibilityVersion(compatibilityVersion); } private Guid privatedstImageGroupId = Guid.Empty; diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateImageVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateImageVDSCommandParameters.java index eda48df..8b10c0f 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateImageVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateImageVDSCommandParameters.java @@ -7,14 +7,13 @@ public class CreateImageVDSCommandParameters extends StoragePoolDomainAndGroupIdBaseVDSCommandParameters { public CreateImageVDSCommandParameters(Guid storagePoolId, Guid storageDomainId, Guid imageGroupId, long imageSizeInBytes, VolumeType imageType, VolumeFormat volFormat, Guid newImageId, - String newImageDescription, String competabilityVersion) { + String newImageDescription) { super(storagePoolId, storageDomainId, imageGroupId); _imageSizeInBytes = imageSizeInBytes; _imageType = imageType; this.setVolumeFormat(volFormat); setNewImageID(newImageId); setNewImageDescription(newImageDescription); - setCompatibilityVersion(competabilityVersion); } private long _imageSizeInBytes; diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateSnapshotVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateSnapshotVDSCommandParameters.java index e9ac469..758141d 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateSnapshotVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateSnapshotVDSCommandParameters.java @@ -7,9 +7,9 @@ public class CreateSnapshotVDSCommandParameters extends CreateImageVDSCommandParameters { public CreateSnapshotVDSCommandParameters(Guid storagePoolId, Guid storageDomainId, Guid imageGroupId, Guid imageId, long imgSizeInBytes, VolumeType imageType, VolumeFormat volFormat, - Guid sourceImageGroupId, Guid newImageId, String newImageDescription, String competabilityVersion) { + Guid sourceImageGroupId, Guid newImageId, String newImageDescription) { super(storagePoolId, storageDomainId, imageGroupId, imgSizeInBytes, imageType, volFormat, newImageId, - newImageDescription, competabilityVersion); + newImageDescription); _imageId = imageId; setSourceImageGroupId(sourceImageGroupId); } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DeleteImageGroupVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DeleteImageGroupVDSCommandParameters.java index b4a427b..354448d 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DeleteImageGroupVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DeleteImageGroupVDSCommandParameters.java @@ -3,35 +3,32 @@ import org.ovirt.engine.core.compat.Guid; public class DeleteImageGroupVDSCommandParameters extends StoragePoolDomainAndGroupIdBaseVDSCommandParameters { - public DeleteImageGroupVDSCommandParameters(Guid storagePoolId, Guid storageDomainId, Guid imageGroupId, - boolean postZeros, boolean force, String competabilityVersion) { + private boolean postZeros; + private boolean forceDelete; + + public DeleteImageGroupVDSCommandParameters(Guid storagePoolId, + Guid storageDomainId, Guid imageGroupId, boolean postZeros, boolean force) { super(storagePoolId, storageDomainId, imageGroupId); setPostZeros(postZeros); setForceDelete(force); - setCompatibilityVersion(competabilityVersion); } - private boolean privatePostZeros; + public DeleteImageGroupVDSCommandParameters() { } public boolean getPostZeros() { - return privatePostZeros; + return postZeros; } protected void setPostZeros(boolean value) { - privatePostZeros = value; + postZeros = value; } - private boolean privateForceDelete; - public boolean getForceDelete() { - return privateForceDelete; + return forceDelete; } public void setForceDelete(boolean value) { - privateForceDelete = value; - } - - public DeleteImageGroupVDSCommandParameters() { + forceDelete = value; } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DestroyImageVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DestroyImageVDSCommandParameters.java index 4a511ea..8487c2b 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DestroyImageVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DestroyImageVDSCommandParameters.java @@ -6,12 +6,11 @@ public class DestroyImageVDSCommandParameters extends AllStorageAndImageIdVDSCommandParametersBase { public DestroyImageVDSCommandParameters(Guid storagePoolId, Guid storageDomainId, Guid imageGroupId, - ArrayList<Guid> imageList, boolean postZero, boolean force, String compatibilityVersion) { + ArrayList<Guid> imageList, boolean postZero, boolean force) { super(storagePoolId, storageDomainId, imageGroupId, Guid.Empty); setPostZero(postZero); setImageList(imageList); setForce(force); - setCompatibilityVersion(compatibilityVersion); } private ArrayList<Guid> privateImageList; diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/IrsBaseVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/IrsBaseVDSCommandParameters.java index b574fc4..2b43fef 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/IrsBaseVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/IrsBaseVDSCommandParameters.java @@ -3,46 +3,34 @@ import org.ovirt.engine.core.compat.Guid; public class IrsBaseVDSCommandParameters extends VDSParametersBase { + private Guid storagePoolId = Guid.Empty; + private boolean ignoreFailoverLimit; + public IrsBaseVDSCommandParameters(Guid storagePoolId) { setStoragePoolId(storagePoolId); } - private Guid privateStoragePoolId = Guid.Empty; + public IrsBaseVDSCommandParameters() { } public Guid getStoragePoolId() { - return privateStoragePoolId; + return storagePoolId; } public void setStoragePoolId(Guid value) { - privateStoragePoolId = value; + storagePoolId = value; } - private boolean privateIgnoreFailoverLimit; - public boolean getIgnoreFailoverLimit() { - return privateIgnoreFailoverLimit; + return ignoreFailoverLimit; } public void setIgnoreFailoverLimit(boolean value) { - privateIgnoreFailoverLimit = value; - } - - private String privateCompatibilityVersion; - - public String getCompatibilityVersion() { - return privateCompatibilityVersion; - } - - public void setCompatibilityVersion(String value) { - privateCompatibilityVersion = value; - } - - public IrsBaseVDSCommandParameters() { + ignoreFailoverLimit = value; } @Override public String toString() { - return String.format("storagePoolId = %s, ignoreFailoverLimit = %s, compatabilityVersion = %s", - getStoragePoolId(), getIgnoreFailoverLimit(), getCompatibilityVersion()); + return String.format("storagePoolId = %s, ignoreFailoverLimit = %s", + getStoragePoolId(), getIgnoreFailoverLimit()); } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MergeSnapshotsVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MergeSnapshotsVDSCommandParameters.java index c3f4b8f..0c34b09 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MergeSnapshotsVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MergeSnapshotsVDSCommandParameters.java @@ -5,13 +5,12 @@ public class MergeSnapshotsVDSCommandParameters extends AllStorageAndImageIdVDSCommandParametersBase { private Guid _imageId2 = Guid.Empty; - public MergeSnapshotsVDSCommandParameters(Guid storagePoolId, Guid storageDomainId, Guid vmId, Guid imageGroupId, - Guid imageId, Guid imageId2, boolean postZero, String compatibilityVersion) { + public MergeSnapshotsVDSCommandParameters(Guid storagePoolId, Guid storageDomainId, + Guid vmId, Guid imageGroupId, Guid imageId, Guid imageId2, boolean postZero) { super(storagePoolId, storageDomainId, imageGroupId, imageId); _imageId2 = imageId2; setVmId(vmId); setPostZero(postZero); - setCompatibilityVersion(compatibilityVersion); } public Guid getImageId2() { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MoveImageGroupVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MoveImageGroupVDSCommandParameters.java index d2f7fc1..ac1ffa9 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MoveImageGroupVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MoveImageGroupVDSCommandParameters.java @@ -25,14 +25,12 @@ } public MoveImageGroupVDSCommandParameters(Guid storagePoolId, Guid storageDomainId, Guid imageGroupId, - Guid dstStorageDomainId, Guid vmId, ImageOperation op, boolean postZero, boolean force, - String compatibilityVersion) { + Guid dstStorageDomainId, Guid vmId, ImageOperation op, boolean postZero, boolean force) { super(storagePoolId, storageDomainId, imageGroupId, dstStorageDomainId); setVmId(vmId); setOp(op); setPostZero(postZero); setForce(force); - setCompatibilityVersion(compatibilityVersion); } private boolean privatePostZero; diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UpgradeStoragePoolVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UpgradeStoragePoolVDSCommandParameters.java index ac400de..f991d09 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UpgradeStoragePoolVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UpgradeStoragePoolVDSCommandParameters.java @@ -4,6 +4,8 @@ import org.ovirt.engine.core.compat.Guid; public class UpgradeStoragePoolVDSCommandParameters extends IrsBaseVDSCommandParameters { + private String compatibilityVersion; + public UpgradeStoragePoolVDSCommandParameters(Guid storagePoolId, StorageFormatType compatibilityVersion) { super(storagePoolId); setCompatibilityVersion(compatibilityVersion.getValue()); @@ -11,6 +13,14 @@ public UpgradeStoragePoolVDSCommandParameters() {} + public String getCompatibilityVersion() { + return compatibilityVersion; + } + + public void setCompatibilityVersion(String value) { + compatibilityVersion = value; + } + @Override public String toString() { return String.format("storagePoolId = %s, poolVersion = %s", -- To view, visit http://gerrit.ovirt.org/16710 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I785e868a1a192af5e5722c5c4562870c69c96b9c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
