ofri masad has uploaded a new change for review. Change subject: webadmin: Add Ballooning to UI ......................................................................
webadmin: Add Ballooning to UI this patch adds the necessary UI for enabling and disabling ballooning feature on the hosts. Change-Id: I8d8f0701f64a1ebf76965cfcbdec2912158c0c90 Bug-Url: https://bugzilla.redhat.com/967572 Signed-off-by: Ofri Masad <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.ui.xml 5 files changed, 36 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/37/16737/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java index d49afd5..1e1ef69 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java @@ -366,6 +366,7 @@ clusterModel.getClusterPolicyModel().getOverCommitTime().setEntity(cluster.getcpu_over_commit_duration_minutes()); clusterModel.getClusterPolicyModel().setOverCommitLowLevel(cluster.getlow_utilization()); clusterModel.getClusterPolicyModel().setOverCommitHighLevel(cluster.gethigh_utilization()); + clusterModel.getEnableBallooning().setEntity(cluster.isEnableBallooning()); clusterModel.getClusterPolicyModel().saveDefaultValues(); if (cluster.supportsTrustedService()) @@ -638,6 +639,8 @@ cluster.setmax_vds_memory_over_commit(model.getMemoryOverCommit()); cluster.setCountThreadsAsCores(Boolean.TRUE.equals(model.getVersionSupportsCpuThreads().getEntity()) && Boolean.TRUE.equals(model.getCountThreadsAsCores().getEntity())); + cluster.setEnableBallooning(Boolean.TRUE.equals(model.getEnableBallooning().getEntity()) + && version.compareTo(Version.v3_3) >= 0); cluster.setTransparentHugepages(version.compareTo(new Version("3.0")) >= 0); //$NON-NLS-1$ cluster.setcompatibility_version(version); cluster.setMigrateOnError(model.getMigrateOnErrorOption()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java index add6412..52da17a 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java @@ -435,6 +435,16 @@ privateMigrateOnErrorOption_HA_ONLY = value; } + private EntityModel enableBallooning; + + public EntityModel getEnableBallooning() { + return enableBallooning; + } + + public void setEnableBallooning(EntityModel enableBallooning) { + this.enableBallooning = enableBallooning; + } + private boolean isGeneralTabValid; public boolean getIsGeneralTabValid() @@ -739,7 +749,8 @@ tempVar7.setEntity(false); setMigrateOnErrorOption_HA_ONLY(tempVar7); getMigrateOnErrorOption_HA_ONLY().getEntityChangedEvent().addListener(this); - + setEnableBallooning(new EntityModel()); + getEnableBallooning().setEntity(false); // Optimization methods: // default value =100; setDefaultMemoryOvercommit(AsyncDataProvider.getClusterDefaultMemoryOverCommit()); @@ -897,6 +908,7 @@ setMemoryOverCommit(getEntity().getmax_vds_memory_over_commit()); getCountThreadsAsCores().setEntity(getEntity().getCountThreadsAsCores()); + getEnableBallooning().setEntity(getEntity().isEnableBallooning()); AsyncQuery _asyncQuery = new AsyncQuery(); _asyncQuery.setModel(this); @@ -1028,7 +1040,7 @@ // CPU Thread support is only available for clusters of version 3.2 or greater getVersionSupportsCpuThreads().setEntity(version.compareTo(Version.v3_2) >= 0); - + getEnableBallooning().setIsChangable(version.compareTo(Version.v3_3) >= 0); } private void initCPU() 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 a8f38ee..42c54f9 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 @@ -136,6 +136,12 @@ @DefaultStringValue("Enable Trusted Service") String clusterPolicyEnableTrustedServiceLabel(); + @DefaultStringValue("Enable Ballooning") + String enableBallooningLabel(); + + @DefaultStringValue("Ballooning") + String ballooningLabelTitle(); + @DefaultStringValue("VM network") String clusterNewNetworkPopupVmNetworkLabel(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.java index 90e9eb0..07ef7c1 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.java @@ -296,6 +296,11 @@ @WithElementId EntityModelCheckBoxEditor enableTrustedServiceEditor; + @UiField(provided = true) + @Path(value = "enableBallooning.entity") + @WithElementId + EntityModelCheckBoxEditor enableBallooning; + private final Driver driver = GWT.create(Driver.class); private final ApplicationMessages messages; @@ -386,6 +391,7 @@ additionPropsPanelTitle.setText(constants.clusterPolicyAdditionalPropsPanelTitle()); enableTrustedServiceEditor.setLabel(constants.clusterPolicyEnableTrustedServiceLabel()); + enableBallooning.setLabel(constants.enableBallooningLabel()); } private void initRadioButtonEditors() { @@ -433,6 +439,8 @@ countThreadsAsCoresEditor = new EntityModelCheckBoxEditor(Align.RIGHT); enableTrustedServiceEditor = new EntityModelCheckBoxEditor(Align.RIGHT); + + enableBallooning = new EntityModelCheckBoxEditor(Align.RIGHT); } private void initInfoIcons(ApplicationResources resources, ApplicationConstants constants, ApplicationTemplates templates) diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.ui.xml index 399955b..8ce7fb8 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.ui.xml @@ -6,6 +6,7 @@ xmlns:f="urn:import:org.ovirt.engine.ui.common.widget.form"> <ui:with field='resources' type='org.ovirt.engine.ui.webadmin.ApplicationResources' /> + <ui:with field='constants' type='org.ovirt.engine.ui.webadmin.ApplicationConstants' /> <ui:style type="org.ovirt.engine.ui.webadmin.section.main.view.popup.cluster.ClusterPopupView.WidgetStyle"> .generalTabTopDecorator { @@ -180,6 +181,10 @@ <d:InfoIcon ui:field="cpuThreadsInfo" addStyleNames="{style.panelInfo}" /> <e:EntityModelCheckBoxEditor ui:field="countThreadsAsCoresEditor" /> </g:FlowPanel> + <g:FlowPanel addStyleNames="{style.nestedSubsequentPanel}"> + <g:Label text="{constants.ballooningLabelTitle}" addStyleNames="{style.panelTitle}" /> + <e:EntityModelCheckBoxEditor ui:field="enableBallooning" /> + </g:FlowPanel> </g:FlowPanel> </t:content> </t:DialogTab> -- To view, visit http://gerrit.ovirt.org/16737 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8d8f0701f64a1ebf76965cfcbdec2912158c0c90 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: ofri masad <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
