Allon Mureinik has uploaded a new change for review. Change subject: core: GetAllFromExportDomainQueryParameters.getAll ......................................................................
core: GetAllFromExportDomainQueryParameters.getAll Removed the GetAll parameter from the GetAllFromExportDomainQueryParameters class. This parameter was ALWAYS set to true, with no way for the user to set it to false. Thus, the parameter itself is useless (it's effectively hardcoded to true), and all the code that handles GetAll=false is dead code that cannot be reached. This patch removes this useless code, as it obviously has no use in the system. A neat side-effect of removing this code is saving a couple of VmDao.getAll() and VmTemplateDao.getAll() database calls. Change-Id: I3cb36d7a5b1a9e309a7553fc2ef696b1cc1cae5a Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.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/RemoveVmFromImportExportCommand.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/storage/GetTemplatesFromExportDomainQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetVmsFromExportDomainQuery.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllFromExportDomainQueryParameters.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmsResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmsResourceTest.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/storage/TemplateBackupModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/VmBaseListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java 17 files changed, 22 insertions(+), 70 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/25/9625/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java index 31acb5d..653591e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java @@ -335,7 +335,6 @@ boolean retVal = true; GetAllFromExportDomainQueryParameters tempVar = new GetAllFromExportDomainQueryParameters(getVm() .getstorage_pool_id(), getParameters().getStorageDomainId()); - tempVar.setGetAll(true); VdcQueryReturnValue qretVal = Backend.getInstance().runInternalQuery(VdcQueryType.GetVmsFromExportDomain, tempVar); @@ -362,7 +361,6 @@ boolean retVal = false; GetAllFromExportDomainQueryParameters tempVar = new GetAllFromExportDomainQueryParameters(storagePoolId, storageDomainId); - tempVar.setGetAll(true); VdcQueryReturnValue qretVal = Backend.getInstance().runInternalQuery(VdcQueryType.GetTemplatesFromExportDomain, tempVar); 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 b8e2124..b4d9ef8 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 @@ -201,7 +201,6 @@ GetAllFromExportDomainQueryParameters tempVar = new GetAllFromExportDomainQueryParameters (getParameters().getStoragePoolId(), getParameters().getSourceDomainId()); - tempVar.setGetAll(true); VdcQueryReturnValue qretVal = getBackend().runInternalQuery(VdcQueryType.GetVmsFromExportDomain, tempVar); @@ -377,7 +376,6 @@ if (!VmTemplateHandler.BlankVmTemplateId.equals(getParameters().getVm().getvmt_guid())) { GetAllFromExportDomainQueryParameters tempVar = new GetAllFromExportDomainQueryParameters(getParameters() .getStoragePoolId(), getParameters().getSourceDomainId()); - tempVar.setGetAll(true); VdcQueryReturnValue qretVal = Backend.getInstance().runInternalQuery( VdcQueryType.GetTemplatesFromExportDomain, tempVar); 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 3486066..be00679 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 @@ -10,9 +10,9 @@ import org.ovirt.engine.core.bll.command.utils.StorageDomainSpaceChecker; import org.ovirt.engine.core.bll.job.ExecutionHandler; import org.ovirt.engine.core.bll.network.VmInterfaceManager; -import org.ovirt.engine.core.bll.quota.QuotaStorageDependent; -import org.ovirt.engine.core.bll.quota.QuotaStorageConsumptionParameter; import org.ovirt.engine.core.bll.quota.QuotaConsumptionParameter; +import org.ovirt.engine.core.bll.quota.QuotaStorageConsumptionParameter; +import org.ovirt.engine.core.bll.quota.QuotaStorageDependent; import org.ovirt.engine.core.bll.utils.VmDeviceUtils; import org.ovirt.engine.core.bll.validator.StorageDomainValidator; import org.ovirt.engine.core.common.AuditLogType; @@ -100,7 +100,6 @@ // Set the template images from the Export domain and change each image id storage is to the import domain GetAllFromExportDomainQueryParameters tempVar = new GetAllFromExportDomainQueryParameters(getParameters() .getStoragePoolId(), getParameters().getSourceDomainId()); - tempVar.setGetAll(true); VdcQueryReturnValue qretVal = getBackend().runInternalQuery( VdcQueryType.GetTemplatesFromExportDomain, tempVar); retVal = qretVal.getSucceeded(); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromImportExportCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromImportExportCommand.java index 5bbb778..3135573 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromImportExportCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromImportExportCommand.java @@ -109,7 +109,6 @@ if (exportVm == null) { GetAllFromExportDomainQueryParameters tempVar = new GetAllFromExportDomainQueryParameters( getParameters().getStoragePoolId(), getParameters().getStorageDomainId()); - tempVar.setGetAll(true); tempVar.setIds(new ArrayList<Guid>(Collections.singletonList(getVmId()))); VdcQueryReturnValue qretVal = Backend.getInstance().runInternalQuery( VdcQueryType.GetVmsFromExportDomain, tempVar); 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 f510ded..6e75cf3 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 @@ -163,7 +163,6 @@ if (exportTemplate == null) { GetAllFromExportDomainQueryParameters tempVar = new GetAllFromExportDomainQueryParameters(getParameters() .getStoragePoolId(), getParameters().getStorageDomainId()); - tempVar.setGetAll(true); VdcQueryReturnValue qretVal = Backend.getInstance().runInternalQuery( VdcQueryType.GetTemplatesFromExportDomain, tempVar); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetTemplatesFromExportDomainQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetTemplatesFromExportDomainQuery.java index 09fcd12..7ac71ea 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetTemplatesFromExportDomainQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetTemplatesFromExportDomainQuery.java @@ -1,7 +1,6 @@ package org.ovirt.engine.core.bll.storage; import java.util.ArrayList; -import java.util.List; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.businessentities.DiskImage; @@ -12,7 +11,6 @@ import org.ovirt.engine.core.common.queries.DiskImageList; import org.ovirt.engine.core.common.queries.GetAllFromExportDomainQueryParameters; import org.ovirt.engine.core.common.vdscommands.VDSReturnValue; -import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBase; @@ -41,15 +39,10 @@ @Override protected void buildOvfReturnValue(Object obj) { - boolean shouldAdd = true; ArrayList<String> ovfList = (ArrayList<String>) obj; OvfManager ovfManager = new OvfManager(); java.util.HashMap<VmTemplate, DiskImageList> templates = new java.util.HashMap<VmTemplate, DiskImageList>(); - List<VmTemplate> existsTemplates = DbFacade.getInstance().getVmTemplateDao().getAll(); - java.util.HashMap<Guid, VmTemplate> existsVmDictionary = new java.util.HashMap<Guid, VmTemplate>(); - for (VmTemplate vmTemplate : existsTemplates) { - existsVmDictionary.put(vmTemplate.getId(), vmTemplate); - } + if (isValidExportDomain()) { VmTemplate template = null; for (String ovf : ovfList) { @@ -59,12 +52,8 @@ ArrayList<VmNetworkInterface> interfaces = new ArrayList<VmNetworkInterface>(); template = new VmTemplate(); ovfManager.ImportTemplate(ovf, template, diskImages, interfaces); - shouldAdd = getParameters().getGetAll() ? shouldAdd : - (!existsVmDictionary.containsKey(template.getId()) && diskImages != null); - if (shouldAdd) { - template.setInterfaces(interfaces); - templates.put(template, new DiskImageList(diskImages)); - } + template.setInterfaces(interfaces); + templates.put(template, new DiskImageList(diskImages)); } } catch (OvfReaderException ex) { AuditLogableBase logable = new AuditLogableBase(); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetVmsFromExportDomainQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetVmsFromExportDomainQuery.java index ba128c5..8b77fe6 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetVmsFromExportDomainQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetVmsFromExportDomainQuery.java @@ -64,15 +64,9 @@ } protected void buildOvfReturnValue(Object obj) { - boolean shouldAdd = true; ArrayList<String> ovfList = (ArrayList<String>) obj; OvfManager ovfManager = new OvfManager(); ArrayList<VM> vms = new ArrayList<VM>(); - List<VM> existsVms = DbFacade.getInstance().getVmDao().getAll(); - java.util.HashMap<Guid, VM> existsVmDictionary = new java.util.HashMap<Guid, VM>(); - for (VM vm : existsVms) { - existsVmDictionary.put(vm.getId(), vm); - } if (isValidExportDomain()) { VM vm = null; @@ -84,24 +78,19 @@ ArrayList<VmNetworkInterface> interfaces = new ArrayList<VmNetworkInterface>(); ovfManager.ImportVm(ovf, vm, diskImages, interfaces); - shouldAdd = getParameters().getGetAll() ? shouldAdd : !existsVmDictionary - .containsKey(vm.getId()); + // add images + vm.setImages(diskImages); + // add interfaces + vm.setInterfaces(interfaces); - if (shouldAdd) { - // add images - vm.setImages(diskImages); - // add interfaces - vm.setInterfaces(interfaces); - - // add disk map - Map<Guid, List<DiskImage>> images = ImportVmCommand - .getImagesLeaf(diskImages); - for (Guid id : images.keySet()) { - List<DiskImage> list = images.get(id); - vm.getDiskMap().put(id, list.get(list.size() - 1)); - } - vms.add(vm); + // add disk map + Map<Guid, List<DiskImage>> images = ImportVmCommand + .getImagesLeaf(diskImages); + for (Guid id : images.keySet()) { + List<DiskImage> list = images.get(id); + vm.getDiskMap().put(id, list.get(list.size() - 1)); } + vms.add(vm); } } catch (OvfReaderException ex) { AuditLogableBase logable = new AuditLogableBase(); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllFromExportDomainQueryParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllFromExportDomainQueryParameters.java index 5141930..3b5a565 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllFromExportDomainQueryParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllFromExportDomainQueryParameters.java @@ -1,6 +1,6 @@ package org.ovirt.engine.core.common.queries; -import org.ovirt.engine.core.compat.*; +import org.ovirt.engine.core.compat.Guid; public class GetAllFromExportDomainQueryParameters extends VdcQueryParametersBase { private static final long serialVersionUID = 5436719744430725750L; @@ -34,19 +34,7 @@ privateIds = value; } - private boolean privateGetAll; - - public boolean getGetAll() { - return privateGetAll; - } - - public void setGetAll(boolean value) { - privateGetAll = value; - } - public GetAllFromExportDomainQueryParameters(Guid storagePoolId, Guid storageDomainId) { - // for getting existing Vm as well - setGetAll(false); this.setStoragePoolId(storagePoolId); this.setStorageDomainId(storageDomainId); } diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResource.java index c4022b6..56ee0fa 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResource.java @@ -51,7 +51,6 @@ protected Collection<VmTemplate> getEntitiesFromExportDomain() { GetAllFromExportDomainQueryParameters params = new GetAllFromExportDomainQueryParameters(getDataCenterId(storageDomainId), storageDomainId); - params.setGetAll(true); Map<VmTemplate, DiskImageList> ret = getEntity(HashMap.class, VdcQueryType.GetTemplatesFromExportDomain, diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmsResource.java index 1bef918..cb1f138 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmsResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmsResource.java @@ -6,8 +6,8 @@ import org.ovirt.engine.api.model.VM; import org.ovirt.engine.api.model.VMs; -import org.ovirt.engine.api.resource.StorageDomainContentResource; import org.ovirt.engine.api.resource.RemovableStorageDomainContentsResource; +import org.ovirt.engine.api.resource.StorageDomainContentResource; import org.ovirt.engine.core.common.action.RemoveVmFromImportExportParamenters; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.queries.GetAllFromExportDomainQueryParameters; @@ -46,7 +46,6 @@ protected Collection<org.ovirt.engine.core.common.businessentities.VM> getEntitiesFromExportDomain() { GetAllFromExportDomainQueryParameters params = new GetAllFromExportDomainQueryParameters(getDataCenterId(storageDomainId), storageDomainId); - params.setGetAll(true); return getBackendCollection(VdcQueryType.GetVmsFromExportDomain, params); } diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResourceTest.java index c0f00cc..f64be2a 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResourceTest.java @@ -105,8 +105,8 @@ case ImportExport: setUpEntityQueryExpectations(VdcQueryType.GetTemplatesFromExportDomain, GetAllFromExportDomainQueryParameters.class, - new String[] { "StoragePoolId", "StorageDomainId", "GetAll" }, - new Object[] { DATA_CENTER_ID, STORAGE_DOMAIN_ID, Boolean.TRUE }, + new String[] { "StoragePoolId", "StorageDomainId"}, + new Object[] { DATA_CENTER_ID, STORAGE_DOMAIN_ID}, setUpExportTemplates(), failure); break; diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmsResourceTest.java index a1bd096..ab75bbb 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmsResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmsResourceTest.java @@ -117,8 +117,8 @@ case ImportExport: setUpEntityQueryExpectations(VdcQueryType.GetVmsFromExportDomain, GetAllFromExportDomainQueryParameters.class, - new String[] { "StoragePoolId", "StorageDomainId", "GetAll" }, - new Object[] { DATA_CENTER_ID, STORAGE_DOMAIN_ID, Boolean.TRUE }, + new String[] { "StoragePoolId", "StorageDomainId"}, + new Object[] { DATA_CENTER_ID, STORAGE_DOMAIN_ID}, setUpVms(), failure); break; 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 9012d08..37ed14e 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 @@ -1789,7 +1789,6 @@ }; GetAllFromExportDomainQueryParameters getAllFromExportDomainQueryParamenters = new GetAllFromExportDomainQueryParameters(storagePoolId, storageDomainId); - getAllFromExportDomainQueryParamenters.setGetAll(true); Frontend.RunQuery(VdcQueryType.GetTemplatesFromExportDomain, getAllFromExportDomainQueryParamenters, aQuery); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java index b4c47a3..26599a6 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java @@ -339,7 +339,6 @@ GetAllFromExportDomainQueryParameters tempVar = new GetAllFromExportDomainQueryParameters(dataCenter.getId(), backupModel.getEntity() .getId()); - tempVar.setGetAll(true); Frontend.RunQuery(VdcQueryType.GetTemplatesFromExportDomain, tempVar, _asyncQuery1); } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java index 79e2bd0..d79c633 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java @@ -491,7 +491,6 @@ GetAllFromExportDomainQueryParameters tempVar = new GetAllFromExportDomainQueryParameters( dataCenter.getId(), backupModel.getEntity() .getId()); - tempVar.setGetAll(true); Frontend.RunQuery(VdcQueryType.GetVmsFromExportDomain, tempVar, _asyncQuery1); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/VmBaseListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/VmBaseListModel.java index 982b54b..5202757 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/VmBaseListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/VmBaseListModel.java @@ -191,7 +191,6 @@ Guid storageDomainId = ((storage_domains) exportModel.getStorage().getSelectedItem()).getId(); GetAllFromExportDomainQueryParameters tempVar = new GetAllFromExportDomainQueryParameters(storagePool.getId(), storageDomainId); - tempVar.setGetAll(true); Frontend.RunQuery(getVmOrTemplateQuery, tempVar, _asyncQuery); } else { exportModel.StopProgress(); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java index 0e100ec..4f29503 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java @@ -414,7 +414,6 @@ GetAllFromExportDomainQueryParameters tempVar = new GetAllFromExportDomainQueryParameters(storagePool.getId(), ((storage_domains) getEntity()) .getId()); - tempVar.setGetAll(true); Frontend.RunQuery(VdcQueryType.GetTemplatesFromExportDomain, tempVar, new AsyncQuery(ImportVmModel.this, new INewAsyncCallback() { -- To view, visit http://gerrit.ovirt.org/9625 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3cb36d7a5b1a9e309a7553fc2ef696b1cc1cae5a 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
