etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changed name from dynamically scalable to dynamic scaling enabled for service offering VO and its usages

This commit is contained in:
Harikrishna Patnala 2021-02-03 16:18:24 +05:30
parent e3b2f505be
commit d63ca70764
11 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/com/cloud/offering/ServiceOffering.java
View File

@ -117,5 +117,5 @@ public interface ServiceOffering extends DiskOffering, InfrastructureEntity, Int
boolean isDynamic();
boolean isDynamicallyScalable();
boolean isDynamicScalingEnabled();
}

6
api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
View File

@ -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;
}
/////////////////////////////////////////////////////

2
engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
View File

@ -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);
}

16
engine/schema/src/main/java/com/cloud/service/ServiceOfferingVO.java
View File

@ -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;
}
}

4
engine/schema/src/main/resources/META-INF/db/schema-41510to41600.sql
View File

@ -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,

8
framework/quota/src/main/java/org/apache/cloudstack/quota/vo/ServiceOfferingVO.java
View File

@ -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<String, String> details = new HashMap<String, String>();
@ -289,7 +289,7 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering
}
@Override
public boolean isDynamicallyScalable() {
return dynamicallyScalable;
public boolean isDynamicScalingEnabled() {
return dynamicScalingEnabled;
}
}

4
plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterStartWorker.java
View File

@ -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(),

2
server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
View File

@ -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());
}
}

2
server/src/main/java/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java
View File

@ -113,7 +113,7 @@ public class ServiceOfferingJoinDaoImpl extends GenericDaoBase<ServiceOfferingJo
offeringResponse.setObjectName("serviceoffering");
offeringResponse.setIscutomized(offering.isDynamic());
offeringResponse.setCacheMode(offering.getCacheMode());
offeringResponse.setDynamicScalingEnabled(offering.isDynamicallyScalable());
offeringResponse.setDynamicScalingEnabled(offering.isDynamicScalingEnabled());
if (offeringDetails != null && !offeringDetails.isEmpty()) {
String vsphereStoragePolicyId = offeringDetails.get(ApiConstants.STORAGE_POLICY);

12
server/src/main/java/com/cloud/api/query/vo/ServiceOfferingJoinVO.java
View File

@ -193,8 +193,8 @@ public class ServiceOfferingJoinVO extends BaseViewVO implements InternalIdentit
@Column(name = "root_disk_size")
private Long rootDiskSize;
@Column(name = "dynamically_scalable")
private boolean dynamicallyScalable;
@Column(name = "dynamic_scaling_enabled")
private boolean dynamicScalingEnabled;
public ServiceOfferingJoinVO() {
}
@ -401,11 +401,11 @@ public class ServiceOfferingJoinVO extends BaseViewVO implements InternalIdentit
return rootDiskSize ;
}
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;
}
}

10
server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
View File

@ -1881,7 +1881,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
_itMgr.checkIfCanUpgrade(vmInstance, newServiceOffering);
ServiceOfferingVO currentServiceOffering = _offeringDao.findByIdIncludingRemoved(vmInstance.getId(), vmInstance.getServiceOfferingId());
if (newServiceOffering.isDynamicallyScalable() != currentServiceOffering.isDynamicallyScalable()) {
if (newServiceOffering.isDynamicScalingEnabled() != currentServiceOffering.isDynamicScalingEnabled()) {
throw new InvalidParameterValueException("Unable to Scale VM: since dynamic scaling enabled flag is not same for new service offering and old service offering");
}
@ -2784,7 +2784,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
if (!template.isDynamicallyScalable()) {
throw new InvalidParameterValueException("Dynamic Scaling cannot be enabled on the VM since template is not dynamic scaling enabled");
}
if (!offering.isDynamicallyScalable()) {
if (!offering.isDynamicScalingEnabled()) {
throw new InvalidParameterValueException("Dynamic Scaling cannot be enabled on the VM since service offering is not dynamic scaling enabled");
}
if (!UserVmManager.EnableDynamicallyScaleVm.valueIn(vm.getDataCenterId())) {
@ -3969,11 +3969,11 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
private Boolean checkIfDynamicScalingCanBeEnabled(Boolean dynamicScalingEnabled, ServiceOfferingVO offering, VMTemplateVO template, Long zoneId) {
if (dynamicScalingEnabled) {
if (!(offering.isDynamicallyScalable() && template.isDynamicallyScalable() && UserVmManager.EnableDynamicallyScaleVm.valueIn(zoneId))) {
if (!(offering.isDynamicScalingEnabled() && template.isDynamicallyScalable() && UserVmManager.EnableDynamicallyScaleVm.valueIn(zoneId))) {
s_logger.info("VM cannot be configured to be dynamically scalable if any of the service offering's dynamic scaling property, template's dynamic scaling property or global setting is false");
}
}
return dynamicScalingEnabled && offering.isDynamicallyScalable() && template.isDynamicallyScalable() && UserVmManager.EnableDynamicallyScaleVm.valueIn(zoneId);
return dynamicScalingEnabled && offering.isDynamicScalingEnabled() && template.isDynamicallyScalable() && UserVmManager.EnableDynamicallyScaleVm.valueIn(zoneId);
}
/**
@ -7506,7 +7506,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
final String uuidName = _uuidMgr.generateUuid(UserVm.class, null);
final Host lastHost = powerState != VirtualMachine.PowerState.PowerOn ? host : null;
final Boolean dynamicScalingEnabled = serviceOffering.isDynamicallyScalable() && template.isDynamicallyScalable() && UserVmManager.EnableDynamicallyScaleVm.valueIn(zone.getId());
final Boolean dynamicScalingEnabled = serviceOffering.isDynamicScalingEnabled() && template.isDynamicallyScalable() && UserVmManager.EnableDynamicallyScaleVm.valueIn(zone.getId());
return commitUserVm(true, zone, host, lastHost, template, hostName, displayName, owner,
null, null, userData, caller, isDisplayVm, keyboard,
accountId, userId, serviceOffering, template.getFormat().equals(ImageFormat.ISO), sshPublicKey, null,