Daniel Erez has uploaded a new change for review. Change subject: core: fixed assign quota to disks in register vm ......................................................................
core: fixed assign quota to disks in register vm Fixed assign storage quota to disks in register VM and template. Change-Id: Id885420281e4b01a3116eed3684e3dac70b6ec30 Signed-off-by: Daniel Erez <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmFromConfigurationCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateFromConfigurationCommand.java 2 files changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/45/28745/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmFromConfigurationCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmFromConfigurationCommand.java index 377b036..74cca85 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmFromConfigurationCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmFromConfigurationCommand.java @@ -1,9 +1,11 @@ package org.ovirt.engine.core.bll; +import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.LinkedList; import java.util.List; +import java.util.Map; import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.common.AuditLogType; @@ -17,6 +19,8 @@ import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector; +import org.ovirt.engine.core.utils.linq.Function; +import org.ovirt.engine.core.utils.linq.LinqUtils; import org.ovirt.engine.core.utils.log.Log; import org.ovirt.engine.core.utils.log.LogFactory; import org.ovirt.engine.core.utils.ovf.OvfReaderException; @@ -82,6 +86,7 @@ // For quota, update disks when required if (getParameters().getDiskMap() != null) { vmFromConfiguration.setDiskMap(getParameters().getDiskMap()); + vmFromConfiguration.setImages(getImages(getParameters().getDiskMap())); } } catch (OvfReaderException e) { log.errorFormat("failed to parse a given ovf configuration: \n" + ovfEntityData.getOvfData(), e); @@ -89,6 +94,15 @@ } } + private ArrayList<DiskImage> getImages(Map<Guid, Disk> diskMap) { + return new ArrayList<>(LinqUtils.foreach(diskMap.values(), new Function<Disk, DiskImage>() { + @Override + public DiskImage eval(Disk disk) { + return (DiskImage) disk; + } + })); + } + private void setDisksToBeAttached(VM vmFromConfiguration) { vmDisksToAttach = vmFromConfiguration.getDiskMap().values(); clearVmDisks(vmFromConfiguration); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateFromConfigurationCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateFromConfigurationCommand.java index 1e9a5fa..6c9c806 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateFromConfigurationCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateFromConfigurationCommand.java @@ -67,6 +67,7 @@ if (getParameters().getDiskTemplateMap() != null) { ArrayList imageList = new ArrayList<>(getParameters().getDiskTemplateMap().values()); vmTemplateFromConfiguration.setDiskList(imageList); + getParameters().setImages(new ArrayList<>(getParameters().getDiskTemplateMap().values())); ensureDomainMap(imageList, getParameters().getDestDomainId()); } } catch (OvfReaderException e) { -- To view, visit http://gerrit.ovirt.org/28745 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id885420281e4b01a3116eed3684e3dac70b6ec30 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
