bfg-common 1.3.219 → 1.3.221

package/components/common/diagramMain/lib/config/index.ts

@@ -20,6 +20,8 @@ export const dataForSelectedNetworkFunc = (
   standbyAdapters: network?.standbyAdapters,
   unusedAdapters: network?.unusedAdapters,
   nics_override: network?.nics_override,
+  id: network.id,
+  switch_name: network.switchName,
 })
 
 export const dataForSelectedAdapterFunc = (

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

@@ -493,10 +493,10 @@ export interface API_UI_I_State {
 }
 
 export interface API_UI_I_Teaming {
-  mode: UI_E_IBSTLoadBalancingMode
-  link_detection_mode: UI_E_ICBLinkDetectionMode
-  notify_switches: UI_E_IYNOption
-  failback: UI_E_IYNOption
+  mode?: UI_E_IBSTLoadBalancingMode
+  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
@@ -547,13 +547,14 @@ export interface UI_I_AdaptersPositions {
 }
 
 export interface UI_I_NetworkEditSendData {
+  id: string
   name: string
   vlan: number
+  switch: string
   security: API_UI_I_Security
   shaping: API_UI_I_Shaping
   teaming: API_UI_I_Teaming
   nics: UI_I_AdapterStatus
-  override_nics: string | number | boolean
 }
 
 export interface UI_I_MigrateVmkernelAdapterEmits {

package/components/common/wizards/network/add/mappers/mappers.ts

@@ -5,6 +5,8 @@ import {
   UI_I_SecurityFields,
   UI_I_TeamingFailoverWithAdaptersFields,
   UI_I_TrafficShapingFields,
+  API_UI_I_Security,
+  API_UI_I_Teaming,
 } from '~/components/common/diagramMain/lib/models/interfaces'
 import {
   UI_I_ModalsInitialData,
@@ -12,7 +14,9 @@ import {
 } from '~/components/common/diagramMain/lib/models/interfaces'
 
 export const networkEditDataFunc = (
-  networkData: UI_I_EditFieldsData
+  networkData: UI_I_EditFieldsData,
+  id: string = '',
+  switchId: string = ''
 ): UI_I_NetworkEditSendData => {
   const { vlanId, networkLabel } =
     networkData.properties as UI_I_PropertiesFields
@@ -36,49 +40,41 @@ export const networkEditDataFunc = (
   const vlan: number =
     vlanId === 'None (0)' ? 0 : vlanId === 'All (4095)' ? 4095 : Number(vlanId)
 
-  const security = {
-    promiscuous_mode: !promiscuousMode.checked
-      ? 'inherit'
-      : promiscuousMode.selected,
-    mac_change: !macAddressChanges.checked
-      ? 'inherit'
-      : macAddressChanges.selected,
-    forged_transmits: !forgedTransmits.checked
-      ? 'inherit'
-      : forgedTransmits.selected,
+  const security: API_UI_I_Security = {
+    promiscuous: promiscuousMode.selected,
+    mac_change: macAddressChanges.selected,
+    forged_transmits: forgedTransmits.selected,
   }
 
   const shaping = {
     inherit: !shapingStatus.checked,
-    enabled: !!Number(shapingStatus.selected),
+    enabled: !!shapingStatus.selected,
     average_bw: average,
     peak_bw: peak,
     burst_size: burstSize,
   }
 
-  const teaming = {
-    mode: !loadBalancing.checked ? 'inherit' : loadBalancing.selected,
-    link_detect: !networkFailureDetection.checked
-      ? 'inherit'
-      : networkFailureDetection.selected,
-    notify_switches: !notifySwitches.checked
-      ? 'inherit'
-      : notifySwitches.selected,
-    failback: !failback.checked ? 'inherit' : failback.selected,
+  const teaming: API_UI_I_Teaming = {
+    mode: loadBalancing.selected,
+    link_detection_mode: networkFailureDetection.selected,
+    notify_switches: notifySwitches.selected,
+    failback: failback.selected,
   }
 
   return {
+    id,
     name: networkLabel,
-    vlan,
-    security,
-    shaping,
-    teaming,
-    override_nics: failoverOrder.checked,
+    switch: switchId,
     nics: {
       active,
       standby,
       unused,
+      inherit: !failoverOrder.checked,
     },
+    security,
+    shaping,
+    vlan,
+    teaming,
   }
 }
 

package/package.json

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