Allon Mureinik has submitted this change and it was merged. Change subject: core: relocate all disks related classes ...................................................................... core: relocate all disks related classes This patch is a part of a series of patches aimed to organize the org/ovirt/engine/core/bll/storage package. Specifically, it relocates all the disks related classes to org/ovirt/engine/core/bll/storage/disk and its sub packages: org/ovirt/engine/core/bll/storage/disk/cinder, org/ovirt/engine/core/bll/storage/disk/image and org/ovirt/engine/core/bll/storage/disk/lun. Change-Id: I6aeb31a8adb92aa103f941204332a77e4e8dadaa Signed-off-by: Idan Shaby <ishaby(a)redhat.com&gt; --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromScratchCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateFromSnapshotCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeFloppyCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CloneVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandsFactory.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUserVmsByUserIdAndGroupsQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmsRelatedToQuotaIdQuery.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/ImportVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmFromExternalProviderCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmTemplateImageTemplatesCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/CreateAllSnapshotsFromVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/CreateSnapshotCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/RemoveDiskSnapshotTaskHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/RemoveDiskSnapshotsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/RemoveSnapshotCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/RemoveSnapshotSingleDiskCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/RemoveSnapshotSingleDiskLiveCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/RemoveTemplateSnapshotCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/RestoreAllSnapshotsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/RestoreFromSnapshotCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotVmConfigurationHelper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotsManager.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/TryBackToAllSnapshotsOfVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/AbstractDiskVmCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/AddDiskCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/AttachDiskToVmCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/BaseGetAttachableDisksQuery.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/ChangeDiskCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/DetachDiskFromVmCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/GetAllAttachableDisksForVmQuery.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/GetAllDisksByVmIdQuery.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/GetAllDisksPartialDataByVmIdQuery.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/GetAllDisksQuery.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/GetDiskAlignmentCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/GetDiskByDiskIdQuery.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/GetFilteredAttachableDisksQuery.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/GetNextAvailableDiskAliasNameByVMIdQuery.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/GetVmTemplatesDisksQuery.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/HotPlugDiskToVmCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/HotUnPlugDiskFromVmCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/MoveDisksCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/MoveOrCopyDiskCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/RemoveDiskCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/UpdateVmDiskCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/AbstractCinderDiskCommandCallback.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/AddCinderDiskCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/AddCinderDiskCommandCallback.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/CinderBroker.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/CinderQueryBase.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/CloneCinderDisksCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/CloneCinderDisksCommandCallback.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/CloneSingleCinderDiskCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/CloneSingleCinderDiskCommandCallback.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/CreateCinderSnapshotCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/CreateCinderSnapshotCommandCallback.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/ExtendCinderDiskCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/ExtendCinderDiskCommandCallback.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/GetAllLibvirtSecretsByProviderIdQuery.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/GetCinderVolumeTypesByStorageDomainIdQuery.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/GetLibvirtSecretByIdQuery.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/GetUnregisteredCinderDiskByIdAndStorageDomainIdQuery.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/GetUnregisteredCinderDisksByStorageDomainIdQuery.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/RegisterCinderDiskCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/RemoveAllCinderDisksCommandCallBack.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/RemoveAllCinderSnapshotDisksCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/RemoveAllVmCinderDisksCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/RemoveCinderDiskCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/RemoveCinderDiskCommandCallback.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/RemoveCinderDiskVolumeCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/RemoveCinderDiskVolumeCommandCallback.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/RemoveCinderSnapshotCommandCallback.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/RemoveCinderSnapshotDiskCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/RestoreAllCinderSnapshotsCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/RestoreFromCinderSnapshotCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/RestoreFromCinderSnapshotCommandCallback.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/TryBackToAllCinderSnapshotsCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/TryBackToCinderSnapshotCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/AddImageFromScratchCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/BaseImagesCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/CopyImageGroupCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/CreateImageTemplateCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/DestroyImageCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/ExtendImageSizeCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/GetAllDisksByStorageDomainIdQuery.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/GetAllImageTypesQuery.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/GetAncestorImagesByImagesIdsQuery.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/GetUnregisteredDiskQuery.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/GetUnregisteredDisksQuery.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/ImageSpmCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/ImagesHandler.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/MetadataDiskDescriptionHandler.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/MoveImageGroupCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/RegisterDiskCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/RemoveAllVmImagesCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/RemoveImageCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/RetrieveImageDataCommand.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/lun/GetDeviceListQuery.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/lun/GetLunsByVgIdQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/GetStorageDomainsByVmTemplateIdQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/export/ExportVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/export/MoveOrCopyTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/export/RemoveVmFromImportExportCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/lsm/CreateImagePlaceholderTaskHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/lsm/LiveMigrateDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/lsm/LiveMigrateDisksTaskHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/lsm/LiveMigrateVmDisksCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/lsm/LiveSnapshotTaskHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/lsm/VmReplicateDiskFinishTaskHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ovfstore/OvfHelper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ovfstore/OvfUpdateProcessHelper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ovfstore/UploadStreamCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/repoimage/ExportRepoImageCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/repoimage/ImportRepoImageCopyTaskHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/repoimage/ImportRepoImageCreateTaskHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/ImportValidator.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/VmValidator.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/storage/DiskSnapshotsValidator.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RunVmCommandTest.java R backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/AddDiskCommandTest.java R backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/AttachDiskToVmCommandTest.java R backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/GetAllDisksByVmIdQueryTest.java R backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/GetDiskAlignmentCommandTest.java R backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/GetNextAvailableDiskAliasNameByVMIdQueryTest.java R backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/HotPlugDiskToVmCommandTest.java R backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/HotUnPlugDiskFromVmCommandTest.java R backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/MoveDisksCommandTest.java R backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/MoveOrCopyDiskCommandTest.java R backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/RemoveDiskCommandTest.java R backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/UpdateVmDiskCommandTest.java R backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/cinder/GetUnregisteredCinderDisksByStorageDomainIdQueryTest.java R backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/image/GetAncestorImagesByImagesIdsQueryTest.java R backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/image/GetUnregisteredDisksQueryTest.java R backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/image/ImagesHandlerTest.java R backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/image/MetadataDiskDescriptionHandlerTest.java R backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/image/RegisterDiskCommandTest.java R backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/image/RemoveImageCommandTest.java R backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/lun/GetDeviceListQueryTest.java R backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/lun/GetLunsByVgIdQueryTest.java 158 files changed, 325 insertions(+), 153 deletions(-) Approvals: Allon Mureinik: Verified; Looks good to me, approved; Passed CI tests -- To view, visit https://gerrit.ovirt.org/49484 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6aeb31a8adb92aa103f941204332a77e4e8dadaa Gerrit-PatchSet: 13 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Idan Shaby <ishaby(a)redhat.com&gt; Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com&gt; Gerrit-Reviewer: Freddy Rolland <frolland(a)redhat.com&gt; Gerrit-Reviewer: Idan Shaby <ishaby(a)redhat.com&gt; Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com&gt; Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;