add 'operator' to requirement
This commit is contained in:
@ -258,20 +258,22 @@ class BaseOption(Base):
|
||||
new_value = []
|
||||
for requires in _requires:
|
||||
new_requires = []
|
||||
new_req = []
|
||||
for require in requires:
|
||||
if load:
|
||||
new_require = [descr.impl_get_opt_by_path(require[0])]
|
||||
else:
|
||||
new_require = [descr.impl_get_path_by_opt(require[0])]
|
||||
new_require.extend(require[1:])
|
||||
new_requires.append(tuple(new_require))
|
||||
for req in require[0]:
|
||||
if load:
|
||||
new_req.append([(descr.impl_get_opt_by_path(req[0]), req[1])])
|
||||
else:
|
||||
new_req.append([(descr.impl_get_path_by_opt(req[0]), req[1])])
|
||||
new_req.extend(require[1:])
|
||||
new_requires.append(tuple(new_req))
|
||||
new_value.append(tuple(new_requires))
|
||||
if load:
|
||||
del(self._state_requires)
|
||||
if new_value != []:
|
||||
self._requires = new_value
|
||||
self._requires = tuple(new_value)
|
||||
else:
|
||||
self._state_requires = new_value
|
||||
self._state_requires = tuple(new_value)
|
||||
|
||||
# serialize
|
||||
def _impl_getstate(self, descr):
|
||||
@ -932,6 +934,94 @@ def validate_requires_arg(multi, requires, name):
|
||||
know more about
|
||||
the description of the requires dictionary
|
||||
"""
|
||||
def get_option(require):
|
||||
option = require['option']
|
||||
if not isinstance(option, Option):
|
||||
raise ValueError(_('malformed requirements '
|
||||
'must be an option in option {0}').format(name))
|
||||
if not multi and option.impl_is_multi():
|
||||
raise ValueError(_('malformed requirements '
|
||||
'multi option must not set '
|
||||
'as requires of non multi option {0}').format(name))
|
||||
return option
|
||||
|
||||
def _set_expected(action, inverse, transitive, same_action, option, expected, operator):
|
||||
if inverse not in ret_requires[action]:
|
||||
ret_requires[action][inverse] = ([(option, [expected])], action, inverse, transitive, same_action, operator)
|
||||
else:
|
||||
for exp in ret_requires[action][inverse][0]:
|
||||
if exp[0] == option:
|
||||
exp[1].append(expected)
|
||||
break
|
||||
else:
|
||||
ret_requires[action][inverse][0].append((option, [expected]))
|
||||
|
||||
def set_expected(require, ret_requires):
|
||||
expected = require['expected']
|
||||
inverse = get_inverse(require)
|
||||
transitive = get_transitive(require)
|
||||
same_action = get_sameaction(require)
|
||||
operator = get_operator(require)
|
||||
if isinstance(expected, list):
|
||||
for exp in expected:
|
||||
if exp.keys() != ['option', 'value']:
|
||||
raise ValueError(_('malformed requirements expected must have '
|
||||
'option and value for option {0}').format(name))
|
||||
option = exp['option']
|
||||
if option is not None:
|
||||
err = option._validate(exp['value'])
|
||||
if err:
|
||||
raise ValueError(_('malformed requirements expected value '
|
||||
'must be valid for option {0}'
|
||||
': {1}').format(name, err))
|
||||
_set_expected(action, inverse, transitive, same_action, option, exp['value'], operator)
|
||||
else:
|
||||
option = get_option(require)
|
||||
if expected is not None:
|
||||
err = option._validate(expected)
|
||||
if err:
|
||||
raise ValueError(_('malformed requirements expected value '
|
||||
'must be valid for option {0}'
|
||||
': {1}').format(name, err))
|
||||
_set_expected(action, inverse, transitive, same_action, option, expected, operator)
|
||||
|
||||
def get_action(require):
|
||||
action = require['action']
|
||||
if action == 'force_store_value':
|
||||
raise ValueError(_("malformed requirements for option: {0}"
|
||||
" action cannot be force_store_value"
|
||||
).format(name))
|
||||
return action
|
||||
|
||||
def get_inverse(require):
|
||||
inverse = require.get('inverse', False)
|
||||
if inverse not in [True, False]:
|
||||
raise ValueError(_('malformed requirements for option: {0}'
|
||||
' inverse must be boolean'))
|
||||
return inverse
|
||||
|
||||
def get_transitive(require):
|
||||
transitive = require.get('transitive', True)
|
||||
if transitive not in [True, False]:
|
||||
raise ValueError(_('malformed requirements for option: {0}'
|
||||
' transitive must be boolean'))
|
||||
return transitive
|
||||
|
||||
def get_sameaction(require):
|
||||
same_action = require.get('same_action', True)
|
||||
if same_action not in [True, False]:
|
||||
raise ValueError(_('malformed requirements for option: {0}'
|
||||
' same_action must be boolean'))
|
||||
return same_action
|
||||
|
||||
def get_operator(require):
|
||||
operator = require.get('operator', 'or')
|
||||
if operator not in ['and', 'or']:
|
||||
raise ValueError(_('malformed requirements for option: {0}'
|
||||
' operator must be "or" or "and"'))
|
||||
return operator
|
||||
|
||||
|
||||
ret_requires = {}
|
||||
config_action = set()
|
||||
|
||||
@ -942,7 +1032,7 @@ def validate_requires_arg(multi, requires, name):
|
||||
raise ValueError(_("malformed requirements type for option:"
|
||||
" {0}, must be a dict").format(name))
|
||||
valid_keys = ('option', 'expected', 'action', 'inverse', 'transitive',
|
||||
'same_action')
|
||||
'same_action', 'operator')
|
||||
unknown_keys = frozenset(require.keys()) - frozenset(valid_keys)
|
||||
if unknown_keys != frozenset():
|
||||
raise ValueError(_('malformed requirements for option: {0}'
|
||||
@ -951,62 +1041,25 @@ def validate_requires_arg(multi, requires, name):
|
||||
unknown_keys,
|
||||
valid_keys))
|
||||
# prepare all attributes
|
||||
if 'option' not in require or 'expected' not in require or \
|
||||
if not ('expected' in require and isinstance(require['expected'], list)) and \
|
||||
not ('option' in require and 'expected' in require) or \
|
||||
'action' not in require:
|
||||
raise ValueError(_("malformed requirements for option: {0}"
|
||||
" require must have option, expected and"
|
||||
" action keys").format(name))
|
||||
option = require['option']
|
||||
expected = require['expected']
|
||||
action = require['action']
|
||||
if action == 'force_store_value':
|
||||
raise ValueError(_("malformed requirements for option: {0}"
|
||||
" action cannot be force_store_value"
|
||||
).format(name))
|
||||
inverse = require.get('inverse', False)
|
||||
if inverse not in [True, False]:
|
||||
raise ValueError(_('malformed requirements for option: {0}'
|
||||
' inverse must be boolean'))
|
||||
transitive = require.get('transitive', True)
|
||||
if transitive not in [True, False]:
|
||||
raise ValueError(_('malformed requirements for option: {0}'
|
||||
' transitive must be boolean'))
|
||||
same_action = require.get('same_action', True)
|
||||
if same_action not in [True, False]:
|
||||
raise ValueError(_('malformed requirements for option: {0}'
|
||||
' same_action must be boolean'))
|
||||
|
||||
if not isinstance(option, Option):
|
||||
raise ValueError(_('malformed requirements '
|
||||
'must be an option in option {0}').format(name))
|
||||
if not multi and option.impl_is_multi():
|
||||
raise ValueError(_('malformed requirements '
|
||||
'multi option must not set '
|
||||
'as requires of non multi option {0}').format(name))
|
||||
if expected is not None:
|
||||
err = option._validate(expected)
|
||||
if err:
|
||||
raise ValueError(_('malformed requirements expected value '
|
||||
'must be valid for option {0}'
|
||||
': {1}').format(name, err))
|
||||
action = get_action(require)
|
||||
config_action.add(action)
|
||||
if action not in ret_requires:
|
||||
ret_requires[action] = {}
|
||||
if option not in ret_requires[action]:
|
||||
ret_requires[action][option] = {}
|
||||
if inverse not in ret_requires[action][option]:
|
||||
ret_requires[action][option][inverse] = (option, [expected], action,
|
||||
inverse, transitive, same_action)
|
||||
else:
|
||||
ret_requires[action][option][inverse][1].append(expected)
|
||||
set_expected(require, ret_requires)
|
||||
|
||||
# transform dict to tuple
|
||||
ret = []
|
||||
for opt_requires in ret_requires.values():
|
||||
for requires in ret_requires.values():
|
||||
ret_action = []
|
||||
for requires in opt_requires.values():
|
||||
for require in requires.values():
|
||||
ret_action.append((require[0], tuple(require[1]), require[2],
|
||||
require[3], require[4], require[5]))
|
||||
for require in requires.values():
|
||||
ret_action.append((tuple(require[0]), require[1],
|
||||
require[2], require[3], require[4], require[5]))
|
||||
ret.append(tuple(ret_action))
|
||||
return frozenset(config_action), tuple(ret)
|
||||
|
||||
|
||||
@ -162,21 +162,21 @@ class OptionDescription(BaseOption, StorageOptionDescription):
|
||||
# * option in require must be a master or a slave
|
||||
# * current option must be a slave (and only a slave)
|
||||
# * option in require and current option must be in same master/slaves
|
||||
require_opt = require[0]
|
||||
if require_opt.impl_is_multi():
|
||||
if is_slave is None:
|
||||
is_slave = option.impl_is_master_slaves('slave')
|
||||
if is_slave:
|
||||
masterslaves = option.impl_get_master_slaves()
|
||||
if is_slave and require_opt.impl_is_master_slaves():
|
||||
if masterslaves != require_opt.impl_get_master_slaves():
|
||||
for require_opt, values in require[0]:
|
||||
if require_opt.impl_is_multi():
|
||||
if is_slave is None:
|
||||
is_slave = option.impl_is_master_slaves('slave')
|
||||
if is_slave:
|
||||
masterslaves = option.impl_get_master_slaves()
|
||||
if is_slave and require_opt.impl_is_master_slaves():
|
||||
if masterslaves != require_opt.impl_get_master_slaves():
|
||||
raise ValueError(_('malformed requirements option {0} '
|
||||
'must be in same master/slaves for {1}').format(
|
||||
require_opt.impl_getname(), option.impl_getname()))
|
||||
else:
|
||||
raise ValueError(_('malformed requirements option {0} '
|
||||
'must be in same master/slaves for {1}').format(
|
||||
'must not be a multi for {1}').format(
|
||||
require_opt.impl_getname(), option.impl_getname()))
|
||||
else:
|
||||
raise ValueError(_('malformed requirements option {0} '
|
||||
'must not be a multi for {1}').format(
|
||||
require_opt.impl_getname(), option.impl_getname()))
|
||||
if init:
|
||||
session = config._impl_values._p_.getsession()
|
||||
if len(cache_option) != len(set(cache_option)):
|
||||
|
||||
Reference in New Issue
Block a user