diff --git a/engine/components-api/src/main/java/com/cloud/network/NetworkStateListener.java b/engine/components-api/src/main/java/com/cloud/network/NetworkStateListener.java index 107e177ef579..6b9a1f73d75d 100644 --- a/engine/components-api/src/main/java/com/cloud/network/NetworkStateListener.java +++ b/engine/components-api/src/main/java/com/cloud/network/NetworkStateListener.java @@ -21,10 +21,8 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; +import org.apache.cloudstack.framework.config.ConfigKey; -import javax.inject.Inject; - -import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.framework.events.EventDistributor; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -38,15 +36,16 @@ public class NetworkStateListener implements StateListener { - @Inject - private ConfigurationDao _configDao; + // Registered/owned by com.cloud.server.ManagementServer#PublishResourceStateEvent; declared here too so this + // module can read it without a reverse dependency on the server module. + private static final ConfigKey PublishResourceStateEvent = new ConfigKey<>("Advanced", Boolean.class, "publish.resource.state.events", "true", + "enable or disable publishing of resource state events on the event bus", true); private EventDistributor eventDistributor; protected Logger logger = LogManager.getLogger(getClass()); - public NetworkStateListener(ConfigurationDao configDao) { - _configDao = configDao; + public NetworkStateListener() { } public void setEventDistributor(EventDistributor eventDistributor) { @@ -69,9 +68,7 @@ public boolean postStateTransitionEvent(StateMachine2.Transition t } private void pubishOnEventBus(String event, String status, Network vo, State oldState, State newState) { - String configKey = "publish.resource.state.events"; - String value = _configDao.getValue(configKey); - boolean configValue = Boolean.parseBoolean(value); + boolean configValue = PublishResourceStateEvent.value(); if(!configValue) return; if (eventDistributor == null) { diff --git a/engine/components-api/src/test/java/com/cloud/network/NetworkStateListenerTest.java b/engine/components-api/src/test/java/com/cloud/network/NetworkStateListenerTest.java index 30960210bfb6..6c0f7c08180a 100644 --- a/engine/components-api/src/test/java/com/cloud/network/NetworkStateListenerTest.java +++ b/engine/components-api/src/test/java/com/cloud/network/NetworkStateListenerTest.java @@ -16,7 +16,6 @@ // under the License. package com.cloud.network; -import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.framework.events.EventDistributor; import org.junit.Assert; import org.junit.Test; @@ -26,7 +25,7 @@ public class NetworkStateListenerTest { @InjectMocks - NetworkStateListener networkStateListener = new NetworkStateListener(Mockito.mock(ConfigurationDao.class)); + NetworkStateListener networkStateListener = new NetworkStateListener(); @Test public void testSetEventDistributor() { diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java index 88968fa9931c..1136d96a3347 100644 --- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java +++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java @@ -52,7 +52,6 @@ import org.apache.cloudstack.framework.config.ConfigKey; import org.apache.cloudstack.framework.config.ConfigKey.Scope; import org.apache.cloudstack.framework.config.Configurable; -import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.framework.messagebus.MessageBus; import org.apache.cloudstack.framework.messagebus.PublishScope; import org.apache.cloudstack.managed.context.ManagedContextRunnable; @@ -226,7 +225,6 @@ import com.cloud.user.ResourceLimitService; import com.cloud.user.User; import com.cloud.user.dao.AccountDao; -import com.cloud.utils.NumbersUtil; import com.cloud.utils.Pair; import com.cloud.utils.UuidUtils; import com.cloud.utils.component.AdapterBase; @@ -291,8 +289,6 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra @Inject AccountDao _accountDao; @Inject - ConfigurationDao _configDao; - @Inject UserVmDao _userVmDao; @Inject AlertManager _alertMgr; @@ -764,7 +760,7 @@ public void doInTransactionWithoutResult(final TransactionStatus status) { _agentMgr.registerForHostEvents(this, true, false, true); - Network.State.getStateMachine().registerListener(new NetworkStateListener(_configDao)); + Network.State.getStateMachine().registerListener(new NetworkStateListener()); logger.info("Network Manager is configured."); @@ -773,7 +769,7 @@ public void doInTransactionWithoutResult(final TransactionStatus status) { @Override public boolean start() { - final int netGcInterval = NumbersUtil.parseInt(_configDao.getValue(NetworkGcInterval.key()), 60); + final int netGcInterval = NetworkGcInterval.value(); logger.info("Network Manager will run the NetworkGarbageCollector every '{}' seconds.", netGcInterval); _executor.scheduleWithFixedDelay(new NetworkGarbageCollector(), netGcInterval, netGcInterval, TimeUnit.SECONDS); diff --git a/plugins/affinity-group-processors/host-anti-affinity/src/main/java/org/apache/cloudstack/affinity/HostAntiAffinityProcessor.java b/plugins/affinity-group-processors/host-anti-affinity/src/main/java/org/apache/cloudstack/affinity/HostAntiAffinityProcessor.java index bd29a48f2588..7af2cb01ada8 100644 --- a/plugins/affinity-group-processors/host-anti-affinity/src/main/java/org/apache/cloudstack/affinity/HostAntiAffinityProcessor.java +++ b/plugins/affinity-group-processors/host-anti-affinity/src/main/java/org/apache/cloudstack/affinity/HostAntiAffinityProcessor.java @@ -32,17 +32,16 @@ import org.apache.cloudstack.engine.cloud.entity.api.db.dao.VMReservationDao; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; -import com.cloud.configuration.Config; import com.cloud.deploy.DeployDestination; import com.cloud.deploy.DeploymentPlan; import com.cloud.deploy.DeploymentPlanner.ExcludeList; import com.cloud.exception.AffinityConflictException; import com.cloud.utils.DateUtil; -import com.cloud.utils.NumbersUtil; import com.cloud.utils.db.Transaction; import com.cloud.utils.db.TransactionCallback; import com.cloud.utils.db.TransactionCallbackNoReturn; import com.cloud.utils.db.TransactionStatus; +import com.cloud.vm.UserVmManager; import com.cloud.vm.VMInstanceVO; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; @@ -125,7 +124,7 @@ protected void processAffinityGroup(AffinityGroupVMMapVO vmGroupMapping, Exclude @Override public boolean configure(final String name, final Map params) throws ConfigurationException { super.configure(name, params); - _vmCapacityReleaseInterval = NumbersUtil.parseInt(_configDao.getValue(Config.CapacitySkipcountingHours.key()), 3600); + _vmCapacityReleaseInterval = UserVmManager.CapacitySkipcountingHours.value(); return true; } diff --git a/plugins/affinity-group-processors/non-strict-host-affinity/src/main/java/org/apache/cloudstack/affinity/NonStrictHostAffinityProcessor.java b/plugins/affinity-group-processors/non-strict-host-affinity/src/main/java/org/apache/cloudstack/affinity/NonStrictHostAffinityProcessor.java index 49e3f60ed5d0..ea3b82127932 100644 --- a/plugins/affinity-group-processors/non-strict-host-affinity/src/main/java/org/apache/cloudstack/affinity/NonStrictHostAffinityProcessor.java +++ b/plugins/affinity-group-processors/non-strict-host-affinity/src/main/java/org/apache/cloudstack/affinity/NonStrictHostAffinityProcessor.java @@ -23,19 +23,17 @@ import javax.inject.Inject; import javax.naming.ConfigurationException; - import org.apache.cloudstack.affinity.dao.AffinityGroupDao; import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao; import org.apache.cloudstack.engine.cloud.entity.api.db.dao.VMReservationDao; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; -import com.cloud.configuration.Config; import com.cloud.deploy.DeployDestination; import com.cloud.deploy.DeploymentPlan; import com.cloud.deploy.DeploymentPlanner.ExcludeList; import com.cloud.exception.AffinityConflictException; import com.cloud.utils.DateUtil; -import com.cloud.utils.NumbersUtil; +import com.cloud.vm.UserVmManager; import com.cloud.vm.VMInstanceVO; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; @@ -119,7 +117,7 @@ protected Integer adjustHostPriority(DeploymentPlan plan, Long hostId) { @Override public boolean configure(final String name, final Map params) throws ConfigurationException { super.configure(name, params); - vmCapacityReleaseInterval = NumbersUtil.parseInt(configDao.getValue(Config.CapacitySkipcountingHours.key()), 3600); + vmCapacityReleaseInterval = UserVmManager.CapacitySkipcountingHours.value(); return true; } diff --git a/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java index 1f0207267932..f1ee374c71f8 100644 --- a/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java +++ b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java @@ -49,7 +49,6 @@ import org.apache.logging.log4j.Logger; import org.springframework.stereotype.Component; -import com.cloud.configuration.Config; import com.cloud.dc.ClusterVO; import com.cloud.dc.DataCenterVO; import com.cloud.dc.DedicatedResourceVO; @@ -72,7 +71,6 @@ import com.cloud.user.AccountVO; import com.cloud.user.dao.AccountDao; import com.cloud.utils.DateUtil; -import com.cloud.utils.NumbersUtil; import com.cloud.utils.Pair; import com.cloud.utils.db.DB; import com.cloud.utils.db.Filter; @@ -81,6 +79,7 @@ import com.cloud.utils.db.TransactionCallbackNoReturn; import com.cloud.utils.db.TransactionStatus; import com.cloud.utils.exception.CloudRuntimeException; +import com.cloud.vm.UserVmManager; import com.cloud.vm.UserVmVO; import com.cloud.vm.dao.UserVmDao; @@ -117,7 +116,7 @@ public class DedicatedResourceManagerImpl implements DedicatedService { private int capacityReleaseInterval; public boolean configure(final String name, final Map params) throws ConfigurationException { - capacityReleaseInterval = NumbersUtil.parseInt(_configDao.getValue(Config.CapacitySkipcountingHours.key()), 3600); + capacityReleaseInterval = UserVmManager.CapacitySkipcountingHours.value(); return true; } diff --git a/plugins/deployment-planners/implicit-dedication/src/main/java/com/cloud/deploy/ImplicitDedicationPlanner.java b/plugins/deployment-planners/implicit-dedication/src/main/java/com/cloud/deploy/ImplicitDedicationPlanner.java index f9cde2ae4414..eedd2c915060 100644 --- a/plugins/deployment-planners/implicit-dedication/src/main/java/com/cloud/deploy/ImplicitDedicationPlanner.java +++ b/plugins/deployment-planners/implicit-dedication/src/main/java/com/cloud/deploy/ImplicitDedicationPlanner.java @@ -28,7 +28,6 @@ import org.apache.commons.collections.CollectionUtils; -import com.cloud.configuration.Config; import com.cloud.exception.InsufficientServerCapacityException; import com.cloud.resource.ResourceManager; import com.cloud.service.ServiceOfferingVO; @@ -36,7 +35,7 @@ import com.cloud.service.dao.ServiceOfferingDetailsDao; import com.cloud.user.Account; import com.cloud.utils.DateUtil; -import com.cloud.utils.NumbersUtil; +import com.cloud.vm.UserVmManager; import com.cloud.vm.VMInstanceVO; import com.cloud.vm.VirtualMachineProfile; @@ -55,7 +54,7 @@ public class ImplicitDedicationPlanner extends FirstFitPlanner implements Deploy @Override public boolean configure(final String name, final Map params) throws ConfigurationException { super.configure(name, params); - capacityReleaseInterval = NumbersUtil.parseInt(configDao.getValue(Config.CapacitySkipcountingHours.key()), 3600); + capacityReleaseInterval = UserVmManager.CapacitySkipcountingHours.value(); return true; } diff --git a/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java b/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java index 3be7384ffb71..cdefd16fac93 100644 --- a/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java +++ b/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java @@ -51,7 +51,6 @@ import com.cloud.agent.api.Command; import com.cloud.agent.api.StartupCommand; import com.cloud.capacity.dao.CapacityDao; -import com.cloud.configuration.Config; import com.cloud.dc.ClusterDetailsDao; import com.cloud.dc.ClusterDetailsVO; import com.cloud.dc.dao.ClusterDao; @@ -77,7 +76,6 @@ import com.cloud.storage.dao.VMTemplatePoolDao; import com.cloud.storage.dao.VolumeDao; import com.cloud.utils.DateUtil; -import com.cloud.utils.NumbersUtil; import com.cloud.utils.Pair; import com.cloud.utils.component.ManagerBase; import com.cloud.utils.db.DB; @@ -88,6 +86,7 @@ import com.cloud.utils.fsm.StateListener; import com.cloud.utils.fsm.StateMachine2; import com.cloud.vm.VMInstanceDetailVO; +import com.cloud.vm.UserVmManager; import com.cloud.vm.UserVmVO; import com.cloud.vm.VMInstanceVO; import com.cloud.vm.VirtualMachine; @@ -147,7 +146,7 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, @Override public boolean configure(String name, Map params) throws ConfigurationException { - _vmCapacityReleaseInterval = NumbersUtil.parseInt(_configDao.getValue(Config.CapacitySkipcountingHours.key()), 3600); + _vmCapacityReleaseInterval = UserVmManager.CapacitySkipcountingHours.value(); VirtualMachine.State.getStateMachine().registerListener(this); _agentManager.registerForHostEvents(new StorageCapacityListener(_capacityDao, _storageMgr), true, false, false); diff --git a/server/src/main/java/com/cloud/network/ExternalDeviceUsageManagerImpl.java b/server/src/main/java/com/cloud/network/ExternalDeviceUsageManagerImpl.java index bffc35f72dfa..a0e9e52153d0 100644 --- a/server/src/main/java/com/cloud/network/ExternalDeviceUsageManagerImpl.java +++ b/server/src/main/java/com/cloud/network/ExternalDeviceUsageManagerImpl.java @@ -35,7 +35,6 @@ import com.cloud.agent.AgentManager; import com.cloud.agent.api.ExternalNetworkResourceUsageAnswer; import com.cloud.agent.api.ExternalNetworkResourceUsageCommand; -import com.cloud.configuration.Config; import com.cloud.dc.DataCenterVO; import com.cloud.dc.dao.DataCenterDao; import com.cloud.dc.dao.HostPodDao; @@ -76,7 +75,6 @@ import com.cloud.user.UserStatisticsVO; import com.cloud.user.dao.AccountDao; import com.cloud.user.dao.UserStatisticsDao; -import com.cloud.utils.NumbersUtil; import com.cloud.utils.component.ManagerBase; import com.cloud.utils.concurrency.NamedThreadFactory; import com.cloud.utils.db.GlobalLock; @@ -157,7 +155,7 @@ public class ExternalDeviceUsageManagerImpl extends ManagerBase implements Exter @Override public boolean configure(String name, Map params) throws ConfigurationException { - _externalNetworkStatsInterval = NumbersUtil.parseInt(_configDao.getValue(Config.ExternalNetworkStatsInterval.key()), 300); + _externalNetworkStatsInterval = NetworkModel.ExternalNetworkStatsInterval.value(); if (_externalNetworkStatsInterval > 0) { _executor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("ExternalNetworkMonitor")); } diff --git a/server/src/main/java/com/cloud/network/IpAddressManagerImpl.java b/server/src/main/java/com/cloud/network/IpAddressManagerImpl.java index b7a6846422fb..dfccbced9a71 100644 --- a/server/src/main/java/com/cloud/network/IpAddressManagerImpl.java +++ b/server/src/main/java/com/cloud/network/IpAddressManagerImpl.java @@ -59,7 +59,6 @@ import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; import org.apache.cloudstack.framework.config.ConfigKey; import org.apache.cloudstack.framework.config.Configurable; -import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.framework.messagebus.MessageBus; import org.apache.cloudstack.framework.messagebus.PublishScope; import org.apache.cloudstack.region.PortableIp; @@ -222,8 +221,6 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage @Inject UserDao _userDao; @Inject - ConfigurationDao _configDao; - @Inject UserVmDao _userVmDao; @Inject AlertManager _alertMgr; @@ -566,7 +563,7 @@ public boolean configure(String name, Map params) { AssignIpAddressFromPodVlanSearch.join("vlan", podVlanSearch, podVlanSearch.entity().getId(), AssignIpAddressFromPodVlanSearch.entity().getVlanId(), JoinType.INNER); AssignIpAddressFromPodVlanSearch.done(); - Network.State.getStateMachine().registerListener(new NetworkStateListener(_configDao)); + Network.State.getStateMachine().registerListener(new NetworkStateListener()); if (RulesContinueOnError.value() != null) { rulesContinueOnErrFlag = RulesContinueOnError.value(); diff --git a/server/src/main/java/com/cloud/network/Ipv6AddressManagerImpl.java b/server/src/main/java/com/cloud/network/Ipv6AddressManagerImpl.java index d096b09ec0d4..f4da58c525ff 100644 --- a/server/src/main/java/com/cloud/network/Ipv6AddressManagerImpl.java +++ b/server/src/main/java/com/cloud/network/Ipv6AddressManagerImpl.java @@ -24,7 +24,6 @@ import org.apache.cloudstack.framework.config.dao.ConfigurationDao; -import com.cloud.configuration.Config; import com.cloud.dc.DataCenter; import com.cloud.dc.Vlan; import com.cloud.dc.dao.DataCenterDao; @@ -78,7 +77,7 @@ public class Ipv6AddressManagerImpl extends ManagerBase implements Ipv6AddressMa public boolean configure(String name, Map params) throws ConfigurationException { _name = name; Map configs = _configDao.getConfiguration(params); - _ipv6RetryMax = NumbersUtil.parseInt(configs.get(Config.NetworkIPv6SearchRetryMax.key()), 10000); + _ipv6RetryMax = NumbersUtil.parseInt(configs.get(NetworkModel.NetworkIPv6SearchRetryMax.key()), 10000); return true; } diff --git a/server/src/main/java/com/cloud/network/NetworkModelImpl.java b/server/src/main/java/com/cloud/network/NetworkModelImpl.java index 26231cd3f594..b7fd40d26ab7 100644 --- a/server/src/main/java/com/cloud/network/NetworkModelImpl.java +++ b/server/src/main/java/com/cloud/network/NetworkModelImpl.java @@ -48,7 +48,6 @@ import org.apache.commons.lang3.StringUtils; import com.cloud.api.ApiDBUtils; -import com.cloud.configuration.Config; import com.cloud.configuration.ConfigurationManager; import com.cloud.dc.DataCenter; import com.cloud.dc.DataCenterVO; @@ -2539,8 +2538,8 @@ private List getNetworkProviders(long networkId) { @Override public boolean configure(String name, Map params) throws ConfigurationException { _configs = _configDao.getConfiguration("Network", params); - _allowSubdomainNetworkAccess = Boolean.valueOf(_configs.get(Config.SubDomainNetworkAccess.key())); - _executeInSequenceNtwkElmtCmd = Boolean.valueOf(_configs.get(Config.ExecuteInSequenceNetworkElementCommands.key())); + _allowSubdomainNetworkAccess = Boolean.valueOf(_configs.get(SubDomainNetworkAccess.key())); + _executeInSequenceNtwkElmtCmd = Boolean.valueOf(_configs.get(ExecuteInSequenceNetworkElementCommands.key())); NetworkOfferingVO publicNetworkOffering = new NetworkOfferingVO(NetworkOffering.SystemPublicNetwork, TrafficType.Public, true); publicNetworkOffering = _networkOfferingDao.persistDefaultNetworkOffering(publicNetworkOffering); diff --git a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java index a53ab122bfb2..07d9a130e81c 100644 --- a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java +++ b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java @@ -100,7 +100,6 @@ import com.cloud.api.query.dao.DomainRouterJoinDao; import com.cloud.api.query.vo.DomainRouterJoinVO; import com.cloud.bgp.BGPService; -import com.cloud.configuration.Config; import com.cloud.configuration.ConfigurationManager; import com.cloud.configuration.Resource; import com.cloud.dc.AccountVlanMapVO; @@ -836,9 +835,9 @@ public boolean releasePortableIpAddress(long ipAddressId) { public boolean configure(final String name, final Map params) throws ConfigurationException { _configs = _configDao.getConfiguration("Network", params); - _cidrLimit = NumbersUtil.parseInt(_configs.get(Config.NetworkGuestCidrLimit.key()), 22); + _cidrLimit = NumbersUtil.parseInt(_configs.get(NetworkGuestCidrLimit.key()), 22); - _allowSubdomainNetworkAccess = Boolean.valueOf(_configs.get(Config.SubDomainNetworkAccess.key())); + _allowSubdomainNetworkAccess = Boolean.valueOf(_configs.get(NetworkModel.SubDomainNetworkAccess.key())); logger.info("Network Service is configured."); diff --git a/server/src/main/java/com/cloud/storage/StorageManagerImpl.java b/server/src/main/java/com/cloud/storage/StorageManagerImpl.java index fa5079624681..c53af932bf69 100644 --- a/server/src/main/java/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/main/java/com/cloud/storage/StorageManagerImpl.java @@ -181,7 +181,6 @@ import com.cloud.capacity.CapacityVO; import com.cloud.capacity.dao.CapacityDao; import com.cloud.cluster.ClusterManagerListener; -import com.cloud.configuration.Config; import com.cloud.configuration.ConfigurationManager; import com.cloud.configuration.Resource.ResourceType; import com.cloud.cpu.CPU; @@ -741,7 +740,7 @@ public boolean configure(String name, Map params) { LocalStorageSearch.and("type", LocalStorageSearch.entity().getPoolType(), SearchCriteria.Op.IN); LocalStorageSearch.done(); - Volume.State.getStateMachine().registerListener(new VolumeStateListener(_configDao, _vmInstanceDao)); + Volume.State.getStateMachine().registerListener(new VolumeStateListener(_vmInstanceDao)); return true; } @@ -4568,7 +4567,7 @@ public Long getDiskBytesReadRate(final ServiceOffering offering, final DiskOffer } else if ((diskOffering != null) && (diskOffering.getBytesReadRate() != null) && (diskOffering.getBytesReadRate() > 0)) { return diskOffering.getBytesReadRate(); } else { - Long bytesReadRate = Long.parseLong(_configDao.getValue(Config.VmDiskThrottlingBytesReadRate.key())); + Long bytesReadRate = VmDiskThrottlingBytesReadRate.value(); if ((bytesReadRate > 0) && ((offering == null) || (!offering.isSystemUse()))) { return bytesReadRate; } @@ -4582,7 +4581,7 @@ public Long getDiskBytesWriteRate(final ServiceOffering offering, final DiskOffe if ((diskOffering != null) && (diskOffering.getBytesWriteRate() != null) && (diskOffering.getBytesWriteRate() > 0)) { return diskOffering.getBytesWriteRate(); } else { - Long bytesWriteRate = Long.parseLong(_configDao.getValue(Config.VmDiskThrottlingBytesWriteRate.key())); + Long bytesWriteRate = VmDiskThrottlingBytesWriteRate.value(); if ((bytesWriteRate > 0) && ((offering == null) || (!offering.isSystemUse()))) { return bytesWriteRate; } @@ -4596,7 +4595,7 @@ public Long getDiskIopsReadRate(final ServiceOffering offering, final DiskOfferi if ((diskOffering != null) && (diskOffering.getIopsReadRate() != null) && (diskOffering.getIopsReadRate() > 0)) { return diskOffering.getIopsReadRate(); } else { - Long iopsReadRate = Long.parseLong(_configDao.getValue(Config.VmDiskThrottlingIopsReadRate.key())); + Long iopsReadRate = VmDiskThrottlingIopsReadRate.value().longValue(); if ((iopsReadRate > 0) && ((offering == null) || (!offering.isSystemUse()))) { return iopsReadRate; } @@ -4610,7 +4609,7 @@ public Long getDiskIopsWriteRate(final ServiceOffering offering, final DiskOffer if ((diskOffering != null) && (diskOffering.getIopsWriteRate() != null) && (diskOffering.getIopsWriteRate() > 0)) { return diskOffering.getIopsWriteRate(); } else { - Long iopsWriteRate = Long.parseLong(_configDao.getValue(Config.VmDiskThrottlingIopsWriteRate.key())); + Long iopsWriteRate = VmDiskThrottlingIopsWriteRate.value().longValue(); if ((iopsWriteRate > 0) && ((offering == null) || (!offering.isSystemUse()))) { return iopsWriteRate; } diff --git a/server/src/main/java/com/cloud/storage/listener/SnapshotStateListener.java b/server/src/main/java/com/cloud/storage/listener/SnapshotStateListener.java index 18ab4168c249..dc22c38c69a2 100644 --- a/server/src/main/java/com/cloud/storage/listener/SnapshotStateListener.java +++ b/server/src/main/java/com/cloud/storage/listener/SnapshotStateListener.java @@ -22,17 +22,13 @@ import java.util.HashMap; import java.util.Map; -import javax.annotation.PostConstruct; -import javax.inject.Inject; - -import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.framework.events.EventDistributor; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.stereotype.Component; -import com.cloud.configuration.Config; import com.cloud.event.EventCategory; +import com.cloud.server.ManagementServer; import com.cloud.server.ManagementService; import com.cloud.storage.Snapshot; import com.cloud.storage.Snapshot.Event; @@ -45,11 +41,6 @@ @Component public class SnapshotStateListener implements StateListener { - protected static ConfigurationDao s_configDao; - - @Inject - private ConfigurationDao configDao; - private EventDistributor eventDistributor = null; protected Logger logger = LogManager.getLogger(getClass()); @@ -57,11 +48,6 @@ public SnapshotStateListener() { } - @PostConstruct - void init() { - s_configDao = configDao; - } - public void setEventDistributor(EventDistributor eventDistributor) { this.eventDistributor = eventDistributor; } @@ -80,9 +66,7 @@ public boolean postStateTransitionEvent(StateMachine2.Transition t private void pubishOnEventBus(String event, String status, Snapshot vo, State oldState, State newState) { - String configKey = Config.PublishResourceStateEvent.key(); - String value = s_configDao.getValue(configKey); - boolean configValue = Boolean.parseBoolean(value); + boolean configValue = ManagementServer.PublishResourceStateEvent.value(); if(!configValue) { return; } diff --git a/server/src/main/java/com/cloud/storage/listener/VolumeStateListener.java b/server/src/main/java/com/cloud/storage/listener/VolumeStateListener.java index 0910c46705af..dfaf2f69bf2e 100644 --- a/server/src/main/java/com/cloud/storage/listener/VolumeStateListener.java +++ b/server/src/main/java/com/cloud/storage/listener/VolumeStateListener.java @@ -22,15 +22,14 @@ import java.util.HashMap; import java.util.Map; -import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.framework.events.EventDistributor; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import com.cloud.configuration.Config; import com.cloud.event.EventCategory; import com.cloud.event.EventTypes; import com.cloud.event.UsageEventUtils; +import com.cloud.server.ManagementServer; import com.cloud.server.ManagementService; import com.cloud.storage.Volume; import com.cloud.storage.Volume.Event; @@ -44,14 +43,12 @@ public class VolumeStateListener implements StateListener { - protected ConfigurationDao _configDao; protected VMInstanceDao _vmInstanceDao; private EventDistributor eventDistributor; protected Logger logger = LogManager.getLogger(getClass()); - public VolumeStateListener(ConfigurationDao configDao, VMInstanceDao vmInstanceDao) { - this._configDao = configDao; + public VolumeStateListener(VMInstanceDao vmInstanceDao) { this._vmInstanceDao = vmInstanceDao; } @@ -96,9 +93,7 @@ public boolean postStateTransitionEvent(StateMachine2.Transition t private void pubishOnEventBus(String event, String status, Volume vo, State oldState, State newState) { - String configKey = Config.PublishResourceStateEvent.key(); - String value = _configDao.getValue(configKey); - boolean configValue = Boolean.parseBoolean(value); + boolean configValue = ManagementServer.PublishResourceStateEvent.value(); if(!configValue) return; if (eventDistributor == null) { diff --git a/server/src/main/java/com/cloud/user/AccountManagerImpl.java b/server/src/main/java/com/cloud/user/AccountManagerImpl.java index 18994b796775..9142af6bdb76 100644 --- a/server/src/main/java/com/cloud/user/AccountManagerImpl.java +++ b/server/src/main/java/com/cloud/user/AccountManagerImpl.java @@ -564,10 +564,10 @@ public boolean configure(final String name, final Map params) th Map configs = _configDao.getConfiguration(params); - String loginAttempts = configs.get(Config.IncorrectLoginAttemptsAllowed.key()); + String loginAttempts = configs.get(IncorrectLoginAttemptsAllowed.key()); _allowedLoginAttempts = NumbersUtil.parseInt(loginAttempts, 5); - String value = configs.get(Config.AccountCleanupInterval.key()); + String value = configs.get(AccountCleanupInterval.key()); _cleanupInterval = NumbersUtil.parseInt(value, 60 * 60 * 24); // 1 day. return true; @@ -3190,16 +3190,8 @@ private UserAccount getUserAccountForSSO(String username, Long domainId, Map params) throws Configu String workers = configs.get("expunge.workers"); int wrks = NumbersUtil.parseInt(workers, 10); - capacityReleaseInterval = NumbersUtil.parseInt(_configDao.getValue(Config.CapacitySkipcountingHours.key()), 3600); + capacityReleaseInterval = CapacitySkipcountingHours.value(); String time = configs.get("expunge.interval"); _expungeInterval = NumbersUtil.parseInt(time, 86400); @@ -2629,12 +2629,11 @@ public boolean configure(String name, Map params) throws Configu _itMgr.registerGuru(VirtualMachine.Type.User, this); - VirtualMachine.State.getStateMachine().registerListener(new UserVmStateListener(_usageEventDao, _networkDao, _nicDao, serviceOfferingDao, _vmDao, this, _configDao)); + VirtualMachine.State.getStateMachine().registerListener(new UserVmStateListener(_usageEventDao, _networkDao, _nicDao, serviceOfferingDao, _vmDao, this)); - String value = _configDao.getValue(Config.SetVmInternalNameUsingDisplayName.key()); - _instanceNameFlag = (value == null) ? false : Boolean.parseBoolean(value); + _instanceNameFlag = SetVmInternalNameUsingDisplayName.value(); - _scaleRetry = NumbersUtil.parseInt(configs.get(Config.ScaleRetry.key()), 2); + _scaleRetry = NumbersUtil.parseInt(configs.get(ScaleRetry.key()), 2); _vmIpFetchThreadExecutor = Executors.newFixedThreadPool(VmIpFetchThreadPoolMax.value(), new NamedThreadFactory("vmIpFetchThread")); logger.info("User VM Manager is configured."); diff --git a/server/src/main/java/com/cloud/vm/UserVmStateListener.java b/server/src/main/java/com/cloud/vm/UserVmStateListener.java index aa1805d3366e..b61a44486f08 100644 --- a/server/src/main/java/com/cloud/vm/UserVmStateListener.java +++ b/server/src/main/java/com/cloud/vm/UserVmStateListener.java @@ -24,19 +24,18 @@ import javax.inject.Inject; -import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.framework.events.EventDistributor; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.NoSuchBeanDefinitionException; -import com.cloud.configuration.Config; import com.cloud.event.EventCategory; import com.cloud.event.EventTypes; import com.cloud.event.UsageEventUtils; import com.cloud.event.dao.UsageEventDao; import com.cloud.network.dao.NetworkDao; import com.cloud.network.dao.NetworkVO; +import com.cloud.server.ManagementServer; import com.cloud.server.ManagementService; import com.cloud.service.dao.ServiceOfferingDao; import com.cloud.utils.component.ComponentContext; @@ -55,19 +54,16 @@ public class UserVmStateListener implements StateListener hosts = new ArrayList<>(); HostVO hostVO = Mockito.mock(HostVO.class); when(hostVO.isInMaintenanceStates()).thenReturn(false);