Arik Hadas has uploaded a new change for review. Change subject: core: remove VmPoolDAO#getVmPoolMapByVmGuid ......................................................................
core: remove VmPoolDAO#getVmPoolMapByVmGuid There is no need for this method since the VM object includes the VM's pool id. Change-Id: I67314513ed9cece3df937271c547c7286c2dd5a4 Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmToPoolCommand.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/RemoveVmFromPoolCommand.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAO.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAODbFacadeImpl.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmPoolDAOTest.java M packaging/dbscripts/vm_pool_maps_sp.sql 7 files changed, 12 insertions(+), 58 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/65/28865/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmToPoolCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmToPoolCommand.java index 4af0ca6..a77c196 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmToPoolCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmToPoolCommand.java @@ -19,7 +19,7 @@ return failCanDoAction(VdcBllMessages.VM_POOL_CANNOT_ADD_RUNNING_VM_TO_POOL); } - if (getVmPoolDAO().getVmPoolMapByVmGuid(getParameters().getVmId()) != null) { + if (getVm().getVmPoolId() != null) { return failCanDoAction(VdcBllMessages.VM_POOL_CANNOT_ADD_VM_ATTACHED_TO_POOL); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java index e3a9ef5..99530b2 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java @@ -263,7 +263,7 @@ DbFacade.getInstance().getSnapshotDao().exists(getVmId(), SnapshotType.STATELESS)) { return failCanDoAction(VdcBllMessages.VM_CANNOT_SUSPEND_STATELESS_VM); } - if (DbFacade.getInstance().getVmPoolDao().getVmPoolMapByVmGuid(getVmId()) != null) { + if (getVm().getVmPoolId() != null) { return failCanDoAction(VdcBllMessages.VM_CANNOT_SUSPEND_VM_FROM_POOL); } if (getStorageDomainId().equals(Guid.Empty)) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromPoolCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromPoolCommand.java index 2798ce3..a5fbd3e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromPoolCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromPoolCommand.java @@ -2,16 +2,14 @@ import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.action.RemoveVmFromPoolParameters; -import org.ovirt.engine.core.common.businessentities.VmPoolMap; import org.ovirt.engine.core.common.errors.VdcBllMessages; public class RemoveVmFromPoolCommand<T extends RemoveVmFromPoolParameters> extends VmPoolCommandBase<T> { public RemoveVmFromPoolCommand(T parameters) { super(parameters); setVmId(parameters.getVmId()); - VmPoolMap map = getVmPoolDAO().getVmPoolMapByVmGuid(parameters.getVmId()); - if (map != null) { - setVmPoolId(map.getvm_pool_id()); + if (getVm() != null) { + setVmPoolId(getVm().getVmPoolId()); } } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAO.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAO.java index 11df144..59db164 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAO.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAO.java @@ -92,8 +92,6 @@ */ void remove(Guid vmPool); - VmPoolMap getVmPoolMapByVmGuid(Guid vmId); - void addVmToPool(VmPoolMap map); List<VmPoolMap> getVmPoolsMapByVmPoolId(Guid vmPoolId); diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAODbFacadeImpl.java index 4af2c91..b02f583 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAODbFacadeImpl.java @@ -116,13 +116,6 @@ } @Override - public VmPoolMap getVmPoolMapByVmGuid(Guid vmId) { - MapSqlParameterSource parameterSource = getCustomMapSqlParameterSource().addValue("vm_guid", vmId); - - return getCallsHandler().executeRead("GetVm_pool_mapByvm_guid", VmPoolMapRowMapper.instance, parameterSource); - } - - @Override public void addVmToPool(VmPoolMap map) { MapSqlParameterSource parameterSource = getCustomMapSqlParameterSource().addValue("vm_guid", map.getvm_guid()) .addValue("vm_pool_id", map.getvm_pool_id()); diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmPoolDAOTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmPoolDAOTest.java index 8a531f0..a5bfc8c 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmPoolDAOTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmPoolDAOTest.java @@ -11,8 +11,8 @@ import org.junit.Test; import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.VMStatus; -import org.ovirt.engine.core.common.businessentities.VmPoolMap; import org.ovirt.engine.core.common.businessentities.VmPool; +import org.ovirt.engine.core.common.businessentities.VmPoolMap; import org.ovirt.engine.core.compat.Guid; public class VmPoolDAOTest extends BaseDAOTestCase { @@ -28,13 +28,14 @@ private VmPool deletableVmPool; private VmPool newVmPool; private VmPoolMap newVmPoolMap; - private VmPoolMap existingVmPoolMap; + private VmDAO vmDao; @Override public void setUp() throws Exception { super.setUp(); dao = dbFacade.getVmPoolDao(); + vmDao = dbFacade.getVmDao(); existingVmPool = dao.get(EXISTING_VM_POOL_ID); deletableVmPool = dao.get(DELETABLE_VM_POOL_ID); @@ -44,24 +45,16 @@ newVmPool.setVmPoolDescription("This is a new VM pool."); newVmPool.setVdsGroupId(VDS_GROUP_ID); - existingVmPoolMap = dao.getVmPoolMapByVmGuid(new Guid("77296e00-0cad-4e5a-9299-008a7b6f4355")); - newVmPoolMap = - new VmPoolMap(FREE_VM_ID, existingVmPool.getVmPoolId()); + newVmPoolMap = new VmPoolMap(FREE_VM_ID, new Guid("77296e00-0cad-4e5a-9299-008a7b6f4355")); } @Test public void testRemoveVmFromPool() { - int before = dao.getVmPoolsMapByVmPoolId(existingVmPoolMap.getvm_pool_id()).size(); + assertNotNull(vmDao.get(EXISTING_VM_ID).getVmPoolId()); dao.removeVmFromVmPool(EXISTING_VM_ID); - int after = dao.getVmPoolsMapByVmPoolId(existingVmPoolMap.getvm_pool_id()).size(); - - assertEquals(before - 1, after); - - VmPoolMap result = dao.getVmPoolMapByVmGuid(EXISTING_VM_ID); - - assertNull(result); + assertNull(vmDao.get(EXISTING_VM_ID).getVmPoolId()); } /** @@ -205,27 +198,12 @@ } @Test - public void testGetVmPoolMap() { - VmPoolMap result = dao.getVmPoolMapByVmGuid(EXISTING_VM_ID); - - assertNotNull(result); - assertEquals(existingVmPoolMap, result); - } - - @Test public void testAddVmToPool() { - int before = dao.getVmPoolsMapByVmPoolId(newVmPoolMap.getvm_pool_id()).size(); + assertNull(vmDao.get(FREE_VM_ID).getVmPoolId()); dao.addVmToPool(newVmPoolMap); - int after = dao.getVmPoolsMapByVmPoolId(newVmPoolMap.getvm_pool_id()).size(); - - assertEquals(before + 1, after); - - VmPoolMap result = dao.getVmPoolMapByVmGuid(newVmPoolMap.getvm_guid()); - - assertNotNull(result); - assertEquals(newVmPoolMap, result); + assertNotNull(vmDao.get(FREE_VM_ID).getVmPoolId()); } @Test diff --git a/packaging/dbscripts/vm_pool_maps_sp.sql b/packaging/dbscripts/vm_pool_maps_sp.sql index 2cce0ca..7f6f417 100644 --- a/packaging/dbscripts/vm_pool_maps_sp.sql +++ b/packaging/dbscripts/vm_pool_maps_sp.sql @@ -68,19 +68,6 @@ -Create or replace FUNCTION GetVm_pool_mapByvm_guid(v_vm_guid UUID) RETURNS SETOF vm_pool_map STABLE - AS $procedure$ -BEGIN - RETURN QUERY SELECT vm_pool_map.* - FROM vm_pool_map - WHERE vm_guid = v_vm_guid; -END; $procedure$ -LANGUAGE plpgsql; - - - - - Create or replace FUNCTION GetVm_pool_mapByvm_pool_id(v_vm_pool_id UUID) RETURNS SETOF vm_pool_map STABLE AS $procedure$ BEGIN -- To view, visit http://gerrit.ovirt.org/28865 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I67314513ed9cece3df937271c547c7286c2dd5a4 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
