Arik Hadas has uploaded a new change for review. Change subject: webadmin: cow-sparse base volumes of templates ......................................................................
webadmin: cow-sparse base volumes of templates Change-Id: Id269321c793e4b2af2c8efb153c37a3721f8cbf7 Bug-Url: https://bugzilla.redhat.com/1168576 Signed-off-by: Arik Hadas <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmMakeTemplatePopupWidget.ui.xml M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationItemView.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationItemView.ui.xml M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationView.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/DisksAllocationModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/DiskModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/VmMakeTemplatePopupView.java 13 files changed, 92 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/77/38377/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmMakeTemplatePopupWidget.ui.xml b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmMakeTemplatePopupWidget.ui.xml index 92f3a7b..7680277 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmMakeTemplatePopupWidget.ui.xml +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmMakeTemplatePopupWidget.ui.xml @@ -47,7 +47,7 @@ <ge:StringEntityModelTextBoxEditor ui:field="templateVersionNameEditor" /> </g:FlowPanel> <g:Label ui:field="disksAllocationLabel" addStyleNames="{style.disksAllocationLabel}" /> - <w:DisksAllocationView ui:field="disksAllocationView" listHeight="145px" listWidth="475px" addStyleNames="{style.disksAllocationPanel}" /> + <w:DisksAllocationView ui:field="disksAllocationView" listHeight="145px" listWidth="560px" addStyleNames="{style.disksAllocationPanel}" /> <g:FlowPanel> <ge:EntityModelCheckBoxEditor ui:field="isTemplatePublicEditor" /> <ge:EntityModelCheckBoxEditor ui:field="copyVmPermissions" /> diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationItemView.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationItemView.java index 67a8b66..a527d87 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationItemView.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationItemView.java @@ -3,6 +3,7 @@ import org.ovirt.engine.core.common.businessentities.DiskImage; import org.ovirt.engine.core.common.businessentities.Quota; import org.ovirt.engine.core.common.businessentities.StorageDomain; +import org.ovirt.engine.core.common.businessentities.VolumeFormat; import org.ovirt.engine.core.common.businessentities.VolumeType; import org.ovirt.engine.core.common.businessentities.profiles.DiskProfile; import org.ovirt.engine.core.common.utils.SizeConverter; @@ -72,6 +73,10 @@ ListModelListBoxEditor<VolumeType> volumeTypeListEditor; @UiField(provided = true) + @Path(value = "volumeFormat.selectedItem") + ListModelListBoxEditor<VolumeFormat> volumeFormatListEditor; + + @UiField(provided = true) @Path(value = "sourceStorageDomain.selectedItem") ListModelListBoxEditor<StorageDomain> sourceStorageListEditor; @@ -110,6 +115,8 @@ void initEditors() { volumeTypeListEditor = new ListModelListBoxEditor<VolumeType>(new EnumRenderer<VolumeType>()); + volumeFormatListEditor = new ListModelListBoxEditor<VolumeFormat>(new EnumRenderer<VolumeFormat>()); + storageListEditor = new ListModelListBoxEditor<StorageDomain>(new StorageDomainFreeSpaceRenderer<StorageDomain>()); sourceStorageListEditor = new ListModelListBoxEditor<StorageDomain>(new StorageDomainFreeSpaceRenderer<StorageDomain>()); @@ -137,6 +144,7 @@ updateEditorStyle(diskSizeLabel, editorStyle); updateEditorStyle(sourceStorageLabel, editorStyle); updateEditorStyle(volumeTypeListEditor, editorStyle); + updateEditorStyle(volumeFormatListEditor, editorStyle); updateEditorStyle(sourceStorageListEditor, editorStyle); updateEditorStyle(storageListEditor, editorStyle); updateEditorStyle(diskProfileListEditor, editorStyle); @@ -164,6 +172,7 @@ object.getSize().getEntity()))); object.getVolumeType().setSelectedItem(((DiskImage) object.getDisk()).getVolumeType()); + object.getVolumeFormat().setSelectedItem(((DiskImage) object.getDisk()).getVolumeFormat()); sourceStorageLabel.getElement().getElementsByTagName("input").getItem(0). //$NON-NLS-1$ getStyle().setBorderColor("transparent"); //$NON-NLS-1$ @@ -188,6 +197,8 @@ ElementIdUtils.createElementId(elementId, "sourceStorageDomainName")); //$NON-NLS-1$ volumeTypeListEditor.setElementId( ElementIdUtils.createElementId(elementId, "volumeType")); //$NON-NLS-1$ + volumeFormatListEditor.setElementId( + ElementIdUtils.createElementId(elementId, "volumeFormat")); //$NON-NLS-1$ sourceStorageListEditor.setElementId( ElementIdUtils.createElementId(elementId, "sourceStorageDomain")); //$NON-NLS-1$ storageListEditor.setElementId( diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationItemView.ui.xml b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationItemView.ui.xml index 582f2bd..cc1c65b 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationItemView.ui.xml +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/DisksAllocationItemView.ui.xml @@ -9,7 +9,7 @@ .editorLabel { display: none; } - + .editorContentNarrow { width: 95px; margin-left: 5px; @@ -33,6 +33,7 @@ <ge:StringEntityModelLabelEditor ui:field="diskSizeLabel" /> <ge:StringEntityModelLabelEditor ui:field="sourceStorageLabel" /> <e:ListModelListBoxEditor ui:field="volumeTypeListEditor" /> + <e:ListModelListBoxEditor ui:field="volumeFormatListEditor" /> <e:ListModelListBoxEditor ui:field="sourceStorageListEditor" /> <e:ListModelListBoxEditor ui:field="storageListEditor" /> <e:ListModelListBoxEditor ui:field="diskProfileListEditor" /> 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 50a9281..bfa00ce 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 @@ -51,6 +51,7 @@ boolean showVolumeType; boolean showSource; boolean showQuota; + boolean showVolumeFormat; private final Driver driver = GWT.create(Driver.class); @@ -89,6 +90,9 @@ if (showVolumeType) listHeader.addColumn(new EmptyColumn(), constants.allocationDisk(), width); + if (showVolumeFormat) + listHeader.addColumn(new EmptyColumn(), constants.formatDisk(), width); + if (showSource) listHeader.addColumn(new EmptyColumn(), constants.sourceDisk(), width); @@ -106,6 +110,7 @@ void updateColumnsAvailability(DisksAllocationModel model) { setShowVolumeType(model.getIsVolumeTypeAvailable()); + setShowVolumeFormat(model.getIsVolumeFormatAvailable()); setShowQuota(model.getQuotaEnforcementType() != QuotaEnforcementTypeEnum.DISABLED); } @@ -164,6 +169,10 @@ this.showVolumeType = showVolumeType; } + public void setShowVolumeFormat(boolean showVolumeFormat) { + this.showVolumeFormat = showVolumeFormat; + } + public void setShowSource(boolean showSource) { this.showSource = showSource; } 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 aed9124..d3276df 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 @@ -1343,6 +1343,16 @@ } } + public VolumeType getDiskVolumeType(VolumeFormat volumeType, StorageType storageType) { + switch (volumeType) { + case COW: + return VolumeType.Sparse; + case RAW: + default: + return storageType.isFileDomain() ? VolumeType.Sparse : VolumeType.Preallocated; + } + } + public void getClusterNetworkList(AsyncQuery aQuery, Guid clusterId) { // do not replace a converter = just add if none provided if (aQuery.converterCallback == null) { @@ -3231,6 +3241,13 @@ })); } + public ArrayList<VolumeFormat> getVolumeFormats() { + return new ArrayList<VolumeFormat>(Arrays.asList( + VolumeFormat.COW, + VolumeFormat.RAW + )); + } + public ArrayList<StorageType> getStorageTypeList() { return new ArrayList<StorageType>(Arrays.asList(new StorageType[] { 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 d9c64f3..efa956e 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 @@ -11,6 +11,7 @@ import org.ovirt.engine.core.common.businessentities.Quota; import org.ovirt.engine.core.common.businessentities.QuotaEnforcementTypeEnum; import org.ovirt.engine.core.common.businessentities.StorageDomain; +import org.ovirt.engine.core.common.businessentities.VolumeFormat; import org.ovirt.engine.core.common.businessentities.VolumeType; import org.ovirt.engine.core.common.businessentities.profiles.DiskProfile; import org.ovirt.engine.core.common.queries.IdQueryParameters; @@ -127,6 +128,7 @@ return quotaEnforcementType; } + private boolean volumeFormatAvailable; private boolean isVolumeTypeAvailable; private boolean isVolumeFormatChangable; private boolean isAliasChangable; @@ -278,7 +280,13 @@ diskImage.setQuotaId(diskModel.getQuota().getSelectedItem().getId()); } - if (diskModel.getVolumeType().getIsAvailable()) { + if (diskModel.getVolumeFormat().getIsAvailable()) { + VolumeFormat volumeFormat = diskModel.getVolumeFormat().getSelectedItem(); + diskImage.setvolumeFormat(volumeFormat); + diskImage.setVolumeType(AsyncDataProvider.getInstance().getDiskVolumeType( + volumeFormat, storageDomain.getStorageType())); + } + else if (diskModel.getVolumeType().getIsAvailable()) { VolumeType volumeType = diskModel.getVolumeType().getSelectedItem(); diskImage.setVolumeType(volumeType); diskImage.setvolumeFormat(AsyncDataProvider.getInstance().getDiskVolumeFormat( @@ -342,6 +350,14 @@ return isVolumeTypeAvailable; } + public void setIsVolumeFormatAvailable(boolean isVolumeFormatAvailable) { + this.volumeFormatAvailable = isVolumeFormatAvailable; + } + + public boolean getIsVolumeFormatAvailable() { + return volumeFormatAvailable; + } + public boolean getIsAliasChangable() { return isAliasChangable; } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java index d2a9efd..44e991f 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java @@ -22,7 +22,6 @@ import org.ovirt.engine.core.common.businessentities.VDSStatus; import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.VMStatus; -import org.ovirt.engine.core.common.businessentities.VolumeFormat; import org.ovirt.engine.core.common.businessentities.VolumeType; import org.ovirt.engine.core.common.businessentities.comparators.NameableComparator; import org.ovirt.engine.core.common.businessentities.profiles.DiskProfile; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/DiskModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/DiskModel.java index 272c551..1b9d728 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/DiskModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/DiskModel.java @@ -5,6 +5,7 @@ import org.ovirt.engine.core.common.businessentities.Quota; import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.VM; +import org.ovirt.engine.core.common.businessentities.VolumeFormat; import org.ovirt.engine.core.common.businessentities.VolumeType; import org.ovirt.engine.core.common.businessentities.profiles.DiskProfile; import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; @@ -28,6 +29,7 @@ private ListModel<StorageDomain> storageDomain; private ListModel<DiskProfile> diskProfile; private ListModel<Quota> quota; + private ListModel<VolumeFormat> volumeFormat; private boolean pluggedToRunningVm; @@ -85,6 +87,14 @@ public void setVolumeType(ListModel<VolumeType> volumeType) { this.volumeType = volumeType; + } + + public ListModel<VolumeFormat> getVolumeFormat() { + return volumeFormat; + } + + public void setVolumeFormat(ListModel<VolumeFormat> volumeFormat) { + this.volumeFormat = volumeFormat; } public ListModel<DiskInterface> getDiskInterface() { @@ -150,5 +160,8 @@ setVolumeType(new ListModel<VolumeType>()); getVolumeType().setItems(AsyncDataProvider.getInstance().getVolumeTypeList()); + + setVolumeFormat(new ListModel<VolumeFormat>()); + getVolumeFormat().setItems(AsyncDataProvider.getInstance().getVolumeFormats()); } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java index 688bb5f..61ddabf 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java @@ -4,6 +4,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; + import org.ovirt.engine.core.common.businessentities.ActionGroup; import org.ovirt.engine.core.common.businessentities.Disk; import org.ovirt.engine.core.common.businessentities.Disk.DiskStorageType; @@ -16,7 +17,6 @@ import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.VmBase; import org.ovirt.engine.core.common.businessentities.VmTemplate; -import org.ovirt.engine.core.common.businessentities.VolumeType; import org.ovirt.engine.core.common.businessentities.comparators.NameableComparator; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.ui.frontend.AsyncQuery; @@ -26,7 +26,6 @@ import org.ovirt.engine.ui.uicommonweb.builders.vm.CommonVmBaseToUnitBuilder; import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; import org.ovirt.engine.ui.uicommonweb.models.EntityModel; -import org.ovirt.engine.ui.uicommonweb.models.ListModel; import org.ovirt.engine.ui.uicommonweb.models.SystemTreeItemModel; import org.ovirt.engine.ui.uicommonweb.models.SystemTreeItemType; import org.ovirt.engine.ui.uicommonweb.models.storage.DisksAllocationModel; @@ -56,6 +55,7 @@ getModel().getCopyPermissions().setIsAvailable(true); DisksAllocationModel disksAllocationModel = getModel().getDisksAllocationModel(); + disksAllocationModel.setIsVolumeFormatAvailable(true); disksAllocationModel.setIsAliasChangable(true); AsyncDataProvider.getInstance().getDataCenterById(new AsyncQuery(getModel(), @@ -111,6 +111,12 @@ } }), vm.getStoragePoolId()); + } + + @Override + protected void updateDiskModel(DiskModel diskModel) { + super.updateDiskModel(diskModel); + diskModel.getVolumeFormat().setIsAvailable(true); } protected void updateTemplate() @@ -245,11 +251,6 @@ EntityModel<Integer> size = new EntityModel<Integer>(); size.setEntity((int) diskImage.getSizeInGigabytes()); diskModel.setSize(size); - ListModel volumes = new ListModel(); - volumes.setItems((diskImage.getVolumeType() == VolumeType.Preallocated ? new ArrayList<VolumeType>(Arrays.asList(new VolumeType[] {VolumeType.Preallocated})) - : AsyncDataProvider.getInstance().getVolumeTypeList())); - volumes.setSelectedItem(diskImage.getVolumeType()); - diskModel.setVolumeType(volumes); diskModel.getAlias().setEntity(diskImage.getDiskAlias()); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java index e2b6323..cd3efba 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java @@ -598,7 +598,7 @@ : AsyncDataProvider.getInstance().getVolumeTypeList())); tempVar2.setSelectedItem(diskImage.getVolumeType()); diskModel.setVolumeType(tempVar2); - diskModel.getVolumeType().setIsAvailable(false); + updateDiskModel(diskModel); } diskModel.setDisk(disk); @@ -613,6 +613,11 @@ template.getId()); } + protected void updateDiskModel(DiskModel diskModel) { + diskModel.getVolumeType().setIsAvailable(false); + diskModel.getVolumeFormat().setIsAvailable(false); + } + public void updateIsDisksAvailable() { } diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java index f1e711b..406c5d8 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java @@ -73,6 +73,10 @@ String StorageFormatType___V3(); + String VolumeFormat___COW(); + + String VolumeFormat___RAW(); + String VDSStatus___Down(); String VDSStatus___Error(); diff --git a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties index d1f2bb3..b524316 100644 --- a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties +++ b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties @@ -124,6 +124,8 @@ VolumeType___Preallocated=Preallocated VolumeType___Sparse=Thin Provision VolumeType___Unassigned=Unassigned +VolumeFormat___COW=QCOW2 +VolumeFormat___RAW=Raw VmPoolType___Automatic=Automatic VmPoolType___Manual=Manual AdRefStatus___Inactive=Inactive @@ -191,4 +193,4 @@ SerialNumberPolicy___VM_ID=Vm ID SerialNumberPolicy___CUSTOM=Custom serial number OpenstackNetworkProviderProperties$BrokerType___QPID=Qpid -OpenstackNetworkProviderProperties$BrokerType___RABBIT_MQ=RabbitMQ \ No newline at end of file +OpenstackNetworkProviderProperties$BrokerType___RABBIT_MQ=RabbitMQ diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/VmMakeTemplatePopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/VmMakeTemplatePopupView.java index 9cd79d9..68541e5 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/VmMakeTemplatePopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/VmMakeTemplatePopupView.java @@ -21,7 +21,7 @@ @Inject public VmMakeTemplatePopupView(EventBus eventBus, ApplicationResources resources, ApplicationConstants constants, CommonApplicationTemplates applicationTemplates) { - super(eventBus, resources, new VmMakeTemplatePopupWidget(constants, applicationTemplates), "490px", "580px"); //$NON-NLS-1$ //$NON-NLS-2$ + super(eventBus, resources, new VmMakeTemplatePopupWidget(constants, applicationTemplates), "575px", "580px"); //$NON-NLS-1$ //$NON-NLS-2$ ViewIdHandler.idHandler.generateAndSetIds(this); } -- To view, visit https://gerrit.ovirt.org/38377 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id269321c793e4b2af2c8efb153c37a3721f8cbf7 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
