bfg-common 1.4.197 → 1.4.199

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

@@ -1,278 +1,331 @@
-import type {
-  UI_I_Network,
-  UI_I_SelectedPort,
-  UI_I_NetworksWithPositions,
-  UI_I_AdaptersWithPositions,
-  UI_I_SelectedSwitchPositions,
-  UI_I_DiagramData,
-  UI_I_AdaptersHeight,
-  UI_I_Adapter,
-  UI_I_AdaptersPositions,
-  UI_I_AdapterStatus,
-  API_UI_I_SwitchItem,
-} from '~/components/common/diagramMain/lib/models/interfaces'
-import type { UI_T_Adapters } from '~/components/common/diagramMain/lib/models/types'
-import {
-  UI_E_NetworkType,
-  UI_E_PositionsY,
-} from '~/components/common/diagramMain/lib/models/enums'
-import { NETWORK_POSITIONS } from '~/components/common/diagramMain/lib/config'
-
-export const hasPortAndNetwork = (
-  selectedPort: UI_I_SelectedPort,
-  id: string
-): boolean =>
-  selectedPort.portId !== '-1' &&
-  selectedPort.networkId !== '-1' &&
-  selectedPort.networkId === id
-
-export const networksPositions = (
-  arr: number[],
-  net: UI_I_NetworksWithPositions
-): number[] => {
-  if (net.ports.length === 0) return [...arr, net.connectLineY]
-  if (!net.toggle)
-    return [
-      ...arr,
-      net.portsPosition + NETWORK_POSITIONS.EMPTY_PORTS_PADDING_BOTTOM,
-    ]
-
-  return [
-    ...arr,
-    net.portsPosition +
-      NETWORK_POSITIONS.FROM_VLAN_ID_TO_GROUP_NAME +
-      NETWORK_POSITIONS.BETWEEN_VMS_AND_PORTS,
-    net.networkType === UI_E_NetworkType.VCenter
-      ? net.portsPosition +
-        NETWORK_POSITIONS.FROM_VLAN_ID_TO_GROUP_NAME +
-        NETWORK_POSITIONS.BETWEEN_V_CENTERS +
-        NETWORK_POSITIONS.V_CENTER_HEIGHT * (net.portsCount - 1)
-      : net.portsPosition +
-        NETWORK_POSITIONS.FROM_VLAN_ID_TO_GROUP_NAME +
-        NETWORK_POSITIONS.BETWEEN_VMS_AND_PORTS +
-        NETWORK_POSITIONS.VMS_AND_PORTS_HEIGHT * (net.portsCount - 1),
-  ]
-}
-
-export const getSelectedPortLinePositions = (
-  selectedPortPosition: number | undefined,
-  selectedNetworkData: UI_I_Network
-) =>
-  selectedPortPosition
-    ? selectedNetworkData.networkType === UI_E_NetworkType.VCenter
-      ? selectedPortPosition + 12.5
-      : selectedPortPosition + 7.5
-    : 0
-
-const selectedNetworkDataFunc = (
-  networkId: string,
-  networksWithPositions: UI_I_NetworksWithPositions[]
-): UI_I_NetworksWithPositions | undefined =>
-  networksWithPositions?.find(
-    (network: UI_I_Network): boolean => network.id === networkId
-  )
-
-export const getSelectNetworkDataFunc = (
-  networkId: string,
-  networksWithPositions: UI_I_NetworksWithPositions[],
-  adaptersWithPositions: UI_I_AdaptersWithPositions
-): UI_I_SelectedSwitchPositions | undefined => {
-  const selectedNetworkData: UI_I_NetworksWithPositions | undefined =
-    selectedNetworkDataFunc(networkId, networksWithPositions)
-
-  if (!selectedNetworkData) return
-
-  if (selectedNetworkData.state.state === 3)
-    return {
-      selectedSwitchLineY: {
-        y1: 0,
-        y2: 0,
-      },
-      selectedPort: {
-        networkId,
-        portId: '-1',
-        activeAdapters: [],
-      },
-    }
-
-  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) || []
-  let selectedPositions: number[] = []
-
-  if (!adaptersWithPositions.toggle) {
-    selectedPositions = [
-      adaptersWithPositions.adaptersConnectLineY,
-      selectedNetworkData.connectLineY,
-    ]
-  } else if (
-    adaptersWithPositions.adapters === null ||
-    adaptersWithPositions.adapters?.length === 0
-  ) {
-    selectedPositions = [47.5, selectedNetworkData.connectLineY].sort(
-      (y1: number, y2: number) => y1 - y2
-    )
-  } else {
-    selectedPositions = [
-      ...adaptersPositions,
-      selectedNetworkData.connectLineY,
-    ].sort((y1: number, y2: number) => y1 - y2)
-  }
-
-  return {
-    selectedSwitchLineY: {
-      y1: selectedPositions[0],
-      y2: selectedPositions[selectedPositions.length - 1],
-    },
-    selectedPort: {
-      networkId,
-      portId: '-1',
-      activeAdapters: activeAdapters || [],
-    },
-  }
-}
-
-export const getSelectPortDataFunc = (
-  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)
-
-  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) || []
-  const selectedPortPosition: number | undefined =
-    selectedNetworkData.ports.find(
-      (el): boolean => el.id === portId
-    )?.portPosition
-  const selectedPortLinePosition: number = getSelectedPortLinePositions(
-    selectedPortPosition,
-    selectedNetworkData
-  )
-  let selectedPositions: number[] = []
-
-  if (!adaptersWithPositions.toggle) {
-    selectedPositions = [
-      adaptersWithPositions.adaptersConnectLineY,
-      selectedNetworkData.connectLineY,
-      selectedPortLinePosition,
-    ]
-  } else {
-    selectedPositions = [...adaptersPositions, selectedPortLinePosition].sort(
-      (y1: number, y2: number) => y1 - y2
-    )
-  }
-
-  return {
-    selectedSwitchLineY: {
-      y1: selectedPositions[0],
-      y2: selectedPositions[selectedPositions.length - 1],
-    },
-    selectedPort: {
-      networkId,
-      portId,
-      activeAdapters: activeAdapters || [],
-    },
-  }
-}
-
-export const countAdaptersHeight = (
-  diagramData: UI_I_DiagramData | null
-): UI_I_AdaptersHeight => {
-  const toggle: boolean = !!diagramData?.physicalAdapters?.toggle
-  const adaptersCount: number =
-    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,
-    toggle,
-    adaptersCount,
-  }
-}
-
-export const getAdaptersPositions = (
-  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
-
-  const rectPosition: number =
-    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
-
-  return {
-    titlePosition,
-    rectPosition,
-    adaptersConnectLineY,
-    adapters,
-  }
-}
-
-export const makeSwitchSendData = (
-  data: UI_I_DiagramData,
-  adapterStatus: UI_I_AdapterStatus
-): API_UI_I_SwitchItem | null => {
-  if (!data.networking) return null
-
-  return {
-    id: data.id,
-    mtu: data.networking.mtu,
-    networks: data.networks.map((network: UI_I_Network) => 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,
-    },
-  }
-}
+import type { UI_I_ItemsWithTotalCounts } from '~/lib/models/interfaces'
+import type {
+  UI_I_Network,
+  UI_I_SelectedPort,
+  UI_I_NetworksWithPositions,
+  UI_I_AdaptersWithPositions,
+  UI_I_SelectedSwitchPositions,
+  UI_I_DiagramData,
+  UI_I_AdaptersHeight,
+  UI_I_Adapter,
+  UI_I_AdaptersPositions,
+  UI_I_AdapterStatus,
+  API_UI_I_SwitchItem,
+  UI_I_AvailableAdapters,
+  UI_I_SwitchAdapterItem,
+  UI_I_AdapterWithError,
+} from '~/components/common/diagramMain/lib/models/interfaces'
+import type { UI_T_Adapters } from '~/components/common/diagramMain/lib/models/types'
+import {
+  UI_E_NetworkType,
+  UI_E_PositionsY,
+} from '~/components/common/diagramMain/lib/models/enums'
+import { NETWORK_POSITIONS } from '~/components/common/diagramMain/lib/config'
+
+export const hasPortAndNetwork = (
+  selectedPort: UI_I_SelectedPort,
+  id: string
+): boolean =>
+  selectedPort.portId !== '-1' &&
+  selectedPort.networkId !== '-1' &&
+  selectedPort.networkId === id
+
+export const networksPositions = (
+  arr: number[],
+  net: UI_I_NetworksWithPositions
+): number[] => {
+  if (net.ports.length === 0) return [...arr, net.connectLineY]
+  if (!net.toggle)
+    return [
+      ...arr,
+      net.portsPosition + NETWORK_POSITIONS.EMPTY_PORTS_PADDING_BOTTOM,
+    ]
+
+  return [
+    ...arr,
+    net.portsPosition +
+      NETWORK_POSITIONS.FROM_VLAN_ID_TO_GROUP_NAME +
+      NETWORK_POSITIONS.BETWEEN_VMS_AND_PORTS,
+    net.networkType === UI_E_NetworkType.VCenter
+      ? net.portsPosition +
+        NETWORK_POSITIONS.FROM_VLAN_ID_TO_GROUP_NAME +
+        NETWORK_POSITIONS.BETWEEN_V_CENTERS +
+        NETWORK_POSITIONS.V_CENTER_HEIGHT * (net.portsCount - 1)
+      : net.portsPosition +
+        NETWORK_POSITIONS.FROM_VLAN_ID_TO_GROUP_NAME +
+        NETWORK_POSITIONS.BETWEEN_VMS_AND_PORTS +
+        NETWORK_POSITIONS.VMS_AND_PORTS_HEIGHT * (net.portsCount - 1),
+  ]
+}
+
+export const getSelectedPortLinePositions = (
+  selectedPortPosition: number | undefined,
+  selectedNetworkData: UI_I_Network
+) =>
+  selectedPortPosition
+    ? selectedNetworkData.networkType === UI_E_NetworkType.VCenter
+      ? selectedPortPosition + 12.5
+      : selectedPortPosition + 7.5
+    : 0
+
+const selectedNetworkDataFunc = (
+  networkId: string,
+  networksWithPositions: UI_I_NetworksWithPositions[]
+): UI_I_NetworksWithPositions | undefined =>
+  networksWithPositions?.find(
+    (network: UI_I_Network): boolean => network.id === networkId
+  )
+
+export const getSelectNetworkDataFunc = (
+  networkId: string,
+  networksWithPositions: UI_I_NetworksWithPositions[],
+  adaptersWithPositions: UI_I_AdaptersWithPositions
+): UI_I_SelectedSwitchPositions | undefined => {
+  const selectedNetworkData: UI_I_NetworksWithPositions | undefined =
+    selectedNetworkDataFunc(networkId, networksWithPositions)
+
+  if (!selectedNetworkData) return
+
+  if (selectedNetworkData.state.state === 3)
+    return {
+      selectedSwitchLineY: {
+        y1: 0,
+        y2: 0,
+      },
+      selectedPort: {
+        networkId,
+        portId: '-1',
+        activeAdapters: [],
+      },
+    }
+
+  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) || []
+  let selectedPositions: number[] = []
+
+  if (!adaptersWithPositions.toggle) {
+    selectedPositions = [
+      adaptersWithPositions.adaptersConnectLineY,
+      selectedNetworkData.connectLineY,
+    ]
+  } else if (
+    adaptersWithPositions.adapters === null ||
+    adaptersWithPositions.adapters?.length === 0
+  ) {
+    selectedPositions = [47.5, selectedNetworkData.connectLineY].sort(
+      (y1: number, y2: number) => y1 - y2
+    )
+  } else {
+    selectedPositions = [
+      ...adaptersPositions,
+      selectedNetworkData.connectLineY,
+    ].sort((y1: number, y2: number) => y1 - y2)
+  }
+
+  return {
+    selectedSwitchLineY: {
+      y1: selectedPositions[0],
+      y2: selectedPositions[selectedPositions.length - 1],
+    },
+    selectedPort: {
+      networkId,
+      portId: '-1',
+      activeAdapters: activeAdapters || [],
+    },
+  }
+}
+
+export const getSelectPortDataFunc = (
+  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)
+
+  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) || []
+  const selectedPortPosition: number | undefined =
+    selectedNetworkData.ports.find(
+      (el): boolean => el.id === portId
+    )?.portPosition
+  const selectedPortLinePosition: number = getSelectedPortLinePositions(
+    selectedPortPosition,
+    selectedNetworkData
+  )
+  let selectedPositions: number[] = []
+
+  if (!adaptersWithPositions.toggle) {
+    selectedPositions = [
+      adaptersWithPositions.adaptersConnectLineY,
+      selectedNetworkData.connectLineY,
+      selectedPortLinePosition,
+    ]
+  } else {
+    selectedPositions = [...adaptersPositions, selectedPortLinePosition].sort(
+      (y1: number, y2: number) => y1 - y2
+    )
+  }
+
+  return {
+    selectedSwitchLineY: {
+      y1: selectedPositions[0],
+      y2: selectedPositions[selectedPositions.length - 1],
+    },
+    selectedPort: {
+      networkId,
+      portId,
+      activeAdapters: activeAdapters || [],
+    },
+  }
+}
+
+export const countAdaptersHeight = (
+  diagramData: UI_I_DiagramData | null
+): UI_I_AdaptersHeight => {
+  const toggle: boolean = !!diagramData?.physicalAdapters?.toggle
+  const adaptersCount: number =
+    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,
+    toggle,
+    adaptersCount,
+  }
+}
+
+export const getAdaptersPositions = (
+  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
+
+  const rectPosition: number =
+    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
+
+  return {
+    titlePosition,
+    rectPosition,
+    adaptersConnectLineY,
+    adapters,
+  }
+}
+
+export const makeSwitchSendData = (
+  data: UI_I_DiagramData,
+  adapterStatus: UI_I_AdapterStatus
+): API_UI_I_SwitchItem | null => {
+  if (!data.networking) return null
+
+  return {
+    id: data.id,
+    mtu: data.networking.mtu,
+    networks: data.networks.map((network: UI_I_Network) => 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,
+    },
+  }
+}
+
+export const getAvailableAdapters = (
+  nics: UI_I_ItemsWithTotalCounts<UI_I_SwitchAdapterItem>,
+  networkOrSwitchNics: UI_I_AdapterStatus
+): UI_I_AvailableAdapters => {
+  const availableAdapters: UI_I_AvailableAdapters = {
+    activeAdapters: [],
+    standbyAdapters: [],
+    unusedAdapters: [],
+  }
+
+  if (nics?.items) {
+    networkOrSwitchNics?.active?.forEach(
+      (nic) =>
+        nics?.items.find(
+          (a: UI_I_SwitchAdapterItem): boolean => a.id === nic
+        ) && availableAdapters.activeAdapters.push(nic)
+    )
+    networkOrSwitchNics?.standby?.forEach(
+      (nic) =>
+        nics?.items.find(
+          (a: UI_I_SwitchAdapterItem): boolean => a.id === nic
+        ) && availableAdapters.standbyAdapters.push(nic)
+    )
+    networkOrSwitchNics?.unused?.forEach(
+      (nic) =>
+        nics?.items.find(
+          (a: UI_I_SwitchAdapterItem): boolean => a.id === nic
+        ) && availableAdapters.unusedAdapters.push(nic)
+    )
+  }
+
+  return availableAdapters
+}
+
+export const createAdapterWithError = (
+  nic: string,
+  switchId: string
+): UI_I_AdapterWithError => ({
+  fullName: nic,
+  id: nic,
+  name: nic,
+  networks: [],
+  state: { state: 1, errors: [] },
+  switch: switchId,
+  testId: `adapter-${nic}`,
+  carrier: false,
+  status: 'error',
+})

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

