Shahar Havivi has uploaded a new change for review. Change subject: vminit: add cloudinit to add/edit vm ......................................................................
vminit: add cloudinit to add/edit vm Change-Id: I0ffdfb012b296232bcdc5407d05cd65f3572df75 Signed-off-by: Shahar Havivi <[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/AbstractVmPopupWidget.ui.xml M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java 3 files changed, 33 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/22/22722/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 46463c3..4d2336f 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 @@ -3,6 +3,7 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.editor.client.SimpleBeanEditorDriver; +import com.google.gwt.editor.client.Editor.Ignore; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.logical.shared.ValueChangeEvent; @@ -23,9 +24,11 @@ import com.google.gwt.user.client.ui.RadioButton; import com.google.gwt.user.client.ui.ValueLabel; import com.google.gwt.user.client.ui.Widget; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; + import org.ovirt.engine.core.common.businessentities.BootSequence; import org.ovirt.engine.core.common.businessentities.Disk; import org.ovirt.engine.core.common.businessentities.Disk.DiskStorageType; @@ -71,6 +74,7 @@ import org.ovirt.engine.ui.common.widget.renderer.MemorySizeRenderer; import org.ovirt.engine.ui.common.widget.renderer.NullSafeRenderer; import org.ovirt.engine.ui.common.widget.table.column.TextColumnWithTooltip; +import org.ovirt.engine.ui.common.widget.uicommon.popup.vm.CloudInitWidget; import org.ovirt.engine.ui.common.widget.uicommon.popup.vm.PopupWidgetConfigMap; import org.ovirt.engine.ui.common.widget.uicommon.storage.DisksAllocationView; import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; @@ -86,6 +90,7 @@ import org.ovirt.engine.ui.uicompat.IEventListener; import org.ovirt.engine.ui.uicompat.PropertyChangedEventArgs; import org.ovirt.engine.ui.uicompat.external.StringUtils; + import static org.ovirt.engine.ui.common.widget.uicommon.popup.vm.PopupWidgetConfig.simpleField; public abstract class AbstractVmPopupWidget extends AbstractModeSwitchingPopupWidget<UnitVmModel> { @@ -341,6 +346,11 @@ @Path("assignedVms.entity") public ValueLabel<Integer> outOfxInPool; + @UiField(provided = true) + @Path(value = "timeZone.selectedItem") + @WithElementId("timeZone") + public ListModelListBoxEditor<TimeZoneModel> timeZoneEditor; + // ==Initial run Tab== @UiField protected DialogTab initialRunTab; @@ -350,10 +360,10 @@ @WithElementId("domain") public ListModelListBoxEditor<String> domainEditor; - @UiField(provided = true) - @Path(value = "timeZone.selectedItem") - @WithElementId("timeZone") - public ListModelListBoxEditor<TimeZoneModel> timeZoneEditor; + @UiField + @Ignore + public CloudInitWidget cloudInitEditor; + // ==Console Tab== @UiField @@ -1064,6 +1074,7 @@ driver.edit(model); profilesInstanceTypeEditor.edit(model.getNicsWithLogicalNetworks()); customPropertiesSheetEditor.edit(model.getCustomPropertySheet()); + cloudInitEditor.edit(model.getCloudInitModel()); initTabAvailabilityListeners(model); initListeners(model); hideAlwaysHiddenFields(); @@ -1348,6 +1359,7 @@ public UnitVmModel flush() { priorityEditor.flush(); profilesInstanceTypeEditor.flush(); + cloudInitEditor.flush(); return driver.flush(); } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml index f208d55..58cba13 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml @@ -7,7 +7,8 @@ xmlns:t="urn:import:org.ovirt.engine.ui.common.widget.dialog.tab" xmlns:s="urn:import:org.ovirt.engine.ui.common.widget.uicommon.storage" xmlns:k="urn:import:org.ovirt.engine.ui.common.widget.form.key_value" - xmlns:p="urn:import:org.ovirt.engine.ui.common.widget.profile"> + xmlns:p="urn:import:org.ovirt.engine.ui.common.widget.profile" + xmlns:vm="urn:import:org.ovirt.engine.ui.common.widget.uicommon.popup.vm"> <ui:with field='resources' type='org.ovirt.engine.ui.common.CommonApplicationResources' /> <ui:with field='constants' type='org.ovirt.engine.ui.common.CommonApplicationConstants'/> @@ -413,6 +414,8 @@ <e:ListModelListBoxEditor ui:field="numOfSocketsEditor" /> </g:FlowPanel> </g:FlowPanel> + <g:Label addStyleNames="{style.sectionLabel}" text="{constants.initialRunGeneral}" /> + <e:ListModelListBoxEditor ui:field="timeZoneEditor" /> </g:FlowPanel> </t:content> </t:DialogTab> @@ -430,10 +433,9 @@ <t:DialogTab ui:field="initialRunTab"> <t:content> <g:FlowPanel> - <g:Label addStyleNames="{style.sectionLabel}" text="{constants.initialRunGeneral}" /> - <e:ListModelListBoxEditor ui:field="timeZoneEditor" /> <g:Label addStyleNames="{style.sectionLabel}" text="{constants.initialRunWindows}" /> <e:ListModelListBoxEditor ui:field="domainEditor" /> + <vm:CloudInitWidget ui:field="cloudInitEditor"/> </g:FlowPanel> </t:content> </t:DialogTab> diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java index 4133ee0..e156ef7 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java @@ -913,6 +913,17 @@ privateCustomProperties = value; } + private CloudInitModel cloudInitModel; + + public CloudInitModel getCloudInitModel() { + return cloudInitModel; + } + + public void setCloudInitModel(CloudInitModel cloudInitModel) { + this.cloudInitModel = cloudInitModel; + } + + private NotChangableForVmInPoolKeyValueModel customPropertySheet; public KeyValueModel getCustomPropertySheet() { @@ -1214,6 +1225,7 @@ setDisplayProtocol(new NotChangableForVmInPoolListModel<EntityModel<DisplayType>>()); setSecondBootDevice(new NotChangableForVmInPoolListModel<EntityModel<BootSequence>>()); setPriority(new NotChangableForVmInPoolListModel<EntityModel<Integer>>()); + setCloudInitModel(new CloudInitModel()); setTemplate(new NotChangableForVmInPoolListModel<VmTemplate>()); getTemplate().getSelectedItemChangedEvent().addListener(this); -- To view, visit http://gerrit.ovirt.org/22722 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0ffdfb012b296232bcdc5407d05cd65f3572df75 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
