bfg-common 1.1.44 → 1.1.45

package/components/common/addNetworking/config/addNetworkingSteps.ts

@@ -120,6 +120,40 @@ export const createSecondSchemeReadyCompleteFunc = (
   },
 ]
 
+export const createThirdSchemeReadyCompleteFunc = (
+  connectionSettingsValues: UI_I_ConnectionSettings,
+  targetDeviceValues: UI_I_TargetDevice,
+  addedAdapters: string[],
+  localization: UI_I_Localization
+): UI_I_ReadyCompleteData[] => [
+  {
+    id: 0,
+    type: 0,
+    rows: [
+      {
+        name: localization.newStandardSwitch,
+        value: '--',
+      },
+      {
+        name: localization.virtualMachinePortGroup,
+        value: connectionSettingsValues.networkLabel,
+      },
+      {
+        name: localization.assignedAdapters,
+        value: addedAdapters.join(', '),
+      },
+      {
+        name: localization.switchMTU,
+        value: targetDeviceValues.mtu?.toString(),
+      },
+      {
+        name: localization.vlanId,
+        value: connectionSettingsValues.vlanId,
+      },
+    ],
+  },
+]
+
 const makeFirstColumnOfZeroAndFirstScheme = (
   targetDevice: UI_I_TargetDevice,
   portProperties: UI_I_PortProperties,

package/components/common/addNetworking/config/index.ts

@@ -13,6 +13,7 @@ export const {
   createSecondSchemeReadyCompleteFunc,
   createZeroSchemeReadyCompleteFunc,
   createFirstSchemeReadyCompleteFunc,
+  createThirdSchemeReadyCompleteFunc,
 } = addNetworkingStepsConfig
 export const {
   servicesInitial,
@@ -41,6 +42,6 @@ export const {
 } = selectSwitches
 
 export const {
-  addNetworkingSecondSchemeDataFunc,
   addNetworkingZeroOrFirstSchemeDataFunc,
+  addNetworkingSecondOrThirdSchemeDataFunc,
 } = sendData

package/components/common/addNetworking/config/sendData.ts

@@ -3,22 +3,37 @@ import {
   UI_I_ConnectionSettings,
   UI_I_IpFourSettings,
   UI_I_PortProperties,
-  UI_I_SecondSchemeData,
   UI_I_TargetDevice,
+  UI_I_AddNetworkingSecondOrThirdSchemeDataSend,
 } from '~/components/common/addNetworking/models/interfaces'
 import { UI_I_AdapterStatus } from '~/components/common/diagramMain/models/interfaces'
 
-export const addNetworkingSecondSchemeDataFunc = (
+export const addNetworkingSecondOrThirdSchemeDataFunc = (
   connectionSettings: UI_I_ConnectionSettings,
   targetDevice: UI_I_TargetDevice,
-  vlan: number
-): UI_I_SecondSchemeData => {
-  return {
-    vlan,
-    name: connectionSettings.networkLabel,
-    switch: targetDevice.standardSwitch,
-  }
-}
+  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 || [],
+          },
+        },
+      }
+
 export const addNetworkingZeroOrFirstSchemeDataFunc = (
   targetDevice: UI_I_TargetDevice,
   vlan: number,

package/components/common/addNetworking/models/interfaces.ts

@@ -1,7 +1,5 @@
 import { UI_E_StepStatus } from '~/components/common/addNetworking/models/enums'
 import { UI_T_TCP } from '~/components/common/addNetworking/models/types'
-import { addNetworkingSecondSchemeDataFunc } from '~/components/common/addNetworking/config/sendData'
-import { createSecondSchemeReadyCompleteFunc } from '~/components/common/addNetworking/config/addNetworkingSteps'
 
 export interface UI_I_Services {
   vMotion: boolean
@@ -121,11 +119,6 @@ export interface UI_I_PortPropertiesEnabledService {
   modelValue: string
 }
 
-export interface UI_I_AddNetworkingSecondSchemeDataSend {
-  name: string
-  vlan: number
-  switch?: string
-}
 export interface UI_I_AddNetworkingZeroOrFirstSchemeDataSend {
   switch?: string
   new_switch?: {
@@ -178,10 +171,18 @@ export interface UI_I_BodyItems {
   id?: string
 }
 
-export interface UI_I_SecondSchemeData {
+export interface UI_I_AddNetworkingSecondOrThirdSchemeDataSend {
   vlan: number
   name: string
-  switch: string | undefined
+  switch?: string | undefined
+  new_switch?: {
+    mtu: number | undefined
+    nics: {
+      active: string[]
+      standby: string[]
+      unused: string[]
+    }
+  }
 }
 
 export interface UI_I_VlanIdData {

package/components/common/addNetworking/steps/SelectedTargetDevice.vue

@@ -137,12 +137,7 @@
         </div>
 
         <div>
-          <div
-            :class="[
-              'radio',
-              { 'disabled-on-time': props.connectionType === '1' },
-            ]"
-          >
+          <div class="radio">
             <input
               id="standard-switch"
               v-model="fields.selected"

package/package.json

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