Martin Peřina has uploaded a new change for review. Change subject: webadmin: Add detect kdump checkbox to power mgmt config ......................................................................
webadmin: Add detect kdump checkbox to power mgmt config Adds detect kdump checkbox to power management tab in Add/Edit Host popup. If set host will be checked if it's not in kdump flow before fencing execution. Change-Id: I29bdf112c8d5e7dd19af4b2e77c52f07eb898d47 Bug-Url: https://bugzilla.redhat.com/1079821 Signed-off-by: Martin Perina <mper...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.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/host/HostPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.ui.xml 8 files changed, 32 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/20/26720/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java index d403823..7a62866 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java @@ -250,6 +250,7 @@ obj.setpm_enabled(instance.getpm_enabled()); obj.setPmSecondaryConcurrent(instance.isPmSecondaryConcurrent()); obj.setDisablePowerManagementPolicy(instance.isDisablePowerManagementPolicy()); + obj.setPmKdumpDetection(instance.isPmKdumpDetection()); obj.setPort(instance.getPort()); obj.setServerSslEnabled(instance.isServerSslEnabled()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java index e19aca2..e34ffd5 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java @@ -496,6 +496,7 @@ host.setpm_enabled(model.getIsPm().getEntity()); host.setPmSecondaryConcurrent(model.getPmSecondaryConcurrent().getEntity()); host.setDisablePowerManagementPolicy(model.getDisableAutomaticPowerManagement().getEntity()); + host.setPmKdumpDetection(model.getPmKdumpDetection().getEntity()); AddVdsActionParameters vdsActionParams = new AddVdsActionParameters(); vdsActionParams.setvds(host); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java index 44314bb..9498512 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java @@ -1631,6 +1631,8 @@ host.setpm_enabled(model.getIsPm().getEntity()); host.setPmSecondaryConcurrent(model.getPmSecondaryConcurrent().getEntity()); host.setDisablePowerManagementPolicy(model.getDisableAutomaticPowerManagement().getEntity()); + host.setPmKdumpDetection(model.getPmKdumpDetection().getEntity()); + AddVdsActionParameters addVdsParams = new AddVdsActionParameters(); addVdsParams.setVdsId(host.getId()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java index b8c8983..01901ae 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java @@ -930,6 +930,8 @@ host.setpm_enabled(model.getIsPm().getEntity()); host.setPmSecondaryConcurrent(model.getPmSecondaryConcurrent().getEntity()); host.setDisablePowerManagementPolicy(model.getDisableAutomaticPowerManagement().getEntity()); + host.setPmKdumpDetection(model.getPmKdumpDetection().getEntity()); + cancelConfirm(); model.startProgress(null); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java index a675f64..ba1dfd8 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java @@ -515,6 +515,18 @@ pmSecondarySecure = value; } + private EntityModel<Boolean> pmKdumpDetection; + + public EntityModel<Boolean> getPmKdumpDetection() + { + return pmKdumpDetection; + } + + private void setPmKdumpDetection(EntityModel<Boolean> value) + { + pmKdumpDetection = value; + } + public HashMap<String, String> getPmSecondaryOptionsMap() { // For secondary map determine (workarround) if it's was specified @@ -964,6 +976,8 @@ getPmSecondaryConcurrent().setEntity(false); setDisableAutomaticPowerManagement(new EntityModel<Boolean>()); getDisableAutomaticPowerManagement().setEntity(false); + setPmKdumpDetection(new EntityModel<Boolean>()); + getPmKdumpDetection().setEntity(true); setPmVariants(new ListModel<String>()); List<String> pmVariants = new ArrayList<String>(); @@ -1480,6 +1494,7 @@ // Update other PM fields. getPmVariants().setIsChangable(isPm); getPmSecondaryConcurrent().setIsChangable(isPm); + getPmKdumpDetection().setIsChangable(isPm); getTestCommand().setIsExecutionAllowed(isPm); } @@ -1718,6 +1733,7 @@ getPmSecondaryConcurrent().setEntity(vds.isPmSecondaryConcurrent()); getDisableAutomaticPowerManagement().setEntity(vds.isDisablePowerManagementPolicy()); + getPmKdumpDetection().setEntity(vds.isPmKdumpDetection()); updateModelDataCenterFromVds(dataCenters, vds); 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 87a3e6f..8476eec 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 @@ -542,6 +542,9 @@ @DefaultStringValue("Disable policy control of power management") String hostPopupPmDisableAutoPM(); + @DefaultStringValue("Detect kdump flow") + String hostPopupPmKdumpDetection(); + @DefaultStringValue("Test") String hostPopupTestButtonLabel(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java index e1e7f1f..257e831 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java @@ -296,6 +296,11 @@ EntityModelCheckBoxEditor disableAutomaticPowerManagementEditor; @UiField + @Path(value = "pmKdumpDetection.entity") + @WithElementId("pmKdumpDetection") + EntityModelCheckBoxEditor pmKdumpDetectionEditor; + + @UiField UiCommandButton testButton; @UiField @@ -560,6 +565,7 @@ // Auto PM disableAutomaticPowerManagementEditor.setLabel(constants.hostPopupPmDisableAutoPM()); + pmKdumpDetectionEditor.setLabel(constants.hostPopupPmKdumpDetection()); // SPM tab spmTab.setLabel(constants.spmTestButtonLabel()); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.ui.xml index c80e09d..796a384 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.ui.xml @@ -279,6 +279,7 @@ <t:content> <g:FlowPanel> <ge:EntityModelCheckBoxEditor ui:field="pmEnabledEditor"/> + <ge:EntityModelCheckBoxEditor ui:field="pmKdumpDetectionEditor"/> <e:ListModelListBoxOnlyEditor ui:field="pmVariantsEditor"/> <ge:EntityModelCheckBoxEditor ui:field="pmSecondaryConcurrentEditor"/> <g:FlowPanel addStyleNames="{style.powerManagementTabInputDecorator}"> -- To view, visit http://gerrit.ovirt.org/26720 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I29bdf112c8d5e7dd19af4b2e77c52f07eb898d47 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <mper...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
