Daniel Erez has uploaded a new change for review. Change subject: webadmin: AddVmFromTemplate - remove redundant logic ......................................................................
webadmin: AddVmFromTemplate - remove redundant logic Removing redundant logic from VmListModel -> onSave(): for getting selected storage domains / allocation policies, DisksAllocationModel -> getImageToDestinationDomainMap() should be passed to AddVmFromTemplateParameters. Change-Id: I1eb9157cbf692a8de4e5751390ed925310bdf4a0 Signed-off-by: Daniel Erez <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java 1 file changed, 4 insertions(+), 46 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/71/13771/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java index 8f9518b..c1df730 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java @@ -45,7 +45,6 @@ import org.ovirt.engine.core.common.businessentities.VmOsType; import org.ovirt.engine.core.common.businessentities.VmTemplate; import org.ovirt.engine.core.common.businessentities.VmType; -import org.ovirt.engine.core.common.businessentities.VolumeType; import org.ovirt.engine.core.common.businessentities.storage_pool; import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; import org.ovirt.engine.core.common.interfaces.SearchType; @@ -2475,53 +2474,12 @@ public void OnSuccess(Object model1, Object result1) { VmListModel vmListModel = (VmListModel) model1; - ArrayList<DiskImage> templateDisks = (ArrayList<DiskImage>) result1; - UnitVmModel unitVmModel = (UnitVmModel) vmListModel.getWindow(); - HashMap<Guid, DiskImage> imageToDestinationDomainMap = - unitVmModel.getDisksAllocationModel().getImageToDestinationDomainMap(); - - ArrayList<StorageDomain> activeStorageDomains = - unitVmModel.getDisksAllocationModel().getActiveStorageDomains(); - - HashMap<Guid, DiskImage> dict = - unitVmModel.getDisksAllocationModel().getImageToDestinationDomainMap(); - for (DiskImage templateDisk : templateDisks) - { - DiskModel disk = null; - for (DiskModel a : unitVmModel.getDisksAllocationModel().getDisks()) - { - if (templateDisk.getId().equals(a.getDisk().getId())) - { - disk = a; - break; - } - } - - StorageDomain storageDomain = - Linq.getStorageById( - imageToDestinationDomainMap.get(templateDisk.getId()) - .getStorageIds() - .get(0), activeStorageDomains); - - if (disk != null) { - dict.get(templateDisk.getId()) - .setVolumeType((VolumeType) disk.getVolumeType() - .getSelectedItem()); - dict.get(templateDisk.getId()) - .setvolumeFormat(AsyncDataProvider.GetDiskVolumeFormat( - (VolumeType) disk.getVolumeType().getSelectedItem(), - storageDomain.getStorageType())); - if (disk.getQuota().getSelectedItem() != null) { - dict.get(templateDisk.getId()).setQuotaId(((Quota) disk.getQuota() - .getSelectedItem()).getId()); - } - } - } - - AddVmFromTemplateParameters param = - new AddVmFromTemplateParameters(vmListModel.getcurrentVm(), dict, Guid.Empty); + AddVmFromTemplateParameters param = new AddVmFromTemplateParameters( + vmListModel.getcurrentVm(), + unitVmModel.getDisksAllocationModel().getImageToDestinationDomainMap(), + Guid.Empty); ArrayList<VdcActionParametersBase> parameters = new ArrayList<VdcActionParametersBase>(); parameters.add(param); -- To view, visit http://gerrit.ovirt.org/13771 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1eb9157cbf692a8de4e5751390ed925310bdf4a0 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
