From d5379b87045452ea2b3d53766d12ca4fbe6f776b Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Wed, 21 Aug 2013 15:33:17 -0700 Subject: [PATCH] CLOUDSTACK-4392: API volumeresponse - return primary storage information to ROOT and resource domain admin only. --- .../api/query/dao/VolumeJoinDaoImpl.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java index 6a5f0a8aa0f..df6e583058c 100644 --- a/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java @@ -167,16 +167,17 @@ public class VolumeJoinDaoImpl extends GenericDaoBase implem volResponse.setBytesWriteRate(volume.getBytesReadRate()); volResponse.setIopsReadRate(volume.getIopsWriteRate()); volResponse.setIopsWriteRate(volume.getIopsWriteRate()); - + } - Long poolId = volume.getPoolId(); - String poolName = (poolId == null) ? "none" : volume.getPoolName(); - volResponse.setStoragePoolName(poolName); - - // return hypervisor for ROOT and Resource domain only - if ((caller.getType() == Account.ACCOUNT_TYPE_ADMIN || caller.getType() == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN) - && volume.getState() != Volume.State.UploadOp && volume.getHypervisorType() != null) { - volResponse.setHypervisor(volume.getHypervisorType().toString()); + + // return hypervisor and storage pool info for ROOT and Resource domain only + if (caller.getType() == Account.ACCOUNT_TYPE_ADMIN || caller.getType() == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN) { + if (volume.getState() != Volume.State.UploadOp && volume.getHypervisorType() != null) { + volResponse.setHypervisor(volume.getHypervisorType().toString()); + } + Long poolId = volume.getPoolId(); + String poolName = (poolId == null) ? "none" : volume.getPoolName(); + volResponse.setStoragePoolName(poolName); } volResponse.setAttached(volume.getAttached());