(cloudstack) branch 4.19 updated: VM Import: Use datastore name when datastore path is not set to search for pools on DB (#8759)

[nv...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

nvazquez pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.19 by this push:
     new f25d35c5d6b VM Import: Use datastore name when datastore path is not set to search for pools on DB (#8759)
f25d35c5d6b is described below

commit f25d35c5d6b737a23e216ade754566ef7fffb9ac
Author: Nicolas Vazquez <ni...@gmail.com>
AuthorDate: Thu Mar 14 22:07:23 2024 -0300

    VM Import: Use datastore name when datastore path is not set to search for pools on DB (#8759)
---
 .../main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 22aa36e6931..1ed5a8f1648 100644
--- a/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java
@@ -551,7 +551,8 @@ public class UnmanagedVMsManagerImpl implements UnmanagedVMsManager {
             List<StoragePoolVO> pools = primaryDataStoreDao.listPoolsByCluster(cluster.getId());
             pools.addAll(primaryDataStoreDao.listByDataCenterId(zone.getId()));
             for (StoragePool pool : pools) {
-                if (StringUtils.contains(pool.getPath(), dsPath)) {
+                String searchPoolParam = StringUtils.isNotBlank(dsPath) ? dsPath : dsName;
+                if (StringUtils.contains(pool.getPath(), searchPoolParam)) {
                     storagePool = pool;
                     break;
                 }