Merge pull request #56 from salt-formulas/develop
Merge develop branch to master
diff --git a/README-extentions.rst b/README-extentions.rst
index 61364a4..ec10e48 100644
--- a/README-extentions.rst
+++ b/README-extentions.rst
@@ -124,6 +124,55 @@
three: ${one}
+Constant Parameters
+--------------------------
+
+Parameters can be labeled as constant by using the prefix ``=``
+
+.. code-block:: yaml
+
+ parameters:
+ =one: 1
+
+If in the normal parameter merging a constant parameter would be changed then depending
+on the setting of ``strict_constant_parameters`` either an exception is raised (``strict_constant_parameters`` true)
+or the parameter is left unchanged and no notification or error is given (``strict_constant_parameters`` false)
+
+For example with:
+
+.. code-block:: yaml
+
+ # nodes/node1.yml
+ classes:
+ - first
+ - second
+
+ # classes/first.yml
+ parameters:
+ =one: 1
+
+ # classes/second.yml
+ parameters:
+ one: 2
+
+``reclass.py --nodeinfo node1`` then gives an ''Attempt to change constant value'' error if ``strict_constant_parameters``
+is true or gives:
+
+.. code-block:: yaml
+
+ parameters:
+ alpha:
+ one: 1
+
+if ``strict_constant_parameters`` is false
+
+Default value for ``strict_constant_parameters`` is True
+
+.. code-block:: yaml
+
+ strict_constant_parameters: True
+
+
Nested References
-----------------
@@ -155,11 +204,12 @@
Ignore overwritten missing references
--------------------------
+-------------------------------------
Given the following classes:
.. code-block:: yaml
+
# node1.yml
classes:
- class1
@@ -197,6 +247,7 @@
Instead of failing on the first undefinded reference error all missing reference errors are printed at once.
.. code-block:: yaml
+
reclass --nodeinfo mynode
-> dontpanic
Cannot resolve ${_param:kkk}, at mkkek3:tree:to:fail, in yaml_fs:///test/classes/third.yml
@@ -237,6 +288,7 @@
Classes:
.. code-block:: yaml
+
#/etc/reclass/classes/global.yml
parameters:
_class:
diff --git a/reclass/core.py b/reclass/core.py
index d3d6187..ed5a392 100644
--- a/reclass/core.py
+++ b/reclass/core.py
@@ -188,7 +188,7 @@
node.interpolate_single_export(q)
except InterpolationError as e:
e.nodename = nodename
- raise InvQueryError(q.contents(), e, context=p, uri=q.uri())
+ raise InvQueryError(q.contents(), e, context=p, uri=q.uri)
inventory[nodename] = node.exports.as_dict()
return inventory
diff --git a/reclass/datatypes/entity.py b/reclass/datatypes/entity.py
index 38360b5..3c927c3 100644
--- a/reclass/datatypes/entity.py
+++ b/reclass/datatypes/entity.py
@@ -83,6 +83,7 @@
self._exports.merge(other._exports)
self._name = other.name
self._uri = other.uri
+ self._parameters._uri = other.uri
if other.environment != None:
self._environment = other.environment
diff --git a/reclass/datatypes/exports.py b/reclass/datatypes/exports.py
index 7f21295..04ab200 100644
--- a/reclass/datatypes/exports.py
+++ b/reclass/datatypes/exports.py
@@ -92,7 +92,7 @@
e.context = path
raise
if isinstance(new, dict):
- self._render_simple_dict(new, path)
+ new = self._render_simple_dict(new, path)
elif isinstance(new, list):
- self._render_simple_list(new, path)
+ new = self._render_simple_list(new, path)
return new
diff --git a/reclass/datatypes/parameters.py b/reclass/datatypes/parameters.py
index e58a1b1..fa0f379 100644
--- a/reclass/datatypes/parameters.py
+++ b/reclass/datatypes/parameters.py
@@ -25,9 +25,11 @@
from collections import namedtuple
from reclass.utils.dictpath import DictPath
+from reclass.utils.parameterdict import ParameterDict
+from reclass.utils.parameterlist import ParameterList
from reclass.values.value import Value
from reclass.values.valuelist import ValueList
-from reclass.errors import InfiniteRecursionError, ResolveError, ResolveErrorList, InterpolationError, ParseError, BadReferencesError
+from reclass.errors import InfiniteRecursionError, ResolveError, ResolveErrorList, InterpolationError, BadReferencesError
class Parameters(object):
@@ -56,22 +58,17 @@
def __init__(self, mapping, settings, uri, parse_strings=True):
self._settings = settings
- self._base = {}
self._uri = uri
+ self._base = ParameterDict(uri=self._uri)
self._unrendered = None
self._escapes_handled = {}
self._inv_queries = []
self._resolve_errors = ResolveErrorList()
self._needs_all_envs = False
- self._keep_overrides = False
self._parse_strings = parse_strings
if mapping is not None:
- # we initialise by merging
- self._keep_overrides = True
+ # initialise by merging
self.merge(mapping)
- self._keep_overrides = False
-
- #delimiter = property(lambda self: self._delimiter)
def __len__(self):
return len(self._base)
@@ -102,25 +99,39 @@
def as_dict(self):
return self._base.copy()
- def _wrap_value(self, value, path):
- if isinstance(value, dict):
- return self._wrap_dict(value, path)
- elif isinstance(value, list):
- return self._wrap_list(value, path)
- elif isinstance(value, (Value, ValueList)):
+ def _wrap_value(self, value):
+ if isinstance(value, (Value, ValueList)):
return value
+ elif isinstance(value, dict):
+ return self._wrap_dict(value)
+ elif isinstance(value, list):
+ return self._wrap_list(value)
else:
try:
return Value(value, self._settings, self._uri, parse_string=self._parse_strings)
except InterpolationError as e:
- e.context = str(path)
+ e.context = DictPath(self._settings.delimiter)
raise
- def _wrap_list(self, source, path):
- return [ self._wrap_value(v, path.new_subpath(k)) for (k, v) in enumerate(source) ]
+ def _wrap_list(self, source):
+ l = ParameterList(uri=self._uri)
+ for (k, v) in enumerate(source):
+ try:
+ l.append(self._wrap_value(v))
+ except InterpolationError as e:
+ e.context.add_ancestor(str(k))
+ raise
+ return l
- def _wrap_dict(self, source, path):
- return { k: self._wrap_value(v, path.new_subpath(k)) for (k, v) in iteritems(source) }
+ def _wrap_dict(self, source):
+ d = ParameterDict(uri=self._uri)
+ for (k, v) in iteritems(source):
+ try:
+ d[k] = self._wrap_value(v)
+ except InterpolationError as e:
+ e.context.add_ancestor(str(k))
+ raise
+ return d
def _update_value(self, cur, new):
if isinstance(cur, Value):
@@ -128,18 +139,26 @@
elif isinstance(cur, ValueList):
values = cur
else:
- values = ValueList(Value(cur, self._settings, self._uri), self._settings)
+ if isinstance(cur, (ParameterDict, ParameterList)):
+ uri = cur.uri
+ else:
+ uri = self._uri
+ values = ValueList(Value(cur, self._settings, uri), self._settings)
if isinstance(new, Value):
values.append(new)
elif isinstance(new, ValueList):
values.extend(new)
else:
- values.append(Value(new, self._settings, self._uri, parse_string=self._parse_strings))
+ if isinstance(new, (ParameterDict, ParameterList)):
+ uri = new.uri
+ else:
+ uri = self._uri
+ values.append(Value(new, self._settings, uri, parse_string=self._parse_strings))
return values
- def _merge_dict(self, cur, new, path):
+ def _merge_dict(self, cur, new):
"""Merge a dictionary with another dictionary.
Iterate over keys in new. If this is not an initialization merge and
@@ -150,7 +169,6 @@
Args:
cur (dict): Current dictionary
new (dict): Dictionary to be merged
- path (string): Merging path from recursion
initmerge (bool): True if called as part of entity init
Returns:
@@ -158,42 +176,50 @@
"""
- ret = cur
- for (key, newvalue) in iteritems(new):
- if key.startswith(self._settings.dict_key_override_prefix) and not self._keep_overrides:
- if not isinstance(newvalue, Value):
- newvalue = Value(newvalue, self._settings, self._uri, parse_string=self._parse_strings)
- newvalue.overwrite = True
- ret[key.lstrip(self._settings.dict_key_override_prefix)] = newvalue
+ for (key, value) in iteritems(new):
+ if key[0] in self._settings.dict_key_prefixes:
+ newkey = key[1:]
+ if not isinstance(value, Value):
+ value = Value(value, self._settings, self._uri, parse_string=self._parse_strings)
+ if key[0] == self._settings.dict_key_override_prefix:
+ value.overwrite = True
+ elif key[0] == self._settings.dict_key_constant_prefix:
+ value.constant = True
+ value = self._merge_recurse(cur.get(newkey), value)
+ key = newkey
else:
- ret[key] = self._merge_recurse(ret.get(key), newvalue, path.new_subpath(key))
- return ret
+ value = self._merge_recurse(cur.get(key), value)
+ cur[key] = value
+ cur.uri = new.uri
+ return cur
- def _merge_recurse(self, cur, new, path=None):
+ def _merge_recurse(self, cur, new):
"""Merge a parameter with another parameter.
- Iterate over keys in new. Call _merge_dict, _extend_list, or
- _update_scalar depending on type. Pass along whether this is an
- initialization merge.
+ Iterate over keys in new. Call _merge_dict, _update_value
+ depending on type.
Args:
- cur (dict): Current dictionary
- new (dict): Dictionary to be merged
- path (string): Merging path from recursion
- initmerge (bool): True if called as part of entity init, defaults
- to False
+ cur: Current parameter
+ new: Parameter to be merged
Returns:
- dict: a merged dictionary
+ merged parameter (Value or ValueList)
"""
- if cur is None:
- return new
- elif isinstance(new, dict) and isinstance(cur, dict):
- return self._merge_dict(cur, new, path)
+ if isinstance(new, dict):
+ if cur is None:
+ cur = ParameterDict(uri=self._uri)
+ if isinstance(cur, dict):
+ return self._merge_dict(cur, new)
+ else:
+ return self._update_value(cur, new)
else:
- return self._update_value(cur, new)
+ if cur is None:
+ return new
+ else:
+ return self._update_value(cur, new)
def merge(self, other):
"""Merge function (public edition).
@@ -211,19 +237,20 @@
self._unrendered = None
if isinstance(other, dict):
- wrapped = self._wrap_dict(other, DictPath(self._settings.delimiter))
+ wrapped = self._wrap_dict(other)
elif isinstance(other, self.__class__):
- wrapped = self._wrap_dict(other._base, DictPath(self._settings.delimiter))
+ wrapped = other._wrap_dict(other._base)
else:
raise TypeError('Cannot merge %s objects into %s' % (type(other),
self.__class__.__name__))
- self._base = self._merge_recurse(self._base, wrapped, DictPath(self._settings.delimiter))
+ self._base = self._merge_recurse(self._base, wrapped)
def _render_simple_container(self, container, key, value, path):
if isinstance(value, ValueList):
if value.is_complex():
p = path.new_subpath(key)
self._unrendered[p] = True
+ container[key] = value
if value.has_inv_query():
self._inv_queries.append((p, value))
if value.needs_all_envs():
@@ -234,29 +261,34 @@
if isinstance(value, Value) and value.is_container():
value = value.contents()
if isinstance(value, dict):
- self._render_simple_dict(value, path.new_subpath(key))
- container[key] = value
+ container[key] = self._render_simple_dict(value, path.new_subpath(key))
elif isinstance(value, list):
- self._render_simple_list(value, path.new_subpath(key))
- container[key] = value
+ container[key] = self._render_simple_list(value, path.new_subpath(key))
elif isinstance(value, Value):
if value.is_complex():
p = path.new_subpath(key)
self._unrendered[p] = True
+ container[key] = value
if value.has_inv_query():
self._inv_queries.append((p, value))
if value.needs_all_envs():
self._needs_all_envs = True
else:
container[key] = value.render(None, None)
+ else:
+ container[key] = value
def _render_simple_dict(self, dictionary, path):
+ new_dict = {}
for (key, value) in iteritems(dictionary):
- self._render_simple_container(dictionary, key, value, path)
+ self._render_simple_container(new_dict, key, value, path)
+ return new_dict
def _render_simple_list(self, item_list, path):
+ new_list = [ None ] * len(item_list)
for n, value in enumerate(item_list):
- self._render_simple_container(item_list, n, value, path)
+ self._render_simple_container(new_list, n, value, path)
+ return new_list
def interpolate(self, inventory=None):
self._initialise_interpolate()
@@ -279,7 +311,7 @@
self._inv_queries = []
self._needs_all_envs = False
self._resolve_errors = ResolveErrorList()
- self._render_simple_dict(self._base, DictPath(self._settings.delimiter))
+ self._base = self._render_simple_dict(self._base, DictPath(self._settings.delimiter))
def _interpolate_inner(self, path, inventory):
value = path.get_value(self._base)
@@ -305,11 +337,14 @@
new = None
else:
raise
+ except InterpolationError as e:
+ e.context = path
+ raise
if isinstance(new, dict):
- self._render_simple_dict(new, path)
+ new = self._render_simple_dict(new, path)
elif isinstance(new, list):
- self._render_simple_list(new, path)
+ new = self._render_simple_list(new, path)
return new
def _interpolate_references(self, path, value, inventory):
@@ -325,7 +360,7 @@
# Therefore, if we encounter False instead of True,
# it means that we have already processed it and are now
# faced with a cyclical reference.
- raise InfiniteRecursionError(path, ref, value.uri())
+ raise InfiniteRecursionError(path, ref, value.uri)
else:
self._interpolate_inner(path_from_ref, inventory)
else:
@@ -345,4 +380,4 @@
old = len(value.get_references())
value.assembleRefs(self._base)
if old == len(value.get_references()):
- raise BadReferencesError(value.get_references(), str(path), value.uri())
+ raise BadReferencesError(value.get_references(), str(path), value.uri)
diff --git a/reclass/datatypes/tests/test_classes.py b/reclass/datatypes/tests/test_classes.py
index 8d396e0..9b9e419 100644
--- a/reclass/datatypes/tests/test_classes.py
+++ b/reclass/datatypes/tests/test_classes.py
@@ -78,8 +78,9 @@
def test_append_invalid_characters(self):
c = Classes()
invalid_name = ' '.join(('foo', 'bar'))
- with self.assertRaises(InvalidClassnameError):
+ with self.assertRaises(InvalidClassnameError) as e:
c.append_if_new(invalid_name)
+ self.assertEqual(e.exception.message, "Invalid character ' ' in class name 'foo bar'.")
def test_merge_unique(self):
c = Classes(TESTLIST1)
diff --git a/reclass/datatypes/tests/test_entity.py b/reclass/datatypes/tests/test_entity.py
index b09e904..f18f3fc 100644
--- a/reclass/datatypes/tests/test_entity.py
+++ b/reclass/datatypes/tests/test_entity.py
@@ -167,6 +167,19 @@
class TestEntityNoMock(unittest.TestCase):
+ def test_interpolate_list_types(self):
+ node1_exports = Exports({'exps': [ '${one}' ] }, SETTINGS, 'first')
+ node1_parameters = Parameters({'alpha': [ '${two}', '${three}' ], 'one': 1, 'two': 2, 'three': 3 }, SETTINGS, 'first')
+ node1_entity = Entity(SETTINGS, classes=None, applications=None, parameters=node1_parameters, exports=node1_exports)
+ node2_exports = Exports({'exps': '${alpha}' }, SETTINGS, 'second')
+ node2_parameters = Parameters({}, SETTINGS, 'second')
+ node2_entity = Entity(SETTINGS, classes=None, applications=None, parameters=node2_parameters, exports=node2_exports)
+ r = {'exps': [ 1, 2, 3 ]}
+ node1_entity.merge(node2_entity)
+ node1_entity.interpolate(None)
+ self.assertIs(type(node1_entity.exports.as_dict()['exps']), list)
+ self.assertDictEqual(node1_entity.exports.as_dict(), r)
+
def test_exports_with_refs(self):
inventory = {'node1': {'a': 1, 'b': 2}, 'node2': {'a': 3, 'b': 4}}
node3_exports = Exports({'a': '${a}', 'b': '${b}'}, SETTINGS, '')
@@ -253,10 +266,11 @@
node1_entity.initialise_interpolation()
node2_entity.initialise_interpolation()
queries = node1_entity.parameters.get_inv_queries()
- with self.assertRaises(ResolveError):
+ with self.assertRaises(ResolveError) as e:
for p, q in queries:
node1_entity.interpolate_single_export(q)
node2_entity.interpolate_single_export(q)
+ self.assertEqual(e.exception.message, "-> \n Cannot resolve ${b}, at a")
def test_exports_failed_render_ignore(self):
node1_exports = Exports({'a': '${a}'}, SETTINGS, '')
diff --git a/reclass/datatypes/tests/test_exports.py b/reclass/datatypes/tests/test_exports.py
index 6a6dcde..7b37ca4 100644
--- a/reclass/datatypes/tests/test_exports.py
+++ b/reclass/datatypes/tests/test_exports.py
@@ -8,6 +8,8 @@
from __future__ import print_function
from __future__ import unicode_literals
+from reclass.utils.parameterdict import ParameterDict
+from reclass.utils.parameterlist import ParameterList
from reclass.settings import Settings
from reclass.datatypes import Exports, Parameters
from reclass.errors import ParseError
@@ -21,9 +23,19 @@
e = Exports({'alpha': { 'one': 1, 'two': 2}}, SETTINGS, '')
d = {'alpha': { 'three': 3, 'four': 4}}
e.overwrite(d)
- e.initialise_interpolation()
+ e.interpolate()
self.assertEqual(e.as_dict(), d)
+ def test_interpolate_types(self):
+ e = Exports({'alpha': { 'one': 1, 'two': 2}, 'beta': [ 1, 2 ]}, SETTINGS, '')
+ r = {'alpha': { 'one': 1, 'two': 2}, 'beta': [ 1, 2 ]}
+ self.assertIs(type(e.as_dict()['alpha']), ParameterDict)
+ self.assertIs(type(e.as_dict()['beta']), ParameterList)
+ e.interpolate()
+ self.assertIs(type(e.as_dict()['alpha']), dict)
+ self.assertIs(type(e.as_dict()['beta']), list)
+ self.assertEqual(e.as_dict(), r)
+
def test_malformed_invquery(self):
with self.assertRaises(ParseError):
p = Parameters({'exp': '$[ exports:a exports:b == self:test_value ]'}, SETTINGS, '')
@@ -62,9 +74,10 @@
def test_list_if_expr_invquery(self):
e = {'node1': {'a': 1, 'b': 2}, 'node2': {'a': 3, 'b': 3}, 'node3': {'a': 3, 'b': 2}}
p = Parameters({'exp': '$[ if exports:b == 2 ]'}, SETTINGS, '')
- r = {'exp': ['node1', 'node3']}
+ r1 = {'exp': ['node1', 'node3']}
+ r2 = {'exp': ['node3', 'node1']}
p.interpolate(e)
- self.assertEqual(p.as_dict(), r)
+ self.assertIn(p.as_dict(), [ r1, r2 ])
def test_if_expr_invquery_wth_and(self):
e = {'node1': {'a': 1, 'b': 4, 'c': False}, 'node2': {'a': 3, 'b': 4, 'c': True}}
@@ -97,9 +110,10 @@
def test_list_if_expr_invquery_with_and(self):
e = {'node1': {'a': 1, 'b': 2}, 'node2': {'a': 3, 'b': 3}, 'node3': {'a': 3, 'b': 4}}
p = Parameters({'exp': '$[ if exports:b == 2 or exports:b == 4 ]'}, SETTINGS, '')
- r = {'exp': ['node1', 'node3']}
+ r1 = {'exp': ['node1', 'node3']}
+ r2 = {'exp': ['node3', 'node1']}
p.interpolate(e)
- self.assertEqual(p.as_dict(), r)
+ self.assertIn(p.as_dict(), [ r1, r2 ])
if __name__ == '__main__':
unittest.main()
diff --git a/reclass/datatypes/tests/test_parameters.py b/reclass/datatypes/tests/test_parameters.py
index fb4a11b..79322e6 100644
--- a/reclass/datatypes/tests/test_parameters.py
+++ b/reclass/datatypes/tests/test_parameters.py
@@ -17,7 +17,12 @@
from reclass.settings import Settings
from reclass.datatypes import Parameters
-from reclass.errors import InfiniteRecursionError, InterpolationError, ResolveError, ResolveErrorList
+from reclass.utils.parameterdict import ParameterDict
+from reclass.utils.parameterlist import ParameterList
+from reclass.values.value import Value
+from reclass.values.valuelist import ValueList
+from reclass.values.scaitem import ScaItem
+from reclass.errors import ChangedConstantError, InfiniteRecursionError, InterpolationError, ResolveError, ResolveErrorList, TypeMergeError
import unittest
try:
@@ -44,7 +49,7 @@
def _construct_mocked_params(self, iterable=None, settings=SETTINGS):
p = Parameters(iterable, settings, '')
self._base = base = p._base
- p._base = mock.MagicMock(spec_set=dict, wraps=base)
+ p._base = mock.MagicMock(spec_set=ParameterDict, wraps=base)
p._base.__repr__ = mock.MagicMock(autospec=dict.__repr__,
return_value=repr(base))
p._base.__getitem__.side_effect = base.__getitem__
@@ -120,13 +125,17 @@
self.assertEqual(b1.__eq__.call_count, 0)
def test_construct_wrong_type(self):
- with self.assertRaises(TypeError):
- self._construct_mocked_params('wrong type')
+ with self.assertRaises(TypeError) as e:
+ self._construct_mocked_params(str('wrong type'))
+ self.assertIn(str(e.exception), [ "Cannot merge <type 'str'> objects into Parameters", # python 2
+ "Cannot merge <class 'str'> objects into Parameters" ]) # python 3
def test_merge_wrong_type(self):
p, b = self._construct_mocked_params()
- with self.assertRaises(TypeError):
- p.merge('wrong type')
+ with self.assertRaises(TypeError) as e:
+ p.merge(str('wrong type'))
+ self.assertIn(str(e.exception), [ "Cannot merge <type 'str'> objects into Parameters", # python 2
+ "Cannot merge <class 'str'> objects into Parameters"]) # python 3
def test_get_dict(self):
p, b = self._construct_mocked_params(SIMPLE)
@@ -138,12 +147,8 @@
mergee = {'five':5,'four':4,'None':None,'tuple':(1,2,3)}
p2, b2 = self._construct_mocked_params(mergee)
p1.merge(p2)
- p1.initialise_interpolation()
- for (key, value) in iteritems(mergee):
- # check that each key, value in mergee resulted in a get call and
- # a __setitem__ call against b1 (the merge target)
- self.assertIn(mock.call(key), b1.get.call_args_list)
- self.assertIn(mock.call(key, value), b1.__setitem__.call_args_list)
+ self.assertEqual(b1.get.call_count, 4)
+ self.assertEqual(b1.__setitem__.call_count, 4)
def test_stray_occurrence_overwrites_during_interpolation(self):
p1 = Parameters({'r' : mock.sentinel.ref, 'b': '${r}'}, SETTINGS, '')
@@ -183,56 +188,121 @@
self.assertListEqual(p1.as_dict()['list'], l1+l2)
def test_merge_list_into_scalar(self):
+ l = ['foo', 1, 2]
+ p1 = Parameters(dict(key=l[0]), SETTINGS, '')
+ p2 = Parameters(dict(key=l[1:]), SETTINGS, '')
+ with self.assertRaises(TypeMergeError) as e:
+ p1.merge(p2)
+ p1.interpolate()
+ self.assertEqual(e.exception.message, "-> \n Canot merge list over scalar, at key, in ; ")
+
+ def test_merge_list_into_scalar_allow(self):
settings = Settings({'allow_list_over_scalar': True})
l = ['foo', 1, 2]
p1 = Parameters(dict(key=l[0]), settings, '')
p2 = Parameters(dict(key=l[1:]), settings, '')
p1.merge(p2)
- p1.initialise_interpolation()
+ p1.interpolate()
self.assertListEqual(p1.as_dict()['key'], l)
def test_merge_scalar_over_list(self):
l = ['foo', 1, 2]
+ p1 = Parameters(dict(key=l[:2]), SETTINGS, '')
+ p2 = Parameters(dict(key=l[2]), SETTINGS, '')
+ with self.assertRaises(TypeMergeError) as e:
+ p1.merge(p2)
+ p1.interpolate()
+ self.assertEqual(e.exception.message, "-> \n Canot merge scalar over list, at key, in ; ")
+
+ def test_merge_scalar_over_list_allow(self):
+ l = ['foo', 1, 2]
settings = Settings({'allow_scalar_over_list': True})
p1 = Parameters(dict(key=l[:2]), settings, '')
p2 = Parameters(dict(key=l[2]), settings, '')
p1.merge(p2)
- p1.initialise_interpolation()
+ p1.interpolate()
self.assertEqual(p1.as_dict()['key'], l[2])
def test_merge_none_over_list(self):
l = ['foo', 1, 2]
+ settings = Settings({'allow_none_override': False})
+ p1 = Parameters(dict(key=l[:2]), settings, '')
+ p2 = Parameters(dict(key=None), settings, '')
+ with self.assertRaises(TypeMergeError) as e:
+ p1.merge(p2)
+ p1.interpolate()
+ self.assertEqual(e.exception.message, "-> \n Canot merge scalar over list, at key, in ; ")
+
+ def test_merge_none_over_list_allow(self):
+ l = ['foo', 1, 2]
settings = Settings({'allow_none_override': True})
p1 = Parameters(dict(key=l[:2]), settings, '')
p2 = Parameters(dict(key=None), settings, '')
p1.merge(p2)
- p1.initialise_interpolation()
+ p1.interpolate()
self.assertEqual(p1.as_dict()['key'], None)
- def test_merge_none_over_list_negative(self):
- l = ['foo', 1, 2]
- settings = Settings({'allow_none_override': False})
- p1 = Parameters(dict(key=l[:2]), settings, '')
- p2 = Parameters(dict(key=None), settings, '')
- with self.assertRaises(TypeError):
+ def test_merge_dict_over_scalar(self):
+ d = { 'one': 1, 'two': 2 }
+ p1 = Parameters({ 'a': 1 }, SETTINGS, '')
+ p2 = Parameters({ 'a': d }, SETTINGS, '')
+ with self.assertRaises(TypeMergeError) as e:
p1.merge(p2)
- p1.initialise_interpolation()
+ p1.interpolate()
+ self.assertEqual(e.exception.message, "-> \n Canot merge dictionary over scalar, at a, in ; ")
+
+ def test_merge_dict_over_scalar_allow(self):
+ settings = Settings({'allow_dict_over_scalar': True})
+ d = { 'one': 1, 'two': 2 }
+ p1 = Parameters({ 'a': 1 }, settings, '')
+ p2 = Parameters({ 'a': d }, settings, '')
+ p1.merge(p2)
+ p1.interpolate()
+ self.assertEqual(p1.as_dict(), { 'a': d })
+
+ def test_merge_scalar_over_dict(self):
+ d = { 'one': 1, 'two': 2}
+ p1 = Parameters({ 'a': d }, SETTINGS, '')
+ p2 = Parameters({ 'a': 1 }, SETTINGS, '')
+ with self.assertRaises(TypeMergeError) as e:
+ p1.merge(p2)
+ p1.interpolate()
+ self.assertEqual(e.exception.message, "-> \n Canot merge scalar over dictionary, at a, in ; ")
+
+ def test_merge_scalar_over_dict_allow(self):
+ d = { 'one': 1, 'two': 2}
+ settings = Settings({'allow_scalar_over_dict': True})
+ p1 = Parameters({ 'a': d }, settings, '')
+ p2 = Parameters({ 'a': 1 }, settings, '')
+ p1.merge(p2)
+ p1.interpolate()
+ self.assertEqual(p1.as_dict(), { 'a': 1})
def test_merge_none_over_dict(self):
+ p1 = Parameters(dict(key=SIMPLE), SETTINGS, '')
+ p2 = Parameters(dict(key=None), SETTINGS, '')
+ with self.assertRaises(TypeMergeError) as e:
+ p1.merge(p2)
+ p1.interpolate()
+ self.assertEqual(e.exception.message, "-> \n Canot merge scalar over dictionary, at key, in ; ")
+
+ def test_merge_none_over_dict_allow(self):
settings = Settings({'allow_none_override': True})
p1 = Parameters(dict(key=SIMPLE), settings, '')
p2 = Parameters(dict(key=None), settings, '')
p1.merge(p2)
- p1.initialise_interpolation()
+ p1.interpolate()
self.assertEqual(p1.as_dict()['key'], None)
- def test_merge_none_over_dict_negative(self):
- settings = Settings({'allow_none_override': False})
- p1 = Parameters(dict(key=SIMPLE), settings, '')
- p2 = Parameters(dict(key=None), settings, '')
- with self.assertRaises(TypeError):
+ def test_merge_list_over_dict(self):
+ p1 = Parameters({}, SETTINGS, '')
+ p2 = Parameters({'one': { 'a': { 'b': 'c' } } }, SETTINGS, 'second')
+ p3 = Parameters({'one': { 'a': [ 'b' ] } }, SETTINGS, 'third')
+ with self.assertRaises(TypeMergeError) as e:
p1.merge(p2)
- p1.initialise_interpolation()
+ p1.merge(p3)
+ p1.interpolate()
+ self.assertEqual(e.exception.message, "-> \n Canot merge list over dictionary, at one:a, in second; third")
# def test_merge_bare_dict_over_dict(self):
# settings = Settings({'allow_bare_override': True})
@@ -282,25 +352,9 @@
p = Parameters(dict(dict=base), SETTINGS, '')
p2 = Parameters(dict(dict=mergee), SETTINGS, '')
p.merge(p2)
- p.initialise_interpolation()
+ p.interpolate()
self.assertDictEqual(p.as_dict(), dict(dict=goal))
- def test_merge_dict_into_scalar(self):
- p = Parameters(dict(base='foo'), SETTINGS, '')
- p2 = Parameters(dict(base=SIMPLE), SETTINGS, '')
- with self.assertRaises(TypeError):
- p.merge(p2)
- p.interpolate()
-
- def test_merge_scalar_over_dict(self):
- settings = Settings({'allow_scalar_over_dict': True})
- p = Parameters(dict(base=SIMPLE), settings, '')
- mergee = {'base':'foo'}
- p2 = Parameters(mergee, settings, '')
- p.merge(p2)
- p.initialise_interpolation()
- self.assertDictEqual(p.as_dict(), mergee)
-
def test_interpolate_single(self):
v = 42
d = {'foo': 'bar'.join(SETTINGS.reference_sentinels),
@@ -340,8 +394,11 @@
d = {'foo': 'bar'.join(SETTINGS.reference_sentinels),
'bar': 'foo'.join(SETTINGS.reference_sentinels)}
p = Parameters(d, SETTINGS, '')
- with self.assertRaises(InfiniteRecursionError):
+ with self.assertRaises(InfiniteRecursionError) as e:
p.interpolate()
+ # interpolation can start with foo or bar
+ self.assertIn(e.exception.message, [ "-> \n Infinite recursion: ${foo}, at bar",
+ "-> \n Infinite recursion: ${bar}, at foo"])
def test_nested_references(self):
d = {'a': '${${z}}', 'b': 2, 'z': 'b'}
@@ -423,6 +480,22 @@
p1.interpolate()
self.assertEqual(p1.as_dict(), r)
+ def test_overwrite_dict(self):
+ p1 = Parameters({'a': { 'one': 1, 'two': 2 }}, SETTINGS, '')
+ p2 = Parameters({'~a': { 'three': 3, 'four': 4 }}, SETTINGS, '')
+ r = {'a': { 'three': 3, 'four': 4 }}
+ p1.merge(p2)
+ p1.interpolate()
+ self.assertEqual(p1.as_dict(), r)
+
+ def test_overwrite_list(self):
+ p1 = Parameters({'a': [1, 2]}, SETTINGS, '')
+ p2 = Parameters({'~a': [3, 4]}, SETTINGS, '')
+ r = {'a': [3, 4]}
+ p1.merge(p2)
+ p1.interpolate()
+ self.assertEqual(p1.as_dict(), r)
+
def test_interpolate_escaping(self):
v = 'bar'.join(SETTINGS.reference_sentinels)
d = {'foo': SETTINGS.escape_character + 'bar'.join(SETTINGS.reference_sentinels),
@@ -575,7 +648,9 @@
p1 = Parameters({'alpha': '${gamma}', 'beta': '${gamma}'}, SETTINGS, '')
with self.assertRaises(ResolveErrorList) as error:
p1.interpolate()
- self.assertEqual(error.exception.message, "-> \n Cannot resolve ${gamma}, at alpha\n Cannot resolve ${gamma}, at beta")
+ # interpolation can start with either alpha or beta
+ self.assertIn(error.exception.message, [ "-> \n Cannot resolve ${gamma}, at alpha\n Cannot resolve ${gamma}, at beta",
+ "-> \n Cannot resolve ${gamma}, at beta\n Cannot resolve ${gamma}, at alpha"])
def test_force_single_resolve_error(self):
settings = copy.deepcopy(SETTINGS)
@@ -583,7 +658,9 @@
p1 = Parameters({'alpha': '${gamma}', 'beta': '${gamma}'}, settings, '')
with self.assertRaises(ResolveError) as error:
p1.interpolate()
- self.assertEqual(error.exception.message, "-> \n Cannot resolve ${gamma}, at alpha")
+ # interpolation can start with either alpha or beta
+ self.assertIn(error.exception.message, [ "-> \n Cannot resolve ${gamma}, at alpha",
+ "-> \n Cannot resolve ${gamma}, at beta"])
def test_ignore_overwriten_missing_reference(self):
settings = copy.deepcopy(SETTINGS)
@@ -680,6 +757,67 @@
p1.interpolate()
self.assertEqual(p1.as_dict(), r)
+ def test_strict_constant_parameter(self):
+ p1 = Parameters({'one': { 'a': 1} }, SETTINGS, 'first')
+ p2 = Parameters({'one': { '=a': 2} }, SETTINGS, 'second')
+ p3 = Parameters({'one': { 'a': 3} }, SETTINGS, 'third')
+ with self.assertRaises(ChangedConstantError) as e:
+ p1.merge(p2)
+ p1.merge(p3)
+ p1.interpolate()
+ self.assertEqual(e.exception.message, "-> \n Attempt to change constant value, at one:a, in second; third")
+
+ def test_constant_parameter(self):
+ settings = Settings({'strict_constant_parameters': False})
+ p1 = Parameters({'one': { 'a': 1} }, settings, 'first')
+ p2 = Parameters({'one': { '=a': 2} }, settings, 'second')
+ p3 = Parameters({'one': { 'a': 3} }, settings, 'third')
+ r = {'one': { 'a': 2 } }
+ p1.merge(p2)
+ p1.merge(p3)
+ p1.interpolate()
+ self.assertEqual(p1.as_dict(), r)
+
+ def test_interpolated_list_type(self):
+ p1 = Parameters({'a': [ 1, 2, 3 ]}, SETTINGS, 'first')
+ r = {'a': [ 1, 2, 3 ]}
+ self.assertIs(type(p1.as_dict()['a']), ParameterList)
+ p1.interpolate()
+ self.assertIs(type(p1.as_dict()['a']), list)
+ self.assertEqual(p1.as_dict(), r)
+
+ def test_interpolated_dict_type(self):
+ p1 = Parameters({'a': { 'one': 1, 'two': 2, 'three': 3 }}, SETTINGS, 'first')
+ r = {'a': { 'one': 1, 'two': 2, 'three': 3 }}
+ self.assertIs(type(p1.as_dict()['a']), ParameterDict)
+ p1.interpolate()
+ self.assertIs(type(p1.as_dict()['a']), dict)
+ self.assertEqual(p1.as_dict(), r)
+
+ def test_merged_interpolated_list_type(self):
+ p1 = Parameters({'a': [ 1, 2, 3 ]}, SETTINGS, 'first')
+ p2 = Parameters({'a': [ 4, 5, 6 ]}, SETTINGS, 'second')
+ r = {'a': [ 1, 2, 3, 4, 5, 6 ]}
+ self.assertIs(type(p1.as_dict()['a']), ParameterList)
+ self.assertIs(type(p2.as_dict()['a']), ParameterList)
+ p1.merge(p2)
+ self.assertIs(type(p1.as_dict()['a']), ValueList)
+ p1.interpolate()
+ self.assertIs(type(p1.as_dict()['a']), list)
+ self.assertEqual(p1.as_dict(), r)
+
+ def test_merged_interpolated_dict_type(self):
+ p1 = Parameters({'a': { 'one': 1, 'two': 2, 'three': 3 }}, SETTINGS, 'first')
+ p2 = Parameters({'a': { 'four': 4, 'five': 5, 'six': 6 }}, SETTINGS, 'second')
+ r = {'a': { 'one': 1, 'two': 2, 'three': 3, 'four': 4, 'five': 5, 'six': 6}}
+ self.assertIs(type(p1.as_dict()['a']), ParameterDict)
+ self.assertIs(type(p2.as_dict()['a']), ParameterDict)
+ p1.merge(p2)
+ self.assertIs(type(p1.as_dict()['a']), ParameterDict)
+ p1.interpolate()
+ self.assertIs(type(p1.as_dict()['a']), dict)
+ self.assertEqual(p1.as_dict(), r)
+
if __name__ == '__main__':
unittest.main()
diff --git a/reclass/defaults.py b/reclass/defaults.py
index 5dbd94b..1e50c0e 100644
--- a/reclass/defaults.py
+++ b/reclass/defaults.py
@@ -29,6 +29,7 @@
OPT_IGNORE_CLASS_NOTFOUND_WARNING = True
OPT_IGNORE_OVERWRITTEN_MISSING_REFERENCES = True
+OPT_STRICT_CONSTANT_PARAMETERS = True
OPT_ALLOW_SCALAR_OVER_DICT = False
OPT_ALLOW_SCALAR_OVER_LIST = False
@@ -50,6 +51,7 @@
EXPORT_SENTINELS = ('$[', ']')
PARAMETER_INTERPOLATION_DELIMITER = ':'
PARAMETER_DICT_KEY_OVERRIDE_PREFIX = '~'
+PARAMETER_DICT_KEY_CONSTANT_PREFIX = '='
ESCAPE_CHARACTER = '\\'
AUTOMATIC_RECLASS_PARAMETERS = True
diff --git a/reclass/errors.py b/reclass/errors.py
index 800a2f8..0c9d48f 100644
--- a/reclass/errors.py
+++ b/reclass/errors.py
@@ -15,6 +15,7 @@
import traceback
from reclass.defaults import REFERENCE_SENTINELS, EXPORT_SENTINELS
+from reclass.utils.dictpath import DictPath
class ReclassException(Exception):
@@ -140,7 +141,7 @@
def _add_context_and_uri(self):
msg = ''
if self.context:
- msg += ', at %s' % self.context
+ msg += ', at %s' % str(self.context)
if self.uri:
msg += ', in %s' % self.uri
return msg
@@ -208,6 +209,7 @@
msg = 'Cannot resolve {0}'.format(self.reference.join(REFERENCE_SENTINELS)) + self._add_context_and_uri()
return [ msg ]
+
class ResolveErrorList(InterpolationError):
def __init__(self):
super(ResolveErrorList, self).__init__(msg=None)
@@ -254,6 +256,7 @@
def _get_error_message(self):
msg = [ 'Parse error: {0}'.format(self._line.join(EXPORT_SENTINELS)) + self._add_context_and_uri() ]
msg.append('{0} at char {1}'.format(self._err, self._col - 1))
+ return msg
class InfiniteRecursionError(InterpolationError):
@@ -280,6 +283,18 @@
return msg
+class TypeMergeError(InterpolationError):
+
+ def __init__(self, value1, value2, uri):
+ super(TypeMergeError, self).__init__(msg=None, uri=uri, tbFlag=False)
+ self.type1 = value1.item_type_str()
+ self.type2 = value2.item_type_str()
+
+ def _get_error_message(self):
+ msg = [ 'Canot merge {0} over {1}'.format(self.type1, self.type2) + self._add_context_and_uri() ]
+ return msg
+
+
class ExpressionError(InterpolationError):
def __init__(self, msg, rc=posix.EX_DATAERR, tbFlag=True):
@@ -291,6 +306,16 @@
return msg
+class ChangedConstantError(InterpolationError):
+
+ def __init__(self, uri):
+ super(ChangedConstantError, self).__init__(msg=None, uri=uri, tbFlag=False)
+
+ def _get_error_message(self):
+ msg = [ 'Attempt to change constant value' + self._add_context_and_uri() ]
+ return msg
+
+
class MappingError(ReclassException):
def __init__(self, msg, rc=posix.EX_DATAERR):
diff --git a/reclass/settings.py b/reclass/settings.py
index 6e35dd2..51c518f 100644
--- a/reclass/settings.py
+++ b/reclass/settings.py
@@ -23,12 +23,15 @@
self.default_environment = options.get('default_environment', DEFAULT_ENVIRONMENT)
self.delimiter = options.get('delimiter', PARAMETER_INTERPOLATION_DELIMITER)
self.dict_key_override_prefix = options.get('dict_key_override_prefix', PARAMETER_DICT_KEY_OVERRIDE_PREFIX)
+ self.dict_key_constant_prefix = options.get('dict_key_constant_prefix', PARAMETER_DICT_KEY_CONSTANT_PREFIX)
+ self.dict_key_prefixes = [ str(self.dict_key_override_prefix), str(self.dict_key_constant_prefix) ]
self.escape_character = options.get('escape_character', ESCAPE_CHARACTER)
self.export_sentinels = options.get('export_sentinels', EXPORT_SENTINELS)
self.inventory_ignore_failed_node = options.get('inventory_ignore_failed_node', OPT_INVENTORY_IGNORE_FAILED_NODE)
self.inventory_ignore_failed_render = options.get('inventory_ignore_failed_render', OPT_INVENTORY_IGNORE_FAILED_RENDER)
self.reference_sentinels = options.get('reference_sentinels', REFERENCE_SENTINELS)
self.ignore_class_notfound = options.get('ignore_class_notfound', OPT_IGNORE_CLASS_NOTFOUND)
+ self.strict_constant_parameters = options.get('strict_constant_parameters', OPT_STRICT_CONSTANT_PARAMETERS)
self.ignore_class_notfound_regexp = options.get('ignore_class_notfound_regexp', OPT_IGNORE_CLASS_NOTFOUND_REGEXP)
if isinstance(self.ignore_class_notfound_regexp, string_types):
@@ -53,6 +56,7 @@
and self.default_environment == other.default_environment \
and self.delimiter == other.delimiter \
and self.dict_key_override_prefix == other.dict_key_override_prefix \
+ and self.dict_key_constant_prefix == other.dict_key_constant_prefix \
and self.escape_character == other.escape_character \
and self.export_sentinels == other.export_sentinels \
and self.inventory_ignore_failed_node == other.inventory_ignore_failed_node \
@@ -60,7 +64,8 @@
and self.reference_sentinels == other.reference_sentinels \
and self.ignore_class_notfound == other.ignore_class_notfound \
and self.ignore_class_notfound_regexp == other.ignore_class_notfound_regexp \
- and self.ignore_class_notfound_warning == other.ignore_class_notfound_warning
+ and self.ignore_class_notfound_warning == other.ignore_class_notfound_warning \
+ and self.strict_constant_parameters == other.strict_constant_parameters
def __copy__(self):
cls = self.__class__
diff --git a/reclass/utils/dictpath.py b/reclass/utils/dictpath.py
index 39b9572..32831cf 100644
--- a/reclass/utils/dictpath.py
+++ b/reclass/utils/dictpath.py
@@ -61,17 +61,17 @@
def __init__(self, delim, contents=None):
self._delim = delim
+
if contents is None:
self._parts = []
+ elif isinstance(contents, list):
+ self._parts = contents
+ elif isinstance(contents, six.string_types):
+ self._parts = self._split_string(contents)
+ elif isinstance(contents, tuple):
+ self._parts = list(contents)
else:
- if isinstance(contents, list):
- self._parts = contents
- elif isinstance(contents, six.string_types):
- self._parts = self._split_string(contents)
- elif isinstance(contents, tuple):
- self._parts = list(contents)
- else:
- raise TypeError('DictPath() takes string or list, '\
+ raise TypeError('DictPath() takes string or list, '\
'not %s' % type(contents))
def __repr__(self):
@@ -148,6 +148,9 @@
def add_subpath(self, key):
self._parts.append(key)
+ def add_ancestor(self, key):
+ self._parts.insert(0, key)
+
def is_ancestor_of(self, other):
if len(other._parts) <= len(self._parts):
return False
diff --git a/reclass/utils/parameterdict.py b/reclass/utils/parameterdict.py
new file mode 100644
index 0000000..6319a0b
--- /dev/null
+++ b/reclass/utils/parameterdict.py
@@ -0,0 +1,12 @@
+class ParameterDict(dict):
+ def __init__(self, *args, **kwargs):
+ self._uri = kwargs.pop('uri', None)
+ dict.__init__(self, *args, **kwargs)
+
+ @property
+ def uri(self):
+ return self._uri
+
+ @uri.setter
+ def uri(self, uri):
+ self._uri = uri
diff --git a/reclass/utils/parameterlist.py b/reclass/utils/parameterlist.py
new file mode 100644
index 0000000..f2473df
--- /dev/null
+++ b/reclass/utils/parameterlist.py
@@ -0,0 +1,12 @@
+class ParameterList(list):
+ def __init__(self, *args, **kwargs):
+ self._uri = kwargs.pop('uri', None)
+ list.__init__(self, *args, **kwargs)
+
+ @property
+ def uri(self):
+ return self._uri
+
+ @uri.setter
+ def uri(self, uri):
+ self._uri = uri
diff --git a/reclass/values/compitem.py b/reclass/values/compitem.py
index 7928e6f..183bc43 100644
--- a/reclass/values/compitem.py
+++ b/reclass/values/compitem.py
@@ -46,17 +46,7 @@
def merge_over(self, item):
if item.type == Item.SCALAR or item.type == Item.COMPOSITE:
return self
- elif item.type == Item.LIST:
- if self._settings.allow_scalar_over_list or (self._settings.allow_none_override and self._value in [None, 'none', 'None']):
- return self
- else:
- raise TypeError('allow scalar over list = False: cannot merge %s over %s' % (repr(self), repr(item)))
- elif item.type == Item.DICTIONARY:
- if self._settings.allow_scalar_over_dict or (self._settings.allow_none_override and self._value in [None, 'none', 'None']):
- return self
- else:
- raise TypeError('allow scalar over dict = False: cannot merge %s over %s' % (repr(self), repr(item)))
- raise TypeError('Cannot merge %s over %s' % (repr(self), repr(item)))
+ raise RuntimeError('Trying to merge %s over %s' % (repr(self), repr(item)))
def render(self, context, inventory):
# Preserve type if only one item
diff --git a/reclass/values/dictitem.py b/reclass/values/dictitem.py
index 76cefe2..d5272b9 100644
--- a/reclass/values/dictitem.py
+++ b/reclass/values/dictitem.py
@@ -24,14 +24,6 @@
def is_container(self):
return True
- def merge_over(self, item):
- if item.type == Item.SCALAR:
- if item.contents() is None or self._settings.allow_dict_over_scalar:
- return self
- else:
- raise TypeError('allow dict over scalar = False: cannot merge %s onto %s' % (repr(self), repr(item)))
- raise TypeError('Cannot merge %s over %s' % (repr(self), repr(item)))
-
def render(self, context, inventory):
return self._dict
diff --git a/reclass/values/item.py b/reclass/values/item.py
index bc507f4..cad3684 100644
--- a/reclass/values/item.py
+++ b/reclass/values/item.py
@@ -19,6 +19,10 @@
REFERENCE = 5
SCALAR = 6
+ TYPE_STR = { COMPOSITE: 'composite', DICTIONARY: 'dictionary',
+ INV_QUERY: 'invventory query', LIST: 'list',
+ REFERENCE: 'reference', SCALAR: 'scalar' }
+
def allRefs(self):
return True
@@ -45,3 +49,6 @@
def render(self, context, exports):
msg = "Item class {0} does not implement render()"
raise NotImplementedError(msg.format(self.__class__.__name__))
+
+ def type_str(self):
+ return self.TYPE_STR[self.type]
diff --git a/reclass/values/listitem.py b/reclass/values/listitem.py
index 8f1a21d..41c02dd 100644
--- a/reclass/values/listitem.py
+++ b/reclass/values/listitem.py
@@ -31,15 +31,7 @@
if item.type == Item.LIST:
item._list.extend(self._list)
return item
- elif item.type == Item.SCALAR:
- if item.contents() is None:
- return self
- elif self._settings.allow_list_over_scalar:
- self._list.insert(0, item.contents())
- return self
- else:
- raise TypeError('allow list over scalar = False: cannot merge %s onto %s' % (repr(self), repr(item)))
- raise TypeError('Cannot merge %s over %s' % (repr(self), repr(item)))
+ raise RuntimeError('Trying to merge %s over %s' % (repr(self), repr(item)))
def __repr__(self):
return 'ListItem(%r)' % (self._list)
diff --git a/reclass/values/scaitem.py b/reclass/values/scaitem.py
index f3057cb..c16ab45 100644
--- a/reclass/values/scaitem.py
+++ b/reclass/values/scaitem.py
@@ -24,17 +24,7 @@
def merge_over(self, item):
if item.type == Item.SCALAR or item.type == Item.COMPOSITE:
return self
- elif item.type == Item.LIST:
- if self._settings.allow_scalar_over_list or (self._settings.allow_none_override and self._value is None):
- return self
- else:
- raise TypeError('allow scalar over list = False: cannot merge %s over %s' % (repr(self), repr(item)))
- elif item.type == Item.DICTIONARY:
- if self._settings.allow_scalar_over_dict or (self._settings.allow_none_override and self._value is None):
- return self
- else:
- raise TypeError('allow scalar over dict = False: cannot merge %s over %s' % (repr(self), repr(item)))
- raise TypeError('Cannot merge %s over %s' % (repr(self), repr(item)))
+ raise RuntimeError('Trying to merge %s over %s' % (repr(self), repr(item)))
def render(self, context, inventory):
return self._value
diff --git a/reclass/values/value.py b/reclass/values/value.py
index f87a9b4..4e86274 100644
--- a/reclass/values/value.py
+++ b/reclass/values/value.py
@@ -24,6 +24,7 @@
self._settings = settings
self._uri = uri
self._overwrite = False
+ self._constant = False
if isinstance(value, string_types):
if parse_string:
try:
@@ -48,9 +49,24 @@
def overwrite(self, overwrite):
self._overwrite = overwrite
+ @property
+ def constant(self):
+ return self._constant
+
+ @constant.setter
+ def constant(self, constant):
+ self._constant = constant
+
+ @property
def uri(self):
return self._uri
+ def item_type(self):
+ return self._item.type
+
+ def item_type_str(self):
+ return self._item.type_str()
+
def is_container(self):
return self._item.is_container()
diff --git a/reclass/values/valuelist.py b/reclass/values/valuelist.py
index 8b8dd51..9c1e1fa 100644
--- a/reclass/values/valuelist.py
+++ b/reclass/values/valuelist.py
@@ -13,7 +13,9 @@
import copy
import sys
-from reclass.errors import ResolveError
+from reclass.errors import ChangedConstantError, ResolveError, TypeMergeError
+
+
class ValueList(object):
@@ -25,8 +27,13 @@
self._inv_refs = []
self._has_inv_query = False
self._ignore_failed_render = False
+ self._is_complex = False
self._update()
+ @property
+ def uri(self):
+ return '; '.join([ str(x.uri) for x in self._values ])
+
def append(self, value):
self._values.append(value)
self._update()
@@ -38,9 +45,11 @@
def _update(self):
self.assembleRefs()
self._check_for_inv_query()
-
- def uri(self):
- return '; '.join([ x.uri() for x in self._values ])
+ self._is_complex = False
+ item_type = self._values[0].item_type()
+ for v in self._values:
+ if v.is_complex() or v.constant or v.overwrite or v.item_type() != item_type:
+ self._is_complex = True
def has_references(self):
return len(self._refs) > 0
@@ -52,7 +61,7 @@
return self._inv_refs
def is_complex(self):
- return (self.has_references() | self.has_inv_query())
+ return self._is_complex
def get_references(self):
return self._refs
@@ -100,10 +109,13 @@
output = None
deepCopied = False
last_error = None
+ constant = False
for n, value in enumerate(self._values):
try:
new = value.render(context, inventory)
except ResolveError as e:
+ # only ignore failed renders if ignore_overwritten_missing_references is set and we are dealing with a scalar value
+ # and it's not the last item in the values list
if self._settings.ignore_overwritten_missing_references and not isinstance(output, (dict, list)) and n != (len(self._values)-1):
new = None
last_error = e
@@ -111,27 +123,64 @@
else:
raise e
+ if constant:
+ if self._settings.strict_constant_parameters:
+ raise ChangedConstantError('{0}; {1}'.format(self._values[n-1].uri, self._values[n].uri))
+ else:
+ continue
+
if output is None or value.overwrite:
output = new
deepCopied = False
else:
- if isinstance(output, dict) and isinstance(new, dict):
- p1 = Parameters(output, self._settings, None, parse_strings=False)
- p2 = Parameters(new, self._settings, None, parse_strings=False)
- p1.merge(p2)
- output = p1.as_dict()
- continue
- elif isinstance(output, list) and isinstance(new, list):
- if not deepCopied:
- output = copy.deepcopy(output)
- deepCopied = True
- output.extend(new)
- continue
- elif isinstance(output, (dict, list)) or isinstance(new, (dict, list)):
- raise TypeError('Cannot merge %s over %s' % (repr(self._values[n]), repr(self._values[n-1])))
+ if isinstance(output, dict):
+ if isinstance(new, dict):
+ p1 = Parameters(output, self._settings, None, parse_strings=False)
+ p2 = Parameters(new, self._settings, None, parse_strings=False)
+ p1.merge(p2)
+ output = p1.as_dict()
+ elif isinstance(new, list):
+ raise TypeMergeError(self._values[n], self._values[n-1], self.uri)
+ elif self._settings.allow_scalar_over_dict or (self._settings.allow_none_override and new is None):
+ output = new
+ deepCopied = False
+ else:
+ raise TypeMergeError(self._values[n], self._values[n-1], self.uri)
+ elif isinstance(output, list):
+ if isinstance(new, list):
+ if not deepCopied:
+ output = copy.deepcopy(output)
+ deepCopied = True
+ output.extend(new)
+ elif isinstance(new, dict):
+ raise TypeMergeError(self._values[n], self._values[n-1], self.uri)
+ elif self._settings.allow_scalar_over_list or (self._settings.allow_none_override and new is None):
+ output = new
+ deepCopied = False
+ else:
+ raise TypeMergeError(self._values[n], self._values[n-1], self.uri)
else:
- output = new
- deepCopied = False
+ if isinstance(new, dict):
+ if self._settings.allow_dict_over_scalar:
+ output = new
+ deepCopied = False
+ else:
+ raise TypeMergeError(self._values[n], self._values[n-1], self.uri)
+ elif isinstance(new, list):
+ if self._settings.allow_list_over_scalar:
+ output_list = list()
+ output_list.append(output)
+ output_list.extend(new)
+ output = output_list
+ deepCopied = True
+ else:
+ raise TypeMergeError(self._values[n], self._values[n-1], self.uri)
+ else:
+ output = new
+ deepCopied = False
+
+ if value.constant:
+ constant = True
if isinstance(output, (dict, list)) and last_error is not None:
raise last_error
diff --git a/reclass/version.py b/reclass/version.py
index ccf6e96..ee7098f 100644
--- a/reclass/version.py
+++ b/reclass/version.py
@@ -13,7 +13,7 @@
RECLASS_NAME = 'reclass'
DESCRIPTION = 'merge data by recursive descent down an ancestry hierarchy (forked extended version)'
-VERSION = '1.5.4'
+VERSION = '1.5.5'
AUTHOR = 'martin f. krafft / Andrew Pickford / salt-formulas community'
AUTHOR_EMAIL = 'salt-formulas@freelists.org'
MAINTAINER = 'salt-formulas community'