Laszlo Hornyak has uploaded a new change for review. Change subject: engine: VmTemplate cleanup (2/2) ......................................................................
engine: VmTemplate cleanup (2/2) - getters and setters renamed Change-Id: I3dcb9493953a7206dab16bf30aeec87a43358093 Signed-off-by: Laszlo Hornyak <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateFromImportExportCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetStorageDomainsByVmTemplateIdQuery.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommandTestAbstract.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/OvfDataUpdaterTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcActionUtils.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmTemplateDAODbFacadeImpl.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmTemplateDAOTest.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/TemplateMapper.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkTemplateListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateGeneralModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalTemplateListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UserPortalNewVmModelBehavior.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabTemplateView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkTemplateView.java 33 files changed, 72 insertions(+), 72 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/33/13433/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java index 7ce1273..af8e08a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java @@ -195,7 +195,7 @@ } protected Guid getStoragePoolIdFromSourceImageContainer() { - return getVmTemplate().getstorage_pool_id().getValue(); + return getVmTemplate().getStoragePoolId().getValue(); } protected int getNeededDiskSize(Guid domainId) { @@ -405,7 +405,7 @@ protected void fillImagesMapBasedOnTemplate() { ImagesHandler.fillImagesMapBasedOnTemplate(getVmTemplate(), - getStorageDomainDAO().getAllForStoragePool(getVmTemplate().getstorage_pool_id().getValue()), + getStorageDomainDAO().getAllForStoragePool(getVmTemplate().getStoragePoolId().getValue()), diskInfoDestinationMap, destStorages, false); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java index b4b20b4..fd236aa 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java @@ -303,7 +303,7 @@ } StorageDomain domain = destStorages.get(domainId); if (domain == null) { - domain = getStorageDomainDAO().getForStoragePool(domainId, getVmTemplate().getstorage_pool_id()); + domain = getStorageDomainDAO().getForStoragePool(domainId, getVmTemplate().getStoragePoolId()); } int numOfDisksOnDomain = 0; if (storageToDisksMap.containsKey(domainId)) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmTemplateCommand.java index 379c247..fa82cfb 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmTemplateCommand.java @@ -33,7 +33,7 @@ public ExportVmTemplateCommand(T parameters) { super(parameters); - setStoragePoolId(getVmTemplate().getstorage_pool_id()); + setStoragePoolId(getVmTemplate().getStoragePoolId()); } protected ExportVmTemplateCommand(Guid commandId) { @@ -132,7 +132,7 @@ // check if template (with no override option) if (retVal && !getParameters().getForceOverride()) { - retVal = !ExportVmCommand.CheckTemplateInStorageDomain(getVmTemplate().getstorage_pool_id().getValue(), + retVal = !ExportVmCommand.CheckTemplateInStorageDomain(getVmTemplate().getStoragePoolId().getValue(), getParameters().getStorageDomainId(), getVmTemplateId()); if (!retVal) { addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_NAME_ALREADY_USED); @@ -169,7 +169,7 @@ VmTemplateHandler.UpdateDisksFromDb(getVmTemplate()); // update the target (export) domain OvfDataUpdater.getInstance().buildMetadataDictionaryForTemplate(getVmTemplate(), metaDictionary); - OvfDataUpdater.getInstance().executeUpdateVmInSpmCommand(getVmTemplate().getstorage_pool_id().getValue(), + OvfDataUpdater.getInstance().executeUpdateVmInSpmCommand(getVmTemplate().getStoragePoolId().getValue(), metaDictionary, getParameters().getStorageDomainId()); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java index d7e31a0..1b54a1b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java @@ -67,7 +67,7 @@ List<StorageDomain> domains = DbFacade.getInstance() .getStorageDomainDao() - .getAllForStoragePool(template.getstorage_pool_id().getValue()); + .getAllForStoragePool(template.getStoragePoolId().getValue()); fillImagesMapBasedOnTemplate(template, domains, diskInfoDestinationMap, destStorages, notCheckSize); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java index ad9c9d0..be52769 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java @@ -310,7 +310,7 @@ if (!VmTemplateHandler.BlankVmTemplateId.equals(getVm().getVmtGuid()) && getVmTemplate() != null - && getVmTemplate().getstatus() == VmTemplateStatus.Locked) { + && getVmTemplate().getStatus() == VmTemplateStatus.Locked) { return failCanDoAction(VdcBllMessages.VM_TEMPLATE_IMAGE_IS_LOCKED); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java index ec0c265..01baca7 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java @@ -319,7 +319,7 @@ protected void addVmTemplateToDb() { getVmTemplate().setVdsGroupId(getParameters().getVdsGroupId()); - getVmTemplate().setstatus(VmTemplateStatus.Locked); + getVmTemplate().setStatus(VmTemplateStatus.Locked); getVmTemplate().setQuotaId(getParameters().getQuotaId()); VmHandler.updateImportedVmUsbPolicy(getVmTemplate()); DbFacade.getInstance().getVmTemplateDao().save(getVmTemplate()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java index 938989f..d53fce8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java @@ -114,7 +114,7 @@ && VmTemplateCommand.isVmTemplateImagesReady(getVmTemplate(), null, getReturnValue().getCanDoActionMessages(), true, true, true, false, getTemplateDisks()); if (retValue) { - setStoragePoolId(getVmTemplate().getstorage_pool_id()); + setStoragePoolId(getVmTemplate().getStoragePoolId()); retValue = checkStorageDomain() && checkStorageDomainStatus(StorageDomainStatus.Active) @@ -126,7 +126,7 @@ && DbFacade.getInstance() .getStoragePoolIsoMapDao() .get(new StoragePoolIsoMapId(getStorageDomain().getId(), - getVmTemplate().getstorage_pool_id().getValue())) == null) { + getVmTemplate().getStoragePoolId().getValue())) == null) { retValue = false; addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_POOL_NOT_MATCH); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java index fd6ed1c..dcad602 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java @@ -181,7 +181,7 @@ List<VmTemplate> templates = getVmTemplateDao().getVmTemplatesByIds(idsToProcess); for (VmTemplate template : templates) { - if (VmTemplateStatus.Locked != template.getstatus()) { + if (VmTemplateStatus.Locked != template.getStatus()) { updateTemplateDisksFromDb(template); boolean verifyDisksNotLocked = verifyDisksNotLocked(template.getDiskList()); if (verifyDisksNotLocked) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java index 9dbe45e..152f5f5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java @@ -174,7 +174,7 @@ private boolean canRemoveTemplateDisk() { boolean retValue = true; DiskImage diskImage = getDiskImage(); - if (getVmTemplate().getstatus() == VmTemplateStatus.Locked) { + if (getVmTemplate().getStatus() == VmTemplateStatus.Locked) { retValue = false; addCanDoActionMessage(VdcBllMessages.VM_TEMPLATE_IMAGE_IS_LOCKED); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java index 7cbc085..3778f89 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java @@ -45,7 +45,7 @@ super.setVmTemplateId(parameters.getVmTemplateId()); parameters.setEntityId(getVmTemplateId()); if (getVmTemplate() != null) { - setStoragePoolId(getVmTemplate().getstorage_pool_id()); + setStoragePoolId(getVmTemplate().getStoragePoolId()); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateFromImportExportCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateFromImportExportCommand.java index 90a329c..1da84c9 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateFromImportExportCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateFromImportExportCommand.java @@ -76,7 +76,7 @@ // VmTemplate is the one from export domain and not from database VmTemplate tmpl = DbFacade.getInstance().getVmTemplateDao().get(getVmTemplateId()); if (tmpl != null) { - retVal = (tmpl.getstatus() != VmTemplateStatus.Locked); + retVal = (tmpl.getStatus() != VmTemplateStatus.Locked); if (!retVal) { getReturnValue().getCanDoActionMessages() .add(VdcBllMessages.VM_TEMPLATE_IMAGE_IS_LOCKED.toString()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java index b346d20..06cc833 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java @@ -50,7 +50,7 @@ } if (mOldTemplate != null) { VmTemplateHandler.UpdateDisksFromDb(mOldTemplate); - if (mOldTemplate.getstatus() == VmTemplateStatus.Locked) { + if (mOldTemplate.getStatus() == VmTemplateStatus.Locked) { return failCanDoAction(VdcBllMessages.VM_TEMPLATE_IS_LOCKED); } if (!StringUtils.equals(mOldTemplate.getName(), getVmTemplate().getName()) diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java index 43b99b6..bee21b6 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java @@ -73,7 +73,7 @@ if (checkStorageDomain) { StorageDomainValidator storageDomainValidator = new StorageDomainValidator(DbFacade.getInstance().getStorageDomainDao().getForStoragePool( - storageDomainId, vmTemplate.getstorage_pool_id())); + storageDomainId, vmTemplate.getStoragePoolId())); ValidationResult res = storageDomainValidator.isDomainExistAndActive(); returnValue = res.isValid(); if (!returnValue) { @@ -95,7 +95,7 @@ } } if (returnValue && checkLocked) { - if (vmTemplate.getstatus() == VmTemplateStatus.Locked) { + if (vmTemplate.getStatus() == VmTemplateStatus.Locked) { returnValue = false; } else { if (vmtImages != null) { @@ -111,7 +111,7 @@ reasons.add(VdcBllMessages.VM_TEMPLATE_IMAGE_IS_LOCKED.toString()); } } - if (returnValue && checkIllegal && (vmTemplate.getstatus() == VmTemplateStatus.Illegal)) { + if (returnValue && checkIllegal && (vmTemplate.getStatus() == VmTemplateStatus.Illegal)) { returnValue = false; reasons.add(VdcBllMessages.VM_TEMPLATE_IMAGE_IS_ILLEGAL.toString()); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateHandler.java index af7dc25..0e2ef7e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateHandler.java @@ -104,9 +104,9 @@ VmTemplate vmTemplate = DbFacade.getInstance().getVmTemplateDao().get(vmTemplateGuid); if (vmTemplate != null) { if (compensationContext != null) { - compensationContext.snapshotEntityStatus(vmTemplate, vmTemplate.getstatus()); + compensationContext.snapshotEntityStatus(vmTemplate, vmTemplate.getStatus()); } - vmTemplate.setstatus(status); + vmTemplate.setStatus(status); DbFacade.getInstance().getVmTemplateDao().update(vmTemplate); } else { log.warnFormat( diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetStorageDomainsByVmTemplateIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetStorageDomainsByVmTemplateIdQuery.java index 9668f7d..0fac496 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetStorageDomainsByVmTemplateIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetStorageDomainsByVmTemplateIdQuery.java @@ -31,7 +31,7 @@ .get(getParameters().getId(), getUserID(), getParameters().isFiltered()); ArrayList<StorageDomain> result = new ArrayList<StorageDomain>(); - if (vmTemplate != null && vmTemplate.getstorage_pool_id() != null) { + if (vmTemplate != null && vmTemplate.getStoragePoolId() != null) { List<Disk> templateDisks = getTemplateDisks(); if (templateDisks.size() > 0) { @@ -55,6 +55,6 @@ protected StorageDomain getStorageDomain(Guid domainId) { return DbFacade.getInstance() .getStorageDomainDao() - .getForStoragePool(domainId, vmTemplate.getstorage_pool_id().getValue()); + .getForStoragePool(domainId, vmTemplate.getStoragePoolId().getValue()); } } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java index 83e015c..4adf184 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java @@ -388,7 +388,7 @@ private VmTemplate createVmTemplate() { if (vmTemplate == null) { vmTemplate = new VmTemplate(); - vmTemplate.setstorage_pool_id(STORAGE_POOL_ID); + vmTemplate.setStoragePoolId(STORAGE_POOL_ID); DiskImage image = createDiskImageTemplate(); vmTemplate.getDiskMap().put(image.getImageId(), image); Map<Guid, DiskImage> diskImageMap = new HashMap<Guid, DiskImage>(); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommandTestAbstract.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommandTestAbstract.java index 948f981..f23775c 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommandTestAbstract.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommandTestAbstract.java @@ -260,7 +260,7 @@ private VmTemplate mockVmTemplate() { VmTemplate template = new VmTemplate(); template.setId(vmTemplateId); - template.setstorage_pool_id(storagePoolId); + template.setStoragePoolId(storagePoolId); setDiskList(template); return template; diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/OvfDataUpdaterTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/OvfDataUpdaterTest.java index 715ca67..1c74f69 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/OvfDataUpdaterTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/OvfDataUpdaterTest.java @@ -271,7 +271,7 @@ private VmTemplate createVmTemplate(Guid id, VmTemplateStatus templateStatus) { VmTemplate template = new VmTemplate(); - template.setstatus(templateStatus); + template.setStatus(templateStatus); template.setDbGeneration(1L); template.setId(id); return template; diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcActionUtils.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcActionUtils.java index bbe8909..a0c58ef 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcActionUtils.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcActionUtils.java @@ -307,7 +307,7 @@ null); } else if (entity.getClass().getName().endsWith("VmTemplate")) { return (entity instanceof VmTemplate ? - ((VmTemplate) entity).getstatus() : + ((VmTemplate) entity).getStatus() : null); } else if (entity instanceof StorageDomain) { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java index 2e64591..e4465ed 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java @@ -97,30 +97,30 @@ this.childCount = childCount; setName(name); this.setNumOfMonitors(numOfMonitors); - this.setstatus(VmTemplateStatus.forValue(status)); + this.setStatus(VmTemplateStatus.forValue(status)); } - public int getchild_count() { + public int getChildCount() { return this.childCount; } - public void setchild_count(int value) { + public void setChildCount(int value) { this.childCount = value; } - public VmTemplateStatus getstatus() { + public VmTemplateStatus getStatus() { return status; } - public void setstatus(VmTemplateStatus value) { + public void setStatus(VmTemplateStatus value) { status = value; } - public String getvds_group_name() { + public String getVdsGroupName() { return vdsGroupName; } - public void setvds_group_name(String value) { + public void setVdsGroupName(String value) { vdsGroupName = value; } @@ -134,19 +134,19 @@ interfaces = value; } - public NGuid getstorage_pool_id() { + public NGuid getStoragePoolId() { return storagePoolId; } - public void setstorage_pool_id(NGuid value) { + public void setStoragePoolId(NGuid value) { storagePoolId = value; } - public String getstorage_pool_name() { + public String getStoragePoolName() { return storagePoolName; } - public void setstorage_pool_name(String value) { + public void setStoragePoolName(String value) { storagePoolName = value; } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmTemplateDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmTemplateDAODbFacadeImpl.java index bd6373e..90344c4 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmTemplateDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmTemplateDAODbFacadeImpl.java @@ -126,7 +126,7 @@ private MapSqlParameterSource getInsertOrUpdateParameters(VmTemplate template) { return getCustomMapSqlParameterSource() - .addValue("child_count", template.getchild_count()) + .addValue("child_count", template.getChildCount()) .addValue("creation_date", template.getCreationDate()) .addValue("description", template.getDescription()) .addValue("mem_size_mb", template.getMemSizeMb()) @@ -139,7 +139,7 @@ .addValue("domain", template.getDomain()) .addValue("num_of_monitors", template.getNumOfMonitors()) .addValue("allow_console_reconnect", template.isAllowConsoleReconnect()) - .addValue("status", template.getstatus()) + .addValue("status", template.getStatus()) .addValue("usb_policy", template.getUsbPolicy()) .addValue("time_zone", template.getTimeZone()) .addValue("fail_back", template.isFailBack()) @@ -212,7 +212,7 @@ map(rs, entity); entity.setId(Guid.createGuidFromString(rs.getString("vmt_guid"))); - entity.setchild_count(rs.getInt("child_count")); + entity.setChildCount(rs.getInt("child_count")); entity.setMemSizeMb(rs.getInt("mem_size_mb")); entity.setName(rs.getString("name")); entity.setOs(VmOsType.forValue(rs.getInt("os"))); @@ -220,10 +220,10 @@ entity.setDomain(rs.getString("domain")); entity.setNumOfMonitors(rs.getInt("num_of_monitors")); entity.setAllowConsoleReconnect(rs.getBoolean("allow_console_reconnect")); - entity.setstatus(VmTemplateStatus.forValue(rs.getInt("status"))); - entity.setvds_group_name(rs.getString("vds_group_name")); - entity.setstorage_pool_id(NGuid.createGuidFromString(rs.getString("storage_pool_id"))); - entity.setstorage_pool_name(rs.getString("storage_pool_name")); + entity.setStatus(VmTemplateStatus.forValue(rs.getInt("status"))); + entity.setVdsGroupName(rs.getString("vds_group_name")); + entity.setStoragePoolId(NGuid.createGuidFromString(rs.getString("storage_pool_id"))); + entity.setStoragePoolName(rs.getString("storage_pool_name")); entity.setDefaultDisplayType(DisplayType.forValue(rs.getInt("default_display_type"))); entity.setQuotaId(Guid.createGuidFromString(rs.getString("quota_id"))); entity.setQuotaName(rs.getString("quota_name")); diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmTemplateDAOTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmTemplateDAOTest.java index 7a62876..30437cc 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmTemplateDAOTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmTemplateDAOTest.java @@ -228,7 +228,7 @@ public void testUpdateStatus() { VmTemplate before = dao.get(existingTemplate.getId()); - before.setstatus(VmTemplateStatus.Locked); + before.setStatus(VmTemplateStatus.Locked); dao.updateStatus(existingTemplate.getId(), VmTemplateStatus.Locked); VmTemplate after = dao.get(existingTemplate.getId()); diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/TemplateMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/TemplateMapper.java index 4ab46fe..be36813 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/TemplateMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/TemplateMapper.java @@ -256,8 +256,8 @@ if (entity.getOrigin() != null) { model.setOrigin(VmMapper.map(entity.getOrigin(), null)); } - if (entity.getstatus() != null) { - model.setStatus(StatusUtils.create(map(entity.getstatus(), null))); + if (entity.getStatus() != null) { + model.setStatus(StatusUtils.create(map(entity.getStatus(), null))); } if (entity.getOs() != null || entity.getDefaultBootSequence() != null || diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java index 19c1771..b9b1872 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java @@ -349,8 +349,8 @@ private static VmTemplate CloneVmTemplate(VmTemplate instance) { VmTemplate obj = new VmTemplate(); - obj.setstorage_pool_id(instance.getstorage_pool_id()); - obj.setstorage_pool_name(instance.getstorage_pool_name()); + obj.setStoragePoolId(instance.getStoragePoolId()); + obj.setStoragePoolName(instance.getStoragePoolName()); obj.setDefaultDisplayType(instance.getDefaultDisplayType()); obj.setPriority(instance.getPriority()); obj.setIsoPath(instance.getIsoPath()); @@ -360,7 +360,7 @@ obj.setDiskImageMap(instance.getDiskImageMap()); obj.setInterfaces(instance.getInterfaces()); obj.setAutoStartup(instance.isAutoStartup()); - obj.setchild_count(instance.getchild_count()); + obj.setChildCount(instance.getChildCount()); obj.setCpuPerSocket(instance.getCpuPerSocket()); obj.setCreationDate(instance.getCreationDate()); obj.setDefaultBootSequence(instance.getDefaultBootSequence()); @@ -375,11 +375,11 @@ obj.setNumOfMonitors(instance.getNumOfMonitors()); obj.setAllowConsoleReconnect(instance.isAllowConsoleReconnect()); obj.setNumOfSockets(instance.getNumOfSockets()); - obj.setstatus(instance.getstatus()); + obj.setStatus(instance.getStatus()); obj.setTimeZone(instance.getTimeZone()); obj.setUsbPolicy(instance.getUsbPolicy()); obj.setVdsGroupId(instance.getVdsGroupId()); - obj.setvds_group_name(instance.getvds_group_name()); + obj.setVdsGroupName(instance.getVdsGroupName()); obj.setVmType(instance.getVmType()); obj.setId(instance.getId()); obj.setDiskList(instance.getDiskList()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java index 101fdc4..0d16d1f 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java @@ -690,7 +690,7 @@ { for (VmTemplate template : (ArrayList<VmTemplate>) source) { - if (template.getstatus() == VmTemplateStatus.OK) + if (template.getStatus() == VmTemplateStatus.OK) { list.add(template); } @@ -2264,7 +2264,7 @@ for (VmTemplate template : (List<VmTemplate>) source) { if (template.getId().equals(Guid.Empty)) { blankTemplate = template; - } else if (template.getstatus() == VmTemplateStatus.OK) { + } else if (template.getStatus() == VmTemplateStatus.OK) { list.add(template); } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkTemplateListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkTemplateListModel.java index 7fd624e..500c02a 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkTemplateListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkTemplateListModel.java @@ -82,7 +82,7 @@ public int compare(PairQueryable<VmNetworkInterface, VmTemplate> paramT1, PairQueryable<VmNetworkInterface, VmTemplate> paramT2) { int compareValue = - paramT1.getSecond().getvds_group_name().compareTo(paramT2.getSecond().getvds_group_name()); + paramT1.getSecond().getVdsGroupName().compareTo(paramT2.getSecond().getVdsGroupName()); if (compareValue != 0) { return compareValue; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateGeneralModel.java index 5d82818..b78c297 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateGeneralModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateGeneralModel.java @@ -453,7 +453,7 @@ setQuotaName(template.getQuotaName() != null ? template.getQuotaName() : ""); //$NON-NLS-1$ setQuotaAvailable(template.getQuotaEnforcementType() != null && !template.getQuotaEnforcementType().equals(QuotaEnforcementTypeEnum.DISABLED)); - setHostCluster(template.getvds_group_name()); + setHostCluster(template.getVdsGroupName()); setDefinedMemory(template.getMemSizeMb() + " MB"); //$NON-NLS-1$ setHasHighlyAvailable(template.getVmType() == VmType.Server); setIsHighlyAvailable(template.isAutoStartup()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java index deded26..00f0fb5 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java @@ -218,7 +218,7 @@ @Override protected Guid extractStoragePoolIdNullSafe(VmTemplate entity) { - return entity.getstorage_pool_id().getValue(); + return entity.getStoragePoolId().getValue(); } @Override @@ -232,12 +232,12 @@ { if (!a.getId().equals(NGuid.Empty)) { - if (!t.containsKey(a.getstorage_pool_id())) + if (!t.containsKey(a.getStoragePoolId())) { - t.put(a.getstorage_pool_id(), new ArrayList<VmTemplate>()); + t.put(a.getStoragePoolId(), new ArrayList<VmTemplate>()); } - ArrayList<VmTemplate> list = t.get(a.getstorage_pool_id()); + ArrayList<VmTemplate> list = t.get(a.getStoragePoolId()); list.add(a); } } @@ -637,7 +637,7 @@ boolean blankSelected = isBlankTemplateSelected(); getEditCommand().setIsExecutionAllowed(items.size() == 1 && item != null - && item.getstatus() != VmTemplateStatus.Locked); + && item.getStatus() != VmTemplateStatus.Locked); if (getEditCommand().getIsExecutionAllowed() && blankSelected) { getEditCommand().getExecuteProhibitionReasons().add(ConstantsManager.getInstance() diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalTemplateListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalTemplateListModel.java index c60d6b2..0d4027e 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalTemplateListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalTemplateListModel.java @@ -40,7 +40,7 @@ ArrayList items = new ArrayList(); items.add(item); getEditCommand().setIsExecutionAllowed( - item.getstatus() != VmTemplateStatus.Locked && + item.getStatus() != VmTemplateStatus.Locked && !isBlankTemplateSelected()); getRemoveCommand().setIsExecutionAllowed( VdcActionUtils.CanExecute(items, VmTemplate.class, diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java index 7c7df0c..a384ea4 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java @@ -34,7 +34,7 @@ getModel().getProvisioning().setIsChangable(false); getModel().getStorageDomain().setIsChangable(false); - if (template.getstorage_pool_id() != null && !template.getstorage_pool_id().getValue().equals(NGuid.Empty)) + if (template.getStoragePoolId() != null && !template.getStoragePoolId().getValue().equals(NGuid.Empty)) { AsyncDataProvider.GetDataCenterById(new AsyncQuery(getModel(), new INewAsyncCallback() { @@ -50,7 +50,7 @@ } }, getModel().getHash()), - template.getstorage_pool_id().getValue()); + template.getStoragePoolId().getValue()); } getModel().getMigrationMode().setSelectedItem(template.getMigrationSupport()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UserPortalNewVmModelBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UserPortalNewVmModelBehavior.java index 235d655..885b302 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UserPortalNewVmModelBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UserPortalNewVmModelBehavior.java @@ -140,7 +140,7 @@ for (VmTemplate template : templates) { Guid datacenterId = - template.getstorage_pool_id() == null ? NGuid.Empty : template.getstorage_pool_id().getValue(); + template.getStoragePoolId() == null ? NGuid.Empty : template.getStoragePoolId().getValue(); if (template.getId().equals(NGuid.Empty)) { @@ -150,7 +150,7 @@ { continue; } - else if (template.getstatus() == VmTemplateStatus.OK) + else if (template.getStatus() == VmTemplateStatus.OK) { templatesList.add(template); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabTemplateView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabTemplateView.java index ff1902a..56bc056 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabTemplateView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabTemplateView.java @@ -55,7 +55,7 @@ TextColumnWithTooltip<VmTemplate> statusColumn = new EnumColumn<VmTemplate, VmTemplateStatus>() { @Override protected VmTemplateStatus getRawValue(VmTemplate object) { - return object.getstatus(); + return object.getStatus(); } }; getTable().addColumn(statusColumn, constants.statusTemplate(), "100px"); //$NON-NLS-1$ @@ -63,7 +63,7 @@ TextColumnWithTooltip<VmTemplate> clusterColumn = new TextColumnWithTooltip<VmTemplate>() { @Override public String getValue(VmTemplate object) { - return object.getvds_group_name(); + return object.getVdsGroupName(); } }; getTable().addColumn(clusterColumn, constants.clusterTemplate(), "150px"); //$NON-NLS-1$ @@ -71,7 +71,7 @@ TextColumnWithTooltip<VmTemplate> dcColumn = new TextColumnWithTooltip<VmTemplate>() { @Override public String getValue(VmTemplate object) { - return object.getstorage_pool_name(); + return object.getStoragePoolName(); } }; getTable().addColumn(dcColumn, constants.dcTemplate(), "150px"); //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkTemplateView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkTemplateView.java index 8c98654..a6b8503 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkTemplateView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkTemplateView.java @@ -48,7 +48,7 @@ TextColumnWithTooltip<PairQueryable<VmNetworkInterface, VmTemplate>> statusColumn = new EnumColumn<PairQueryable<VmNetworkInterface, VmTemplate>, VmTemplateStatus>() { @Override protected VmTemplateStatus getRawValue(PairQueryable<VmNetworkInterface, VmTemplate> object) { - return object.getSecond().getstatus(); + return object.getSecond().getStatus(); } }; getTable().addColumn(statusColumn, constants.statusTemplate(), "100px"); //$NON-NLS-1$ @@ -56,7 +56,7 @@ TextColumnWithTooltip<PairQueryable<VmNetworkInterface, VmTemplate>> clusterColumn = new TextColumnWithTooltip<PairQueryable<VmNetworkInterface, VmTemplate>>() { @Override public String getValue(PairQueryable<VmNetworkInterface, VmTemplate> object) { - return object.getSecond().getvds_group_name(); + return object.getSecond().getVdsGroupName(); } }; getTable().addColumn(clusterColumn, constants.clusterTemplate(), "150px"); //$NON-NLS-1$ -- To view, visit http://gerrit.ovirt.org/13433 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3dcb9493953a7206dab16bf30aeec87a43358093 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Laszlo Hornyak <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
