From 10fc4a446c4e81a783717a7385f841a1c4152fda Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Fri, 24 May 2024 17:34:01 +0530 Subject: [PATCH 1/3] server: remove username required condition for listVmsForImport Fixes #8414 Signed-off-by: Abhishek Kumar --- .../org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) 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 7dc000c73752..10b2809b165e 100644 --- a/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java +++ b/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java @@ -2446,11 +2446,7 @@ public ListResponse listVmsForImport(ListVmsForImport throw new InvalidParameterValueException("Please specify a valid zone."); } final String hypervisorType = cmd.getHypervisor(); - if (Hypervisor.HypervisorType.KVM.toString().equalsIgnoreCase(hypervisorType)) { - if (StringUtils.isBlank(cmd.getUsername())) { - throw new InvalidParameterValueException("Username need to be provided."); - } - } else { + if (!Hypervisor.HypervisorType.KVM.toString().equalsIgnoreCase(hypervisorType)) { throw new InvalidParameterValueException(String.format("VM Import is currently not supported for hypervisor: %s", hypervisorType)); } From c3250342e8c0a909b316a1866c6153d79f7e9212 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Fri, 24 May 2024 17:44:20 +0530 Subject: [PATCH 2/3] fix Signed-off-by: Abhishek Kumar --- .../org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java | 4 ---- 1 file changed, 4 deletions(-) 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 10b2809b165e..1237b92cdf70 100644 --- a/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java +++ b/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java @@ -2042,10 +2042,6 @@ private UserVmResponse importKvmInstance(ImportVmCmd cmd) { UnmanagedInstanceTO unmanagedInstanceTO = null; if (ImportSource.EXTERNAL == importSource) { - if (StringUtils.isBlank(cmd.getUsername())) { - throw new InvalidParameterValueException("Username need to be provided."); - } - HashMap instancesMap = getRemoteVms(zoneId, remoteUrl, cmd.getUsername(), cmd.getPassword()); unmanagedInstanceTO = instancesMap.get(cmd.getName()); if (unmanagedInstanceTO == null) { From e2fb4532c628aee9faa4cf12f6f45c1c6b1be321 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Fri, 14 Jun 2024 11:20:05 +0530 Subject: [PATCH 3/3] revert Signed-off-by: Abhishek Kumar --- .../org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java | 4 ++++ 1 file changed, 4 insertions(+) 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 a5627071521e..ed4f377a8968 100644 --- a/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java +++ b/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java @@ -2042,6 +2042,10 @@ private UserVmResponse importKvmInstance(ImportVmCmd cmd) { UnmanagedInstanceTO unmanagedInstanceTO = null; if (ImportSource.EXTERNAL == importSource) { + if (StringUtils.isBlank(cmd.getUsername())) { + throw new InvalidParameterValueException("Username need to be provided."); + } + HashMap instancesMap = getRemoteVmsOnKVMHost(zoneId, remoteUrl, cmd.getUsername(), cmd.getPassword()); unmanagedInstanceTO = instancesMap.get(cmd.getName()); if (unmanagedInstanceTO == null) {