[cloudstack] branch main updated: Updated storage type of the volume, in the volume response, based on the underlying storage pool. (#5560)

[nvazquez]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 07efd7c  Updated storage type of the volume, in the volume response, 
based on the underlying storage pool. (#5560)
07efd7c is described below

commit 07efd7c19de6147a2ca78fade94116efa04d1cfc
Author: sureshanaparti <12028987+sureshanapa...@users.noreply.github.com>
AuthorDate: Sun Oct 10 05:52:20 2021 +0530

    Updated storage type of the volume, in the volume response, based on the 
underlying storage pool. (#5560)
---
 .../main/java/com/cloud/api/query/dao/VolumeJoinDaoImpl.java  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

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 c60e27c..517ac63 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
@@ -213,10 +213,13 @@ public class VolumeJoinDaoImpl extends 
GenericDaoBaseWithTagInformation<VolumeJo
             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());
+                if (poolVO != null) {
+                    volResponse.setStorageType(poolVO.isLocal() ? 
ServiceOffering.StorageType.local.toString() : 
ServiceOffering.StorageType.shared.toString());
+                    if (poolVO.getParent() != 0L) {
+                        StoragePoolVO datastoreClusterVO = 
primaryDataStoreDao.findById(poolVO.getParent());
+                        
volResponse.setStoragePoolName(datastoreClusterVO.getName());
+                        
volResponse.setStoragePoolId(datastoreClusterVO.getUuid());
+                    }
                 }
             }
         }