bfg-common 1.0.4 → 1.0.6

package/components/common/vm/actions/add/Add.vue

@@ -46,9 +46,7 @@
             @show-compute-resource-tree="
               emits('show-compute-resource-tree', $event)
             "
-            @select-compute-resource-tree="
-              emits('select-compute-resource-tree', $event)
-            "
+            @select-compute-resource-tree="onSelectComputeResourceTree"
             @clear-compute-resource-tree="
               emits('clear-compute-resource-tree', $event)
             "
@@ -285,6 +283,8 @@ const emits = defineEmits<{
   (event: 'clear-compute-resource-tree'): void // для сферы
 }>()
 
+const { $recursion } = useNuxtApp()
+
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const stepPosition = ref<number>(0)
@@ -307,6 +307,7 @@ const vmForm = ref<UI_I_VmForm>({
   guestOsVersion: null,
   computeResource: null,
   storage: null,
+  locationPath: '',
   dataCenter: null,
 })
 const vmFormCash = ref<UI_I_VmFormCash>({
@@ -321,11 +322,25 @@ const onChangeNameAndNext = (name: string, node: UI_I_TreeNode): void => {
   if (hasChanges) checkLocalChangeAndChangeStepStatus()
 
   vmForm.value.name = name
+  vmForm.value.locationPath = $recursion.createAbsolutePathRecursion(
+    node,
+    'id',
+    'parent'
+  )
   vmForm.value.dataCenter = node
   vmFormCash.value.dataCenterId = node?.id || null
   onNext(true)
 }
 // Для сферы
+const computeResourcePath = ref<string>('')
+const onSelectComputeResourceTree = (node: UI_I_TreeNode): void => {
+  emits('select-compute-resource-tree', node)
+  computeResourcePath.value = $recursion.createAbsolutePathRecursion(
+    node,
+    'id',
+    'parent'
+  )
+}
 const changeComputeResourceAndNext = (node: UI_I_TreeNode): void => {
   const hasChanges =
     `${node.type}${node.id}` !== vmFormCash.value.computeResourceTypeAndId
@@ -410,7 +425,9 @@ const validateSendData = (): void => {
       virtualHardwareHardDisks.value,
       virtualHardwareCdDvdDrives.value,
       isPowerOnByDefault.value,
-      localization.value
+      localization.value,
+      vmForm.value.locationPath, // для сферы
+      computeResourcePath.value // для сферы
     )
     .then((data) => {
       loading.value = false
@@ -487,7 +504,8 @@ const checkSubmit = (force = false): boolean => {
   if (
     (props.project === 'sphere'
       ? stepPosition.value === 3
-      : stepPosition.value === 2) && !force
+      : stepPosition.value === 2) &&
+    !force
   ) {
     storageSubmit.value++
     return false
@@ -495,7 +513,8 @@ const checkSubmit = (force = false): boolean => {
   if (
     (props.project === 'sphere'
       ? stepPosition.value === 6
-      : stepPosition.value === 5) && !force
+      : stepPosition.value === 5) &&
+    !force
   ) {
     customizeHardwareSubmit.value++
     return false

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

@@ -16,6 +16,7 @@ export interface UI_I_VmForm {
   guestOsFamily: UI_I_OptionItem | null
   guestOsVersion: UI_I_OptionItem | null
   computeResource: UI_I_TreeNode | null
+  locationPath: string
   dataCenter: UI_I_TreeNode | null
 }
 export interface UI_I_VmFormCash {

package/components/common/vm/actions/add/models/types.ts

@@ -59,5 +59,6 @@ export type UI_T_AddVmFinishFunc<T = void> = (
   virtualHardwareCdDvdDrives: UI_I_SendDataNewCdDvdDrive[] | null,
   isPowerOnByDefault: boolean,
   localization: UI_I_Localization,
-  isValidation?: boolean
+  locationPath?: string, // для сферы
+  computeResourcePath?: string // для сферы
 ) => Promise<T>

package/models/store/vm/interfaces.ts

@@ -9,7 +9,7 @@ import {
 } from '~/components/common/vm/actions/add/customizeHardware/virtualHardware/models/interfaces'
 import { UI_I_CreateVmData } from '~/components/common/vm/actions/add/models/interfaces'
 
-export interface API_UI_I_VmEditCpu {
+export interface API_UI_UI_I_VmEditCpu {
   core_per_socket: number
   hotplug: boolean
   limit_mhz: number
@@ -19,13 +19,13 @@ export interface API_UI_I_VmEditCpu {
   shares: number
   vcpus: number
 }
-export interface API_UI_I_VmEditMemory {
+export interface API_UI_UI_I_VmEditMemory {
   hotplug: boolean
   limit_mb: number
   reservation_mb: number
   size_mb: number
 }
-export interface API_UI_I_VmEditOptions {
+export interface API_UI_UI_I_VmEditOptions {
   boot_options: {
     boot_delay_ms: number
     boot_menu: boolean
@@ -71,17 +71,137 @@ export interface UI_I_VmSettings {
   maxMemory: number
   uuid: string
   compatibility: string
-  options: API_UI_I_VmEditOptions
-  cpu: API_UI_I_VmEditCpu
-  memory: API_UI_I_VmEditMemory
+  options: API_UI_UI_I_VmEditOptions
+  cpu: API_UI_UI_I_VmEditCpu
+  memory: API_UI_UI_I_VmEditMemory
 }
 
 export interface UI_I_CreateVmPayload {
   start: boolean
   pvm: UI_I_CreateVmData
+  location?: string // для сферы
+  compute_resource?: string // для сферы
 }
 
 export interface UI_I_EditVmPayload {
   vmId: string
   body: UI_I_CreateVmData
 }
+
+export interface API_UI_I_VmReadyToCompleteCpu {
+  core_per_socket: number
+  hotplug: number
+  limit_mhz: number
+  max_vcpus: number
+  model: string
+  reservation_mhz: number
+  shares: number
+  vcpus: number
+}
+export interface API_UI_I_VmReadyToCompleteDiskDevices {
+  boot_order: number
+  bus: string
+  cache: string
+  create: boolean
+  device_type: string
+  discard: string
+  disk_mode: string
+  io: string
+  limit_iops: number
+  provision_type: string
+  read_only: boolean
+  shares: number
+  sharing: boolean
+  size: number
+  source: string
+  storage_id: string
+  target: string
+}
+export interface API_UI_I_VmReadyToCompleteInputDevices {
+  bus: string
+  type: string
+}
+export interface API_UI_I_VmReadyToCompleteMemory {
+  hotplug: boolean
+  limit_mb: number
+  reservation_mb: number
+  size_mb: number
+}
+export interface API_UI_I_VmReadyToCompleteNetworkDevices {
+  boot_order: number
+  mac: string
+  model: string
+  net_bridge: string
+  network: string
+  target: string
+}
+export interface API_UI_I_VmReadyToCompleteOptions {
+  boot_options: {
+    boot_delay_ms: number
+    boot_menu: boolean
+    firmware: string
+  }
+  guest_tools: {
+    enabled: boolean
+    synchronized_time: boolean
+  }
+  remote_console: {
+    guest_os_lock: boolean
+    keymap: string
+    limit_sessions: number
+    password: string
+    port: number
+    type: string
+    spice: {
+      clipboard: boolean
+      file_transfer: boolean
+      img_compression: string
+      jpeg_compression: string
+      playback_compression: boolean
+      streaming_mode: string
+      zlib_glz_compression: string
+    }
+  }
+  id: string
+}
+export interface API_UI_I_VmReadyToCompleteStorage {
+  folder: string
+  id: string
+}
+export interface API_UI_I_VmReadyToCompleteUsbController {
+  type: number
+}
+export interface API_UI_I_VmReadyToCompleteVideoCard {
+  adapter: string
+  displays: number
+  memory_mb: number
+}
+export interface API_UI_I_VmReadyToCompletePciDevice {
+  id: string
+  class_name: string
+  device_name: string
+  vendor_name: string
+}
+export interface API_UI_I_VmReadyToComplete {
+  message: string
+  vm_desc: {
+    compatibility: string
+    deployment_name: string
+    guest_os_family: string
+    guest_os_version: string
+    machine_type: string
+    name: string
+    uuid: string
+    cpu: API_UI_I_VmReadyToCompleteCpu
+    disk_devices: API_UI_I_VmReadyToCompleteDiskDevices[]
+    input_devices: API_UI_I_VmReadyToCompleteInputDevices[]
+    memory: API_UI_I_VmReadyToCompleteMemory
+    monitoring: any
+    network_devices: API_UI_I_VmReadyToCompleteNetworkDevices[]
+    options: API_UI_I_VmReadyToCompleteOptions
+    storage: API_UI_I_VmReadyToCompleteStorage
+    usb_controllers: API_UI_I_VmReadyToCompleteUsbController[]
+    video_card: API_UI_I_VmReadyToCompleteVideoCard
+    pci_pt_devices: API_UI_I_VmReadyToCompletePciDevice[]
+  }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.0.4",
+  "version": "1.0.6",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",