Add test case for '..'
diff --git a/Pipfile b/Pipfile
index fc2022b..e7b12a9 100644
--- a/Pipfile
+++ b/Pipfile
@@ -9,7 +9,6 @@
pyparsing = "*"
PyYAML = "*"
six = "*"
-pyyaml = "*"
enum34 = "*"
# FIXME, issues with compile phase
#"pygit2" = "*"
diff --git a/README-extensions.rst b/README-extensions.rst
index 6693256..22991c4 100644
--- a/README-extensions.rst
+++ b/README-extensions.rst
@@ -340,7 +340,7 @@
--------------------------------
Load referenced class from a relative location to the current class.
-To load class from relative location start the class uri with "." char.
+To load class from relative location start the class uri with "." or ".." char.
The only supported reference is to nested tree structure below the current class.
You are allowed to use syntax for relative uri to required class on any place on your model (first class loaded, init.yml, regular class .yml).
@@ -350,7 +350,7 @@
It's a new feature use it with care and mind that using "relative syntax" lower traceability of
your pillar composition.
-Example usage of relative class name:
+Example usage of relative class name using '.' and '..':
.. code-block:: yaml
@@ -366,6 +366,12 @@
classes:
- .defaults
+.. code-block:: yaml
+
+ #/etc/reclass/classes/component/configuration/init.yml
+ classes:
+ - ..defaults
+
Inventory Queries
-----------------
diff --git a/reclass/tests/data/02/classes/four.yml b/reclass/tests/data/02/classes/four.yml
index e5aec4c..1f9873c 100644
--- a/reclass/tests/data/02/classes/four.yml
+++ b/reclass/tests/data/02/classes/four.yml
@@ -1,2 +1,2 @@
parameters:
- four_alpha: 3
\ No newline at end of file
+ four_alpha: 3
diff --git a/reclass/tests/data/02/classes/one/alpha.yml b/reclass/tests/data/02/classes/one/alpha.yml
index 7b29825..7f7d0a0 100644
--- a/reclass/tests/data/02/classes/one/alpha.yml
+++ b/reclass/tests/data/02/classes/one/alpha.yml
@@ -2,7 +2,7 @@
- .beta
- two.beta
- ..four
-- ..two.delta
+- ..two.gamma
parameters:
test1: ${one_beta}
diff --git a/reclass/tests/test_core.py b/reclass/tests/test_core.py
index 2489da9..8f28f7a 100644
--- a/reclass/tests/test_core.py
+++ b/reclass/tests/test_core.py
@@ -62,13 +62,15 @@
def test_relative_class_names(self):
reclass = self._core('02')
node = reclass.nodeinfo('relative')
- params = { 'test1': 1, 'test2': 2, 'one_beta': 1, 'two_beta': 2, '_reclass_': { 'environment': 'base', 'name': { 'full': 'relative', 'short': 'relative' } } }
+ params = { 'test1': 1, 'test2': 2, 'test3': 3, 'test4': 4, 'one_beta': 1, 'two_beta': 2, 'four_alpha': 3, 'two_gamma': 4, '_reclass_': { 'environment': 'base', 'name': { 'full': 'relative', 'short': 'relative' } } }
+ self.maxDiff = None
self.assertEqual(node['parameters'], params)
def test_top_relative_class_names(self):
reclass = self._core('02')
node = reclass.nodeinfo('top_relative')
- params = { 'test1': 1, 'test2': 2, 'test3': 3, 'test4': 4, 'one_beta': 1, 'two_beta': 2, 'four_aplha': 3, 'two_gamma': 4, '_reclass_': { 'environment': 'base', 'name': { 'full': 'top_relative', 'short': 'top_relative' } } }
+ params = { 'test1': 1, 'test2': 2, 'test3': 3, 'test4': 4, 'one_beta': 1, 'two_beta': 2, 'four_alpha': 3, 'two_gamma': 4, '_reclass_': { 'environment': 'base', 'name': { 'full': 'top_relative', 'short': 'top_relative' } } }
+ self.maxDiff = None
self.assertEqual(node['parameters'], params)
def test_compose_node_names(self):