Daniel Erez has uploaded a new change for review. Change subject: webadmin,userportal: single storage domain cleanup ......................................................................
webadmin,userportal: single storage domain cleanup Removing redundant and dead code of legacy 'single storage domain' (used in move/copy disk, new VM/template, clone VM and import VM). Change-Id: Ibd8fe9ff1f2535e2298b73cd650f695465966da5 Signed-off-by: Daniel Erez <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmMakeTemplatePopupWidget.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationView.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationView.ui.xml M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/DisksAllocationModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/MoveOrCopyDiskModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/CopyDiskModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateDiskListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/MoveDiskModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java 16 files changed, 33 insertions(+), 457 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/74/11874/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java index 1238578..d2c3d8a 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java @@ -860,12 +860,10 @@ } private void addDiskAllocation(UnitVmModel model) { - // ArrayList<storage_domains> storageDomains = (ArrayList<storage_domains>) model.getStorageDomain().getItems(); if (!model.getIsDisksAvailable()) { return; } disksAllocationView.edit(model.getDisksAllocationModel()); - model.getDisksAllocationModel().getStorageDomain().setItems(model.getStorageDomain().getItems()); model.getDisksAllocationModel().setDisks(model.getDisks()); } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmMakeTemplatePopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmMakeTemplatePopupWidget.java index 19595b0..de544f3 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmMakeTemplatePopupWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmMakeTemplatePopupWidget.java @@ -140,15 +140,6 @@ } }); - model.getStorageDomain().getPropertyChangedEvent().addListener(new IEventListener() { - @Override - public void eventRaised(Event ev, Object sender, EventArgs args) { - boolean isDisksAllocationEnabled = model.getDisks() != null && !model.getDisks().isEmpty(); - disksAllocationView.setEnabled(isDisksAllocationEnabled); - disksAllocationLabel.getElement().getStyle().setColor(isDisksAllocationEnabled ? "black" : "grey"); //$NON-NLS-1$ //$NON-NLS-2$ - } - }); - model.getPropertyChangedEvent().addListener(new IEventListener() { @Override public void eventRaised(Event ev, Object sender, EventArgs args) { @@ -162,7 +153,6 @@ private void addDiskAllocation(UnitVmModel model) { disksAllocationView.edit(model.getDisksAllocationModel()); - model.getDisksAllocationModel().getStorageDomain().setItems(model.getStorageDomain().getItems()); model.getDisksAllocationModel().setDisks(model.getDisks()); } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationView.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationView.java index 838c8d6..2af0691 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationView.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationView.java @@ -2,9 +2,7 @@ import java.util.ArrayList; -import org.ovirt.engine.core.common.businessentities.Quota; import org.ovirt.engine.core.common.businessentities.QuotaEnforcementTypeEnum; -import org.ovirt.engine.core.common.businessentities.storage_domains; import org.ovirt.engine.core.compat.Event; import org.ovirt.engine.core.compat.EventArgs; import org.ovirt.engine.core.compat.IEventListener; @@ -14,23 +12,15 @@ import org.ovirt.engine.ui.common.idhandler.HasElementId; import org.ovirt.engine.ui.common.utils.ElementIdUtils; import org.ovirt.engine.ui.common.view.popup.FocusableComponentsContainer; -import org.ovirt.engine.ui.common.widget.AbstractValidatedWidgetWithLabel; -import org.ovirt.engine.ui.common.widget.Align; import org.ovirt.engine.ui.common.widget.HasEditorDriver; import org.ovirt.engine.ui.common.widget.editor.EntityModelCellTable; -import org.ovirt.engine.ui.common.widget.editor.EntityModelCheckBoxEditor; -import org.ovirt.engine.ui.common.widget.editor.IVdcQueryableCellTable; -import org.ovirt.engine.ui.common.widget.editor.ListModelListBoxEditor; -import org.ovirt.engine.ui.common.widget.renderer.NullSafeRenderer; import org.ovirt.engine.ui.common.widget.table.column.EmptyColumn; -import org.ovirt.engine.ui.common.widget.table.column.TextColumnWithTooltip; import org.ovirt.engine.ui.uicommonweb.models.ListModel; import org.ovirt.engine.ui.uicommonweb.models.storage.DisksAllocationModel; import org.ovirt.engine.ui.uicommonweb.models.vms.DiskModel; import com.google.gwt.core.client.GWT; import com.google.gwt.editor.client.SimpleBeanEditorDriver; -import com.google.gwt.resources.client.CssResource; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiConstructor; import com.google.gwt.uibinder.client.UiField; @@ -51,34 +41,6 @@ ViewUiBinder uiBinder = GWT.create(ViewUiBinder.class); } - interface WidgetStyle extends CssResource { - String isSingleStorageEditorContent(); - - String editorLabel(); - - String editorContent(); - - String editorWrapper(); - } - - @UiField - WidgetStyle style; - - @UiField(provided = true) - @Path(value = "isSingleStorageDomain.entity") - EntityModelCheckBoxEditor isSingleStorageEditor; - - @UiField(provided = true) - @Path(value = "storageDomain.selectedItem") - ListModelListBoxEditor<Object> singleStorageEditor; - - @UiField(provided = true) - @Path(value = "quota.selectedItem") - ListModelListBoxEditor<Object> singleQuotaEditor; - - @UiField - FlowPanel singleStoragePanel; - @UiField FlowPanel diskListPanel; @@ -92,10 +54,7 @@ boolean showSource; boolean showQuota; - @Ignore - IVdcQueryableCellTable<storage_domains, ListModel> storageTable; - - CommonApplicationConstants constants; + private CommonApplicationConstants constants; private String elementId = DOM.createUniqueId(); @@ -115,32 +74,8 @@ public DisksAllocationView(CommonApplicationConstants constants) { this.constants = constants; - initListBoxEditors(); initWidget(ViewUiBinder.uiBinder.createAndBindUi(this)); - localize(constants); - addStyles(); Driver.driver.initialize(this); - - // Hide single destination storage and quota panel - singleStoragePanel.setVisible(false); - } - - void initListBoxEditors() { - isSingleStorageEditor = new EntityModelCheckBoxEditor(Align.RIGHT); - - singleStorageEditor = new ListModelListBoxEditor<Object>(new NullSafeRenderer<Object>() { - @Override - public String renderNullSafe(Object object) { - return ((storage_domains) object).getstorage_name(); - } - }); - - singleQuotaEditor = new ListModelListBoxEditor<Object>(new NullSafeRenderer<Object>() { - @Override - public String renderNullSafe(Object object) { - return ((Quota) object).getQuotaName(); - } - }); } void updateListHeader(DisksAllocationModel model) { @@ -170,32 +105,12 @@ void updateColumnsAvailability(DisksAllocationModel model) { setShowVolumeType(model.getIsVolumeFormatAvailable()); setShowQuota(model.getQuotaEnforcementType() != QuotaEnforcementTypeEnum.DISABLED); - localize(constants); - } - - void addStyles() { - isSingleStorageEditor.addContentWidgetStyleName(style.isSingleStorageEditorContent()); - - updateEditorStyle(singleStorageEditor); - updateEditorStyle(singleQuotaEditor); - } - - private void updateEditorStyle(AbstractValidatedWidgetWithLabel editor) { - editor.addContentWidgetStyleName(style.editorContent()); - editor.addWrapperStyleName(style.editorWrapper()); - editor.setLabelStyleName(style.editorLabel()); - } - - void localize(CommonApplicationConstants constants) { - isSingleStorageEditor.setLabel(!showQuota ? constants.singleDestinationStorage() : - constants.singleDestinationStorage() + constants.singleQuota()); } @Override public void edit(DisksAllocationModel model) { Driver.driver.edit(model); initListerners(model); - InitStorageTable(model.getIsSingleDiskCopy()); updateColumnsAvailability(model); updateListHeader(model); } @@ -231,35 +146,6 @@ ElementIdUtils.createElementId(elementId, "disk" + (diskIndex++))); //$NON-NLS-1$ diskListPanel.add(disksAllocationItemView); } - - if (model.getIsSingleDiskMove() || model.getIsSingleDiskCopy()) { - singleStoragePanel.setVisible(false); - model.getIsSingleStorageDomain().setEntity(false); - } - } - - public void InitStorageTable(boolean multiSelection) { - storageTable = new IVdcQueryableCellTable<storage_domains, ListModel>(multiSelection); - - // Table Entity Columns - storageTable.addColumn(new TextColumnWithTooltip<storage_domains>() { - @Override - public String getValue(storage_domains storage) { - return storage.getstorage_name(); - } - }, constants.nameDisk()); - - storageTable.addColumn(new TextColumnWithTooltip<storage_domains>() { - @Override - public String getValue(storage_domains storage) { - if (storage.getavailable_disk_size() == null || storage.getavailable_disk_size() < 1) { - return "< 1 GB"; //$NON-NLS-1$ - } - return storage.getavailable_disk_size() + " GB"; //$NON-NLS-1$ - } - }, constants.freeSpaceDisk()); - - storageTable.setWidth("100%", true); //$NON-NLS-1$ } @Override @@ -287,11 +173,6 @@ this.showQuota = showQuota; } - public void setEnabled(boolean enabled) { - isSingleStorageEditor.setEnabled(enabled); - singleStorageEditor.setEnabled(enabled); - } - public void addDiskListPanelStyle(String style) { diskListPanel.addStyleName(style); } @@ -299,13 +180,6 @@ @Override public void setElementId(String elementId) { this.elementId = elementId; - - isSingleStorageEditor.setElementId( - ElementIdUtils.createElementId(elementId, "isSingleStorage")); //$NON-NLS-1$ - singleStorageEditor.setElementId( - ElementIdUtils.createElementId(elementId, "singleStorage")); //$NON-NLS-1$ - singleQuotaEditor.setElementId( - ElementIdUtils.createElementId(elementId, "singleQuota")); //$NON-NLS-1$ } } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationView.ui.xml b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationView.ui.xml index 2f02716..5c8abcd 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationView.ui.xml +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationView.ui.xml @@ -3,54 +3,15 @@ <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:e="urn:import:org.ovirt.engine.ui.common.widget.editor"> - <ui:style type="org.ovirt.engine.ui.common.widget.uicommon.storage.DisksAllocationView.WidgetStyle"> - .container { - text-align: right; - } - - .isSingleStorageEditorContent { - width: 250px; - padding: 0px; - } - - .isSingleStorageEditor { - float: left; - } - - .editorLabel { - display: none; - } - - .editorContent { - width: 110px; - } - - .editorWrapper { - display: inline-block; - } - - .singleStoragePanel { - width: 100%; - border-bottom: 1px solid black; - margin-bottom: 5px; - } - + <ui:style> .diskListPanel { overflow: auto; position: absolute; width: 100%; } - - </ui:style> + </ui:style> <g:FlowPanel> - <g:FlowPanel ui:field="singleStoragePanel" addStyleNames="{style.singleStoragePanel}"> - <e:EntityModelCheckBoxEditor ui:field="isSingleStorageEditor" addStyleNames="{style.isSingleStorageEditor}"/> - <g:FlowPanel addStyleNames="{style.container}"> - <e:ListModelListBoxEditor ui:field="singleStorageEditor" /> - <e:ListModelListBoxEditor ui:field="singleQuotaEditor" /> - </g:FlowPanel> - </g:FlowPanel> <g:SimplePanel ui:field="diskListHeaderPanel" /> <g:FlowPanel ui:field="diskListPanel" addStyleNames="{style.diskListPanel}"/> </g:FlowPanel> diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java index 028ffc7..0ca1805 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java @@ -464,7 +464,6 @@ } MoveDiskModel model = new MoveDiskModel(); - model.setIsSingleDiskMove(disks.size() == 1); setWindow(model); model.setTitle(ConstantsManager.getInstance().getConstants().moveDisksTitle()); model.setHashName("move_disks"); //$NON-NLS-1$ @@ -540,7 +539,6 @@ } CopyDiskModel model = new CopyDiskModel(); - model.setIsSingleDiskMove(disks.size() == 1); setWindow(model); model.setTitle(ConstantsManager.getInstance().getConstants().copyDisksTitle()); model.setHashName("copy_disks"); //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java index 3f0de95..722cba3 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java @@ -519,11 +519,8 @@ .Integer(), 0); param.setStorageDomainId(Guid.Empty); - param.setDiskInfoDestinationMap( - model.getDisksAllocationModel() - .getImageToDestinationDomainMap((Boolean) model.getDisksAllocationModel() - .getIsSingleStorageDomain() - .getEntity())); + param.setDiskInfoDestinationMap(model.getDisksAllocationModel() + .getImageToDestinationDomainMap()); if (model.getQuota().getSelectedItem() != null) { desktop.setQuotaId(((Quota) model.getQuota().getSelectedItem()).getId()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/DisksAllocationModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/DisksAllocationModel.java index 7e936a1..b8d2a7d 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/DisksAllocationModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/DisksAllocationModel.java @@ -39,54 +39,6 @@ } }; - private EntityModel isSingleStorageDomain; - - public EntityModel getIsSingleStorageDomain() - { - return isSingleStorageDomain; - } - - public void setIsSingleStorageDomain(EntityModel value) - { - isSingleStorageDomain = value; - } - - private ListModel privateStorageDomain; - - public ListModel getStorageDomain() - { - return privateStorageDomain; - } - - public void setStorageDomain(ListModel value) - { - privateStorageDomain = value; - } - - private ListModel privateSourceStorageDomain; - - public ListModel getSourceStorageDomain() - { - return privateSourceStorageDomain; - } - - public void setSourceStorageDomain(ListModel value) - { - privateSourceStorageDomain = value; - } - - private EntityModel sourceStorageDomainName; - - public EntityModel getSourceStorageDomainName() - { - return sourceStorageDomainName; - } - - public void setSourceStorageDomainName(EntityModel value) - { - sourceStorageDomainName = value; - } - private List<DiskModel> disks; public List<DiskModel> getDisks() @@ -114,15 +66,10 @@ private HashMap<Guid, DiskImage> imageToDestinationDomainMap; - public HashMap<Guid, DiskImage> getImageToDestinationDomainMap(Boolean isSingle) - { - updateImageToDestinationDomainMap(isSingle); - return imageToDestinationDomainMap; - } - public HashMap<Guid, DiskImage> getImageToDestinationDomainMap() { - return getImageToDestinationDomainMap(false); + updateImageToDestinationDomainMap(); + return imageToDestinationDomainMap; } public void setImageToDestinationDomainMap(HashMap<Guid, DiskImage> imageToDestinationDomainMap) @@ -153,20 +100,6 @@ return quotaEnforcementType; } - private ListModel quota; - - public ListModel getQuota() - { - return quota; - } - - public void setQuota(ListModel value) - { - quota = value; - } - - private boolean isSingleDiskMove; - private boolean isSingleDiskCopy; private boolean isVolumeFormatAvailable; private boolean isVolumeFormatChangable; private boolean isAliasChangable; @@ -176,48 +109,7 @@ public DisksAllocationModel() { - setIsSingleStorageDomain(new EntityModel()); - getIsSingleStorageDomain().setEntity(false); - getIsSingleStorageDomain().getEntityChangedEvent().addListener(this); - - setStorageDomain(new ListModel()); - getStorageDomain().getItemsChangedEvent().addListener(this); - getStorageDomain().getSelectedItemChangedEvent().addListener(this); - - setQuota(new ListModel()); - getQuota().getItemsChangedEvent().addListener(this); - - setSourceStorageDomain(new ListModel()); - getSourceStorageDomain().getItemsChangedEvent().addListener(this); - getSourceStorageDomain().setIsAvailable(false); - - setSourceStorageDomainName(new EntityModel()); - getSourceStorageDomainName().setIsAvailable(false); - setImageToDestinationDomainMap(new HashMap<Guid, DiskImage>()); - } - - @Override - public void eventRaised(Event ev, Object sender, EventArgs args) - { - super.eventRaised(ev, sender, args); - - if (ev.equals(EntityModel.EntityChangedEventDefinition) && sender == getIsSingleStorageDomain()) - { - UpdateStorageDomainsAvailability(); - } - else if (ev.equals(ListModel.ItemsChangedEventDefinition) && sender == getStorageDomain() || - ev.equals(ListModel.ItemsChangedEventDefinition) && sender == getSourceStorageDomain()) - { - UpdateSingleStorageDomainsAvailability(); - UpdateStorageDomainsAvailability(); - } - else if (ev.equals(ListModel.SelectedItemChangedEventDefinition) && sender == getStorageDomain()) { - storage_domains storageDomain = (storage_domains) getStorageDomain().getSelectedItem(); - if (storageDomain != null) { - updateQuota(storageDomain.getId(), null); - } - } } private void updateQuota(Guid storageDomainId, final ListModel isItem) { @@ -234,7 +126,6 @@ DisksAllocationModel diskAllocationModel = (DisksAllocationModel) innerModel; if (list != null) { if (isItem == null) { - diskAllocationModel.getQuota().setItems(list); for (DiskModel diskModel : diskAllocationModel.getDisks()) { diskModel.getQuota().setItems(list); for (Quota quota : list) { @@ -279,26 +170,8 @@ } } - private void UpdateSingleStorageDomainsAvailability() - { - boolean isStorageDomainsEmpty = - getStorageDomain().getItems() != null && ((ArrayList) getStorageDomain().getItems()).isEmpty(); - getIsSingleStorageDomain().setIsChangable(!isStorageDomainsEmpty); - if (isStorageDomainsEmpty) { - getIsSingleStorageDomain().setEntity(false); - } - } - private void UpdateStorageDomainsAvailability() { - boolean isSingleStorageDomain = (Boolean) getIsSingleStorageDomain().getEntity(); - - if (getStorageDomain().getItems() != null) { - boolean isStorageDomainsEmpty = ((ArrayList) getStorageDomain().getItems()).isEmpty(); - getStorageDomain().setIsChangable(isSingleStorageDomain && !isStorageDomainsEmpty); - getQuota().setIsChangable(isSingleStorageDomain && !isStorageDomainsEmpty); - } - if (disks == null) { return; } @@ -312,7 +185,7 @@ } } - private void updateImageToDestinationDomainMap(boolean isSingle) { + private void updateImageToDestinationDomainMap() { if (disks == null) { return; @@ -321,12 +194,8 @@ for (DiskModel diskModel : disks) { Guid diskId = ((DiskImage) diskModel.getDisk()).getId(); Guid storageId = null; - if (!isSingle) { - storageId = ((storage_domains) diskModel.getStorageDomain().getSelectedItem()).getId(); - } - else { - storageId = ((storage_domains) getStorageDomain().getSelectedItem()).getId(); - } + storageId = ((storage_domains) diskModel.getStorageDomain().getSelectedItem()).getId(); + DiskImage diskImage = (DiskImage) diskModel.getDisk(); ArrayList<Guid> storageIdList = new ArrayList<Guid>(); storageIdList.add(storageId); @@ -334,20 +203,13 @@ diskImage.setDiskAlias((String) diskModel.getAlias().getEntity()); if (diskModel.getQuota().getSelectedItem() != null) { - if (!isSingle) { - diskImage.setQuotaId(((Quota) diskModel.getQuota().getSelectedItem()).getId()); - } - else { - diskImage.setQuotaId(((Quota) getQuota().getSelectedItem()).getId()); - } + diskImage.setQuotaId(((Quota) diskModel.getQuota().getSelectedItem()).getId()); } imageToDestinationDomainMap.put(diskId, diskImage); } } private void UpdateQuotaAvailability() { - getQuota().setIsAvailable(quotaEnforcementType != QuotaEnforcementTypeEnum.DISABLED); - if (disks != null) { for (DiskModel diskModel : disks) { diskModel.getQuota().setIsAvailable(quotaEnforcementType != QuotaEnforcementTypeEnum.DISABLED); @@ -356,15 +218,12 @@ } private void updateDisksQuota(Object sender) { - if (!(Boolean) isSingleStorageDomain.getEntity()) { - - storage_domains storageDomain = (storage_domains) ((ListModel) sender).getSelectedItem(); - if (storageDomain != null) { - for (DiskModel innerDisk : disks) { - if (innerDisk.getStorageDomain().equals(sender)) { - updateQuota(storageDomain.getId(), innerDisk.getQuota()); - break; - } + storage_domains storageDomain = (storage_domains) ((ListModel) sender).getSelectedItem(); + if (storageDomain != null) { + for (DiskModel innerDisk : disks) { + if (innerDisk.getStorageDomain().equals(sender)) { + updateQuota(storageDomain.getId(), innerDisk.getQuota()); + break; } } } @@ -415,22 +274,6 @@ public void setIsSourceStorageDomainNameAvailable(boolean isSourceStorageDomainNameAvailable) { this.isSourceStorageDomainNameAvailable = isSourceStorageDomainNameAvailable; - } - - public void setIsSingleDiskMove(boolean isSingleDiskMove) { - this.isSingleDiskMove = isSingleDiskMove; - } - - public void setIsSingleDiskCopy(boolean isSingleDiskCopy) { - this.isSingleDiskCopy = isSingleDiskCopy; - } - - public boolean getIsSingleDiskMove() { - return isSingleDiskMove; - } - - public boolean getIsSingleDiskCopy() { - return isSingleDiskCopy; } public boolean isWarningAvailable() { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/MoveOrCopyDiskModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/MoveOrCopyDiskModel.java index 7d460ac..c5f0898 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/MoveOrCopyDiskModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/MoveOrCopyDiskModel.java @@ -83,9 +83,6 @@ protected abstract String getNoActiveTargetDomainMessage(); - protected abstract void updateMoveOrCopySingleDiskParameters( - ArrayList<VdcActionParametersBase> parameters, DiskModel diskModel); - protected abstract MoveOrCopyImageGroupParameters createParameters( Guid sourceStorageDomainGuid, Guid destStorageDomainGuid, @@ -281,42 +278,28 @@ } protected ArrayList<VdcActionParametersBase> getParameters() { - boolean iSingleStorageDomain = (Boolean) getIsSingleStorageDomain().getEntity(); - ArrayList<VdcActionParametersBase> parameters = new ArrayList<VdcActionParametersBase>(); for (DiskModel diskModel : getDisks()) { - storage_domains destStorageDomain = iSingleStorageDomain ? - (storage_domains) getStorageDomain().getSelectedItem() : - (storage_domains) diskModel.getStorageDomain().getSelectedItem(); - + storage_domains destStorageDomain = (storage_domains) diskModel.getStorageDomain().getSelectedItem(); storage_domains sourceStorageDomain = (storage_domains) diskModel.getSourceStorageDomain().getSelectedItem(); Guid sourceStorageDomainGuid = sourceStorageDomain != null ? sourceStorageDomain.getId() : Guid.Empty; DiskImage disk = (DiskImage) diskModel.getDisk(); if (diskModel.getQuota().getSelectedItem() != null) { - if (iSingleStorageDomain) { - disk.setQuotaId(((Quota) getQuota().getSelectedItem()).getId()); - } else { - disk.setQuotaId(((Quota) diskModel.getQuota().getSelectedItem()).getId()); - } + disk.setQuotaId(((Quota) diskModel.getQuota().getSelectedItem()).getId()); } - if (iSingleStorageDomain && getDisks().size() == 1) { - updateMoveOrCopySingleDiskParameters(parameters, diskModel); + if (destStorageDomain == null || sourceStorageDomain == null) { + continue; } - else { - if (destStorageDomain == null || sourceStorageDomain == null) { - continue; - } - Guid destStorageDomainGuid = destStorageDomain.getId(); - addMoveOrCopyParameters(parameters, - sourceStorageDomainGuid, - destStorageDomainGuid, - disk); - } + Guid destStorageDomainGuid = destStorageDomain.getId(); + addMoveOrCopyParameters(parameters, + sourceStorageDomainGuid, + destStorageDomainGuid, + disk); } return parameters; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/CopyDiskModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/CopyDiskModel.java index fd8b0ed..86e1adb 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/CopyDiskModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/CopyDiskModel.java @@ -16,7 +16,6 @@ import org.ovirt.engine.ui.frontend.INewAsyncCallback; import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; import org.ovirt.engine.ui.uicommonweb.models.storage.MoveOrCopyDiskModel; -import org.ovirt.engine.ui.uicommonweb.models.vms.DiskModel; import org.ovirt.engine.ui.uicompat.FrontendMultipleActionAsyncResult; import org.ovirt.engine.ui.uicompat.IFrontendMultipleActionAsyncCallback; @@ -60,26 +59,6 @@ copyDiskModel.onInitStorageDomains(storageDomains); } }), ((DiskImage) disk).getstorage_pool_id().getValue()); - } - - @Override - protected void updateMoveOrCopySingleDiskParameters(ArrayList<VdcActionParametersBase> parameters, - DiskModel diskModel) { - - ArrayList<storage_domains> selectedStorageDomains = new ArrayList<storage_domains>(); - if (diskModel.getStorageDomain().getSelectedItems() != null) { - selectedStorageDomains.addAll(diskModel.getStorageDomain().getSelectedItems()); - } - else { - selectedStorageDomains.add((storage_domains) diskModel.getStorageDomain().getSelectedItem()); - } - - for (storage_domains storageDomain : selectedStorageDomains) { - addMoveOrCopyParameters(parameters, - Guid.Empty, - storageDomain.getId(), - (DiskImage) diskModel.getDisk()); - } } @Override diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateDiskListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateDiskListModel.java index ed8b92a..60aee96 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateDiskListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateDiskListModel.java @@ -282,7 +282,6 @@ VmTemplate template = (VmTemplate) getEntity(); CopyDiskModel model = new CopyDiskModel(); - model.setIsSingleDiskCopy(disks.size() == 1); setWindow(model); model.setTitle(ConstantsManager.getInstance().getConstants().copyDisksTitle()); model.setHashName("copy_disk"); //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java index dcb1f88..5704677 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java @@ -677,11 +677,8 @@ newvm.setQuotaId(((Quota) model.getQuota().getSelectedItem()).getId()); } - addVmTemplateParameters.setDiskInfoDestinationMap( - model.getDisksAllocationModel() - .getImageToDestinationDomainMap((Boolean) model.getDisksAllocationModel() - .getIsSingleStorageDomain() - .getEntity())); + addVmTemplateParameters.setDiskInfoDestinationMap(model.getDisksAllocationModel() + .getImageToDestinationDomainMap()); Frontend.RunAction(VdcActionType.AddVmTemplate, addVmTemplateParameters, new IFrontendActionAsyncCallback() { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/MoveDiskModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/MoveDiskModel.java index 905f0ae..6f79afc 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/MoveDiskModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/MoveDiskModel.java @@ -63,18 +63,6 @@ } @Override - protected void updateMoveOrCopySingleDiskParameters(ArrayList<VdcActionParametersBase> parameters, - DiskModel diskModel) { - - storage_domains selectedStorageDomain = (storage_domains) diskModel.getStorageDomain().getSelectedItem(); - - addMoveOrCopyParameters(parameters, - Guid.Empty, - selectedStorageDomain.getId(), - (DiskImage) diskModel.getDisk()); - } - - @Override protected VdcActionType getActionType() { return VdcActionType.MoveDisks; } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java index 05dc26f..be10615 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java @@ -840,7 +840,6 @@ VM vm = getEntity(); MoveDiskModel model = new MoveDiskModel(); - model.setIsSingleDiskMove(disks.size() == 1); setWindow(model); model.setVmId(vm.getStatus() == VMStatus.Up ? vm.getId() : null); model.setWarningAvailable(vm.getStatus() == VMStatus.Up); 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 ee3587a..8a471ec 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 @@ -1832,10 +1832,7 @@ addVmTemplateParameters.setPublicUse((Boolean) model.getIsTemplatePublic().getEntity()); addVmTemplateParameters.setDiskInfoDestinationMap( - model.getDisksAllocationModel() - .getImageToDestinationDomainMap((Boolean) model.getDisksAllocationModel() - .getIsSingleStorageDomain() - .getEntity())); + model.getDisksAllocationModel().getImageToDestinationDomainMap()); model.StartProgress(null); @@ -2487,10 +2484,8 @@ ArrayList<storage_domains> activeStorageDomains = unitVmModel.getDisksAllocationModel().getActiveStorageDomains(); - HashMap<Guid, DiskImage> dict = unitVmModel.getDisksAllocationModel() - .getImageToDestinationDomainMap((Boolean) unitVmModel.getDisksAllocationModel() - .getIsSingleStorageDomain() - .getEntity()); + HashMap<Guid, DiskImage> dict = + unitVmModel.getDisksAllocationModel().getImageToDestinationDomainMap(); for (DiskImage templateDisk : templateDisks) { DiskModel disk = null; @@ -2524,13 +2519,8 @@ } } - storage_domains storageDomain = - (storage_domains) unitVmModel.getDisksAllocationModel() - .getStorageDomain().getSelectedItem(); - AddVmFromTemplateParameters param = - new AddVmFromTemplateParameters(vmListModel.getcurrentVm(), - dict, storageDomain.getId()); + new AddVmFromTemplateParameters(vmListModel.getcurrentVm(), dict, Guid.Empty); ArrayList<VdcActionParametersBase> parameters = new ArrayList<VdcActionParametersBase>(); parameters.add(param); @@ -2559,11 +2549,7 @@ model.StartProgress(null); VmManagementParametersBase params = new VmManagementParametersBase(getcurrentVm()); - params.setDiskInfoDestinationMap( - model.getDisksAllocationModel() - .getImageToDestinationDomainMap((Boolean) model.getDisksAllocationModel() - .getIsSingleStorageDomain() - .getEntity())); + params.setDiskInfoDestinationMap(model.getDisksAllocationModel().getImageToDestinationDomainMap()); ArrayList<VdcActionParametersBase> parameters = new ArrayList<VdcActionParametersBase>(); parameters.add(params); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java index 4ced183..54a4584 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java @@ -29,7 +29,6 @@ import org.ovirt.engine.core.common.businessentities.VmOsType; import org.ovirt.engine.core.common.businessentities.VmTemplate; import org.ovirt.engine.core.common.businessentities.VolumeType; -import org.ovirt.engine.core.common.businessentities.storage_domains; import org.ovirt.engine.core.common.businessentities.storage_pool; import org.ovirt.engine.core.common.queries.GetAllVmSnapshotsByVmIdParameters; import org.ovirt.engine.core.common.queries.VdcQueryType; @@ -668,19 +667,7 @@ HashMap<Guid, DiskImage> imageToDestinationDomainMap = model.getDisksAllocationModel().getImageToDestinationDomainMap(); - storage_domains storageDomain = - ((storage_domains) model.getDisksAllocationModel().getStorageDomain().getSelectedItem()); ArrayList<DiskImage> diskInfoList = CreateDiskInfoList(); - - if ((Boolean) model.getDisksAllocationModel().getIsSingleStorageDomain().getEntity()) { - for (Guid key : imageToDestinationDomainMap.keySet()) { - ArrayList<Guid> storageIdList = new ArrayList<Guid>(); - storageIdList.add(storageDomain.getId()); - DiskImage diskImage = new DiskImage(); - diskImage.setstorage_ids(storageIdList); - imageToDestinationDomainMap.put(key, diskImage); - } - } AddVmFromSnapshotParameters parameters = new AddVmFromSnapshotParameters(getcurrentVm().getStaticData(), snapshot.getId()); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java index fc03ead..b419aea 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java @@ -821,9 +821,6 @@ @DefaultStringValue("Close") String closeText(); - @DefaultStringValue("Storage domain can be modified only when 'Single Destination Domain' is unchecked") - String importVmTemplateSingleStorageCheckedLabel(); - @DefaultStringValue("Allocation can be modified only when importing a single VM") String importAllocationModifiedSingleVM(); -- To view, visit http://gerrit.ovirt.org/11874 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibd8fe9ff1f2535e2298b73cd650f695465966da5 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
