Minor service layer changes

Author: abh1sar

engine/components-api/src/main/java/com/cloud/capacity/CapacityManager.java

@@ -71,7 +71,7 @@ public interface CapacityManager {
                     "0.85",
                     "Percentage (as a value between 0 and 1) of storage utilization above which allocators will disable using the pool for low storage available.",
                     true,
-                    List.of(ConfigKey.Scope.Zone, ConfigKey.Scope.StoragePool));
+                    List.of(ConfigKey.Scope.StoragePool, ConfigKey.Scope.Zone));
     static final ConfigKey<Double> StorageOverprovisioningFactor =
             new ConfigKey<>(
                     "Storage",
@@ -89,7 +89,7 @@ public interface CapacityManager {
                     "0.85",
                     "Percentage (as a value between 0 and 1) of allocated storage utilization above which allocators will disable using the pool for low allocated storage available.",
                     true,
-                    List.of(ConfigKey.Scope.Zone, ConfigKey.Scope.StoragePool));
+                    List.of(ConfigKey.Scope.StoragePool, ConfigKey.Scope.Zone));
     static final ConfigKey<Boolean> StorageOperationsExcludeCluster =
             new ConfigKey<>(
                     Boolean.class,
@@ -129,7 +129,7 @@ public interface CapacityManager {
                     "Percentage (as a value between 0 and 1) of allocated storage utilization above which allocators will disable using the pool for volume resize. " +
                             "This is applicable only when volume.resize.allowed.beyond.allocation is set to true.",
                     true,
-                    List.of(ConfigKey.Scope.Zone, ConfigKey.Scope.StoragePool));
+                    List.of(ConfigKey.Scope.StoragePool, ConfigKey.Scope.Zone));
 
     public boolean releaseVmCapacity(VirtualMachine vm, boolean moveFromReserved, boolean moveToReservered, Long hostId);
 

framework/config/src/main/java/org/apache/cloudstack/framework/config/ConfigKey.java

