bfg-common 1.4.776 → 1.4.778

package/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/common.ts

@@ -1,14 +1,14 @@
-export const isIntegerNumberInRange = (
-  value: number | string | undefined,
-  down: number,
-  up: number
-): boolean =>
-  isNaN(Number(value)) ||
-  Number(value) < down ||
-  Number(value) > up ||
-  Number(value) !== Math.round(Number(value))
-
-export const checkVlanId = (vlanId: string): boolean =>
-  vlanId !== 'None (0)' &&
-  vlanId !== 'All (4095)' &&
-  (isIntegerNumberInRange(vlanId, 0, 4095) || vlanId === '')
+export const isIntegerNumberInRange = (
+  value: number | string | undefined,
+  down: number,
+  up: number
+): boolean =>
+  isNaN(Number(value)) ||
+  Number(value) < down ||
+  Number(value) > up ||
+  Number(value) !== Math.round(Number(value))
+
+export const checkVlanId = (vlanId: string): boolean =>
+  vlanId !== 'None (0)' &&
+  vlanId !== 'All (4095)' &&
+  (isIntegerNumberInRange(vlanId, 0, 4095) || vlanId === '')

package/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/connectionSettings.ts

@@ -1,137 +1,137 @@
-import type { UI_I_ConnectionSettings } from '~/components/common/wizards/network/add/lib/models/interfaces'
-import type { UI_I_MigrateVmkernelAdapterEmits } from '~/components/common/diagramMain/lib/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type {
-  UI_I_AsyncCheckReturn,
-  UI_I_ValidationReturn,
-  UI_I_WizardStep,
-} from '~/components/atoms/wizard/lib/models/interfaces'
-import { UI_E_MigrationValidationFields } from '~/components/common/diagramMain/lib/models/enums'
-import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
-import { checkVlanId } from '~/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/common'
-
-export const validateVlanIdConnectionSettingsLocal = (
-  localization: UI_I_Localization,
-  data: UI_I_ConnectionSettings,
-  wizard: Wizard
-): void => {
-  wizard.validateFieldLocal(
-    1,
-    UI_E_MigrationValidationFields.CONNECTION_SETTINGS_VLAN,
-    checkVlanId(data.vlanId),
-    localization.common.vlanIdInvalidMessage,
-    localization.common.vlanIdInvalidMessage
-  )
-}
-
-export const validateNetworkConnectionSettingsLocal = (
-  localization: UI_I_Localization,
-  data: UI_I_ConnectionSettings,
-  wizard: Wizard
-): void => {
-  wizard.validateFieldLocal(
-    1,
-    UI_E_MigrationValidationFields.CONNECTION_SETTINGS_NETWORK,
-    data.networkLabel === '',
-    localization.common.networkLabelInvalidMessage,
-    localization.common.networkLabelInvalidMessage
-  )
-}
-
-export const checkConnectionSettingsSync = (
-  localization: UI_I_Localization,
-  data: UI_I_ConnectionSettings,
-  wizard: Wizard,
-  value: UI_I_WizardStep[]
-): UI_I_ValidationReturn => {
-  let stepHasError = false
-
-  if (checkVlanId(data.vlanId)) {
-    stepHasError = wizard.setValidation(
-      1,
-      UI_E_MigrationValidationFields.CONNECTION_SETTINGS_VLAN,
-      {
-        fieldMessage: localization.common.vlanIdInvalidMessage,
-        alertMessage: localization.common.vlanIdInvalidMessage,
-      }
-    )
-  } else if (
-    wizard.hasMessage(
-      1,
-      UI_E_MigrationValidationFields.CONNECTION_SETTINGS_VLAN
-    )
-  ) {
-    value = wizard.removeValidation(
-      1,
-      UI_E_MigrationValidationFields.CONNECTION_SETTINGS_VLAN,
-      value
-    )
-  }
-
-  return {
-    newValue: value,
-    stepHasError,
-  }
-}
-
-const checkNetwork = async (
-  label: string,
-  localization: UI_I_Localization,
-  emits: UI_I_MigrateVmkernelAdapterEmits
-): Promise<UI_I_AsyncCheckReturn> => {
-  if (label) {
-    return new Promise((resolve, _reject) =>
-      emits('check-network-label', label, (message: string) => {
-        if (message === '') {
-          resolve({
-            isValid: true,
-            message: '',
-          })
-        }
-
-        if (message !== '') {
-          resolve({
-            isValid: false,
-            message,
-          })
-        }
-      })
-    )
-  } else {
-    return {
-      isValid: false,
-      message: localization.common.networkLabelInvalidMessage,
-    }
-  }
-}
-
-export const checkNetworkAsync = async (
-  value: UI_I_WizardStep[],
-  label: string,
-  stepId: number,
-  fieldName: string,
-  emits: UI_I_MigrateVmkernelAdapterEmits,
-  localization: UI_I_Localization,
-  wizard: Wizard
-): Promise<UI_I_ValidationReturn> => {
-  let stepHasError = false
-
-  const labelValidation: {
-    isValid: boolean
-    message: string
-  } = await checkNetwork(label, localization, emits)
-
-  if (!labelValidation.isValid) {
-    stepHasError = wizard.setValidation(stepId, fieldName, {
-      fieldMessage: labelValidation.message,
-      alertMessage: labelValidation.message,
-    })
-  } else if (wizard.hasMessage(stepId, fieldName)) {
-    value = wizard.removeValidation(stepId, fieldName, value)
-  }
-
-  return {
-    newValue: value,
-    stepHasError,
-  }
-}
+import type { UI_I_ConnectionSettings } from '~/components/common/wizards/network/add/lib/models/interfaces'
+import type { UI_I_MigrateVmkernelAdapterEmits } from '~/components/common/diagramMain/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type {
+  UI_I_AsyncCheckReturn,
+  UI_I_ValidationReturn,
+  UI_I_WizardStep,
+} from '~/components/atoms/wizard/lib/models/interfaces'
+import { UI_E_MigrationValidationFields } from '~/components/common/diagramMain/lib/models/enums'
+import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
+import { checkVlanId } from '~/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/common'
+
+export const validateVlanIdConnectionSettingsLocal = (
+  localization: UI_I_Localization,
+  data: UI_I_ConnectionSettings,
+  wizard: Wizard
+): void => {
+  wizard.validateFieldLocal(
+    1,
+    UI_E_MigrationValidationFields.CONNECTION_SETTINGS_VLAN,
+    checkVlanId(data.vlanId),
+    localization.common.vlanIdInvalidMessage,
+    localization.common.vlanIdInvalidMessage
+  )
+}
+
+export const validateNetworkConnectionSettingsLocal = (
+  localization: UI_I_Localization,
+  data: UI_I_ConnectionSettings,
+  wizard: Wizard
+): void => {
+  wizard.validateFieldLocal(
+    1,
+    UI_E_MigrationValidationFields.CONNECTION_SETTINGS_NETWORK,
+    data.networkLabel === '',
+    localization.common.networkLabelInvalidMessage,
+    localization.common.networkLabelInvalidMessage
+  )
+}
+
+export const checkConnectionSettingsSync = (
+  localization: UI_I_Localization,
+  data: UI_I_ConnectionSettings,
+  wizard: Wizard,
+  value: UI_I_WizardStep[]
+): UI_I_ValidationReturn => {
+  let stepHasError = false
+
+  if (checkVlanId(data.vlanId)) {
+    stepHasError = wizard.setValidation(
+      1,
+      UI_E_MigrationValidationFields.CONNECTION_SETTINGS_VLAN,
+      {
+        fieldMessage: localization.common.vlanIdInvalidMessage,
+        alertMessage: localization.common.vlanIdInvalidMessage,
+      }
+    )
+  } else if (
+    wizard.hasMessage(
+      1,
+      UI_E_MigrationValidationFields.CONNECTION_SETTINGS_VLAN
+    )
+  ) {
+    value = wizard.removeValidation(
+      1,
+      UI_E_MigrationValidationFields.CONNECTION_SETTINGS_VLAN,
+      value
+    )
+  }
+
+  return {
+    newValue: value,
+    stepHasError,
+  }
+}
+
+const checkNetwork = async (
+  label: string,
+  localization: UI_I_Localization,
+  emits: UI_I_MigrateVmkernelAdapterEmits
+): Promise<UI_I_AsyncCheckReturn> => {
+  if (label) {
+    return new Promise((resolve, _reject) =>
+      emits('check-network-label', label, (message: string) => {
+        if (message === '') {
+          resolve({
+            isValid: true,
+            message: '',
+          })
+        }
+
+        if (message !== '') {
+          resolve({
+            isValid: false,
+            message,
+          })
+        }
+      })
+    )
+  } else {
+    return {
+      isValid: false,
+      message: localization.common.networkLabelInvalidMessage,
+    }
+  }
+}
+
+export const checkNetworkAsync = async (
+  value: UI_I_WizardStep[],
+  label: string,
+  stepId: number,
+  fieldName: string,
+  emits: UI_I_MigrateVmkernelAdapterEmits,
+  localization: UI_I_Localization,
+  wizard: Wizard
+): Promise<UI_I_ValidationReturn> => {
+  let stepHasError = false
+
+  const labelValidation: {
+    isValid: boolean
+    message: string
+  } = await checkNetwork(label, localization, emits)
+
+  if (!labelValidation.isValid) {
+    stepHasError = wizard.setValidation(stepId, fieldName, {
+      fieldMessage: labelValidation.message,
+      alertMessage: labelValidation.message,
+    })
+  } else if (wizard.hasMessage(stepId, fieldName)) {
+    value = wizard.removeValidation(stepId, fieldName, value)
+  }
+
+  return {
+    newValue: value,
+    stepHasError,
+  }
+}

