add PathConfig

This commit is contained in:
Emmanuel Garette 2018-10-31 08:00:19 +01:00
parent 69919535f6
commit f4bf3dc390
37 changed files with 1480 additions and 258 deletions

View File

@ -1,4 +1,7 @@
# coding: utf-8 # coding: utf-8
from time import sleep, time
from py.test import raises
from .autopath import do_autopath from .autopath import do_autopath
do_autopath() do_autopath()
@ -11,10 +14,11 @@ from tiramisu.error import ConfigError, PropertiesOptionError
from tiramisu.setting import groups from tiramisu.setting import groups
from tiramisu import undefined, Params, ParamValue, ParamOption from tiramisu import undefined, Params, ParamValue, ParamOption
from tiramisu.api import TIRAMISU_VERSION from tiramisu.api import TIRAMISU_VERSION
from tiramisu.storage import list_sessions
from time import sleep, time def teardown_function(function):
from py.test import raises assert list_sessions() == [], 'session list is not empty when leaving "{}"'.format(function.__name__)
global incr global incr

View File

@ -10,6 +10,11 @@ from tiramisu import Config
from tiramisu.error import ConfigError from tiramisu.error import ConfigError
from tiramisu import undefined, Params, ParamValue, ParamOption from tiramisu import undefined, Params, ParamValue, ParamOption
from tiramisu.api import TIRAMISU_VERSION from tiramisu.api import TIRAMISU_VERSION
from tiramisu.storage import list_sessions
def teardown_function(function):
assert list_sessions() == [], 'session list is not empty when leaving "{}"'.format(function.__name__)
def return_val(val): def return_val(val):

View File

@ -14,6 +14,11 @@ from tiramisu.i18n import _
from tiramisu import Config, IntOption, FloatOption, StrOption, ChoiceOption, \ from tiramisu import Config, IntOption, FloatOption, StrOption, ChoiceOption, \
BoolOption, UnicodeOption, OptionDescription, undefined BoolOption, UnicodeOption, OptionDescription, undefined
from tiramisu.error import ConflictError, ConfigError, PropertiesOptionError, APIError from tiramisu.error import ConflictError, ConfigError, PropertiesOptionError, APIError
from tiramisu.storage import list_sessions
def teardown_function(function):
assert list_sessions() == [], 'session list is not empty when leaving "{}"'.format(function.__name__)
def make_description(): def make_description():

View File

@ -9,6 +9,11 @@ from tiramisu import Config, IntOption, FloatOption, StrOption, ChoiceOption, \
PortOption, NetworkOption, NetmaskOption, BroadcastOption, \ PortOption, NetworkOption, NetmaskOption, BroadcastOption, \
DomainnameOption, OptionDescription DomainnameOption, OptionDescription
from tiramisu.error import PropertiesOptionError from tiramisu.error import PropertiesOptionError
from tiramisu.storage import list_sessions
def teardown_function(function):
assert list_sessions() == [], 'session list is not empty when leaving "{}"'.format(function.__name__)
def make_description(): def make_description():

View File

@ -8,6 +8,11 @@ from tiramisu import Config
from tiramisu.option import DomainnameOption, EmailOption, URLOption, OptionDescription from tiramisu.option import DomainnameOption, EmailOption, URLOption, OptionDescription
from tiramisu.error import ValueWarning from tiramisu.error import ValueWarning
from tiramisu.i18n import _ from tiramisu.i18n import _
from tiramisu.storage import list_sessions
def teardown_function(function):
assert list_sessions() == [], 'session list is not empty when leaving "{}"'.format(function.__name__)
def test_domainname(): def test_domainname():

View File

@ -6,6 +6,11 @@ from py.test import raises
from tiramisu import Config ,IPOption, NetworkOption, NetmaskOption, \ from tiramisu import Config ,IPOption, NetworkOption, NetmaskOption, \
PortOption, BroadcastOption, OptionDescription PortOption, BroadcastOption, OptionDescription
from tiramisu.error import ValueWarning from tiramisu.error import ValueWarning
from tiramisu.storage import list_sessions
def teardown_function(function):
assert list_sessions() == [], 'session list is not empty when leaving "{}"'.format(function.__name__)
def test_ip(): def test_ip():

View File

@ -1,11 +1,16 @@
# coding: utf-8 # coding: utf-8
from .autopath import do_autopath from .autopath import do_autopath
do_autopath() do_autopath()
import weakref
from tiramisu import BoolOption, IntOption, StrOption, IPOption, NetmaskOption, \ from tiramisu import BoolOption, IntOption, StrOption, IPOption, NetmaskOption, \
SymLinkOption, OptionDescription, DynOptionDescription, submulti, \ SymLinkOption, OptionDescription, DynOptionDescription, submulti, \
Config, GroupConfig, MetaConfig, Params, ParamOption Config, GroupConfig, MetaConfig, Params, ParamOption
import weakref from tiramisu.storage import list_sessions
def teardown_function(function):
assert list_sessions() == [], 'session list is not empty when leaving "{}"'.format(function.__name__)
IS_DEREFABLE = True IS_DEREFABLE = True

View File

@ -1,13 +1,18 @@
# coding: utf-8 # coding: utf-8
from .autopath import do_autopath from .autopath import do_autopath
do_autopath() do_autopath()
from py.test import raises
from tiramisu.setting import groups from tiramisu.setting import groups
from tiramisu import Config, MetaConfig from tiramisu import Config, MetaConfig
from tiramisu import ChoiceOption, BoolOption, IntOption, \ from tiramisu import ChoiceOption, BoolOption, IntOption, \
StrOption, OptionDescription StrOption, OptionDescription
from .test_state import _diff_opts, _diff_conf from .test_state import _diff_opts, _diff_conf
from py.test import raises from tiramisu.storage import list_sessions
def teardown_function(function):
assert list_sessions() == [], 'session list is not empty when leaving "{}"'.format(function.__name__)
def make_description(): def make_description():

View File

@ -1,6 +1,7 @@
# coding: utf-8 # coding: utf-8
from .autopath import do_autopath from .autopath import do_autopath
do_autopath() do_autopath()
from py.test import raises
from tiramisu.setting import groups, owners from tiramisu.setting import groups, owners
from tiramisu import BoolOption, StrOption, ChoiceOption, IPOption, \ from tiramisu import BoolOption, StrOption, ChoiceOption, IPOption, \
@ -10,8 +11,11 @@ from tiramisu import BoolOption, StrOption, ChoiceOption, IPOption, \
OptionDescription, DynOptionDescription, DynSymLinkOption, submulti, MasterSlaves, \ OptionDescription, DynOptionDescription, DynSymLinkOption, submulti, MasterSlaves, \
Config, Params, ParamOption, ParamValue Config, Params, ParamOption, ParamValue
from tiramisu.error import PropertiesOptionError, ConfigError, ConflictError from tiramisu.error import PropertiesOptionError, ConfigError, ConflictError
from tiramisu.storage import list_sessions
from py.test import raises
def teardown_function(function):
assert list_sessions() == [], 'session list is not empty when leaving "{}"'.format(function.__name__)
def return_true(value, param=None, suffix=None): def return_true(value, param=None, suffix=None):

View File

@ -10,6 +10,11 @@ from tiramisu import ChoiceOption, BoolOption, IntOption, FloatOption, \
StrOption, OptionDescription, SymLinkOption, MasterSlaves, Config, \ StrOption, OptionDescription, SymLinkOption, MasterSlaves, Config, \
Params, ParamContext, ParamOption, ParamValue Params, ParamContext, ParamOption, ParamValue
from tiramisu.error import PropertiesOptionError, ConfigError from tiramisu.error import PropertiesOptionError, ConfigError
from tiramisu.storage import list_sessions
def teardown_function(function):
assert list_sessions() == [], 'session list is not empty when leaving "{}"'.format(function.__name__)
def compare(calculated, expected): def compare(calculated, expected):

View File

@ -9,6 +9,11 @@ from tiramisu import IntOption, StrOption, UnicodeOption, OptionDescription, \
SymLinkOption, MasterSlaves, undefined, Params, ParamOption SymLinkOption, MasterSlaves, undefined, Params, ParamOption
from tiramisu.error import PropertiesOptionError, ConfigError from tiramisu.error import PropertiesOptionError, ConfigError
from tiramisu.setting import groups from tiramisu.setting import groups
from tiramisu.storage import list_sessions
def teardown_function(function):
assert list_sessions() == [], 'session list is not empty when leaving "{}"'.format(function.__name__)
def make_description(): def make_description():

View File

@ -1,14 +1,18 @@
# coding: utf-8 # coding: utf-8
from .autopath import do_autopath from .autopath import do_autopath
do_autopath() do_autopath()
from py.test import raises
from tiramisu.setting import groups, owners from tiramisu.setting import groups, owners
from tiramisu import ChoiceOption, BoolOption, IntOption, IPOption, NetmaskOption, \ from tiramisu import ChoiceOption, BoolOption, IntOption, IPOption, NetmaskOption, \
StrOption, OptionDescription, MasterSlaves, Config StrOption, OptionDescription, MasterSlaves, Config
from tiramisu.error import SlaveError, PropertiesOptionError, APIError, ConfigError from tiramisu.error import SlaveError, PropertiesOptionError, APIError, ConfigError
from tiramisu.api import TIRAMISU_VERSION from tiramisu.api import TIRAMISU_VERSION
from tiramisu.storage import list_sessions
from py.test import raises
def teardown_function(function):
assert list_sessions() == [], 'session list is not empty when leaving "{}"'.format(function.__name__)
def compare(calculated, expected): def compare(calculated, expected):
@ -133,9 +137,12 @@ def test_list_recursive():
group_names = [res.option.name() for res in result] group_names = [res.option.name() for res in result]
assert group_names == ['general', 'interface1'] assert group_names == ['general', 'interface1']
# #
result = list(api.option.list(recursive=True)) result = api.option.list(recursive=True)
group_names = [res.option.name() for res in result] group_names = [res.option.name() for res in result]
assert group_names == ['numero_etab', 'nom_machine', 'nombre_interfaces', 'activer_proxy_client', 'mode_conteneur_actif', 'serveur_ntp', 'time_zone', 'ip_admin_eth0', 'netmask_admin_eth0'] assert group_names == ['numero_etab', 'nom_machine', 'nombre_interfaces',
'activer_proxy_client', 'mode_conteneur_actif',
'serveur_ntp', 'time_zone', 'ip_admin_eth0',
'netmask_admin_eth0']
result = list(api.option.list(recursive=True, type='optiondescription')) result = list(api.option.list(recursive=True, type='optiondescription'))
group_names = [res.option.name() for res in result] group_names = [res.option.name() for res in result]
assert group_names == ['general', 'ip_admin_eth0', 'interface1', 'creole'] assert group_names == ['general', 'ip_admin_eth0', 'interface1', 'creole']
@ -191,7 +198,12 @@ def test_iter_on_empty_group():
def test_iter_not_group(): def test_iter_not_group():
api = Config(OptionDescription("name", "descr", [])) api = Config(OptionDescription("name", "descr", []))
api.property.read_write() api.property.read_write()
raises(AssertionError, "list(api.option.list(type='optiondescription', group_type='family'))") try:
list(api.option.list(type='optiondescription', group_type='family'))
except AssertionError:
pass
else:
raise Exception('must raise')
def test_groups_with_master(): def test_groups_with_master():

View File

@ -8,6 +8,12 @@ from tiramisu import IntOption, StrOption, NetworkOption, NetmaskOption, \
OptionDescription, MasterSlaves, Config, GroupConfig, MetaConfig, \ OptionDescription, MasterSlaves, Config, GroupConfig, MetaConfig, \
Params, ParamOption, ParamValue Params, ParamOption, ParamValue
from tiramisu.error import ConfigError, ConflictError, PropertiesOptionError, SlaveError, APIError from tiramisu.error import ConfigError, ConflictError, PropertiesOptionError, SlaveError, APIError
from tiramisu.storage import list_sessions
def teardown_function(function):
assert list_sessions() == [], 'session list is not empty when leaving "{}"'.format(function.__name__)
owners.addowner('meta1') owners.addowner('meta1')
owners.addowner('meta2') owners.addowner('meta2')
@ -663,16 +669,16 @@ def test_meta_callback():
meta.property.read_write() meta.property.read_write()
assert meta.config('cfg').value.dict() == {'val3': 'yes', 'val2': 'val', 'val1': 'val', 'val5': 'yes', 'val4': 'val'} assert meta.config('cfg').value.dict() == {'val3': 'yes', 'val2': 'val', 'val1': 'val', 'val5': 'yes', 'val4': 'val'}
meta.config('cfg').option('val1').value.set('new') meta.config('cfg').option('val1').value.set('new')
#assert meta.config('cfg').value.dict() == {'val3': 'yes', 'val2': 'new', 'val1': 'new', 'val5': 'yes', 'val4': 'new'} assert meta.config('cfg').value.dict() == {'val3': 'yes', 'val2': 'new', 'val1': 'new', 'val5': 'yes', 'val4': 'new'}
#meta.config('cfg').option('val1').value.reset() meta.config('cfg').option('val1').value.reset()
#meta.option('val1').value.set('new') meta.option('val1').value.set('new')
#assert meta.config('cfg').value.dict() == {'val3': 'yes', 'val2': 'new', 'val1': 'new', 'val5': 'yes', 'val4': 'new'} assert meta.config('cfg').value.dict() == {'val3': 'yes', 'val2': 'new', 'val1': 'new', 'val5': 'yes', 'val4': 'new'}
#meta.config('cfg').option('val4').value.set('new1') meta.config('cfg').option('val4').value.set('new1')
#assert meta.config('cfg').value.dict() == {'val3': 'yes', 'val2': 'new', 'val1': 'new', 'val5': 'yes', 'val4': 'new1'} assert meta.config('cfg').value.dict() == {'val3': 'yes', 'val2': 'new', 'val1': 'new', 'val5': 'yes', 'val4': 'new1'}
#meta.config('cfg').option('val4').value.reset() meta.config('cfg').option('val4').value.reset()
#meta.option('val4').value.set('new1') meta.option('val4').value.set('new1')
#assert meta.config('cfg').value.dict() == {'val3': 'yes', 'val2': 'new', 'val1': 'new', 'val5': 'yes', 'val4': 'new1'} assert meta.config('cfg').value.dict() == {'val3': 'yes', 'val2': 'new', 'val1': 'new', 'val5': 'yes', 'val4': 'new1'}
#meta.option('val4').value.reset() meta.option('val4').value.reset()
def test_meta_callback_slave(): def test_meta_callback_slave():
@ -875,35 +881,47 @@ def test_meta_properties_meta_set_value():
assert len(ret) == 2 assert len(ret) == 2
assert isinstance(ret[0], PropertiesOptionError) assert isinstance(ret[0], PropertiesOptionError)
assert isinstance(ret[1], PropertiesOptionError) assert isinstance(ret[1], PropertiesOptionError)
del(ret) del ret[1]
del ret[0]
del ret
ret = meta.value.set('netmask_admin_eth0', ['255.255.255.255'], force_default=True) ret = meta.value.set('netmask_admin_eth0', ['255.255.255.255'], force_default=True)
assert len(ret) == 1 assert len(ret) == 1
assert isinstance(ret[0], PropertiesOptionError) assert isinstance(ret[0], PropertiesOptionError)
del(ret) del ret[0]
del ret
ret = meta.value.set('netmask_admin_eth0', ['255.255.255.255'], force_dont_change_value=True) ret = meta.value.set('netmask_admin_eth0', ['255.255.255.255'], force_dont_change_value=True)
assert len(ret) == 3 assert len(ret) == 3
assert isinstance(ret[0], PropertiesOptionError) assert isinstance(ret[0], PropertiesOptionError)
assert isinstance(ret[1], PropertiesOptionError) assert isinstance(ret[1], PropertiesOptionError)
assert isinstance(ret[2], PropertiesOptionError) assert isinstance(ret[2], PropertiesOptionError)
del(ret) del ret[2]
del ret[1]
del ret[0]
del ret
ret = meta.value.set('netmask_admin_eth0', ['255.255.255.255'], force_default_if_same=True) ret = meta.value.set('netmask_admin_eth0', ['255.255.255.255'], force_default_if_same=True)
assert len(ret) == 1 assert len(ret) == 1
assert isinstance(ret[0], PropertiesOptionError) assert isinstance(ret[0], PropertiesOptionError)
del(ret) del ret[0]
del ret
ret = meta.value.set('ip_admin_eth0', '255.255.255.255', only_config=True) ret = meta.value.set('ip_admin_eth0', '255.255.255.255', only_config=True)
assert len(ret) == 2 assert len(ret) == 2
assert isinstance(ret[0], ValueError) assert isinstance(ret[0], ValueError)
assert isinstance(ret[1], ValueError) assert isinstance(ret[1], ValueError)
del(ret) del ret[1]
del ret[0]
del ret
ret = meta.value.set('ip_admin_eth0', '255.255.255.255', force_default=True) ret = meta.value.set('ip_admin_eth0', '255.255.255.255', force_default=True)
assert len(ret) == 1 assert len(ret) == 1
assert isinstance(ret[0], ValueError) assert isinstance(ret[0], ValueError)
del(ret) del ret[0]
del ret
ret = meta.value.set('ip_admin_eth0', '255.255.255.255', force_dont_change_value=True) ret = meta.value.set('ip_admin_eth0', '255.255.255.255', force_dont_change_value=True)
assert len(ret) == 1 assert len(ret) == 1
assert isinstance(ret[0], ValueError) assert isinstance(ret[0], ValueError)
del(ret) del ret[0]
del ret
ret = meta.value.set('ip_admin_eth0', '255.255.255.255', force_default_if_same=True) ret = meta.value.set('ip_admin_eth0', '255.255.255.255', force_default_if_same=True)
assert len(ret) == 1 assert len(ret) == 1
assert isinstance(ret[0], ValueError) assert isinstance(ret[0], ValueError)
del(ret) del ret[0]
del ret

