Change in ovirt-engine[master]: core: Support floating lun in the DAO
Michael Kublin has submitted this change and it was merged.
Change subject: core: Support floating lun in the DAO
......................................................................
core: Support floating lun in the DAO
Before this patch DiskDAO would crash when attempting to read a floating
lun due to missing treatment for vm_entity_type.
Such a treatment existed in DiskImageDao, however.
This patch extarcts the AbstractBaseDiskRowMapper class, and changes
AbstractDiskRowMapper to handle Disks instead of BaseDisks.
Having done that, AbstractDiskRowMapper can now handle the entityType
field, so that both DiskImageRowMapper and LunDiskRowMapper that extend
it will get that functionality.
In addtition, this patch also adds a floating lun to the fixtures.xml to
test this functionality, and updates the other disks' tests accordingly.
Change-Id: Iec20c0092375cb1a7ee4b7b40f57e75d2c5cd13c
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
A
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AbstractBaseDiskRowMapper.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AbstractDiskRowMapper.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/BaseDiskDaoDbFacadeImpl.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskDaoDbFacadeImpl.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDAODbFacadeImpl.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDiskDaoTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DiskDaoTest.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DiskLunMapDaoTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/FixturesTool.java
M backend/manager/modules/dal/src/test/resources/fixtures.xml
10 files changed, 106 insertions(+), 49 deletions(-)
Approvals:
Michael Kublin: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/4466
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iec20c0092375cb1a7ee4b7b40f57e75d2c5cd13c
Gerrit-PatchSet: 10
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com>
Gerrit-Reviewer: Michael Kublin <mkublin(a)redhat.com>
Gerrit-Reviewer: Mike Kolesnik <mkolesni(a)redhat.com>