@@ -93,7 +93,7 @@ import type {
 } from '~/components/common/diagramMain/lib/models/interfaces'
 import type { UI_T_PropertiesFieldName } from '~/components/common/diagramMain/lib/models/types'
 import { validationMessagesArrayFunc } from '~/components/common/diagramMain/modals/lib/utils'
-import { vlanIdSelectData } from '~/components/common/wizards/network/add/lib/config'
+import { vlanIdSelectData } from '~/components/common/wizards/network/add/lib/config/config'
 
 // Props from up
 const props = withDefaults(

package/components/common/diagramMain/modals/migrateVmkernelAdapter/steps/ConnectionSettings.vue

@@ -94,7 +94,7 @@ import type {
 } from '~/lib/models/interfaces'
 import type { UI_I_ConnectionSettings } from '~/components/common/wizards/network/add/lib/models/interfaces'
 import type { UI_I_ErrorFields } from '~/components/atoms/wizard/lib/models/interfaces'
-import { vlanIdSelectData } from '~/components/common/wizards/network/add/lib/config'
+import { vlanIdSelectData } from '~/components/common/wizards/network/add/lib/config/config'
 import type Wizard from '~/components/atoms/wizard/lib/utils/utils'
 import {
   validateNetworkConnectionSettingsLocal,