NuKVM/xen-orchestra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(xapi/utils/makeEditObject): constraints works with user props (#410)

Browse Source
This commit is contained in:
Pierre Donias 2016-10-04 15:02:27 +02:00 committed by Julien Fontanet
parent 2784a7cc92
commit 2ee0be7466
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/xapi/utils.js
View File

@ -317,14 +317,20 @@ export const makeEditObject = specs => {
const cbs = [] const cbs = []
forEach(constraints, (constraint, constraintName) => { forEach(constraints, (constraint, constraintName) => {
// This constraint value is already defined: bypass the constraint. // Before setting a property to a new value, if the constraint check fails (e.g. memoryMin > memoryMax):
if (values[constraintName] != null) { // - if the user wants to set the constraint (ie constraintNewValue is defined):
return // constraint <-- constraintNewValue THEN property <-- value (e.g. memoryMax <-- 2048 THEN memoryMin <-- 1024)
} // - if the user DOES NOT want to set the constraint (ie constraintNewValue is NOT defined):
// constraint <-- value THEN property <-- value (e.g. memoryMax <-- 1024 THEN memoryMin <-- 1024)
// FIXME: Some values combinations will lead to setting the same property twice, which is not perfect but works for now.
const constraintCurrentValue = specs[constraintName].get(object)
const constraintNewValue = values[constraintName]
if (!constraint(specs[constraintName].get(object), value)) { if (!constraint(constraintCurrentValue, value)) {
const cb = set(value, constraintName) const cb = set(constraintNewValue == null ? value : constraintNewValue, constraintName)
cbs.push(cb) if (cb) {
cbs.push(cb)
}
} }
}) })