Fix rendered disk size <1Gi

If disk size is < 1 Gi in the Storage Tab of CreateVmWizard,
the value is reformatted and appended by a lower matching unit.

Corresponding PVC is created with a value conforming the format
required by Kubernetes.

src/components/Table/EditableDraggableTable.js

@@ -190,12 +190,13 @@ class EditableDraggableTable extends React.Component {
 
   getRenderConfig = additionalData => {
     const { renderConfig } = additionalData.column;
-
     return renderConfig ? renderConfig(additionalData.rowData) : null;
   };
 
   resolveRenderedValue = (value, additionalData, editable) => {
     const renderConfig = this.getRenderConfig(additionalData);
+    const { readValueFormatter } = additionalData.column;
+
     let result;
     if (this.isDropdown(additionalData)) {
       result = get(renderConfig.choices.find(clazz => clazz.id === value), 'name');
@@ -205,6 +206,10 @@ class EditableDraggableTable extends React.Component {
       result = value;
     }
 
+    if (!editable && readValueFormatter) {
+      result = readValueFormatter(result);
+    }
+
     if (!editable && additionalData.column.hasAddendum) {
       const { addendum } = additionalData.rowData;
       if (addendum) {

src/components/Wizard/CreateVmWizard/CreateVmWizard.js

@@ -144,7 +144,8 @@ export class CreateVmWizard extends React.Component {
       vmSettings,
       this.state.stepData[NETWORKS_TAB_KEY].value,
       this.state.stepData[STORAGE_TAB_KEY].value,
-      this.props.persistentVolumeClaims
+      this.props.persistentVolumeClaims,
+      this.props.units,
     )
       .then(() => getResults(enhancedK8sMethods))
       .catch(error => cleanupAndGetResults(enhancedK8sMethods, error))

src/components/Wizard/CreateVmWizard/StorageTab.js

@@ -48,6 +48,8 @@ import {
 
 import { canBeBootable, needsBootableDisk } from './utils/storageTabUtils';
 
+import { getValidK8SSize } from '../../../utils';
+
 const initalStorageErrorsArray = () => Array(4).fill(null);
 
 const genericValidator = (storage, validationResolvers) =>
@@ -428,6 +430,7 @@ export class StorageTab extends React.Component {
               type: POSITIVE_NUMBER,
             }
           : null,
+      readValueFormatter: value => value < 1 ? getValidK8SSize(value, this.props.units, 'Gi', false) : value,
     },
     {
       header: {

src/k8s/objects/pvc/pvc.js

@@ -1,6 +1,7 @@
 import { PersistentVolumeClaimModel } from '../../../models/index';
+import { getValidK8SSize } from '../../../utils';
 
-export const buildPvc = ({ generateName, namespace, storageType, size, storageClass }) => ({
+export const buildPvc = ({generateName, namespace, storageType, size, storageClass, units}) => ({
   apiVersion: PersistentVolumeClaimModel.apiVersion,
   kind: PersistentVolumeClaimModel.kind,
   metadata: {
@@ -12,7 +13,7 @@ export const buildPvc = ({ generateName, namespace, storageType, size, storageCl
     volumeMode: 'Filesystem',
     resources: {
       requests: {
-        storage: `${size}Gi`,
+        storage: getValidK8SSize(size, units, 'Gi', true),
       },
     },
     storageClassName: storageClass,

src/k8s/request.js

@@ -185,7 +185,8 @@ export const createVm = async (
   vmSettings,
   networks,
   storages,
-  persistentVolumeClaims
+  persistentVolumeClaims,
+  units
 ) => {
   const getSetting = settingsValue.bind(undefined, vmSettings);
 
@@ -195,7 +196,7 @@ export const createVm = async (
     const importResult = await importVmwareVm(vmSettings, networks, storages, {
       k8sCreate,
       k8sPatch,
-    });
+    }, units);
     // eslint-disable-next-line prefer-destructuring
     conversionPod = importResult.conversionPod;
     storages = importResult.mappedStorages;

src/k8s/requests/v2v/importVmware.js

@@ -75,7 +75,7 @@ const createProviderSecret = async (vmSettings, networks, storages, { k8sCreate
   return null;
 };
 
-const resolveStorages = async (vmSettings, networks, storages, { k8sCreate }) => {
+const resolveStorages = async (vmSettings, networks, storages, { k8sCreate }, lastResults, units) => {
   const isImportStorage = storage =>
     [STORAGE_TYPE_EXTERNAL_IMPORT, STORAGE_TYPE_EXTERNAL_V2V_TEMP].includes(storage.storageType);
   const namespace = settingsValue(vmSettings, NAMESPACE_KEY);
@@ -88,6 +88,7 @@ const resolveStorages = async (vmSettings, networks, storages, { k8sCreate }) =>
         generateName: storage.name,
         name: undefined,
         namespace,
+        units,
       })
     )
   );
@@ -230,7 +231,7 @@ const startConversionPod = async (
   };
 };
 
-export const importVmwareVm = async (vmSettings, networks, storages, { k8sCreate, k8sPatch }) =>
+export const importVmwareVm = async (vmSettings, networks, storages, { k8sCreate, k8sPatch }, units) =>
   [
     createProviderSecret,
     createConversionPodSecret,
@@ -247,7 +248,8 @@ export const importVmwareVm = async (vmSettings, networks, storages, { k8sCreate
         k8sCreate,
         k8sPatch,
       },
-      lastResult
+      lastResult,
+      units,
     );
     return {
       ...lastResult,

src/k8s/requests/v2v/startV2VvmwareController.js

@@ -38,6 +38,8 @@ export const startV2VVMWareController = async ({ namespace }, { k8sGet, k8sCreat
         : 'V2V VMWare controller deployment not found, so creating one ...'
     );
 
+    // TODO: do not fail if i.e. ServiceAccount already exists
+    // TODO: notify user if deployment fails
     [cleanupOldDeployment, resolveRolesAndServiceAccount, startVmWare].reduce(
       async (lastResultPromise, stepFunction) => {
         const lastResult = await lastResultPromise;

src/utils/utils.js

@@ -161,3 +161,10 @@ export const objectMerge = (dest, ...sources) =>
     }
     return undefined;
   });
+
+// https://github.com/kubernetes/community/blob/master/contributors/design-proposals/scheduling/resources.md#resource-quantities
+export const getValidK8SSize = (size, units, sizeUnit = 'Gi', useTrim = true) => {
+  const baseSize = units.dehumanize(`${size}${sizeUnit}`, 'binaryBytesWithoutB');
+  const validSize = units.humanize(baseSize.value, 'binaryBytesWithoutB');
+  return useTrim ? `${validSize.value}${validSize.unit.trim()}` : validSize.string;
+};