Maor Lipchuk has uploaded a new change for review. Change subject: core: Get all unregisterd entities for Storage Domain ......................................................................
core: Get all unregisterd entities for Storage Domain When entity type is NULL, fetch all the unregistered entities Change-Id: I1fa749c309381a9f034dc8e6ea499740c33f8990 Related to Bug-Url: https://bugzilla.redhat.com/1138114 Signed-off-by: Maor Lipchuk <mlipc...@redhat.com> --- M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/UnregisteredOVFDataDAODbFacadeImpl.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/UnregisteredOVFDataDAOTest.java M packaging/dbscripts/unregistered_OVF_data_sp.sql 3 files changed, 19 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/98/33098/1 diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/UnregisteredOVFDataDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/UnregisteredOVFDataDAODbFacadeImpl.java index 6598b56..e1e6acd 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/UnregisteredOVFDataDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/UnregisteredOVFDataDAODbFacadeImpl.java @@ -19,7 +19,7 @@ OvfEntityDataRowMapper.instance, getCustomMapSqlParameterSource() .addValue("storage_domain_id", storageDomainId) - .addValue("entity_type", entityType.name())); + .addValue("entity_type", entityType != null ? entityType.name() : null)); } @Override diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/UnregisteredOVFDataDAOTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/UnregisteredOVFDataDAOTest.java index e892cc1..7c55930 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/UnregisteredOVFDataDAOTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/UnregisteredOVFDataDAOTest.java @@ -1,5 +1,6 @@ package org.ovirt.engine.core.dao; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; @@ -64,6 +65,22 @@ } @Test + public void testGetAllEntitiesForStorageDomain() { + List<OvfEntityData> ovfEntityDataList = + dao.getAllForStorageDomainByEntityType(FixturesTool.STORAGE_DOAMIN_NFS2_1, null); + assertEquals("A Template and a VM should be fetched for the specified storage domain", + 2, + ovfEntityDataList.size()); + } + + @Test + public void testGetAllEntitiesForStorageDomainWithNoUnregisteredEntities() { + List<OvfEntityData> ovfEntityDataList = + dao.getAllForStorageDomainByEntityType(FixturesTool.STORAGE_DOAMIN_NFS2_2, null); + assertTrue("No entities should be fetched for the specified storage domain", ovfEntityDataList.isEmpty()); + } + + @Test public void testGetTemplatesForNotRelatedStorageDomain() { List<OvfEntityData> ovfEntityDataList = dao.getAllForStorageDomainByEntityType(FixturesTool.STORAGE_DOAMIN_NFS2_2, VmEntityType.TEMPLATE); diff --git a/packaging/dbscripts/unregistered_OVF_data_sp.sql b/packaging/dbscripts/unregistered_OVF_data_sp.sql index aa159b4..c56afc0 100644 --- a/packaging/dbscripts/unregistered_OVF_data_sp.sql +++ b/packaging/dbscripts/unregistered_OVF_data_sp.sql @@ -41,7 +41,7 @@ RETURN QUERY SELECT * FROM unregistered_ovf_of_entities WHERE storage_domain_id = v_storage_domain_id - AND entity_type = v_entity_type; + AND (entity_type = v_entity_type OR v_entity_type IS NULL); END; $procedure$ LANGUAGE plpgsql; -- To view, visit http://gerrit.ovirt.org/33098 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1fa749c309381a9f034dc8e6ea499740c33f8990 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Maor Lipchuk <mlipc...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
