use ConfigKeys for ManagementServer, agent, secondary storage and router settings

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

@@ -94,7 +94,6 @@
 import com.cloud.alert.AlertManager;
 import com.cloud.cluster.ManagementServerHostVO;
 import com.cloud.cluster.dao.ManagementServerHostDao;
-import com.cloud.configuration.Config;
 import com.cloud.configuration.ManagementServiceConfiguration;
 import com.cloud.dc.ClusterVO;
 import com.cloud.dc.DataCenterVO;
@@ -121,6 +120,7 @@
 import com.cloud.resource.ResourceManager;
 import com.cloud.resource.ResourceState;
 import com.cloud.resource.ServerResource;
+import com.cloud.server.ManagementServer;
 import com.cloud.utils.NumbersUtil;
 import com.cloud.utils.Pair;
 import com.cloud.utils.component.ManagerBase;
@@ -2273,8 +2273,8 @@ public void processConnect(final Host host, final StartupCommand cmd, final bool
 
             if (((StartupRoutingCommand)cmd).getHypervisorType() == HypervisorType.KVM || ((StartupRoutingCommand)cmd).getHypervisorType() == HypervisorType.LXC) {
                 Map<String, String> params = new HashMap<>();
-                params.put(Config.RouterAggregationCommandEachTimeout.toString(), _configDao.getValue(Config.RouterAggregationCommandEachTimeout.toString()));
-                params.put(Config.MigrateWait.toString(), _configDao.getValue(Config.MigrateWait.toString()));
+                params.put(ManagementServer.RouterAggregationCommandEachTimeout.key(), String.valueOf(ManagementServer.RouterAggregationCommandEachTimeout.value()));
+                params.put(MigrateWait.toString(), String.valueOf(MigrateWait.value()));
                 params.put(NetworkOrchestrationService.TUNGSTEN_ENABLED.key(), String.valueOf(NetworkOrchestrationService.TUNGSTEN_ENABLED.valueIn(host.getDataCenterId())));
                 params.put(ReconcileCommandService.ReconcileCommandsEnabled.key(), String.valueOf(_reconcileCommandsEnabled));
 

engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java

@@ -59,6 +59,7 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.stereotype.Component;
+import com.cloud.agent.AgentManager;
 
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.storage.MigrateVolumeAnswer;
@@ -68,7 +69,6 @@
 import com.cloud.agent.api.to.DataTO;
 import com.cloud.agent.api.to.NfsTO;
 import com.cloud.agent.api.to.VirtualMachineTO;
-import com.cloud.configuration.Config;
 import com.cloud.host.Host;
 import com.cloud.hypervisor.Hypervisor;
 import com.cloud.storage.DataStoreRole;
@@ -85,7 +85,6 @@
 import com.cloud.storage.dao.VolumeDao;
 import com.cloud.storage.snapshot.SnapshotManager;
 import com.cloud.template.TemplateManager;
-import com.cloud.utils.NumbersUtil;
 import com.cloud.utils.db.DB;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.vm.VirtualMachineManager;
@@ -632,8 +631,7 @@ private boolean canDirectlyCopyBetweenDataStoreScopes(Scope srcDataStoreScope, S
     }
 
     protected Answer migrateVolumeToPool(DataObject srcData, DataObject destData) {
-        String value = configDao.getValue(Config.MigrateWait.key());
-        int waitInterval = NumbersUtil.parseInt(value, Integer.parseInt(Config.MigrateWait.getDefaultValue()));
+        int waitInterval = AgentManager.MigrateWait.value();
 
         VolumeInfo volume = (VolumeInfo)srcData;
         StoragePool srcPool = (StoragePool)dataStoreMgr.getDataStore(srcData.getDataStore().getId(), DataStoreRole.Primary);

engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java

@@ -101,7 +101,6 @@
 import com.cloud.agent.api.to.DiskTO;
 import com.cloud.agent.api.to.NfsTO;
 import com.cloud.agent.api.to.VirtualMachineTO;
-import com.cloud.configuration.Config;
 import com.cloud.dc.dao.ClusterDao;
 import com.cloud.exception.AgentUnavailableException;
 import com.cloud.exception.OperationTimedoutException;
@@ -139,7 +138,6 @@
 import com.cloud.storage.dao.VMTemplatePoolDao;
 import com.cloud.storage.dao.VolumeDao;
 import com.cloud.storage.dao.VolumeDetailsDao;
-import com.cloud.utils.NumbersUtil;
 import com.cloud.utils.db.GlobalLock;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.vm.VMInstanceVO;
@@ -753,8 +751,7 @@ private void handleVolumeMigrationForXenServer(VolumeInfo srcVolumeInfo, VolumeI
 
         _volumeService.grantAccess(destVolumeInfo, hostVO, destVolumeInfo.getDataStore());
 
-        String value = _configDao.getValue(Config.MigrateWait.key());
-        int waitInterval = NumbersUtil.parseInt(value, Integer.parseInt(Config.MigrateWait.getDefaultValue()));
+        int waitInterval = AgentManager.MigrateWait.value();
 
         StoragePool destPool = (StoragePool)dataStoreMgr.getDataStore(destVolumeInfo.getDataStore().getId(), DataStoreRole.Primary);
 

engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java

@@ -81,7 +81,6 @@
 import com.cloud.agent.api.storage.ListTemplateCommand;
 import com.cloud.agent.api.to.DatadiskTO;
 import com.cloud.alert.AlertManager;
-import com.cloud.configuration.Config;
 import com.cloud.configuration.Resource.ResourceType;
 import com.cloud.dc.DataCenterVO;
 import com.cloud.dc.dao.ClusterDao;
@@ -104,6 +103,7 @@
 import com.cloud.storage.VMTemplateZoneVO;
 import com.cloud.storage.dao.VMTemplateDao;
 import com.cloud.storage.dao.VMTemplateZoneDao;
+import com.cloud.storage.secondary.SecondaryStorageVmManager;
 import com.cloud.storage.template.TemplateConstants;
 import com.cloud.storage.template.TemplateProp;
 import com.cloud.template.TemplateManager;
@@ -1519,12 +1519,8 @@ public AsyncCallFuture<TemplateApiResult> copyTemplate(TemplateInfo srcTemplate,
     private String generateCopyUrl(String ipAddress, String dir, String path) {
         String hostname = ipAddress;
         String scheme = "http";
-        boolean _sslCopy = false;
-        String sslCfg = _configDao.getValue(Config.SecStorageEncryptCopy.toString());
-        String _ssvmUrlDomain = _configDao.getValue("secstorage.ssl.cert.domain");
-        if (sslCfg != null) {
-            _sslCopy = Boolean.parseBoolean(sslCfg);
-        }
+        boolean _sslCopy = SecondaryStorageVmManager.SecStorageEncryptCopy.value();
+        String _ssvmUrlDomain = SecondaryStorageVmManager.SecStorageSecureCopyCert.value();
         if(_sslCopy && (_ssvmUrlDomain == null || _ssvmUrlDomain.isEmpty())){
             logger.warn("Empty secondary storage url domain, ignoring SSL");
             _sslCopy = false;

engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java

@@ -75,7 +75,6 @@
 import org.apache.logging.log4j.LogManager;
 
 import com.cloud.agent.api.Answer;
-import com.cloud.configuration.Config;
 import com.cloud.dc.DataCenter;
 import com.cloud.event.EventTypes;
 import com.cloud.event.UsageEventUtils;
@@ -86,6 +85,7 @@
 import com.cloud.storage.SnapshotVO;
 import com.cloud.storage.dao.SnapshotDao;
 import com.cloud.storage.dao.SnapshotDetailsDao;
+import com.cloud.storage.secondary.SecondaryStorageVmManager;
 import com.cloud.storage.template.TemplateConstants;
 import com.cloud.utils.db.Transaction;
 import com.cloud.utils.db.TransactionCallbackNoReturn;
@@ -188,12 +188,8 @@ public RevertSnapshotContext(AsyncCompletionCallback<T> callback, SnapshotInfo s
 
     private String generateCopyUrlBase(String hostname, String dir) {
         String scheme = "http";
-        boolean _sslCopy = false;
-        String sslCfg = _configDao.getValue(Config.SecStorageEncryptCopy.toString());
-        String _ssvmUrlDomain = _configDao.getValue("secstorage.ssl.cert.domain");
-        if (sslCfg != null) {
-            _sslCopy = Boolean.parseBoolean(sslCfg);
-        }
+        boolean _sslCopy = SecondaryStorageVmManager.SecStorageEncryptCopy.value();
+        String _ssvmUrlDomain = SecondaryStorageVmManager.SecStorageSecureCopyCert.value();
         if(_sslCopy && (_ssvmUrlDomain == null || _ssvmUrlDomain.isEmpty())){
             logger.warn("Empty secondary storage url domain, ignoring SSL");
             _sslCopy = false;

engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/ScaleIOVMSnapshotStrategy.java

@@ -47,7 +47,7 @@
 import com.cloud.event.EventTypes;
 import com.cloud.event.UsageEventUtils;
 import com.cloud.event.UsageEventVO;
-import com.cloud.server.ManagementServerImpl;
+import com.cloud.server.ManagementServer;
 import com.cloud.storage.DiskOfferingVO;
 import com.cloud.storage.Storage;
 import com.cloud.storage.Storage.ImageFormat;
@@ -170,7 +170,7 @@ public VMSnapshot takeVMSnapshot(VMSnapshot vmSnapshot) {
             long virtual_size=0;
             for (VolumeObjectTO volume : volumeTOs) {
                 String volumeSnapshotName = String.format("%s-%s-%s-%s-%s", ScaleIOUtil.VMSNAPSHOT_PREFIX, vmSnapshotVO.getId(), volume.getId(),
-                        storagePool.getUuid().split("-")[0].substring(4), ManagementServerImpl.customCsIdentifier.value());
+                        storagePool.getUuid().split("-")[0].substring(4), ManagementServer.customCsIdentifier.value());
                 srcVolumeDestSnapshotMap.put(ScaleIOUtil.getVolumePath(volume.getPath()), volumeSnapshotName);
 
                 virtual_size += volume.getSize();

engine/storage/src/main/java/org/apache/cloudstack/storage/LocalHostEndpoint.java

@@ -33,8 +33,8 @@
 
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.Command;
-import com.cloud.configuration.Config;
 import com.cloud.resource.ServerResource;
+import com.cloud.storage.secondary.SecondaryStorageVmManager;
 import com.cloud.utils.component.ComponentContext;
 import com.cloud.utils.net.NetUtils;
 
@@ -51,7 +51,7 @@ public LocalHostEndpoint() {
     private void configure() {
         // get mount parent folder configured in global setting, if set, this will overwrite _parent in NfsSecondaryStorageResource to work
         // around permission issue for default /mnt folder
-        String mountParent = configDao.getValue(Config.MountParent.key());
+        String mountParent = SecondaryStorageVmManager.MountParent.value();
 
         String path = mountParent + File.separator + "secStorage";
 

engine/storage/src/main/java/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java

@@ -40,7 +40,6 @@
 import org.apache.cloudstack.framework.async.AsyncCallbackDispatcher;
 import org.apache.cloudstack.framework.async.AsyncCompletionCallback;
 import org.apache.cloudstack.framework.async.AsyncRpcContext;
-import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.storage.command.CommandResult;
 import org.apache.cloudstack.storage.command.CopyCommand;
 import org.apache.cloudstack.storage.command.DeleteCommand;
@@ -67,7 +66,6 @@
 import com.cloud.agent.api.to.NfsTO;
 import com.cloud.agent.api.to.OVFInformationTO;
 import com.cloud.alert.AlertManager;
-import com.cloud.configuration.Config;
 import com.cloud.exception.AgentUnavailableException;
 import com.cloud.exception.OperationTimedoutException;
 import com.cloud.host.Host;
@@ -79,11 +77,11 @@
 import com.cloud.storage.VMTemplateStorageResourceAssoc;
 import com.cloud.storage.VMTemplateVO;
 import com.cloud.storage.VolumeVO;
+import com.cloud.storage.secondary.SecondaryStorageVmManager;
 import com.cloud.storage.dao.VMTemplateDao;
 import com.cloud.storage.dao.VMTemplateZoneDao;
 import com.cloud.storage.dao.VolumeDao;
 import com.cloud.storage.download.DownloadMonitor;
-import com.cloud.utils.NumbersUtil;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.net.Proxy;
 import com.cloud.vm.VirtualMachineManager;
@@ -107,8 +105,6 @@ public abstract class BaseImageStoreDriverImpl implements ImageStoreDriver {
     @Inject
     EndPointSelector _epSelector;
     @Inject
-    ConfigurationDao configDao;
-    @Inject
     VMTemplateZoneDao _vmTemplateZoneDao;
     @Inject
     AlertManager _alertMgr;
@@ -163,7 +159,7 @@ public CreateContext(AsyncCompletionCallback<T> callback, DataObject data) {
 
     protected Long getMaxTemplateSizeInBytes() {
         try {
-            return Long.parseLong(configDao.getValue("max.template.iso.size")) * 1024L * 1024L * 1024L;
+            return SecondaryStorageVmManager.MaxTemplateAndIsoSize.value() * 1024L * 1024L * 1024L;
         } catch (NumberFormatException e) {
             return null;
         }
@@ -398,7 +394,7 @@ public void copyAsync(DataObject srcdata, DataObject destData, AsyncCompletionCa
                 (srcdata.getType() == DataObjectType.SNAPSHOT && destData.getType() == DataObjectType.SNAPSHOT) ||
                 (srcdata.getType() == DataObjectType.VOLUME && destData.getType() == DataObjectType.VOLUME)) {
 
-            int nMaxExecutionMinutes = NumbersUtil.parseInt(configDao.getValue(Config.SecStorageCmdExecutionTimeMax.key()), 30);
+            int nMaxExecutionMinutes = AgentManager.SecStorageCmdExecutionTimeMax.value();
             CopyCommand cmd = new CopyCommand(srcdata.getTO(), destData.getTO(), nMaxExecutionMinutes * 60 * 1000, VirtualMachineManager.ExecuteInSequence.value());
             Answer answer = null;
 

plugins/hypervisors/hyperv/src/main/java/com/cloud/hypervisor/hyperv/manager/HypervManagerImpl.java

@@ -35,10 +35,12 @@
 import org.apache.cloudstack.utils.identity.ManagementServerNode;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
+import com.cloud.agent.AgentManager;
+import com.cloud.network.router.VirtualNetworkApplianceManager;
 
-import com.cloud.configuration.Config;
 import com.cloud.storage.JavaStorageLayer;
 import com.cloud.storage.StorageLayer;
+import com.cloud.storage.secondary.SecondaryStorageVmManager;
 import com.cloud.utils.FileUtil;
 import com.cloud.utils.NumbersUtil;
 import com.cloud.utils.db.GlobalLock;
@@ -78,7 +80,7 @@ public boolean configure(String name, Map<String, Object> params) throws Configu
             _storage = new JavaStorageLayer();
             _storage.configure("StorageLayer", params);
         }
-        _routerExtraPublicNics = NumbersUtil.parseInt(_configDao.getValue(Config.RouterExtraPublicNics.key()), 2);
+        _routerExtraPublicNics = VirtualNetworkApplianceManager.RouterExtraPublicNics.value();
         return true;
     }
 
@@ -313,12 +315,12 @@ private File getSystemVMPatchIsoFile() {
     }
 
     private String getMountParent() {
-        String mountParent = _configDao.getValue(Config.MountParent.key());
+        String mountParent = SecondaryStorageVmManager.MountParent.value();
         if (mountParent == null) {
             mountParent = File.separator + "mnt";
         }
 
-        String instance = _configDao.getValue(Config.InstanceName.key());
+        String instance = AgentManager.InstanceName.value();
         if (instance == null) {
             instance = "DEFAULT";
         }

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java

@@ -187,7 +187,7 @@
 import com.cloud.agent.resource.virtualnetwork.VRScripts;
 import com.cloud.agent.resource.virtualnetwork.VirtualRouterDeployer;
 import com.cloud.agent.resource.virtualnetwork.VirtualRoutingResource;
-import com.cloud.configuration.Config;
+import com.cloud.agent.AgentManager;
 import com.cloud.dc.Vlan;
 import com.cloud.exception.InternalErrorException;
 import com.cloud.host.Host.Type;
@@ -1768,8 +1768,8 @@ public boolean configureHostParams(final Map<String, String> params) {
             storage.persist(AgentProperties.ROUTER_AGGREGATION_COMMAND_EACH_TIMEOUT.getName(), String.valueOf(longValue));
         }
 
-        if (params.get(Config.MigrateWait.toString()) != null) {
-            String value = (String)params.get(Config.MigrateWait.toString());
+        if (params.get(AgentManager.MigrateWait.toString()) != null) {
+            String value = (String)params.get(AgentManager.MigrateWait.toString());
             Integer intValue = NumbersUtil.parseInt(value, -1);
             storage.persist("vm.migrate.wait", String.valueOf(intValue));
             migrateWait = intValue;

plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/hypervisor/OvmDiscoverer.java

@@ -31,7 +31,6 @@
 
 import com.cloud.agent.api.StartupCommand;
 import com.cloud.agent.api.StartupRoutingCommand;
-import com.cloud.configuration.Config;
 import com.cloud.dc.ClusterVO;
 import com.cloud.dc.dao.ClusterDao;
 import com.cloud.exception.DiscoveryException;
@@ -46,6 +45,7 @@
 import com.cloud.resource.ResourceStateAdapter;
 import com.cloud.resource.ServerResource;
 import com.cloud.resource.UnableDeleteHostException;
+import com.cloud.server.ManagementServer;
 import com.cloud.utils.UuidUtils;
 import com.cloud.utils.db.QueryBuilder;
 import com.cloud.utils.db.SearchCriteria;
@@ -65,9 +65,9 @@ public class OvmDiscoverer extends DiscovererBase implements Discoverer, Resourc
     @Override
     public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
         super.configure(name, params);
-        _publicNetworkDevice = _params.get(Config.OvmPublicNetwork.key());
-        _privateNetworkDevice = _params.get(Config.OvmPrivateNetwork.key());
-        _guestNetworkDevice = _params.get(Config.OvmGuestNetwork.key());
+        _publicNetworkDevice = ManagementServer.OvmPublicNetwork.value();
+        _privateNetworkDevice = ManagementServer.OvmPrivateNetwork.value();
+        _guestNetworkDevice = ManagementServer.OvmGuestNetwork.value();
         _resourceMgr.registerResourceStateAdapter(this.getClass().getSimpleName(), this);
         return true;
     }

plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3Discoverer.java

@@ -29,7 +29,6 @@
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
-
 import com.cloud.agent.AgentManager;
 import com.cloud.agent.Listener;
 import com.cloud.agent.api.AgentControlAnswer;
@@ -38,7 +37,6 @@
 import com.cloud.agent.api.Command;
 import com.cloud.agent.api.StartupCommand;
 import com.cloud.agent.api.StartupRoutingCommand;
-import com.cloud.configuration.Config;
 import com.cloud.dc.ClusterDetailsDao;
 import com.cloud.dc.ClusterVO;
 import com.cloud.dc.dao.ClusterDao;
@@ -58,6 +56,7 @@
 import com.cloud.resource.ResourceStateAdapter;
 import com.cloud.resource.ServerResource;
 import com.cloud.resource.UnableDeleteHostException;
+import com.cloud.server.ManagementServer;
 import com.cloud.utils.UuidUtils;
 import com.cloud.utils.db.QueryBuilder;
 import com.cloud.utils.db.SearchCriteria;
@@ -93,11 +92,10 @@ public boolean configure(String name, Map<String, Object> params)
             return false;
         }
 
-        /* these are in Config.java */
-        publicNetworkDevice = _params.get(Config.Ovm3PublicNetwork.key());
-        privateNetworkDevice = _params.get(Config.Ovm3PrivateNetwork.key());
-        guestNetworkDevice = _params.get(Config.Ovm3GuestNetwork.key());
-        storageNetworkDevice = _params.get(Config.Ovm3StorageNetwork.key());
+        publicNetworkDevice = ManagementServer.Ovm3PublicNetwork.value();
+        privateNetworkDevice = ManagementServer.Ovm3PrivateNetwork.value();
+        guestNetworkDevice = ManagementServer.Ovm3GuestNetwork.value();
+        storageNetworkDevice = ManagementServer.Ovm3StorageNetwork.value();
         resourceMgr.registerResourceStateAdapter(this.getClass()
                 .getSimpleName(), this);
         return true;

plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java

@@ -150,6 +150,7 @@
 import com.cloud.storage.StoragePool;
 import com.cloud.storage.StoragePoolStatus;
 import com.cloud.storage.dao.VMTemplatePoolDao;
+import com.cloud.storage.secondary.SecondaryStorageVmManager;
 import com.cloud.template.TemplateManager;
 import com.cloud.utils.FileUtil;
 import com.cloud.utils.NumbersUtil;
@@ -313,13 +314,13 @@ public boolean configure(String name, Map<String, Object> params) throws Configu
             throw new ConfigurationException("Vmware component can only run under premium distribution");
         }
 
-        _instance = _configDao.getValue(Config.InstanceName.key());
+        _instance = AgentManager.InstanceName.value();
         if (_instance == null) {
             _instance = "DEFAULT";
         }
         logger.info("VmwareManagerImpl config - instance.name: " + _instance);
 
-        _mountParent = _configDao.getValue(Config.MountParent.key());
+        _mountParent = SecondaryStorageVmManager.MountParent.value();
         if (_mountParent == null) {
             _mountParent = File.separator + "mnt";
         }