From 0233ceba3e4cd0749b4d038fda40425eb6f3e266 Mon Sep 17 00:00:00 2001 From: Suresh Kumar Anaparti Date: Fri, 8 Oct 2021 18:09:02 +0530 Subject: [PATCH] Updated storage type of the volume, in the volume response, based on the underlying storage pool. --- .../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 c60e27c5352e..517ac63bf07b 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 VolumeResponse newVolumeResponse(ResponseView view, VolumeJoinVO volume) 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()); + } } } }