bfg-common 1.3.222 → 1.3.224

package/components/atoms/tooltip/Signpost.vue

@@ -1,225 +1,225 @@
-<template>
-  <div
-    id="signpost"
-    :class="['signpost', signpostClass]"
-    :style="signpostStyles"
-    @click.stop
-    @mouseenter="hovered = true"
-    @mouseleave="hovered = false"
-  >
-    <div class="signpost-wrap">
-      <div class="popover-pointer" />
-      <div class="signpost-content-header">
-        <button
-          :id="`${props.testId}-close-icon`"
-          class="signpost-action close"
-          @click="hide"
-        >
-          <atoms-the-icon class="close-icon" name="close" />
-        </button>
-      </div>
-      <div class="signpost-content-body">
-        <slot />
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { UI_I_ElPosition } from '~/components/atoms/tooltip/lib/models/interfaces'
-const props = withDefaults(
-  defineProps<{
-    elemId: string
-    testId?: string
-  }>(),
-  { testId: 'ui-signpost' }
-)
-const emits = defineEmits<{
-  (event: 'hide'): void
-}>()
-const hide = (): void => {
-  emits('hide')
-}
-
-const signpostStyles = ref<UI_I_ElPosition | null>(null)
-watch(
-  () => props.elemId,
-  (newValue: string) => {
-    const element =
-      (document.getElementById(newValue) as HTMLDivElement) || null
-    const { width, x, y } = element.getBoundingClientRect()
-
-    signpostStyles.value = {
-      top: `${y}px`,
-      left: `${x + width / 2}px`,
-    }
-    setTimeout(() => {
-      setSignpostPosition()
-    }, 0)
-  },
-  { immediate: true }
-)
-const signpostClass = ref<string[]>([])
-const setSignpostPosition = (): void => {
-  const signpost =
-    (document.getElementById('signpost') as HTMLDivElement) || null
-  const signpostRect = (signpost?.getBoundingClientRect() as DOMRect) || null
-
-  type PositionX = 'right' | 'left'
-  let positionX: PositionX = 'right'
-
-  type PositionY = 'top' | 'middle'
-  let positionY: PositionY = 'middle'
-
-  const isOutRight = signpostRect.left + signpostRect.width > window.innerWidth
-  const isOutTop = signpostRect.top < 0
-
-  if (isOutTop) {
-    positionY = 'top'
-  }
-  if (isOutRight) {
-    positionX = 'left'
-  }
-
-  signpostClass.value.push(positionY)
-  signpostClass.value.push(positionX)
-  signpostClass.value.push('show')
-}
-
-const hovered = ref<boolean>(false)
-const windowClick = (): void => {
-  hide()
-}
-const windowScroll = (): void => {
-  if (hovered.value) {
-    return
-  }
-  hide()
-}
-onMounted(() => {
-  setTimeout(() => {
-    window.addEventListener('click', windowClick)
-    window.addEventListener('scroll', windowScroll, true)
-  })
-})
-onUnmounted(() => {
-  window.removeEventListener('click', windowClick)
-  window.removeEventListener('scroll', windowScroll, true)
-})
-</script>
-
-<style scoped lang="scss">
-.signpost {
-  opacity: 0;
-  position: fixed;
-  cursor: default;
-  transform: translateY(calc(-50% + 14px)) translateX(20px);
-  z-index: 1000000000;
-
-  &.show {
-    opacity: 1;
-  }
-  &.left {
-    transform: translateY(calc(-50% + 14px)) translateX(calc(-100% - 20px));
-
-    .signpost-wrap {
-      .popover-pointer {
-        left: 100%;
-        border-right: unset;
-        border-left: 12px solid var(--signpost-border-color);
-
-        &::before {
-          border-right: unset;
-          border-left: 12px solid var(--signpost-bgcolor);
-          left: unset;
-          right: 2px;
-        }
-      }
-    }
-  }
-  &.top {
-    transform: translateY(calc(0% + 10px)) translateX(20px);
-
-    &.left {
-      transform: translateY(calc(0% + 10px)) translateX(calc(-100% - 20px));
-
-      .popover-pointer {
-        top: 5px;
-      }
-    }
-
-    .signpost-wrap {
-      .popover-pointer {
-        top: 5px;
-      }
-    }
-  }
-
-  .signpost-wrap {
-    border-radius: 3px;
-    border: 1px solid var(--signpost-border-color);
-    background-color: var(--signpost-bgcolor);
-    position: relative;
-
-    .popover-pointer {
-      border-bottom: 12px solid transparent;
-      top: 50%;
-      transform: translateY(-50%);
-      border-right: 12px solid var(--signpost-border-color);
-      left: -12px;
-      height: 0;
-      width: 0;
-      position: absolute;
-
-      &::before {
-        border-bottom: 12px solid transparent;
-        top: 1px;
-        border-right: 12px solid var(--signpost-bgcolor);
-        left: 2px;
-        content: '';
-        height: 0;
-        width: 0;
-        position: absolute;
-      }
-    }
-
-    .signpost-content-header {
-      display: flex;
-      justify-content: flex-end;
-      position: absolute;
-      width: 100%;
-      background-color: inherit;
-      top: 0;
-
-      button {
-        line-height: 24px;
-
-        .close-icon {
-          width: 16px;
-          height: 16px;
-        }
-      }
-    }
-
-    .signpost-content-body {
-      padding: 24px;
-      max-height: 480px;
-      overflow-y: auto;
-      text-transform: none;
-    }
-  }
-}
-</style>
-
-<style>
-:root {
-  --signpost-bgcolor: #fff;
-  --signpost-border-color: #b3b3b3;
-  --signpost-color: #acbac3;
-}
-:root.dark-theme {
-  --signpost-bgcolor: #21333b;
-  --signpost-border-color: #000;
-  --signpost-color: #acbac3;
-}
-</style>
+<template>
+  <div
+    id="signpost"
+    :class="['signpost', signpostClass]"
+    :style="signpostStyles"
+    @click.stop
+    @mouseenter="hovered = true"
+    @mouseleave="hovered = false"
+  >
+    <div class="signpost-wrap">
+      <div class="popover-pointer" />
+      <div class="signpost-content-header">
+        <button
+          :id="`${props.testId}-close-icon`"
+          class="signpost-action close"
+          @click="hide"
+        >
+          <atoms-the-icon class="close-icon" name="close" />
+        </button>
+      </div>
+      <div class="signpost-content-body">
+        <slot />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { UI_I_ElPosition } from '~/components/atoms/tooltip/lib/models/interfaces'
+const props = withDefaults(
+  defineProps<{
+    elemId: string
+    testId?: string
+  }>(),
+  { testId: 'ui-signpost' }
+)
+const emits = defineEmits<{
+  (event: 'hide'): void
+}>()
+const hide = (): void => {
+  emits('hide')
+}
+
+const signpostStyles = ref<UI_I_ElPosition | null>(null)
+watch(
+  () => props.elemId,
+  (newValue: string) => {
+    const element =
+      (document.getElementById(newValue) as HTMLDivElement) || null
+    const { width, x, y } = element.getBoundingClientRect()
+
+    signpostStyles.value = {
+      top: `${y}px`,
+      left: `${x + width / 2}px`,
+    }
+    setTimeout(() => {
+      setSignpostPosition()
+    }, 0)
+  },
+  { immediate: true }
+)
+const signpostClass = ref<string[]>([])
+const setSignpostPosition = (): void => {
+  const signpost =
+    (document.getElementById('signpost') as HTMLDivElement) || null
+  const signpostRect = (signpost?.getBoundingClientRect() as DOMRect) || null
+
+  type PositionX = 'right' | 'left'
+  let positionX: PositionX = 'right'
+
+  type PositionY = 'top' | 'middle'
+  let positionY: PositionY = 'middle'
+
+  const isOutRight = signpostRect.left + signpostRect.width > window.innerWidth
+  const isOutTop = signpostRect.top < 0
+
+  if (isOutTop) {
+    positionY = 'top'
+  }
+  if (isOutRight) {
+    positionX = 'left'
+  }
+
+  signpostClass.value.push(positionY)
+  signpostClass.value.push(positionX)
+  signpostClass.value.push('show')
+}
+
+const hovered = ref<boolean>(false)
+const windowClick = (): void => {
+  hide()
+}
+const windowScroll = (): void => {
+  if (hovered.value) {
+    return
+  }
+  hide()
+}
+onMounted(() => {
+  setTimeout(() => {
+    window.addEventListener('click', windowClick)
+    window.addEventListener('scroll', windowScroll, true)
+  })
+})
+onUnmounted(() => {
+  window.removeEventListener('click', windowClick)
+  window.removeEventListener('scroll', windowScroll, true)
+})
+</script>
+
+<style scoped lang="scss">
+.signpost {
+  opacity: 0;
+  position: fixed;
+  cursor: default;
+  transform: translateY(calc(-50% + 14px)) translateX(20px);
+  z-index: 1000000000;
+
+  &.show {
+    opacity: 1;
+  }
+  &.left {
+    transform: translateY(calc(-50% + 14px)) translateX(calc(-100% - 20px));
+
+    .signpost-wrap {
+      .popover-pointer {
+        left: 100%;
+        border-right: unset;
+        border-left: 12px solid var(--signpost-border-color);
+
+        &::before {
+          border-right: unset;
+          border-left: 12px solid var(--signpost-bgcolor);
+          left: unset;
+          right: 2px;
+        }
+      }
+    }
+  }
+  &.top {
+    transform: translateY(calc(0% + 10px)) translateX(20px);
+
+    &.left {
+      transform: translateY(calc(0% + 10px)) translateX(calc(-100% - 20px));
+
+      .popover-pointer {
+        top: 5px;
+      }
+    }
+
+    .signpost-wrap {
+      .popover-pointer {
+        top: 5px;
+      }
+    }
+  }
+
+  .signpost-wrap {
+    border-radius: 3px;
+    border: 1px solid var(--signpost-border-color);
+    background-color: var(--signpost-bgcolor);
+    position: relative;
+
+    .popover-pointer {
+      border-bottom: 12px solid transparent;
+      top: 50%;
+      transform: translateY(-50%);
+      border-right: 12px solid var(--signpost-border-color);
+      left: -12px;
+      height: 0;
+      width: 0;
+      position: absolute;
+
+      &::before {
+        border-bottom: 12px solid transparent;
+        top: 1px;
+        border-right: 12px solid var(--signpost-bgcolor);
+        left: 2px;
+        content: '';
+        height: 0;
+        width: 0;
+        position: absolute;
+      }
+    }
+
+    .signpost-content-header {
+      display: flex;
+      justify-content: flex-end;
+      position: absolute;
+      width: 100%;
+      background-color: inherit;
+      top: 0;
+
+      button {
+        line-height: 24px;
+
+        .close-icon {
+          width: 16px;
+          height: 16px;
+        }
+      }
+    }
+
+    .signpost-content-body {
+      padding: 24px;
+      max-height: 480px;
+      overflow-y: auto;
+      text-transform: none;
+    }
+  }
+}
+</style>
+
+<style>
+:root {
+  --signpost-bgcolor: #fff;
+  --signpost-border-color: #b3b3b3;
+  --signpost-color: #acbac3;
+}
+:root.dark-theme {
+  --signpost-bgcolor: #21333b;
+  --signpost-border-color: #000;
+  --signpost-color: #acbac3;
+}
+</style>

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,
         },
       },
     })