bfg-common 1.3.221 → 1.3.223

package/components/common/diagramMain/DiagramMain.vue

@@ -711,10 +711,10 @@ const countNetworksPositions = (): UI_I_NetworksWithPositions[] => {
               })
             : (network.sysx && [
                 {
-                  id: network.sysx?.name,
-                  name: `${network.sysx?.name} ${
-                    !network.sysx.tcp_config.auto
-                      ? `: ${network.sysx.tcp_config.ipv4}`
+                  id: network.sysx?.id,
+                  name: `${network.sysx?.id} ${
+                    !network.sysx.ipv4_settings.auto
+                      ? `: ${network.sysx.ipv4_settings.ipv4}`
                       : ''
                   }`,
                   portPosition:

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

@@ -65,28 +65,62 @@ export interface UI_I_SelectedAdapter {
 }
 
 export interface UI_I_Sysx {
-  mtu: number
-  name: string
+  id: string
+  state: UI_I_State
+  index: UI_I_ListIndex
+  switch: string
+  network_id: string
+  tcp_stack: string
   services: {
-    fault_tolerance_logging: boolean
-    management: boolean
-    nvme_over_rdma: boolean
-    nvme_over_tcp: boolean
-    provisioning: boolean
-    vmotion: boolean
-    vsan: boolean
-    vsphere_backup_nfc: boolean
-    vsphere_replication: boolean
-    vsphere_replication_nfc: boolean
+    // New interface
+    Management: boolean
+    VMotion: boolean
+    Provisioning: boolean
+    VSAN: boolean
+    FaultToleranceLogging: boolean
+    VSphereReplication: boolean
+    VSphereReplicationNFC: boolean
+    VSphereBackupNFC: boolean
+    NVMeOverTCP: boolean
+    NVMeOverRDMA: boolean
+
+    // management: boolean
+    // vmotion: boolean
+    // provisioning: boolean
+    // vsan: boolean
+    // fault_tolerance_logging: boolean
+    // vsphere_replication: boolean
+    // vsphere_replication_nfc: boolean
+    // vsphere_backup_nfc: boolean
+    // nvme_over_tcp: boolean
+    // nvme_over_rdma: boolean
   }
-  tcp_config: {
+  mtu: number
+  ipv4_settings: {
     auto: boolean
-    gateway: string
-    gateway_override: boolean
     ipv4: string
-    net_mask: string
+    mask: string
+    gateway_override: boolean
+    gateway: string
+    routing_table: number
   }
-  tcp_stack: string
+
+  // name: string
+  // tcp_config: {
+  //   auto: boolean
+  //   ipv4: string
+  //   net_mask: string
+  //   gateway_override: boolean
+  //   gateway: string
+
+    // New interface
+    // auto: boolean
+    // ipv4: string
+    // mask: string
+    // gateway_override: boolean
+    // gateway: string
+    // routing_table: number
+  // }
 }
 
 export interface UI_I_OverrideValue<T = string | number | boolean> {
@@ -212,7 +246,6 @@ export interface UI_I_ToggleDiagramAdaptersPayload {
   paths: string[]
 }
 
-// TODO important
 export interface UI_I_SecurityFields {
   promiscuousMode: {
     checked: boolean
@@ -470,12 +503,10 @@ export interface UI_I_ModalTabs {
   value: number
 }
 
-// TODO important
 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
@@ -497,7 +528,6 @@ 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
@@ -612,7 +642,7 @@ export interface API_UI_I_Network {
   active_ports?: number
   nics_overrided?: boolean
   vm_list?: API_UI_I_NetworkVMList[]
-  sysx_id?: UI_I_Sysx
+  sysx?: UI_I_Sysx
   security: API_UI_I_Security
   shaping: API_UI_I_Shaping
   teaming: API_UI_I_Teaming

package/components/common/diagramMain/modals/migrateVmkernelAdapter/MigrateVmkernelAdapter.vue

@@ -231,14 +231,14 @@ watch(
           !vmKernelNetworksIdOnSwitch.includes(net.id)
       )
       .map((net: UI_I_Network, index: number) => ({
-        name: net.sysx?.name || '',
+        name: net.sysx?.id || '',
         networkLabel: net.title,
         switch: net.switchName || '',
-        ipAddress: net.sysx?.tcp_config.ipv4 || '--',
+        ipAddress: net.sysx?.ipv4_settings.ipv4 || '--',
         tcp: net.sysx?.tcp_stack
           ? localization.value[net.sysx?.tcp_stack]
           : '--',
-        id: `${net.sysx?.name || ''}-${index}`,
+        id: `${net.sysx?.id || ''}-${index}`,
       }))
   },
   { deep: true, immediate: true }

package/components/common/diagramMain/port/Port.vue

@@ -250,31 +250,31 @@ const onShowModalWithTypeCheck = (value: string) => {
 
   if (isVmKernel.value) {
     onShowModal(value, {
-      portName: props.network.sysx?.name,
+      portName: props.network.sysx?.id,
       networkLabel: props.network.title,
       vlanId: props.network.vlanId,
       tcpIp: props.network.sysx?.tcp_stack,
       mtu: props.network.sysx?.mtu,
       services: {
-        vMotion: props.network.sysx?.services.vmotion,
-        provisioning: props.network.sysx?.services.provisioning,
+        vMotion: props.network.sysx?.services.VMotion,
+        provisioning: props.network.sysx?.services.Provisioning,
         faultToleranceLogging:
-          props.network.sysx?.services.fault_tolerance_logging,
-        management: props.network.sysx?.services.management,
-        replication: props.network.sysx?.services.vsphere_replication,
-        replicationNFC: props.network.sysx?.services.vsphere_replication_nfc,
-        vSAN: props.network.sysx?.services.vsan,
-        backupNFC: props.network.sysx?.services.vsphere_backup_nfc,
-        nVMeOverTCP: props.network.sysx?.services.nvme_over_tcp,
-        nVMeOverRDMA: props.network.sysx?.services.nvme_over_rdma,
+          props.network.sysx?.services.FaultToleranceLogging,
+        management: props.network.sysx?.services.Management,
+        replication: props.network.sysx?.services.VSphereReplication,
+        replicationNFC: props.network.sysx?.services.VSphereReplicationNFC,
+        vSAN: props.network.sysx?.services.VSAN,
+        backupNFC: props.network.sysx?.services.VSphereBackupNFC,
+        nVMeOverTCP: props.network.sysx?.services.NVMeOverTCP,
+        nVMeOverRDMA: props.network.sysx?.services.NVMeOverRDMA,
       },
       tcpConfig: {
-        ipv4Settings: props.network.sysx?.tcp_config.auto ? '0' : '1',
-        ipv4Address: props.network.sysx?.tcp_config.ipv4,
-        subnetMask: props.network.sysx?.tcp_config.net_mask,
+        ipv4Settings: props.network.sysx?.ipv4_settings.auto ? '0' : '1',
+        ipv4Address: props.network.sysx?.ipv4_settings.ipv4,
+        subnetMask: props.network.sysx?.ipv4_settings.net_mask,
         defaultGateway: {
-          checked: props.network.sysx?.tcp_config.gateway_override,
-          value: props.network.sysx?.tcp_config.gateway,
+          checked: props.network.sysx?.ipv4_settings.gateway_override,
+          value: props.network.sysx?.ipv4_settings.gateway,
         },
       },
     })

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

@@ -55,21 +55,21 @@ export const addNetworkingZeroOrFirstSchemeDataFunc = (
     tcp_stack: portProperties.tcp,
     mtu: portProperties.mtu.size,
     services: {
-      management: portProperties.services.management,
-      vmotion: portProperties.services.vMotion,
-      provisioning: portProperties.services.provisioning,
-      vsan: portProperties.services.vSAN,
-      fault_tolerance_logging: portProperties.services.faultToleranceLogging,
-      vsphere_replication: portProperties.services.replication,
-      vsphere_replication_nfc: portProperties.services.replicationNFC,
-      vsphere_backup_nfc: portProperties.services.backupNFC,
-      nvme_over_tcp: portProperties.services.nVMeOverTCP,
-      nvme_over_rdma: portProperties.services.nVMeOverRDMA,
+      Management: portProperties.services.management,
+      VMotion: portProperties.services.vMotion,
+      Provisioning: portProperties.services.provisioning,
+      VSAN: portProperties.services.vSAN,
+      FaultToleranceLogging: portProperties.services.faultToleranceLogging,
+      VSphereReplication: portProperties.services.replication,
+      VSphereReplicationNFC: portProperties.services.replicationNFC,
+      VSphereBackupNFC: portProperties.services.backupNFC,
+      NVMeOverTCP: portProperties.services.nVMeOverTCP,
+      NVMeOverRDMA: portProperties.services.nVMeOverRDMA,
     },
-    tcp_config: {
+    ipv4_settings: {
       auto: ipFourSettings.ipSettings === '0',
       ipv4: ipFourSettings.static.ipFourAddress,
-      net_mask: ipFourSettings.static.subnetMask,
+      mask: ipFourSettings.static.subnetMask,
       gateway_override: ipFourSettings.static.defaultGateway.override,
       gateway: ipFourSettings.static.defaultGateway.override
           ? ipFourSettings.static.defaultGateway.value
@@ -90,12 +90,12 @@ export const addNetworkingZeroOrFirstSchemeDataFunc = (
 
   const isAutoIp: boolean = ipFourSettings.ipSettings === '0'
 
-  sendData.tcp_config = isAutoIp
+  sendData.ipv4_settings = isAutoIp
       ? { auto: true }
       : {
         auto: false,
         ipv4: ipFourSettings.static.ipFourAddress,
-        net_mask: ipFourSettings.static.subnetMask,
+        mask: ipFourSettings.static.subnetMask,
         gateway_override: ipFourSettings.static.defaultGateway.override,
         gateway: ipFourSettings.static.defaultGateway.override
             ? ipFourSettings.static.defaultGateway.value

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

@@ -8,9 +8,9 @@ export enum UI_E_ValidationFields {
   PORT_PROPERTIES_VLAN = 'new_network.vlan',
   PORT_PROPERTIES_MTU = 'mtu',
 
-  IPV_SETTINGS_IPV = 'tcp_config.ipv4',
-  IPV_SETTINGS_MASK = 'tcp_config.net_mask',
-  IPV_SETTINGS_GATEWAY = 'tcp_config.gateway',
+  IPV_SETTINGS_IPV = 'ipv4_settings.ipv4',
+  IPV_SETTINGS_MASK = 'ipv4_settings.mask',
+  IPV_SETTINGS_GATEWAY = 'ipv4_settings.gateway',
 
   CONNECTION_SETTINGS_NETWORK = 'name',
   CONNECTION_SETTINGS_VLAN = 'vlan',

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

@@ -110,21 +110,21 @@ export interface UI_I_AddNetworkingZeroOrFirstSchemeDataSend {
   tcp_stack: string
   mtu: number
   services: {
-    management: boolean
-    vmotion?: boolean
-    provisioning: boolean
-    vsan: boolean
-    fault_tolerance_logging: boolean
-    vsphere_replication: boolean
-    vsphere_replication_nfc: boolean
-    vsphere_backup_nfc: boolean
-    nvme_over_tcp: boolean
-    nvme_over_rdma: boolean
+    Management: boolean
+    VMotion?: boolean
+    Provisioning: boolean
+    VSAN: boolean
+    FaultToleranceLogging: boolean
+    VSphereReplication: boolean
+    VSphereReplicationNFC: boolean
+    VSphereBackupNFC: boolean
+    NVMeOverTCP: boolean
+    NVMeOverRDMA: boolean
   }
-  tcp_config: {
+  ipv4_settings: {
     auto: boolean
     ipv4?: string
-    net_mask?: string
+    mask?: string
     gateway_override?: boolean
     gateway?: string
   }

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

@@ -15,8 +15,7 @@ import {
 
 export const networkEditDataFunc = (
   networkData: UI_I_EditFieldsData,
-  id: string = '',
-  switchId: string = ''
+  initialData: UI_I_ModalsInitialData
 ): UI_I_NetworkEditSendData => {
   const { vlanId, networkLabel } =
     networkData.properties as UI_I_PropertiesFields
@@ -40,10 +39,24 @@ export const networkEditDataFunc = (
   const vlan: number =
     vlanId === 'None (0)' ? 0 : vlanId === 'All (4095)' ? 4095 : Number(vlanId)
 
-  const security: API_UI_I_Security = {
-    promiscuous: promiscuousMode.selected,
-    mac_change: macAddressChanges.selected,
-    forged_transmits: forgedTransmits.selected,
+  const security: API_UI_I_Security = {}
+
+  if (promiscuousMode.checked) {
+    security.promiscuous = promiscuousMode.selected
+  } else {
+    security.promiscuous_computed = promiscuousMode.selected
+  }
+
+  if (forgedTransmits.checked) {
+    security.forged_transmits = forgedTransmits.selected
+  } else {
+    security.forged_transmits_computed = forgedTransmits.selected
+  }
+
+  if (macAddressChanges.checked) {
+    security.mac_change = macAddressChanges.selected
+  } else {
+    security.mac_change_computed = macAddressChanges.selected
   }
 
   const shaping = {
@@ -54,17 +67,36 @@ export const networkEditDataFunc = (
     burst_size: burstSize,
   }
 
-  const teaming: API_UI_I_Teaming = {
-    mode: loadBalancing.selected,
-    link_detection_mode: networkFailureDetection.selected,
-    notify_switches: notifySwitches.selected,
-    failback: failback.selected,
+  const teaming: API_UI_I_Teaming = {}
+
+  if (loadBalancing.checked) {
+    teaming.mode = loadBalancing.selected
+  } else {
+    teaming.mode_computed = loadBalancing.selected
+  }
+
+  if (networkFailureDetection.checked) {
+    teaming.link_detection_mode = networkFailureDetection.selected
+  } else {
+    teaming.link_detection_mode_computed = networkFailureDetection.selected
+  }
+
+  if (notifySwitches.checked) {
+    teaming.notify_switches = notifySwitches.selected
+  } else {
+    teaming.notify_switches_computed = notifySwitches.selected
+  }
+
+  if (failback.checked) {
+    teaming.failback = failback.selected
+  } else {
+    teaming.failback_computed = failback.selected
   }
 
   return {
-    id,
+    id: initialData.id || '',
     name: networkLabel,
-    switch: switchId,
+    switch: initialData.switch_name || '',
     nics: {
       active,
       standby,

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

@@ -45,7 +45,7 @@
               <div class="property-value-group">
                 <fieldset>
                   <atoms-tooltip-error
-                    :has-error="!!props.messagesFields['tcp_config.ipv4'].field"
+                    :has-error="!!props.messagesFields['ipv4_settings.ipv4'].field"
                   >
                     <template #elem>
                       <input
@@ -56,13 +56,13 @@
                           'tooltip-field port-properties-network-label',
                           {
                             'danger-not-valid':
-                              props.messagesFields['tcp_config.ipv4'].field,
+                              props.messagesFields['ipv4_settings.ipv4'].field,
                           },
                         ]"
                       />
                     </template>
                     <template #content>
-                      {{ props.messagesFields['tcp_config.ipv4'].field }}
+                      {{ props.messagesFields['ipv4_settings.ipv4'].field }}
                     </template>
                   </atoms-tooltip-error>
                 </fieldset>
@@ -78,7 +78,7 @@
                 <fieldset>
                   <atoms-tooltip-error
                     :has-error="
-                      !!props.messagesFields['tcp_config.net_mask'].field
+                      !!props.messagesFields['ipv4_settings.mask'].field
                     "
                   >
                     <template #elem>
@@ -90,13 +90,13 @@
                           'tooltip-field',
                           {
                             'danger-not-valid':
-                              props.messagesFields['tcp_config.net_mask'].field,
+                              props.messagesFields['ipv4_settings.mask'].field,
                           },
                         ]"
                       />
                     </template>
                     <template #content>
-                      {{ props.messagesFields['tcp_config.net_mask'].field }}
+                      {{ props.messagesFields['ipv4_settings.mask'].field }}
                     </template>
                   </atoms-tooltip-error>
                 </fieldset>
@@ -128,7 +128,7 @@
                   <fieldset>
                     <atoms-tooltip-error
                       :has-error="
-                        !!props.messagesFields['tcp_config.gateway'].field
+                        !!props.messagesFields['ipv4_settings.gateway'].field
                       "
                     >
                       <template #elem>
@@ -141,14 +141,14 @@
                             'tooltip-field',
                             {
                               'danger-not-valid':
-                                props.messagesFields['tcp_config.gateway']
+                                props.messagesFields['ipv4_settings.gateway']
                                   .field,
                             },
                           ]"
                         />
                       </template>
                       <template #content>
-                        {{ props.messagesFields['tcp_config.gateway'].field }}
+                        {{ props.messagesFields['ipv4_settings.gateway'].field }}
                       </template>
                     </atoms-tooltip-error>
                   </fieldset>

package/package.json

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