package/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/selectVmkernelAdapter.ts

@@ -1,52 +1,52 @@
-import type { UI_I_SelectVmkernelAdapter } from '~/components/common/wizards/network/add/lib/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_WizardStep, UI_I_ValidationReturn } from '~/components/atoms/wizard/lib/models/interfaces'
-import { UI_E_MigrationValidationFields } from '~/components/common/diagramMain/lib/models/enums'
-import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
-
-export const validateSelectedVmLocal = (
-  localization: UI_I_Localization,
-  data: UI_I_SelectVmkernelAdapter,
-  wizard: Wizard
-): void => {
-  wizard.validateFieldLocal(
-    0,
-    'vm',
-    data.vm === '',
-    '',
-    localization.common.noVmKernelNetworkAdapterSelectedForMigration
-  )
-}
-
-export const checkSelectedVmSync = (
-  localization: UI_I_Localization,
-  data: UI_I_SelectVmkernelAdapter,
-  wizard: Wizard,
-  value: UI_I_WizardStep[]
-): UI_I_ValidationReturn => {
-  let stepHasError = false
-
-  if (data.vm === '') {
-    stepHasError = wizard.setValidation(
-      0,
-      UI_E_MigrationValidationFields.SELECT_ADAPTER_VM,
-      {
-        fieldMessage: '',
-        alertMessage: localization.common.noVmKernelNetworkAdapterSelectedForMigration,
-      }
-    )
-  } else if (
-    wizard.hasMessage(0, UI_E_MigrationValidationFields.SELECT_ADAPTER_VM)
-  ) {
-    value = wizard.removeValidation(
-      0,
-      UI_E_MigrationValidationFields.SELECT_ADAPTER_VM,
-      value
-    )
-  }
-
-  return {
-    newValue: value,
-    stepHasError,
-  }
-}
+import type { UI_I_SelectVmkernelAdapter } from '~/components/common/wizards/network/add/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_WizardStep, UI_I_ValidationReturn } from '~/components/atoms/wizard/lib/models/interfaces'
+import { UI_E_MigrationValidationFields } from '~/components/common/diagramMain/lib/models/enums'
+import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
+
+export const validateSelectedVmLocal = (
+  localization: UI_I_Localization,
+  data: UI_I_SelectVmkernelAdapter,
+  wizard: Wizard
+): void => {
+  wizard.validateFieldLocal(
+    0,
+    'vm',
+    data.vm === '',
+    '',
+    localization.common.noVmKernelNetworkAdapterSelectedForMigration
+  )
+}
+
+export const checkSelectedVmSync = (
+  localization: UI_I_Localization,
+  data: UI_I_SelectVmkernelAdapter,
+  wizard: Wizard,
+  value: UI_I_WizardStep[]
+): UI_I_ValidationReturn => {
+  let stepHasError = false
+
+  if (data.vm === '') {
+    stepHasError = wizard.setValidation(
+      0,
+      UI_E_MigrationValidationFields.SELECT_ADAPTER_VM,
+      {
+        fieldMessage: '',
+        alertMessage: localization.common.noVmKernelNetworkAdapterSelectedForMigration,
+      }
+    )
+  } else if (
+    wizard.hasMessage(0, UI_E_MigrationValidationFields.SELECT_ADAPTER_VM)
+  ) {
+    value = wizard.removeValidation(
+      0,
+      UI_E_MigrationValidationFields.SELECT_ADAPTER_VM,
+      value
+    )
+  }
+
+  return {
+    newValue: value,
+    stepHasError,
+  }
+}

