Skip to content

Commit efb6850

Browse files
harikrishna-patnalaharikrishna-patnala
committed
Changed name from dynamically scalable to dynamic scaling enabled for service offering VO and its usages
1 parent 0dc0748 commit efb6850

File tree

11 files changed

+35
-35
lines changed

11 files changed

+35
-35
lines changed

‎api/src/main/java/com/cloud/offering/ServiceOffering.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,5 +117,5 @@ public enum StorageType {
117117

118118
boolean isDynamic();
119119

120-
boolean isDynamicallyScalable();
120+
boolean isDynamicScalingEnabled();
121121
}

‎api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ public class DeployVMCmd extends BaseAsyncCreateCustomIdCmd implements SecurityG
238238
@Parameter(name = ApiConstants.DYNAMIC_SCALING_ENABLED,
239239
type = CommandType.BOOLEAN,
240240
description = "true if virtual machine needs to be dynamically scalable")
241-
protected Boolean isDynamicScalingEnabled;
241+
protected Boolean dynamicScalingEnabled;
242242

243243
/////////////////////////////////////////////////////
244244
/////////////////// Accessors ///////////////////////
@@ -628,8 +628,8 @@ public Boolean getBootIntoSetup() {
628628
return bootIntoSetup;
629629
}
630630

631-
public Boolean getDynamicScalingEnabled() {
632-
return isDynamicScalingEnabled == null ? Boolean.TRUE : isDynamicScalingEnabled;
631+
public Boolean isDynamicScalingEnabled() {
632+
return dynamicScalingEnabled == null ? Boolean.TRUE : dynamicScalingEnabled;
633633
}
634634

635635
/////////////////////////////////////////////////////

‎engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3685,7 +3685,7 @@ public boolean upgradeVmDb(final long vmId, final ServiceOffering newServiceOffe
36853685
if (currentServiceOffering.isDynamic() && !newServiceOffering.isDynamic()) {
36863686
removeCustomOfferingDetails(vmId);
36873687
}
3688-
Boolean dynamicScalingEnabled = vmForUpdate.isDynamicallyScalable() && newServiceOffering.isDynamicallyScalable() && UserVmManager.EnableDynamicallyScaleVm.valueIn(vmForUpdate.getDataCenterId());
3688+
Boolean dynamicScalingEnabled = vmForUpdate.isDynamicallyScalable() && newServiceOffering.isDynamicScalingEnabled() && UserVmManager.EnableDynamicallyScaleVm.valueIn(vmForUpdate.getDataCenterId());
36893689
vmForUpdate.setDynamicallyScalable(dynamicScalingEnabled);
36903690
return _vmDao.update(vmId, vmForUpdate);
36913691
}

‎engine/schema/src/main/java/com/cloud/service/ServiceOfferingVO.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering
7575
@Column(name = "deployment_planner")
7676
private String deploymentPlanner = null;
7777

78-
@Column(name = "dynamically_scalable")
79-
private boolean dynamicallyScalable;
78+
@Column(name = "dynamic_scaling_enabled")
79+
private boolean dynamicScalingEnabled;
8080

8181
// This is a delayed load value. If the value is null,
8282
// then this field has not been loaded yet.
@@ -123,7 +123,7 @@ public ServiceOfferingVO(String name, Integer cpu, Integer ramSize, Integer spee
123123
this.vmType = vmType == null ? null : vmType.toString().toLowerCase();
124124
this.hostTag = hostTag;
125125
this.deploymentPlanner = deploymentPlanner;
126-
this.dynamicallyScalable = dynamicScalingEnabled;
126+
this.dynamicScalingEnabled = dynamicScalingEnabled;
127127
}
128128

129129
public ServiceOfferingVO(ServiceOfferingVO offering) {
@@ -150,7 +150,7 @@ public ServiceOfferingVO(ServiceOfferingVO offering) {
150150
volatileVm = offering.isVolatileVm();
151151
hostTag = offering.getHostTag();
152152
vmType = offering.getSystemVmType();
153-
dynamicallyScalable = offering.isDynamicallyScalable();
153+
dynamicScalingEnabled = offering.isDynamicScalingEnabled();
154154
}
155155

156156
@Override
@@ -298,11 +298,11 @@ public boolean isCustomCpuSpeedSupported() {
298298
}
299299

300300
@Override
301-
public boolean isDynamicallyScalable() {
302-
return dynamicallyScalable;
301+
public boolean isDynamicScalingEnabled() {
302+
return dynamicScalingEnabled;
303303
}
304304

305-
public void setDynamicallyScalable(boolean dynamicallyScalable) {
306-
this.dynamicallyScalable = dynamicallyScalable;
305+
public void setDynamicScalingEnabled(boolean dynamicScalingEnabled) {
306+
this.dynamicScalingEnabled = dynamicScalingEnabled;
307307
}
308308
}

‎engine/schema/src/main/resources/META-INF/db/schema-41510to41600.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
--;
2121

2222
-- Adding dynamic scalable flag for service offering table
23-
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';
23+
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';
2424
DROP VIEW IF EXISTS `cloud`.`service_offering_view`;
2525
CREATE VIEW `cloud`.`service_offering_view` AS
2626
SELECT
@@ -65,7 +65,7 @@ CREATE VIEW `cloud`.`service_offering_view` AS
6565
`service_offering`.`sort_key` AS `sort_key`,
6666
`service_offering`.`is_volatile` AS `is_volatile`,
6767
`service_offering`.`deployment_planner` AS `deployment_planner`,
68-
`service_offering`.`dynamically_scalable` AS `dynamically_scalable`,
68+
`service_offering`.`dynamic_scaling_enabled` AS `dynamic_scaling_enabled`,
6969
`vsphere_storage_policy`.`value` AS `vsphere_storage_policy`,
7070
GROUP_CONCAT(DISTINCT(domain.id)) AS domain_id,
7171
GROUP_CONCAT(DISTINCT(domain.uuid)) AS domain_uuid,

‎framework/quota/src/main/java/org/apache/cloudstack/quota/vo/ServiceOfferingVO.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering
7575
@Column(name = "deployment_planner")
7676
private String deploymentPlanner = null;
7777

78-
@Column(name = "dynamically_scalable")
79-
private boolean dynamicallyScalable;
78+
@Column(name = "dynamic_scaling_enabled")
79+
private boolean dynamicScalingEnabled;
8080

8181
@Transient
8282
Map<String, String> details = new HashMap<String, String>();
@@ -289,7 +289,7 @@ public void setDynamicFlag(boolean isdynamic) {
289289
}
290290

291291
@Override
292-
public boolean isDynamicallyScalable() {
293-
return dynamicallyScalable;
292+
public boolean isDynamicScalingEnabled() {
293+
return dynamicScalingEnabled;
294294
}
295295
}

‎plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterStartWorker.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ private UserVm createKubernetesMaster(final Network network, String serverIp) th
209209
logAndThrow(Level.ERROR, "Failed to read Kubernetes master configuration file", e);
210210
}
211211
String base64UserData = Base64.encodeBase64String(k8sMasterConfig.getBytes(StringUtils.getPreferredCharset()));
212-
Boolean dynamicScalingEnabled = serviceOffering.isDynamicallyScalable() && clusterTemplate.isDynamicallyScalable() && UserVmManager.EnableDynamicallyScaleVm.valueIn(zone.getId());
212+
Boolean dynamicScalingEnabled = serviceOffering.isDynamicScalingEnabled() && clusterTemplate.isDynamicallyScalable() && UserVmManager.EnableDynamicallyScaleVm.valueIn(zone.getId());
213213
masterVm = userVmService.createAdvancedVirtualMachine(zone, serviceOffering, clusterTemplate, networkIds, owner,
214214
hostName, hostName, null, null, null,
215215
Hypervisor.HypervisorType.None, BaseCmd.HTTPMethod.POST, base64UserData, kubernetesCluster.getKeyPair(),
@@ -264,7 +264,7 @@ private UserVm createKubernetesAdditionalMaster(final String joinIp, final int a
264264
logAndThrow(Level.ERROR, "Failed to read Kubernetes master configuration file", e);
265265
}
266266
String base64UserData = Base64.encodeBase64String(k8sMasterConfig.getBytes(StringUtils.getPreferredCharset()));
267-
Boolean dynamicScalingEnabled = serviceOffering.isDynamicallyScalable() && clusterTemplate.isDynamicallyScalable() && UserVmManager.EnableDynamicallyScaleVm.valueIn(zone.getId());
267+
Boolean dynamicScalingEnabled = serviceOffering.isDynamicScalingEnabled() && clusterTemplate.isDynamicallyScalable() && UserVmManager.EnableDynamicallyScaleVm.valueIn(zone.getId());
268268
additionalMasterVm = userVmService.createAdvancedVirtualMachine(zone, serviceOffering, clusterTemplate, networkIds, owner,
269269
hostName, hostName, null, null, null,
270270
Hypervisor.HypervisorType.None, BaseCmd.HTTPMethod.POST, base64UserData, kubernetesCluster.getKeyPair(),

‎server/src/main/java/com/cloud/api/query/QueryManagerImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2967,7 +2967,7 @@ private Pair<List<ServiceOfferingJoinVO>, Integer> searchForServiceOfferingsInte
29672967
sc.addAnd("cpu", Op.GTEQ, currentVmOffering.getCpu());
29682968
sc.addAnd("speed", Op.GTEQ, currentVmOffering.getSpeed());
29692969
sc.addAnd("ramSize", Op.GTEQ, currentVmOffering.getRamSize());
2970-
sc.addAnd("dynamicallyScalable", Op.EQ, currentVmOffering.isDynamicallyScalable());
2970+
sc.addAnd("dynamicScalingEnabled", Op.EQ, currentVmOffering.isDynamicScalingEnabled());
29712971
}
29722972
}
29732973

‎server/src/main/java/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public ServiceOfferingResponse newServiceOfferingResponse(ServiceOfferingJoinVO
113113
offeringResponse.setObjectName("serviceoffering");
114114
offeringResponse.setIscutomized(offering.isDynamic());
115115
offeringResponse.setCacheMode(offering.getCacheMode());
116-
offeringResponse.setDynamicScalingEnabled(offering.isDynamicallyScalable());
116+
offeringResponse.setDynamicScalingEnabled(offering.isDynamicScalingEnabled());
117117

118118
if (offeringDetails != null && !offeringDetails.isEmpty()) {
119119
String vsphereStoragePolicyId = offeringDetails.get(ApiConstants.STORAGE_POLICY);

‎server/src/main/java/com/cloud/api/query/vo/ServiceOfferingJoinVO.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,8 @@ public class ServiceOfferingJoinVO extends BaseViewVO implements InternalIdentit
193193
@Column(name = "root_disk_size")
194194
private Long rootDiskSize;
195195

196-
@Column(name = "dynamically_scalable")
197-
private boolean dynamicallyScalable;
196+
@Column(name = "dynamic_scaling_enabled")
197+
private boolean dynamicScalingEnabled;
198198

199199
public ServiceOfferingJoinVO() {
200200
}
@@ -401,11 +401,11 @@ public Long getRootDiskSize() {
401401
return rootDiskSize ;
402402
}
403403

404-
public boolean isDynamicallyScalable() {
405-
return dynamicallyScalable;
404+
public boolean isDynamicScalingEnabled() {
405+
return dynamicScalingEnabled;
406406
}
407407

408-
public void setDynamicallyScalable(boolean dynamicallyScalable) {
409-
this.dynamicallyScalable = dynamicallyScalable;
408+
public void setDynamicScalingEnabled(boolean dynamicScalingEnabled) {
409+
this.dynamicScalingEnabled = dynamicScalingEnabled;
410410
}
411411
}

0 commit comments

Comments
 (0)