@@ -70,12 +70,12 @@ public int getBitValue() {
         }
 
         public boolean isDescendantOf(Scope other) {
-            Scope current = this;
-            while (current != null) {
-                if (current == other) {
+            Scope parent = this.getParent();
+            while (parent != null) {
+                if (parent == other) {
                     return true;
                 }
-                current = current.getParent();
+                parent = parent.getParent();
             }
             return false;
         }
@@ -365,10 +365,6 @@ public T valueIn(Long id) {
         return valueInScope(getPrimaryScope(), id);
     }
 
-    public T valueInDomain(Long domainId) {
-        return valueInScope(Scope.Domain, domainId);
-    }
-
     @SuppressWarnings("unchecked")
     protected T valueOf(String value) {
         if (value == null) {

framework/config/src/main/java/org/apache/cloudstack/framework/config/dao/ConfigurationDaoImpl.java

@@ -22,7 +22,6 @@
 import java.util.Map;
 
 import javax.annotation.PostConstruct;
-import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
 import org.apache.cloudstack.framework.config.impl.ConfigurationVO;
@@ -31,7 +30,6 @@
 import com.cloud.utils.component.ComponentLifecycle;
 import com.cloud.utils.crypt.DBEncryptionUtil;
 import com.cloud.utils.db.DB;
-import com.cloud.utils.db.EntityManager;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
@@ -40,9 +38,6 @@
 
 @Component
 public class ConfigurationDaoImpl extends GenericDaoBase<ConfigurationVO, String> implements ConfigurationDao {
-    @Inject
-    EntityManager entityManager;
-
     private Map<String, String> _configs = null;
     private boolean _premium;
 
@@ -211,4 +206,5 @@ public ConfigurationVO findByName(String name) {
         sc.setParameters("name", name);
         return findOneIncludingRemovedBy(sc);
     }
+
 }

plugins/metrics/src/main/java/org/apache/cloudstack/metrics/MetricsServiceImpl.java

@@ -649,7 +649,7 @@ public List<StoragePoolMetricsResponse> listStoragePoolMetrics(List<StoragePoolR
             Long poolClusterId = clusterUuidToIdMap.get(poolResponse.getClusterId());
             Long poolId = poolUuidToIdMap.get(poolResponse.getId());
             final Double storageThreshold = AlertManager.StorageCapacityThreshold.valueIn(poolClusterId);
-            final Double storageDisableThreshold = CapacityManager.StorageCapacityDisableThreshold.valueInScope(ConfigKey.Scope.StoragePool, poolId);
+            final Double storageDisableThreshold = CapacityManager.StorageCapacityDisableThreshold.valueIn(poolId);
 
             metricsResponse.setHasAnnotation(poolResponse.hasAnnotation());
             metricsResponse.setDiskSizeUsedGB(poolResponse.getDiskSizeUsed());

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java

@@ -1229,7 +1229,7 @@ protected String validateConfigurationValue(String name, String value, String sc
         if (scope != null) {
             ConfigKey.Scope scopeVal = ConfigKey.Scope.valueOf(scope);
             if (!configScope.contains(scopeVal) &&
-                    !(ENABLE_ACCOUNT_SETTINGS_FOR_DOMAIN.value() && configScope.contains(ConfigKey.Scope.Account.toString()) &&
+                    !(ENABLE_ACCOUNT_SETTINGS_FOR_DOMAIN.value() && configScope.contains(ConfigKey.Scope.Account) &&
                             scope.equals(ConfigKey.Scope.Domain.toString()))) {
                 logger.error("Invalid scope id provided for the parameter " + name);
                 return "Invalid scope id provided for the parameter " + name;

server/src/main/java/com/cloud/network/IpAddressManagerImpl.java

@@ -2476,7 +2476,7 @@ public boolean isPublicIpAddressStillInQuarantine(PublicIpQuarantineVO publicIpQ
 
     @Override
     public PublicIpQuarantine addPublicIpAddressToQuarantine(IpAddress publicIpAddress, Long domainId) {
-        Integer quarantineDuration = PUBLIC_IP_ADDRESS_QUARANTINE_DURATION.valueInDomain(domainId);
+        Integer quarantineDuration = PUBLIC_IP_ADDRESS_QUARANTINE_DURATION.valueIn(domainId);
         if (quarantineDuration <= 0) {
             logger.debug(String.format("Not adding IP [%s] to quarantine because configuration [%s] has value equal or less to 0.", publicIpAddress.getAddress(),
                     PUBLIC_IP_ADDRESS_QUARANTINE_DURATION.key()));

server/src/main/java/com/cloud/server/ManagementServerImpl.java

@@ -2311,13 +2311,8 @@ public Pair<List<? extends Configuration>, Integer> searchForConfigurations(fina
                 if (configVo != null) {
                     final ConfigKey<?> key = _configDepot.get(param.getName());
                     if (key != null) {
-                        if (scope.equals(ConfigKey.Scope.Domain)) {
-                            Object value = key.valueInDomain(id);
-                            configVo.setValue(value == null ? null : value.toString());
-                        } else {
-                            Object value = key.valueInScope(scope, id);
-                            configVo.setValue(value == null ? null : value.toString());
-                        }
+                        Object value = key.valueInScope(scope, id);
+                        configVo.setValue(value == null ? null : value.toString());
                         configVOList.add(configVo);
                     } else {
                         logger.warn("ConfigDepot could not find parameter " + param.getName() + " for scope " + scope);

server/src/main/java/com/cloud/storage/StorageManagerImpl.java

@@ -2921,7 +2921,7 @@ private boolean checkUsagedSpace(StoragePool pool) {
         long totalSize = pool.getCapacityBytes();
         long usedSize = getUsedSize(pool);
         double usedPercentage = ((double)usedSize / (double)totalSize);
-        double storageUsedThreshold = CapacityManager.StorageCapacityDisableThreshold.valueInScope(ConfigKey.Scope.StoragePool, pool.getId());
+        double storageUsedThreshold = CapacityManager.StorageCapacityDisableThreshold.valueIn(pool.getDataCenterId());
         if (logger.isDebugEnabled()) {
             logger.debug("Checking pool {} for storage, totalSize: {}, usedBytes: {}, usedPct: {}, disable threshold: {}", pool, pool.getCapacityBytes(), pool.getUsedBytes(), usedPercentage, storageUsedThreshold);
         }
@@ -3193,7 +3193,7 @@ protected boolean checkPoolforSpace(StoragePool pool, long allocatedSizeWithTemp
 
         logger.debug("Total capacity of the pool {} is {}", poolVO, toHumanReadableSize(totalOverProvCapacity));
 
-        double storageAllocatedThreshold = CapacityManager.StorageAllocatedCapacityDisableThreshold.valueInScope(ConfigKey.Scope.StoragePool, pool.getId());
+        double storageAllocatedThreshold = CapacityManager.StorageAllocatedCapacityDisableThreshold.valueIn(pool.getDataCenterId());
 
         if (logger.isDebugEnabled()) {
             logger.debug("Checking pool: {} for storage allocation , maxSize : {}, " +
@@ -3218,7 +3218,7 @@ protected boolean checkPoolforSpace(StoragePool pool, long allocatedSizeWithTemp
                 return false;
             }
 
-            double storageAllocatedThresholdForResize = CapacityManager.StorageAllocatedCapacityDisableThresholdForVolumeSize.valueInScope(ConfigKey.Scope.StoragePool, pool.getId());
+            double storageAllocatedThresholdForResize = CapacityManager.StorageAllocatedCapacityDisableThresholdForVolumeSize.valueIn(pool.getDataCenterId());
             if (usedPercentage > storageAllocatedThresholdForResize) {
                 logger.debug(String.format("Skipping the pool %s since its allocated percentage: %s has crossed the allocated %s: %s",
                         pool, usedPercentage, CapacityManager.StorageAllocatedCapacityDisableThresholdForVolumeSize.key(), storageAllocatedThresholdForResize));