This is an automated email from the ASF dual-hosted git repository.
sureshanaparti pushed a commit to branch 4.22
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.22 by this push:
new 64ac0822b43 merge conflict fixes (#13046)
64ac0822b43 is described below
commit 64ac0822b439d71796108f0f41485b61e3b8b395
Author: dahn <[email protected]>
AuthorDate: Thu Apr 23 19:16:54 2026 +0100
merge conflict fixes (#13046)
* merge conflict fixes
* fix pre-commit issue
Co-authored-by: Daan Hoogland <[email protected]>
Co-authored-by: Suresh Kumar Anaparti <[email protected]>
---
agent/conf/agent.properties | 1 -
.../resource/wrapper/LibvirtConvertInstanceCommandWrapper.java | 2 +-
.../java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java | 10 ++--------
.../org/apache/cloudstack/vm/UnmanagedVMsManagerImplTest.java | 1 -
4 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/agent/conf/agent.properties b/agent/conf/agent.properties
index 013c2e5bf2a..ba4a3874664 100644
--- a/agent/conf/agent.properties
+++ b/agent/conf/agent.properties
@@ -472,4 +472,3 @@ iscsi.session.cleanup.enabled=false
# Optional vCenter SHA1 thumbprint for VMware to KVM conversion via VDDK,
passed as
# -io vddk-thumbprint=<value>. If unset, CloudStack computes it on the KVM
host via openssl.
#vddk.thumbprint=
-
diff --git
a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapper.java
b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapper.java
index eaa8b790439..f28b5eda4a6 100644
---
a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapper.java
+++
b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapper.java
@@ -107,7 +107,7 @@ public class LibvirtConvertInstanceCommandWrapper extends
CommandWrapper<Convert
String vddkLibDir = resolveVddkSetting(cmd.getVddkLibDir(),
serverResource.getVddkLibDir());
if (StringUtils.isBlank(vddkLibDir)) {
String err = String.format("VDDK lib dir is not configured
on the host. " +
- "Set '%s' in agent.properties or in details
parameter of the import api calll to use VDDK-based conversion.",
"vddk.lib.dir");
+ "Set '%s' in agent.properties or in details
parameter of the import api call to use VDDK-based conversion.",
"vddk.lib.dir");
logger.error("({}) {}", originalVMName, err);
return new Answer(cmd, false, err);
}
diff --git
a/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java
b/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java
index 56998325ba7..846eab599fd 100644
--- a/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java
@@ -1325,10 +1325,7 @@ public class UnmanagedVMsManagerImpl implements
UnmanagedVMsManager {
List<String> managedVms = new ArrayList<>(additionalNameFilters);
managedVms.addAll(getHostsManagedVms(hosts));
- List<String> resourceLimitHostTags =
resourceLimitService.getResourceLimitHostTags(serviceOffering, template);
- try (CheckedReservation vmReservation = new CheckedReservation(owner,
Resource.ResourceType.user_vm, resourceLimitHostTags, 1L, reservationDao,
resourceLimitService);
- CheckedReservation cpuReservation = new CheckedReservation(owner,
Resource.ResourceType.cpu, resourceLimitHostTags,
Long.valueOf(serviceOffering.getCpu()), reservationDao, resourceLimitService);
- CheckedReservation memReservation = new CheckedReservation(owner,
Resource.ResourceType.memory, resourceLimitHostTags,
Long.valueOf(serviceOffering.getRamSize()), reservationDao,
resourceLimitService)) {
+ try {
ActionEventUtils.onStartedActionEvent(userId, owner.getId(),
EventTypes.EVENT_VM_IMPORT,
cmd.getEventDescription(), null, null, true, 0);
@@ -2673,10 +2670,7 @@ public class UnmanagedVMsManagerImpl implements
UnmanagedVMsManager {
UserVm userVm = null;
- List<String> resourceLimitHostTags =
resourceLimitService.getResourceLimitHostTags(serviceOffering, template);
- try (CheckedReservation vmReservation = new CheckedReservation(owner,
Resource.ResourceType.user_vm, resourceLimitHostTags, 1L, reservationDao,
resourceLimitService);
- CheckedReservation cpuReservation = new CheckedReservation(owner,
Resource.ResourceType.cpu, resourceLimitHostTags,
Long.valueOf(serviceOffering.getCpu()), reservationDao, resourceLimitService);
- CheckedReservation memReservation = new CheckedReservation(owner,
Resource.ResourceType.memory, resourceLimitHostTags,
Long.valueOf(serviceOffering.getRamSize()), reservationDao,
resourceLimitService)) {
+ try {
if (ImportSource.EXTERNAL == importSource) {
String username = cmd.getUsername();
diff --git
a/server/src/test/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImplTest.java
b/server/src/test/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImplTest.java
index 9655b797ae9..874bce0f95e 100644
---
a/server/src/test/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImplTest.java
+++
b/server/src/test/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImplTest.java
@@ -260,7 +260,6 @@ public class UnmanagedVMsManagerImplTest {
ImportVMTaskVO importVMTaskVO;
@Mock
private VMInstanceDetailsDao vmInstanceDetailsDao;
-
@Mock
private ConfigKey<Boolean> configKeyMockParamsAllowed;
@Mock
