bfg-common 1.5.558 → 1.5.559

package/components/common/vm/actions/lib/models/interfaces.ts

@@ -1,15 +1,40 @@
+import type { UI_I_ErrorMessage } from '~/components/common/vm/actions/common/lib/models/interfaces'
+import type { UI_I_VmSettings } from '~/lib/models/store/vm/interfaces'
 import type {
-  UI_I_CreateVmData,
-  UI_I_ErrorMessage,
+  UI_I_CreateVmDataCdDvdDevice,
+  UI_I_CreateVmDataExistDiskDevice,
+  UI_I_CreateVmDataNewDiskDevice,
+  UI_I_VmForm,
 } from '~/components/common/vm/actions/common/lib/models/interfaces'
+import type {
+  UI_I_SendDataCpu,
+  UI_I_SendDataMemory,
+  UI_I_SendDataNewNetwork,
+  UI_I_SendDataNewPciDevice,
+  UI_I_SendDataVideoCard,
+} from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/interfaces'
 
 export interface UI_I_ConstructErrorMessagesData {
   fields: string[]
   messages: UI_I_ErrorMessage[]
 }
 
-export interface UI_I_VmConstructData {
-  form: UI_I_CreateVmData
+export interface UI_I_VmConstructData<T> {
+  options: T,
+  name: string,
+  vmData: UI_I_VmSettings | UI_I_VmForm,
+  videoCard: UI_I_SendDataVideoCard,
+  diskDevices: (
+    | UI_I_CreateVmDataNewDiskDevice
+    | UI_I_CreateVmDataExistDiskDevice
+    | UI_I_CreateVmDataCdDvdDevice
+    )[],
+  networks: UI_I_SendDataNewNetwork[],
+  storageId: string,
+  cpu: UI_I_SendDataCpu,
+  memory: UI_I_SendDataMemory,
+  usbController: string,
+  pciDevices: UI_I_SendDataNewPciDevice[]
   // Sphere
   uuid: string
 }

package/components/common/vm/actions/lib/utils.ts

@@ -102,53 +102,37 @@ export const constructDiskDevicesFunc = (
 export const constructSendDataForm = (
   data: UI_I_VmConstructData
 ): UI_I_CreateVmData => {
-  const { form, uuid = '' } = data
-
   const {
-    name,
     options,
+    name,
+    vmData,
+    videoCard,
+    diskDevices,
+    networks,
     storage,
-    compatibility,
-    guest_os_family,
-    guest_os_version,
-    machine_type,
-    video_card,
-    disk_devices,
-    network_devices,
-    passthrough_pci_devices,
     cpu,
     memory,
-    usb_controllers,
-    input_devices,
-  } = form
-
-  const diskDevices: (
-    | UI_I_CreateVmDataNewDiskDevice
-    | UI_I_CreateVmDataExistDiskDevice
-    | UI_I_CreateVmDataCdDvdDevice
-  )[] = constructDiskDevicesFunc(
-    disk_devices.filter((disk) => disk.device_type !== 'cdrom'),
-    disk_devices.filter((disk) => disk.device_type === 'cdrom')
-  )
+    usbController,
+    pciDevices,
+    uuid = '',
+  } = data
 
   return {
-    uuid,
-    name,
     options,
-    compatibility,
-    usb_controllers,
-    input_devices,
-    storage: { id: storage?.id || '' },
-    guest_os_family: guest_os_family?.value,
-    guest_os_version: guest_os_version?.value,
-    machine_type: machine_type?.value,
-    video_card: video_card,
+    name,
+    uuid,
+    compatibility: vmData.compatibility,
+    guest_os_family: vmData.guestOsFamily?.value,
+    guest_os_version: vmData.guestOsVersion?.value,
+    machine_type: vmData.guestMachineType?.value,
+    video_card: videoCard,
     disk_devices: diskDevices,
-    network_devices: network_devices,
-    passthrough_pci_devices: passthrough_pci_devices,
+    network_devices: networks,
+    passthrough_pci_devices: pciDevices,
+    storage,
     cpu: {
       vcpus: cpu.vcpus,
-      max_vcpus: cpu.hotplug ? cpu.max_vcpus : 0,
+      max_vcpus: cpu.max_vcpus,
       core_per_socket: cpu.core_per_socket,
       model: cpu.model,
       reservation_mhz: cpu.reservation_mhz,
@@ -157,11 +141,22 @@ export const constructSendDataForm = (
       hotplug: cpu.hotplug,
     },
     memory: {
-      size_mb: +memory.size_mb,
+      size_mb: +memory.memory,
       hotplug: memory.hotplug,
       reservation_mb: +memory.reservation_mb,
       limit_mb: +memory.limit_mb,
     },
+    usb_controllers: [
+      {
+        type: usbController,
+      },
+    ],
+    input_devices: [
+      {
+        type: 'keyboard',
+        bus: 'usb',
+      },
+    ],
   }
 }