[cloudstack] branch 4.14 updated: vmware: volume utilisation is always zero (#4225)

[rohit]

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

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


The following commit(s) were added to refs/heads/4.14 by this push:
     new 2fce8b7  vmware: volume utilisation is always zero (#4225)
2fce8b7 is described below

commit 2fce8b733e19f37af990a6d21450c1a43a4c5bbd
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
AuthorDate: Wed Aug 5 14:01:16 2020 +0530

    vmware: volume utilisation is always zero (#4225)
    
    This fixes issues of virtual size to be twice in case the disk is a
    linked-clone root disk. The virtual size of root disk (first in chain)
    must be used.
    
    Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
---
 .../main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java  | 1 -
 server/src/main/java/com/cloud/api/query/ViewResponseHelper.java        | 2 +-
 .../src/main/java/com/cloud/hypervisor/vmware/mo/DatastoreMO.java       | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java
 
b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index fab6f0a..341e18c 100644
--- 
a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ 
b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -3766,7 +3766,6 @@ public class VmwareResource implements 
StoragePoolResource, ServerResource, Vmwa
                                     VolumeStatsEntry vse = 
statEntry.get(chainInfo);
                                     if (vse != null) {
                                         
vse.setPhysicalSize(vse.getPhysicalSize() + physicalsize);
-                                        
vse.setVirtualSize(vse.getVirtualSize() + virtualsize);
                                     }
                                 } else {
                                     VolumeStatsEntry vse = new 
VolumeStatsEntry(chainInfo, physicalsize, virtualsize);
diff --git a/server/src/main/java/com/cloud/api/query/ViewResponseHelper.java 
b/server/src/main/java/com/cloud/api/query/ViewResponseHelper.java
index ced81a6..4baf25c 100644
--- a/server/src/main/java/com/cloud/api/query/ViewResponseHelper.java
+++ b/server/src/main/java/com/cloud/api/query/ViewResponseHelper.java
@@ -268,7 +268,7 @@ public class ViewResponseHelper {
 
     public static List<VolumeResponse> createVolumeResponse(ResponseView view, 
VolumeJoinVO... volumes) {
         Hashtable<Long, VolumeResponse> vrDataList = new Hashtable<Long, 
VolumeResponse>();
-        DecimalFormat df = new DecimalFormat("0.00");
+        DecimalFormat df = new DecimalFormat("0.0%");
         for (VolumeJoinVO vr : volumes) {
             VolumeResponse vrData = vrDataList.get(vr.getId());
             if (vrData == null) {
diff --git 
a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatastoreMO.java 
b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatastoreMO.java
index fa0c380..fd9a374 100644
--- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatastoreMO.java
+++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatastoreMO.java
@@ -356,6 +356,7 @@ public class DatastoreMO extends BaseMO {
         FileQueryFlags fqf = new FileQueryFlags();
         fqf.setFileSize(true);
         fqf.setFileOwner(true);
+        fqf.setFileType(true);
         fqf.setModification(true);
         searchSpec.setDetails(fqf);
         searchSpec.setSearchCaseInsensitive(false);