bfg-common 1.3.205 → 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

@@ -246,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,
@@ -295,7 +296,7 @@ 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
@@ -309,8 +310,8 @@ const props = withDefaults(
     standardSwitchesInitial: () => [],
     hostName: '',
     adapters: () => ({
-      totalItems: 0,
-      totalPages: 0,
+      total_items: 0,
+      total_pages: 0,
       items: [],
     }),
     freeAdapters: () => [],

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/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