View File

@ -9,6 +9,11 @@ from py.test import raises
from tiramisu.error import APIError, ConfigError from tiramisu.error import APIError, ConfigError
from tiramisu import IntOption, OptionDescription, Config from tiramisu import IntOption, OptionDescription, Config
from tiramisu.setting import groups from tiramisu.setting import groups
from tiramisu.storage import list_sessions
def teardown_function(function):
assert list_sessions() == [], 'session list is not empty when leaving "{}"'.format(function.__name__)
def a_func(): def a_func():
@ -140,8 +145,18 @@ def test_optiondescription_list():
assert len(list(api.option('od').list('optiondescription', group_type=groups.notfamily1))) == 1 assert len(list(api.option('od').list('optiondescription', group_type=groups.notfamily1))) == 1
assert len(list(api.option('od.od').list('option'))) == 1 assert len(list(api.option('od.od').list('option'))) == 1
assert len(list(api.option('od.od2').list('option'))) == 1 assert len(list(api.option('od.od2').list('option'))) == 1
raises(AssertionError, "list(api.option('od').list('unknown'))") try:
raises(AssertionError, "list(api.option('od').list('option', group_type='toto'))") list(api.option('od').list('unknown'))
except AssertionError:
pass
else:
raise Exception('must raise')
try:
list(api.option('od').list('option', group_type='toto'))
except AssertionError:
pass
else:
raise Exception('must raise')
def test_optiondescription_group(): def test_optiondescription_group():
@ -158,8 +173,18 @@ def test_optiondescription_group():
assert len(list(api.option.list('optiondescription'))) == 2 assert len(list(api.option.list('optiondescription'))) == 2
assert len(list(api.option.list('optiondescription', group_type=groups.family))) == 1 assert len(list(api.option.list('optiondescription', group_type=groups.family))) == 1
assert len(list(api.option.list('optiondescription', group_type=groups.notfamily))) == 1 assert len(list(api.option.list('optiondescription', group_type=groups.notfamily))) == 1
raises(AssertionError, "list(api.option.list('unknown'))") try:
raises(AssertionError, "list(api.option.list('option', group_type='toto'))") list(api.option.list('unknown'))
except AssertionError:
pass
else:
raise Exception('must raise')
try:
list(api.option.list('option', group_type='toto'))
except AssertionError:
pass
else:
raise Exception('must raise')
def test_optiondescription_group_redefined(): def test_optiondescription_group_redefined():

View File

@ -12,6 +12,11 @@ from tiramisu import ChoiceOption, BoolOption, IntOption, FloatOption, \
from tiramisu.api import TIRAMISU_VERSION from tiramisu.api import TIRAMISU_VERSION
from tiramisu.error import PropertiesOptionError, ConflictError, SlaveError, ConfigError from tiramisu.error import PropertiesOptionError, ConflictError, SlaveError, ConfigError
from tiramisu.i18n import _ from tiramisu.i18n import _
from tiramisu.storage import list_sessions
def teardown_function(function):
assert list_sessions() == [], 'session list is not empty when leaving "{}"'.format(function.__name__)
def return_val(): def return_val():
@ -697,13 +702,12 @@ def test_consistency_master_and_slaves_master_mandatory_transitive():
maconfig = OptionDescription('rootconfig', '', [interface1, interface2]) maconfig = OptionDescription('rootconfig', '', [interface1, interface2])
api = Config(maconfig) api = Config(maconfig)
api.property.read_write() api.property.read_write()
err = None
try: try:
api.option('val1.val1').value.get() api.option('val1.val1').value.get()
except PropertiesOptionError as error: except PropertiesOptionError as error:
err = error assert str(error) == str(_('cannot access to {0} "{1}" because "{2}" has {3} {4}').format('option', 'val1', 'val2', 'property', '"disabled"'))
assert err, 'should raises' else:
assert str(err) == str(_('cannot access to {0} "{1}" because "{2}" has {3} {4}').format('option', 'val1', 'val2', 'property', '"disabled"')) raise Exception('must raises')
raises(PropertiesOptionError, "api.option('val3.val3').value.get()") raises(PropertiesOptionError, "api.option('val3.val3').value.get()")
assert list(api.value.mandatory_warnings()) == [] assert list(api.value.mandatory_warnings()) == []

View File

@ -10,6 +10,11 @@ from tiramisu import IPOption, NetworkOption, NetmaskOption, IntOption,\
from tiramisu.error import ConfigError, ValueWarning, PropertiesOptionError from tiramisu.error import ConfigError, ValueWarning, PropertiesOptionError
from tiramisu.api import TIRAMISU_VERSION from tiramisu.api import TIRAMISU_VERSION
import warnings import warnings
from tiramisu.storage import list_sessions
def teardown_function(function):
assert list_sessions() == [], 'session list is not empty when leaving "{}"'.format(function.__name__)
def return_value(value=None): def return_value(value=None):

View File

@ -8,6 +8,11 @@ from tiramisu.setting import owners
from tiramisu.error import PropertiesOptionError, ConfigError from tiramisu.error import PropertiesOptionError, ConfigError
from tiramisu import IntOption, FloatOption, StrOption, ChoiceOption, \ from tiramisu import IntOption, FloatOption, StrOption, ChoiceOption, \
BoolOption, OptionDescription, MasterSlaves, Config, undefined BoolOption, OptionDescription, MasterSlaves, Config, undefined
from tiramisu.storage import list_sessions
def teardown_function(function):
assert list_sessions() == [], 'session list is not empty when leaving "{}"'.format(function.__name__)
def make_description(): def make_description():

View File

@ -7,6 +7,11 @@ from tiramisu.setting import owners, groups
from tiramisu import ChoiceOption, BoolOption, IntOption, FloatOption, \ from tiramisu import ChoiceOption, BoolOption, IntOption, FloatOption, \
StrOption, OptionDescription, SymLinkOption, MasterSlaves, Config StrOption, OptionDescription, SymLinkOption, MasterSlaves, Config
from tiramisu.error import ConfigError, ConstError, PropertiesOptionError, APIError from tiramisu.error import ConfigError, ConstError, PropertiesOptionError, APIError
from tiramisu.storage import list_sessions
def teardown_function(function):
assert list_sessions() == [], 'session list is not empty when leaving "{}"'.format(function.__name__)
def make_description(): def make_description():

View File

@ -10,7 +10,11 @@ from tiramisu.setting import owners, groups
from tiramisu import ChoiceOption, BoolOption, IntOption, FloatOption, \ from tiramisu import ChoiceOption, BoolOption, IntOption, FloatOption, \
StrOption, OptionDescription, MasterSlaves, Config, undefined StrOption, OptionDescription, MasterSlaves, Config, undefined
from tiramisu.error import PropertiesOptionError from tiramisu.error import PropertiesOptionError
from tiramisu.api import TIRAMISU_VERSION from tiramisu.storage import list_sessions
def teardown_function(function):
assert list_sessions() == [], 'session list is not empty when leaving "{}"'.format(function.__name__)
def make_description(): def make_description():
@ -458,10 +462,6 @@ def test_reset_properties_force_store_value():
api = Config(descr) api = Config(descr)
assert api.property.exportation() == {} assert api.property.exportation() == {}
api.property.add('frozen') api.property.add('frozen')
if TIRAMISU_VERSION == 2:
assert api.property.exportation() == \
{None: set(('frozen', 'cache', 'validator', 'warnings', 'expire'))}
else:
assert api.property.exportation() == \ assert api.property.exportation() == \
{None: set(('frozen', 'cache', 'validator', 'warnings'))} {None: set(('frozen', 'cache', 'validator', 'warnings'))}
api.property.reset() api.property.reset()
@ -471,29 +471,14 @@ def test_reset_properties_force_store_value():
api.property.reset() api.property.reset()
assert api.property.exportation() == {'gc.dummy': set(('test', 'force_store_value'))} assert api.property.exportation() == {'gc.dummy': set(('test', 'force_store_value'))}
api.property.add('frozen') api.property.add('frozen')
if TIRAMISU_VERSION == 2:
assert api.property.exportation() == \
{None: set(('frozen', 'validator', 'cache', 'warnings', 'expire')),
'gc.dummy': set(('test', 'force_store_value'))}
else:
assert api.property.exportation() == \ assert api.property.exportation() == \
{None: set(('frozen', 'validator', 'cache', 'warnings')), {None: set(('frozen', 'validator', 'cache', 'warnings')),
'gc.dummy': set(('test', 'force_store_value'))} 'gc.dummy': set(('test', 'force_store_value'))}
api.property.add('frozen') api.property.add('frozen')
if TIRAMISU_VERSION == 2:
assert api.property.exportation() == \
{None: set(('frozen', 'validator', 'cache', 'warnings', 'expire')),
'gc.dummy': set(('test', 'force_store_value'))}
else:
assert api.property.exportation() == \ assert api.property.exportation() == \
{None: set(('frozen', 'validator', 'cache', 'warnings')), {None: set(('frozen', 'validator', 'cache', 'warnings')),
'gc.dummy': set(('test', 'force_store_value'))} 'gc.dummy': set(('test', 'force_store_value'))}
api.option('gc.dummy').property.add('test') api.option('gc.dummy').property.add('test')
if TIRAMISU_VERSION == 2:
assert api.property.exportation() == \
{None: set(('frozen', 'validator', 'cache', 'warnings', 'expire')),
'gc.dummy': set(('test', 'force_store_value'))}
else:
assert api.property.exportation() == \ assert api.property.exportation() == \
{None: set(('frozen', 'validator', 'cache', 'warnings')), {None: set(('frozen', 'validator', 'cache', 'warnings')),
'gc.dummy': set(('test', 'force_store_value'))} 'gc.dummy': set(('test', 'force_store_value'))}
@ -511,10 +496,6 @@ def test_set_modified_value():
def test_pprint(): def test_pprint():
if TIRAMISU_VERSION == 2:
msg_error = _("cannot access to {0} \"{1}\" because has {2} {3}")
msg_is_not = _('the value of "{0}" is not "{1}"')
else:
msg_error = _("cannot access to {0} \"{1}\" because has {2} {3}") msg_error = _("cannot access to {0} \"{1}\" because has {2} {3}")
msg_is_not = _('the value of "{0}" is not {1}') msg_is_not = _('the value of "{0}" is not {1}')
msg_is = _('the value of "{0}" is "{1}"') msg_is = _('the value of "{0}" is "{1}"')
@ -547,13 +528,10 @@ def test_pprint():
except PropertiesOptionError as error: except PropertiesOptionError as error:
err = error err = error
if TIRAMISU_VERSION == 2:
list_disabled = 'disabled (' + display_list([msg_is.format('Test int option', '1'), msg_is.format('string2', 'string')]) + ')'
list_hidden = 'hidden (' + msg_is_not.format('Test int option', display_list([2, 3, 4], 'or')) + ')'
else:
list_disabled = '"disabled" (' + display_list([msg_is.format('Test int option', '1'), msg_is.format('string2', 'string')]) + ')' list_disabled = '"disabled" (' + display_list([msg_is.format('Test int option', '1'), msg_is.format('string2', 'string')]) + ')'
list_hidden = '"hidden" (' + msg_is_not.format('Test int option', display_list([2, 3, 4], 'or', add_quote=True)) + ')' list_hidden = '"hidden" (' + msg_is_not.format('Test int option', display_list([2, 3, 4], 'or', add_quote=True)) + ')'
assert str(err) == _(msg_error.format('option', 'Test string option', properties, display_list([list_disabled, list_hidden]))) assert str(err) == _(msg_error.format('option', 'Test string option', properties, display_list([list_disabled, list_hidden])))
del err
err = None err = None
try: try:
@ -561,9 +539,6 @@ def test_pprint():
except PropertiesOptionError as error: except PropertiesOptionError as error:
err = error err = error
if TIRAMISU_VERSION == 2:
assert str(err) == msg_error.format('optiondescription', 'options', prop, 'hidden (' + msg_is.format('Test int option', 1) + ')')
else:
assert str(err) == msg_error.format('optiondescription', 'options', prop, '"hidden" (' + msg_is.format('Test int option', 1) + ')') assert str(err) == msg_error.format('optiondescription', 'options', prop, '"hidden" (' + msg_is.format('Test int option', 1) + ')')
#err = None #err = None
@ -574,10 +549,6 @@ def test_pprint():
#msg_1 = msg_is.format('string2', 'string') #msg_1 = msg_is.format('string2', 'string')
#msg_2 = msg_is.format('Test int option', 1) #msg_2 = msg_is.format('Test int option', 1)
#if TIRAMISU_VERSION == 2:
# msg_3 = msg_is_not.format('Test int option', display_list([2, 3, 4], 'or'))
# list_hidden = 'hidden (' + display_list([msg_2, msg_3, msg_1]) + ')'
#else:
#msg_3 = msg_is_not.format('Test int option', display_list([2, 3, 4], 'or', add_quote=True)) #msg_3 = msg_is_not.format('Test int option', display_list([2, 3, 4], 'or', add_quote=True))
#list_hidden = '"hidden" (' + display_list([msg_2, msg_3, msg_1]) + ')' #list_hidden = '"hidden" (' + display_list([msg_2, msg_3, msg_1]) + ')'
@ -589,10 +560,8 @@ def test_pprint():
except Exception as error: except Exception as error:
err = error err = error
if TIRAMISU_VERSION == 2:
assert str(err) == msg_error.format('option', 'string', properties, display_list(['disabled', 'hidden']))
else:
assert str(err) == msg_error.format('option', 'string', properties, display_list(['disabled', 'hidden'], add_quote=True)) assert str(err) == msg_error.format('option', 'string', properties, display_list(['disabled', 'hidden'], add_quote=True))
del err
err = None err = None
try: try:
@ -600,7 +569,5 @@ def test_pprint():
except Exception as error: except Exception as error:
err = error err = error
if TIRAMISU_VERSION == 2:
assert str(err) == msg_error.format('option', 'string3', prop, 'hidden')
else:
assert str(err) == msg_error.format('option', 'string3', prop, '"hidden"') assert str(err) == msg_error.format('option', 'string3', prop, '"hidden"')
del err

