From a2bb1b7b129b2b5c44812724b2af4a9bf59ef3a1 Mon Sep 17 00:00:00 2001 From: Gabriel Brascher Date: Tue, 8 Jun 2021 01:54:24 -0300 Subject: [PATCH 1/2] Root disk size should be listed in GB at listServiceOffering --- .../api/query/dao/ServiceOfferingJoinDaoImpl.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java index 87b03748dbcd..9950b90a2f26 100644 --- a/server/src/main/java/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java +++ b/server/src/main/java/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java @@ -45,6 +45,13 @@ public class ServiceOfferingJoinDaoImpl extends GenericDaoBase sofIdSearch; + /** + * Constant used to convert GB into Bytes (or the other way around). + * GB * MB * KB = Bytes // + * 1024 * 1024 * 1024 = 1073741824 + */ + private static final long GB_TO_BYTES = 1073741824; + protected ServiceOfferingJoinDaoImpl() { sofIdSearch = createSearchBuilder(); @@ -123,7 +130,8 @@ public ServiceOfferingResponse newServiceOfferingResponse(ServiceOfferingJoinVO } } - offeringResponse.setRootDiskSize(offering.getRootDiskSize()); + long rootDiskSizeInGb = (long) offering.getRootDiskSize() / GB_TO_BYTES; + offeringResponse.setRootDiskSize(rootDiskSizeInGb); return offeringResponse; } From d7b10386127f05d19c91aceb4dacbfddae7f0f63 Mon Sep 17 00:00:00 2001 From: Gabriel Brascher Date: Tue, 8 Jun 2021 14:25:08 -0300 Subject: [PATCH 2/2] Update UI to handle rootdisk size in GB instead of Bytes --- ui/src/components/view/DetailsTab.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/components/view/DetailsTab.vue b/ui/src/components/view/DetailsTab.vue index 563acac947e6..a9c584545ed2 100644 --- a/ui/src/components/view/DetailsTab.vue +++ b/ui/src/components/view/DetailsTab.vue @@ -35,7 +35,7 @@
- {{ parseFloat( resource.rootdisksize / (1024.0 * 1024.0 * 1024.0)).toFixed(1) }} GB + {{ resource.rootdisksize }} GB