Greg Padgett has uploaded a new change for review. Change subject: webadmin: show hosted engine info in host>general tab ......................................................................
webadmin: show hosted engine info in host>general tab Display a single entry in the host > general tab displaying hosted engine status, if it is configured on the selected host. Change-Id: I17f0eff120b2ab99b4badc53da1780c1e758299c Bug-Url: https://bugzilla.redhat.com/1047649 Signed-off-by: Greg Padgett <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/GeneralFormPanel.ui.xml M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.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/tab/host/SubTabHostGeneralView.java 6 files changed, 81 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/06/24606/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/GeneralFormPanel.ui.xml b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/GeneralFormPanel.ui.xml index 4cdb8fd..3d8de66 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/GeneralFormPanel.ui.xml +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/GeneralFormPanel.ui.xml @@ -31,6 +31,8 @@ white-space: nowrap; color: black; font-family: Arial, sans-serif; + padding-top: 1px; + padding-bottom: 2px; } @external formPanel_detailViewItemValue; @@ -39,8 +41,8 @@ color: #777777; font-family: Arial, sans-serif; padding-left: 4px; - padding-top: 4px; - padding-bottom: 4px; + padding-top: 1px; + padding-bottom: 2px; } </ui:style> diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java index 8294b57..8188686 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java @@ -649,6 +649,46 @@ } } + private String hostedEngineHa; + + public String getHostedEngineHa() + { + return hostedEngineHa; + } + + public void setHostedEngineHa(String value) + { + if (hostedEngineHa == null && value == null) + { + return; + } + if (hostedEngineHa == null || !hostedEngineHa.equals(value)) + { + hostedEngineHa = value; + onPropertyChanged(new PropertyChangedEventArgs("HostedEngineHa")); //$NON-NLS-1$ + } + } + + private Boolean hostedEngineHaIsConfigured; + + public Boolean getHostedEngineHaIsConfigured() + { + return hostedEngineHaIsConfigured; + } + + public void setHostedEngineHaIsConfigured(Boolean value) + { + if (hostedEngineHaIsConfigured == null && value == null) + { + return; + } + if (hostedEngineHaIsConfigured == null || !hostedEngineHaIsConfigured.equals(value)) + { + hostedEngineHaIsConfigured = value; + onPropertyChanged(new PropertyChangedEventArgs("HostedEngineHaIsConfigured")); //$NON-NLS-1$ + } + } + // Alert section in general tab private boolean hasAnyAlert; @@ -1097,6 +1137,22 @@ setSharedMemory(vds.getMemSharedPercent()); setMemoryPageSharing(vds.getKsmState()); setAutomaticLargePage(vds.getTransparentHugePagesState()); + + if (!vds.getHighlyAvailableIsConfigured()) { + setHostedEngineHaIsConfigured(false); + setHostedEngineHa(constants.bracketedNotAvailableLabel()); + } else { + setHostedEngineHaIsConfigured(true); + if (!vds.getHighlyAvailableIsActive()) { + setHostedEngineHa(constants.haNotActive()); + } else if (vds.getHighlyAvailableGlobalMaintenance()) { + setHostedEngineHa(constants.haGlobalMaintenance()); + } else if (vds.getHighlyAvailableLocalMaintenance()) { + setHostedEngineHa(constants.haLocalMaintenance()); + } else { + setHostedEngineHa(messages.haActive(vds.getHighlyAvailableScore())); + } + } } private void updateAlerts() diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java index 51ac3c1..1606815 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java @@ -25,6 +25,9 @@ @DefaultStringValue("N/A") String notAvailableLabel(); + @DefaultStringValue("[N/A]") + String bracketedNotAvailableLabel(); + @DefaultStringValue("Not Specified") String notSpecifiedLabel(); @@ -2134,7 +2137,6 @@ @DefaultStringValue("Not available when Templates are not configured.") String notAvailableWithNoTemplates(); - @DefaultStringValue("Connecting to pool not supported.") String connectToPoolNotSupported(); @@ -2194,5 +2196,14 @@ @DefaultStringValue("An IDE disk can't be read-only.") String cannotEnableIdeInterfaceForReadOnlyDisk(); + + @DefaultStringValue("Global Maintenance Enabled") + String haGlobalMaintenance(); + + @DefaultStringValue("Local Maintenance Enabled") + String haLocalMaintenance(); + + @DefaultStringValue("Not Active") + String haNotActive(); } diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java index 5a68f08..d6e7aaa 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java @@ -346,4 +346,7 @@ "Storage Domains belonging to the Data Center, and make them unusable with versions older than {0}. " + "Are you sure you want to continue?") String youAreAboutChangeDcCompatibilityVersionWithUpgradeMsg(String version); + + @DefaultMessage("Active (Score: {0})") + String haActive(int score); } 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 60d08ec..8dfc5bc 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 @@ -1428,6 +1428,9 @@ @DefaultStringValue("Shared Memory") String sharedMemHostGeneral(); + @DefaultStringValue("Hosted Engine HA") + String hostedEngineHaHostGeneral(); + @DefaultStringValue("Action Items") String actionItemsHostGeneral(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralView.java index 0c5d07c..945e7dd 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralView.java @@ -67,6 +67,7 @@ NullableNumberTextBoxLabel<Integer> numberOfSockets = new NullableNumberTextBoxLabel<Integer>(constants.unknown()); NullableNumberTextBoxLabel<Integer> coresPerSocket = new NullableNumberTextBoxLabel<Integer>(constants.unknown()); TextBoxLabel spmPriority = new TextBoxLabel(); + TextBoxLabel hostedEngineHa = new TextBoxLabel(); MemorySizeTextBoxLabel<Integer> physicalMemory; MemorySizeTextBoxLabel<Integer> usedMemory; @@ -134,7 +135,7 @@ boolean glusterSupported = ApplicationModeHelper.isModeSupported(ApplicationMode.GlusterOnly); // Build a form using the FormBuilder - formBuilder = new FormBuilder(formPanel, 3, 7); + formBuilder = new FormBuilder(formPanel, 3, 8); formBuilder.addFormItem(new FormItem(constants.osVersionHostGeneral(), oS, 0).withAutoPlacement()); formBuilder.addFormItem(new FormItem(constants.kernelVersionHostGeneral(), kernelVersion, 0).withAutoPlacement()); @@ -143,6 +144,7 @@ formBuilder.addFormItem(new FormItem(constants.vdsmVersionHostGeneral(), vdsmVersion, 0).withAutoPlacement()); formBuilder.addFormItem(new FormItem(constants.spiceVersionHostGeneral(), spiceVersion, 0, virtSupported).withAutoPlacement()); formBuilder.addFormItem(new FormItem(constants.glusterVersionHostGeneral(), glusterVersion, 0, glusterSupported).withAutoPlacement()); + formBuilder.addFormItem(new FormItem(constants.hostedEngineHaHostGeneral(), hostedEngineHa, 0, virtSupported).withAutoPlacement()); formBuilder.addFormItem(new FormItem(constants.spmPriority(), spmPriority, 0, 1, virtSupported).withAutoPlacement()); formBuilder.addFormItem(new FormItem(constants.activeVmsHostGeneral(), activeVms, 1, virtSupported).withAutoPlacement()); -- To view, visit http://gerrit.ovirt.org/24606 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I17f0eff120b2ab99b4badc53da1780c1e758299c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Greg Padgett <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