View File

@ -8,6 +8,11 @@ from py.test import raises
from tiramisu import ChoiceOption, BoolOption, IntOption, FloatOption, \ from tiramisu import ChoiceOption, BoolOption, IntOption, FloatOption, \
PasswordOption, StrOption, DateOption, OptionDescription, Config PasswordOption, StrOption, DateOption, OptionDescription, Config
from tiramisu.error import PropertiesOptionError from tiramisu.error import PropertiesOptionError
from tiramisu.storage import list_sessions
def teardown_function(function):
assert list_sessions() == [], 'session list is not empty when leaving "{}"'.format(function.__name__)
def make_description(): def make_description():

View File

@ -5,6 +5,12 @@ do_autopath()
from py.test import raises from py.test import raises
from tiramisu.option import UsernameOption from tiramisu.option import UsernameOption
from tiramisu.storage import list_sessions
def teardown_function(function):
assert list_sessions() == [], 'session list is not empty when leaving "{}"'.format(function.__name__)
def test_username(): def test_username():
UsernameOption('a', '', 'string') UsernameOption('a', '', 'string')

View File

@ -8,6 +8,11 @@ from tiramisu import BoolOption, StrOption, OptionDescription, MasterSlaves, Con
from tiramisu.setting import groups from tiramisu.setting import groups
from tiramisu.error import ValueWarning, ConfigError from tiramisu.error import ValueWarning, ConfigError
from tiramisu.i18n import _ from tiramisu.i18n import _
from tiramisu.storage import list_sessions
def teardown_function(function):
assert list_sessions() == [], 'session list is not empty when leaving "{}"'.format(function.__name__)
msg_err = _('attention, "{0}" could be an invalid {1} for "{2}", {3}') msg_err = _('attention, "{0}" could be an invalid {1} for "{2}", {3}')

View File

@ -6,6 +6,11 @@ from py.test import raises
from tiramisu import BoolOption, OptionDescription, ChoiceOption,\ from tiramisu import BoolOption, OptionDescription, ChoiceOption,\
IntOption, FloatOption, StrOption, Config IntOption, FloatOption, StrOption, Config
from tiramisu.storage import list_sessions
def teardown_function(function):
assert list_sessions() == [], 'session list is not empty when leaving "{}"'.format(function.__name__)
def make_description(): def make_description():

966
test/test_pathconfig.py Normal file
View File

