1
0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-23 22:50:09 +03:00

M #~: Modify vcpu decimal text (#2490)

(cherry picked from commit fa1c9f1348a223332067baa58ec80985a10ddfc8)
This commit is contained in:
Frederick Borges 2023-02-08 18:48:50 +01:00 committed by Tino Vázquez
parent 6daac5193c
commit bf3f646424
No known key found for this signature in database
GPG Key ID: 14201E424D02047E
4 changed files with 21 additions and 21 deletions

View File

@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and *
* limitations under the License. *
* ------------------------------------------------------------------------- */
import { boolean, number, object } from 'yup'
import { INPUT_TYPES, T } from 'client/constants'
import { getValidationFromFields } from 'client/utils'
import { T, INPUT_TYPES } from 'client/constants'
import { boolean, number, object } from 'yup'
const ENFORCE = {
name: 'enforce',
@ -52,7 +52,7 @@ const PHYSICAL_CPU = {
const VIRTUAL_CPU = {
name: 'VCPU',
label: T.VirtualCpuWithPercent,
label: T.VirtualCpuWithDecimal,
tooltip: T.VirtualCpuConcept,
type: INPUT_TYPES.TEXT,
htmlType: 'number',

View File

@ -16,21 +16,21 @@
import { number, string } from 'yup'
import {
generateModificationInputs,
generateHotResizeInputs,
generateCapacityInput,
generateCostCapacityInput,
generateHotResizeInputs,
generateModificationInputs,
} from 'client/components/Forms/VmTemplate/CreateForm/Steps/General/capacityUtils'
import { Translate } from 'client/components/HOC'
import { formatNumberByCurrency } from 'client/models/Helper'
import { Field, arrayToOptions } from 'client/utils'
import {
T,
HYPERVISORS,
VmTemplateFeatures,
INPUT_TYPES,
MEMORY_RESIZE_OPTIONS,
T,
VmTemplateFeatures,
} from 'client/constants'
import { formatNumberByCurrency } from 'client/models/Helper'
import { Field, arrayToOptions } from 'client/utils'
const commonValidation = number()
.positive()
@ -96,7 +96,7 @@ export const CPU_FIELDS = [PHYSICAL_CPU, ...MOD_CPU_FIELDS]
/** @type {Field} Virtual CPU field */
export const VIRTUAL_CPU = generateCapacityInput({
name: 'VCPU',
label: T.VirtualCpuWithPercent,
label: T.VirtualCpuWithDecimal,
tooltip: T.VirtualCpuConcept,
validation: commonValidation,
})

View File

@ -15,21 +15,21 @@
* ------------------------------------------------------------------------- */
import { NumberSchema } from 'yup'
import { scaleVcpuByCpuFactor } from 'client/models/VirtualMachine'
import { getUserInputParams } from 'client/models/Helper'
import {
Field,
schemaUserInput,
prettyBytes,
isDivisibleBy,
} from 'client/utils'
import {
T,
HYPERVISORS,
T,
USER_INPUT_TYPES,
VmTemplate,
VmTemplateFeatures,
} from 'client/constants'
import { getUserInputParams } from 'client/models/Helper'
import { scaleVcpuByCpuFactor } from 'client/models/VirtualMachine'
import {
Field,
isDivisibleBy,
prettyBytes,
schemaUserInput,
} from 'client/utils'
const { number, numberFloat, range, rangeFloat } = USER_INPUT_TYPES
@ -42,7 +42,7 @@ const TRANSLATES = {
CPU: { name: 'CPU', label: T.PhysicalCpuWithPercent, tooltip: T.CpuConcept },
VCPU: {
name: 'VCPU',
label: T.VirtualCpuWithPercent,
label: T.VirtualCpuWithDecimal,
tooltip: T.VirtualCpuConcept,
},
}

View File

@ -534,7 +534,7 @@ module.exports = {
PhysicalCpu: 'Physical CPU',
PhysicalCpuWithPercent: 'Physical CPU (%)',
VirtualCpu: 'Virtual CPU',
VirtualCpuWithPercent: 'Virtual CPU (%)',
VirtualCpuWithDecimal: 'Virtual CPU (Decimal values are allowed)',
VirtualCores: 'Virtual Cores',
Cores: 'Cores',
Sockets: 'Sockets',