From 14d15aa9c2f8059749010ee85805f64342fcace2 Mon Sep 17 00:00:00 2001 From: Harikrishna Patnala Date: Mon, 8 Feb 2021 21:28:50 +0530 Subject: [PATCH] Formatting Changes --- engine/schema/src/main/java/com/cloud/vm/VMInstanceVO.java | 3 +-- .../main/java/com/cloud/hypervisor/HypervisorGuruBase.java | 4 +--- server/src/main/java/com/cloud/vm/UserVmManagerImpl.java | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/engine/schema/src/main/java/com/cloud/vm/VMInstanceVO.java b/engine/schema/src/main/java/com/cloud/vm/VMInstanceVO.java index f60daec970a..aa2e7360bf4 100644 --- a/engine/schema/src/main/java/com/cloud/vm/VMInstanceVO.java +++ b/engine/schema/src/main/java/com/cloud/vm/VMInstanceVO.java @@ -57,8 +57,7 @@ import com.google.gson.Gson; @Table(name = "vm_instance") @Inheritance(strategy = InheritanceType.JOINED) @DiscriminatorColumn(name = "type", discriminatorType = DiscriminatorType.STRING, length = 32) -public class -VMInstanceVO implements VirtualMachine, FiniteStateObject { +public class VMInstanceVO implements VirtualMachine, FiniteStateObject { private static final Logger s_logger = Logger.getLogger(VMInstanceVO.class); @Id @TableGenerator(name = "vm_instance_sq", table = "sequence", pkColumnName = "name", valueColumnName = "value", pkColumnValue = "vm_instance_seq", allocationSize = 1) diff --git a/server/src/main/java/com/cloud/hypervisor/HypervisorGuruBase.java b/server/src/main/java/com/cloud/hypervisor/HypervisorGuruBase.java index 8e982f0cc19..2a8b13e96ca 100644 --- a/server/src/main/java/com/cloud/hypervisor/HypervisorGuruBase.java +++ b/server/src/main/java/com/cloud/hypervisor/HypervisorGuruBase.java @@ -256,9 +256,7 @@ public abstract class HypervisorGuruBase extends AdapterBase implements Hypervis // Workaround to make sure the TO has the UUID we need for Niciri integration VMInstanceVO vmInstance = _virtualMachineDao.findById(to.getId()); - // check if XStools/VMWare tools are present in the VM and dynamic scaling feature is enabled (per zone/global) - Boolean isDynamicallyScalable = vmInstance.isDynamicallyScalable(); - to.setEnableDynamicallyScaleVm(isDynamicallyScalable); + to.setEnableDynamicallyScaleVm(vmInstance.isDynamicallyScalable()); to.setUuid(vmInstance.getUuid()); to.setVmData(vmProfile.getVmData()); diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java index d85cd71b89b..1ca37258d39 100644 --- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java @@ -3969,7 +3969,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir @Override public boolean checkIfDynamicScalingCanBeEnabled(VirtualMachine vm, ServiceOffering offering, VirtualMachineTemplate template, Long zoneId) { - boolean canEnableDynamicScaling = (vm != null? vm.isDynamicallyScalable():true) && offering.isDynamicScalingEnabled() && template.isDynamicallyScalable() && UserVmManager.EnableDynamicallyScaleVm.valueIn(zoneId); + boolean canEnableDynamicScaling = (vm != null ? vm.isDynamicallyScalable() : true) && offering.isDynamicScalingEnabled() && template.isDynamicallyScalable() && UserVmManager.EnableDynamicallyScaleVm.valueIn(zoneId); if (!canEnableDynamicScaling) { 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"); }