fix: align all memory / storage / quota units to Gi/Mi

Signed-off-by: Andy Lee <andy.lee@suse.com>
(cherry picked from commit 8f76d5ad30b34778d38eddc5fdb7532699cde11c)

pkg/harvester/detail/harvesterhci.io.host/HarvesterHostBasic.vue

@@ -121,7 +121,7 @@ export default {
     memoryUnits() {
       const exponent = exponentNeeded(this.memoryTotal, 1024);
 
-      return `${ UNITS[exponent] }iB`;
+      return `${ UNITS[exponent] }i`;
     },
 
     nodeType() {

pkg/harvester/detail/harvesterhci.io.host/index.vue

@@ -178,7 +178,7 @@ export default {
         minExponent:  3,
         maxExponent:  3,
         maxPrecision: 2,
-        suffix:       'iB',
+        suffix:       'i',
       };
 
       const longhornDisks = Object.keys(diskStatus).map((key) => {

pkg/harvester/dialog/HarvesterQuotaDialog.vue

@@ -92,7 +92,7 @@ export default {
         :input-exponent="3"
         :increment="1024"
         :output-modifier="true"
-        suffix="GiB"
+        suffix="Gi"
         class="mb-20"
       />
     </template>

pkg/harvester/edit/harvesterhci.io.host/index.vue

@@ -185,7 +185,7 @@ export default {
         minExponent:  3,
         maxExponent:  3,
         maxPrecision: 2,
-        suffix:       'iB',
+        suffix:       'i',
       };
 
       const longhornDisks = Object.keys(diskStatus).map((key) => {
@@ -457,7 +457,7 @@ export default {
           const devPath = d.spec?.devPath;
           const deviceType = d.status?.deviceStatus?.details?.deviceType;
           const sizeBytes = d.status?.deviceStatus?.capacity?.sizeBytes;
-          const size = formatSi(sizeBytes, { increment: 1024 });
+          const size = formatSi(sizeBytes, { increment: 1024, suffix: 'i' });
           const parentDevice = d.status?.deviceStatus?.parentDevice;
           const isChildAdded = this.newDisks.find((newDisk) => newDisk.blockDevice?.status?.deviceStatus?.parentDevice === devPath);
           const name = d.displayName;

pkg/harvester/edit/harvesterhci.io.volume.vue

@@ -377,6 +377,7 @@ export default {
           :disabled="value?.isLonghornV2 && isEdit"
           required
           class="mb-20"
+          suffix="Gi"
           @update:value="update"
         />
 

pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineCpuMemory.vue

@@ -113,6 +113,7 @@ export default {
           :output-modifier="true"
           :disabled="disabled"
           required
+          suffix="Gi"
           class="mb-20"
           @update:value="change"
         />

pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineReserved.vue

@@ -47,6 +47,7 @@ export default {
     :input-exponent="2"
     :increment="1024"
     :output-modifier="true"
+    suffix="Mi"
     @update:value="change"
   />
 </template>

pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/type/existing.vue

@@ -254,6 +254,7 @@ export default {
             :label="t('harvester.fields.size')"
             :mode="mode"
             :disabled="true"
+            suffix="Gi"
             @update:value="update"
           />
         </InputOrDisplay>

pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/type/vmImage.vue

@@ -129,13 +129,17 @@ export default {
     },
 
     imageVirtualSize() {
-      return this.selectedImage?.virtualSize;
+      if (this.selectedImage?.virtualSize) {
+        return this.selectedImage.virtualSize.replace(' ', '');
+      }
+
+      return '0';
     },
 
     diskSize() {
       const size = this.value?.size || '0';
 
-      return `${ size.replace('Gi', '') } GB`;
+      return size;
     },
 
     imageVirtualSizeInByte() {
@@ -332,7 +336,7 @@ export default {
             :mode="mode"
             :required="validateRequired"
             :disable="isLonghornV2"
-            suffix="GiB"
+            suffix="Gi"
             @update:value="update"
           />
         </InputOrDisplay>

pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/type/volume.vue

@@ -258,6 +258,7 @@ export default {
             :required="validateRequired"
             :label="t('harvester.fields.size')"
             :disabled="isLonghornV2"
+            suffix="Gi"
             @update:value="update"
           />
         </InputOrDisplay>

pkg/harvester/formatters/HarvesterMemoryUsed.vue

@@ -51,7 +51,7 @@ export default {
     memoryUnits() {
       const exponent = exponentNeeded(this.memoryTotal, 1024);
 
-      return `${ UNITS[exponent] }iB`;
+      return `${ UNITS[exponent] }i`;
     },
 
     node() {

pkg/harvester/formatters/HarvesterStorageUsed.vue

@@ -75,13 +75,13 @@ export default {
     allocatedUnits() {
       const exponent = exponentNeeded(this.storageStats.total, 1024);
 
-      return `${ UNITS[exponent] }iB`;
+      return `${ UNITS[exponent] }i`;
     },
 
     usedUnits() {
       const exponent = exponentNeeded(this.storageStats.maximum, 1024);
 
-      return `${ UNITS[exponent] }iB`;
+      return `${ UNITS[exponent] }i`;
     },
 
     formatUsed() {

pkg/harvester/list/harvesterhci.io.dashboard.vue

@@ -8,9 +8,7 @@ import Banner from '@components/Banner/Banner.vue';
 import MessageLink from '@shell/components/MessageLink';
 import SortableTable from '@shell/components/SortableTable';
 import { allHash, setPromiseResult } from '@shell/utils/promise';
-import {
+import { parseSi, formatSi, exponentNeeded, UNITS } from '@shell/utils/units';
-  parseSi, formatSi, exponentNeeded, UNITS, createMemoryValues
-} from '@shell/utils/units';
 import { REASON } from '@shell/config/table-headers';
 import {
   EVENT, METRIC, NODE, SERVICE, PVC, LONGHORN, POD, COUNT, NETWORK_ATTACHMENT
@@ -32,7 +30,6 @@ dayjs.extend(utc);
 dayjs.extend(minMax);
 
 const PARSE_RULES = {
-  memory: {
   format: {
     addSuffix:        true,
     firstSuffix:      'B',
@@ -41,8 +38,7 @@ const PARSE_RULES = {
     maxPrecision:     2,
     minExponent:      0,
     startingExponent: 0,
-      suffix:           'iB',
+    suffix:           'i',
-    }
   }
 };
 
@@ -402,13 +398,13 @@ export default {
     storageUsed() {
       const stats = this.storageStats;
 
-      return this.createMemoryValues(stats.maximum, stats.used);
+      return this.createDisplayValues(stats.maximum, stats.used);
     },
 
     storageAllocated() {
       const stats = this.storageStats;
 
-      return this.createMemoryValues(stats.total, stats.scheduled);
+      return this.createDisplayValues(stats.total, stats.scheduled);
     },
 
     vmEvents() {
@@ -454,7 +450,7 @@ export default {
         return total + node.memoryReserved;
       }, 0);
 
-      return createMemoryValues(this.memoryTotal, useful);
+      return this.createDisplayValues(this.memoryTotal, useful);
     },
 
     availableNodes() {
@@ -494,7 +490,7 @@ export default {
     },
 
     ramUsed() {
-      return createMemoryValues(this.memoryTotal, this.metricAggregations?.memory);
+      return this.createDisplayValues(this.memoryTotal, this.metricAggregations?.memory);
     },
 
     hasMetricNodeSchema() {
@@ -516,10 +512,12 @@ export default {
   },
 
   methods: {
-    createMemoryValues(total, useful) {
+    createDisplayValues(total, useful) {
       const parsedTotal = parseSi((total || '0').toString());
+
       const parsedUseful = parseSi((useful || '0').toString());
-      const format = this.createMemoryFormat(parsedTotal);
+      const format = this.createFormat(parsedTotal);
+
       const formattedTotal = formatSi(parsedTotal, format);
       let formattedUseful = formatSi(parsedUseful, {
         ...format,
@@ -538,24 +536,24 @@ export default {
         useful: Number(parsedUseful),
         formattedTotal,
         formattedUseful,
-        units:  this.createMemoryUnits(parsedTotal),
+        units:  this.createUnits(parsedTotal),
       };
     },
 
-    createMemoryFormat(n) {
+    createFormat(n) {
-      const exponent = exponentNeeded(n, PARSE_RULES.memory.format.increment);
+      const exponent = exponentNeeded(n, PARSE_RULES.format.increment);
 
       return {
-        ...PARSE_RULES.memory.format,
+        ...PARSE_RULES.format,
         maxExponent: exponent,
         minExponent: exponent,
       };
     },
 
-    createMemoryUnits(n) {
+    createUnits(n) {
-      const exponent = exponentNeeded(n, PARSE_RULES.memory.format.increment);
+      const exponent = exponentNeeded(n, PARSE_RULES.format.increment);
 
-      return `${ UNITS[exponent] }${ PARSE_RULES.memory.format.suffix }`;
+      return `${ UNITS[exponent] }${ PARSE_RULES.format.suffix }`;
     },
 
     async fetchClusterResources(type, opt = {}, store) {

pkg/harvester/models/harvesterhci.io.virtualmachineimage.js

@@ -243,8 +243,8 @@ export default class HciVmImage extends HarvesterResource {
     return formatSi(size, {
       increment:    1024,
       maxPrecision: 2,
-      suffix:       'B',
+      suffix:       'i',
-      firstSuffix:  'B',
+      firstSuffix:  'i',
     });
   }
 
@@ -258,8 +258,8 @@ export default class HciVmImage extends HarvesterResource {
     return formatSi(virtualSize, {
       increment:    1024,
       maxPrecision: 2,
-      suffix:       'B',
+      suffix:       'i',
-      firstSuffix:  'B',
+      firstSuffix:  'i',
     });
   }
 

pkg/harvester/validators/vm.js

@@ -88,7 +88,7 @@ export function vmDisks(spec, getters, errors, validatorArgs, displayKey, value)
       }
 
       if (typeValue?.spec?.resources?.requests?.storage && !/^([0-9][0-9]{0,8})[a-zA-Z]+$/.test(typeValue?.spec?.resources?.requests?.storage)) {
-        const message = getters['i18n/t']('harvester.validation.generic.maximumSize', { max: '999999999 GiB' });
+        const message = getters['i18n/t']('harvester.validation.generic.maximumSize', { max: '999999999 Gi' });
 
         errors.push(getters['i18n/t']('harvester.validation.generic.tabError', { prefix, message }));
       }

pkg/harvester/validators/volume.js

@@ -6,7 +6,7 @@ export function volumeSize(size, getters, errors, validatorArgs, displayKey, val
   }
 
   if (size && !/^([0-9][0-9]{0,8})[a-zA-Z]+$/.test(size)) {
-    const message = getters['i18n/t']('harvester.validation.generic.maximumSize', { max: '999999999 GiB' });
+    const message = getters['i18n/t']('harvester.validation.generic.maximumSize', { max: '999999999 Gi' });
 
     errors.push(message);
   }