bfg-common 1.4.732 → 1.4.734

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newPciDevice/NewPciDevice.vue

@@ -7,6 +7,7 @@
     v-model:nvidia-grid-profile="nvidiaGridProfile"
     :index="props.index"
     :passthrough-devices="props.passthroughDevices"
+    :mediated-devices="props.mediatedDevices"
     :type="props.type"
     :is-removable="isRemovable"
     :label="label"
@@ -22,6 +23,7 @@
     v-model:nvidia-grid-profile="nvidiaGridProfile"
     :index="props.index"
     :passthrough-devices="props.passthroughDevices"
+    :mediated-devices="props.mediatedDevices"
     :type="props.type"
     :is-removable="isRemovable"
     :label="label"
@@ -37,12 +39,13 @@ import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 import type { UI_I_SendDataNewPciDevice } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/interfaces'
 import type { UI_T_PciDeviceType } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/lib/models/types'
 import type { UI_I_PciDevice } from '~/lib/models/store/vm/interfaces'
-import { pciDeviceTypeOptionsConfig } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/newPciDevice/lib/config/options'
+import { pciDeviceTypeOptionsFunc } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/newPciDevice/lib/config/options'
 
 const props = defineProps<{
   index: number
   pciDevice: UI_I_SendDataNewPciDevice
   passthroughDevices: UI_I_PciDevice[]
+  mediatedDevices: any[]
   type: UI_T_PciDeviceType
   isEdit: boolean
   state?: string | number
@@ -84,26 +87,54 @@ const selectedLabel = computed<string>(() => {
   }
 })
 
-const pciDeviceTypeOptions = ref<UI_I_OptionItem[]>(pciDeviceTypeOptionsConfig)
-const selectedType = ref<UI_I_OptionItem>(pciDeviceTypeOptionsConfig[0])
+const pciDeviceTypeOptions = ref<UI_I_OptionItem[]>(
+  pciDeviceTypeOptionsFunc(
+    !props.passthroughDevices.length,
+    !props.mediatedDevices.length
+  )
+)
+const selectedType = ref<UI_I_OptionItem>(pciDeviceTypeOptions.value[0])
+pciDeviceTypeOptions.value.forEach((option) => {
+  if (!option.disabled) selectedType.value = option
+})
 
 const directPathIo = ref<UI_I_PciDevice>(props.passthroughDevices[0])
 const dynamicDirectPathIo = ref<string>('')
