bfg-common 1.3.179 → 1.3.181

package/components/common/diagramMain/lib/models/interfaces.ts

@@ -508,14 +508,14 @@ interface API_UI_I_ListIndex {
 
 export interface API_UI_I_SwitchItem {
   id: string
-  state: API_UI_I_State
+  state?: API_UI_I_State
   index?: API_UI_I_ListIndex
   mtu: number
   security: API_UI_I_Security
   shaping: API_UI_I_Shaping
   teaming: API_UI_I_Teaming
   nics: UI_I_AdapterStatus
-  networks?: string[]
+  networks: string[]
 
   num_ports?: string // TODO MAMMA MIA, WHERE IS IIIIIT?
 }

package/components/common/diagramMain/lib/utils/utils.ts

@@ -3,12 +3,14 @@ import {
   UI_I_SelectedPort,
   UI_I_NetworksWithPositions,
   UI_I_AdaptersWithPositions,
-  UI_I_SwitchLine,
   UI_I_SelectedSwitchPositions,
   UI_I_DiagramDataFull,
   UI_I_AdaptersHeight,
   UI_I_Adapter,
   UI_I_AdaptersPositions,
+  UI_I_AdapterStatus,
+  UI_I_NetworkFull,
+  API_UI_I_SwitchItem,
 } from '~/components/common/diagramMain/lib/models/interfaces'
 import {
   UI_E_NetworkType,
@@ -216,3 +218,33 @@ export const getAdaptersPositions = (
     adapters,
   }
 }
+
+export const makeSwitchSendData = (
+  data: UI_I_DiagramDataFull,
+  adapterStatus: UI_I_AdapterStatus
+): API_UI_I_SwitchItem => {
+  return {
+    id: data.id,
+    mtu: data.networking.mtu,
+    networks: data.networks.map((network: UI_I_NetworkFull) => network.title),
+    nics: adapterStatus,
+    security: {
+      promiscuous: data.networking.securityPolicy[0].value,
+      forged_transmits: data.networking.securityPolicy[1].value,
+      mac_change: data.networking.securityPolicy[2].value,
+    },
+    teaming: {
+      notify_switches: data.networking.nicTeamingPolicy[0].value,
+      mode: data.networking.nicTeamingPolicy[1].value,
+      link_detection_mode: data.networking.nicTeamingPolicy[2].value,
+      failback: data.networking.nicTeamingPolicy[3].value,
+    },
+    shaping: {
+      inherit: false,
+      enabled: !!data.networking.shapingPolicy[0].value,
+      average_bw: data.networking.average_bw,
+      peak_bw: data.networking.peak_bw,
+      burst_size: data.networking.burst_size,
+    },
+  }
+}

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

@@ -223,7 +223,7 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 const { $binary } = useNuxtApp()
 
 const dropdownItems = computed<UI_I_DropdownTreeItem[]>(() =>
-  dropdownItemsFunc(localization.value, props.state)
+  dropdownItemsFunc(localization.value, props.state, props.passthroughDevices)
 )
 
 const hardDisksIndex = ref<number[]>([0])
@@ -277,12 +277,18 @@ const addHardDisk = (
     source,
     attach: true,
     boot_order: 0, // Убираем галочку
-    provision_type: provisionType
+    provision_type: provisionType,
   })
   sendData()
 }
 const onAddExistHardDisk = (file: UI_I_FileTreeNode): void => {
-  addHardDisk(false, $binary.bToGb(file.size), file.path, 'exist', file.provisioned_type)
+  addHardDisk(
+    false,
+    $binary.bToGb(file.size),
+    file.path,
+    'exist',
+    file.provisioned_type
+  )
 }
 const onRemoveHardDisk = (
   index: number,

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

@@ -1,53 +1,59 @@
-import { UI_I_Localization } from '~/lib/models/interfaces'
-import { UI_I_DropdownTreeItem } from '~/components/atoms/dropdown/tree/lib/models/interfaces'
-
-export const dropdownItemsFunc = (
-  localization: UI_I_Localization,
-  state: string | number | undefined
-): UI_I_DropdownTreeItem[] => {
-  const { $text } = useNuxtApp()
-
-  return [
-    {
-      text: localization.disksDrivesStorage,
-      children: [
-        { text: $text.toCapitalizeEveryWord(localization.hardDisk), value: 1 },
-        {
-          text: $text.toCapitalizeEveryWord(localization.existingHardDisk),
-          value: 2,
-        },
-        // { text: 'RDM Disk', value: 2 },
-        // { text: 'Host USB Device', value: 3 },
-        // { text: 'NVDIMM', value: 4 },
-        { text: localization.cdDvdDrive, value: 5 },
-      ],
-    },
-    // {
-    //   text: 'Controllers',
-    //   children: [
-    //     { text: 'NVMe Controller', value: 6 },
-    //     { text: 'SATA Controller', value: 7 },
-    //     { text: 'SCSI Controller', value: 8 },
-    //     { text: 'USB Controller', value: 9 },
-    //   ],
-    // },
-    {
-      text: 'Other Devices',
-      children: [
-        { text: 'PCI Device', value: 10, disabled: state === 2 },
-        // { text: 'Watchdog Timer', value: 11 },
-        // { text: 'Precision Clock', value: 12 },
-        // { text: 'Serial Port', value: 13 },
-      ],
-    },
-    {
-      text: localization.network,
-      children: [
-        {
-          text: $text.toCapitalizeEveryWord(localization.networkAdapter),
-          value: 14,
-        },
-      ],
-    },
-  ]
-}
+import { UI_I_Localization } from '~/lib/models/interfaces'
+import { UI_I_DropdownTreeItem } from '~/components/atoms/dropdown/tree/lib/models/interfaces'
+import { UI_I_PciDevice } from '~/lib/models/store/vm/interfaces'
+
+export const dropdownItemsFunc = (
+  localization: UI_I_Localization,
+  state: string | number | undefined,
+  passthroughDevices?: UI_I_PciDevice[]
+): UI_I_DropdownTreeItem[] => {
+  const { $text } = useNuxtApp()
+
+  return [
+    {
+      text: localization.disksDrivesStorage,
+      children: [
+        { text: $text.toCapitalizeEveryWord(localization.hardDisk), value: 1 },
+        {
+          text: $text.toCapitalizeEveryWord(localization.existingHardDisk),
+          value: 2,
+        },
+        // { text: 'RDM Disk', value: 2 },
+        // { text: 'Host USB Device', value: 3 },
+        // { text: 'NVDIMM', value: 4 },
+        { text: localization.cdDvdDrive, value: 5 },
+      ],
+    },
+    // {
+    //   text: 'Controllers',
+    //   children: [
+    //     { text: 'NVMe Controller', value: 6 },
+    //     { text: 'SATA Controller', value: 7 },
+    //     { text: 'SCSI Controller', value: 8 },
+    //     { text: 'USB Controller', value: 9 },
+    //   ],
+    // },
+    {
+      text: 'Other Devices',
+      children: [
+        {
+          text: 'PCI Device',
+          value: 10,
+          disabled: state === 2 || !passthroughDevices?.length,
+        },
+        // { text: 'Watchdog Timer', value: 11 },
+        // { text: 'Precision Clock', value: 12 },
+        // { text: 'Serial Port', value: 13 },
+      ],
+    },
+    {
+      text: localization.network,
+      children: [
+        {
+          text: $text.toCapitalizeEveryWord(localization.networkAdapter),
+          value: 14,
+        },
+      ],
+    },
+  ]
+}

package/package.json

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