@ -0,0 +1,966 @@
from .autopath import do_autopath
do_autopath()
from py.test import raises
from tiramisu.setting import groups, owners
from tiramisu import IntOption, StrOption, NetworkOption, NetmaskOption, \
OptionDescription, MasterSlaves, Config, GroupConfig, PathConfig, \
Params, ParamOption, ParamValue
from tiramisu.error import ConfigError, ConflictError, PropertiesOptionError, SlaveError, APIError
from tiramisu.storage import list_sessions
owners.addowner('path1')
owners.addowner('path2')
def teardown_function(function):
assert list_sessions() == [], 'session list is not empty when leaving "{}"'.format(function.__name__)
def return_value(value=None):
return value
def raise_exception():
raise Exception('test')
def make_description():
i1 = IntOption('i1', '')
i2 = IntOption('i2', '', default=1)
i3 = IntOption('i3', '')
i4 = IntOption('i4', '', default=2)
i5 = IntOption('i5', '', default=[2], multi=True)
i6 = IntOption('i6', '', properties=('disabled',))
od1 = OptionDescription('od1', '', [i1, i2, i3, i4, i5, i6])
od2 = OptionDescription('od2', '', [od1])
return od2
def make_description1():
i1 = IntOption('i1', '')
i2 = IntOption('i2', '', default=1)
i3 = IntOption('i3', '')
i4 = IntOption('i4', '', default=2)
i5 = IntOption('i5', '', default=[2], multi=True)
i6 = IntOption('i6', '', properties=('disabled',))
od1 = OptionDescription('od1', '', [i1, i2, i3, i4, i5, i6])
od2 = OptionDescription('od2', '', [od1])
return od2
def make_description2():
i1 = IntOption('i1', '')
i2 = IntOption('i2', '', default=1)
i3 = IntOption('i3', '')
i4 = IntOption('i4', '', default=2)
i5 = IntOption('i5', '', default=[2], multi=True)
i6 = IntOption('i6', '', properties=('disabled',))
od1 = OptionDescription('od1', '', [i1, i2, i3, i4, i5, i6])
od2 = OptionDescription('od2', '', [od1])
return od2
def make_description3():
i1 = IntOption('i1', '')
i2 = IntOption('i2', '', default=1)
i3 = IntOption('i3', '')
i4 = IntOption('i4', '', default=2)
i5 = IntOption('i5', '', default=[2], multi=True)
i6 = IntOption('i6', '', properties=('disabled',))
od1 = OptionDescription('od1', '', [i1, i2, i3, i4, i5, i6])
od2 = OptionDescription('od2', '', [od1])
return od2
def make_pathconfig(double=False):
od1 = make_description()
od2 = make_description1()
od3 = make_description2()
conf1 = Config(od1, session_id='conf1')
conf2 = Config(od2, session_id='conf2')
path = PathConfig(od3, [conf1, conf2], session_id='path')
if double:
od4 = make_description3()
path.owner.set(owners.path2)
path = PathConfig(od4, [path], session_id='doublepath')
path.property.read_write()
path.owner.set(owners.path1)
return path
def test_unknown_config():
path = make_pathconfig()
raises(ConfigError, "path.config('unknown')")
def test_none():
path = make_pathconfig()
assert path.option('od1.i3').value.get() is path.config('conf1').option('od1.i3').value.get() is path.config('conf2').option('od1.i3').value.get() is None
assert path.option('od1.i3').owner.get() is path.config('conf1').option('od1.i3').owner.get() is path.config('conf2').option('od1.i3').owner.get() is owners.default
#
path.option('od1.i3').value.set(3)
assert path.option('od1.i3').value.get() == path.config('conf1').option('od1.i3').value.get() == path.config('conf2').option('od1.i3').value.get() == 3
assert path.option('od1.i3').owner.get() is path.config('conf1').option('od1.i3').owner.get() is path.config('conf2').option('od1.i3').owner.get() is owners.path1
#
path.config('conf1').option('od1.i3').value.set(2)
assert path.option('od1.i3').value.get() == path.config('conf2').option('od1.i3').value.get() == 3
assert path.config('conf1').option('od1.i3').value.get() == 2
assert path.option('od1.i3').owner.get() is path.config('conf2').option('od1.i3').owner.get() is owners.path1
assert path.config('conf1').option('od1.i3').owner.get() is owners.user
#
path.option('od1.i3').value.set(4)
assert path.option('od1.i3').value.get() == path.config('conf2').option('od1.i3').value.get() == 4
assert path.config('conf1').option('od1.i3').value.get() == 2
assert path.option('od1.i3').owner.get() is path.config('conf2').option('od1.i3').owner.get() is owners.path1
assert path.config('conf1').option('od1.i3').owner.get() is owners.user
#
path.option('od1.i3').value.reset()
assert path.option('od1.i3').value.get() is path.config('conf2').option('od1.i3').value.get() is None
assert path.config('conf1').option('od1.i3').value.get() == 2
assert path.option('od1.i3').owner.get() is path.config('conf2').option('od1.i3').owner.get() is owners.default
assert path.config('conf1').option('od1.i3').owner.get() is owners.user
#
path.config('conf1').option('od1.i3').value.reset()
assert path.option('od1.i3').value.get() is path.config('conf1').option('od1.i3').value.get() is path.config('conf2').option('od1.i3').value.get() is None
assert path.option('od1.i3').owner.get() is path.config('conf1').option('od1.i3').owner.get() is path.config('conf2').option('od1.i3').owner.get() is owners.default
#
assert path.config(None).config.name() == path.config.name()
def test_reset():
path = make_pathconfig()
assert path.option('od1.i2').value.get() == 1
path.option('od1.i2').value.set(2)
path.config('conf1').option('od1.i2').value.set(3)
assert path.option('od1.i2').value.get() == 2
assert path.config('conf1').option('od1.i2').value.get() == 3
assert path.config('conf2').option('od1.i2').value.get() == 2
path.config.reset()
assert path.option('od1.i2').value.get() == 1
assert path.config('conf1').option('od1.i2').value.get() == 3
assert path.config('conf2').option('od1.i2').value.get() == 1
def test_default():
path = make_pathconfig()
assert path.option('od1.i2').value.get() == path.config('conf1').option('od1.i2').value.get() == path.config('conf2').option('od1.i2').value.get() == 1
assert path.option('od1.i2').owner.get() is path.config('conf1').option('od1.i2').owner.get() is path.config('conf2').option('od1.i2').owner.get() is owners.default
#
path.option('od1.i2').value.set(3)
assert path.option('od1.i2').value.get() == path.config('conf1').option('od1.i2').value.get() == path.config('conf2').option('od1.i2').value.get() == 3
assert path.option('od1.i2').owner.get() is path.config('conf1').option('od1.i2').owner.get() is path.config('conf2').option('od1.i2').owner.get() is owners.path1
#
path.config('conf1').option('od1.i2').value.set(2)
assert path.option('od1.i2').value.get() == path.config('conf2').option('od1.i2').value.get() == 3
assert path.config('conf1').option('od1.i2').value.get() == 2
assert path.option('od1.i2').owner.get() is path.config('conf2').option('od1.i2').owner.get() is owners.path1
assert path.config('conf1').option('od1.i2').owner.get() is owners.user
#
path.option('od1.i2').value.set(4)
assert path.option('od1.i2').value.get() == path.config('conf2').option('od1.i2').value.get() == 4
assert path.config('conf1').option('od1.i2').value.get() == 2
assert path.option('od1.i2').owner.get() is path.config('conf2').option('od1.i2').owner.get() is owners.path1
assert path.config('conf1').option('od1.i2').owner.get() is owners.user
#
path.option('od1.i2').value.reset()
assert path.option('od1.i2').value.get() == path.config('conf2').option('od1.i2').value.get() == 1
assert path.config('conf1').option('od1.i2').value.get() == 2
assert path.option('od1.i2').owner.get() is path.config('conf2').option('od1.i2').owner.get() is owners.default
assert path.config('conf1').option('od1.i2').owner.get() is owners.user
#
path.config('conf1').option('od1.i2').value.reset()
assert path.option('od1.i2').value.get() == path.config('conf1').option('od1.i2').value.get() == path.config('conf2').option('od1.i2').value.get() == 1
assert path.option('od1.i2').owner.get() is path.config('conf1').option('od1.i2').owner.get() is path.config('conf2').option('od1.i2').owner.get() is owners.default
def test_contexts():
path = make_pathconfig()
errors = path.value.set('od1.i2', 6, only_config=True)
assert path.option('od1.i2').value.get() == 1
assert path.option('od1.i2').owner.get() == owners.default
assert path.config('conf1').option('od1.i2').value.get() == path.config('conf1').option('od1.i2').value.get() == 6
assert path.config('conf1').option('od1.i2').owner.get() == path.config('conf1').option('od1.i2').owner.get() is owners.user
assert len(errors) == 0
def test_find():
path = make_pathconfig()
ret = list(path.option.find('i2'))
assert len(ret) == 1
assert 1 == ret[0].value.get()
assert 1 == path.option.find('i2', first=True).value.get()
assert path.value.dict() == {'od1.i4': 2, 'od1.i1': None, 'od1.i3': None,
'od1.i2': 1, 'od1.i5': [2]}
def test_path_path():
path = make_pathconfig(double=True)
assert path.option('od1.i2').value.get() == path.config('path').option('od1.i2').value.get() == path.config('path.conf1').option('od1.i2').value.get() == path.config('path.conf2').option('od1.i2').value.get() == 1
assert path.option('od1.i2').owner.get() is path.config('path').option('od1.i2').owner.get() is path.config('path.conf1').option('od1.i2').owner.get() is path.config('path.conf2').option('od1.i2').owner.get() is owners.default
#
path.option('od1.i2').value.set(3)
assert path.option('od1.i2').value.get() == path.config('path').option('od1.i2').value.get() == path.config('path.conf1').option('od1.i2').value.get() == path.config('path.conf2').option('od1.i2').value.get() == 3
assert path.option('od1.i2').owner.get() is path.config('path').option('od1.i2').owner.get() is path.config('path.conf1').option('od1.i2').owner.get() is path.config('path.conf2').option('od1.i2').owner.get() is owners.path1
#
path.config('path.conf1').option('od1.i2').value.set(2)
assert path.option('od1.i2').value.get() == path.config('path').option('od1.i2').value.get() == path.config('path.conf2').option('od1.i2').value.get() == 3
assert path.config('path.conf1').option('od1.i2').value.get() == 2
assert path.option('od1.i2').owner.get() is path.config('path').option('od1.i2').owner.get() is path.config('path.conf2').option('od1.i2').owner.get() is owners.path1
assert path.config('path.conf1').option('od1.i2').owner.get() is owners.user
#
path.config('path').option('od1.i2').value.set(4)
assert path.option('od1.i2').value.get() == 3
assert path.config('path').option('od1.i2').value.get() == path.config('path.conf2').option('od1.i2').value.get() == 4
assert path.config('path.conf1').option('od1.i2').value.get() == 2
assert path.option('od1.i2').owner.get() is owners.path1
assert path.config('path').option('od1.i2').owner.get() is path.config('path.conf2').option('od1.i2').owner.get() is owners.path2
assert path.config('path.conf1').option('od1.i2').owner.get() is owners.user
#
path.config('path').option('od1.i2').value.reset()
assert path.option('od1.i2').value.get() == path.config('path').option('od1.i2').value.get() == path.config('path.conf2').option('od1.i2').value.get() == 3
assert path.config('path.conf1').option('od1.i2').value.get() == 2
assert path.option('od1.i2').owner.get() is path.config('path').option('od1.i2').owner.get() is path.config('path.conf2').option('od1.i2').owner.get() is owners.path1
assert path.config('path.conf1').option('od1.i2').owner.get() is owners.user
#
path.option('od1.i2').value.reset()
assert path.option('od1.i2').value.get() == path.config('path').option('od1.i2').value.get() == path.config('path.conf2').option('od1.i2').value.get() == 1
assert path.config('path.conf1').option('od1.i2').value.get() == 2
assert path.option('od1.i2').owner.get() is path.config('path').option('od1.i2').owner.get() is path.config('path.conf2').option('od1.i2').owner.get() is owners.default
assert path.config('path.conf1').option('od1.i2').owner.get() is owners.user
#
path.config('path.conf1').option('od1.i2').value.reset()
assert path.option('od1.i2').value.get() == path.config('path').option('od1.i2').value.get() == path.config('path.conf1').option('od1.i2').value.get() == path.config('path.conf2').option('od1.i2').value.get() == 1
assert path.option('od1.i2').owner.get() is path.config('path').option('od1.i2').owner.get() is path.config('path.conf1').option('od1.i2').owner.get() is path.config('path.conf2').option('od1.i2').owner.get() is owners.default
def test_path_path_set():
path = make_pathconfig(double=True)
errors1 = path.value.set('od1.i1', 7, only_config=True)
errors2 = path.value.set('od1.i6', 7, only_config=True)
assert len(errors1) == 0
assert len(errors2) == 2
conf1 = path.config('path.conf1')._config_bag.context
conf2 = path.config('path.conf2')._config_bag.context
assert path.config('path.conf1').option('od1.i1').value.get() == path.config('path.conf2').option('od1.i1').value.get() == 7
#
dconfigs = []
for conf in path.config.find('i1', value=7).config.list():
dconfigs.append(conf._config_bag.context)
assert [conf1, conf2] == dconfigs
path.config('path.conf1').option('od1.i1').value.set(8)
#
dconfigs = []
for conf in path.config.find('i1').config.list():
dconfigs.append(conf._config_bag.context)
assert [conf1, conf2] == dconfigs
assert conf2 == list(path.config.find('i1', value=7).config.list())[0]._config_bag.context
assert conf1 == list(path.config.find('i1', value=8).config.list())[0]._config_bag.context
#
dconfigs = []
for conf in path.config.find('i5', value=2).config.list():
dconfigs.append(conf._config_bag.context)
assert [conf1, conf2] == dconfigs
#
raises(AttributeError, "path.config.find('i1', value=10)")
raises(AttributeError, "path.config.find('not', value=10)")
raises(AttributeError, "path.config.find('i6')")
raises(ValueError, "path.value.set('od1.i6', 7, only_config=True, force_default=True)")
raises(ValueError, "path.value.set('od1.i6', 7, only_config=True, force_default_if_same=True)")
raises(ValueError, "path.value.set('od1.i6', 7, only_config=True, force_dont_change_value=True)")
def test_not_path():
i1 = IntOption('i1', '')
od1 = OptionDescription('od1', '', [i1])
od2 = OptionDescription('od2', '', [od1])
conf1 = Config(od2, session_id='conf1')
conf2 = Config(od2, session_id='conf2')
conf3 = Config(od2)
conf4 = Config(od2, session_id='conf4')
raises(TypeError, "GroupConfig(conf1)")
#same name
#raises(ConflictError, "GroupConfig([conf2, conf4], session_id='conf2')")
raises(ConflictError, "GroupConfig([conf2, conf2], session_id='conf8')")
grp = GroupConfig([conf1, conf2])
raises(APIError, "grp.option('od1.i1').value.get()")
conf1, conf2 = grp.config.list()
errors = grp.value.set('od1.i1', 7)
assert len(errors) == 0
assert grp.config('conf1').option('od1.i1').value.get() == grp.config('conf2').option('od1.i1').value.get() == 7
assert grp.config('conf1').option('od1.i1').owner.get() is grp.config('conf2').option('od1.i1').owner.get() is owners.user
grp.option('od1.i1').value.reset()
assert grp.config('conf1').option('od1.i1').owner.get() is grp.config('conf2').option('od1.i1').owner.get() is owners.default
def test_group_find_firsts():
i1 = IntOption('i1', '')
od1 = OptionDescription('od1', '', [i1])
od2 = OptionDescription('od2', '', [od1])
conf1 = Config(od2, session_id='conf1')
conf2 = Config(od2, session_id='conf2')
grp = GroupConfig([conf1, conf2])
itr = grp.config.find('i1').config.list()
conf1._config_bag.context == next(itr)._config_bag.context
conf2._config_bag.context == next(itr)._config_bag.context
try:
next(itr)
except StopIteration:
pass
except:
raise Exception('no')
else:
raise Exception('no')
def test_group_group():
i1 = IntOption('i1', '')
od1 = OptionDescription('od1', '', [i1])
od2 = OptionDescription('od2', '', [od1])
conf1 = Config(od2, session_id='conf9')
conf2 = Config(od2, session_id='conf10')
grp = GroupConfig([conf1, conf2], 'grp')
grp2 = GroupConfig([grp])
errors = grp2.value.set('od1.i1', 2)
assert len(errors) == 0
assert grp2.config('grp.conf9').option('od1.i1').value.get() == 2
assert grp2.config('grp.conf9').option('od1.i1').owner.get() is owners.user
def test_path_unconsistent():
i1 = IntOption('i1', '')
i2 = IntOption('i2', '', default=1)
i3 = IntOption('i3', '')
i4 = IntOption('i4', '', default=2)
od1 = OptionDescription('od1', '', [i1, i2, i3, i4])
od2 = OptionDescription('od2', '', [od1])
od3 = OptionDescription('od3', '', [od1])
conf1 = Config(od2, session_id='conf1')
conf2 = Config(od2, session_id='conf2')
conf3 = Config(od2, session_id='conf3')
conf4 = Config(od3, session_id='conf4')
path = PathConfig(od2, [conf1, conf2])
path.owner.set(owners.path1)
raises(TypeError, 'PathConfig(od2, "string")')
# same descr but conf1 already in path
raises(ValueError, "PathConfig(od2, [conf1, conf3])")
# not same descr
PathConfig(od2, [conf3, conf4])
def test_path_master_slaves():
ip_admin_eth0 = StrOption('ip_admin_eth0', "ip", multi=True)
netmask_admin_eth0 = StrOption('netmask_admin_eth0', "mask", multi=True, properties=('hidden',))
interface1 = MasterSlaves('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
od = OptionDescription('root', '', [interface1])
conf1 = Config(od, session_id='conf1')
conf2 = Config(od, session_id='conf2')
path = PathConfig(od, [conf1, conf2])
path.property.read_only()
itr = path.config.find('ip_admin_eth0').config.list()
assert conf1._config_bag.context == next(itr)._config_bag.context
assert conf2._config_bag.context == next(itr)._config_bag.context
itr = path.config.find('netmask_admin_eth0').config.list()
assert conf1._config_bag.context == next(itr)._config_bag.context
assert conf2._config_bag.context == next(itr)._config_bag.context
path.property.read_write()
raises(AttributeError, "path.config.find('netmask_admin_eth0')")
itr = path.unrestraint.config.find('netmask_admin_eth0').config.list()
assert conf1._config_bag.context == next(itr)._config_bag.context
assert conf2._config_bag.context == next(itr)._config_bag.context
path.property.read_only()
itr = path.config.find('netmask_admin_eth0').config.list()
assert conf1._config_bag.context == next(itr)._config_bag.context
assert conf2._config_bag.context == next(itr)._config_bag.context
def test_path_master_slaves_value2():
ip_admin_eth0 = StrOption('ip_admin_eth0', "ip", multi=True)
netmask_admin_eth0 = StrOption('netmask_admin_eth0', "mask", multi=True, properties=('hidden',))
interface1 = MasterSlaves('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
od = OptionDescription('root', '', [interface1])
conf1 = Config(od, session_id='conf1')
conf2 = Config(od, session_id='conf2')
path = PathConfig(od, [conf1, conf2], session_id="path")
path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').value.set(['192.168.1.8'])
assert path.config('conf1').option('ip_admin_eth0.netmask_admin_eth0', 0).value.get() == None
#FIXME devrait raise ! assert path.config('conf1').option('ip_admin_eth0.ip_admin_eth0', 0).value.get() == None
#
path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').value.reset()
#
path.option('ip_admin_eth0.ip_admin_eth0').value.set(['192.168.1.1'])
assert path.config('conf1').option('ip_admin_eth0.netmask_admin_eth0', 0).value.get() == None
path.option('ip_admin_eth0.netmask_admin_eth0', 0).value.set('255.255.255.0')
assert path.config('conf1').option('ip_admin_eth0.netmask_admin_eth0', 0).value.get() == '255.255.255.0'
path.option('ip_admin_eth0.netmask_admin_eth0', 0).value.set('255.255.0.0')
assert path.config('conf1').option('ip_admin_eth0.netmask_admin_eth0', 0).value.get() == '255.255.0.0'
#
path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').value.set(['192.168.1.1'])
assert path.config('conf1').option('ip_admin_eth0.netmask_admin_eth0', 0).value.get() == None
def test_path_master_slaves_value_default():
ip_admin_eth0 = StrOption('ip_admin_eth0', "ip", multi=True, default=['192.168.1.1'])
netmask_admin_eth0 = StrOption('netmask_admin_eth0', "mask", multi=True)
interface1 = MasterSlaves('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
od = OptionDescription('root', '', [interface1])
conf1 = Config(od, session_id='conf1')
conf2 = Config(od, session_id='conf2')
path = PathConfig(od, [conf1, conf2])
assert path.config('conf1').option('ip_admin_eth0.netmask_admin_eth0', 0).value.get() == None
#
path.option('ip_admin_eth0.ip_admin_eth0').value.set(['192.168.1.1'])
assert path.config('conf1').option('ip_admin_eth0.netmask_admin_eth0', 0).value.get() == None
#
path.option('ip_admin_eth0.netmask_admin_eth0', 0).value.set('255.255.255.0')
assert path.config('conf1').option('ip_admin_eth0.netmask_admin_eth0', 0).value.get() == '255.255.255.0'
#
path.option('ip_admin_eth0.netmask_admin_eth0', 0).value.set('255.255.0.0')
assert path.config('conf1').option('ip_admin_eth0.netmask_admin_eth0', 0).value.get() == '255.255.0.0'
#
path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').value.set(['192.168.1.1'])
assert path.config('conf1').option('ip_admin_eth0.netmask_admin_eth0', 0).value.get() == None
def test_path_master_slaves_owners():
ip_admin_eth0 = StrOption('ip_admin_eth0', "ip", multi=True)
netmask_admin_eth0 = StrOption('netmask_admin_eth0', "mask", multi=True, properties=('hidden',))
interface1 = MasterSlaves('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
od = OptionDescription('root', '', [interface1])
conf1 = Config(od, session_id='conf1')
conf2 = Config(od, session_id='conf2')
path = PathConfig(od, [conf1, conf2])
path.owner.set(owners.path1)
assert path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').owner.isdefault()
raises(SlaveError, "path.config('conf1').option('ip_admin_eth0.netmask_admin_eth0', 0).owner.isdefault()")
#
path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').value.set(['192.168.1.1'])
assert path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').owner.get() == owners.user
assert path.config('conf1').option('ip_admin_eth0.netmask_admin_eth0', 0).owner.isdefault()
#
path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').value.reset()
assert path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').owner.isdefault()
#
path.option('ip_admin_eth0.ip_admin_eth0').value.set(['192.168.1.1'])
assert path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').owner.get() == owners.path1
assert path.config('conf1').option('ip_admin_eth0.netmask_admin_eth0', 0).owner.isdefault()
#
path.option('ip_admin_eth0.netmask_admin_eth0', 0).value.set('255.255.255.0')
assert path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').owner.get() == owners.path1
assert path.config('conf1').option('ip_admin_eth0.netmask_admin_eth0', 0).owner.get() == owners.path1
#
path.option('ip_admin_eth0.netmask_admin_eth0', 0).value.set('255.255.0.0')
assert path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').owner.get() == owners.path1
assert path.config('conf1').option('ip_admin_eth0.netmask_admin_eth0', 0).owner.get() == owners.path1
#
path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').value.set(['192.168.1.1'])
assert path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').owner.get() == owners.user
assert path.config('conf1').option('ip_admin_eth0.netmask_admin_eth0', 0).owner.get() == owners.default
def test_path_force_default():
ip_admin_eth0 = StrOption('ip_admin_eth0', "ip", multi=True)
netmask_admin_eth0 = StrOption('netmask_admin_eth0', "mask", multi=True, properties=('hidden',))
interface1 = MasterSlaves('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
od = OptionDescription('root', '', [interface1])
conf1 = Config(od, session_id='conf1')
conf2 = Config(od, session_id='conf2')
path = PathConfig(od, [conf1, conf2])
path.property.read_write()
path.owner.set('path1')
assert path.option('ip_admin_eth0.ip_admin_eth0').value.get() == []
assert path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').value.get() == []
assert path.config('conf2').option('ip_admin_eth0.ip_admin_eth0').value.get() == []
#
errors = path.value.set('ip_admin_eth0.ip_admin_eth0', ['192.168.1.1'])
assert len(errors) == 0
assert path.option('ip_admin_eth0.ip_admin_eth0').value.get() == ['192.168.1.1']
assert path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').value.get() == ['192.168.1.1']
assert path.config('conf2').option('ip_admin_eth0.ip_admin_eth0').value.get() == ['192.168.1.1']
#
path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').value.set(['192.168.1.2'])
assert path.option('ip_admin_eth0.ip_admin_eth0').value.get() == ['192.168.1.1']
assert path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').value.get() == ['192.168.1.2']
assert path.config('conf2').option('ip_admin_eth0.ip_admin_eth0').value.get() == ['192.168.1.1']
#
errors = path.value.set('ip_admin_eth0.ip_admin_eth0', ['192.168.1.3'])
assert len(errors) == 0
assert path.option('ip_admin_eth0.ip_admin_eth0').value.get() == ['192.168.1.3']
assert path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').value.get() == ['192.168.1.2']
assert path.config('conf2').option('ip_admin_eth0.ip_admin_eth0').value.get() == ['192.168.1.3']
#
errors = path.value.set('ip_admin_eth0.ip_admin_eth0', ['192.168.1.4'], force_default=True)
assert len(errors) == 0
assert path.option('ip_admin_eth0.ip_admin_eth0').value.get() == ['192.168.1.4']
assert path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').value.get() == ['192.168.1.4']
assert path.config('conf2').option('ip_admin_eth0.ip_admin_eth0').value.get() == ['192.168.1.4']
def test_path_force_dont_change_value():
ip_admin_eth0 = StrOption('ip_admin_eth0', "ip", multi=True)
netmask_admin_eth0 = StrOption('netmask_admin_eth0', "mask", multi=True, properties=('hidden',))
interface1 = MasterSlaves('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
od = OptionDescription('root', '', [interface1])
conf1 = Config(od, session_id='conf1')
conf2 = Config(od, session_id='conf2')
path = PathConfig(od, [conf1, conf2])
path.property.read_write()
path.owner.set('path1')
assert path.option('ip_admin_eth0.ip_admin_eth0').value.get() == []
assert path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').value.get() == []
assert path.config('conf2').option('ip_admin_eth0.ip_admin_eth0').value.get() == []
path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').value.set(['192.168.1.4'])
assert path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').value.get() == ['192.168.1.4']
assert path.config('conf2').option('ip_admin_eth0.ip_admin_eth0').value.get() == []
assert path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').owner.get() is owners.user
assert path.config('conf2').option('ip_admin_eth0.ip_admin_eth0').owner.isdefault()
errors = path.value.set('ip_admin_eth0.ip_admin_eth0', ['192.168.1.4'], force_dont_change_value=True)
assert len(errors) == 0
assert path.option('ip_admin_eth0.ip_admin_eth0').value.get() == ['192.168.1.4']
assert path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').value.get() == ['192.168.1.4']
assert path.config('conf2').option('ip_admin_eth0.ip_admin_eth0').value.get() == []
assert path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').owner.get() is owners.user
assert path.config('conf2').option('ip_admin_eth0.ip_admin_eth0').owner.get() is owners.user
def test_path_force_default_if_same():
ip_admin_eth0 = StrOption('ip_admin_eth0', "ip", multi=True)
netmask_admin_eth0 = StrOption('netmask_admin_eth0', "mask", multi=True, properties=('hidden',))
interface1 = MasterSlaves('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
od = OptionDescription('root', '', [interface1])
conf1 = Config(od, session_id='conf1')
conf2 = Config(od, session_id='conf2')
path = PathConfig(od, [conf1, conf2])
path.property.read_write()
path.owner.set('path1')
#
assert path.option('ip_admin_eth0.ip_admin_eth0').value.get() == []
assert path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').value.get() == []
assert path.config('conf2').option('ip_admin_eth0.ip_admin_eth0').value.get() == []
#
path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').value.set(['192.168.1.4'])
assert path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').value.get() == ['192.168.1.4']
assert path.config('conf2').option('ip_admin_eth0.ip_admin_eth0').value.get() == []
assert path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').owner.get() is owners.user
assert path.config('conf2').option('ip_admin_eth0.ip_admin_eth0').owner.isdefault()
errors = path.value.set('ip_admin_eth0.ip_admin_eth0', ['192.168.1.4'], force_default_if_same=True)
assert len(errors) == 0
assert path.option('ip_admin_eth0.ip_admin_eth0').value.get() == ['192.168.1.4']
assert path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').value.get() == ['192.168.1.4']
assert path.config('conf2').option('ip_admin_eth0.ip_admin_eth0').value.get() == ['192.168.1.4']
assert path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').owner.get() is owners.path1
assert path.config('conf2').option('ip_admin_eth0.ip_admin_eth0').owner.get() is owners.path1
#
path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').value.set(['192.168.1.3'])
assert path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').value.get() == ['192.168.1.3']
assert path.config('conf2').option('ip_admin_eth0.ip_admin_eth0').value.get() == ['192.168.1.4']
assert path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').owner.get() is owners.user
assert path.config('conf2').option('ip_admin_eth0.ip_admin_eth0').owner.get() is owners.path1
errors = path.value.set('ip_admin_eth0.ip_admin_eth0', ['192.168.1.5'], force_default_if_same=True)
assert len(errors) == 0
assert path.option('ip_admin_eth0.ip_admin_eth0').value.get() == ['192.168.1.5']
assert path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').value.get() == ['192.168.1.3']
assert path.config('conf2').option('ip_admin_eth0.ip_admin_eth0').value.get() == ['192.168.1.5']
assert path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').owner.get() is owners.user
assert path.config('conf2').option('ip_admin_eth0.ip_admin_eth0').owner.get() is owners.path1
def test_path_force_default_if_same_and_dont_change():
ip_admin_eth0 = StrOption('ip_admin_eth0', "ip", multi=True)
netmask_admin_eth0 = StrOption('netmask_admin_eth0', "mask", multi=True, properties=('hidden',))
interface1 = MasterSlaves('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
od = OptionDescription('root', '', [interface1])
conf1 = Config(od, session_id='conf1')
conf2 = Config(od, session_id='conf2')
path = PathConfig(od, [conf1, conf2])
path.property.read_write()
path.owner.set('path1')
#
assert path.option('ip_admin_eth0.ip_admin_eth0').value.get() == []
assert path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').value.get() == []
assert path.config('conf2').option('ip_admin_eth0.ip_admin_eth0').value.get() == []
#
path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').value.set(['192.168.1.4'])
assert path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').value.get() == ['192.168.1.4']
assert path.config('conf2').option('ip_admin_eth0.ip_admin_eth0').value.get() == []
assert path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').owner.get() is owners.user
assert path.config('conf2').option('ip_admin_eth0.ip_admin_eth0').owner.isdefault()
errors = path.value.set('ip_admin_eth0.ip_admin_eth0', ['192.168.1.4'], force_default_if_same=True, force_dont_change_value=True)
assert len(errors) == 0
assert path.option('ip_admin_eth0.ip_admin_eth0').value.get() == ['192.168.1.4']
assert path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').value.get() == ['192.168.1.4']
assert path.config('conf2').option('ip_admin_eth0.ip_admin_eth0').value.get() == []
assert path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').owner.get() is owners.path1
assert path.config('conf2').option('ip_admin_eth0.ip_admin_eth0').owner.get() is owners.user
#
path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').value.set(['192.168.1.3'])
assert path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').value.get() == ['192.168.1.3']
assert path.config('conf2').option('ip_admin_eth0.ip_admin_eth0').value.get() == []
assert path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').owner.get() is owners.user
assert path.config('conf2').option('ip_admin_eth0.ip_admin_eth0').owner.get() is owners.user
errors = path.value.set('ip_admin_eth0.ip_admin_eth0', ['192.168.1.5'], force_default_if_same=True, force_dont_change_value=True)
assert len(errors) == 0
assert path.option('ip_admin_eth0.ip_admin_eth0').value.get() == ['192.168.1.5']
assert path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').value.get() == ['192.168.1.3']
assert path.config('conf2').option('ip_admin_eth0.ip_admin_eth0').value.get() == []
assert path.config('conf1').option('ip_admin_eth0.ip_admin_eth0').owner.get() is owners.user
assert path.config('conf2').option('ip_admin_eth0.ip_admin_eth0').owner.get() is owners.user
def test_path_force_default_and_dont_change():
ip_admin_eth0 = StrOption('ip_admin_eth0', "ip", multi=True)
netmask_admin_eth0 = StrOption('netmask_admin_eth0', "mask", multi=True, properties=('hidden',))
interface1 = MasterSlaves('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
od = OptionDescription('root', '', [interface1])
conf1 = Config(od, session_id='rconf1')
conf2 = Config(od, session_id='rconf2')
path = PathConfig(od, [conf1, conf2])
path.property.read_write()
path.owner.set('path1')
raises(ValueError, "path.value.set('ip_admin_eth0.ip_admin_eth0', ['192.168.1.4'], force_default=True, force_dont_change_value=True)")
def test_path_properties_path():
ip_admin_eth0 = NetworkOption('ip_admin_eth0', "ip", multi=True, default=['192.168.1.1'])
netmask_admin_eth0 = NetmaskOption('netmask_admin_eth0', "mask", multi=True, properties=('disabled',))
netmask_admin_eth0.impl_add_consistency('network_netmask', ip_admin_eth0)
interface1 = MasterSlaves('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
od = OptionDescription('root', '', [interface1])
conf1 = Config(od, session_id='conf1')
conf2 = Config(od, session_id='conf2')
conf1.property.read_write()
conf2.property.read_write()
path = PathConfig(od, [conf1, conf2])
path.property.read_write()
assert path.config('conf1').value.dict() == {}
def test_path_exception_path():
ip_admin_eth0 = NetworkOption('ip_admin_eth0', "ip", multi=True, default=['192.168.1.1'])
netmask_admin_eth0 = NetmaskOption('netmask_admin_eth0', "mask", multi=True, callback=raise_exception)
netmask_admin_eth0.impl_add_consistency('network_netmask', ip_admin_eth0)
interface1 = MasterSlaves('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
od = OptionDescription('root', '', [interface1])
conf1 = Config(od, session_id='conf1')
conf2 = Config(od, session_id='conf2')
path = PathConfig(od, [conf1, conf2])
path.property.read_write()
raises(Exception, "conf1.make_dict()")
def test_path_callback():
val1 = StrOption('val1', "", 'val')
val2 = StrOption('val2', "", callback=return_value, callback_params=Params(ParamOption(val1)))
val3 = StrOption('val3', "", callback=return_value, callback_params=Params(ParamValue('yes')))
val4 = StrOption('val4', "", callback=return_value, callback_params=Params(kwargs={'value': ParamOption(val1)}))
val5 = StrOption('val5', "", callback=return_value, callback_params=Params(kwargs={'value': ParamValue('yes')}))
maconfig = OptionDescription('rootconfig', '', [val1, val2, val3, val4, val5])
cfg = Config(maconfig, session_id='cfg')
path = PathConfig(maconfig, [cfg])
path.property.read_write()
assert path.config('cfg').value.dict() == {'val3': 'yes', 'val2': 'val', 'val1': 'val', 'val5': 'yes', 'val4': 'val'}
path.config('cfg').option('val1').value.set('new')
assert path.config('cfg').value.dict() == {'val3': 'yes', 'val2': 'new', 'val1': 'new', 'val5': 'yes', 'val4': 'new'}
path.config('cfg').option('val1').value.reset()
path.option('val1').value.set('new')
assert path.config('cfg').value.dict() == {'val3': 'yes', 'val2': 'new', 'val1': 'new', 'val5': 'yes', 'val4': 'new'}
path.config('cfg').option('val4').value.set('new1')
assert path.config('cfg').value.dict() == {'val3': 'yes', 'val2': 'new', 'val1': 'new', 'val5': 'yes', 'val4': 'new1'}
path.config('cfg').option('val4').value.reset()
path.option('val4').value.set('new1')
assert path.config('cfg').value.dict() == {'val3': 'yes', 'val2': 'new', 'val1': 'new', 'val5': 'yes', 'val4': 'new1'}
path.option('val4').value.reset()
def test_path_callback_slave():
val = StrOption('val', "", default='val')
val1 = StrOption('val1', "", multi=True, callback=return_value, callback_params=Params(ParamOption(val)))
val3 = StrOption('val2', "", multi=True, callback=return_value, callback_params=Params(ParamOption(val1)))
val4 = StrOption('val3', "", multi=True, callback=return_value, callback_params=Params(ParamOption(val1)))
interface1 = MasterSlaves('val1', '', [val1, val3, val4])
od = OptionDescription('root', '', [interface1])
maconfig = OptionDescription('rootconfig', '', [val, interface1])
cfg = Config(maconfig, session_id='cfg1')
path = PathConfig(maconfig, [cfg])
path.property.read_write()
assert path.config('cfg1').value.dict() == {'val1.val2': ['val'], 'val1.val1': ['val'], 'val1.val3': ['val'], 'val': 'val'}
path.config('cfg1').option('val').value.set('val1')
assert path.config('cfg1').value.dict() == {'val1.val2': ['val1'], 'val1.val1': ['val1'], 'val1.val3': ['val1'], 'val': 'val1'}
path.config('cfg1').option('val').value.reset()
path.option('val').value.set('val1')
assert path.config('cfg1').value.dict() == {'val1.val2': ['val1'], 'val1.val1': ['val1'], 'val1.val3': ['val1'], 'val': 'val1'}
path.option('val').value.reset()
path.config('cfg1').option('val1.val2', 0).value.set('val2')
assert path.config('cfg1').value.dict() == {'val1.val2': ['val2'], 'val1.val1': ['val'], 'val1.val3': ['val'], 'val': 'val'}
path.config('cfg1').option('val1.val2', 0).value.reset()
assert path.config('cfg1').value.dict() == {'val1.val2': ['val'], 'val1.val1': ['val'], 'val1.val3': ['val'], 'val': 'val'}
path.option('val1.val2', 0).value.set('val2')
assert path.config('cfg1').value.dict() == {'val1.val2': ['val2'], 'val1.val1': ['val'], 'val1.val3': ['val'], 'val': 'val'}
path.config('cfg1').option('val1.val3', 0).value.set('val6')
assert path.config('cfg1').value.dict() == {'val1.val2': ['val2'], 'val1.val1': ['val'], 'val1.val3': ['val6'], 'val': 'val'}
path.option('val1.val2', 0).value.reset()
path.config('cfg1').option('val1.val3', 0).value.reset()
path.config('cfg1').option('val1.val1').value.set(['val3'])
assert path.config('cfg1').value.dict() == {'val1.val2': ['val3'], 'val1.val1': ['val3'], 'val1.val3': ['val3'], 'val': 'val'}
path.config('cfg1').option('val1.val1').value.reset()
assert path.config('cfg1').value.dict() == {'val1.val2': ['val'], 'val1.val1': ['val'], 'val1.val3': ['val'], 'val': 'val'}
path.option('val1.val1').value.set(['val3'])
assert path.config('cfg1').value.dict() == {'val1.val2': ['val3'], 'val1.val1': ['val3'], 'val1.val3': ['val3'], 'val': 'val'}
path.config('cfg1').option('val1.val2', 0).value.set('val2')
assert path.config('cfg1').value.dict() == {'val1.val2': ['val2'], 'val1.val1': ['val3'], 'val1.val3': ['val3'], 'val': 'val'}
path.option('val1.val1').value.set(['val3', 'rah'])
assert path.config('cfg1').value.dict() == {'val1.val2': ['val2', 'rah'], 'val1.val1': ['val3', 'rah'], 'val1.val3': ['val3', 'rah'], 'val': 'val'}
path.option('val1.val1').value.pop(1)
path.option('val1.val1').value.set(['val4'])
assert path.config('cfg1').value.dict() == {'val1.val2': ['val2'], 'val1.val1': ['val4'], 'val1.val3': ['val4'], 'val': 'val'}
def test_meta_reset():
ip_admin_eth0 = StrOption('ip_admin_eth0', "ip", multi=True)
netmask_admin_eth0 = StrOption('netmask_admin_eth0', "mask", multi=True, properties=('hidden',))
interface1 = MasterSlaves('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
od0 = OptionDescription('root', '', [interface1])
ip_admin_eth0 = StrOption('ip_admin_eth0', "ip", multi=True)
netmask_admin_eth0 = StrOption('netmask_admin_eth0', "mask", multi=True, properties=('hidden',))
interface1 = MasterSlaves('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
od1 = OptionDescription('root', '', [interface1])
ip_admin_eth0 = StrOption('ip_admin_eth0', "ip", multi=True)
netmask_admin_eth0 = StrOption('netmask_admin_eth0', "mask", multi=True, properties=('hidden',))
interface1 = MasterSlaves('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
od2 = OptionDescription('root', '', [interface1])
conf1 = Config(od0, session_id='conf1')
conf2 = Config(od1, session_id='conf2')
meta = PathConfig(od2, [conf1, conf2])
meta.property.read_write()
meta.owner.set('path1')
assert meta.option('ip_admin_eth0.ip_admin_eth0').value.get() == []
assert meta.config('conf1').option('ip_admin_eth0.ip_admin_eth0').value.get() == []
assert meta.config('conf2').option('ip_admin_eth0.ip_admin_eth0').value.get() == []
errors = meta.value.set('ip_admin_eth0.ip_admin_eth0', ['192.168.1.1'])
assert len(errors) == 0
assert meta.option('ip_admin_eth0.ip_admin_eth0').value.get() == ['192.168.1.1']
assert meta.config('conf1').option('ip_admin_eth0.ip_admin_eth0').value.get() == ['192.168.1.1']
assert meta.config('conf2').option('ip_admin_eth0.ip_admin_eth0').value.get() == ['192.168.1.1']
meta.config('conf1').option('ip_admin_eth0.ip_admin_eth0').value.set(['192.168.1.2'])
assert meta.option('ip_admin_eth0.ip_admin_eth0').value.get() == ['192.168.1.1']
assert meta.config('conf1').option('ip_admin_eth0.ip_admin_eth0').value.get() == ['192.168.1.2']
assert meta.config('conf2').option('ip_admin_eth0.ip_admin_eth0').value.get() == ['192.168.1.1']
meta.option('ip_admin_eth0.ip_admin_eth0').value.reset(children=True)
assert meta.option('ip_admin_eth0.ip_admin_eth0').value.get() == []
assert meta.config('conf1').option('ip_admin_eth0.ip_admin_eth0').value.get() == []
assert meta.config('conf2').option('ip_admin_eth0.ip_admin_eth0').value.get() == []
def test_path_properties_path_copy():
ip_admin_eth0 = NetworkOption('ip_admin_eth0', "ip", multi=True, default=['192.168.1.1'])
netmask_admin_eth0 = NetmaskOption('netmask_admin_eth0', "mask", multi=True, properties=('disabled',))
interface0 = OptionDescription('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
ip_admin_eth0 = NetworkOption('ip_admin_eth0', "ip", multi=True, default=['192.168.1.1'])
netmask_admin_eth0 = NetmaskOption('netmask_admin_eth0', "mask", multi=True, properties=('disabled',))
interface1 = OptionDescription('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
ip_admin_eth0 = NetworkOption('ip_admin_eth0', "ip", multi=True, default=['192.168.1.1'])
netmask_admin_eth0 = NetmaskOption('netmask_admin_eth0', "mask", multi=True, properties=('disabled',))
interface2 = OptionDescription('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
conf1 = Config(interface0, session_id='conf1')
conf2 = Config(interface1, session_id='conf2')
conf1.property.read_write()
conf2.property.read_write()
path = PathConfig(interface2, [conf1, conf2], session_id='path1')
path.property.read_write()
conf3 = path.config('conf1').config.copy(session_id='conf3')
path2 = conf3.config.metaconfig()
assert path.config.name() == path2.config.name()
assert path.config('conf1').value.dict() == {'ip_admin_eth0': ['192.168.1.1']}
assert path.config('conf2').value.dict() == {'ip_admin_eth0': ['192.168.1.1']}
assert path.config('conf3').value.dict() == {'ip_admin_eth0': ['192.168.1.1']}
path.option('ip_admin_eth0').value.set(['192.168.1.2'])
assert path.config('conf1').value.dict() == {'ip_admin_eth0': ['192.168.1.2']}
assert path.config('conf2').value.dict() == {'ip_admin_eth0': ['192.168.1.2']}
assert path.config('conf3').value.dict() == {'ip_admin_eth0': ['192.168.1.2']}
ret = path.value.set('ip_admin_eth0', ['192.168.1.3'], force_default_if_same=True)
assert path.config('conf1').value.dict() == {'ip_admin_eth0': ['192.168.1.3']}
assert path.config('conf2').value.dict() == {'ip_admin_eth0': ['192.168.1.3']}
assert path.config('conf3').value.dict() == {'ip_admin_eth0': ['192.168.1.3']}
def test_path_properties_path_deepcopy():
ip_admin_eth0 = NetworkOption('ip_admin_eth0', "ip", multi=True, default=['192.168.1.1'])
netmask_admin_eth0 = NetmaskOption('netmask_admin_eth0', "mask", multi=True,
properties=('disabled',))
interface0 = OptionDescription('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
ip_admin_eth0 = NetworkOption('ip_admin_eth0', "ip", multi=True, default=['192.168.1.1'])
netmask_admin_eth0 = NetmaskOption('netmask_admin_eth0', "mask", multi=True,
properties=('disabled',))
interface1 = OptionDescription('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
ip_admin_eth0 = NetworkOption('ip_admin_eth0', "ip", multi=True, default=['192.168.1.1'])
netmask_admin_eth0 = NetmaskOption('netmask_admin_eth0', "mask", multi=True,
properties=('disabled',))
interface2 = OptionDescription('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
conf1 = Config(interface0, session_id='conf1')
conf2 = Config(interface1, session_id='conf2')
conf1.property.read_write()
conf2.property.read_write()
path = PathConfig(interface2, [conf1, conf2])
path.permissive.set(frozenset({'hidden'}))
path.property.read_write()
path2 = path.config('conf1').config.deepcopy(session_id='conf3')
assert path != path2
assert path.permissive.get() == path2.permissive.get()
assert path.config('conf1').value.dict() == {'ip_admin_eth0': ['192.168.1.1']}
assert path.config('conf2').value.dict() == {'ip_admin_eth0': ['192.168.1.1']}
assert path2.config('conf3').value.dict() == {'ip_admin_eth0': ['192.168.1.1']}
path.option('ip_admin_eth0').value.set(['192.168.1.2'])
assert path.config('conf1').value.dict() == {'ip_admin_eth0': ['192.168.1.2']}
assert path.config('conf2').value.dict() == {'ip_admin_eth0': ['192.168.1.2']}
assert path2.config('conf3').value.dict() == {'ip_admin_eth0': ['192.168.1.1']}
path.value.set('ip_admin_eth0', ['192.168.1.3'], force_default_if_same=True)
assert path.config('conf1').value.dict() == {'ip_admin_eth0': ['192.168.1.3']}
assert path.config('conf2').value.dict() == {'ip_admin_eth0': ['192.168.1.3']}
assert path2.config('conf3').value.dict() == {'ip_admin_eth0': ['192.168.1.1']}
def test_path_properties_subpath_deepcopy():
ip_admin_eth0 = NetworkOption('ip_admin_eth0', "ip", multi=True, default=['192.168.1.1'])
netmask_admin_eth0 = NetmaskOption('netmask_admin_eth0', "mask", multi=True,
properties=('disabled',))
interface0 = OptionDescription('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
ip_admin_eth0 = NetworkOption('ip_admin_eth0', "ip", multi=True, default=['192.168.1.1'])
netmask_admin_eth0 = NetmaskOption('netmask_admin_eth0', "mask", multi=True,
properties=('disabled',))
interface1 = OptionDescription('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
ip_admin_eth0 = NetworkOption('ip_admin_eth0', "ip", multi=True, default=['192.168.1.1'])
netmask_admin_eth0 = NetmaskOption('netmask_admin_eth0', "mask", multi=True,
properties=('disabled',))
interface2 = OptionDescription('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
conf1 = Config(interface0, session_id='conf1')
conf1.property.read_write()
path1 = PathConfig(interface1, [conf1], session_id='path1')
path2 = PathConfig(interface2, [path1], session_id='path2')
path_copy = conf1.config.deepcopy(session_id='conf2',
metaconfig_prefix='copy_')
assert path_copy.config.name() == 'copy_path2'
assert path_copy.config('copy_path1').config.name() == 'copy_path1'
assert path_copy.config('copy_path1').config('conf2').config.name() == 'conf2'
def test_path_properties_subpath_deepcopy_owner():
ip_admin_eth0 = NetworkOption('ip_admin_eth0', "ip")
netmask_admin_eth0 = NetmaskOption('netmask_admin_eth1', "mask")
interface0 = OptionDescription('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
ip_admin_eth0 = NetworkOption('ip_admin_eth1', "ip")
netmask_admin_eth0 = NetmaskOption('netmask_admin_eth0', "mask")
interface1 = OptionDescription('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
ip_admin_eth0 = NetworkOption('ip_admin_eth0', "ip")
netmask_admin_eth0 = NetmaskOption('netmask_admin_eth0', "mask")
interface2 = OptionDescription('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
conf1 = Config(interface0, session_id='conf1')
conf1.owner.set('conf1_user')
conf1.property.read_write()
path1 = PathConfig(interface1, [conf1], session_id='path1')
path1.owner.set('path1_user')
path2 = PathConfig(interface2, [path1], session_id='path2')
path2.owner.set('path2_user')
#
conf1.option('ip_admin_eth0').value.set('192.168.0.1')
assert conf1.option('ip_admin_eth0').owner.get() == 'conf1_user'
path2.option('ip_admin_eth0').value.set('192.168.0.3')
assert path2.option('ip_admin_eth0').owner.get() == 'path2_user'
#
path2_copy = conf1.config.deepcopy(session_id='conf2',
metaconfig_prefix='copy_')
path2_copy.option('netmask_admin_eth0').value.set('255.255.255.255')
assert path2_copy.option('ip_admin_eth0').value.get() == '192.168.0.3'
assert path2_copy.option('ip_admin_eth0').owner.get() == 'path2_user'
assert path2_copy.option('netmask_admin_eth0').owner.get() == 'path2_user'
#
path1_copy = path2_copy.config('copy_path1')
path1_copy.option('netmask_admin_eth0').value.set('255.255.255.255')
#
conf2 = path1_copy.config('conf2')
conf2.owner.set('conf2_user')
conf2.option('netmask_admin_eth1').value.set('255.255.255.255')
assert conf2.option('netmask_admin_eth1').owner.get() == 'conf2_user'
assert conf2.option('ip_admin_eth0').value.get() == '192.168.0.1'
assert conf2.option('ip_admin_eth0').owner.get() == 'conf1_user'
def test_path_properties_path_set_value():
ip_admin_eth0 = NetworkOption('ip_admin_eth1', "ip", multi=True, default=['192.168.1.1'])
netmask_admin_eth0 = NetmaskOption('netmask_admin_eth0', "mask", multi=True, properties=('disabled',))
interface0 = OptionDescription('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
ip_admin_eth0 = NetworkOption('ip_admin_eth0', "ip", multi=True, default=['192.168.1.1'])
netmask_admin_eth0 = NetmaskOption('netmask_admin_eth1', "mask", multi=True, properties=('disabled',))
interface1 = OptionDescription('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
ip_admin_eth0 = NetworkOption('ip_admin_eth0', "ip", multi=True, default=['192.168.1.1'])
netmask_admin_eth0 = NetmaskOption('netmask_admin_eth0', "mask", multi=True, properties=('disabled',))
interface2 = OptionDescription('ip_admin_eth0', '', [ip_admin_eth0, netmask_admin_eth0])
conf1 = Config(interface0, session_id='conf1')
conf2 = Config(interface1, session_id='conf2')
conf1.property.read_write()
conf2.property.read_write()
path = PathConfig(interface2, [conf1, conf2])
path.property.read_write()
assert path.config('conf2').value.dict() == {'ip_admin_eth0': ['192.168.1.1']}
ret = path.value.set('netmask_admin_eth0', ['255.255.255.255'], only_config=True)
assert len(ret) == 2
assert isinstance(ret[0], PropertiesOptionError)
assert isinstance(ret[1], AttributeError)
del ret[1]
del ret[0]
del ret
ret = path.value.set('netmask_admin_eth0', ['255.255.255.255'], force_default=True)
assert len(ret) == 2
assert isinstance(ret[0], AttributeError)
assert isinstance(ret[1], PropertiesOptionError)
del ret[1]
del ret[0]
del ret
ret = path.value.set('netmask_admin_eth0', ['255.255.255.255'], force_dont_change_value=True)
assert len(ret) == 3
assert isinstance(ret[0], PropertiesOptionError)
assert isinstance(ret[1], AttributeError)
assert isinstance(ret[2], PropertiesOptionError)
del ret[2]
del ret[1]
del ret[0]
del ret
ret = path.value.set('netmask_admin_eth0', ['255.255.255.255'], force_default_if_same=True)
assert len(ret) == 2
assert isinstance(ret[0], AttributeError)
assert isinstance(ret[1], PropertiesOptionError)
del ret[1]
del ret[0]
del ret
ret = path.value.set('ip_admin_eth0', '255.255.255.255', only_config=True)
assert len(ret) == 2
assert isinstance(ret[0], AttributeError)
assert isinstance(ret[1], ValueError)
del ret[1]
del ret[0]
del ret
ret = path.value.set('ip_admin_eth0', '255.255.255.255', force_default=True)
assert len(ret) == 2
assert isinstance(ret[0], AttributeError)
assert isinstance(ret[1], ValueError)
del ret[1]
del ret[0]
del ret
ret = path.value.set('ip_admin_eth0', '255.255.255.255', force_dont_change_value=True)
assert len(ret) == 2
assert isinstance(ret[0], AttributeError)
assert isinstance(ret[1], ValueError)
del ret[1]
del ret[0]
del ret
ret = path.value.set('ip_admin_eth0', '255.255.255.255', force_default_if_same=True)
assert len(ret) == 2
assert isinstance(ret[0], AttributeError)
assert isinstance(ret[1], ValueError)
del ret[1]
del ret[0]
del ret

View File

@ -7,6 +7,11 @@ from py.test import raises
from tiramisu import IntOption, UnicodeOption, OptionDescription, Config from tiramisu import IntOption, UnicodeOption, OptionDescription, Config
from tiramisu.error import PropertiesOptionError, ConfigError from tiramisu.error import PropertiesOptionError, ConfigError
from tiramisu.api import TIRAMISU_VERSION from tiramisu.api import TIRAMISU_VERSION
from tiramisu.storage import list_sessions, delete_session
def teardown_function(function):
assert list_sessions() == [], 'session list is not empty when leaving "{}"'.format(function.__name__)
def make_description(): def make_description():

View File

@ -11,6 +11,11 @@ from tiramisu import IPOption, OptionDescription, BoolOption, IntOption, StrOpti
MasterSlaves, Config MasterSlaves, Config
from tiramisu.error import PropertiesOptionError, RequirementError from tiramisu.error import PropertiesOptionError, RequirementError
from py.test import raises from py.test import raises
from tiramisu.storage import list_sessions, delete_session
def teardown_function(function):
assert list_sessions() == [], 'session list is not empty when leaving "{}"'.format(function.__name__)
def test_properties(): def test_properties():
@ -437,6 +442,8 @@ def test_requires_transitive_hidden_disabled_multiple():
except PropertiesOptionError as err: except PropertiesOptionError as err:
props = err.proptype props = err.proptype
assert set(props) == {'disabled', 'hidden'} assert set(props) == {'disabled', 'hidden'}
del props
#
req = None req = None
try: try:
api.option('ip_address_service_web').value.get() api.option('ip_address_service_web').value.get()
@ -444,6 +451,8 @@ def test_requires_transitive_hidden_disabled_multiple():
req = err req = err
assert req, "ip_address_service_web should raise RequirementError" assert req, "ip_address_service_web should raise RequirementError"
assert str(req) == str(_('cannot access to option "{}" because required option "{}" has {} {}').format('ip_address_service_web', 'activate_service_web', 'property', '"disabled"')) assert str(req) == str(_('cannot access to option "{}" because required option "{}" has {} {}').format('ip_address_service_web', 'activate_service_web', 'property', '"disabled"'))
del req
#
api.permissive.set(frozenset()) api.permissive.set(frozenset())
try: try:
api.option('ip_address_service_web').value.get() api.option('ip_address_service_web').value.get()
@ -451,6 +460,7 @@ def test_requires_transitive_hidden_disabled_multiple():
req = err req = err
assert req, "ip_address_service_web should raise RequirementError" assert req, "ip_address_service_web should raise RequirementError"
assert str(req) == str(_('cannot access to option "{}" because required option "{}" has {} {}').format('ip_address_service_web', 'activate_service_web', 'properties', '"disabled" and "hidden"')) assert str(req) == str(_('cannot access to option "{}" because required option "{}" has {} {}').format('ip_address_service_web', 'activate_service_web', 'properties', '"disabled" and "hidden"'))
del req
def test_requires_not_transitive(): def test_requires_not_transitive():
@ -959,8 +969,11 @@ def test_master_slave_requires():
assert set(ret.keys()) == set(['ip_admin_eth0.ip_admin_eth0', 'ip_admin_eth0.netmask_admin_eth0']) assert set(ret.keys()) == set(['ip_admin_eth0.ip_admin_eth0', 'ip_admin_eth0.netmask_admin_eth0'])
assert ret['ip_admin_eth0.ip_admin_eth0'] == ['192.168.1.2', '192.168.1.1'] assert ret['ip_admin_eth0.ip_admin_eth0'] == ['192.168.1.2', '192.168.1.1']
assert len(ret['ip_admin_eth0.netmask_admin_eth0']) == 2 assert len(ret['ip_admin_eth0.netmask_admin_eth0']) == 2
assert ret['ip_admin_eth0.netmask_admin_eth0'][0] == None assert ret['ip_admin_eth0.netmask_admin_eth0'][0] is None
assert isinstance(ret['ip_admin_eth0.netmask_admin_eth0'][1], PropertiesOptionError) assert isinstance(ret['ip_admin_eth0.netmask_admin_eth0'][1], PropertiesOptionError)
del ret['ip_admin_eth0.netmask_admin_eth0'][1]
del ret['ip_admin_eth0.netmask_admin_eth0'][0]
del ret['ip_admin_eth0.netmask_admin_eth0']
# #
api.option('ip_admin_eth0.netmask_admin_eth0', 0).value.set('255.255.255.255') api.option('ip_admin_eth0.netmask_admin_eth0', 0).value.set('255.255.255.255')
ret = api.value.dict() ret = api.value.dict()
@ -969,6 +982,9 @@ def test_master_slave_requires():
assert len(ret['ip_admin_eth0.netmask_admin_eth0']) == 2 assert len(ret['ip_admin_eth0.netmask_admin_eth0']) == 2
assert ret['ip_admin_eth0.netmask_admin_eth0'][0] == '255.255.255.255' assert ret['ip_admin_eth0.netmask_admin_eth0'][0] == '255.255.255.255'
assert isinstance(ret['ip_admin_eth0.netmask_admin_eth0'][1], PropertiesOptionError) assert isinstance(ret['ip_admin_eth0.netmask_admin_eth0'][1], PropertiesOptionError)
del ret['ip_admin_eth0.netmask_admin_eth0'][1]
del ret['ip_admin_eth0.netmask_admin_eth0'][0]
del ret['ip_admin_eth0.netmask_admin_eth0']
def test_master_slave_requires_both(): def test_master_slave_requires_both():

View File

@ -15,41 +15,61 @@ from tiramisu.option import ChoiceOption, BoolOption, IntOption, FloatOption,\
StrOption, SymLinkOption, UnicodeOption, IPOption, OptionDescription, \ StrOption, SymLinkOption, UnicodeOption, IPOption, OptionDescription, \
PortOption, NetworkOption, NetmaskOption, DomainnameOption, EmailOption, \ PortOption, NetworkOption, NetmaskOption, DomainnameOption, EmailOption, \
URLOption, FilenameOption URLOption, FilenameOption
from tiramisu.storage import list_sessions, delete_session
def teardown_function(function):
assert list_sessions() == [], 'session list is not empty when leaving "{}"'.format(function.__name__)
def test_slots_option(): def test_slots_option():
c = ChoiceOption('a', '', ('a',)) c = ChoiceOption('a', '', ('a',))
raises(AttributeError, "c.x = 1") raises(AttributeError, "c.x = 1")
del c
c = BoolOption('a', '') c = BoolOption('a', '')
raises(AttributeError, "c.x = 1") raises(AttributeError, "c.x = 1")
del c
c = IntOption('a', '') c = IntOption('a', '')
raises(AttributeError, "c.x = 1") raises(AttributeError, "c.x = 1")
del c
c = FloatOption('a', '') c = FloatOption('a', '')
raises(AttributeError, "c.x = 1") raises(AttributeError, "c.x = 1")
del c
c = StrOption('a', '') c = StrOption('a', '')
raises(AttributeError, "c.x = 1") raises(AttributeError, "c.x = 1")
c = SymLinkOption('b', c) c = SymLinkOption('b', c)
raises(AttributeError, "c.x = 1") raises(AttributeError, "c.x = 1")
del c
c = UnicodeOption('a', '') c = UnicodeOption('a', '')
raises(AttributeError, "c.x = 1") raises(AttributeError, "c.x = 1")
del c
c = IPOption('a', '') c = IPOption('a', '')
raises(AttributeError, "c.x = 1") raises(AttributeError, "c.x = 1")
del c
c = OptionDescription('a', '', []) c = OptionDescription('a', '', [])
raises(AttributeError, "c.x = 1") raises(AttributeError, "c.x = 1")
del c
c = PortOption('a', '') c = PortOption('a', '')
raises(AttributeError, "c.x = 1") raises(AttributeError, "c.x = 1")
del c
c = NetworkOption('a', '') c = NetworkOption('a', '')
raises(AttributeError, "c.x = 1") raises(AttributeError, "c.x = 1")
del c
c = NetmaskOption('a', '') c = NetmaskOption('a', '')
raises(AttributeError, "c.x = 1") raises(AttributeError, "c.x = 1")
del c
c = DomainnameOption('a', '') c = DomainnameOption('a', '')
raises(AttributeError, "c.x = 1") raises(AttributeError, "c.x = 1")
del c
c = EmailOption('a', '') c = EmailOption('a', '')
raises(AttributeError, "c.x = 1") raises(AttributeError, "c.x = 1")
del c
c = URLOption('a', '') c = URLOption('a', '')
raises(AttributeError, "c.x = 1") raises(AttributeError, "c.x = 1")
del c
c = FilenameOption('a', '') c = FilenameOption('a', '')
raises(AttributeError, "c.x = 1") raises(AttributeError, "c.x = 1")
del c
def test_slots_option_readonly(): def test_slots_option_readonly():

View File

@ -7,6 +7,11 @@ from tiramisu import Config
from pickle import dumps from pickle import dumps
from py.test import raises from py.test import raises
import sys import sys
from tiramisu.storage import list_sessions
def teardown_function(function):
assert list_sessions() == [], 'session list is not empty when leaving "{}"'.format(function.__name__)
def _get_slots(opt): def _get_slots(opt):

View File

@ -11,6 +11,10 @@ from tiramisu.setting import groups, owners
from tiramisu.storage import list_sessions, delete_session from tiramisu.storage import list_sessions, delete_session
def teardown_function(function):
assert list_sessions() == [], 'session list is not empty when leaving "{}"'.format(function.__name__)
def test_non_persistent(): def test_non_persistent():
b = BoolOption('b', '') b = BoolOption('b', '')
o = OptionDescription('od', '', [b]) o = OptionDescription('od', '', [b])
@ -22,9 +26,9 @@ def test_list():
o = OptionDescription('od', '', [b]) o = OptionDescription('od', '', [b])
c = Config(o, session_id='test_non_persistent') c = Config(o, session_id='test_non_persistent')
c.option('b').value.set(True) c.option('b').value.set(True)
assert 'test_non_persistent' in list_sessions('config') assert 'test_non_persistent' in list_sessions()
del(c) del(c)
assert 'test_non_persistent' not in list_sessions('config') assert 'test_non_persistent' not in list_sessions()
def test_delete_not_persisten(): def test_delete_not_persisten():
@ -34,9 +38,9 @@ def test_delete_not_persisten():
Config(o, session_id='test_persistent', persistent=True) Config(o, session_id='test_persistent', persistent=True)
except: except:
c = Config(o, session_id='not_test_persistent') c = Config(o, session_id='not_test_persistent')
assert 'not_test_persistent' in list_sessions('all') assert 'not_test_persistent' in list_sessions()
del c del c
assert 'not_test_persistent' not in list_sessions('all') assert 'not_test_persistent' not in list_sessions()
# #
c = Config(o, session_id='not_test_persistent') c = Config(o, session_id='not_test_persistent')
raises(ValueError, "delete_session('not_test_persistent')") raises(ValueError, "delete_session('not_test_persistent')")
@ -73,7 +77,7 @@ def test_list_sessions_persistent():
# storage is not persistent # storage is not persistent
pass pass
else: else:
assert 'test_persistent' in list_sessions('config') assert 'test_persistent' in list_sessions()
delete_session('test_persistent') delete_session('test_persistent')
@ -86,9 +90,9 @@ def test_delete_session_persistent():
# storage is not persistent # storage is not persistent
pass pass
else: else:
assert 'test_persistent' in list_sessions('config') assert 'test_persistent' in list_sessions()
delete_session('test_persistent') delete_session('test_persistent')
assert 'test_persistent' not in list_sessions('config') assert 'test_persistent' not in list_sessions()
def test_create_persistent_retrieve(): def test_create_persistent_retrieve():
@ -106,7 +110,7 @@ def test_create_persistent_retrieve():
del c del c
c = Config(o, session_id='test_persistent', persistent=True) c = Config(o, session_id='test_persistent', persistent=True)
assert c.option('b').value.get() is True assert c.option('b').value.get() is True
assert 'test_persistent' in list_sessions('config') assert 'test_persistent' in list_sessions()
delete_session(c.config.name()) delete_session(c.config.name())
del c del c
c = Config(o, session_id='test_persistent', persistent=True) c = Config(o, session_id='test_persistent', persistent=True)

View File

@ -9,8 +9,12 @@ from tiramisu.setting import groups, owners
from tiramisu import StrOption, IntOption, OptionDescription, submulti, MasterSlaves, Config, \ from tiramisu import StrOption, IntOption, OptionDescription, submulti, MasterSlaves, Config, \
MetaConfig, undefined, Params, ParamOption MetaConfig, undefined, Params, ParamOption
from tiramisu.error import SlaveError from tiramisu.error import SlaveError
from tiramisu.storage import list_sessions
def teardown_function(function):
assert list_sessions() == [], 'session list is not empty when leaving "{}"'.format(function.__name__)
def return_val(val=None): def return_val(val=None):
if val is None: if val is None:

View File

@ -1,4 +1,5 @@
# coding: utf-8 # coding: utf-8
from py.test import raises
from .autopath import do_autopath from .autopath import do_autopath
do_autopath() do_autopath()
@ -7,8 +8,11 @@ from tiramisu import BoolOption, StrOption, SymLinkOption, \
from tiramisu.error import PropertiesOptionError, ConfigError from tiramisu.error import PropertiesOptionError, ConfigError
from tiramisu.setting import groups, owners from tiramisu.setting import groups, owners
from tiramisu.api import TIRAMISU_VERSION from tiramisu.api import TIRAMISU_VERSION
from tiramisu.storage import list_sessions
from py.test import raises
def teardown_function(function):
assert list_sessions() == [], 'session list is not empty when leaving "{}"'.format(function.__name__)
def return_value(): def return_value():
@ -60,7 +64,12 @@ def test_symlink_addproperties():
api = Config(descr) api = Config(descr)
api.property.read_write() api.property.read_write()
raises(TypeError, "api.option('c').property.add('new')") raises(TypeError, "api.option('c').property.add('new')")
raises(AssertionError, "api.option('c').property.reset()") try:
api.option('c').property.reset()
except AssertionError:
pass
else:
raise Exception('must raise')
def test_symlink_getpermissive(): def test_symlink_getpermissive():
@ -73,14 +82,19 @@ def test_symlink_getpermissive():
api.option('c').permissive.get() == frozenset(['perm']) api.option('c').permissive.get() == frozenset(['perm'])
def test_symlink_addpermissive(): def test_symlink_addpermissives():
boolopt = BoolOption('b', '', default=True, properties=('test',)) boolopt = BoolOption('b', '', default=True, properties=('test',))
linkopt = SymLinkOption("c", boolopt) linkopt = SymLinkOption("c", boolopt)
descr = OptionDescription('opt', '', [boolopt, linkopt]) descr = OptionDescription('opt', '', [boolopt, linkopt])
api = Config(descr) api = Config(descr)
api.property.read_write() api.property.read_write()
raises(TypeError, "api.option('c').permissive.set(frozenset(['new']))") raises(TypeError, "api.option('c').permissive.set(frozenset(['new']))")
raises(AssertionError, "api.option('c').permissive.reset()") try:
api.option('c').permissive.reset()
except AssertionError:
pass
else:
raise Exception('must raise')
def test_symlink_getproperties(): def test_symlink_getproperties():

View File

@ -15,7 +15,7 @@
from .function import Params, ParamOption, ParamValue, ParamContext from .function import Params, ParamOption, ParamValue, ParamContext
from .option import * from .option import *
from .error import APIError from .error import APIError
from .api import Config, MetaConfig, GroupConfig from .api import Config, MetaConfig, GroupConfig, PathConfig
from .option import __all__ as all_options from .option import __all__ as all_options
from .setting import owners, undefined from .setting import owners, undefined
@ -25,6 +25,7 @@ allfuncs = ['Params',
'ParamValue', 'ParamValue',
'ParamContext', 'ParamContext',
'MetaConfig', 'MetaConfig',
'PathConfig',
'GroupConfig', 'GroupConfig',
'Config', 'Config',
'APIError', 'APIError',

View File

@ -22,7 +22,7 @@ from typing import List, Any, Optional, Callable, Union, Dict
from .error import APIError, ConfigError, SlaveError, PropertiesOptionError from .error import APIError, ConfigError, SlaveError, PropertiesOptionError
from .i18n import _ from .i18n import _
from .setting import ConfigBag, OptionBag, owners, groups, Undefined, undefined, FORBIDDEN_SET_PROPERTIES from .setting import ConfigBag, OptionBag, owners, groups, Undefined, undefined, FORBIDDEN_SET_PROPERTIES
from .config import KernelConfig, SubConfig, KernelGroupConfig, KernelMetaConfig from .config import KernelConfig, SubConfig, KernelGroupConfig, KernelMetaConfig, KernelPathConfig
from .option import ChoiceOption, OptionDescription from .option import ChoiceOption, OptionDescription
@ -227,14 +227,9 @@ class TiramisuOptionOption(CommonTiramisuOption):
name, name,
subconfig, subconfig,
option_bag): option_bag):
cls._name = name option = subconfig.cfgimpl_get_description().impl_getchild(name,
cls._subconfig = subconfig option_bag.config_bag,
cls._option_bag = option_bag subconfig.cfgimpl_get_path())
cls._get_option(cls)
option = option_bag.option
del cls._name
del cls._subconfig
del cls._option_bag
if option.impl_is_optiondescription(): if option.impl_is_optiondescription():
return _TiramisuOptionOptionDescription(name=name, return _TiramisuOptionOptionDescription(name=name,
subconfig=subconfig, subconfig=subconfig,
@ -396,7 +391,8 @@ class TiramisuOptionInformation(CommonTiramisuOption):
values = self._option_bag.config_bag.context.cfgimpl_get_values() values = self._option_bag.config_bag.context.cfgimpl_get_values()
values.set_information(key, value, path=path) values.set_information(key, value, path=path)
def reset(self, key): def reset(self,
key):
"""Remove information""" """Remove information"""
path = self._option_bag.path path = self._option_bag.path
values = self._option_bag.config_bag.context.cfgimpl_get_values() values = self._option_bag.config_bag.context.cfgimpl_get_values()
@ -541,7 +537,7 @@ class TiramisuOptionValue(CommonTiramisuOption):
types.append(_TiramisuOptionValueMaster) types.append(_TiramisuOptionValueMaster)
elif option.impl_is_master_slaves('slave'): elif option.impl_is_master_slaves('slave'):
types.append(_TiramisuOptionValueSlave) types.append(_TiramisuOptionValueSlave)
if option_bag.config_bag.context.impl_type == 'meta': if option_bag.config_bag.context.impl_type in ('meta', 'path'):
# only if not an optiondescription # only if not an optiondescription
types.insert(0, _TiramisuOptionValueMeta) types.insert(0, _TiramisuOptionValueMeta)
if option_bag.config_bag.context.impl_type == 'group': if option_bag.config_bag.context.impl_type == 'group':
@ -657,14 +653,9 @@ class _TiramisuOptionDescription(_TiramisuOption):
"""Get type for an optiondescription (only for optiondescription)""" """Get type for an optiondescription (only for optiondescription)"""
return self._get_option().impl_get_group_type() return self._get_option().impl_get_group_type()
def list(self, def _filter(self,
type='option', opt,
group_type=None): subconfig):
"""List options in an optiondescription (only for optiondescription)"""
assert type in ('all', 'option', 'optiondescription'), _('unknown list type {}').format(type)
assert group_type is None or isinstance(group_type, groups.GroupType), \
_("unknown group_type: {0}").format(group_type)
def _filter(opt):
if self._config_bag.properties: if self._config_bag.properties:
name = opt.impl_getname() name = opt.impl_getname()
path = subconfig._get_subpath(name) path = subconfig._get_subpath(name)
@ -680,6 +671,13 @@ class _TiramisuOptionDescription(_TiramisuOption):
subconfig.getattr(name, subconfig.getattr(name,
option_bag) option_bag)
def list(self,
type='option',
group_type=None):
"""List options in an optiondescription (only for optiondescription)"""
assert type in ('all', 'option', 'optiondescription'), _('unknown list type {}').format(type)
assert group_type is None or isinstance(group_type, groups.GroupType), \
_("unknown group_type: {0}").format(group_type)
option = self._get_option() option = self._get_option()
name = option.impl_getname() name = option.impl_getname()
path = self._subconfig._get_subpath(name) path = self._subconfig._get_subpath(name)
@ -692,7 +690,8 @@ class _TiramisuOptionDescription(_TiramisuOption):
option_bag) option_bag)
for opt in option.impl_getchildren(self._config_bag): for opt in option.impl_getchildren(self._config_bag):
try: try:
subsubconfig = _filter(opt) subsubconfig = self._filter(opt,
subconfig)
except PropertiesOptionError: except PropertiesOptionError:
continue continue
if opt.impl_is_optiondescription(): if opt.impl_is_optiondescription():
@ -998,12 +997,8 @@ class TiramisuContextOption(TiramisuContext):
return next(self._find(name, value, type)) return next(self._find(name, value, type))
return self._find(name, value, type) return self._find(name, value, type)
def list(self, def _filter(self,
type='option', opt):
group_type=None,
recursive=False):
"""List options (by default list only option)"""
def _filter(opt):
if self._config_bag.properties: if self._config_bag.properties:
name = opt.impl_getname() name = opt.impl_getname()
option_bag = OptionBag() option_bag = OptionBag()
@ -1016,20 +1011,27 @@ class TiramisuContextOption(TiramisuContext):
else: else:
self._config_bag.context.getattr(name, self._config_bag.context.getattr(name,
option_bag) option_bag)
def _walk(option): def _walk(self,
option,
recursive,
type_,
group_type):
for opt in option.impl_getchildren(self._config_bag): for opt in option.impl_getchildren(self._config_bag):
try: try:
subsubconfig = _filter(opt) subsubconfig = self._filter(opt)
except PropertiesOptionError: except PropertiesOptionError:
continue continue
if opt.impl_is_optiondescription(): if opt.impl_is_optiondescription():
if recursive: if recursive:
for toption in _walk(opt): for toption in self._walk(opt,
recursive,
type_,
group_type):
yield toption yield toption
if type == 'option' or (type == 'optiondescription' and \ if type_ == 'option' or (type_ == 'optiondescription' and \
group_type and opt.impl_get_group_type() != group_type): group_type and opt.impl_get_group_type() != group_type):
continue continue
elif type == 'optiondescription': elif type_ == 'optiondescription':
continue continue
path = opt.impl_getpath() path = opt.impl_getpath()
subconfig, name = self._config_bag.context.cfgimpl_get_home_by_path(path, subconfig, name = self._config_bag.context.cfgimpl_get_home_by_path(path,
@ -1039,11 +1041,20 @@ class TiramisuContextOption(TiramisuContext):
None, None,
subconfig, subconfig,
self._config_bag) self._config_bag)
def list(self,
type='option',
group_type=None,
recursive=False):
"""List options (by default list only option)"""
assert type in ('all', 'option', 'optiondescription'), _('unknown list type {}').format(type) assert type in ('all', 'option', 'optiondescription'), _('unknown list type {}').format(type)
assert group_type is None or isinstance(group_type, groups.GroupType), \ assert group_type is None or isinstance(group_type, groups.GroupType), \
_("unknown group_type: {0}").format(group_type) _("unknown group_type: {0}").format(group_type)
option = self._config_bag.context.cfgimpl_get_description() option = self._config_bag.context.cfgimpl_get_description()
for toption in _walk(option): for toption in self._walk(option,
recursive,
type,
group_type):
yield toption yield toption
@ -1138,6 +1149,11 @@ class _TiramisuContextGroupConfig(TiramisuContext):
return Config(config) return Config(config)
class _TiramisuContextPathConfig(_TiramisuContextGroupConfig, _TiramisuContextConfigReset):
"""Actions to PathConfig"""
pass
class _TiramisuContextMetaConfig(_TiramisuContextGroupConfig, _TiramisuContextConfigReset): class _TiramisuContextMetaConfig(_TiramisuContextGroupConfig, _TiramisuContextConfigReset):
"""Actions to MetaConfig""" """Actions to MetaConfig"""
def new(self, def new(self,
@ -1186,6 +1202,8 @@ class TiramisuAPI(TiramisuHelp):
config = _TiramisuContextGroupConfig config = _TiramisuContextGroupConfig
elif config_type == 'meta': elif config_type == 'meta':
config = _TiramisuContextMetaConfig config = _TiramisuContextMetaConfig
elif config_type == 'path':
config = _TiramisuContextPathConfig
else: else:
config = _TiramisuContextConfig config = _TiramisuContextConfig
return config(self._config_bag) return config(self._config_bag)
@ -1258,6 +1276,26 @@ class MetaConfig(TiramisuAPI):
super().__init__(config) super().__init__(config)
class PathConfig(TiramisuAPI):
"""MetaConfig object that enables us to handle the sub configuration's options"""
def __init__(self,
optiondescription: OptionDescription,
children: List[Config],
session_id: Optional[str]=None,
persistent: bool=False) -> None:
_children = []
for child in children:
if isinstance(child, TiramisuAPI):
_children.append(child._config_bag.context)
else:
_children.append(child)
config = KernelPathConfig(optiondescription,
_children,
session_id=session_id,
persistent=persistent)
super().__init__(config)
class GroupConfig(TiramisuAPI): class GroupConfig(TiramisuAPI):
"""GroupConfig that enables us to access the Config""" """GroupConfig that enables us to access the Config"""

View File

@ -300,4 +300,5 @@ def calculate(option,
'').format(str(error), '').format(str(error),
callback.__name__, callback.__name__,
option.impl_get_display_name()) option.impl_get_display_name())
del error
raise ConfigError(msg) raise ConfigError(msg)

View File

@ -668,7 +668,7 @@ class _CommonConfig(SubConfig):
metaconfig_prefix=None, metaconfig_prefix=None,
child=None, child=None,
deep=False): deep=False):
assert isinstance(self, (KernelConfig, KernelMetaConfig)), _('cannot duplicate {}').format(self.__class__.__name__) assert isinstance(self, (KernelConfig, KernelPathConfig)), _('cannot duplicate {}').format(self.__class__.__name__)
if isinstance(self, KernelConfig): if isinstance(self, KernelConfig):
duplicated_config = KernelConfig(self._impl_descr, duplicated_config = KernelConfig(self._impl_descr,
_duplicate=True, _duplicate=True,
@ -677,7 +677,7 @@ class _CommonConfig(SubConfig):
force_settings=force_settings, force_settings=force_settings,
persistent=persistent, persistent=persistent,
storage=storage) storage=storage)
elif isinstance(self, KernelMetaConfig): else:
if session_id is None and metaconfig_prefix is not None: if session_id is None and metaconfig_prefix is not None:
session_id = metaconfig_prefix + self.impl_getname() session_id = metaconfig_prefix + self.impl_getname()
duplicated_config = KernelMetaConfig([], duplicated_config = KernelMetaConfig([],
@ -809,7 +809,7 @@ class KernelGroupConfig(_CommonConfig):
resetted_opts=None): resetted_opts=None):
if resetted_opts is None: if resetted_opts is None:
resetted_opts = [] resetted_opts = []
if isinstance(self, KernelMetaConfig): if isinstance(self, KernelPathConfig):
super().cfgimpl_reset_cache(option_bag, super().cfgimpl_reset_cache(option_bag,
resetted_opts=copy(resetted_opts)) resetted_opts=copy(resetted_opts))
for child in self._impl_children: for child in self._impl_children:
@ -834,7 +834,6 @@ class KernelGroupConfig(_CommonConfig):
for child in self._impl_children: for child in self._impl_children:
cconfig_bag = config_bag.copy() cconfig_bag = config_bag.copy()
cconfig_bag.context = child cconfig_bag.context = child
try:
if isinstance(child, KernelGroupConfig): if isinstance(child, KernelGroupConfig):
ret.extend(child.set_value(path, ret.extend(child.set_value(path,
index, index,
@ -843,6 +842,7 @@ class KernelGroupConfig(_CommonConfig):
only_config=only_config, only_config=only_config,
_commit=commit)) _commit=commit))
else: else:
try:
subconfig, name = child.cfgimpl_get_home_by_path(path, subconfig, name = child.cfgimpl_get_home_by_path(path,
cconfig_bag) cconfig_bag)
option = subconfig.cfgimpl_get_description().impl_getchild(name, option = subconfig.cfgimpl_get_description().impl_getchild(name,
@ -864,7 +864,7 @@ class KernelGroupConfig(_CommonConfig):
err._requires, err._requires,
err._name, err._name,
err._orig_opt)) err._orig_opt))
except (ValueError, SlaveError) as err: except (ValueError, SlaveError, AttributeError) as err:
ret.append(err) ret.append(err)
if _commit and self.impl_type != 'group': if _commit and self.impl_type != 'group':
self.cfgimpl_get_values()._p_.commit() self.cfgimpl_get_values()._p_.commit()
@ -885,7 +885,7 @@ class KernelGroupConfig(_CommonConfig):
#so search only one time the option for all children #so search only one time the option for all children
if bypath is undefined and byname is not None and \ if bypath is undefined and byname is not None and \
isinstance(self, isinstance(self,
KernelMetaConfig): KernelPathConfig):
bypath = next(self.find(bytype=None, bypath = next(self.find(bytype=None,
byvalue=undefined, byvalue=undefined,
byname=byname, byname=byname,
@ -954,47 +954,30 @@ class KernelGroupConfig(_CommonConfig):
raise ConfigError(_('unknown config "{}"').format(name)) raise ConfigError(_('unknown config "{}"').format(name))
class KernelMetaConfig(KernelGroupConfig): class KernelPathConfig(KernelGroupConfig):
__slots__ = tuple() __slots__ = tuple()
impl_type = 'meta' impl_type = 'path'
def __init__(self, def __init__(self,
optiondescription,
children, children,
session_id=None, session_id=None,
persistent=False, persistent=False,
optiondescription=None,
storage=None, storage=None,
_duplicate=False): _duplicate=False):
descr = None # FIXME _duplicate
if optiondescription is not None:
if not _duplicate:
new_children = []
for child_session_id in children:
assert isinstance(child_session_id, str), _('MetaConfig with optiondescription'
' must have string has child, '
'not {}').format(child_session_id)
new_children.append(KernelConfig(optiondescription,
persistent=persistent,
session_id=child_session_id))
children = new_children
descr = optiondescription
for child in children: for child in children:
if not isinstance(child, _CommonConfig): if not isinstance(child, _CommonConfig):
try: try:
child = child._config child = child._config
except: except:
raise TypeError(_("metaconfig's children " raise TypeError(_("{}config's children "
"should be config, not {0}" "should be config, not {}"
).format(type(child))) ).format(self.impl_type,
type(child)))
if child.cfgimpl_get_meta() is not None: if child.cfgimpl_get_meta() is not None:
raise ValueError(_("child has already a metaconfig's")) raise ValueError(_("child has already a {}config's").format(self.impl_type))
if descr is None:
descr = child.cfgimpl_get_description()
elif not descr is child.cfgimpl_get_description():
raise ValueError(_('all config in metaconfig must '
'have the same optiondescription'))
child._impl_meta = weakref.ref(self) child._impl_meta = weakref.ref(self)
properties, permissives, values, session_id = get_storages(self, properties, permissives, values, session_id = get_storages(self,
session_id, session_id,
persistent, persistent,
@ -1004,7 +987,7 @@ class KernelMetaConfig(KernelGroupConfig):
self._impl_values = Values(values) self._impl_values = Values(values)
super().__init__(children, super().__init__(children,
session_id=session_id, session_id=session_id,
_descr=descr) _descr=optiondescription)
self._impl_build_all_caches() self._impl_build_all_caches()
def set_value(self, def set_value(self,
@ -1036,11 +1019,12 @@ class KernelMetaConfig(KernelGroupConfig):
if force_default and force_dont_change_value: if force_default and force_dont_change_value:
raise ValueError(_('force_default and force_dont_change_value' raise ValueError(_('force_default and force_dont_change_value'
' cannot be set together')) ' cannot be set together'))
opt = self.cfgimpl_get_description().impl_get_opt_by_path(path, #opt = self.cfgimpl_get_description().impl_get_opt_by_path(path,
config_bag) # config_bag)
for child in self._impl_children: for child in self._impl_children:
cconfig_bag = config_bag.copy() cconfig_bag = config_bag.copy()
cconfig_bag.context = child cconfig_bag.context = child
try:
subconfig, name = child.cfgimpl_get_home_by_path(path, subconfig, name = child.cfgimpl_get_home_by_path(path,
cconfig_bag) cconfig_bag)
option = subconfig.cfgimpl_get_description().impl_getchild(name, option = subconfig.cfgimpl_get_description().impl_getchild(name,
@ -1062,14 +1046,21 @@ class KernelMetaConfig(KernelGroupConfig):
_commit=False) _commit=False)
continue continue
if force_dont_change_value: if force_dont_change_value:
try:
child_value = child.getattr(name, child_value = child.getattr(name,
option_bag) option_bag)
if value != child_value: if value != child_value:
child.setattr(child_value, child.setattr(child_value,
option_bag, option_bag,
_commit=False) _commit=False)
except (PropertiesOptionError, ValueError, SlaveError) as err: except PropertiesOptionError as err:
ret.append(PropertiesOptionError(err._option_bag,
err.proptype,
err._settings,
err._opt_type,
err._requires,
err._name,
err._orig_opt))
except (ValueError, SlaveError, AttributeError) as err:
ret.append(err) ret.append(err)
try: try:
@ -1109,6 +1100,51 @@ class KernelMetaConfig(KernelGroupConfig):
option_bag.config_bag.context = child option_bag.config_bag.context = child
child.cfgimpl_get_values().reset(option_bag) child.cfgimpl_get_values().reset(option_bag)
class KernelMetaConfig(KernelPathConfig):
__slots__ = tuple()
impl_type = 'meta'
def __init__(self,
children,
session_id=None,
persistent=False,
optiondescription=None,
storage=None,
_duplicate=False):
descr = None
if optiondescription is not None:
if not _duplicate:
new_children = []
for child_session_id in children:
assert isinstance(child_session_id, str), _('MetaConfig with optiondescription'
' must have string has child, '
'not {}').format(child_session_id)
new_children.append(KernelConfig(optiondescription,
persistent=persistent,
session_id=child_session_id))
children = new_children
descr = optiondescription
for child in children:
if not isinstance(child, _CommonConfig):
try:
child = child._config
except:
raise TypeError(_("{}config's children "
"should be config, not {}"
).format(self.impl_type,
type(child)))
if descr is None:
descr = child.cfgimpl_get_description()
elif descr is not child.cfgimpl_get_description():
raise ValueError(_('all config in metaconfig must '
'have the same optiondescription'))
super().__init__(descr,
children,
persistent=persistent,
storage=storage,
session_id=session_id)
def new_config(self, def new_config(self,
session_id, session_id,
type_='config', type_='config',

View File

@ -108,7 +108,7 @@ class ChoiceOption(Option):
current_opt=undefined): current_opt=undefined):
values = self.impl_get_values(option_bag, values = self.impl_get_values(option_bag,
current_opt=current_opt) current_opt=current_opt)
if values is not undefined and not value in values: if values is not undefined and value not in values:
if len(values) == 1: if len(values) == 1:
raise ValueError(_('only "{0}" is allowed' raise ValueError(_('only "{0}" is allowed'
'').format(values[0])) '').format(values[0]))

View File

@ -115,12 +115,9 @@ def get_default_settings_storages():
return properties, permissives return properties, permissives
def list_sessions(type_): def list_sessions():
"""List all available session (persistent or not persistent) """List all available session (persistent or not persistent)
""" """
#if type_ == 'option':
# return storage_option_type.get().list_sessions()
#else:
return storage_type.get().list_sessions() return storage_type.get().list_sessions()