-const nvidiaGridProfile = ref<string>('')
+const nvidiaGridProfile = ref<any>(props.mediatedDevices[0]?.value)
 
 watch(
-  props.pciDevice,
-  (newValue) => {
+  [() => props.pciDevice, () => props.mediatedDevices],
+  ([newValue1]) => {
     // const passthroughDevice = props.passthroughDevices.find(
     //   (item) => item.address === newValue.address
     // )
     // passthroughDevice && (directPathIo.value = passthroughDevice) // Todo change
-    newValue && (directPathIo.value = newValue)
+    if (newValue1) {
+      directPathIo.value = newValue1
+      const mediatedDevice = props.mediatedDevices.find((device) => {
+        return (
+          device.profile_name + '_' + device.root_device ===
+          newValue1.class_name + '_' + newValue1.address
+        )
+      })
+      if (mediatedDevice) {
+        nvidiaGridProfile.value = mediatedDevice.profile_name + '_' + mediatedDevice.root_device
+
+        selectedType.value =
+          pciDeviceTypeOptions.value.find(
+            (option) => option.value === 'nvidia_grid'
+          ) || selectedType.value
+      }
+    }
   },
-  { immediate: true }
+  { immediate: true, deep: true }
 )
 
 const sendData = computed<UI_I_SendDataNewPciDevice>(() => {
+  const nvidea = props.mediatedDevices.find(
+    (device) =>
+      nvidiaGridProfile.value === device.profile_name + '_' + device.root_device
+  )
   switch (selectedType.value.value) {
     case 'direct_path_io':
       return {
@@ -111,6 +142,7 @@ const sendData = computed<UI_I_SendDataNewPciDevice>(() => {
         vendor_name: directPathIo.value.vendor_name,
         class_name: directPathIo.value.class_name,
         device_name: directPathIo.value.device_name,
+        mediated_devices: false,
       }
     case 'dynamic_direct_path_io':
       return {
@@ -118,6 +150,16 @@ const sendData = computed<UI_I_SendDataNewPciDevice>(() => {
         vendor_name: '',
         class_name: '',
         device_name: '',
+        mediated_devices: false,
+      }
+    case 'nvidia_grid':
+      return {
+        address: nvidea?.root_device || '',
+        vendor_name: '',
+        class_name: nvidea?.profile_name || '',
+        device_name: nvidea?.name || '',
+        mediated_devices: true,
+        mediated_devices_uuid: '',
       }
     default:
       return {
@@ -125,6 +167,7 @@ const sendData = computed<UI_I_SendDataNewPciDevice>(() => {
         vendor_name: '',
         class_name: '',
         device_name: '',
+        mediated_devices: false,
       }
   }
 })
@@ -138,5 +181,4 @@ watch(
 )
 </script>
 
-<style scoped lang="scss">
-</style>
+<style scoped lang="scss"></style>

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newPciDevice/NewPciDeviceNew.vue

@@ -27,22 +27,47 @@
           :pci-device-index="props.index"
         />
 
-        <common-vm-actions-common-customize-hardware-virtual-hardware-new-pci-device-direct-path-io
+        <!-- v-show="selectedType.value === 'dynamic_direct_path_io'" -->
+        <common-vm-actions-common-customize-hardware-virtual-hardware-new-pci-device-dynamic-direct-path-io
+          v-show="selectedType.value === 'nvidia_grid'"
+          v-model="nvidiaGridProfile"
+          :pci-device-index="props.index"
+          :mediated-devices="props.mediatedDevices"
+        />
+        <!-- v-show="selectedType.value === 'nvidia_grid'" -->
+        <common-vm-actions-common-customize-hardware-virtual-hardware-new-pci-device-nvidia-grid
           v-show="selectedType.value === 'direct_path_io'"
           v-model="directPathIo"
           :pci-device-index="props.index"
-          :passthrough-devices="props.passthroughDevices"
         />
-        <common-vm-actions-common-customize-hardware-virtual-hardware-new-pci-device-dynamic-direct-path-io
+        <!-- v-show="selectedType.value === 'direct_path_io'" -->
+        <common-vm-actions-common-customize-hardware-virtual-hardware-new-pci-device-direct-path-io
           v-show="selectedType.value === 'dynamic_direct_path_io'"
           v-model="dynamicDirectPathIo"
           :pci-device-index="props.index"
+          :passthrough-devices="props.passthroughDevices"
         />
-        <common-vm-actions-common-customize-hardware-virtual-hardware-new-pci-device-nvidia-grid
+
+        <!-- v-show="selectedType.value === 'dynamic_direct_path_io'" -->
+        <!-- <common-vm-actions-common-customize-hardware-virtual-hardware-new-pci-device-dynamic-direct-path-io
           v-show="selectedType.value === 'nvidia_grid'"
+          v-model="dynamicDirectPathIo"
+          :pci-device-index="props.index"
+          :mediated-devices="props.mediatedDevices"
+        /> -->
+        <!-- v-show="selectedType.value === 'nvidia_grid'" -->
+        <!-- <common-vm-actions-common-customize-hardware-virtual-hardware-new-pci-device-nvidia-grid
+          v-show="selectedType.value === 'direct_path_io'"
           v-model="nvidiaGridProfile"
           :pci-device-index="props.index"
-        />
+        /> -->
+        <!-- v-show="selectedType.value === 'direct_path_io'" -->
+        <!-- <common-vm-actions-common-customize-hardware-virtual-hardware-new-pci-device-direct-path-io
+          v-show="selectedType.value === 'dynamic_direct_path_io'"
+          v-model="directPathIo"
+          :pci-device-index="props.index"
+          :passthrough-devices="props.passthroughDevices"
+        /> -->
       </template>
 
       <common-vm-actions-common-customize-hardware-virtual-hardware-new-pci-device-note />
@@ -71,6 +96,7 @@ const nvidiaGridProfile = defineModel<string>('nvidiaGridProfile', {
 const props = defineProps<{
   index: number
   passthroughDevices: UI_I_PciDevice[]
+  mediatedDevices: any[]
   type: UI_T_PciDeviceType
   isRemovable: boolean
   label: string

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newPciDevice/NewPciDeviceOld.vue

@@ -28,22 +28,47 @@
             :pci-device-index="props.index"
           />
 
-          <common-vm-actions-common-customize-hardware-virtual-hardware-new-pci-device-direct-path-io
+          <!-- v-show="selectedType.value === 'dynamic_direct_path_io'" -->
+          <common-vm-actions-common-customize-hardware-virtual-hardware-new-pci-device-dynamic-direct-path-io
+            v-show="selectedType.value === 'nvidia_grid'"
+            v-model="nvidiaGridProfile"
+            :pci-device-index="props.index"
+            :mediated-devices="props.mediatedDevices"
+          />
+          <!-- v-show="selectedType.value === 'nvidia_grid'" -->
+          <common-vm-actions-common-customize-hardware-virtual-hardware-new-pci-device-nvidia-grid
             v-show="selectedType.value === 'direct_path_io'"
             v-model="directPathIo"
             :pci-device-index="props.index"
-            :passthrough-devices="props.passthroughDevices"
           />
-          <common-vm-actions-common-customize-hardware-virtual-hardware-new-pci-device-dynamic-direct-path-io
+          <!-- v-show="selectedType.value === 'direct_path_io'" -->
+          <common-vm-actions-common-customize-hardware-virtual-hardware-new-pci-device-direct-path-io
             v-show="selectedType.value === 'dynamic_direct_path_io'"
             v-model="dynamicDirectPathIo"
             :pci-device-index="props.index"
+            :passthrough-devices="props.passthroughDevices"
           />
-          <common-vm-actions-common-customize-hardware-virtual-hardware-new-pci-device-nvidia-grid
+
+          <!-- v-show="selectedType.value === 'dynamic_direct_path_io'" -->
+          <!-- <common-vm-actions-common-customize-hardware-virtual-hardware-new-pci-device-dynamic-direct-path-io
             v-show="selectedType.value === 'nvidia_grid'"
+            v-model="dynamicDirectPathIo"
+            :pci-device-index="props.index"
+            :mediated-devices="props.mediatedDevices"
+          /> -->
+          <!-- v-show="selectedType.value === 'nvidia_grid'" -->
+          <!-- <common-vm-actions-common-customize-hardware-virtual-hardware-new-pci-device-nvidia-grid
+            v-show="selectedType.value === 'direct_path_io'"
             v-model="nvidiaGridProfile"
             :pci-device-index="props.index"
-          />
+          /> -->
+          <!-- v-show="selectedType.value === 'direct_path_io'" -->
+          <!-- <common-vm-actions-common-customize-hardware-virtual-hardware-new-pci-device-direct-path-io
+            v-show="selectedType.value === 'dynamic_direct_path_io'"
+            v-model="directPathIo"
+            :pci-device-index="props.index"
+            :passthrough-devices="props.passthroughDevices"
+          /> -->
         </template>
 
         <common-vm-actions-common-customize-hardware-virtual-hardware-new-pci-device-note />
@@ -73,6 +98,7 @@ const nvidiaGridProfile = defineModel<string>('nvidiaGridProfile', {
 const props = defineProps<{
   index: number
   passthroughDevices: UI_I_PciDevice[]
+  mediatedDevices: any[]
   type: UI_T_PciDeviceType
   isRemovable: boolean
   label: string

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newPciDevice/dynamicDirectPathIo/DynamicDirectPathIo.vue

@@ -15,18 +15,25 @@
 
 <script lang="ts" setup>
 import type { UI_I_Option } from '~/components/atoms/select/lib/models/interfaces'
-import { optionsConfig } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/newPciDevice/dynamicDirectPathIo/lib/config/options'
+// import { optionsConfig } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/newPciDevice/dynamicDirectPathIo/lib/config/options'
 
 const model = defineModel<string>({required: true})
 
 const props = defineProps<{
   pciDeviceIndex: number
+  mediatedDevices: any[]
 }>()
 
 const { $store }: any = useNuxtApp()
 const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 
-const options = ref<UI_I_Option[]>(optionsConfig)
+// const options = ref<UI_I_Option[]>(optionsConfig)
+const options = ref<UI_I_Option[]>(props.mediatedDevices.map(device => {
+  return {
+    text: device.human_readable,
+    value: device.profile_name + '_' + device.root_device
+  }
+}))
 model.value = '' + options.value[0].value
 </script>
 

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newPciDevice/lib/config/options.ts

@@ -1,7 +1,14 @@
 import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 
-export const pciDeviceTypeOptionsConfig: UI_I_OptionItem[] = [
-  { text: 'DP I/O', value: 'direct_path_io' },
-  { text: 'Dynamic DP I/O', value: 'dynamic_direct_path_io' },
-  { text: 'GRID vGPU', value: 'nvidia_grid' },
+export const pciDeviceTypeOptionsFunc = (
+  isDisabledDynamicDirectPathIo: boolean,
+  isDisabledNvidiaGrid: boolean
+): UI_I_OptionItem[] => [
+  {
+    text: 'Dynamic DP I/O',
+    value: 'dynamic_direct_path_io',
+    disabled: isDisabledDynamicDirectPathIo,
+  },
+  { text: 'GRID vGPU', value: 'nvidia_grid', disabled: isDisabledNvidiaGrid },
+  { text: 'DP I/O', value: 'direct_path_io', disabled: true },
 ]

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newPciDevice/typeSelection/TypeSelectionNew.vue

@@ -8,7 +8,7 @@
             v-model="modelLocal"
             :value="item.value"
             :label="item.text"
-            :disabled="!!index"
+            :disabled="item.disabled"
             :test-id="`pci-device-radio-input-${props.pciDeviceIndex}-${index}`"
           />
         </div>

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newPciDevice/typeSelection/TypeSelectionOld.vue

@@ -13,7 +13,7 @@
               v-model="model"
               type="radio"
               :value="item"
-              :disabled="!!index"
+              :disabled="item.disabled"
               :data-id="`pci-device-radio-input-${props.pciDeviceIndex}-${index}`"
             />
             <label

package/components/common/vm/actions/editSettings/EditSettings.vue

@@ -18,6 +18,7 @@
     :state="props.state"
     :vm-name-old="props.vmSettings?.name"
     :passthrough-devices="props.passthroughDevices"
+    :mediated-devices="props.mediatedDevices"
     :get-datastore-table-func="props.getDatastoreTableFunc"
     :customize-hardware-submit="customizeHardwareSubmit"
     @hide="emits('hide')"
@@ -51,6 +52,7 @@
     :state="props.state"
     :vm-name-old="props.vmSettings?.name"
     :passthrough-devices="props.passthroughDevices"
+    :mediated-devices="props.mediatedDevices"
     :get-datastore-table-func="props.getDatastoreTableFunc"
     :customize-hardware-submit="customizeHardwareSubmit"
     @hide="emits('hide')"
@@ -111,6 +113,7 @@ const props = defineProps<{
   getDatastoreTableFunc?: (payload: UI_I_TablePayload) => Promise<void>
   state?: string | number
   passthroughDevices?: UI_I_PciDevice[]
+  mediatedDevices?: any[]
   capabilities?: UI_I_Capabilities
 }>()
 

package/components/common/vm/actions/editSettings/EditSettingsOld.vue

@@ -46,6 +46,7 @@
             :error-validation-fields="props.errorValidationFields"
             :vm-cpu-help-text-second="props.vmCpuHelpTextSecond"
             :passthrough-devices="props.passthroughDevices"
+            :mediated-devices="props.mediatedDevices"
             :state="props.state"
             :get-datastore-table-func="props.getDatastoreTableFunc"
             :datastore="props.datastore"
@@ -112,6 +113,7 @@ const props = defineProps<{
   state?: string | number
   vmNameOld?: string
   passthroughDevices?: UI_I_PciDevice[]
+  mediatedDevices?: any[]
   getDatastoreTableFunc?: (payload: UI_I_TablePayload) => Promise<void>
   customizeHardwareSubmit?: null | Function
 }>()

package/components/common/vm/actions/editSettings/new/New.vue

@@ -48,6 +48,7 @@
             :error-validation-fields="props.errorValidationFields"
             :vm-cpu-help-text-second="props.vmCpuHelpTextSecond"
             :passthrough-devices="props.passthroughDevices"
+            :mediated-devices="props.mediatedDevices"
             :state="props.state"
             :get-datastore-table-func="props.getDatastoreTableFunc"
             :datastore="props.datastore"
@@ -118,6 +119,7 @@ const props = defineProps<{
   state?: string | number
   vmNameOld?: string
   passthroughDevices?: UI_I_PciDevice[]
+  mediatedDevices?: any[]
   getDatastoreTableFunc?: (payload: UI_I_TablePayload) => Promise<void>
   customizeHardwareSubmit?: null | Function
 }>()

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.4.732",
+  "version": "1.4.734",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",
@@ -34,8 +34,8 @@
     "@nuxtjs/eslint-config-typescript": "^12.0.0",
     "@vueuse/components": "^10.1.2",
     "date-fns": "^2.29.3",
-    "bfg-nuxt-3-graph": "1.0.15",
-    "bfg-uikit": "1.0.301",
+    "bfg-nuxt-3-graph": "1.0.17",
+    "bfg-uikit": "1.0.312",
     "html2canvas": "^1.4.1",
     "prettier-eslint": "^15.0.1"
   }