Martin Peřina has uploaded a new change for review. Change subject: core: Add VdsSpmIdMapDAO.get(storagePoolId, vdsId) ......................................................................
core: Add VdsSpmIdMapDAO.get(storagePoolId, vdsId) Adds method to get SPM host id for specific storage pool (data center) and vds. Change-Id: Ic590281545123788ce62c740901c69de0ed00c33 Bug-Url: https://bugzilla.redhat.com/1090799 Signed-off-by: Martin Perina <mper...@redhat.com> --- M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsSpmIdMapDAO.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsSpmIdMapDAODbFacadeImpl.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsSpmIdMapDAOTest.java M packaging/dbscripts/vds_spm_id_map_sp.sql 4 files changed, 49 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/37/30937/1 diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsSpmIdMapDAO.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsSpmIdMapDAO.java index 7423ccb..e76f92f 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsSpmIdMapDAO.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsSpmIdMapDAO.java @@ -10,7 +10,7 @@ */ public interface VdsSpmIdMapDAO extends GenericDao<vds_spm_id_map, Guid> { /** - * Gets the map for a given storage pool and vds id + * Gets the map for a given storage pool and vds spm id * * @param storagePoolId storage pool id * @param spmId vds spm id @@ -19,6 +19,15 @@ vds_spm_id_map get(Guid storagePoolId, int spmId); /** + * Gets the map for a given storage pool and vds id + * + * @param storagePoolId storage pool id + * @param vdsId vds id + * @return vds_spm_id_map + */ + vds_spm_id_map get(Guid storagePoolId, Guid vdsId); + + /** * Gets all maps for a given storage pool. * * @param storagePoolId storage pool id. diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsSpmIdMapDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsSpmIdMapDAODbFacadeImpl.java index a61fc62..0268bdf 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsSpmIdMapDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsSpmIdMapDAODbFacadeImpl.java @@ -68,6 +68,18 @@ } @Override + public vds_spm_id_map get(Guid storagePoolId, Guid vdsId ) { + MapSqlParameterSource parameterSource = getCustomMapSqlParameterSource() + .addValue("storage_pool_id", storagePoolId) + .addValue("vds_id", vdsId); + return getCallsHandler().executeRead( + "Getvds_spm_id_mapBystorage_pool_idAndvds_id", + VdsSpmIdMapRowMapper.instance, + parameterSource + ); + } + + @Override public List<vds_spm_id_map> getAll() { throw new NotImplementedException(); } diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsSpmIdMapDAOTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsSpmIdMapDAOTest.java index 696c553..845d2e5 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsSpmIdMapDAOTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsSpmIdMapDAOTest.java @@ -80,7 +80,7 @@ } @Test - public void testGetVdsSpmIdMapForStoragePoolAndVdsId() { + public void testGetVdsSpmIdMapForStoragePoolAndVdsSpmId() { vds_spm_id_map result = dao.get(existingVdsSpmIdMap.getstorage_pool_id(), existingVdsSpmIdMap.getvds_spm_id()); @@ -88,4 +88,14 @@ assertNotNull(result); assertEquals(existingVdsSpmIdMap, result); } + + @Test + public void testGetVdsSpmIdMapForStoragePoolAndVdsId() { + vds_spm_id_map result = + dao.get(existingVdsSpmIdMap.getstorage_pool_id(), + existingVdsSpmIdMap.getId()); + + assertNotNull(result); + assertEquals(existingVdsSpmIdMap, result); + } } diff --git a/packaging/dbscripts/vds_spm_id_map_sp.sql b/packaging/dbscripts/vds_spm_id_map_sp.sql index 211506f..474f2ea 100644 --- a/packaging/dbscripts/vds_spm_id_map_sp.sql +++ b/packaging/dbscripts/vds_spm_id_map_sp.sql @@ -107,3 +107,19 @@ LANGUAGE plpgsql; + + + +CREATE OR REPLACE FUNCTION Getvds_spm_id_mapBystorage_pool_idAndvds_id ( + v_storage_pool_id UUID, + v_vds_id UUID +) RETURNS SETOF vds_spm_id_map STABLE +AS $procedure$ +BEGIN +RETURN QUERY SELECT vds_spm_id_map.* + FROM vds_spm_id_map + WHERE storage_pool_id = v_storage_pool_id AND vds_id = v_vds_id; + +END; $procedure$ +LANGUAGE plpgsql; + -- To view, visit http://gerrit.ovirt.org/30937 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic590281545123788ce62c740901c69de0ed00c33 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <mper...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
