bfg-common 1.5.843 → 1.5.845

package/assets/localization/local_be.json

@@ -3591,7 +3591,15 @@
     "configureOptionsForCloneVm": "Наладзьце параметры запуску, аперацыйнай сістэмы і абсталявання новай віртуальнай машыны.",
     "vmStoragePolicy": "Палітыка захоўвання ВМ",
     "hostUsbDevice": "USB-прылада хоста",
-    "newHostUsbDevice": "Новая USB-прылада хоста"
+    "newHostUsbDevice": "Новая USB-прылада хоста",
+    "emptyElement": "Пусты элемент у пазіцыі {0}",
+    "cpuOutOfRange": "Працэсар {0} па-за дапушчальным дыяпазонам (0-{1})",
+    "cpuDuplicate": "Працэсар {0} пазначаны больш за адзін раз",
+    "invalidRange": "Няправільны дыяпазон: {0} (пачатковае значэнне большае за канчатковае)",
+    "rangeStartOutOfRange": "Пачатак дыяпазону {0} па-за дапушчальным дыяпазонам (0-{1})",
+    "rangeEndOutOfRange": "Канец дыяпазону {0} па-за дапушчальным дыяпазонам (0-{1})",
+    "rangeDuplicate": "Працэсар {0} пазначаны больш за адзін раз",
+    "invalidFormat": "Няправільны фармат: \"{0}\". Выкарыстоўвайце лікі (напрыклад, \"0\") або дыяпазоны (напрыклад, \"0-3\")"
   },
   "feedback": {
     "additionalDetailsHelp": "Даведка па дадатковых звестках",

package/assets/localization/local_en.json

@@ -3595,7 +3595,15 @@
     "configureOptionsForCloneVm": "Configure startup parameters, operating system, and hardware for the new virtual machine.",
     "vmStoragePolicy": "VM storage policy",
     "hostUsbDevice": "Host USB Device",
-    "newHostUsbDevice": "New Host USB Device"
+    "newHostUsbDevice": "New Host USB Device",
+    "emptyElement": "Empty element at position {0}",
+    "cpuOutOfRange": "Processor {0} is out of valid range (0-{1})",
+    "cpuDuplicate": "Processor {0} is specified more than once",
+    "invalidRange": "Invalid range: {0} (start value is greater than end value)",
+    "rangeStartOutOfRange": "Range start {0} is out of valid range (0-{1})",
+    "rangeEndOutOfRange": "Range end {0} is out of valid range (0-{1})",
+    "rangeDuplicate": "Processor {0} is specified more than once",
+    "invalidFormat": "Invalid format: \"{0}\". Use numbers (e.g., \"0\") or ranges (e.g., \"0-3\")"
   },
   "feedback": {
     "additionalDetailsHelp": "Additional Details Help",

package/assets/localization/local_hy.json

@@ -3595,7 +3595,15 @@
     "configureOptionsForCloneVm": "Կարգավորեք նոր վիրտուալ մեքենայի մեկնարկային պարամետրերը, օպերացիոն համակարգը և սարքավորումները:",
     "vmStoragePolicy": "ՎՄ պահպանման քաղաքականություն",
     "hostUsbDevice": "Հոստի USB սարք",
-    "newHostUsbDevice": "Հոստի նոր USB սարք"
+    "newHostUsbDevice": "Հոստի նոր USB սարք",
+    "emptyElement": "Դատարկ տարր {0} դիրքում",
+    "cpuOutOfRange": "Պրոցեսոր {0} թույլատրելի տիրույթից դուրս է (0-{1})",
+    "cpuDuplicate": "Պրոցեսոր {0}-ը նշված է մեկից ավելի անգամ",
+    "invalidRange": "Անվավեր տիրույթ: {0} (սկզբնական արժեքը մեծ է վերջնականից)",
+    "rangeStartOutOfRange": "Տիրույթի սկիզբ {0} թույլատրելի տիրույթից դուրս է (0-{1})",
+    "rangeEndOutOfRange": "Տիրույթի վերջ {0} թույլատրելի տիրույթից դուրս է (0-{1})",
+    "rangeDuplicate": "Պրոցեսոր {0}-ը նշված է մեկից ավելի անգամ",
+    "invalidFormat": "Անվավեր ձևաչափ: \"{0}\". Օգտագործեք թվեր (օրինակ՝ \"0\") կամ տիրույթներ (օրինակ՝ \"0-3\")"
   },
   "feedback": {
     "additionalDetailsHelp": "Լրացուցիչ մանրամասներ Օգնություն",

package/assets/localization/local_kk.json

@@ -3594,7 +3594,15 @@
     "configureOptionsForCloneVm": "Жаңа виртуалды машинаның іске қосу параметрлерін, операциялық жүйесін және жабдықтарын баптаңыз.",
     "vmStoragePolicy": "ВМ сақтау саясаты",
     "hostUsbDevice": "Хосттың USB құрылғысы",
-    "newHostUsbDevice": "Хосттың жаңа USB құрылғысы"
+    "newHostUsbDevice": "Хосттың жаңа USB құрылғысы",
+    "emptyElement": "{0} позициясында бос элемент",
+    "cpuOutOfRange": "{0} процессоры рұқсат етілген ауқымнан тыс (0-{1})",
+    "cpuDuplicate": "{0} процессоры бірнеше рет көрсетілген",
+    "invalidRange": "Қате ауқым: {0} (бастапқы мәні соңғы мәннен үлкен)",
+    "rangeStartOutOfRange": "Ауқымның басы {0} рұқсат етілген ауқымнан тыс (0-{1})",
+    "rangeEndOutOfRange": "Ауқымның соңы {0} рұқсат етілген ауқымнан тыс (0-{1})",
+    "rangeDuplicate": "{0} процессоры бірнеше рет көрсетілген",
+    "invalidFormat": "Қате пішім: \"{0}\". Сандарды (мысалы, \"0\") немесе ауқымдарды (мысалы, \"0-3\") пайдаланыңыз"
   },
   "feedback": {
     "additionalDetailsHelp": "Қосымша мәліметтер анықтамасы",

package/assets/localization/local_ru.json

@@ -3594,7 +3594,15 @@
     "configureOptionsForCloneVm": "Настройте параметры запуска, операционной системы и оборудования новой виртуальной машины.",
     "vmStoragePolicy": "Политика хранения ВМ",
     "hostUsbDevice": "USB-устройство хоста",
-    "newHostUsbDevice": "Новое USB-устройство хоста"
+    "newHostUsbDevice": "Новое USB-устройство хоста",
+    "emptyElement": "Пустой элемент в позиции {0}",
+    "cpuOutOfRange": "Процессор {0} вне допустимого диапазона (0-{1})",
+    "cpuDuplicate": "Процессор {0} указан более одного раза",
+    "invalidRange": "Неверный диапазон: {0} (начальное значение больше конечного)",
+    "rangeStartOutOfRange": "Начало диапазона {0} вне допустимого диапазона (0-{1})",
+    "rangeEndOutOfRange": "Конец диапазона {0} вне допустимого диапазона (0-{1})",
+    "rangeDuplicate": "Процессор {0} указан более одного раза",
+    "invalidFormat": "Неверный формат: \"{0}\". Используйте числа (например, \"0\") или диапазоны (например, \"0-3\")"
   },
   "feedback": {
     "additionalDetailsHelp": "Дополнительная информация Помощь",

package/assets/localization/local_zh.json

@@ -3592,7 +3592,15 @@
     "configureOptionsForCloneVm": "配置新虚拟机的启动参数、操作系统和硬件。",
     "vmStoragePolicy": "虚拟机存储策略",
     "hostUsbDevice": "主机USB设备",
-    "newHostUsbDevice": "新主机USB设备"
+    "newHostUsbDevice": "新主机USB设备",
+    "emptyElement": "位置 {0} 处的空元素",
+    "cpuOutOfRange": "处理器 {0} 超出有效范围 (0-{1})",
+    "cpuDuplicate": "处理器 {0} 被多次指定",
+    "invalidRange": "无效范围: {0} (起始值大于结束值)",
+    "rangeStartOutOfRange": "范围起始值 {0} 超出有效范围 (0-{1})",
+    "rangeEndOutOfRange": "范围结束值 {0} 超出有效范围 (0-{1})",
+    "rangeDuplicate": "处理器 {0} 被多次指定",
+    "invalidFormat": "无效格式: \"{0}\"。请使用数字（例如 \"0\"）或范围（例如 \"0-3\"）"
   },
   "feedback": {
     "additionalDetailsHelp": "其他详细信息帮助",

package/components/common/vm/actions/add/Add.vue

@@ -48,6 +48,7 @@
     :is-loading="isLoading"
     :selected-template-id="props.selectedTemplateId"
     :validate-empty-name="props.validateEmptyName"
+    :nums="props.nums"
     :title="title"
     :name-request-url="props.nameRequestUrl"
     :validation-description="validationDescription"
@@ -153,6 +154,7 @@ const props = withDefaults(
     capabilities?: UI_I_Capabilities
     vmtSettings?: UI_I_VmSettings | null
     validateEmptyName?: boolean
+    nums?: any // для прокуратора
     dataCenter?: UI_I_TreeNode // для сферы
     computeResource?: UI_I_TreeNode // для сферы
     computeResourceTree?: UI_I_TreeNode[] // для сферы
@@ -165,6 +167,7 @@ const props = withDefaults(
     capabilities: undefined,
     vmtSettings: undefined,
     validateEmptyName: false,
+    nums: null, // для прокуратора
     dataCenter: null,
     computeResource: null,
     computeResourceTree: undefined,

package/components/common/vm/actions/add/New.vue

@@ -274,6 +274,7 @@
               :mediated-devices="props.mediatedDevices"
               :compute-resource="computeResource"
               :compatibility-info="props.compatibilityInfo"
+              :nums="props.nums"
               @get-storage="emits('get-storage', $event)"
               @get-folders-or-files="emits('get-folders-or-files', $event)"
               @get-active-device-child="
@@ -335,6 +336,7 @@
               :mediated-devices="props.mediatedDevices"
               :compute-resource="computeResource"
               :compatibility-info="props.compatibilityInfo"
+              :nums="props.nums"
               is-clone
               @get-storage="emits('get-storage', $event)"
               @get-folders-or-files="emits('get-folders-or-files', $event)"
@@ -488,6 +490,7 @@ const props = withDefaults(
     validateEmptyName: boolean
     validationDescription: string
     nameExistValidation: string
+    nums?: any // для прокуратора
     isShowSelectTemplate: boolean
     title: string
     nameRequestUrl: string
@@ -505,6 +508,7 @@ const props = withDefaults(
     selectedTemplateId?: string
   }>(),
   {
+    nums: null,
     isLoadingComputeTree: false,
     computeResourceAlert: () => [],
     compatibilityText: () => ['none', ''],

package/components/common/vm/actions/add/Old.vue

@@ -122,6 +122,7 @@
             :passthrough-devices="props.passthroughDevices"
             :mediated-devices="props.mediatedDevices"
             :compute-resource="computeResource"
+            :nums="props.nums"
             @get-storage="emits('get-storage', $event)"
             @get-folders-or-files="emits('get-folders-or-files', $event)"
             @get-active-device-child="emits('get-active-device-child', $event)"
@@ -161,6 +162,7 @@
             :passthrough-devices="props.passthroughDevices"
             :mediated-devices="props.mediatedDevices"
             :compute-resource="computeResource"
+            :nums="props.nums"
             is-clone
             @get-storage="emits('get-storage', $event)"
             @get-folders-or-files="emits('get-folders-or-files', $event)"
@@ -287,6 +289,7 @@ const props = withDefaults(
     nameExistValidation: string
     isShowPowerOn: boolean
     validateEmptyName: boolean
+    nums?: any // для прокуратора
     title: string
     nameRequestUrl: string
     nameTestIds: UI_I_NameTestIds
@@ -305,6 +308,7 @@ const props = withDefaults(
     isLoadingComputeTree: false,
     computeResourceAlert: () => [],
     compatibilityText: () => ['none', ''],
+    nums: null,
     dataCenter: null,
     computeResourceTree: undefined,
     locationNodes: () => [],

package/components/common/vm/actions/clone/Clone.vue

@@ -46,6 +46,7 @@
         :compatibility-info="compatibilityInfo"
         :max-memory="maxMemory"
         :cpu-models="cpuModels"
+        :nums="props.nums"
         @get-folders-or-files="emits('get-folders-or-files', $event)"
         @change-name="onChangeName"
         @change-storage="onChangeStorage"
@@ -137,6 +138,7 @@ const props = withDefaults(
     computeResource?: UI_I_TreeNode // для сферы
     computeResourceTree?: UI_I_TreeNode[] // для сферы
     locationNodes?: UI_I_TreeNode[] // для сферы
+    nums: any // TODO
   }>(),
   {
     capabilities: undefined,
@@ -147,6 +149,7 @@ const props = withDefaults(
     computeResource: null,
     computeResourceTree: undefined,
     locationNodes: () => [],
+    nums: null
   }
 )
 

package/components/common/vm/actions/clone/new/New.vue

@@ -181,6 +181,7 @@
             :datastore="props.datastore"
             :is-datastore-loading="props.isDatastoreLoading"
             :project="props.project"
+            :nums="props.nums"
             is-clone
             @get-storage="emits('get-storage', $event)"
             @get-folders-or-files="emits('get-folders-or-files', $event)"
@@ -345,11 +346,13 @@ const props = withDefaults(
     computeResourceAlert?: string[] // для сферы
     compatibilityText?: [UI_T_CompatibilityStatus, string] // для сферы
     compatibilityInfo?: string
+    nums?: any
   }>(),
   {
     isLoadingComputeTree: false,
     computeResourceAlert: () => [],
     compatibilityText: () => ['none', ''],
+    nums: null
   }
 )
 

package/components/common/vm/actions/clone/old/Old.vue

@@ -110,6 +110,7 @@
             :datastore="props.datastore"
             :is-datastore-loading="props.isDatastoreLoading"
             :project="props.project"
+            :nums="props.nums"
             is-clone
             @get-storage="emits('get-storage', $event)"
             @get-folders-or-files="emits('get-folders-or-files', $event)"
@@ -207,11 +208,13 @@ const props = withDefaults(
     isLoadingComputeTree?: boolean // для сферы
     computeResourceAlert?: string[] // для сферы
     compatibilityText?: [UI_T_CompatibilityStatus, string] // для сферы
+    nums?: any // TODO
   }>(),
   {
     isLoadingComputeTree: false,
     computeResourceAlert: () => [],
     compatibilityText: () => ['none', ''],
+    nums: null
   }
 )
 

package/components/common/vm/actions/common/customizeHardware/CustomizeHardware.vue

@@ -32,6 +32,7 @@
     :compute-resource="props.computeResource"
     :compatibility-info="props.compatibilityInfo"
     :is-vmt="props.isVmt"
+    :nums="props.nums"
     @next="emits('next')"
     @get-storage="emits('get-storage', $event)"
     @get-folders-or-files="emits('get-folders-or-files', $event)"
@@ -109,6 +110,7 @@ const props = withDefaults(
     computeResource?: UI_I_TreeNode | null
     compatibilityInfo?: string
     isVmt?: boolean
+    nums?: any // для прокуратора
   }>(),
   {
     vmCpuHelpTextSecond: undefined,
@@ -128,6 +130,7 @@ const props = withDefaults(
     computeResource: undefined,
     compatibilityInfo: undefined,
     isVmt: undefined,
+    nums: null
   }
 )
 const emits = defineEmits<{

package/components/common/vm/actions/common/customizeHardware/New.vue

@@ -52,6 +52,7 @@
         :guest-machine-type="model.machine_type"
         :computeResource="props.computeResource"
         :compatibility-info="props.compatibilityInfo"
+        :nums="props.nums"
         @get-storage="emits('get-storage', $event)"
         @get-folders-or-files="emits('get-folders-or-files', $event)"
         @get-active-device-child="emits('get-active-device-child', $event)"
@@ -145,6 +146,7 @@ const props = withDefaults(
     computeResource?: UI_I_TreeNode | null
     compatibilityInfo?: string
     isVmt?: boolean
+    nums?: any // для прокуратора
   }>(),
   {
     state: undefined,
@@ -163,6 +165,7 @@ const props = withDefaults(
     computeResource: undefined,
     compatibilityInfo: undefined,
     isVmt: false,
+    nums: null
   }
 )
 const emits = defineEmits<{

package/components/common/vm/actions/common/customizeHardware/Old.vue

@@ -37,6 +37,7 @@
         :project="props.project"
         :guest-machine-type="model.machine_type"
         :compute-resource="props.computeResource"
+        :nums="props.nums"
         @get-storage="emits('get-storage', $event)"
         @get-folders-or-files="emits('get-folders-or-files', $event)"
         @get-active-device-child="emits('get-active-device-child', $event)"
@@ -126,6 +127,7 @@ const props = withDefaults(
     getDatastoreTableFunc?: (payload: UI_I_TablePayload) => Promise<void>
     computeResource?: UI_I_TreeNode | null
     isVmt?: boolean
+    nums?: any // для прокуратора
   }>(),
   {
     state: undefined,
@@ -143,6 +145,7 @@ const props = withDefaults(
     getDatastoreTableFunc: undefined,
     computeResource: undefined,
     isVmt: false,
+    nums: null
   }
 )
 const emits = defineEmits<{

package/components/common/vm/actions/common/customizeHardware/virtualHardware/New.vue

@@ -40,6 +40,7 @@
           :state="props.state"
           :error-validation-fields="props.errorValidationFields"
           :vm-cpu-help-text-second="props.vmCpuHelpTextSecond"
+          :nums="props.nums"
           @remove-error-by-title="emits('remove-error-by-title', $event)"
           @invalid="cpuInvalid = $event"
         />
@@ -357,6 +358,7 @@ const props = withDefaults(
     vmCpuHelpTextSecond?: string
     computeResource?: UI_I_TreeNode | null
     compatibilityInfo?: string
+    nums?: any // для прокуратора
   }>(),
   {
     cpu: undefined,
@@ -368,6 +370,7 @@ const props = withDefaults(
     vmCpuHelpTextSecond: undefined,
     computeResource: undefined,
     compatibilityInfo: undefined,
+    nums: null
   }
 )
 const emits = defineEmits<{

package/components/common/vm/actions/common/customizeHardware/virtualHardware/Old.vue

@@ -18,6 +18,7 @@
           :state="props.state"
           :error-validation-fields="props.errorValidationFields"
           :vm-cpu-help-text-second="props.vmCpuHelpTextSecond"
+          :nums="props.nums"
           @remove-error-by-title="emits('remove-error-by-title', $event)"
           @invalid="cpuInvalid = $event"
         />
@@ -330,6 +331,7 @@ const props = withDefaults(
     mediatedDevices?: UI_I_MediatedDevice[]
     vmCpuHelpTextSecond?: string
     computeResource?: UI_I_TreeNode | null
+    nums?: any // для прокуратора
   }>(),
   {
     cpu: undefined,
@@ -340,6 +342,7 @@ const props = withDefaults(
     mediatedDevices: () => [],
     vmCpuHelpTextSecond: undefined,
     computeResource: undefined,
+    nums: null
   }
 )
 const emits = defineEmits<{

package/components/common/vm/actions/common/customizeHardware/virtualHardware/VirtualHardware.vue

@@ -40,6 +40,7 @@
     :compute-resource="props.computeResource"
     :compatibility-info="props.compatibilityInfo"
     :network-value-prop="networkValueProp"
+    :nums="props.nums"
     @add-device="onAddDevice"
     @get-storage="emits('get-storage', $event)"
     @remove-network="onRemoveNetwork"
@@ -128,6 +129,7 @@ const props = withDefaults(
     guestMachineType?: UI_I_OptionItem | null
     computeResource?: UI_I_TreeNode | null
     compatibilityInfo?: string
+    nums?: any // для прокуратора
   }>(),
   {
     state: undefined,
@@ -142,6 +144,7 @@ const props = withDefaults(
     guestMachineType: undefined,
     computeResource: undefined,
     compatibilityInfo: undefined,
+    nums: null
   }
 )
 const emits = defineEmits<{

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/Cpu.vue

@@ -11,6 +11,7 @@
     v-model:cpu-model="cpuModel"
     v-model:passthrough-host-cpu="passthroughHostCpu"
     v-model:host-model-cpu="hostModelCpu"
+    v-model:scheduling-affinity="model.cpu.scheduling_affinity"
     :cpu-models="props.cpuModels"
     :is-edit="props.isEdit"
     :error-validation-fields="props.errorValidationFields"
@@ -23,12 +24,14 @@
     :enable-cpu-hot-add-disabled="enableCpuHotAddDisabled"
     :max-cpu-options="maxCpuOptions"
     :vm-cpu-help-text-second="vmCpuHelpTextSecond"
+    :nums="props.nums"
     @remove-error-by-title="emits('remove-error-by-title', $event)"
     @remove-validation-error="onRemoveValidationError"
     @max-cpu-invalid="maxCpuInvalid = $event"
     @reservation-invalid="reservationInvalid = $event"
     @limit-invalid="limitInvalid = $event"
     @shares-invalid="sharesInvalid = $event"
+    @sa-invalid="saInvalid = $event"
   />
 </template>
 
@@ -49,9 +52,11 @@ const props = withDefaults(
     errorValidationFields: UI_I_ErrorValidationField[]
     vmCpuHelpTextSecond?: string
     state?: string | number
+    nums?: any // для прокуратора
   }>(),
   {
     state: undefined,
+    nums: null
   }
 )
 const emits = defineEmits<{
@@ -192,6 +197,7 @@ const vcpusLocalAndApiErrorsTexts = computed<string>(() => {
 const reservationInvalid = ref<boolean>(false)
 const limitInvalid = ref<boolean>(false)
 const sharesInvalid = ref<boolean>(false)
+const saInvalid = ref<boolean>(false)
 const maxCpuInvalid = ref<boolean>(false)
 const cpuInvalid = computed<boolean>(
   () =>
@@ -199,6 +205,7 @@ const cpuInvalid = computed<boolean>(
     reservationInvalid.value ||
     limitInvalid.value ||
     sharesInvalid.value ||
+    saInvalid.value ||
     (model.value.cpu.hotplug &&
       // model.value.cpu.vcpus < model.value.cpu.max_vcpus && // pc-1766
       maxCpuInvalid.value)

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/New.vue

@@ -125,9 +125,12 @@
         <!--        <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-pc-->
         <!--          v-models:performanceCounters="performanceCounters"-->
         <!--        />-->
-        <!--        <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-sa-->
-        <!--          v-models:schedulingAffinity="schedulingAffinity"-->
-        <!--        />-->
+        <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-sa
+          v-model="schedulingAffinity"
+          :nums="props.nums"
+          @invalid="emits('sa-invalid', $event)"
+          @remove-error-by-title="emits('remove-error-by-title', $event)"
+        />
         <!--        <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-iommu-->
         <!--          v-models:iommu="iommu"-->
         <!--        />-->
@@ -162,6 +165,9 @@ const limit = defineModel<string>('limit', { required: true })
 const limitType = defineModel<string>('limitType', { required: true })
 const shares = defineModel<string>('shares', { required: true })
 const sharesType = defineModel<string>('sharesType', { required: true })
+const schedulingAffinity = defineModel<string>('schedulingAffinity', {
+  required: true,
+})
 const cpuModel = defineModel<string>('cpuModel', { required: true })
 const passthroughHostCpu = defineModel<boolean>('passthroughHostCpu', {
   required: true,
@@ -183,9 +189,11 @@ const props = withDefaults(
     enableCpuHotAddDisabled: boolean
     maxCpuOptions: UI_I_OptionItem[]
     vmCpuHelpTextSecond?: string
+    nums?: any // для прокуратора
   }>(),
   {
     vmCpuHelpTextSecond: undefined,
+    nums: null
   }
 )
 const emits = defineEmits<{
@@ -195,6 +203,7 @@ const emits = defineEmits<{
   (event: 'reservation-invalid', value: boolean): void
   (event: 'limit-invalid', value: boolean): void
   (event: 'shares-invalid', value: boolean): void
+  (event: 'sa-invalid', value: boolean): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/Old.vue

@@ -103,9 +103,12 @@
         <!--        <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-pc-->
         <!--          v-models:performanceCounters="performanceCounters"-->
         <!--        />-->
-        <!--        <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-sa-->
-        <!--          v-models:schedulingAffinity="schedulingAffinity"-->
-        <!--        />-->
+        <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-sa
+          v-model="schedulingAffinity"
+          :nums="props.nums"
+          @invalid="emits('sa-invalid', $event)"
+          @remove-error-by-title="emits('remove-error-by-title', $event)"
+        />
         <!--        <common-vm-actions-common-customize-hardware-virtual-hardware-cpu-iommu-->
         <!--          v-models:iommu="iommu"-->
         <!--        />-->
@@ -141,6 +144,9 @@ const limit = defineModel<string>('limit', { required: true })
 const limitType = defineModel<string>('limitType', { required: true })
 const shares = defineModel<string>('shares', { required: true })
 const sharesType = defineModel<string>('sharesType', { required: true })
+const schedulingAffinity = defineModel<string>('schedulingAffinity', {
+  required: true,
+})
 const cpuModel = defineModel<string>('cpuModel', { required: true })
 const passthroughHostCpu = defineModel<boolean>('passthroughHostCpu', {
   required: true,
@@ -162,9 +168,11 @@ const props = withDefaults(
     enableCpuHotAddDisabled: boolean
     maxCpuOptions: UI_I_OptionItem[]
     vmCpuHelpTextSecond?: string
+    nums?: any // для прокуратора
   }>(),
   {
     vmCpuHelpTextSecond: undefined,
+    nums: null
   }
 )
 const emits = defineEmits<{
@@ -174,6 +182,7 @@ const emits = defineEmits<{
   (event: 'reservation-invalid', value: boolean): void
   (event: 'limit-invalid', value: boolean): void
   (event: 'shares-invalid', value: boolean): void
+  (event: 'sa-invalid', value: boolean): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/sa/Sa.vue

@@ -0,0 +1,170 @@
+<template>
+  <div class="">
+    <atoms-stack-block :has-children="false">
+      <template #stackBlockKey>
+        {{ localization.common.schedulingAffinity }}
+      </template>
+      <template #stackBlockContent>
+        <div class="flex-space-between">
+          <div class="flex-align-center">
+            <atoms-tooltip-error
+              :has-error="!!errorText"
+              selector="#sa-edit-setting-input"
+              @remove="onRemoveValidationError"
+            >
+              <template #elem>
+                <input
+                  id="sa-edit-setting-input"
+                  v-model="schedulingAffinity"
+                  data-id="sa-edit-setting-input"
+                  type="text"
+                  class="edit-setting-input"
+                  @blur="onBlur"
+                />
+              </template>
+              <template #content>{{ errorText }}</template>
+            </atoms-tooltip-error>
+          </div>
+
+          <div id="sa-help-icon">
+            <atoms-the-icon
+              fill="#0072a3"
+              width="24px"
+              height="24px"
+              name="info-circle"
+              data-id="show-sa-help-icon"
+              @click.stop="isShowSaHelp = !isShowSaHelp"
+            />
+            <Teleport to="body">
+              <atoms-tooltip-signpost
+                v-if="isShowSaHelp"
+                elem-id="sa-help-icon"
+                @hide="isShowSaHelp = false"
+              >
+                <h3 class="sa-help-title">
+                  {{ localization.mainNavigation.help }}
+                </h3>
+
+                <p class="sa-help-text">
+                  {{ localization.common.schedulingAffinityHelpDescription1 }}
+                </p>
+                <p class="sa-help-text">
+                  {{ localization.common.schedulingAffinityHelpDescription2 }}
+                </p>
+                <p class="sa-help-text">
+                  {{ localization.common.schedulingAffinityHelpDescription3 }}
+                </p>
+                <p class="sa-help-text">
+                  <strong
+                    >{{ localization.common.hyperthreadingStatus }}:
+                  </strong>
+                  {{ localization.common.inactive }}
+                </p>
+                <!--                <p class="sa-help-text">-->
+                <!--                  <strong>{{ localization.common.availableCpus }}: </strong>-->
+                <!--                  8({{ localization.common.physicalCpus }})-->
+                <!--                </p>-->
+                <div
+                  v-for="item in numsLocal"
+                  :key="item.label"
+                  class="sa-help-text"
+                >
+                  <strong>{{ item.label }} </strong>
+                  <p>{{ item.value }}</p>
+                </div>
+              </atoms-tooltip-signpost>
+            </Teleport>
+          </div>
+        </div>
+      </template>
+    </atoms-stack-block>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import { validateAffinityInput } from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/sa/lib/utils/validation'
+import { groupConsecutiveNumbers } from '~/lib/utils/nums'
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const schedulingAffinity = defineModel<string>({
+  required: true,
+})
+
+const props = defineProps<{
+  nums: any // для прокуратора
+}>()
+const emits = defineEmits<{
+  (event: 'invalid', value: boolean): void
+  (event: 'remove-error-by-title', value: string): void
+}>()
+
+const isShowSaHelp = ref<boolean>(false)
+
+const numsLocal = computed<any>(() => {
+  const cpuTopology = []
+  for (const key in props.nums.cpu) {
+    cpuTopology.push({
+      label: `CPU NUMA ${+key + 1}`,
+      value:
+        'cores: ' +
+        groupConsecutiveNumbers(props.nums.cpu[key]) +
+        '; memory: ' +
+        props.nums.ram[key],
+    })
+  }
+  return cpuTopology
+})
+
+const errorText = ref<string>('')
+const onBlur = (): void => {
+  const cpuNums = []
+  for (const key in props.nums.cpu) {
+    cpuNums.push(...props.nums.cpu[key])
+  }
+  const validation = validateAffinityInput(
+    schedulingAffinity.value,
+    localization.value,
+    cpuNums
+  )
+
+  errorText.value = ''
+
+  if (!validation.isValid) {
+    errorText.value = validation.error
+  }
+}
+
+const isInvalid = computed<boolean>(() => !!errorText.value)
+watch(
+  isInvalid,
+  (newValue) => {
+    emits('invalid', newValue)
+  },
+  { immediate: true }
+)
+
+const onRemoveValidationError = (): void => {
+  emits('remove-error-by-title', 'cpu.temp') // TODO
+}
+</script>
+
+<style scoped lang="scss">
+h3.sa-help-title {
+  margin-top: 7px;
+  font-size: 22px;
+  color: #565656;
+}
+p.sa-help-text {
+  width: 310px;
+  margin-top: 24px;
+  font-size: 14px;
+  color: #565656;
+}
+p.sa-help-text strong {
+  font-size: 14px;
+  font-weight: bold;
+  color: #565656;
+}
+</style>

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/sa/lib/utils/validation.ts

@@ -0,0 +1,266 @@
+// import type { UI_I_Localization } from '~/lib/models/interfaces'
+//
+// export const validateAffinityInput = (
+//   inputValue: string,
+//   localization: UI_I_Localization,
+//   availableCPUs = 8
+// ): any => {
+//   // Очищаем строку от пробелов
+//   const cleanedInput = inputValue.trim()
+//
+//   // Если строка пустая - привязка очищается (валидно)
+//   if (cleanedInput === '') {
+//     return {
+//       isValid: true,
+//       processors: [],
+//       error: null,
+//     }
+//   }
+//
+//   // Разделяем по запятым
+//   const parts = cleanedInput.split(',')
+//   const processors = new Set()
+//   const errors = []
+//
+//   // Регулярное выражение для проверки формата
+//   const singleRegex = /^\s*\d+\s*$/
+//   const rangeRegex = /^\s*(\d+)\s*-\s*(\d+)\s*$/
+//
+//   for (let i = 0; i < parts.length; i++) {
+//     const part = parts[i].trim()
+//
+//     if (part === '') {
+//       errors.push(localization.vmWizard.emptyElement.replace('{0}', `${i + 1}`))
+//       continue
+//     }
+//
+//     // Проверяем, является ли часть одиночным числом
+//     if (singleRegex.test(part)) {
+//       const cpuNum = parseInt(part, 10)
+//
+//       if (cpuNum < 0 || cpuNum >= availableCPUs) {
+//         errors.push(
+//           localization.vmWizard.cpuOutOfRange
+//             .replace('{0}', `${cpuNum}`)
+//             .replace('{1}', `${availableCPUs - 1}`)
+//         )
+//         continue
+//       }
+//
+//       if (processors.has(cpuNum)) {
+//         errors.push(
+//           localization.vmWizard.cpuDuplicate.replace('{0}', `${cpuNum}`)
+//         )
+//         continue
+//       }
+//
+//       processors.add(cpuNum)
+//     }
+//     // Проверяем, является ли часть диапазоном
+//     else if (rangeRegex.test(part)) {
+//       const match = part.match(rangeRegex)
+//       const start = parseInt(match[1], 10)
+//       const end = parseInt(match[2], 10)
+//
+//       if (start > end) {
+//         errors.push(
+//           localization.vmWizard.invalidRange.replace('{0}', `${part}`)
+//         )
+//         continue
+//       }
+//
+//       if (start < 0 || start >= availableCPUs) {
+//         errors.push(
+//           localization.vmWizard.rangeStartOutOfRange
+//             .replace('{0}', `${start}`)
+//             .replace('{1}', `${availableCPUs - 1}`)
+//         )
+//         continue
+//       }
+//
+//       if (end < 0 || end >= availableCPUs) {
+//         errors.push(
+//           localization.vmWizard.rangeEndOutOfRange
+//             .replace('{0}', `${end}`)
+//             .replace('{1}', `${availableCPUs - 1}`)
+//         )
+//         continue
+//       }
+//
+//       // Добавляем все процессоры из диапазона
+//       for (let cpu = start; cpu <= end; cpu++) {
+//         if (processors.has(cpu)) {
+//           errors.push(
+//             localization.vmWizard.rangeDuplicate.replace('{0}', `${cpu}`)
+//           )
+//         } else {
+//           processors.add(cpu)
+//         }
+//       }
+//     }
+//     // Неизвестный формат
+//     else {
+//       errors.push(localization.vmWizard.invalidFormat.replace('{0}', `${part}`))
+//     }
+//   }
+//
+//   return {
+//     processors, // TODO remove this one
+//     isValid: errors.length === 0,
+//     error: errors.length > 0 ? errors.join('; ') : null,
+//   }
+// }
+
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import {groupConsecutiveNumbers} from "~/lib/utils/nums";
+
+export const validateAffinityInput = (
+  inputValue: string,
+  localization: UI_I_Localization,
+  availableCPUs: number[] = []
+): any => {
+  const cleanedInput = inputValue?.trim() || ''
+
+  if (cleanedInput === '') {
+    return {
+      isValid: true,
+      processors: [],
+      error: null,
+    }
+  }
+
+  const availableCPUSet = new Set(availableCPUs)
+  // const maxAvailableCPU = availableCPUs.length > 0
+  //     ? Math.max(...availableCPUs)
+  //     : 0
+
+  const parts = cleanedInput.split(',')
+  const processors = new Set()
+  const errors = []
+
+  const singleRegex = /^\s*\d+\s*$/
+  const rangeRegex = /^\s*(\d+)\s*-\s*(\d+)\s*$/
+
+  for (let i = 0; i < parts.length; i++) {
+    const part = parts[i].trim()
+
+    if (part === '') {
+      errors.push(localization.vmWizard.emptyElement.replace('{0}', `${i + 1}`))
+      continue
+    }
+
+    if (singleRegex.test(part)) {
+      const cpuNum = parseInt(part, 10)
+
+      if (!availableCPUSet.has(cpuNum)) {
+        const availableList =
+          availableCPUs.length > 0
+            ? groupConsecutiveNumbers(availableCPUs.sort((a, b) => a - b))
+            : 'нет доступных'
+
+        errors.push(
+          localization.vmWizard.cpuOutOfRange
+            .replace('{0}', `${cpuNum}`)
+            .replace('{1}', availableList)
+        )
+        continue
+      }
+
+      if (processors.has(cpuNum)) {
+        errors.push(
+          localization.vmWizard.cpuDuplicate.replace('{0}', `${cpuNum}`)
+        )
+        continue
+      }
+
+      processors.add(cpuNum)
+    }
+    // Проверяем, является ли часть диапазоном
+    else if (rangeRegex.test(part)) {
+      const match = part.match(rangeRegex)
+      const start = parseInt(match[1], 10)
+      const end = parseInt(match[2], 10)
+
+      if (start > end) {
+        errors.push(
+          localization.vmWizard.invalidRange.replace('{0}', `${part}`)
+        )
+        continue
+      }
+
+      // Проверяем доступность начала диапазона
+      if (!availableCPUSet.has(start)) {
+        const availableList =
+          availableCPUs.length > 0
+            ? availableCPUs.sort((a, b) => a - b).join(', ')
+            : 'нет доступных'
+
+        errors.push(
+          localization.vmWizard.rangeStartOutOfRange
+            .replace('{0}', `${start}`)
+            .replace('{1}', availableList)
+        )
+        continue
+      }
+
+      // Проверяем доступность конца диапазона
+      if (!availableCPUSet.has(end)) {
+        const availableList =
+          availableCPUs.length > 0
+            ? availableCPUs.sort((a, b) => a - b).join(', ')
+            : 'нет доступных'
+
+        errors.push(
+          localization.vmWizard.rangeEndOutOfRange
+            .replace('{0}', `${end}`)
+            .replace('{1}', availableList)
+        )
+        continue
+      }
+
+      // Проверяем все процессоры в диапазоне
+      let hasInvalidInRange = false
+      for (let cpu = start; cpu <= end; cpu++) {
+        if (!availableCPUSet.has(cpu)) {
+          const availableList =
+            availableCPUs.length > 0
+              ? availableCPUs.sort((a, b) => a - b).join(', ')
+              : 'нет доступных'
+
+          errors.push(
+            localization.vmWizard.cpuOutOfRange
+              .replace('{0}', `${cpu}`)
+              .replace('{1}', availableList)
+          )
+          hasInvalidInRange = true
+        }
+      }
+
+      // Если в диапазоне есть недоступные CPU, пропускаем добавление
+      if (hasInvalidInRange) {
+        continue
+      }
+
+      // Добавляем все процессоры из диапазона
+      for (let cpu = start; cpu <= end; cpu++) {
+        if (processors.has(cpu)) {
+          errors.push(
+            localization.vmWizard.rangeDuplicate.replace('{0}', `${cpu}`)
+          )
+        } else {
+          processors.add(cpu)
+        }
+      }
+    }
+    // Неизвестный формат
+    else {
+      errors.push(localization.vmWizard.invalidFormat.replace('{0}', `${part}`))
+    }
+  }
+
+  return {
+    processors: Array.from(processors), // Конвертируем Set в массив
+    isValid: errors.length === 0,
+    error: errors.length > 0 ? errors.join('; ') : null,
+  }
+}

package/components/common/vm/actions/editSettings/EditSettings.vue

@@ -22,6 +22,7 @@
     :is-vmt="props.isVmt"
     :max-memory="maxMemory"
     :cpu-models="cpuModels"
+    :nums="props.nums"
     @hide="emits('hide')"
     @validate="validateSendData"
     @get-storage="emits('get-storage', $event)"
@@ -79,6 +80,7 @@ const props = withDefaults(
     mediatedDevices?: UI_I_MediatedDevice[]
     capabilities?: UI_I_Capabilities
     isVmt?: boolean
+    nums?: any // TODO
   }>(),
   {
     getDatastoreTableFunc: undefined,
@@ -88,6 +90,7 @@ const props = withDefaults(
     mediatedDevices: undefined,
     capabilities: undefined,
     isVmt: undefined,
+    nums: []
   }
 )
 

package/components/common/vm/actions/editSettings/Old.vue

@@ -44,6 +44,7 @@
             :is-datastore-loading="props.isDatastoreLoading"
             :customize-hardware-submit="props.customizeHardwareSubmit"
             :is-vmt="props.isVmt"
+            :nums="props.nums"
             is-edit
             @get-storage="emits('get-storage', $event)"
             @get-folders-or-files="emits('get-folders-or-files', $event)"
@@ -102,6 +103,7 @@ const props = withDefaults(
     getDatastoreTableFunc?: (payload: UI_I_TablePayload) => Promise<void>
     customizeHardwareSubmit?: null | Function
     isVmt?: boolean
+    nums?: any // TODO
   }>(),
   {
     state: undefined,
@@ -112,6 +114,7 @@ const props = withDefaults(
     getDatastoreTableFunc: undefined,
     customizeHardwareSubmit: undefined,
     isVmt: undefined,
+    nums: null
   }
 )
 

package/components/common/vm/actions/lib/utils.ts

@@ -180,6 +180,7 @@ export const constructSendDataForm = (
       limit_mhz: +cpu.limit_mhz,
       shares: cpu.shares,
       hotplug: cpu.hotplug,
+      scheduling_affinity: cpu.scheduling_affinity,
     },
     memory: {
       size_mb: +memory.size_mb,

package/lib/utils/nums.ts

@@ -0,0 +1,27 @@
+export const groupConsecutiveNumbers = (numbers: number[]): string => {
+  if (!numbers || numbers.length === 0) {
+    return ''
+  }
+
+  const sorted = [...new Set(numbers)].sort((a, b) => a - b)
+
+  const result = sorted.reduce((acc, num, index, arr) => {
+    if (index === 0) {
+      acc.push([num])
+    } else if (num === arr[index - 1] + 1) {
+      acc[acc.length - 1].push(num)
+    } else {
+      acc.push([num])
+    }
+    return acc
+  }, [])
+
+  return result
+    .map((range) => {
+      if (range.length === 1) {
+        return range[0].toString()
+      }
+      return `${range[0]}-${range[range.length - 1]}`
+    })
+    .join(', ')
+}

package/package.json

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

package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/Sa.vue

@@ -1,106 +0,0 @@
-<!--<template>-->
-<!--  <div class="">-->
-<!--    <atoms-stack-block :has-children="false">-->
-<!--      <template #stackBlockKey>-->
-<!--        {{ localization.common.schedulingAffinity }}-->
-<!--      </template>-->
-<!--      <template #stackBlockContent>-->
-<!--        <div class="flex-space-between">-->
-<!--          <div class="flex-align-center">-->
-<!--            <input-->
-<!--              id="sa-edit-setting-input"-->
-<!--              v-model="schedulingAffinityLocal"-->
-<!--              data-id="sa-edit-setting-input"-->
-<!--              type="text"-->
-<!--              class="edit-setting-input"-->
-<!--              disabled-->
-<!--            />-->
-<!--          </div>-->
-
-<!--          <div id="sa-help-icon">-->
-<!--            <atoms-the-icon-->
-<!--              fill="#0072a3"-->
-<!--              width="24px"-->
-<!--              height="24px"-->
-<!--              name="info-circle"-->
-<!--              data-id="show-sa-help-icon"-->
-<!--              @click.stop="isShowSaHelp = !isShowSaHelp"-->
-<!--            />-->
-<!--            <Teleport to="body">-->
-<!--              <atoms-tooltip-signpost-->
-<!--                v-if="isShowSaHelp"-->
-<!--                elem-id="sa-help-icon"-->
-<!--                @hide="isShowSaHelp = false"-->
-<!--              >-->
-<!--                <h3 class="sa-help-title">-->
-<!--                  {{ localization.mainNavigation.help }}-->
-<!--                </h3>-->
-
-<!--                <p class="sa-help-text">-->
-<!--                  {{ localization.common.schedulingAffinityHelpDescription1 }}-->
-<!--                </p>-->
-<!--                <p class="sa-help-text">-->
-<!--                  {{ localization.common.schedulingAffinityHelpDescription2 }}-->
-<!--                </p>-->
-<!--                <p class="sa-help-text">-->
-<!--                  {{ localization.common.schedulingAffinityHelpDescription3 }}-->
-<!--                </p>-->
-<!--                <p class="sa-help-text">-->
-<!--                  <strong>{{ localization.common.hyperthreadingStatus }}: </strong>-->
-<!--                  {{ localization.common.inactive }}-->
-<!--                </p>-->
-<!--                <p class="sa-help-text">-->
-<!--                  <strong>{{ localization.common.availableCpus }}: </strong>-->
-<!--                  8({{ localization.common.physicalCpus }})-->
-<!--                </p>-->
-<!--              </atoms-tooltip-signpost>-->
-<!--            </Teleport>-->
-<!--          </div>-->
-<!--        </div>-->
-<!--      </template>-->
-<!--    </atoms-stack-block>-->
-<!--  </div>-->
-<!--</template>-->
-
-<!--<script setup lang="ts">-->
-<!--import type { UI_I_Localization } from '~/lib/models/interfaces'-->
-
-<!--const localization = computed<UI_I_Localization>(() => useLocal())-->
-
-<!--const props = defineProps<{-->
-<!--  schedulingAffinity: string-->
-<!--}>()-->
-<!--const emits = defineEmits<{-->
-<!--  (event: 'update:scheduling-affinity', value: string): void-->
-<!--}>()-->
-
-<!--const schedulingAffinityLocal = computed<string>({-->
-<!--  get() {-->
-<!--    return props.schedulingAffinity-->
-<!--  },-->
-<!--  set(newValue) {-->
-<!--    emits('update:scheduling-affinity', newValue)-->
-<!--  },-->
-<!--})-->
-
-<!--const isShowSaHelp = ref<boolean>(false)-->
-<!--</script>-->
-
-<!--<style scoped lang="scss">-->
-<!--h3.sa-help-title {-->
-<!--  margin-top: 7px;-->
-<!--  font-size: 22px;-->
-<!--  color: #565656;-->
-<!--}-->
-<!--p.sa-help-text {-->
-<!--  width: 310px;-->
-<!--  margin-top: 24px;-->
-<!--  font-size: 14px;-->
-<!--  color: #565656;-->
-<!--}-->
-<!--p.sa-help-text strong {-->
-<!--  font-size: 14px;-->
-<!--  font-weight: bold;-->
-<!--  color: #565656;-->
-<!--}-->
-<!--</style>-->