package/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/validations.ts

@@ -1,19 +1,19 @@
-import {
-  validateVlanIdConnectionSettingsLocal,
-  validateNetworkConnectionSettingsLocal,
-  checkConnectionSettingsSync,
-  checkNetworkAsync,
-} from '~/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/connectionSettings'
-import {
-  checkSelectedVmSync,
-  validateSelectedVmLocal,
-} from '~/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/selectVmkernelAdapter'
-
-export {
-  validateVlanIdConnectionSettingsLocal,
-  validateNetworkConnectionSettingsLocal,
-  checkConnectionSettingsSync,
-  checkNetworkAsync,
-  checkSelectedVmSync,
-  validateSelectedVmLocal,
-}
+import {
+  validateVlanIdConnectionSettingsLocal,
+  validateNetworkConnectionSettingsLocal,
+  checkConnectionSettingsSync,
+  checkNetworkAsync,
+} from '~/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/connectionSettings'
+import {
+  checkSelectedVmSync,
+  validateSelectedVmLocal,
+} from '~/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/selectVmkernelAdapter'
+
+export {
+  validateVlanIdConnectionSettingsLocal,
+  validateNetworkConnectionSettingsLocal,
+  checkConnectionSettingsSync,
+  checkNetworkAsync,
+  checkSelectedVmSync,
+  validateSelectedVmLocal,
+}

