Martin Peřina has uploaded a new change for review. Change subject: core: Fix pmEnabled getter/setter names in VDS ......................................................................
core: Fix pmEnabled getter/setter names in VDS Renames getpm_enabled() to isPmEnabled() and setpm_enabled() to setPmEnabled() so now are getter/setter names same as in VdsStatic. Change-Id: If51e011ccdcfe7a256308e209870dd595147c624 Signed-off-by: Martin Perina <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsPowerDownCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/PmHealthCheckManager.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/PowerSavingBalancePolicyUnit.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/FenceValidator.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.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/clusters/ClusterListModel.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/HostGeneralModel.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/widget/table/column/HostStatusCell.java 19 files changed, 28 insertions(+), 28 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/43/36643/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java index 8467faf..b635cb5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java @@ -170,7 +170,7 @@ private void processFence() { FenceExecutor executor = new FenceExecutor(getVds()); vdsProxyFound = new FenceProxyLocator(getVds()).isProxyHostAvailable(); - if (getVds().getpm_enabled() && vdsProxyFound) { + if (getVds().isPmEnabled() && vdsProxyFound) { VDSFenceReturnValue returnValue = executor.checkStatus(); fenceSucceeded = returnValue.getSucceeded(); // potential bug here - if no proxy host found, this variable // is still 'true' @@ -342,15 +342,15 @@ if (getVdsGroup().supportsVirtService()) { if (!connectPoolSucceeded) { type = AuditLogType.CONNECT_STORAGE_POOL_FAILED; - } else if (getVds().getpm_enabled() && fenceSucceeded) { + } else if (getVds().isPmEnabled() && fenceSucceeded) { type = AuditLogType.VDS_FENCE_STATUS; - } else if (getVds().getpm_enabled() && !fenceSucceeded) { + } else if (getVds().isPmEnabled() && !fenceSucceeded) { type = AuditLogType.VDS_FENCE_STATUS_FAILED; } // PM alerts AuditLogableBase logable = new AuditLogableBase(getVds().getId()); - if (getVds().getpm_enabled()) { + if (getVds().isPmEnabled()) { if (!vdsProxyFound) { logable.addCustomValue("Reason", AuditLogDirector.getMessage(AuditLogType.VDS_ALERT_FENCE_NO_PROXY_HOST)); @@ -561,7 +561,7 @@ // host is UP, remove kdump status getDbFacade().getVdsKdumpStatusDao().remove(getVdsId()); - if (getVds().getpm_enabled() && + if (getVds().isPmEnabled() && getVds().isPmKdumpDetection() && getVds().getKdumpStatus() != KdumpStatus.ENABLED) { AuditLogableBase base = new AuditLogableBase(); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsCommand.java index e7c3c13..3401b0b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsCommand.java @@ -332,7 +332,7 @@ VDS vds = getVds(); VDSFenceReturnValue returnValue = null; // Check first if Host has configured PM - if (vds != null && vds.getpm_enabled()) { + if (vds != null && vds.isPmEnabled()) { FenceExecutor executor = new FenceExecutor(vds); returnValue = executor.checkStatus(); // !! handle failure diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java index b620524..e5d0a56 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java @@ -581,7 +581,7 @@ return true; }}, new Callable<Boolean>() { public Boolean call() throws Exception { - boolean enabled = _vds.getpm_enabled() && + boolean enabled = _vds.isPmEnabled() && _vds.isPmKdumpDetection() && fenceKdumpSupported; if (!enabled) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsPowerDownCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsPowerDownCommand.java index 0521dba..8c61160 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsPowerDownCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsPowerDownCommand.java @@ -62,7 +62,7 @@ getVds().getDynamicData().isPowerManagementControlledByPolicy()); } - } else if (getParameters().getFallbackToPowerManagement() && getVds().getpm_enabled()) { + } else if (getParameters().getFallbackToPowerManagement() && getVds().isPmEnabled()) { FenceVdsActionParameters parameters = new FenceVdsActionParameters(getVds().getId(), FenceActionType.Stop); parameters.setKeepPolicyPMEnabled(getParameters().getKeepPolicyPMEnabled()); runInternalAction(VdcActionType.StopVds, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/PmHealthCheckManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/PmHealthCheckManager.java index 5be91d7..d69e7db 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/PmHealthCheckManager.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/PmHealthCheckManager.java @@ -79,7 +79,7 @@ active = true; List<VDS> hosts = DbFacade.getInstance().getVdsDao().getAll(); for (VDS host : hosts) { - if (host.getpm_enabled()) { + if (host.isPmEnabled()) { // check health PmHealth pmHealth = checkPMHealth(host); // handle alerts - adding or canceling as necessary @@ -216,7 +216,7 @@ new Predicate<VDS>() { @Override public boolean eval(VDS host) { - return (host.getpm_enabled() && host.getStatus() == VDSStatus.Reboot); + return (host.isPmEnabled() && host.getStatus() == VDSStatus.Reboot); } }); if (hostsWithPMInReboot.size() > 0) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/PowerSavingBalancePolicyUnit.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/PowerSavingBalancePolicyUnit.java index ec461af..f291a10 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/PowerSavingBalancePolicyUnit.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/PowerSavingBalancePolicyUnit.java @@ -216,7 +216,7 @@ public boolean eval(VDS vds) { return !vds.isDisablePowerManagementPolicy() && vds.getSpmStatus() != VdsSpmStatus.SPM - && vds.getpm_enabled(); + && vds.isPmEnabled(); } }); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/FenceValidator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/FenceValidator.java index d09b103..08e9b7e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/FenceValidator.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/FenceValidator.java @@ -43,7 +43,7 @@ } public boolean isPowerManagementEnabledAndLegal(VDS vds, VDSGroup vdsGroup, List<String> messages) { - if (!(vds.getpm_enabled() && isPowerManagementLegal(vds.getFenceAgents(), vdsGroup, messages))) { + if (!(vds.isPmEnabled() && isPowerManagementLegal(vds.getFenceAgents(), vdsGroup, messages))) { messages.add(VdcBllMessages.VDS_FENCE_DISABLED.name()); return false; } else { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java index d74142b..b7deb6e 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java @@ -157,7 +157,7 @@ vds.setServerSslEnabled(isServerSslEnabled()); vds.setCpuFlags(getCpuFlags()); vds.setNetConfigDirty(getNetConfigDirty()); - vds.setpm_enabled(getpm_enabled()); + vds.setPmEnabled(isPmEnabled()); vds.setPmKdumpDetection(isPmKdumpDetection()); vds.setConsoleAddress(getConsoleAddress()); vds.setHBAs(getHBAs()); @@ -916,11 +916,11 @@ mVdsStatic.setPmKdumpDetection(pmKdumpDetection); } - public boolean getpm_enabled() { + public boolean isPmEnabled() { return mVdsStatic.isPmEnabled(); } - public void setpm_enabled(boolean value) { + public void setPmEnabled(boolean value) { mVdsStatic.setPmEnabled(value); } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java index 5668d30..00c64e3 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java @@ -312,7 +312,7 @@ entity.setVdsSpmId((Integer) rs.getObject("vds_spm_id")); entity.setNetConfigDirty((Boolean) rs .getObject("net_config_dirty")); - entity.setpm_enabled(rs.getBoolean("pm_enabled")); + entity.setPmEnabled(rs.getBoolean("pm_enabled")); entity.setPmProxyPreferences(rs.getString("pm_proxy_preferences")); entity.setPmKdumpDetection(rs.getBoolean("pm_detect_kdump")); entity.setSpmStatus(VdsSpmStatus.forValue(rs diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java index 72ed4c2..14160a6 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java @@ -376,9 +376,9 @@ model.setPmProxies(pmProxies); } model.setKdumpDetection(entity.isPmKdumpDetection()); - model.setEnabled(entity.getpm_enabled()); + model.setEnabled(entity.isPmEnabled()); model.setAutomaticPmEnabled(!entity.isDisablePowerManagementPolicy()); - if (entity.getpm_enabled()) { + if (entity.isPmEnabled()) { DeprecatedPowerManagementMapper.map(entity.getFenceAgents(), model); } return model; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java index 07cf87f..949d594 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java @@ -531,7 +531,7 @@ ArrayList<VDS> ret = new ArrayList<VDS>(); for (VDS i : items) { - if (i.getpm_enabled()) + if (i.isPmEnabled()) { ret.add(i); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java index f2ca1f6..c66859c 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java @@ -508,7 +508,7 @@ host.setSshUsername("root"); //$NON-NLS-1$ host.setVdsGroupId(getEntity().getId()); - host.setpm_enabled(false); + host.setPmEnabled(false); AddVdsActionParameters parameters = new AddVdsActionParameters(); parameters.setVdsId(host.getId()); 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 1176b17..c29aaf5 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 @@ -500,7 +500,7 @@ host.setVdsSpmPriority(model.getSpmPriorityValue()); // Save other PM parameters. - host.setpm_enabled(model.getIsPm().getEntity()); + host.setPmEnabled(model.getIsPm().getEntity()); host.setDisablePowerManagementPolicy(model.getDisableAutomaticPowerManagement().getEntity()); host.setPmKdumpDetection(model.getPmKdumpDetection().getEntity()); 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 990d8d0..94e79a1 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 @@ -930,7 +930,7 @@ host.setSshUsername("root"); //$NON-NLS-1$ host.setVdsGroupId(hostsModel.getClusterModel().getClusterId()); - host.setpm_enabled(false); + host.setPmEnabled(false); AddVdsActionParameters parameters = new AddVdsActionParameters(); parameters.setVdsId(host.getId()); 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 c05f1db..7917137 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 @@ -1611,7 +1611,7 @@ host.setVdsSpmPriority(model.getSpmPriorityValue()); // Save other PM parameters. - host.setpm_enabled(model.getIsPm().getEntity()); + host.setPmEnabled(model.getIsPm().getEntity()); host.setDisablePowerManagementPolicy(model.getDisableAutomaticPowerManagement().getEntity()); host.setPmKdumpDetection(model.getPmKdumpDetection().getEntity()); 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 7738b35..cf483fb 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 @@ -1022,12 +1022,12 @@ // Check manual fence alert presense. if (getEntity().getStatus() == VDSStatus.NonResponsive - && !getEntity().getpm_enabled() + && !getEntity().isPmEnabled() && ((getEntity().getVmActive() == null ? 0 : getEntity().getVmActive()) > 0 || getEntity().getSpmStatus() == VdsSpmStatus.SPM)) { setHasManualFenceAlert(true); } - else if (!getEntity().getpm_enabled()) + else if (!getEntity().isPmEnabled()) { setHasNoPowerManagementAlert(true); } 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 232e38a..3c56f81 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 @@ -983,7 +983,7 @@ // Save other PM parameters. - host.setpm_enabled(model.getIsPm().getEntity()); + host.setPmEnabled(model.getIsPm().getEntity()); host.setDisablePowerManagementPolicy(model.getDisableAutomaticPowerManagement().getEntity()); host.setPmKdumpDetection(model.getPmKdumpDetection().getEntity()); 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 a326698..6034750 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 @@ -1819,7 +1819,7 @@ getIsPm().setEntity(true); getIsPm().setIsChangable(false); } else { - getIsPm().setEntity(vds.getpm_enabled()); + getIsPm().setEntity(vds.isPmEnabled()); } updateModelDataCenterFromVds(dataCenters, vds); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/HostStatusCell.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/HostStatusCell.java index f738225..7b961a9 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/HostStatusCell.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/HostStatusCell.java @@ -85,7 +85,7 @@ sb.append(statusImageHtml); boolean getnet_config_dirty = vds.getNetConfigDirty() == null ? false : vds.getNetConfigDirty().booleanValue(); - boolean showPMAlert = vds.getVdsGroupSupportsVirtService() && !vds.getpm_enabled(); + boolean showPMAlert = vds.getVdsGroupSupportsVirtService() && !vds.isPmEnabled(); if (showPMAlert || getnet_config_dirty) { sb.append(alertImageHtml); } -- To view, visit http://gerrit.ovirt.org/36643 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If51e011ccdcfe7a256308e209870dd595147c624 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
