Change in ovirt-engine[master]: core: Move SCSI reservation indication to DiskVmElement
tnisan at redhat.com
tnisan at redhat.com
Mon Oct 31 16:23:56 UTC 2016
Tal Nisan has submitted this change and it was merged.
Change subject: core: Move SCSI reservation indication to DiskVmElement
......................................................................
core: Move SCSI reservation indication to DiskVmElement
As the indication to whether a disk uses SCSI reservation is relevant to
disks and not all the other types of devices it should be moved from
VmDevice to DiskVmElement.
Aside for that the fact that the LunDisk entity contains that indication
is plain wrong and redundant and thus removed.
Additionally a test was added to MigrateVmCommand which is the most
important command regarding the SCSI reservation
Bug-Url: https://bugzilla.redhat.com/1362152
Change-Id: I3e70748464637720edc2d023becd8d8bcf648ce1
Signed-off-by: Tal Nisan <tnisan at redhat.com>
---
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/storage/disk/AddDiskCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/UpdateVmDiskCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmDeviceUtils.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/DiskValidator.java
A backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MigrateVmCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/AddDiskCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/VmValidatorTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/storage/DiskValidatorTest.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDevice.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/DiskVmElement.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/LunDisk.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskDaoImpl.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskVmElementDaoImpl.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDeviceDaoImpl.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DiskVmElementDaoTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmDeviceDaoTest.java
M backend/manager/modules/dal/src/test/resources/fixtures.xml
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/v3/helpers/V3VmHelper.java
M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/DiskAttachmentMapper.java
M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/DiskMapper.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/EditDiskModel.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ReadOnlyDiskModel.java
M packaging/dbscripts/create_views.sql
M packaging/dbscripts/disk_vm_element_sp.sql
A packaging/dbscripts/upgrade/04_01_0380_move_scsi_reservation_to_disk_vm_element.sql
M packaging/dbscripts/vm_device_sp.sql
30 files changed, 211 insertions(+), 174 deletions(-)
Approvals:
Tal Nisan: Verified; Passed CI tests
Allon Mureinik: Looks good to me, approved
Idan Shaby: Looks good to me, but someone else must approve
--
To view, visit https://gerrit.ovirt.org/65711
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3e70748464637720edc2d023becd8d8bcf648ce1
Gerrit-PatchSet: 10
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tal Nisan <tnisan at redhat.com>
Gerrit-Reviewer: Ala Hino <ahino at redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini at redhat.com>
Gerrit-Reviewer: Freddy Rolland <frolland at redhat.com>
Gerrit-Reviewer: Idan Shaby <ishaby at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Tal Nisan <tnisan at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>
More information about the Engine-commits
mailing list