bfg-common 1.3.204 → 1.3.206

package/components/common/adapterManager/AdapterManager.vue

@@ -144,14 +144,16 @@ import {
   adapterViewSettingsFunc,
 } from '~/components/common/diagramMain/modals/lib/config'
 import { allAdaptersFunc } from '~/components/common/adapterManager/lib/config'
-import { UI_I_Localization } from '~/lib/models/interfaces'
+import {
+  UI_I_Localization,
+  UI_I_ItemsWithTotalCounts,
+} from '~/lib/models/interfaces'
 import { UI_T_AdapterStatusNames } from '~/components/common/diagramMain/lib/models/types'
 import {
   UI_I_Adapter,
   UI_I_AdapterStatus,
   UI_I_ModalsInitialData,
   UI_I_SwitchAdapterItem,
-  UI_I_SwitchAdapters,
 } from '~/components/common/diagramMain/lib/models/interfaces'
 
 const props = withDefaults(
@@ -160,7 +162,7 @@ const props = withDefaults(
     fullMode?: boolean
     isAddModal?: boolean
     isDarkMode: boolean
-    adapters: UI_I_SwitchAdapters
+    adapters: UI_I_ItemsWithTotalCounts<UI_I_SwitchAdapterItem>
     initialData?: UI_I_ModalsInitialData
     addedAdapters?: string[]
     coreAdapters?: string[]
@@ -188,8 +190,8 @@ const props = withDefaults(
     addedAdapters: () => [],
     coreAdapters: () => [],
     adapters: () => ({
-      totalItems: 0,
-      totalPages: 0,
+      total_items: 0,
+      total_pages: 0,
       items: [],
     }),
     isShowNoConnectedActiveAdaptersModal: false,

package/components/common/adapterManager/AddAdapterModal.vue

@@ -34,11 +34,10 @@
 </template>
 
 <script setup lang="ts">
-import { UI_I_Localization } from '~/lib/models/interfaces'
+import { UI_I_Localization, UI_I_ItemsWithTotalCounts } from '~/lib/models/interfaces'
 import {
   UI_I_Adapter,
-  UI_I_SwitchAdapterItem,
-  UI_I_SwitchAdapters,
+  UI_I_SwitchAdapterItem
 } from '~/components/common/diagramMain/lib/models/interfaces'
 
 // Props from up
@@ -51,15 +50,15 @@ const props = withDefaults(
     height: string
     modalName: string
     viewName: string
-    adapters: UI_I_SwitchAdapters
+    adapters: UI_I_ItemsWithTotalCounts<UI_I_SwitchAdapterItem>
     existingAdaptersForAdding: (UI_I_Adapter | UI_I_SwitchAdapterItem)[]
     selectedAddAdapterId: string
   }>(),
   {
     existingAdaptersForAdding: () => [],
     adapters: () => ({
-      totalItems: 0,
-      totalPages: 0,
+      total_items: 0,
+      total_pages: 0,
       items: [],
     }),
   }

package/components/common/diagramMain/DiagramMain.vue

@@ -205,6 +205,7 @@
         :selected-switch-id="selectedSwitchId"
         :tcp-stacks="props.tcpStacks"
         :tcp-stack-loading="props.tcpStackLoading"
+        :diagrams-data="props.diagramsData"
         @check-network-label="onCheckNetworkLabel"
         @get-existing-standard-switches="onGetExistingStandardSwitches"
         @get-tcp-stacks="onGetTcpStacks"
@@ -245,11 +246,12 @@ import {
   UI_I_ToggleDiagramPortsPayload,
   UI_I_PortToggleFlag,
   UI_I_DiagramData,
-  UI_I_SwitchAdapters,
+  UI_I_SwitchAdapterItem,
 } from '~/components/common/diagramMain/lib/models/interfaces'
 import {
   UI_I_ArbitraryObject,
   UI_I_Localization,
+  UI_I_ItemsWithTotalCounts,
 } from '~/lib/models/interfaces'
 import {
   UI_I_AddNetworkingSecondOrThirdSchemeDataSend,
@@ -294,12 +296,13 @@ const props = withDefaults(
     inPortlet?: boolean
     standardSwitchesInitial?: UI_I_Switch[]
     hostName?: string
-    adapters?: UI_I_SwitchAdapters
+    adapters?: UI_I_ItemsWithTotalCounts<UI_I_SwitchAdapterItem>
     freeAdapters?: UI_I_Adapter[]
     networksList?: UI_I_Network[]
     isDarkMode: boolean
     tcpStacks?: UI_I_TCPStack[]
     tcpStackLoading?: boolean
+    diagramsData?: UI_I_DiagramData[]
   }>(),
   {
     diagramData: null,
@@ -307,14 +310,15 @@ const props = withDefaults(
     standardSwitchesInitial: () => [],
     hostName: '',
     adapters: () => ({
-      totalItems: 0,
-      totalPages: 0,
+      total_items: 0,
+      total_pages: 0,
       items: [],
     }),
     freeAdapters: () => [],
     networksList: () => [],
     tcpStacks: () => [],
     tcpStackLoading: false,
+    diagramsData: [],
   }
 )
 

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

@@ -1,3 +1,5 @@
+import type { UI_I_State, UI_I_ListIndex } from '~/lib/models/interfaces'
+import { UI_E_Kind } from '~/lib/models/enums'
 import { UI_E_NetworkType } from './enums'
 import { UI_T_Adapters } from '~/components/common/diagramMain/lib/models/types'
 import {
@@ -15,19 +17,23 @@ export interface UI_I_Port {
 }
 
 export interface UI_I_Adapter {
-  id: string
   name: string
+  id: string
   fullName: string
+  state: UI_I_State
   adapter: string
   pciAddress: string
   driver: string
-  carrier: boolean
-  speed: number
+  carrier?: boolean
+  speed?: number
   duplex: string
-  networks: null
-  srIov: boolean
-  cdp: boolean
-  lldp: boolean
+  networks: string[]
+  srIov?: boolean
+  cdp?: boolean
+  lldp?: boolean
+  managed?: boolean
+  switch?: string
+  mac: string
   status: string
 }
 
@@ -97,7 +103,6 @@ export interface UI_I_NetworkSummaryPortletListItem<
   initialValue: UI_I_OverrideValue<T>
 }
 
-
 export interface UI_I_NetworkInfo {
   average_bw: number
   burst_size: number
@@ -291,6 +296,7 @@ export interface UI_I_AdapterStatus {
   standby?: string[]
   unused?: string[]
   connected?: string[]
+  inherit?: boolean
 }
 
 export interface UI_I_SwitchPropertiesFields {
@@ -379,41 +385,42 @@ export interface UI_I_ModalsInitialData<T = string | number | boolean> {
 
 export interface UI_I_SwitchAdapterItem {
   name: string
+  id: string
+  fullName: string
+  state: UI_I_State
   adapter: string
   pciAddress: string
   driver: string
-  carrier: boolean
-  speed: number
+  carrier?: boolean
+  speed?: number
   duplex: string
-  networks: null
-  srIov: boolean
-  cdp: boolean
-  lldp: boolean
+  networks: string[]
+  srIov?: boolean
+  cdp?: boolean
+  lldp?: boolean
+  managed?: boolean
+  switch?: string
+  mac: string
 }
+
 export interface API_UI_I_SwitchAdapterItem {
-  name: string
+  id: string
+  state: UI_I_State
+  index?: UI_I_ListIndex
   adapter: string
   pci_addr: string
   driver: string
-  carrier: boolean
-  speed: number
+  carrier?: boolean
+  speed?: number
   duplex: string
-  networks: null
-  sr_iov: boolean
-  cdp: boolean
-  lldp: boolean
-}
-
-export interface UI_I_SwitchAdapters {
-  totalItems: number
-  totalPages: number
-  items: UI_I_SwitchAdapterItem[]
-}
-
-export interface API_UI_I_SwitchAdapters {
-  total_items: number
-  total_pages: number
-  items: API_UI_I_SwitchAdapterItem[]
+  networks?: string[]
+  sr_iov?: boolean
+  cdp?: boolean
+  lldp?: boolean
+  managed?: boolean
+  name: string
+  switch?: string
+  mac: string
 }
 
 export interface UI_I_TeamingAndFailoverTemplate {
@@ -466,6 +473,10 @@ export interface API_UI_I_Security {
   forged_transmits: UI_E_IYNOption
   mac_change: UI_E_IYNOption
   promiscuous: UI_E_IYNOption
+  // TODO Question about those
+  promiscuous_computed?: UI_E_IYNOption
+  mac_change_computed?: UI_E_IYNOption
+  forged_transmits_computed?: UI_E_IYNOption
 }
 export interface API_UI_I_Shaping {
   enabled?: boolean
@@ -490,6 +501,11 @@ export interface API_UI_I_Teaming {
   link_detection_mode: UI_E_ICBLinkDetectionMode
   notify_switches: UI_E_IYNOption
   failback: UI_E_IYNOption
+  // TODO Question about those
+  mode_computed?: UI_E_IBSTLoadBalancingMode
+  link_detection_mode_computed?: UI_E_ICBLinkDetectionMode
+  notify_switches_computed?: UI_E_IYNOption
+  failback_computed?: UI_E_IYNOption
 }
 
 interface API_UI_I_ListIndex {
@@ -576,3 +592,38 @@ export interface UI_I_PortToggleFlag {
   value: boolean
   id: string
 }
+
+// TODO today start
+export interface API_UI_I_NetworkPortInfo {
+  id: string
+  name: string
+  mac: string
+  adapter: string
+}
+
+export interface API_UI_I_NetworkVMList {
+  id: string
+  name: string
+  ports: API_UI_I_NetworkPortInfo[]
+  is_active: boolean
+}
+
+export interface API_UI_I_Network {
+  id: string
+  name: string
+  state: UI_I_State
+  index: UI_I_ListIndex
+  vlan: number
+  net_bridge: string
+  kind: UI_E_Kind
+  switch: string // vswitch_name
+  vms_count: number // vms_amount
+  active_ports: number
+  nics_overrided: boolean
+  vm_list?: API_UI_I_NetworkVMList[]
+  sysx?: UI_I_Sysx
+  security: API_UI_I_Security
+  shaping: API_UI_I_Shaping
+  teaming: API_UI_I_Teaming
+  nics: UI_I_AdapterStatus
+}

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

@@ -18,16 +18,16 @@ import {
 import { UI_T_Adapters } from '~/components/common/diagramMain/lib/models/types'
 
 export const hasPortAndNetwork = (
-  selectedPort: UI_I_SelectedPort,
-  id: string
+    selectedPort: UI_I_SelectedPort,
+    id: string
 ): boolean =>
-  selectedPort.portId !== '-1' &&
-  selectedPort.networkId !== '-1' &&
-  selectedPort.networkId === id
+    selectedPort.portId !== '-1' &&
+    selectedPort.networkId !== '-1' &&
+    selectedPort.networkId === id
 
 export const networksPositions = (
-  arr: number[],
-  net: UI_I_NetworksWithPositions
+    arr: number[],
+    net: UI_I_NetworksWithPositions
 ): number[] => {
   if (net.ports.length === 0) return [...arr, net.connectLineY]
   if (!net.toggle) return [...arr, net.portsPosition + 7.5]
@@ -36,44 +36,44 @@ export const networksPositions = (
     ...arr,
     net.portsPosition + 22 + 7.5,
     net.networkType === UI_E_NetworkType.VCenter
-      ? net.portsPosition + 22 + 12.5 + 32 * (net.portsCount - 1)
-      : net.portsPosition + 22 + 7.5 + 22 * (net.portsCount - 1),
+        ? net.portsPosition + 22 + 12.5 + 32 * (net.portsCount - 1)
+        : net.portsPosition + 22 + 7.5 + 22 * (net.portsCount - 1),
   ]
 }
 
 export const getSelectedPortLinePositions = (
-  selectedPortPosition: number | undefined,
-  selectedNetworkData: UI_I_Network
+    selectedPortPosition: number | undefined,
+    selectedNetworkData: UI_I_Network
 ) =>
-  selectedPortPosition
-    ? selectedNetworkData.networkType === UI_E_NetworkType.VCenter
-      ? selectedPortPosition + 12.5
-      : selectedPortPosition + 7.5
-    : 0
+    selectedPortPosition
+        ? selectedNetworkData.networkType === UI_E_NetworkType.VCenter
+            ? selectedPortPosition + 12.5
+            : selectedPortPosition + 7.5
+        : 0
 
 const selectedNetworkDataFunc = (
-  networkId: string,
-  networksWithPositions: UI_I_NetworksWithPositions[]
+    networkId: string,
+    networksWithPositions: UI_I_NetworksWithPositions[]
 ): UI_I_NetworksWithPositions | undefined =>
-  networksWithPositions?.find(
-    (network: UI_I_Network): boolean => network.id === networkId
-  )
+    networksWithPositions?.find(
+        (network: UI_I_Network): boolean => network.id === networkId
+    )
 
 export const getSelectNetworkDataFunc = (
-  networkId: string,
-  networksWithPositions: UI_I_NetworksWithPositions[],
-  adaptersWithPositions: UI_I_AdaptersWithPositions
+    networkId: string,
+    networksWithPositions: UI_I_NetworksWithPositions[],
+    adaptersWithPositions: UI_I_AdaptersWithPositions
 ): UI_I_SelectedSwitchPositions | undefined => {
   const selectedNetworkData: UI_I_NetworksWithPositions | undefined =
-    selectedNetworkDataFunc(networkId, networksWithPositions)
+      selectedNetworkDataFunc(networkId, networksWithPositions)
 
   if (!selectedNetworkData) return
 
   const activeAdapters: string[] = selectedNetworkData.activeAdapters
   const adaptersPositions: number[] =
-    adaptersWithPositions.adapters
-      ?.filter((adapter: UI_T_Adapters) => activeAdapters?.includes(adapter.id))
-      ?.map((adapter: UI_T_Adapters) => adapter.adapterPosition + 7.5) || []
+      adaptersWithPositions.adapters
+          ?.filter((adapter: UI_T_Adapters) => activeAdapters?.includes(adapter.id))
+          ?.map((adapter: UI_T_Adapters) => adapter.adapterPosition + 7.5) || []
   let selectedPositions: number[] = []
 
   if (!adaptersWithPositions.toggle) {
@@ -82,11 +82,11 @@ export const getSelectNetworkDataFunc = (
       selectedNetworkData.connectLineY,
     ]
   } else if (
-    adaptersWithPositions.adapters === null ||
-    adaptersWithPositions.adapters?.length === 0
+      adaptersWithPositions.adapters === null ||
+      adaptersWithPositions.adapters?.length === 0
   ) {
     selectedPositions = [47.5, selectedNetworkData.connectLineY].sort(
-      (y1: number, y2: number) => y1 - y2
+        (y1: number, y2: number) => y1 - y2
     )
   } else {
     selectedPositions = [
@@ -109,28 +109,28 @@ export const getSelectNetworkDataFunc = (
 }
 
 export const getSelectPortDataFunc = (
-  networkId: string,
-  portId: string,
-  networksWithPositions: UI_I_NetworksWithPositions[],
-  adaptersWithPositions: UI_I_AdaptersWithPositions
+    networkId: string,
+    portId: string,
+    networksWithPositions: UI_I_NetworksWithPositions[],
+    adaptersWithPositions: UI_I_AdaptersWithPositions
 ): UI_I_SelectedSwitchPositions | undefined => {
   const selectedNetworkData: UI_I_NetworksWithPositions | undefined =
-    selectedNetworkDataFunc(networkId, networksWithPositions)
+      selectedNetworkDataFunc(networkId, networksWithPositions)
 
   if (!selectedNetworkData) return
 
   const activeAdapters: string[] = selectedNetworkData.activeAdapters
   const adaptersPositions: number[] =
-    adaptersWithPositions.adapters
-      ?.filter((adapter: UI_T_Adapters) => activeAdapters?.includes(adapter.id))
-      ?.map((adapter: UI_T_Adapters) => adapter.adapterPosition + 7.5) || []
+      adaptersWithPositions.adapters
+          ?.filter((adapter: UI_T_Adapters) => activeAdapters?.includes(adapter.id))
+          ?.map((adapter: UI_T_Adapters) => adapter.adapterPosition + 7.5) || []
   const selectedPortPosition: number | undefined =
-    selectedNetworkData.ports.find(
-      (el): boolean => el.id === portId
-    )?.portPosition
+      selectedNetworkData.ports.find(
+          (el): boolean => el.id === portId
+      )?.portPosition
   const selectedPortLinePosition: number = getSelectedPortLinePositions(
-    selectedPortPosition,
-    selectedNetworkData
+      selectedPortPosition,
+      selectedNetworkData
   )
   let selectedPositions: number[] = []
 
@@ -142,7 +142,7 @@ export const getSelectPortDataFunc = (
     ]
   } else {
     selectedPositions = [...adaptersPositions, selectedPortLinePosition].sort(
-      (y1: number, y2: number) => y1 - y2
+        (y1: number, y2: number) => y1 - y2
     )
   }
 
@@ -160,55 +160,55 @@ export const getSelectPortDataFunc = (
 }
 
 export const countAdaptersHeight = (
-  diagramData: UI_I_DiagramData | null
+    diagramData: UI_I_DiagramData | null
 ): UI_I_AdaptersHeight => {
   const toggle: boolean = !!diagramData?.physicalAdapters?.toggle
   const adaptersCount: number =
-    diagramData?.physicalAdapters?.adapters.length || 0
+      diagramData?.physicalAdapters?.adapters.length || 0
 
   return {
     height:
-      UI_E_PositionsY.ADAPTER_FROM_RECT_TOP +
-      (adaptersCount === 0
-        ? UI_E_PositionsY.SINGLE_ADAPTER_HEIGHT
-        : toggle
-        ? adaptersCount * UI_E_PositionsY.SINGLE_ADAPTER_HEIGHT
-        : 0) +
-      UI_E_PositionsY.SPACE_FROM_RECT_BOTTOM,
+        UI_E_PositionsY.ADAPTER_FROM_RECT_TOP +
+        (adaptersCount === 0
+            ? UI_E_PositionsY.SINGLE_ADAPTER_HEIGHT
+            : toggle
+                ? adaptersCount * UI_E_PositionsY.SINGLE_ADAPTER_HEIGHT
+                : 0) +
+        UI_E_PositionsY.SPACE_FROM_RECT_BOTTOM,
     toggle,
     adaptersCount,
   }
 }
 
 export const getAdaptersPositions = (
-  diagramData: UI_I_DiagramData | null,
-  height: number
+    diagramData: UI_I_DiagramData | null,
+    height: number
 ): UI_I_AdaptersPositions => {
   const titlePosition: number =
-    UI_E_PositionsY.DIAGRAM_TOP +
-    UI_E_PositionsY.BETWEEN_RECTS +
-    UI_E_PositionsY.TITLE_FROM_RECT_TOP
+      UI_E_PositionsY.DIAGRAM_TOP +
+      UI_E_PositionsY.BETWEEN_RECTS +
+      UI_E_PositionsY.TITLE_FROM_RECT_TOP
 
   const rectPosition: number =
-    UI_E_PositionsY.DIAGRAM_TOP + UI_E_PositionsY.BETWEEN_RECTS
+      UI_E_PositionsY.DIAGRAM_TOP + UI_E_PositionsY.BETWEEN_RECTS
 
   const adaptersConnectLineY: number = rectPosition + height / 2
 
   const adapters: UI_T_Adapters[] | null =
-    diagramData?.physicalAdapters?.adapters.map(
-      (adapter: UI_I_Adapter, index: number) => {
-        const adapterPosition: number =
-          UI_E_PositionsY.DIAGRAM_TOP +
-          UI_E_PositionsY.BETWEEN_RECTS +
-          UI_E_PositionsY.ADAPTER_FROM_RECT_TOP +
-          UI_E_PositionsY.SINGLE_ADAPTER_HEIGHT * index
-
-        return {
-          ...adapter,
-          adapterPosition,
-        }
-      }
-    ) || null
+      diagramData?.physicalAdapters?.adapters.map(
+          (adapter: UI_I_Adapter, index: number) => {
+            const adapterPosition: number =
+                UI_E_PositionsY.DIAGRAM_TOP +
+                UI_E_PositionsY.BETWEEN_RECTS +
+                UI_E_PositionsY.ADAPTER_FROM_RECT_TOP +
+                UI_E_PositionsY.SINGLE_ADAPTER_HEIGHT * index
+
+            return {
+              ...adapter,
+              adapterPosition,
+            }
+          }
+      ) || null
 
   return {
     titlePosition,
@@ -219,10 +219,10 @@ export const getAdaptersPositions = (
 }
 
 export const makeSwitchSendData = (
-  data: UI_I_DiagramData,
-  adapterStatus: UI_I_AdapterStatus
-): API_UI_I_SwitchItem | void => {
-  if(!data.networking) return
+    data: UI_I_DiagramData,
+    adapterStatus: UI_I_AdapterStatus
+): API_UI_I_SwitchItem | null => {
+  if (!data.networking) return null
 
   return {
     id: data.id,

package/components/common/diagramMain/modals/ManagePhysicalAdaptersModal.vue

@@ -49,12 +49,14 @@
 </template>
 
 <script setup lang="ts">
-import { UI_I_Localization } from '~/lib/models/interfaces'
+import {
+  UI_I_Localization,
+  UI_I_ItemsWithTotalCounts,
+} from '~/lib/models/interfaces'
 import {
   UI_I_Adapter,
   UI_I_AdapterStatus,
   UI_I_SwitchAdapterItem,
-  UI_I_SwitchAdapters,
 } from '~/components/common/diagramMain/lib/models/interfaces'
 
 // Props from up
@@ -67,7 +69,7 @@ const props = withDefaults(
     height: string
     freeAdapters: UI_I_Adapter[]
     adapterStatus: UI_I_AdapterStatus
-    adapters: UI_I_SwitchAdapters
+    adapters: UI_I_ItemsWithTotalCounts<UI_I_SwitchAdapterItem>
     initialAdapterStatus: UI_I_AdapterStatus
     isDarkMode?: boolean
   }>(),

package/components/common/diagramMain/modals/editSettings/EditSettings.vue

@@ -92,10 +92,11 @@
 </template>
 
 <script setup lang="ts">
+import { UI_I_ItemsWithTotalCounts } from '~/lib/models/interfaces'
 import {
   UI_I_AdapterStatus,
   UI_I_ModalsInitialData,
-  UI_I_SwitchAdapters,
+  UI_I_SwitchAdapterItem,
   UI_I_SecurityFields,
   UI_I_TrafficShapingFields,
   UI_I_TeamingFailoverFields,
@@ -116,7 +117,7 @@ const props = withDefaults(
       text: string
     }[]
     initialData?: UI_I_ModalsInitialData
-    adapters: UI_I_SwitchAdapters
+    adapters: UI_I_ItemsWithTotalCounts<UI_I_SwitchAdapterItem>
     flagSendData: boolean
     isDarkMode?: boolean
   }>(),

package/components/common/diagramMain/modals/editSettings/EditSettingsModal.vue

@@ -36,11 +36,14 @@
 </template>
 
 <script setup lang="ts">
-import { UI_I_Localization } from '~/lib/models/interfaces'
+import {
+  UI_I_Localization,
+  UI_I_ItemsWithTotalCounts,
+} from '~/lib/models/interfaces'
 import {
   UI_I_ModalsInitialData,
   UI_I_EditFieldsData,
-  UI_I_SwitchAdapters,
+  UI_I_SwitchAdapterItem,
 } from '~/components/common/diagramMain/lib/models/interfaces'
 
 // Props from up
@@ -55,7 +58,7 @@ interface UI_I_PortViewSettingsModalProps {
     text: string
   }[]
   initialData?: UI_I_ModalsInitialData
-  adapters?: UI_I_SwitchAdapters
+  adapters?: UI_I_ItemsWithTotalCounts<UI_I_SwitchAdapterItem>
   isDarkMode: boolean
 }
 
@@ -63,8 +66,8 @@ const props = withDefaults(defineProps<UI_I_PortViewSettingsModalProps>(), {
   initialData: () => ({}),
   title: 'Network',
   adapters: () => ({
-    totalPages: 0,
-    totalItems: 0,
+    total_pages: 0,
+    total_items: 0,
     items: [],
   }),
 })

package/components/common/diagramMain/modals/editSettings/tabs/TeamingFailover.vue

@@ -93,10 +93,13 @@
 </template>
 
 <script setup lang="ts">
-import { UI_I_Localization } from '~/lib/models/interfaces'
+import {
+  UI_I_Localization,
+  UI_I_ItemsWithTotalCounts,
+} from '~/lib/models/interfaces'
 import {
   UI_I_TeamingFailoverFields,
-  UI_I_SwitchAdapters,
+  UI_I_SwitchAdapterItem,
   UI_I_ModalsInitialData,
   UI_I_TeamingAndFailoverTemplate,
   UI_I_AdapterStatus,
@@ -112,7 +115,7 @@ import {
 const props = withDefaults(
   defineProps<{
     initialData?: UI_I_ModalsInitialData
-    adapters: UI_I_SwitchAdapters
+    adapters: UI_I_ItemsWithTotalCounts<UI_I_SwitchAdapterItem>
     adapterStatus: UI_I_AdapterStatus
     isSwitch: boolean
     isDarkMode?: boolean

package/components/common/wizards/network/add/Add.vue

@@ -108,6 +108,7 @@
 import {
   UI_I_ArbitraryObject,
   UI_I_Localization,
+  UI_I_ItemsWithTotalCounts,
 } from '~/lib/models/interfaces'
 import { UI_T_Project } from '~/lib/models/types'
 import {
@@ -119,13 +120,15 @@ import {
   UI_I_ReadyCompleteFields,
   UI_I_AddNetworkingSecondOrThirdSchemeDataSend,
   UI_I_AddNetworkingZeroOrFirstSchemeDataSend,
+  UI_I_AddNetworkingFourthOrFifthSchemeDataSend,
   UI_I_AddNetworkingEmits,
   UI_I_TCPStack,
 } from '~/components/common/wizards/network/add/lib/models/interfaces'
 import {
   UI_I_Adapter,
   UI_I_AdapterStatus,
-  UI_I_SwitchAdapters,
+  UI_I_SwitchAdapterItem,
+  UI_I_DiagramData,
 } from '~/components/common/diagramMain/lib/models/interfaces'
 import {
   UI_I_ValidationReturn,
@@ -149,7 +152,6 @@ import {
   addNetworkingSecondOrThirdSchemeDataFunc,
   addNetworkingFourthOrFifthSchemeDataFunc,
 } from '~/components/common/wizards/network/add/lib/config'
-
 import {
   checkTargetDeviceSync,
   checkAdaptersSync,
@@ -162,7 +164,7 @@ import {
 const props = withDefaults(
   defineProps<{
     show: boolean
-    adapters: UI_I_SwitchAdapters
+    adapters: UI_I_ItemsWithTotalCounts<UI_I_SwitchAdapterItem>
     standardSwitchesInitial: UI_I_Switch[]
     freeAdapters: UI_I_Adapter[]
     project?: UI_T_Project
@@ -171,6 +173,7 @@ const props = withDefaults(
     selectedSwitchId?: string
     tcpStacks?: UI_I_TCPStack[]
     tcpStackLoading?: boolean
+    diagramsData?: UI_I_DiagramData[]
   }>(),
   {
     standardSwitchesInitial: () => [],
@@ -181,6 +184,7 @@ const props = withDefaults(
     selectedSwitchId: '',
     tcpStacks: () => [],
     tcpStackLoading: false,
+    diagramsData: [],
   }
 )
 
@@ -475,6 +479,7 @@ const checkFinal = async (): Promise<UI_I_ArbitraryObject<string>> => {
   let sendData:
     | UI_I_AddNetworkingZeroOrFirstSchemeDataSend
     | UI_I_AddNetworkingSecondOrThirdSchemeDataSend
+    | UI_I_AddNetworkingFourthOrFifthSchemeDataSend
 
   let type: 'network' | 'vmkernel'
 
@@ -512,6 +517,7 @@ const checkFinal = async (): Promise<UI_I_ArbitraryObject<string>> => {
       targetDevice.value.switch,
       wizard.isSelectedScheme(4),
       adapterStatus.value,
+      props.diagramsData,
       targetDevice.value.mtu
     )
 
@@ -723,6 +729,18 @@ const onSubmit = async (): Promise<void> => {
     )
   }
 
+  if (wizard.isSelectedScheme(4) || wizard.isSelectedScheme(5)) {
+    sendData = addNetworkingFourthOrFifthSchemeDataFunc(
+      targetDevice.value.switch,
+      wizard.isSelectedScheme(4),
+      adapterStatus.value,
+      props.diagramsData,
+      targetDevice.value.mtu
+    )
+
+    type = 'adapter'
+  }
+
   sendData &&
     emits(
       'send-add-networking-data',

package/components/common/wizards/network/add/lib/config/sendData.ts

@@ -6,41 +6,45 @@ import {
   UI_I_TargetDevice,
   UI_I_AddNetworkingSecondOrThirdSchemeDataSend,
 } from '~/components/common/wizards/network/add/lib/models/interfaces'
-import { UI_I_AdapterStatus } from '~/components/common/diagramMain/lib/models/interfaces'
+import {
+  UI_I_AdapterStatus,
+  UI_I_DiagramData,
+} from '~/components/common/diagramMain/lib/models/interfaces'
+import { makeSwitchSendData } from '~/components/common/diagramMain/lib/utils/utils'
 
 export const addNetworkingSecondOrThirdSchemeDataFunc = (
-  connectionSettings: UI_I_ConnectionSettings,
-  targetDevice: UI_I_TargetDevice,
-  vlan: number,
-  isSecondScheme: boolean = false,
-  adapterStatus?: UI_I_AdapterStatus
+    connectionSettings: UI_I_ConnectionSettings,
+    targetDevice: UI_I_TargetDevice,
+    vlan: number,
+    isSecondScheme: boolean = false,
+    adapterStatus?: UI_I_AdapterStatus
 ): UI_I_AddNetworkingSecondOrThirdSchemeDataSend =>
-  isSecondScheme
-    ? {
-        vlan,
-        name: connectionSettings.networkLabel,
-        switch: targetDevice.standardSwitch,
-      }
-    : {
-        vlan,
-        name: connectionSettings.networkLabel,
-        new_switch: {
-          mtu: targetDevice.selected === '3' ? targetDevice.mtu : undefined,
-          nics: {
-            active: adapterStatus?.active || [],
-            standby: adapterStatus?.standby || [],
-            unused: adapterStatus?.unused || [],
+    isSecondScheme
+        ? {
+          vlan,
+          name: connectionSettings.networkLabel,
+          switch: targetDevice.standardSwitch,
+        }
+        : {
+          vlan,
+          name: connectionSettings.networkLabel,
+          new_switch: {
+            mtu: targetDevice.selected === '3' ? targetDevice.mtu : undefined,
+            nics: {
+              active: adapterStatus?.active || [],
+              standby: adapterStatus?.standby || [],
+              unused: adapterStatus?.unused || [],
+            },
           },
-        },
-      }
+        }
 
 export const addNetworkingZeroOrFirstSchemeDataFunc = (
-  targetDevice: UI_I_TargetDevice,
-  vlan: number,
-  portProperties: UI_I_PortProperties,
-  ipFourSettings: UI_I_IpFourSettings,
-  isFirstScheme?: boolean,
-  adapterStatus?: UI_I_AdapterStatus
+    targetDevice: UI_I_TargetDevice,
+    vlan: number,
+    portProperties: UI_I_PortProperties,
+    ipFourSettings: UI_I_IpFourSettings,
+    isFirstScheme?: boolean,
+    adapterStatus?: UI_I_AdapterStatus
 ): UI_I_AddNetworkingZeroOrFirstSchemeDataSend => {
   const sendData: UI_I_AddNetworkingZeroOrFirstSchemeDataSend = {
     switch: targetDevice.selected === '1' ? targetDevice.standardSwitch : '',
@@ -68,8 +72,8 @@ export const addNetworkingZeroOrFirstSchemeDataFunc = (
       net_mask: ipFourSettings.static.subnetMask,
       gateway_override: ipFourSettings.static.defaultGateway.override,
       gateway: ipFourSettings.static.defaultGateway.override
-        ? ipFourSettings.static.defaultGateway.value
-        : '',
+          ? ipFourSettings.static.defaultGateway.value
+          : '',
     },
   }
 
@@ -87,36 +91,45 @@ export const addNetworkingZeroOrFirstSchemeDataFunc = (
   const isAutoIp: boolean = ipFourSettings.ipSettings === '0'
 
   sendData.tcp_config = isAutoIp
-    ? { auto: true }
-    : {
+      ? { auto: true }
+      : {
         auto: false,
         ipv4: ipFourSettings.static.ipFourAddress,
         net_mask: ipFourSettings.static.subnetMask,
         gateway_override: ipFourSettings.static.defaultGateway.override,
         gateway: ipFourSettings.static.defaultGateway.override
-          ? ipFourSettings.static.defaultGateway.value
-          : '',
+            ? ipFourSettings.static.defaultGateway.value
+            : '',
       }
 
   return sendData
 }
 
 export const addNetworkingFourthOrFifthSchemeDataFunc = (
-  switchId: string,
-  isFourthScheme: boolean = false,
-  adapterStatus: UI_I_AdapterStatus,
-  mtu?: number
-): any =>
-  isFourthScheme
-    ? {
-        id: switchId,
-        nics: {
-          active: adapterStatus?.active || [],
-          standby: adapterStatus?.standby || [],
-          unused: adapterStatus?.unused || [],
-        },
-      }
-    : {
+    switchId: string,
+    isFourthScheme: boolean = false,
+    adapterStatus: UI_I_AdapterStatus,
+    switchData: UI_I_DiagramData[] | null,
+    mtu?: number
+): any => {
+  let data: UI_I_DiagramData | null = null
+  if (switchData) {
+    data = switchData.find(
+        (d: UI_I_DiagramData) => d.diagramName === switchId
+    ) as UI_I_DiagramData
+  }
+
+  return isFourthScheme
+      ? makeSwitchSendData(data as UI_I_DiagramData, adapterStatus)
+      : // {
+        //     id: switchId,
+        //     nics: {
+        //       active: adapterStatus?.active || [],
+        //       standby: adapterStatus?.standby || [],
+        //       unused: adapterStatus?.unused || [],
+        //     },
+        //   }
+      {
         mtu: mtu,
         nics: {
           active: adapterStatus?.active || [],
@@ -124,3 +137,4 @@ export const addNetworkingFourthOrFifthSchemeDataFunc = (
           unused: adapterStatus?.unused || [],
         },
       }
+}

package/components/common/wizards/network/add/lib/models/interfaces.ts

@@ -154,6 +154,19 @@ export interface UI_I_AddNetworkingSecondOrThirdSchemeDataSend {
   }
 }
 
+export interface UI_I_AddNetworkingFourthOrFifthSchemeDataSend {
+  name: string
+  switch?: string | undefined
+  new_switch?: {
+    mtu: number | undefined
+    nics: {
+      active: string[]
+      standby: string[]
+      unused: string[]
+    }
+  }
+}
+
 export interface UI_I_VlanIdData {
   text: string
   value: string
@@ -179,28 +192,30 @@ export interface UI_I_ReadyCompleteFirstColumn {
 export interface UI_I_AddNetworkingEmits {
   (event: 'hide'): void
   (
-    event: 'add-networking-data-validate',
-    networkData:
-      | UI_I_AddNetworkingSecondOrThirdSchemeDataSend
-      | UI_I_AddNetworkingZeroOrFirstSchemeDataSend,
-    type: string,
-    setValidation: (err_arg: UI_I_ArbitraryObject<string>) => void
+      event: 'add-networking-data-validate',
+      networkData:
+          | UI_I_AddNetworkingSecondOrThirdSchemeDataSend
+          | UI_I_AddNetworkingZeroOrFirstSchemeDataSend
+          | UI_I_AddNetworkingFourthOrFifthSchemeDataSend,
+      type: string,
+      setValidation: (err_arg: UI_I_ArbitraryObject<string>) => void
   ): void
   (
-    event: 'send-add-networking-data',
-    schemeData:
-      | UI_I_AddNetworkingSecondOrThirdSchemeDataSend
-      | UI_I_AddNetworkingZeroOrFirstSchemeDataSend,
-    type: string,
-    hideSendNetworkDataLoader: () => void,
-    onHideAddNetworkingModal: () => void
+      event: 'send-add-networking-data',
+      schemeData:
+          | UI_I_AddNetworkingSecondOrThirdSchemeDataSend
+          | UI_I_AddNetworkingZeroOrFirstSchemeDataSend
+          | UI_I_AddNetworkingFourthOrFifthSchemeDataSend,
+      type: string,
+      hideSendNetworkDataLoader: () => void,
+      onHideAddNetworkingModal: () => void
   ): void
   (event: 'get-existing-standard-switches', cb: () => void): void
   (event: 'get-free-adapters', cb: () => void): void
   (
-    event: 'check-network-label',
-    networkLabel: string,
-    cb: (error_message: string) => void
+      event: 'check-network-label',
+      networkLabel: string,
+      cb: (error_message: string) => void
   ): void
   (event: 'get-tcp-stacks'): void
 }

package/components/common/wizards/network/add/steps/CreateStandardSwitch.vue

@@ -34,11 +34,14 @@
 </template>
 
 <script setup lang="ts">
-import { UI_I_Localization } from '~/lib/models/interfaces'
+import {
+  UI_I_Localization,
+  UI_I_ItemsWithTotalCounts,
+} from '~/lib/models/interfaces'
 import {
   UI_I_Adapter,
   UI_I_AdapterStatus,
-  UI_I_SwitchAdapters,
+  UI_I_SwitchAdapterItem,
 } from '~/components/common/diagramMain/lib/models/interfaces'
 
 // Props from up
@@ -46,7 +49,7 @@ const props = defineProps<{
   addedAdapters: string[]
   freeAdapters: UI_I_Adapter[]
   adapterStatus: UI_I_AdapterStatus
-  adapters: UI_I_SwitchAdapters
+  adapters: UI_I_ItemsWithTotalCounts<UI_I_SwitchAdapterItem>
   coreAdapters: string[]
   isShowNoConnectedActiveAdaptersModal: boolean
   isShowNoActiveAdaptersModal: boolean

package/components/common/wizards/network/add/steps/SelectConnectionType.vue

@@ -32,7 +32,7 @@
         <div class="add-networking-radio-button-description">
           {{ localization.portGroupHandlesVirtualMachineTraffic }}
         </div>
-        <div class="radio disabled-on-time">
+        <div class="radio">
           <input
             id="physical-adapter"
             type="radio"
@@ -44,7 +44,7 @@
             {{ localization.physicalNetworkAdapter }}
           </label>
         </div>
-        <div class="add-networking-radio-button-description disabled-on-time">
+        <div class="add-networking-radio-button-description">
           {{ localization.physicalNetworkAdapterHandlesNetworkTraffic }}
         </div>
       </form>

package/lib/models/enums.ts

@@ -21,8 +21,14 @@ export enum E_NodeIconsByState {
 }
 
 export enum UI_E_State {
-  UNKNOWN = 0,
-  OK = 1,
-  WARNING = 2,
-  ERROR = 3,
+  UNKNOWN,
+  OK,
+  WARNING,
+  ERROR,
+}
+
+export enum UI_E_Kind {
+  UNKNOWN,
+  NORMAL,
+  SYSTEM,
 }

package/package.json

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