package/components/common/diagramMain/port/Ports.vue

@@ -1,47 +1,47 @@
-<template>
-  <g>
-    <template v-if="props.network.toggle">
-      <template v-for="port in props.network.ports" :key="port.id">
-        <common-diagram-main-port
-          :network="props.network"
-          :port="port"
-          :is-dark-mode="props.isDarkMode"
-          :selected-port="props.selectedPort"
-          :selected-adapter="props.selectedAdapter"
-          @select-port="onSelectPort"
-          @show-modal="onShowModal"
-        />
-      </template>
-    </template>
-  </g>
-</template>
-
-<script setup lang="ts">
-import type {
-  UI_I_ModalsInitialData,
-  UI_I_NetworkFullWithPositions,
-  UI_I_SelectedAdapter,
-  UI_I_SelectedPort,
-} from '~/components/common/diagramMain/lib/models/interfaces'
-
-const props = defineProps<{
-  network: UI_I_NetworkFullWithPositions
-  selectedPort: UI_I_SelectedPort
-  selectedAdapter: UI_I_SelectedAdapter
-  isDarkMode: boolean
-}>()
-
-const emits = defineEmits<{
-  (event: 'select-port', networkId: string, portId: string): void
-  (
-    event: 'show-modal',
-    value: string,
-    properties?: UI_I_ModalsInitialData
-  ): void
-}>()
-
-const onSelectPort = (networkId: string, portId: string) =>
-  emits('select-port', networkId, portId)
-const onShowModal = (value: string, properties?: UI_I_ModalsInitialData) =>
-  emits('show-modal', value, properties)
-</script>
+<template>
+  <g>
+    <template v-if="props.network.toggle">
+      <template v-for="port in props.network.ports" :key="port.id">
+        <common-diagram-main-port
+          :network="props.network"
+          :port="port"
+          :is-dark-mode="props.isDarkMode"
+          :selected-port="props.selectedPort"
+          :selected-adapter="props.selectedAdapter"
+          @select-port="onSelectPort"
+          @show-modal="onShowModal"
+        />
+      </template>
+    </template>
+  </g>
+</template>
+
+<script setup lang="ts">
+import type {
+  UI_I_ModalsInitialData,
+  UI_I_NetworkFullWithPositions,
+  UI_I_SelectedAdapter,
+  UI_I_SelectedPort,
+} from '~/components/common/diagramMain/lib/models/interfaces'
+
+const props = defineProps<{
+  network: UI_I_NetworkFullWithPositions
+  selectedPort: UI_I_SelectedPort
+  selectedAdapter: UI_I_SelectedAdapter
+  isDarkMode: boolean
+}>()
+
+const emits = defineEmits<{
+  (event: 'select-port', networkId: string, portId: string): void
+  (
+    event: 'show-modal',
+    value: string,
+    properties?: UI_I_ModalsInitialData
+  ): void
+}>()
+
+const onSelectPort = (networkId: string, portId: string) =>
+  emits('select-port', networkId, portId)
+const onShowModal = (value: string, properties?: UI_I_ModalsInitialData) =>
+  emits('show-modal', value, properties)
+</script>

