bfg-common 1.3.132 → 1.3.134

package/components/common/diagramMain/modals/lib/config/initial.ts

@@ -12,6 +12,69 @@ import {
 export const teamingFailoverFieldsInitialFunc = (
   isSwitch: boolean,
   initialData?: UI_I_ModalsInitialData
+): UI_I_TeamingFailoverFields => {
+  const teaming = {
+    loadBalancing: {
+      checked: isSwitch,
+      selected: 3,
+    },
+    networkFailureDetection: {
+      checked: isSwitch,
+      selected: 1,
+    },
+    notifySwitches: {
+      checked: isSwitch,
+      selected: 1,
+    },
+    failback: {
+      checked: isSwitch,
+      selected: 1,
+    },
+    failoverOrder: {
+      checked: isSwitch,
+    },
+  }
+
+  initialData &&
+    initialData.nicTeamingPolicy?.forEach(
+      (sec: UI_I_NetworkSummaryPortletListItem) => {
+        switch (sec.id) {
+          case 'mode':
+            teaming.loadBalancing = {
+              checked: isSwitch || sec.initialValue.override,
+              selected: sec.initialValue.value as number,
+            }
+            return true
+          case 'link_detect':
+            teaming.networkFailureDetection = {
+              checked: isSwitch || sec.initialValue.override,
+              selected: sec.initialValue.value as number,
+            }
+            return true
+          case 'notify_switches':
+            teaming.notifySwitches = {
+              checked: isSwitch || sec.initialValue.override,
+              selected: sec.initialValue.value as number,
+            }
+            return true
+          case 'failback':
+            teaming.failback = {
+              checked: isSwitch || sec.initialValue.override,
+              selected: sec.initialValue.value as number,
+            }
+            return true
+        }
+      }
+    )
+
+  teaming.failoverOrder.checked = initialData?.nics_override || false
+
+  return teaming
+}
+
+export const teamingFailoverNetworkFieldsInitialFunc = (
+  isSwitch: boolean,
+  initialData?: UI_I_ModalsInitialData
 ): UI_I_TeamingFailoverFields => {
   const teaming = {
     loadBalancing: {
@@ -75,6 +138,54 @@ export const teamingFailoverFieldsInitialFunc = (
 export const securityFieldsInitialFunc = (
   isSwitch: boolean,
   initialData?: UI_I_ModalsInitialData
+): UI_I_SecurityFields => {
+  const security: UI_I_SecurityFields = {
+    promiscuousMode: {
+      checked: isSwitch,
+      selected: 1,
+    },
+    macAddressChanges: {
+      checked: isSwitch,
+      selected: 1,
+    },
+    forgedTransmits: {
+      checked: isSwitch,
+      selected: 1,
+    },
+  }
+
+  initialData &&
+    initialData.securityPolicy?.forEach(
+      (sec: UI_I_NetworkSummaryPortletListItem) => {
+        switch (sec.id) {
+          case 'promiscuous_mode':
+            security.promiscuousMode = {
+              checked: isSwitch || sec.initialValue.override,
+              selected: sec.initialValue.value as number,
+            }
+            return true
+          case 'mac_change':
+            security.macAddressChanges = {
+              checked: isSwitch || sec.initialValue.override,
+              selected: sec.initialValue.value as number,
+            }
+            return true
+          case 'forged_transmits':
+            security.forgedTransmits = {
+              checked: isSwitch || sec.initialValue.override,
+              selected: sec.initialValue.value as number,
+            }
+            return true
+        }
+      }
+    )
+
+  return security
+}
+
+export const securityNetworkFieldsInitialFunc = (
+  isSwitch: boolean,
+  initialData?: UI_I_ModalsInitialData
 ): UI_I_SecurityFields => {
   const security: UI_I_SecurityFields = {
     promiscuousMode: {
@@ -121,8 +232,50 @@ export const securityFieldsInitialFunc = (
 }
 export const trafficShapingFieldsInitialFunc = (
   isSwitch: boolean,
-  initialData: UI_I_ModalsInitialData,
-  speeds: UI_I_TrafficShapingSpeeds
+  initialData: UI_I_ModalsInitialData
+): UI_I_TrafficShapingFields => {
+  const trafficShapingInitialValue = initialData?.shapingPolicy?.find(
+    (sec: UI_I_NetworkSummaryPortletListItem) => sec.id === 'shaping_enabled'
+  )?.initialValue as UI_I_OverrideValue
+
+  let trafficShaping: UI_I_TrafficShapingFields = {
+    status: {
+      checked: isSwitch,
+      selected: 0,
+    },
+    average: 100000,
+    peak: 100000,
+    burstSize: 102400,
+  }
+
+  initialData &&
+    initialData.shapingPolicy?.forEach(
+      (sec: UI_I_NetworkSummaryPortletListItem) => {
+        switch (sec.id) {
+          case 'shaping_enabled':
+            trafficShaping.status = {
+              checked: isSwitch || trafficShapingInitialValue?.override,
+              selected: trafficShapingInitialValue?.value ? 1 : 0,
+            }
+            return true
+        }
+      }
+    )
+
+  initialData &&
+    (trafficShaping = {
+      ...trafficShaping,
+      average: initialData?.average_bw || 0,
+      peak: initialData?.average_bw || 0,
+      burstSize: initialData?.average_bw || 0,
+    })
+
+  return trafficShaping
+}
+
+export const trafficShapingNetworkFieldsInitialFunc = (
+  isSwitch: boolean,
+  initialData: UI_I_ModalsInitialData
 ): UI_I_TrafficShapingFields => {
   const trafficShapingInitialValue = initialData?.shapingPolicy?.find(
     (sec: UI_I_NetworkSummaryPortletListItem) => sec.id === 'shaping_enabled'
@@ -155,9 +308,9 @@ export const trafficShapingFieldsInitialFunc = (
   initialData &&
     (trafficShaping = {
       ...trafficShaping,
-      average: speeds?.average_bw,
-      peak: speeds?.peak_bw,
-      burstSize: speeds?.burst_size,
+      average: initialData?.average_bw || 0,
+      peak: initialData?.average_bw || 0,
+      burstSize: initialData?.average_bw || 0,
     })
 
   return trafficShaping

package/components/common/diagramMain/modals/lib/config/networkModal.ts

@@ -7,7 +7,7 @@ import {
 } from '~/components/common/diagramMain/lib/models/interfaces'
 
 export const networkViewSettingsModalTabsFunc = (
-    localization: UI_I_Localization
+  localization: UI_I_Localization
 ) => [
   {
     text: localization.all,
@@ -24,115 +24,117 @@ export const networkViewSettingsModalTabsFunc = (
 ]
 
 const findInitialValue = (
-    source: UI_I_NetworkSummaryPortletListItem[] | undefined,
-    id: string
+  source: UI_I_NetworkSummaryPortletListItem[] | undefined,
+  id: string
 ): UI_I_OverrideValue =>
-    source?.find(
-        (sourceItem: UI_I_NetworkSummaryPortletListItem) => sourceItem.id === id
-    )?.initialValue as UI_I_OverrideValue
+  source?.find(
+    (sourceItem: UI_I_NetworkSummaryPortletListItem) => sourceItem.id === id
+  )?.initialValue as UI_I_OverrideValue
 
 export const networkViewSettingsFunc = (
-    localization: UI_I_Localization,
-    initialData: UI_I_ModalsInitialData
+  localization: UI_I_Localization,
+  initialData: UI_I_ModalsInitialData
 ) => {
   const linkDetect: UI_I_OverrideValue = findInitialValue(
-      initialData.nicTeamingPolicy,
-      'link_detect'
+    initialData.nicTeamingPolicy,
+    'link_detect'
   )
 
   const failback: UI_I_OverrideValue = findInitialValue(
-      initialData.nicTeamingPolicy,
-      'failback'
+    initialData.nicTeamingPolicy,
+    'failback'
   )
 
   const loadBalancing: UI_I_OverrideValue = findInitialValue(
-      initialData.nicTeamingPolicy,
-      'mode'
+    initialData.nicTeamingPolicy,
+    'mode'
   )
 
   const notifySwitches: UI_I_OverrideValue = findInitialValue(
-      initialData.nicTeamingPolicy,
-      'notify_switches'
+    initialData.nicTeamingPolicy,
+    'notify_switches'
   )
 
   const promiscuousMode: UI_I_OverrideValue = findInitialValue(
-      initialData.securityPolicy,
-      'promiscuous_mode'
+    initialData.securityPolicy,
+    'promiscuous_mode'
   )
 
   const macAddressChanges: UI_I_OverrideValue = findInitialValue(
-      initialData.securityPolicy,
-      'mac_change'
+    initialData.securityPolicy,
+    'mac_change'
   )
 
   const forgedTransmits: UI_I_OverrideValue = findInitialValue(
-      initialData.securityPolicy,
-      'forged_transmits'
+    initialData.securityPolicy,
+    'forged_transmits'
   )
 
   const promiscuousModeValue: string =
-      promiscuousMode && promiscuousMode.value
-          ? promiscuousMode.value === 'yes'
-              ? localization.accept
-              : localization.reject
-          : '--'
+    promiscuousMode && promiscuousMode.value
+      ? promiscuousMode.value === 'yes'
+        ? localization.accept
+        : localization.reject
+      : '--'
 
   const macAddressChangesValue: string =
-      macAddressChanges && macAddressChanges.value
-          ? macAddressChanges.value === 'yes'
-              ? localization.accept
-              : localization.reject
-          : '--'
+    macAddressChanges && macAddressChanges.value
+      ? macAddressChanges.value === 'yes'
+        ? localization.accept
+        : localization.reject
+      : '--'
 
   const forgedTransmitsValue: string =
-      forgedTransmits && forgedTransmits.value
-          ? forgedTransmits.value === 'yes'
-              ? localization.accept
-              : localization.reject
-          : '--'
+    forgedTransmits && forgedTransmits.value
+      ? forgedTransmits.value === 'yes'
+        ? localization.accept
+        : localization.reject
+      : '--'
 
   const averageBandwidthValue: string = initialData.shapingPolicy?.[0]
-      .initialValue
-      ? `${initialData.average_bw} ${localization.kbitS}`
-      : '--'
+    .initialValue.value
+    ? `${initialData.average_bw} ${localization.kbitS}`
+    : '--'
 
   const peakBandwidthValue: string = initialData.shapingPolicy?.[0].initialValue
-      ? `${initialData.peak_bw} ${localization.kbitS}`
-      : '--'
+    .value
+    ? `${initialData.peak_bw} ${localization.kbitS}`
+    : '--'
 
   const burstSizeValue: string = initialData.shapingPolicy?.[0].initialValue
-      ? `${initialData.burst_size} ${localization.kb}`
-      : '--'
+    .value
+    ? `${initialData.burst_size} ${localization.kb}`
+    : '--'
 
   const loadBalancingValue: string = loadBalancing
-      ? (loadBalancing.value === 'balance-tcp' &&
-          localization.routeBasedIpHash) ||
+    ? (loadBalancing.value === 'balance-tcp' &&
+        localization.routeBasedIpHash) ||
       (loadBalancing.value === 'balance-slb' &&
-          localization.routeBasedSourceMacHash) ||
+        localization.routeBasedSourceMacHash) ||
       (loadBalancing.value === 'active-backup' &&
-          localization.useExplicitFailoverOrder) ||
+        localization.useExplicitFailoverOrder) ||
       '--'
-      : '--'
+    : '--'
 
   const networkFailureDetectionValue: string =
-      (linkDetect &&
-          linkDetect.value &&
-          localization[linkDetect.value.toString()]) ||
-      '--'
+    (linkDetect &&
+      linkDetect.value &&
+      localization[linkDetect.value.toString()]) ||
+    '--'
 
   const notifySwitchesValue: string =
-      notifySwitches && notifySwitches.value
-          ? notifySwitches.value === 'yes'
-              ? localization.yes
-              : localization.no
-          : '--'
+    notifySwitches && notifySwitches.value
+      ? notifySwitches.value === 'yes'
+        ? localization.yes
+        : localization.no
+      : '--'
 
   const failbackValue: string =
-      failback && failback.value
-          ? failback.value === 'yes'
-              ? localization.yes
-              : localization.no
-          : '--'
+    failback && failback.value
+      ? failback.value === 'yes'
+        ? localization.yes
+        : localization.no
+      : '--'
 
   return [
     {
@@ -227,7 +229,7 @@ export const networkViewSettingsFunc = (
 }
 
 export const networkEditSettingsTabsFunc = (
-    localization: UI_I_Localization
+  localization: UI_I_Localization
 ) => [
   {
     value: '1',
@@ -248,10 +250,10 @@ export const networkEditSettingsTabsFunc = (
 ]
 
 export const networkPopupFieldsFunc = (
-    localization: UI_I_Localization,
-    _networkType: string,
-    id: string,
-    inPortlet = false
+  localization: UI_I_Localization,
+  _networkType: string,
+  id: string,
+  inPortlet = false
 ) => {
   const formatedId = id.replaceAll('=', '_')
 
@@ -286,7 +288,64 @@ export const networkPopupFieldsFunc = (
 }
 
 export const teamingAndFailoverTemplateMakerFunc = (
-    localization: UI_I_Localization
+  localization: UI_I_Localization
+): UI_I_TeamingAndFailoverTemplate[] => [
+  {
+    key: 'loadBalancing',
+    options: [
+      {
+        value: 3,
+        text: localization.routeBasedIpHash,
+      },
+      {
+        value: 2,
+        text: localization.routeBasedSourceMacHash,
+      },
+      {
+        value: 1,
+        text: localization.useExplicitFailoverOrder,
+      },
+    ],
+  },
+  {
+    key: 'networkFailureDetection',
+    options: [
+      {
+        value: 1,
+        text: localization.linkStatusOnly,
+      },
+    ],
+  },
+  {
+    key: 'notifySwitches',
+    options: [
+      {
+        value: 2,
+        text: localization.no,
+      },
+      {
+        value: 1,
+        text: localization.yes,
+      },
+    ],
+  },
+  {
+    key: 'failback',
+    options: [
+      {
+        value: 2,
+        text: localization.no,
+      },
+      {
+        value: 1,
+        text: localization.yes,
+      },
+    ],
+  },
+]
+
+export const teamingAndFailoverNetworkTemplateMakerFunc = (
+  localization: UI_I_Localization
 ): UI_I_TeamingAndFailoverTemplate[] => [
   {
     key: 'loadBalancing',

package/components/common/diagramMain/modals/lib/config/switchModal.ts

@@ -24,7 +24,9 @@ export const switchEditSettingsTabsFunc = (localization: UI_I_Localization) => [
   },
 ]
 
-export const switchViewSettingsModalTabsFunc = (localization: UI_I_Localization) => [
+export const switchViewSettingsModalTabsFunc = (
+  localization: UI_I_Localization
+) => [
   {
     text: localization.all,
     value: 0,
@@ -43,9 +45,25 @@ export const switchViewSettingsFunc = (
   localization: UI_I_Localization,
   initialData: UI_I_ModalsInitialData
 ) => {
-  const linkDetect = initialData.nicTeamingPolicy?.find(
-    (teaming) => teaming.id === 'link_detect'
-  )?.initialValue as UI_I_OverrideValue
+  const loadBalancing =
+    initialData.nicTeamingPolicy?.find((teaming) => teaming.id === 'mode')
+      ?.value || 1
+
+  let loadBalancingValue: string
+
+  switch (loadBalancing) {
+    case 1:
+      loadBalancingValue = localization.useExplicitFailoverOrder
+      break
+    case 2:
+      loadBalancingValue = localization.routeBasedSourceMacHash
+      break
+    case 3:
+      loadBalancingValue = localization.routeBasedIpHash
+      break
+    default:
+      loadBalancingValue = '--'
+  }
 
   return [
     {
@@ -74,7 +92,7 @@ export const switchViewSettingsFunc = (
             initialData.securityPolicy?.find(
               (sec: UI_I_NetworkSummaryPortletListItem) =>
                 sec.id === 'promiscuous_mode'
-            )?.initialValue === 'yes'
+            )?.initialValue?.value === 1
               ? localization.accept
               : localization.reject,
         },
@@ -82,8 +100,9 @@ export const switchViewSettingsFunc = (
           name: localization.macAddressChanges,
           value:
             initialData.securityPolicy?.find(
-              (sec: UI_I_NetworkSummaryPortletListItem) => sec.id === 'mac_change'
-            )?.initialValue === 'yes'
+              (sec: UI_I_NetworkSummaryPortletListItem) =>
+                sec.id === 'mac_change'
+            )?.initialValue?.value === 1
               ? localization.accept
               : localization.reject,
         },
@@ -93,7 +112,7 @@ export const switchViewSettingsFunc = (
             initialData.securityPolicy?.find(
               (sec: UI_I_NetworkSummaryPortletListItem) =>
                 sec.id === 'forged_transmits'
-            )?.initialValue === 'yes'
+            )?.initialValue?.value === 1
               ? localization.accept
               : localization.reject,
         },
@@ -106,19 +125,19 @@ export const switchViewSettingsFunc = (
       rows: [
         {
           name: localization.averageBandwidth,
-          value: initialData.shapingPolicy?.[0].initialValue
+          value: initialData.shapingPolicy?.[0].initialValue.value
             ? `${initialData.average_bw} ${localization.kbitS}`
             : '--',
         },
         {
           name: localization.peakBandwidth,
-          value: initialData.shapingPolicy?.[0].initialValue
+          value: initialData.shapingPolicy?.[0].initialValue.value
             ? `${initialData.peak_bw} ${localization.kbitS}`
             : '--',
         },
         {
           name: localization.burstSize,
-          value: initialData.shapingPolicy?.[0].initialValue
+          value: initialData.shapingPolicy?.[0].initialValue.value
             ? `${initialData.burst_size} ${localization.kb}`
             : '--',
         },
@@ -131,28 +150,34 @@ export const switchViewSettingsFunc = (
       rows: [
         {
           name: localization.loadBalancing,
-          value: initialData.nicTeamingPolicy?.find(
-            (teaming) => teaming.id === 'mode'
-          )?.value,
+          value: loadBalancingValue,
         },
         {
           name: localization.networkFailureDetection,
           value:
-            linkDetect &&
-            linkDetect.value &&
-            localization[linkDetect.value.toString()],
+            initialData.nicTeamingPolicy?.find(
+              (teaming) => teaming.id === 'link_detect'
+            )?.value === 1
+              ? localization.linkStatusOnly
+              : localization.beaconProbing,
         },
         {
           name: localization.notifySwitches,
-          value: initialData.nicTeamingPolicy?.find(
-            (teaming) => teaming.id === 'notify_switches'
-          )?.value,
+          value:
+            initialData.nicTeamingPolicy?.find(
+              (teaming) => teaming.id === 'notify_switches'
+            )?.value === 1
+              ? localization.yes
+              : localization.no,
         },
         {
           name: localization.failback,
-          value: initialData.nicTeamingPolicy?.find(
-            (teaming) => teaming.id === 'failback'
-          )?.value,
+          value:
+            initialData.nicTeamingPolicy?.find(
+              (teaming) => teaming.id === 'failback'
+            )?.value === 1
+              ? localization.yes
+              : localization.no,
         },
         {
           name: localization.activeAdapters,

package/components/common/diagramMain/network/Network.vue

@@ -36,6 +36,7 @@
       :network="props.network"
       :selected-port="props.selectedPort"
       :selected-adapter="props.selectedAdapter"
+      :is-dark-mode="props.isDarkMode"
       @select-port="onSelectPort"
       @show-modal="onShowModal"
     />
@@ -59,6 +60,7 @@ const props = defineProps<{
   selectedNetwork: string
   inPortlet: boolean
   isVisibleLine: boolean
+  isDarkMode: boolean
 }>()
 
 const isNetworkConnectedSelectedAdapter = computed<boolean>(

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

@@ -115,7 +115,7 @@
         />
         <atoms-diagram-icon
           v-if="isVCenter || (isVMPortsGroup && !props.port.isActive)"
-          name="outline-port"
+          :name="inactivePortIconName"
         />
       </div>
     </foreignObject>
@@ -142,6 +142,7 @@ const props = defineProps<{
   port: UI_I_Port & { portPosition: number }
   selectedPort: UI_I_SelectedPort
   selectedAdapter: UI_I_SelectedAdapter
+  isDarkMode: boolean
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
@@ -155,6 +156,10 @@ const emits = defineEmits<{
   ): void
 }>()
 
+const inactivePortIconName = computed<string>(
+  () => `outline-port${props.isDarkMode ? '-dark-mode' : ''}`
+)
+
 const portTitlePosition = computed<number>(() => props.port.portPosition - 5)
 
 const isVmKernel = computed<boolean>(

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

@@ -5,6 +5,7 @@
         <common-diagram-main-port
           :network="props.network"
           :port="port"
+          :is-dark-mode="props.isDarkMode"
           :selected-port="props.selectedPort"
           :selected-adapter="props.selectedAdapter"
           @select-port="onSelectPort"
@@ -27,11 +28,16 @@ const props = defineProps<{
   network: UI_I_NetworkFullWithPositions
   selectedPort: UI_I_SelectedPort
   selectedAdapter: UI_I_SelectedAdapter
+  isDarkMode: boolean
 }>()
 
 const emits = defineEmits<{
   (event: 'select-port', networkId: string, portId: string): void
-  (event: 'show-modal', value: string, properties?: UI_I_ModalsInitialData): void
+  (
+    event: 'show-modal',
+    value: string,
+    properties?: UI_I_ModalsInitialData
+  ): void
 }>()
 
 const onSelectPort = (networkId: string, portId: string) =>