Allon Mureinik has uploaded a new change for review. Change subject: core: Move saveIsInitialized to VmDao ......................................................................
core: Move saveIsInitialized to VmDao Moved saveIsInitialized(vmId, isInitialized) from DbFacade to VmDao, where it belongs. Change-Id: Id4cea34ec7306b64f99c9a46a78d11083a91eb20 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacade.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAO.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAODbFacadeImpl.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmDAOTest.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/CreateVmVDSCommand.java 6 files changed, 46 insertions(+), 41 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/99/11899/1 diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacade.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacade.java index 83b915f..0e00401 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacade.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacade.java @@ -18,8 +18,11 @@ import org.ovirt.engine.core.common.businessentities.Image; import org.ovirt.engine.core.common.businessentities.Role; import org.ovirt.engine.core.common.businessentities.Snapshot; +import org.ovirt.engine.core.common.businessentities.StorageDomainDynamic; +import org.ovirt.engine.core.common.businessentities.StorageDomainStatic; import org.ovirt.engine.core.common.businessentities.StorageDomainStatus; import org.ovirt.engine.core.common.businessentities.StorageDomainType; +import org.ovirt.engine.core.common.businessentities.StoragePoolIsoMap; import org.ovirt.engine.core.common.businessentities.VdsDynamic; import org.ovirt.engine.core.common.businessentities.VdsStatic; import org.ovirt.engine.core.common.businessentities.VdsStatistics; @@ -30,11 +33,8 @@ import org.ovirt.engine.core.common.businessentities.VmTemplate; import org.ovirt.engine.core.common.businessentities.image_storage_domain_map; import org.ovirt.engine.core.common.businessentities.permissions; -import org.ovirt.engine.core.common.businessentities.StorageDomainDynamic; -import org.ovirt.engine.core.common.businessentities.StorageDomainStatic; import org.ovirt.engine.core.common.businessentities.storage_domains; import org.ovirt.engine.core.common.businessentities.storage_pool; -import org.ovirt.engine.core.common.businessentities.StoragePoolIsoMap; import org.ovirt.engine.core.common.businessentities.vds_spm_id_map; import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; @@ -214,14 +214,6 @@ private CustomMapSqlParameterSource getCustomMapSqlParameterSource() { return new CustomMapSqlParameterSource(dbEngineDialect); - } - - public void SaveIsInitialized(Guid vmid, boolean isInitialized) { - MapSqlParameterSource parameterSource = getCustomMapSqlParameterSource().addValue("vm_guid", vmid).addValue( - "is_initialized", isInitialized); - - new SimpleJdbcCall(jdbcTemplate).withProcedureName("UpdateIsInitialized") - .execute(parameterSource); } // tags_vm_map diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAO.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAO.java index c45edad..2b65863 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAO.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAO.java @@ -197,6 +197,15 @@ void save(VM vm); /** + * Saves the is_initialized property of the VM. + * + * @param vmid + * The VM's ID + * @param isInitialized + * Whether or not the VM is initialized. + */ + void saveIsInitialized(Guid vmid, boolean isInitialized); + /** * Removes the VM with the specified id. * * @param vm diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAODbFacadeImpl.java index 5daa663..5d6e7c9 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAODbFacadeImpl.java @@ -237,6 +237,14 @@ } @Override + public void saveIsInitialized(Guid vmid, boolean isInitialized) { + getCallsHandler().executeModification("UpdateIsInitialized", + getCustomMapSqlParameterSource() + .addValue("vm_guid", vmid) + .addValue("is_initialized", isInitialized)); + } + + @Override public void remove(Guid id) { getCallsHandler().executeModification("DeleteVm", getCustomMapSqlParameterSource() .addValue("vm_guid", id)); diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java index d2b50a9..53ad1c3 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java @@ -20,25 +20,25 @@ import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.businessentities.ActionGroup; import org.ovirt.engine.core.common.businessentities.BaseDisk; +import org.ovirt.engine.core.common.businessentities.Bookmark; import org.ovirt.engine.core.common.businessentities.DbUser; import org.ovirt.engine.core.common.businessentities.MigrationSupport; import org.ovirt.engine.core.common.businessentities.Quota; import org.ovirt.engine.core.common.businessentities.Role; import org.ovirt.engine.core.common.businessentities.RoleType; import org.ovirt.engine.core.common.businessentities.StorageDomainStatus; +import org.ovirt.engine.core.common.businessentities.StoragePoolIsoMap; import org.ovirt.engine.core.common.businessentities.StoragePoolIsoMapId; import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.VMStatus; import org.ovirt.engine.core.common.businessentities.VdsStatic; +import org.ovirt.engine.core.common.businessentities.VmPool; import org.ovirt.engine.core.common.businessentities.VmStatic; import org.ovirt.engine.core.common.businessentities.VmTemplate; -import org.ovirt.engine.core.common.businessentities.Bookmark; import org.ovirt.engine.core.common.businessentities.permissions; import org.ovirt.engine.core.common.businessentities.storage_domains; import org.ovirt.engine.core.common.businessentities.storage_pool; -import org.ovirt.engine.core.common.businessentities.StoragePoolIsoMap; import org.ovirt.engine.core.common.businessentities.tags; -import org.ovirt.engine.core.common.businessentities.VmPool; import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.compat.Guid; @@ -258,10 +258,10 @@ vmStaticArray = vmStatics.toArray(vmStaticArray); // initialize the VMs with equal settings: non HA, priority 1 and MIGRATABLE - for (int i = 0; i < vmStaticArray.length; i++) { - vmStaticArray[i].setAutoStartup(false); - vmStaticArray[i].setPriority(1); - vmStaticArray[i].setMigrationSupport(MigrationSupport.MIGRATABLE); + for (VmStatic element : vmStaticArray) { + element.setAutoStartup(false); + element.setPriority(1); + element.setMigrationSupport(MigrationSupport.MIGRATABLE); } // set higher migration support value for the first VM @@ -334,8 +334,8 @@ * Updates the given array of vmStatics in the Database */ private void updateArrayOfVmStaticsInDb(VmStatic[] vmStaticArray) { - for (int i = 0; i < vmStaticArray.length; i++) { - dbFacade.getVmStaticDao().update(vmStaticArray[i]); + for (VmStatic element : vmStaticArray) { + dbFacade.getVmStaticDao().update(element); } } @@ -501,26 +501,6 @@ assertNotNull(network); String name = network.getName(); assertTrue(name.equals(dbFacade.getEntityNameByIdAndType(NETWORK_ID, VdcObjectType.Network))); - } - - @Test - public void testSaveIsInitialized(){ - // The vm starts out as initialized - VmStatic vmStaticForTest = dbFacade.getVmStaticDao().get(VM_STATIC_GUID); - assertNotNull(vmStaticForTest); - assertTrue(vmStaticForTest.isInitialized()); - - // Change it into uninitialized and make sure that the change succeeded - dbFacade.SaveIsInitialized(vmStaticForTest.getId(), !INITIALIZED); - vmStaticForTest = dbFacade.getVmStaticDao().get(VM_STATIC_GUID); - assertNotNull(vmStaticForTest); - assertFalse(vmStaticForTest.isInitialized()); - - // Change it back to initialized and make sure that the change succeeded - dbFacade.SaveIsInitialized(vmStaticForTest.getId(), INITIALIZED); - vmStaticForTest = dbFacade.getVmStaticDao().get(VM_STATIC_GUID); - assertNotNull(vmStaticForTest); - assertTrue(vmStaticForTest.isInitialized()); } @Test diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmDAOTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmDAOTest.java index 044c82a..72d60c8 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmDAOTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmDAOTest.java @@ -395,4 +395,20 @@ assertNotNull(result); assertEquals("wrong number of VMs attached to pool", 2, result.size()); } + + @Test + public void testSaveIsInitialized() { + Guid vmId = existingVm.getId(); + boolean origInitialized = existingVm.isInitialized(); + + // Switch is_initialized + dao.saveIsInitialized(vmId, !origInitialized); + VM updatedVm = dao.get(vmId); + assertEquals("VM's is_initiazlied was not updated", !origInitialized, updatedVm.isInitialized()); + + // Switch it back, just to make sure + dao.saveIsInitialized(vmId, origInitialized); + updatedVm = dao.get(vmId); + assertEquals("VM's is_initiazlied was not updated", origInitialized, updatedVm.isInitialized()); + } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/CreateVmVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/CreateVmVDSCommand.java index 1bdd9b8..2076e57 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/CreateVmVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/CreateVmVDSCommand.java @@ -169,7 +169,7 @@ new TransactionMethod<Void>() { @Override public Void runInTransaction() { - DbFacade.getInstance().SaveIsInitialized(vmId, true); + DbFacade.getInstance().getVmDao().saveIsInitialized(vmId, true); return null; } }); -- To view, visit http://gerrit.ovirt.org/11899 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id4cea34ec7306b64f99c9a46a78d11083a91eb20 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
