Tomas Jelinek has uploaded a new change for review. Change subject: webadmin: added optimized for desktop/server ......................................................................
webadmin: added optimized for desktop/server Change-Id: I83ddfe3c3159a1a371bd95dda2474138cc3f2dca Signed-off-by: Tomas Jelinek <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java 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/builders/network/AddNullNetworkBuilder.java A frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/OptimizedFor.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties 8 files changed, 44 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/73/13273/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java index 3fea09b..f067dab 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java @@ -352,6 +352,9 @@ @DefaultStringValue("Image") String imageType(); + @DefaultStringValue("Optimized For") + String optimizedFor(); + @DefaultStringValue("Pool") String poolVmPopup(); 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 788f1b2..599a0a1 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 @@ -121,6 +121,11 @@ public ListModelListBoxEditor<Object> instanceTypeEditor; @UiField(provided = true) + @Path(value = "optimizedFor.selectedItem") + @WithElementId("optimizedFor") + public ListModelListBoxEditor<Object> optimizedForEditor; + + @UiField(provided = true) @Path(value = "imageType.selectedItem") @WithElementId("imageType") public ListModelListBoxEditor<Object> imageTypeEditor; @@ -653,6 +658,8 @@ } }); + optimizedForEditor = new ListModelListBoxEditor<Object>(new EnumRenderer()); + dataCenterEditor = new ListModelListBoxEditor<Object>(new NullSafeRenderer<Object>() { @Override public String renderNullSafe(Object object) { @@ -788,6 +795,7 @@ instanceTypeEditor.setLabel(constants.instanceType()); imageTypeEditor.setLabel(constants.imageType()); + optimizedForEditor.setLabel(constants.optimizedFor()); // Pools Tab poolTab.setLabel(constants.poolVmPopup()); 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 eb56aba..1999b1c 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 @@ -282,6 +282,9 @@ <e:ListModelListBoxEditor ui:field="instanceTypeEditor" /> <e:ListModelListBoxEditor ui:field="imageTypeEditor" /> </g:FlowPanel> + + <e:ListModelListBoxEditor ui:field="optimizedForEditor" /> + <g:FlowPanel ui:field="logicalNetworksEditorPanel" addStyleNames="{style.sectionPanel}"> <n:LogicalNetworksEditor ui:field="logicalNetworksEditor" /> </g:FlowPanel> diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/builders/network/AddNullNetworkBuilder.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/builders/network/AddNullNetworkBuilder.java index c39582b..457b9c0 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/builders/network/AddNullNetworkBuilder.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/builders/network/AddNullNetworkBuilder.java @@ -39,7 +39,6 @@ String clusteVersion = cluster.getcompatibility_version().getValue(); return (Boolean) AsyncDataProvider.GetConfigValuePreConverted(ConfigurationValues.NetworkLinkingSupported, clusteVersion); - } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/OptimizedFor.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/OptimizedFor.java new file mode 100644 index 0000000..53dcdc3 --- /dev/null +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/OptimizedFor.java @@ -0,0 +1,6 @@ +package org.ovirt.engine.ui.uicommonweb.models.vms; + +public enum OptimizedFor { + SERVER, + DESKTOP +} 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 330c13e..3f3b569 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 @@ -400,6 +400,16 @@ return imageType; } + private ListModel optimizedFor; + + public ListModel getOptimizedFor() { + return optimizedFor; + } + + public void setOptimizedFor(ListModel optimizedFor) { + this.optimizedFor = optimizedFor; + } + private void setImageType(ListModel imageType) { this.imageType = imageType; } @@ -1087,6 +1097,7 @@ setInstanceType(new ListModel()); setImageType(new ListModel()); + setOptimizedFor(new ListModel()); setStorageDomain(new NotChangableForVmInPoolListModel()); setName(new NotChangableForVmInPoolEntityModel()); setNumOfMonitors(new NotChangableForVmInPoolListModel()); @@ -1246,6 +1257,7 @@ getCdImage().setIsChangable(false); + initOptimizedFor(); InitOSType(); InitDisplayProtocol(); InitFirstBootDevice(); @@ -1258,6 +1270,11 @@ behavior.Initialize(SystemTreeSelectedItem); } + private void initOptimizedFor() { + getOptimizedFor().setItems(Arrays.asList(OptimizedFor.SERVER, OptimizedFor.DESKTOP)); + getOptimizedFor().setSelectedItem(OptimizedFor.SERVER); + } + @Override public void eventRaised(Event ev, Object sender, EventArgs args) { diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java index b430d66..65a0d31 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java @@ -632,4 +632,9 @@ String MigrationSupport___IMPLICITLY_NON_MIGRATABLE(); String MigrationSupport___PINNED_TO_HOST(); + + String OptimizedFor___SERVER(); + + String OptimizedFor___DESKTOP(); + } diff --git a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties index d92f953..7fdc170 100644 --- a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties +++ b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties @@ -313,3 +313,5 @@ MigrationSupport___MIGRATABLE=Allow manual and automatic migration MigrationSupport___IMPLICITLY_NON_MIGRATABLE=Allow manual migration only MigrationSupport___PINNED_TO_HOST=Do not allow migration +OptimizedFor___SERVER=Server +OptimizedFor___DESKTOP=Desktop -- To view, visit http://gerrit.ovirt.org/13273 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I83ddfe3c3159a1a371bd95dda2474138cc3f2dca Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tomas Jelinek <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