package/components/common/vm/actions/common/customizeHardware/virtualHardware/VirtualHardware.vue

@@ -466,8 +466,8 @@ const onRollBackCdDvdDrive = (index: number): void => {
 const defaultPciDevice: UI_I_SendDataNewPciDevice = {
   address: '',
   vendor_name: '',
-  class_name: 'cdrom',
-  device_name: 'cdrom',
+  class_name: '',
+  device_name: '',
 }
 const pciDevicesIndex = ref<number[]>([0])
 const pciDevicesType = ref<('new' | 'edit' | 'removed')[]>(['new'])

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

@@ -82,11 +82,14 @@ const label = computed<string>(() => {
 })
 
 const selectedLabel = computed<string>(() => {
+  if (props.pciDevice.address) {
+    return `${props.pciDevice.address} | ${props.pciDevice.device_name}`
+  }
   switch (selectedType.value.value) {
     case 'direct_path_io':
-      return `${directPathIo.value.address} | ${directPathIo.value.device_name}`
+      return `${directPathIo.value?.address} | ${directPathIo.value?.device_name}`
     case 'dynamic_direct_path_io':
-      return dynamicDirectPathIo.value
+      return `${dynamicDirectPathIo.value?.address} | ${dynamicDirectPathIo.value?.device_name}`
     default:
       return nvidiaGridProfile.value?.text
   }
@@ -103,9 +106,8 @@ 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<any>(props.mediatedDevices[0]?.value)
+const directPathIo = ref<string>('') /// TODO 
+const dynamicDirectPathIo = ref<UI_I_PciDevice>(props.passthroughDevices[0])
 const nvidiaGridProfile = ref<UI_I_Option | null>(null)
 
 watch(
@@ -116,7 +118,18 @@ watch(
     // )
     // passthroughDevice && (directPathIo.value = passthroughDevice) // Todo change
     if (newValue1) {
-      directPathIo.value = newValue1
+      // directPathIo.value = newValue1
+      const passthroughDevice = props.passthroughDevices.find((device) => {
+        return (
+          device.class_name + '_' + device.address ===
+          newValue1.class_name + '_' + newValue1.address
+        )
+      })
+      if (passthroughDevice) {
+        dynamicDirectPathIo.value = passthroughDevice
+      }
+
+
       const mediatedDevice = props.mediatedDevices.find((device) => {
         return (
           device.profile_name + '_' + device.root_device ===
@@ -146,14 +159,6 @@ const sendData = computed<UI_I_SendDataNewPciDevice>(() => {
   )
   switch (selectedType.value.value) {
     case 'direct_path_io':
-      return {
-        address: directPathIo.value.address,
-        vendor_name: directPathIo.value.vendor_name,
-        class_name: directPathIo.value.class_name,
-        device_name: directPathIo.value.device_name,
-        mediated_device: false,
-      }
-    case 'dynamic_direct_path_io':
       return {
         address: '',
         vendor_name: '',
@@ -161,6 +166,14 @@ const sendData = computed<UI_I_SendDataNewPciDevice>(() => {
         device_name: '',
         mediated_device: false,
       }
+    case 'dynamic_direct_path_io':
+      return {
+        address: dynamicDirectPathIo.value?.address || '',
+        vendor_name: dynamicDirectPathIo.value?.vendor_name || '',
+        class_name: dynamicDirectPathIo.value?.class_name || '',
+        device_name: dynamicDirectPathIo.value?.device_name || '',
+        mediated_device: false,
+      }
     case 'nvidia_grid':
       return {
         address: nvidia?.root_device || '',

package/package.json

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