Rename ambiguous global setting: enable.kvm.host.auto.enable.disable

Author: Pearl1594

engine/components-api/src/main/java/com/cloud/agent/AgentManager.java

@@ -39,8 +39,8 @@
 public interface AgentManager {
     static final ConfigKey<Integer> Wait = new ConfigKey<Integer>("Advanced", Integer.class, "wait", "1800", "Time in seconds to wait for control commands to return",
             true);
-    ConfigKey<Boolean> EnableKVMAutoEnableDisable = new ConfigKey<>(Boolean.class,
-                    "enable.kvm.host.auto.enable.disable",
+    ConfigKey<Boolean> EnableKVMAutoEnable = new ConfigKey<>(Boolean.class,
+                    "enable.kvm.host.auto.enable",
                     "Advanced",
                     "false",
                     "(KVM only) Enable Auto Disable/Enable KVM hosts in the cluster " +

engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java

@@ -1293,9 +1293,9 @@ private void processHostHealthCheckResult(Boolean hostHealthCheckResult, long ho
                 s_logger.error(String.format("Unable to find host with ID: %s", hostId));
                 return;
             }
-            if (!BooleanUtils.toBoolean(EnableKVMAutoEnableDisable.valueIn(host.getClusterId()))) {
+            if (!BooleanUtils.toBoolean(EnableKVMAutoEnable.valueIn(host.getClusterId()))) {
                 s_logger.debug(String.format("%s is disabled for the cluster %s, cannot process the health check result " +
-                        "received for the host %s", EnableKVMAutoEnableDisable.key(), host.getClusterId(), host.getName()));
+                        "received for the host %s", EnableKVMAutoEnable.key(), host.getClusterId(), host.getName()));
                 return;
             }
 
@@ -1838,7 +1838,7 @@ public String getConfigComponentName() {
     @Override
     public ConfigKey<?>[] getConfigKeys() {
         return new ConfigKey<?>[] { CheckTxnBeforeSending, Workers, Port, Wait, AlertWait, DirectAgentLoadSize,
-                DirectAgentPoolSize, DirectAgentThreadCap, EnableKVMAutoEnableDisable, ReadyCommandWait };
+                DirectAgentPoolSize, DirectAgentThreadCap, EnableKVMAutoEnable, ReadyCommandWait };
     }
 
     protected class SetHostParamsListener implements Listener {

server/src/main/java/com/cloud/resource/ResourceManagerImpl.java

@@ -1834,7 +1834,7 @@ private void handleAutoEnableDisableKVMHost(boolean autoEnableDisableKVMSetting,
                     Boolean.parseBoolean(hostDetail.getValue()) && resourceEvent == ResourceState.Event.Disable) {
                 s_logger.info(String.format("The setting %s is enabled but the host %s is manually set into %s state," +
                                 "ignoring future auto enabling of the host based on health check results",
-                        AgentManager.EnableKVMAutoEnableDisable.key(), host.getName(), resourceEvent));
+                        AgentManager.EnableKVMAutoEnable.key(), host.getName(), resourceEvent));
                 hostDetail.setValue(Boolean.FALSE.toString());
                 _hostDetailsDao.update(hostDetail.getId(), hostDetail);
             } else if (hostDetail == null) {
@@ -1846,7 +1846,7 @@ private void handleAutoEnableDisableKVMHost(boolean autoEnableDisableKVMSetting,
     }
     private boolean updateHostAllocationState(HostVO host, String allocationState,
                                            boolean isUpdateFromHostHealthCheck) throws NoTransitionException {
-        boolean autoEnableDisableKVMSetting = AgentManager.EnableKVMAutoEnableDisable.valueIn(host.getClusterId()) &&
+        boolean autoEnableDisableKVMSetting = AgentManager.EnableKVMAutoEnable.valueIn(host.getClusterId()) &&
                 host.getHypervisorType() == HypervisorType.KVM;
         ResourceState.Event resourceEvent = getResourceEventFromAllocationStateString(allocationState);
         DetailVO hostDetail = _hostDetailsDao.findDetail(host.getId(), ApiConstants.AUTO_ENABLE_KVM_HOST);
@@ -1860,7 +1860,7 @@ private boolean updateHostAllocationState(HostVO host, String allocationState,
         if (isAutoEnableAttemptForADisabledHost(autoEnableDisableKVMSetting, isUpdateFromHostHealthCheck, hostDetail, resourceEvent)) {
             s_logger.debug(String.format("The setting '%s' is enabled and the health check succeeds on the host, " +
                             "but the host has been manually disabled previously, ignoring auto enabling",
-                    AgentManager.EnableKVMAutoEnableDisable.key()));
+                    AgentManager.EnableKVMAutoEnable.key()));
             return false;
         }
 
@@ -1974,7 +1974,7 @@ private void sendAlertAndAnnotationForAutoEnableDisableKVMHostFeature(HostVO hos
                                                                           boolean isUpdateFromHostHealthCheck,
                                                                           boolean isUpdateHostAllocation, String annotation) {
         boolean isAutoEnableDisableKVMSettingEnabled = host.getHypervisorType() == HypervisorType.KVM &&
-                AgentManager.EnableKVMAutoEnableDisable.valueIn(host.getClusterId());
+                AgentManager.EnableKVMAutoEnable.valueIn(host.getClusterId());
         if (!isAutoEnableDisableKVMSettingEnabled) {
             if (StringUtils.isNotBlank(annotation)) {
                 annotationService.addAnnotation(annotation, AnnotationService.EntityType.HOST, host.getUuid(), true);
@@ -1998,7 +1998,7 @@ private void sendAlertAndAnnotationForAutoEnableDisableKVMHostFeature(HostVO hos
                     host.getPodId(), msg, msg);
         } else {
             msg += String.format("is %s despite the setting '%s' is enabled for the cluster %s",
-                    isEventEnable ? "enabled" : "disabled", AgentManager.EnableKVMAutoEnableDisable.key(),
+                    isEventEnable ? "enabled" : "disabled", AgentManager.EnableKVMAutoEnable.key(),
                     host.getClusterId());
             if (StringUtils.isNotBlank(annotation)) {
                 msg += String.format(", reason: %s", annotation);