From 85d440d9738cd133230243558a7859e8306a926d Mon Sep 17 00:00:00 2001
From: Harikrishna Patnala <harikrishna.patnala@gmail.com>
Date: Tue, 18 Aug 2020 02:25:45 +0530
Subject: [PATCH] Fix list volume response to list datastore cluster name and
 id instead of child datastore

---
 .../com/cloud/api/query/dao/VolumeJoinDaoImpl.java   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/server/src/main/java/com/cloud/api/query/dao/VolumeJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
index c7977356379..2ee0ca1b1f4 100644
--- a/server/src/main/java/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
+++ b/server/src/main/java/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
@@ -24,6 +24,8 @@ import javax.inject.Inject;
 import org.apache.cloudstack.api.ResponseObject.ResponseView;
 import org.apache.cloudstack.api.response.VolumeResponse;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 
@@ -51,6 +53,8 @@ public class VolumeJoinDaoImpl extends GenericDaoBaseWithTagInformation<VolumeJo
     public AccountManager _accountMgr;
     @Inject
     private VmDiskStatisticsDao vmDiskStatsDao;
+    @Inject
+    private PrimaryDataStoreDao primaryDataStoreDao;
 
     private final SearchBuilder<VolumeJoinVO> volSearch;
 
@@ -220,6 +224,14 @@ public class VolumeJoinDaoImpl extends GenericDaoBaseWithTagInformation<VolumeJo
             String poolName = (poolId == null) ? "none" : volume.getPoolName();
             volResponse.setStoragePoolName(poolName);
             volResponse.setStoragePoolId(volume.getPoolUuid());
+            if (poolId != null) {
+                StoragePoolVO poolVO = primaryDataStoreDao.findById(poolId);
+                if (poolVO != null && poolVO.getParent() != 0L) {
+                    StoragePoolVO datastoreClusterVO = primaryDataStoreDao.findById(poolVO.getParent());
+                    volResponse.setStoragePoolName(datastoreClusterVO.getName());
+                    volResponse.setStoragePoolId(datastoreClusterVO.getUuid());
+                }
+            }
         }
 
         volResponse.setAttached(volume.getAttached());