diff --git a/api/src/main/java/com/cloud/offering/ServiceOffering.java b/api/src/main/java/com/cloud/offering/ServiceOffering.java index 163762202b0..7bad77fef30 100644 --- a/api/src/main/java/com/cloud/offering/ServiceOffering.java +++ b/api/src/main/java/com/cloud/offering/ServiceOffering.java @@ -117,5 +117,5 @@ public interface ServiceOffering extends DiskOffering, InfrastructureEntity, Int boolean isDynamic(); - boolean isDynamicallyScalable(); + boolean isDynamicScalingEnabled(); } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java index 1546c1c538b..346d49ca6c5 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java @@ -238,7 +238,7 @@ public class DeployVMCmd extends BaseAsyncCreateCustomIdCmd implements SecurityG @Parameter(name = ApiConstants.DYNAMIC_SCALING_ENABLED, type = CommandType.BOOLEAN, description = "true if virtual machine needs to be dynamically scalable") - protected Boolean isDynamicScalingEnabled; + protected Boolean dynamicScalingEnabled; ///////////////////////////////////////////////////// /////////////////// Accessors /////////////////////// @@ -628,8 +628,8 @@ public class DeployVMCmd extends BaseAsyncCreateCustomIdCmd implements SecurityG return bootIntoSetup; } - public Boolean getDynamicScalingEnabled() { - return isDynamicScalingEnabled == null ? Boolean.TRUE : isDynamicScalingEnabled; + public Boolean isDynamicScalingEnabled() { + return dynamicScalingEnabled == null ? Boolean.TRUE : dynamicScalingEnabled; } ///////////////////////////////////////////////////// diff --git a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java index 4c1ce803dca..cc938a9974c 100755 --- a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java @@ -3916,7 +3916,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac if (currentServiceOffering.isDynamic() && !newServiceOffering.isDynamic()) { removeCustomOfferingDetails(vmId); } - Boolean dynamicScalingEnabled = vmForUpdate.isDynamicallyScalable() && newServiceOffering.isDynamicallyScalable() && UserVmManager.EnableDynamicallyScaleVm.valueIn(vmForUpdate.getDataCenterId()); + Boolean dynamicScalingEnabled = vmForUpdate.isDynamicallyScalable() && newServiceOffering.isDynamicScalingEnabled() && UserVmManager.EnableDynamicallyScaleVm.valueIn(vmForUpdate.getDataCenterId()); vmForUpdate.setDynamicallyScalable(dynamicScalingEnabled); return _vmDao.update(vmId, vmForUpdate); } diff --git a/engine/schema/src/main/java/com/cloud/service/ServiceOfferingVO.java b/engine/schema/src/main/java/com/cloud/service/ServiceOfferingVO.java index c265bcd290d..9f4f765a9cd 100644 --- a/engine/schema/src/main/java/com/cloud/service/ServiceOfferingVO.java +++ b/engine/schema/src/main/java/com/cloud/service/ServiceOfferingVO.java @@ -75,8 +75,8 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering @Column(name = "deployment_planner") private String deploymentPlanner = null; - @Column(name = "dynamically_scalable") - private boolean dynamicallyScalable; + @Column(name = "dynamic_scaling_enabled") + private boolean dynamicScalingEnabled; // This is a delayed load value. If the value is null, // then this field has not been loaded yet. @@ -123,7 +123,7 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering this.vmType = vmType == null ? null : vmType.toString().toLowerCase(); this.hostTag = hostTag; this.deploymentPlanner = deploymentPlanner; - this.dynamicallyScalable = dynamicScalingEnabled; + this.dynamicScalingEnabled = dynamicScalingEnabled; } public ServiceOfferingVO(ServiceOfferingVO offering) { @@ -150,7 +150,7 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering volatileVm = offering.isVolatileVm(); hostTag = offering.getHostTag(); vmType = offering.getSystemVmType(); - dynamicallyScalable = offering.isDynamicallyScalable(); + dynamicScalingEnabled = offering.isDynamicScalingEnabled(); } @Override @@ -298,11 +298,11 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering } @Override - public boolean isDynamicallyScalable() { - return dynamicallyScalable; + public boolean isDynamicScalingEnabled() { + return dynamicScalingEnabled; } - public void setDynamicallyScalable(boolean dynamicallyScalable) { - this.dynamicallyScalable = dynamicallyScalable; + public void setDynamicScalingEnabled(boolean dynamicScalingEnabled) { + this.dynamicScalingEnabled = dynamicScalingEnabled; } } diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41510to41600.sql b/engine/schema/src/main/resources/META-INF/db/schema-41510to41600.sql index 4c158d62149..d31a0f8c33b 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-41510to41600.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-41510to41600.sql @@ -20,7 +20,7 @@ --; -- Adding dynamic scalable flag for service offering table -ALTER TABLE `cloud`.`service_offering` ADD COLUMN `dynamically_scalable` tinyint(1) unsigned NOT NULL DEFAULT 1 COMMENT 'true(1) if VM needs to be dynamically scalable of cpu or memory'; +ALTER TABLE `cloud`.`service_offering` ADD COLUMN `dynamic_scaling_enabled` tinyint(1) unsigned NOT NULL DEFAULT 1 COMMENT 'true(1) if VM needs to be dynamically scalable of cpu or memory'; DROP VIEW IF EXISTS `cloud`.`service_offering_view`; CREATE VIEW `cloud`.`service_offering_view` AS SELECT @@ -65,7 +65,7 @@ CREATE VIEW `cloud`.`service_offering_view` AS `service_offering`.`sort_key` AS `sort_key`, `service_offering`.`is_volatile` AS `is_volatile`, `service_offering`.`deployment_planner` AS `deployment_planner`, - `service_offering`.`dynamically_scalable` AS `dynamically_scalable`, + `service_offering`.`dynamic_scaling_enabled` AS `dynamic_scaling_enabled`, `vsphere_storage_policy`.`value` AS `vsphere_storage_policy`, GROUP_CONCAT(DISTINCT(domain.id)) AS domain_id, GROUP_CONCAT(DISTINCT(domain.uuid)) AS domain_uuid, diff --git a/framework/quota/src/main/java/org/apache/cloudstack/quota/vo/ServiceOfferingVO.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/vo/ServiceOfferingVO.java index 873aa38fea2..ab6b9311c69 100644 --- a/framework/quota/src/main/java/org/apache/cloudstack/quota/vo/ServiceOfferingVO.java +++ b/framework/quota/src/main/java/org/apache/cloudstack/quota/vo/ServiceOfferingVO.java @@ -75,8 +75,8 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering @Column(name = "deployment_planner") private String deploymentPlanner = null; - @Column(name = "dynamically_scalable") - private boolean dynamicallyScalable; + @Column(name = "dynamic_scaling_enabled") + private boolean dynamicScalingEnabled; @Transient Map details = new HashMap(); @@ -289,7 +289,7 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering } @Override - public boolean isDynamicallyScalable() { - return dynamicallyScalable; + public boolean isDynamicScalingEnabled() { + return dynamicScalingEnabled; } } diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterStartWorker.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterStartWorker.java index a67375eb4c2..6021427bd32 100644 --- a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterStartWorker.java +++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterStartWorker.java @@ -209,7 +209,7 @@ public class KubernetesClusterStartWorker extends KubernetesClusterResourceModif logAndThrow(Level.ERROR, "Failed to read Kubernetes master configuration file", e); } String base64UserData = Base64.encodeBase64String(k8sMasterConfig.getBytes(StringUtils.getPreferredCharset())); - Boolean dynamicScalingEnabled = serviceOffering.isDynamicallyScalable() && clusterTemplate.isDynamicallyScalable() && UserVmManager.EnableDynamicallyScaleVm.valueIn(zone.getId()); + Boolean dynamicScalingEnabled = serviceOffering.isDynamicScalingEnabled() && clusterTemplate.isDynamicallyScalable() && UserVmManager.EnableDynamicallyScaleVm.valueIn(zone.getId()); masterVm = userVmService.createAdvancedVirtualMachine(zone, serviceOffering, clusterTemplate, networkIds, owner, hostName, hostName, null, null, null, Hypervisor.HypervisorType.None, BaseCmd.HTTPMethod.POST, base64UserData, kubernetesCluster.getKeyPair(), @@ -264,7 +264,7 @@ public class KubernetesClusterStartWorker extends KubernetesClusterResourceModif logAndThrow(Level.ERROR, "Failed to read Kubernetes master configuration file", e); } String base64UserData = Base64.encodeBase64String(k8sMasterConfig.getBytes(StringUtils.getPreferredCharset())); - Boolean dynamicScalingEnabled = serviceOffering.isDynamicallyScalable() && clusterTemplate.isDynamicallyScalable() && UserVmManager.EnableDynamicallyScaleVm.valueIn(zone.getId()); + Boolean dynamicScalingEnabled = serviceOffering.isDynamicScalingEnabled() && clusterTemplate.isDynamicallyScalable() && UserVmManager.EnableDynamicallyScaleVm.valueIn(zone.getId()); additionalMasterVm = userVmService.createAdvancedVirtualMachine(zone, serviceOffering, clusterTemplate, networkIds, owner, hostName, hostName, null, null, null, Hypervisor.HypervisorType.None, BaseCmd.HTTPMethod.POST, base64UserData, kubernetesCluster.getKeyPair(), diff --git a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java index b200a476922..9e24e5c36c9 100644 --- a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java @@ -2976,7 +2976,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q sc.addAnd("cpu", Op.GTEQ, currentVmOffering.getCpu()); sc.addAnd("speed", Op.GTEQ, currentVmOffering.getSpeed()); sc.addAnd("ramSize", Op.GTEQ, currentVmOffering.getRamSize()); - sc.addAnd("dynamicallyScalable", Op.EQ, currentVmOffering.isDynamicallyScalable()); + sc.addAnd("dynamicScalingEnabled", Op.EQ, currentVmOffering.isDynamicScalingEnabled()); } } diff --git a/server/src/main/java/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java index fc1ddc7a7cb..55faa391df0 100644 --- a/server/src/main/java/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java +++ b/server/src/main/java/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java @@ -113,7 +113,7 @@ public class ServiceOfferingJoinDaoImpl extends GenericDaoBase