diff --git a/tests/results/test_namespace/00_2default_calculated.json b/tests/results/test_namespace/00_2default_calculated.json index 1d8d13c..5fd7164 100644 --- a/tests/results/test_namespace/00_2default_calculated.json +++ b/tests/results/test_namespace/00_2default_calculated.json @@ -4,22 +4,18 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var1": "string1", + "var1": "no", "var2": [ - "string1", - "string2", - "string3" + "no" ] } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var1": "string1", + "var1": "no", "var2": [ - "string1", - "string2", - "string3" + "no" ] } } diff --git a/tests/results/test_namespace/00_2default_calculated_multi.json b/tests/results/test_namespace/00_2default_calculated_multi.json index 0fcd3f4..5b3bb9b 100644 --- a/tests/results/test_namespace/00_2default_calculated_multi.json +++ b/tests/results/test_namespace/00_2default_calculated_multi.json @@ -5,14 +5,14 @@ "ansible_host": "group1.net", "rougail": { "var1": [ - "string1", - "string2", - "string3" + "no", + "yes", + "maybe" ], "var2": [ - "string1", - "string2", - "string3" + "no", + "yes", + "maybe" ] } }, @@ -20,14 +20,14 @@ "ansible_host": "group2.net", "rougail": { "var1": [ - "string1", - "string2", - "string3" + "no", + "yes", + "maybe" ], "var2": [ - "string1", - "string2", - "string3" + "no", + "yes", + "maybe" ] } } diff --git a/tests/results/test_namespace/00_5load_notype.json b/tests/results/test_namespace/00_5load_notype.json index 57b9b0d..202945b 100644 --- a/tests/results/test_namespace/00_5load_notype.json +++ b/tests/results/test_namespace/00_5load_notype.json @@ -4,13 +4,13 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "without_type": "string1" + "without_type": "non" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "without_type": "string1" + "without_type": "non" } } } diff --git a/tests/results/test_namespace/00_6boolean.json b/tests/results/test_namespace/00_6boolean.json index 422b40f..fad18f0 100644 --- a/tests/results/test_namespace/00_6boolean.json +++ b/tests/results/test_namespace/00_6boolean.json @@ -7,9 +7,9 @@ "var1": true, "var2": true, "var3": true, - "var4": true, - "var5": true, - "var6": true + "var4": false, + "var5": false, + "var6": false } }, "GROUP2_01": { @@ -18,9 +18,9 @@ "var1": true, "var2": true, "var3": true, - "var4": true, - "var5": true, - "var6": true + "var4": false, + "var5": false, + "var6": false } } } diff --git a/tests/results/test_namespace/00_6choice.json b/tests/results/test_namespace/00_6choice.json index 0a5a42a..f5f72b9 100644 --- a/tests/results/test_namespace/00_6choice.json +++ b/tests/results/test_namespace/00_6choice.json @@ -6,7 +6,7 @@ "rougail": { "var1": "a", "var2": "a", - "var3": "a", + "var3": null, "var4": null, "var5": "a", "var6": 1 @@ -17,7 +17,7 @@ "rougail": { "var1": "a", "var2": "a", - "var3": "a", + "var3": null, "var4": null, "var5": "a", "var6": 1 diff --git a/tests/results/test_namespace/00_6choice_calculation.json b/tests/results/test_namespace/00_6choice_calculation.json index 0d4a4ef..be45c9a 100644 --- a/tests/results/test_namespace/00_6choice_calculation.json +++ b/tests/results/test_namespace/00_6choice_calculation.json @@ -4,13 +4,13 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var": 0 + "var": 9 } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var": 0 + "var": 9 } } } diff --git a/tests/results/test_namespace/00_6choice_variable.json b/tests/results/test_namespace/00_6choice_variable.json index 5a079a5..2b9a473 100644 --- a/tests/results/test_namespace/00_6choice_variable.json +++ b/tests/results/test_namespace/00_6choice_variable.json @@ -5,22 +5,22 @@ "ansible_host": "group1.net", "rougail": { "var1": [ - "string1", - "string2", - "string3" + "a", + "b", + "c" ], - "var2": "string1" + "var2": "a" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { "var1": [ - "string1", - "string2", - "string3" + "a", + "b", + "c" ], - "var2": "string1" + "var2": "a" } } } diff --git a/tests/results/test_namespace/00_6choice_variable_link.json b/tests/results/test_namespace/00_6choice_variable_link.json index 53f88c9..681933b 100644 --- a/tests/results/test_namespace/00_6choice_variable_link.json +++ b/tests/results/test_namespace/00_6choice_variable_link.json @@ -5,24 +5,24 @@ "ansible_host": "group1.net", "rougail": { "var1": [ - "string1", - "string2", - "string3" + "a", + "b", + "c" ], - "var2": "string1", - "var3": "string1" + "var2": "a", + "var3": "a" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { "var1": [ - "string1", - "string2", - "string3" + "a", + "b", + "c" ], - "var2": "string1", - "var3": "string1" + "var2": "a", + "var3": "a" } } } diff --git a/tests/results/test_namespace/00_6choice_variable_link2.json b/tests/results/test_namespace/00_6choice_variable_link2.json index 843bddd..0a79b6d 100644 --- a/tests/results/test_namespace/00_6choice_variable_link2.json +++ b/tests/results/test_namespace/00_6choice_variable_link2.json @@ -5,13 +5,13 @@ "ansible_host": "group1.net", "rougail": { "var1": [ - "string1", - "string2", - "string3" + "a", + "b", + "c" ], - "var2": "string1", + "var2": "a", "family": { - "var3": "string1" + "var3": "a" } } }, @@ -19,13 +19,13 @@ "ansible_host": "group2.net", "rougail": { "var1": [ - "string1", - "string2", - "string3" + "a", + "b", + "c" ], - "var2": "string1", + "var2": "a", "family": { - "var3": "string1" + "var3": "a" } } } diff --git a/tests/results/test_namespace/00_6custom.json b/tests/results/test_namespace/00_6custom.json index 20aa2c9..b366db8 100644 --- a/tests/results/test_namespace/00_6custom.json +++ b/tests/results/test_namespace/00_6custom.json @@ -5,14 +5,14 @@ "ansible_host": "group1.net", "rougail": { "custom1": "string1", - "custom2": "string1" + "custom2": "value" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { "custom1": "string1", - "custom2": "string1" + "custom2": "value" } } } diff --git a/tests/results/test_namespace/00_6domainname.json b/tests/results/test_namespace/00_6domainname.json index b2e4e51..cee6f24 100644 --- a/tests/results/test_namespace/00_6domainname.json +++ b/tests/results/test_namespace/00_6domainname.json @@ -4,13 +4,13 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "variable": "domain1.lan" + "variable": "my.domain.name" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "variable": "domain1.lan" + "variable": "my.domain.name" } } } diff --git a/tests/results/test_namespace/00_6domainname_params.json b/tests/results/test_namespace/00_6domainname_params.json index b2e4e51..cee6f24 100644 --- a/tests/results/test_namespace/00_6domainname_params.json +++ b/tests/results/test_namespace/00_6domainname_params.json @@ -4,13 +4,13 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "variable": "domain1.lan" + "variable": "my.domain.name" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "variable": "domain1.lan" + "variable": "my.domain.name" } } } diff --git a/tests/results/test_namespace/00_6float.json b/tests/results/test_namespace/00_6float.json index 95904bf..7d45c2c 100644 --- a/tests/results/test_namespace/00_6float.json +++ b/tests/results/test_namespace/00_6float.json @@ -4,23 +4,23 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var1": 1.1, - "var2": 1.1, - "var3": 1.1, - "var4": 1.1, - "var5": 1.1, - "var6": 1.1 + "var1": 0.0, + "var2": 0.0, + "var3": 0.0, + "var4": 10.1, + "var5": 10.1, + "var6": 10.1 } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var1": 1.1, - "var2": 1.1, - "var3": 1.1, - "var4": 1.1, - "var5": 1.1, - "var6": 1.1 + "var1": 0.0, + "var2": 0.0, + "var3": 0.0, + "var4": 10.1, + "var5": 10.1, + "var6": 10.1 } } } diff --git a/tests/results/test_namespace/00_6number.json b/tests/results/test_namespace/00_6number.json index 5689989..f3e9f25 100644 --- a/tests/results/test_namespace/00_6number.json +++ b/tests/results/test_namespace/00_6number.json @@ -4,23 +4,23 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var1": 1, - "var2": 1, - "var3": 1, - "var4": 1, - "var5": 1, - "var6": 1 + "var1": 0, + "var2": 0, + "var3": 0, + "var4": 10, + "var5": 10, + "var6": 10 } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var1": 1, - "var2": 1, - "var3": 1, - "var4": 1, - "var5": 1, - "var6": 1 + "var1": 0, + "var2": 0, + "var3": 0, + "var4": 10, + "var5": 10, + "var6": 10 } } } diff --git a/tests/results/test_namespace/00_6port.json b/tests/results/test_namespace/00_6port.json index 4393e8c..a497c72 100644 --- a/tests/results/test_namespace/00_6port.json +++ b/tests/results/test_namespace/00_6port.json @@ -5,16 +5,16 @@ "ansible_host": "group1.net", "rougail": { "variable1": "80", - "variable2": "80", - "variable3": "80" + "variable2": "8080", + "variable3": "8080" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { "variable1": "80", - "variable2": "80", - "variable3": "80" + "variable2": "8080", + "variable3": "8080" } } } diff --git a/tests/results/test_namespace/00_6regexp.json b/tests/results/test_namespace/00_6regexp.json index 0ab8e42..27dc7f8 100644 --- a/tests/results/test_namespace/00_6regexp.json +++ b/tests/results/test_namespace/00_6regexp.json @@ -4,13 +4,13 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var": "#b1b1b1" + "var": "#a1a1a1" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var": "#b1b1b1" + "var": "#a1a1a1" } } } diff --git a/tests/results/test_namespace/00_6regexp_link.json b/tests/results/test_namespace/00_6regexp_link.json index 382074a..a22a68a 100644 --- a/tests/results/test_namespace/00_6regexp_link.json +++ b/tests/results/test_namespace/00_6regexp_link.json @@ -4,15 +4,15 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var1": "#b1b1b1", - "var2": "#b2b1b1" + "var1": "#a1a1a1", + "var2": "#a1a1a1" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var1": "#b1b1b1", - "var2": "#b2b1b1" + "var1": "#a1a1a1", + "var2": "#a1a1a1" } } } diff --git a/tests/results/test_namespace/00_6secret.json b/tests/results/test_namespace/00_6secret.json index 5d67335..4ca329d 100644 --- a/tests/results/test_namespace/00_6secret.json +++ b/tests/results/test_namespace/00_6secret.json @@ -5,14 +5,14 @@ "ansible_host": "group1.net", "rougail": { "secret1": "onE7vaLues_len1", - "secret2": "onE7vaLues_len1" + "secret2": "value" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { "secret1": "onE7vaLues_len1", - "secret2": "onE7vaLues_len1" + "secret2": "value" } } } diff --git a/tests/results/test_namespace/00_6secret_param.json b/tests/results/test_namespace/00_6secret_param.json index 31a54ac..8107417 100644 --- a/tests/results/test_namespace/00_6secret_param.json +++ b/tests/results/test_namespace/00_6secret_param.json @@ -5,16 +5,16 @@ "ansible_host": "group1.net", "rougail": { "secret1": "onE7vaLues_len1", - "secret2": "onE7vaLues", - "secret3": "onE7vaLues" + "secret2": "value", + "secret3": "value" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { "secret1": "onE7vaLues_len1", - "secret2": "onE7vaLues", - "secret3": "onE7vaLues" + "secret2": "value", + "secret3": "value" } } } diff --git a/tests/results/test_namespace/00_6string.json b/tests/results/test_namespace/00_6string.json index 5574fee..3d409c6 100644 --- a/tests/results/test_namespace/00_6string.json +++ b/tests/results/test_namespace/00_6string.json @@ -7,9 +7,9 @@ "var1": "string1", "var2": "string1", "var3": "string1", - "var4": "string1", - "var5": "string1", - "var6": "string1" + "var4": "value", + "var5": "value", + "var6": "value" } }, "GROUP2_01": { @@ -18,9 +18,9 @@ "var1": "string1", "var2": "string1", "var3": "string1", - "var4": "string1", - "var5": "string1", - "var6": "string1" + "var4": "value", + "var5": "value", + "var6": "value" } } } diff --git a/tests/results/test_namespace/00_7value_doublequote.json b/tests/results/test_namespace/00_7value_doublequote.json index 50c4849..421c714 100644 --- a/tests/results/test_namespace/00_7value_doublequote.json +++ b/tests/results/test_namespace/00_7value_doublequote.json @@ -4,13 +4,13 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "variable": "string1" + "variable": "quote\"" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "variable": "string1" + "variable": "quote\"" } } } diff --git a/tests/results/test_namespace/00_7value_doublequote2.json b/tests/results/test_namespace/00_7value_doublequote2.json index 50c4849..4a3ba74 100644 --- a/tests/results/test_namespace/00_7value_doublequote2.json +++ b/tests/results/test_namespace/00_7value_doublequote2.json @@ -4,13 +4,13 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "variable": "string1" + "variable": "quote'\"" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "variable": "string1" + "variable": "quote'\"" } } } diff --git a/tests/results/test_namespace/00_7value_doublequote3.json b/tests/results/test_namespace/00_7value_doublequote3.json index 50c4849..e2dcbeb 100644 --- a/tests/results/test_namespace/00_7value_doublequote3.json +++ b/tests/results/test_namespace/00_7value_doublequote3.json @@ -4,13 +4,13 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "variable": "string1" + "variable": "quote\\\"\\'" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "variable": "string1" + "variable": "quote\\\"\\'" } } } diff --git a/tests/results/test_namespace/00_7value_quote.json b/tests/results/test_namespace/00_7value_quote.json index 50c4849..050c77f 100644 --- a/tests/results/test_namespace/00_7value_quote.json +++ b/tests/results/test_namespace/00_7value_quote.json @@ -4,13 +4,13 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "variable": "string1" + "variable": "quote'" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "variable": "string1" + "variable": "quote'" } } } diff --git a/tests/results/test_namespace/00_8calculation_namespace.json b/tests/results/test_namespace/00_8calculation_namespace.json index 50c4849..68728de 100644 --- a/tests/results/test_namespace/00_8calculation_namespace.json +++ b/tests/results/test_namespace/00_8calculation_namespace.json @@ -4,13 +4,13 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "variable": "string1" + "variable": "Rougail" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "variable": "string1" + "variable": "Rougail" } } } diff --git a/tests/results/test_namespace/00_8calculation_param_namespace.json b/tests/results/test_namespace/00_8calculation_param_namespace.json index 50c4849..68728de 100644 --- a/tests/results/test_namespace/00_8calculation_param_namespace.json +++ b/tests/results/test_namespace/00_8calculation_param_namespace.json @@ -4,13 +4,13 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "variable": "string1" + "variable": "Rougail" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "variable": "string1" + "variable": "Rougail" } } } diff --git a/tests/results/test_namespace/00_8test.json b/tests/results/test_namespace/00_8test.json index f3a22b5..c5b998e 100644 --- a/tests/results/test_namespace/00_8test.json +++ b/tests/results/test_namespace/00_8test.json @@ -5,10 +5,10 @@ "ansible_host": "group1.net", "rougail": { "var1": "test", - "var2": "test", + "var2": "value", "var3": "test1", "var4": null, - "var5": false, + "var5": true, "var6": [ "test1", "test2" @@ -19,10 +19,10 @@ "ansible_host": "group2.net", "rougail": { "var1": "test", - "var2": "test", + "var2": "value", "var3": "test1", "var4": null, - "var5": false, + "var5": true, "var6": [ "test1", "test2" diff --git a/tests/results/test_namespace/00_9choice_variable_multi.json b/tests/results/test_namespace/00_9choice_variable_multi.json index 45040ac..6044caf 100644 --- a/tests/results/test_namespace/00_9choice_variable_multi.json +++ b/tests/results/test_namespace/00_9choice_variable_multi.json @@ -8,10 +8,7 @@ "val1", "val2" ], - "variable2": [ - "val1", - "val2" - ] + "variable2": [] } }, "GROUP2_01": { @@ -21,10 +18,7 @@ "val1", "val2" ], - "variable2": [ - "val1", - "val2" - ] + "variable2": [] } } } diff --git a/tests/results/test_namespace/00_9choice_variables.json b/tests/results/test_namespace/00_9choice_variables.json index d46e366..740b5eb 100644 --- a/tests/results/test_namespace/00_9choice_variables.json +++ b/tests/results/test_namespace/00_9choice_variables.json @@ -4,17 +4,17 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "source_variable_1": "string1", - "source_variable_2": "string1", - "my_variable": "string1" + "source_variable_1": "val1", + "source_variable_2": "val2", + "my_variable": "val1" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "source_variable_1": "string1", - "source_variable_2": "string1", - "my_variable": "string1" + "source_variable_1": "val1", + "source_variable_2": "val2", + "my_variable": "val1" } } } diff --git a/tests/results/test_namespace/00_9default_calculation.json b/tests/results/test_namespace/00_9default_calculation.json index 50c4849..a24fd85 100644 --- a/tests/results/test_namespace/00_9default_calculation.json +++ b/tests/results/test_namespace/00_9default_calculation.json @@ -4,13 +4,13 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "variable": "string1" + "variable": "string_1_True_None" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "variable": "string1" + "variable": "string_1_True_None" } } } diff --git a/tests/results/test_namespace/00_9default_calculation_multi_optional.json b/tests/results/test_namespace/00_9default_calculation_multi_optional.json index 9453174..34adb2c 100644 --- a/tests/results/test_namespace/00_9default_calculation_multi_optional.json +++ b/tests/results/test_namespace/00_9default_calculation_multi_optional.json @@ -4,22 +4,18 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "my_variable": "string1", + "my_variable": "val1", "my_calculated_variable": [ - "string1", - "string2", - "string3" + "val1" ] } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "my_variable": "string1", + "my_variable": "val1", "my_calculated_variable": [ - "string1", - "string2", - "string3" + "val1" ] } } diff --git a/tests/results/test_namespace/00_9default_calculation_multi_optional2.json b/tests/results/test_namespace/00_9default_calculation_multi_optional2.json index 9453174..34adb2c 100644 --- a/tests/results/test_namespace/00_9default_calculation_multi_optional2.json +++ b/tests/results/test_namespace/00_9default_calculation_multi_optional2.json @@ -4,22 +4,18 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "my_variable": "string1", + "my_variable": "val1", "my_calculated_variable": [ - "string1", - "string2", - "string3" + "val1" ] } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "my_variable": "string1", + "my_variable": "val1", "my_calculated_variable": [ - "string1", - "string2", - "string3" + "val1" ] } } diff --git a/tests/results/test_namespace/00_9default_calculation_optional_exists.json b/tests/results/test_namespace/00_9default_calculation_optional_exists.json index 0f6f879..29b26d4 100644 --- a/tests/results/test_namespace/00_9default_calculation_optional_exists.json +++ b/tests/results/test_namespace/00_9default_calculation_optional_exists.json @@ -5,14 +5,12 @@ "ansible_host": "group1.net", "rougail": { "my_variable": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], "my_calculated_variable": [ - "string1", - "string2", - "string3" + "val1", + "val2" ] } }, @@ -20,14 +18,12 @@ "ansible_host": "group2.net", "rougail": { "my_variable": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], "my_calculated_variable": [ - "string1", - "string2", - "string3" + "val1", + "val2" ] } } diff --git a/tests/results/test_namespace/00_9default_calculation_param_optional.json b/tests/results/test_namespace/00_9default_calculation_param_optional.json index 54c12a1..5acfc36 100644 --- a/tests/results/test_namespace/00_9default_calculation_param_optional.json +++ b/tests/results/test_namespace/00_9default_calculation_param_optional.json @@ -4,15 +4,15 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var1": "string1", - "var2": "string1" + "var1": "no", + "var2": "no" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var1": "string1", - "var2": "string1" + "var1": "no", + "var2": "no" } } } diff --git a/tests/results/test_namespace/00_9default_integer.json b/tests/results/test_namespace/00_9default_integer.json index 0d4a4ef..be45c9a 100644 --- a/tests/results/test_namespace/00_9default_integer.json +++ b/tests/results/test_namespace/00_9default_integer.json @@ -4,13 +4,13 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var": 0 + "var": 9 } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var": 0 + "var": 9 } } } diff --git a/tests/results/test_namespace/00_9extra.json b/tests/results/test_namespace/00_9extra.json index 5b635e7..bdb014f 100644 --- a/tests/results/test_namespace/00_9extra.json +++ b/tests/results/test_namespace/00_9extra.json @@ -4,19 +4,19 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "variable": "string1" + "variable": "rougail" }, "extra": { - "variable": "string1" + "variable": "no" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "variable": "string1" + "variable": "rougail" }, "extra": { - "variable": "string1" + "variable": "no" } } } diff --git a/tests/results/test_namespace/00_9extra_calculation.json b/tests/results/test_namespace/00_9extra_calculation.json index def7eae..4ead254 100644 --- a/tests/results/test_namespace/00_9extra_calculation.json +++ b/tests/results/test_namespace/00_9extra_calculation.json @@ -4,23 +4,23 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "variable": "string1" + "variable": "value" }, "extra": { - "variable1": "string1", - "variable2": "string1", - "variable3": "string1" + "variable1": "value", + "variable2": "value", + "variable3": "value" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "variable": "string1" + "variable": "value" }, "extra": { - "variable1": "string1", - "variable2": "string1", - "variable3": "string1" + "variable1": "value", + "variable2": "value", + "variable3": "value" } } } diff --git a/tests/results/test_namespace/00_9extra_ouside.json b/tests/results/test_namespace/00_9extra_ouside.json index 5b635e7..92afa59 100644 --- a/tests/results/test_namespace/00_9extra_ouside.json +++ b/tests/results/test_namespace/00_9extra_ouside.json @@ -4,19 +4,19 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "variable": "string1" + "variable": "value in extra" }, "extra": { - "variable": "string1" + "variable": "value in extra" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "variable": "string1" + "variable": "value in extra" }, "extra": { - "variable": "string1" + "variable": "value in extra" } } } diff --git a/tests/results/test_namespace/01_6boolean_multi.json b/tests/results/test_namespace/01_6boolean_multi.json index 46b5766..d5bf051 100644 --- a/tests/results/test_namespace/01_6boolean_multi.json +++ b/tests/results/test_namespace/01_6boolean_multi.json @@ -14,13 +14,13 @@ true ], "var4": [ - true + false ], "var5": [ - true + false ], "var6": [ - true + false ], "var7": [ true @@ -43,13 +43,13 @@ true ], "var4": [ - true + false ], "var5": [ - true + false ], "var6": [ - true + false ], "var7": [ true diff --git a/tests/results/test_namespace/01_6custom_multi.json b/tests/results/test_namespace/01_6custom_multi.json index 975b263..41d6d0f 100644 --- a/tests/results/test_namespace/01_6custom_multi.json +++ b/tests/results/test_namespace/01_6custom_multi.json @@ -10,9 +10,7 @@ "string3" ], "custom2": [ - "string1", - "string2", - "string3" + "value" ] } }, @@ -25,9 +23,7 @@ "string3" ], "custom2": [ - "string1", - "string2", - "string3" + "value" ] } } diff --git a/tests/results/test_namespace/01_6float_multi.json b/tests/results/test_namespace/01_6float_multi.json index 83e16e8..b8793ac 100644 --- a/tests/results/test_namespace/01_6float_multi.json +++ b/tests/results/test_namespace/01_6float_multi.json @@ -5,44 +5,28 @@ "ansible_host": "group1.net", "rougail": { "var1": [ - 1.1, - 2.2, - 3.3 + 0.0 ], "var2": [ - 1.1, - 2.2, - 3.3 + 0.0 ], "var3": [ - 1.1, - 2.2, - 3.3 + 0.0 ], "var4": [ - 1.1, - 2.2, - 3.3 + 10.1 ], "var5": [ - 1.1, - 2.2, - 3.3 + 10.1 ], "var6": [ - 1.1, - 2.2, - 3.3 + 10.1 ], "var7": [ - 1.1, - 2.2, - 3.3 + 0.0 ], "var8": [ - 1.1, - 2.2, - 3.3 + 0.0 ] } }, @@ -50,44 +34,28 @@ "ansible_host": "group2.net", "rougail": { "var1": [ - 1.1, - 2.2, - 3.3 + 0.0 ], "var2": [ - 1.1, - 2.2, - 3.3 + 0.0 ], "var3": [ - 1.1, - 2.2, - 3.3 + 0.0 ], "var4": [ - 1.1, - 2.2, - 3.3 + 10.1 ], "var5": [ - 1.1, - 2.2, - 3.3 + 10.1 ], "var6": [ - 1.1, - 2.2, - 3.3 + 10.1 ], "var7": [ - 1.1, - 2.2, - 3.3 + 0.0 ], "var8": [ - 1.1, - 2.2, - 3.3 + 0.0 ] } } diff --git a/tests/results/test_namespace/01_6number_multi.json b/tests/results/test_namespace/01_6number_multi.json index 033f3bf..1975ce8 100644 --- a/tests/results/test_namespace/01_6number_multi.json +++ b/tests/results/test_namespace/01_6number_multi.json @@ -5,44 +5,28 @@ "ansible_host": "group1.net", "rougail": { "var1": [ - 1, - 2, - 3 + 0 ], "var2": [ - 1, - 2, - 3 + 0 ], "var3": [ - 1, - 2, - 3 + 0 ], "var4": [ - 1, - 2, - 3 + 10 ], "var5": [ - 1, - 2, - 3 + 10 ], "var6": [ - 1, - 2, - 3 + 10 ], "var7": [ - 1, - 2, - 3 + 0 ], "var8": [ - 1, - 2, - 3 + 0 ] } }, @@ -50,44 +34,28 @@ "ansible_host": "group2.net", "rougail": { "var1": [ - 1, - 2, - 3 + 0 ], "var2": [ - 1, - 2, - 3 + 0 ], "var3": [ - 1, - 2, - 3 + 0 ], "var4": [ - 1, - 2, - 3 + 10 ], "var5": [ - 1, - 2, - 3 + 10 ], "var6": [ - 1, - 2, - 3 + 10 ], "var7": [ - 1, - 2, - 3 + 0 ], "var8": [ - 1, - 2, - 3 + 0 ] } } diff --git a/tests/results/test_namespace/01_6string_multi.json b/tests/results/test_namespace/01_6string_multi.json index 3ff4a34..9719c2d 100644 --- a/tests/results/test_namespace/01_6string_multi.json +++ b/tests/results/test_namespace/01_6string_multi.json @@ -20,29 +20,19 @@ "string3" ], "var4": [ - "string1", - "string2", - "string3" + "value" ], "var5": [ - "string1", - "string2", - "string3" + "value" ], "var6": [ - "string1", - "string2", - "string3" + "value" ], "var7": [ - "string1", - "string2", - "string3" + "value" ], "var8": [ - "string1", - "string2", - "string3" + "value" ] } }, @@ -65,29 +55,19 @@ "string3" ], "var4": [ - "string1", - "string2", - "string3" + "value" ], "var5": [ - "string1", - "string2", - "string3" + "value" ], "var6": [ - "string1", - "string2", - "string3" + "value" ], "var7": [ - "string1", - "string2", - "string3" + "value" ], "var8": [ - "string1", - "string2", - "string3" + "value" ] } } diff --git a/tests/results/test_namespace/01_7value_multi_doublequote.json b/tests/results/test_namespace/01_7value_multi_doublequote.json index c04a785..5d4c2cc 100644 --- a/tests/results/test_namespace/01_7value_multi_doublequote.json +++ b/tests/results/test_namespace/01_7value_multi_doublequote.json @@ -5,9 +5,7 @@ "ansible_host": "group1.net", "rougail": { "variable": [ - "string1", - "string2", - "string3" + "quote\"" ] } }, @@ -15,9 +13,7 @@ "ansible_host": "group2.net", "rougail": { "variable": [ - "string1", - "string2", - "string3" + "quote\"" ] } } diff --git a/tests/results/test_namespace/01_7value_multi_doublequote2.json b/tests/results/test_namespace/01_7value_multi_doublequote2.json index c04a785..8a4f5ac 100644 --- a/tests/results/test_namespace/01_7value_multi_doublequote2.json +++ b/tests/results/test_namespace/01_7value_multi_doublequote2.json @@ -5,9 +5,7 @@ "ansible_host": "group1.net", "rougail": { "variable": [ - "string1", - "string2", - "string3" + "quote'\"" ] } }, @@ -15,9 +13,7 @@ "ansible_host": "group2.net", "rougail": { "variable": [ - "string1", - "string2", - "string3" + "quote'\"" ] } } diff --git a/tests/results/test_namespace/01_7value_multi_quote.json b/tests/results/test_namespace/01_7value_multi_quote.json index c04a785..84c64c6 100644 --- a/tests/results/test_namespace/01_7value_multi_quote.json +++ b/tests/results/test_namespace/01_7value_multi_quote.json @@ -5,9 +5,7 @@ "ansible_host": "group1.net", "rougail": { "variable": [ - "string1", - "string2", - "string3" + "quote'" ] } }, @@ -15,9 +13,7 @@ "ansible_host": "group2.net", "rougail": { "variable": [ - "string1", - "string2", - "string3" + "quote'" ] } } diff --git a/tests/results/test_namespace/01_9choice_variable_multi.json b/tests/results/test_namespace/01_9choice_variable_multi.json index 2bb1db3..092123d 100644 --- a/tests/results/test_namespace/01_9choice_variable_multi.json +++ b/tests/results/test_namespace/01_9choice_variable_multi.json @@ -5,22 +5,22 @@ "ansible_host": "group1.net", "rougail": { "variable1": [ - "string1", - "string2", - "string3" + "a", + "b", + "c" ], - "variable2": "string1" + "variable2": "a" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { "variable1": [ - "string1", - "string2", - "string3" + "a", + "b", + "c" ], - "variable2": "string1" + "variable2": "a" } } } diff --git a/tests/results/test_namespace/04_0type_param.json b/tests/results/test_namespace/04_0type_param.json index 2586839..cabd215 100644 --- a/tests/results/test_namespace/04_0type_param.json +++ b/tests/results/test_namespace/04_0type_param.json @@ -4,13 +4,13 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "int": 1 + "int": 10 } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "int": 1 + "int": 10 } } } diff --git a/tests/results/test_namespace/04_1auto_save_and_calculated.json b/tests/results/test_namespace/04_1auto_save_and_calculated.json index 02d49a7..5acfc36 100644 --- a/tests/results/test_namespace/04_1auto_save_and_calculated.json +++ b/tests/results/test_namespace/04_1auto_save_and_calculated.json @@ -4,14 +4,14 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var1": "string1", + "var1": "no", "var2": "no" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var1": "string1", + "var1": "no", "var2": "no" } } diff --git a/tests/results/test_namespace/04_1auto_save_and_calculated_hidden.json b/tests/results/test_namespace/04_1auto_save_and_calculated_hidden.json index 16604ca..b05e504 100644 --- a/tests/results/test_namespace/04_1auto_save_and_calculated_hidden.json +++ b/tests/results/test_namespace/04_1auto_save_and_calculated_hidden.json @@ -4,14 +4,14 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var1": "string1", + "var1": "no", "var2": "yes" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var1": "string1", + "var1": "no", "var2": "yes" } } diff --git a/tests/results/test_namespace/04_1default_calculation_hidden.json b/tests/results/test_namespace/04_1default_calculation_hidden.json index 3ad50ee..8617540 100644 --- a/tests/results/test_namespace/04_1default_calculation_hidden.json +++ b/tests/results/test_namespace/04_1default_calculation_hidden.json @@ -4,17 +4,15 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var1": "string1", - "var2": "string1", - "var3": "string1" + "var1": "value", + "var3": "value" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var1": "string1", - "var2": "string1", - "var3": "string1" + "var1": "value", + "var3": "value" } } } diff --git a/tests/results/test_namespace/04_1default_calculation_hidden_2.json b/tests/results/test_namespace/04_1default_calculation_hidden_2.json index 3ad50ee..e46f243 100644 --- a/tests/results/test_namespace/04_1default_calculation_hidden_2.json +++ b/tests/results/test_namespace/04_1default_calculation_hidden_2.json @@ -4,16 +4,14 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var1": "string1", - "var2": "string1", + "var1": "value", "var3": "string1" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var1": "string1", - "var2": "string1", + "var1": "value", "var3": "string1" } } diff --git a/tests/results/test_namespace/04_5disabled_calculation.json b/tests/results/test_namespace/04_5disabled_calculation.json index a2d541f..9cabdf8 100644 --- a/tests/results/test_namespace/04_5disabled_calculation.json +++ b/tests/results/test_namespace/04_5disabled_calculation.json @@ -4,7 +4,7 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "condition": "string1", + "condition": "no", "variable1": "string1", "variable2": "string1" } @@ -12,7 +12,7 @@ "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "condition": "string1", + "condition": "no", "variable1": "string1", "variable2": "string1" } diff --git a/tests/results/test_namespace/04_5disabled_calculation_default.json b/tests/results/test_namespace/04_5disabled_calculation_default.json index dc9c4d5..7594a49 100644 --- a/tests/results/test_namespace/04_5disabled_calculation_default.json +++ b/tests/results/test_namespace/04_5disabled_calculation_default.json @@ -4,17 +4,17 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "condition": "string1", - "var1": "string1", - "var2": "string1" + "condition": "no", + "var1": "no", + "var2": "no" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "condition": "string1", - "var1": "string1", - "var2": "string1" + "condition": "no", + "var1": "no", + "var2": "no" } } } diff --git a/tests/results/test_namespace/04_5disabled_calculation_multi.json b/tests/results/test_namespace/04_5disabled_calculation_multi.json index eacf06b..d2d5750 100644 --- a/tests/results/test_namespace/04_5disabled_calculation_multi.json +++ b/tests/results/test_namespace/04_5disabled_calculation_multi.json @@ -4,7 +4,7 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "condition": "string1", + "condition": "no", "variable1": [ "string1", "string2", @@ -20,7 +20,7 @@ "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "condition": "string1", + "condition": "no", "variable1": [ "string1", "string2", diff --git a/tests/results/test_namespace/04_5disabled_calculation_optional.json b/tests/results/test_namespace/04_5disabled_calculation_optional.json index e38c264..5ea273e 100644 --- a/tests/results/test_namespace/04_5disabled_calculation_optional.json +++ b/tests/results/test_namespace/04_5disabled_calculation_optional.json @@ -4,17 +4,17 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "condition": "string1", + "condition": "no", "var1": null, - "var2": "string1" + "var2": null } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "condition": "string1", + "condition": "no", "var1": null, - "var2": "string1" + "var2": null } } } diff --git a/tests/results/test_namespace/04_5disabled_calculation_variable.json b/tests/results/test_namespace/04_5disabled_calculation_variable.json index 6e21f0a..88d6685 100644 --- a/tests/results/test_namespace/04_5disabled_calculation_variable.json +++ b/tests/results/test_namespace/04_5disabled_calculation_variable.json @@ -4,13 +4,15 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "condition": true + "condition": false, + "variable": "string1" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "condition": true + "condition": false, + "variable": "string1" } } } diff --git a/tests/results/test_namespace/04_5disabled_calculation_variable3.json b/tests/results/test_namespace/04_5disabled_calculation_variable3.json index 6e9ea3c..d7196de 100644 --- a/tests/results/test_namespace/04_5disabled_calculation_variable3.json +++ b/tests/results/test_namespace/04_5disabled_calculation_variable3.json @@ -4,15 +4,13 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "condition": "string1", - "variable": "string1" + "condition": "yes" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "condition": "string1", - "variable": "string1" + "condition": "yes" } } } diff --git a/tests/results/test_namespace/04_5disabled_calculation_variable4.json b/tests/results/test_namespace/04_5disabled_calculation_variable4.json index 951746c..aefed08 100644 --- a/tests/results/test_namespace/04_5disabled_calculation_variable4.json +++ b/tests/results/test_namespace/04_5disabled_calculation_variable4.json @@ -4,13 +4,15 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "condition": "string1" + "condition": "yes", + "variable": "string1" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "condition": "string1" + "condition": "yes", + "variable": "string1" } } } diff --git a/tests/results/test_namespace/04_5disabled_calculation_variable_multi.json b/tests/results/test_namespace/04_5disabled_calculation_variable_multi.json index 6e21f0a..5273666 100644 --- a/tests/results/test_namespace/04_5disabled_calculation_variable_multi.json +++ b/tests/results/test_namespace/04_5disabled_calculation_variable_multi.json @@ -4,13 +4,23 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "condition": true + "condition": false, + "variable": [ + "string1", + "string2", + "string3" + ] } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "condition": true + "condition": false, + "variable": [ + "string1", + "string2", + "string3" + ] } } } diff --git a/tests/results/test_namespace/04_5hidden_calculation.json b/tests/results/test_namespace/04_5hidden_calculation.json index dc9c4d5..7594a49 100644 --- a/tests/results/test_namespace/04_5hidden_calculation.json +++ b/tests/results/test_namespace/04_5hidden_calculation.json @@ -4,17 +4,17 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "condition": "string1", - "var1": "string1", - "var2": "string1" + "condition": "no", + "var1": "no", + "var2": "no" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "condition": "string1", - "var1": "string1", - "var2": "string1" + "condition": "no", + "var1": "no", + "var2": "no" } } } diff --git a/tests/results/test_namespace/04_5hidden_calculation2.json b/tests/results/test_namespace/04_5hidden_calculation2.json index dc9c4d5..7594a49 100644 --- a/tests/results/test_namespace/04_5hidden_calculation2.json +++ b/tests/results/test_namespace/04_5hidden_calculation2.json @@ -4,17 +4,17 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "condition": "string1", - "var1": "string1", - "var2": "string1" + "condition": "no", + "var1": "no", + "var2": "no" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "condition": "string1", - "var1": "string1", - "var2": "string1" + "condition": "no", + "var1": "no", + "var2": "no" } } } diff --git a/tests/results/test_namespace/04_5hidden_calculation_default_calculation.json b/tests/results/test_namespace/04_5hidden_calculation_default_calculation.json index dc9c4d5..7594a49 100644 --- a/tests/results/test_namespace/04_5hidden_calculation_default_calculation.json +++ b/tests/results/test_namespace/04_5hidden_calculation_default_calculation.json @@ -4,17 +4,17 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "condition": "string1", - "var1": "string1", - "var2": "string1" + "condition": "no", + "var1": "no", + "var2": "no" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "condition": "string1", - "var1": "string1", - "var2": "string1" + "condition": "no", + "var1": "no", + "var2": "no" } } } diff --git a/tests/results/test_namespace/04_5validators_differ.json b/tests/results/test_namespace/04_5validators_differ.json index 82027ef..dfd87d0 100644 --- a/tests/results/test_namespace/04_5validators_differ.json +++ b/tests/results/test_namespace/04_5validators_differ.json @@ -4,15 +4,15 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var1": "another_value", - "var2": "string1" + "var1": "oui", + "var2": "no" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var1": "another_value", - "var2": "string1" + "var1": "oui", + "var2": "no" } } } diff --git a/tests/results/test_namespace/04_5validators_multi.json b/tests/results/test_namespace/04_5validators_multi.json index b336cb4..8efe54a 100644 --- a/tests/results/test_namespace/04_5validators_multi.json +++ b/tests/results/test_namespace/04_5validators_multi.json @@ -5,9 +5,8 @@ "ansible_host": "group1.net", "rougail": { "var1": [ - "string1", - "string2", - "string3" + "no", + "yes" ] } }, @@ -15,9 +14,8 @@ "ansible_host": "group2.net", "rougail": { "var1": [ - "string1", - "string2", - "string3" + "no", + "yes" ] } } diff --git a/tests/results/test_namespace/04_5validators_multi2.json b/tests/results/test_namespace/04_5validators_multi2.json index c9a1b03..8efe54a 100644 --- a/tests/results/test_namespace/04_5validators_multi2.json +++ b/tests/results/test_namespace/04_5validators_multi2.json @@ -5,8 +5,8 @@ "ansible_host": "group1.net", "rougail": { "var1": [ - "val1", - "val2" + "no", + "yes" ] } }, @@ -14,8 +14,8 @@ "ansible_host": "group2.net", "rougail": { "var1": [ - "val1", - "val2" + "no", + "yes" ] } } diff --git a/tests/results/test_namespace/05_0multi_not_uniq.json b/tests/results/test_namespace/05_0multi_not_uniq.json index b336cb4..5361a91 100644 --- a/tests/results/test_namespace/05_0multi_not_uniq.json +++ b/tests/results/test_namespace/05_0multi_not_uniq.json @@ -5,9 +5,7 @@ "ansible_host": "group1.net", "rougail": { "var1": [ - "string1", - "string2", - "string3" + "non" ] } }, @@ -15,9 +13,7 @@ "ansible_host": "group2.net", "rougail": { "var1": [ - "string1", - "string2", - "string3" + "non" ] } } diff --git a/tests/results/test_namespace/05_0multi_uniq.json b/tests/results/test_namespace/05_0multi_uniq.json index c04a785..0c931c9 100644 --- a/tests/results/test_namespace/05_0multi_uniq.json +++ b/tests/results/test_namespace/05_0multi_uniq.json @@ -5,9 +5,7 @@ "ansible_host": "group1.net", "rougail": { "variable": [ - "string1", - "string2", - "string3" + "non" ] } }, @@ -15,9 +13,7 @@ "ansible_host": "group2.net", "rougail": { "variable": [ - "string1", - "string2", - "string3" + "non" ] } } diff --git a/tests/results/test_namespace/16_5exists_nonexists.json b/tests/results/test_namespace/16_5exists_nonexists.json index 54c12a1..b05e504 100644 --- a/tests/results/test_namespace/16_5exists_nonexists.json +++ b/tests/results/test_namespace/16_5exists_nonexists.json @@ -4,15 +4,15 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var1": "string1", - "var2": "string1" + "var1": "no", + "var2": "yes" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var1": "string1", - "var2": "string1" + "var1": "no", + "var2": "yes" } } } diff --git a/tests/results/test_namespace/16_5redefine_calculation.json b/tests/results/test_namespace/16_5redefine_calculation.json index 50c4849..2ea61d9 100644 --- a/tests/results/test_namespace/16_5redefine_calculation.json +++ b/tests/results/test_namespace/16_5redefine_calculation.json @@ -4,13 +4,13 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "variable": "string1" + "variable": "yes" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "variable": "string1" + "variable": "yes" } } } diff --git a/tests/results/test_namespace/16_5redefine_default.json b/tests/results/test_namespace/16_5redefine_default.json index 50c4849..2ea61d9 100644 --- a/tests/results/test_namespace/16_5redefine_default.json +++ b/tests/results/test_namespace/16_5redefine_default.json @@ -4,13 +4,13 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "variable": "string1" + "variable": "yes" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "variable": "string1" + "variable": "yes" } } } diff --git a/tests/results/test_namespace/16_5redefine_multi.json b/tests/results/test_namespace/16_5redefine_multi.json index c04a785..0c931c9 100644 --- a/tests/results/test_namespace/16_5redefine_multi.json +++ b/tests/results/test_namespace/16_5redefine_multi.json @@ -5,9 +5,7 @@ "ansible_host": "group1.net", "rougail": { "variable": [ - "string1", - "string2", - "string3" + "non" ] } }, @@ -15,9 +13,7 @@ "ansible_host": "group2.net", "rougail": { "variable": [ - "string1", - "string2", - "string3" + "non" ] } } diff --git a/tests/results/test_namespace/16_5redefine_remove_disable_calculation.json b/tests/results/test_namespace/16_5redefine_remove_disable_calculation.json index 6e9ea3c..cb3b0ee 100644 --- a/tests/results/test_namespace/16_5redefine_remove_disable_calculation.json +++ b/tests/results/test_namespace/16_5redefine_remove_disable_calculation.json @@ -4,14 +4,14 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "condition": "string1", + "condition": "no", "variable": "string1" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "condition": "string1", + "condition": "no", "variable": "string1" } } diff --git a/tests/results/test_namespace/16_5test_redefine.json b/tests/results/test_namespace/16_5test_redefine.json index f2aeea7..d2c26d6 100644 --- a/tests/results/test_namespace/16_5test_redefine.json +++ b/tests/results/test_namespace/16_5test_redefine.json @@ -4,16 +4,16 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var1": "test1", - "var2": "test1", + "var1": "no", + "var2": "non", "var3": "string1" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var1": "test1", - "var2": "test1", + "var1": "no", + "var2": "non", "var3": "string1" } } diff --git a/tests/results/test_namespace/16_6choice_redefine.json b/tests/results/test_namespace/16_6choice_redefine.json index b936256..8b35f65 100644 --- a/tests/results/test_namespace/16_6choice_redefine.json +++ b/tests/results/test_namespace/16_6choice_redefine.json @@ -4,13 +4,13 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var": "a" + "var": "c" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var": "a" + "var": "c" } } } diff --git a/tests/results/test_namespace/20_0multi_family.json b/tests/results/test_namespace/20_0multi_family.json index 95d800f..b5ece35 100644 --- a/tests/results/test_namespace/20_0multi_family.json +++ b/tests/results/test_namespace/20_0multi_family.json @@ -6,7 +6,7 @@ "rougail": { "family": { "subfamily": { - "variable": "string1" + "variable": null } } } @@ -16,7 +16,7 @@ "rougail": { "family": { "subfamily": { - "variable": "string1" + "variable": null } } } diff --git a/tests/results/test_namespace/20_0multi_family_expert.json b/tests/results/test_namespace/20_0multi_family_expert.json index 95d800f..b5ece35 100644 --- a/tests/results/test_namespace/20_0multi_family_expert.json +++ b/tests/results/test_namespace/20_0multi_family_expert.json @@ -6,7 +6,7 @@ "rougail": { "family": { "subfamily": { - "variable": "string1" + "variable": null } } } @@ -16,7 +16,7 @@ "rougail": { "family": { "subfamily": { - "variable": "string1" + "variable": null } } } diff --git a/tests/results/test_namespace/20_0validators_differ_redefine.json b/tests/results/test_namespace/20_0validators_differ_redefine.json index 405f0af..c65fb45 100644 --- a/tests/results/test_namespace/20_0validators_differ_redefine.json +++ b/tests/results/test_namespace/20_0validators_differ_redefine.json @@ -4,16 +4,16 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var1": "string1", - "var2": "string1", + "var1": "no", + "var2": "no", "var3": "yes" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var1": "string1", - "var2": "string1", + "var1": "no", + "var2": "no", "var3": "yes" } } diff --git a/tests/results/test_namespace/24_0family_hidden_condition.json b/tests/results/test_namespace/24_0family_hidden_condition.json index a8b7c06..c6d11d6 100644 --- a/tests/results/test_namespace/24_0family_hidden_condition.json +++ b/tests/results/test_namespace/24_0family_hidden_condition.json @@ -4,7 +4,7 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "condition": "string1", + "condition": "no", "family": { "var1": "string1" } @@ -13,7 +13,7 @@ "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "condition": "string1", + "condition": "no", "family": { "var1": "string1" } diff --git a/tests/results/test_namespace/24_0family_hidden_condition_boolean.json b/tests/results/test_namespace/24_0family_hidden_condition_boolean.json index 1ae4ca1..9c35f6a 100644 --- a/tests/results/test_namespace/24_0family_hidden_condition_boolean.json +++ b/tests/results/test_namespace/24_0family_hidden_condition_boolean.json @@ -4,18 +4,18 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "condition": true, + "condition": false, "family": { - "variable": "string1" + "variable": null } } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "condition": true, + "condition": false, "family": { - "variable": "string1" + "variable": null } } } diff --git a/tests/results/test_namespace/24_0family_hidden_condition_sub_family.json b/tests/results/test_namespace/24_0family_hidden_condition_sub_family.json index 4320c45..c7f2209 100644 --- a/tests/results/test_namespace/24_0family_hidden_condition_sub_family.json +++ b/tests/results/test_namespace/24_0family_hidden_condition_sub_family.json @@ -4,7 +4,7 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "condition": "string1", + "condition": "no", "family": { "subfamily": { "var1": "string1" @@ -15,7 +15,7 @@ "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "condition": "string1", + "condition": "no", "family": { "subfamily": { "var1": "string1" diff --git a/tests/results/test_namespace/24_0family_hidden_condition_with_variable.json b/tests/results/test_namespace/24_0family_hidden_condition_with_variable.json index f488d7d..b70d5da 100644 --- a/tests/results/test_namespace/24_0family_hidden_condition_with_variable.json +++ b/tests/results/test_namespace/24_0family_hidden_condition_with_variable.json @@ -4,8 +4,8 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "condition1": true, - "condition2": true, + "condition1": false, + "condition2": false, "family": { "variable": null } @@ -14,8 +14,8 @@ "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "condition1": true, - "condition2": true, + "condition1": false, + "condition2": false, "family": { "variable": null } diff --git a/tests/results/test_namespace/24_0family_hidden_param_condition_sub_family.json b/tests/results/test_namespace/24_0family_hidden_param_condition_sub_family.json index a613423..fe18eea 100644 --- a/tests/results/test_namespace/24_0family_hidden_param_condition_sub_family.json +++ b/tests/results/test_namespace/24_0family_hidden_param_condition_sub_family.json @@ -4,7 +4,7 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "condition": "string1", + "condition": "no", "family": { "sub_family": { "var1": "string1" @@ -15,7 +15,7 @@ "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "condition": "string1", + "condition": "no", "family": { "sub_family": { "var1": "string1" diff --git a/tests/results/test_namespace/24_0family_mandatory_condition.json b/tests/results/test_namespace/24_0family_mandatory_condition.json index b8f56e5..e67bc8f 100644 --- a/tests/results/test_namespace/24_0family_mandatory_condition.json +++ b/tests/results/test_namespace/24_0family_mandatory_condition.json @@ -4,15 +4,15 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "condition": "string1", - "var": "string1" + "condition": "no", + "var": null } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "condition": "string1", - "var": "string1" + "condition": "no", + "var": null } } } diff --git a/tests/results/test_namespace/40_0leadership_follower_default_calculation.json b/tests/results/test_namespace/40_0leadership_follower_default_calculation.json index 442cbea..3491d56 100644 --- a/tests/results/test_namespace/40_0leadership_follower_default_calculation.json +++ b/tests/results/test_namespace/40_0leadership_follower_default_calculation.json @@ -7,18 +7,18 @@ "leader": [ { "leader": "string1", - "follower1": "string1", - "follower2": "string1" + "follower1": "value", + "follower2": "value" }, { "leader": "string2", - "follower1": "string2", - "follower2": "string2" + "follower1": "value", + "follower2": "value" }, { "leader": "string3", - "follower1": "string3", - "follower2": "string3" + "follower1": "value", + "follower2": "value" } ] } @@ -29,18 +29,18 @@ "leader": [ { "leader": "string1", - "follower1": "string1", - "follower2": "string1" + "follower1": "value", + "follower2": "value" }, { "leader": "string2", - "follower1": "string2", - "follower2": "string2" + "follower1": "value", + "follower2": "value" }, { "leader": "string3", - "follower1": "string3", - "follower2": "string3" + "follower1": "value", + "follower2": "value" } ] } diff --git a/tests/results/test_namespace/40_0leadership_follower_default_submulti.json b/tests/results/test_namespace/40_0leadership_follower_default_submulti.json index a0fd982..6bedd69 100644 --- a/tests/results/test_namespace/40_0leadership_follower_default_submulti.json +++ b/tests/results/test_namespace/40_0leadership_follower_default_submulti.json @@ -6,42 +6,13 @@ "rougail": { "leader": [ { - "leader": "string1", + "leader": "leader", "follower1": [ - "string1", - "string2", - "string3" + "value" ], "follower2": [ - "string1", - "string2", - "string3" - ] - }, - { - "leader": "string2", - "follower1": [ - "string1", - "string2", - "string3" - ], - "follower2": [ - "string1", - "string2", - "string3" - ] - }, - { - "leader": "string3", - "follower1": [ - "string1", - "string2", - "string3" - ], - "follower2": [ - "string1", - "string2", - "string3" + "value1", + "value2" ] } ] @@ -52,42 +23,13 @@ "rougail": { "leader": [ { - "leader": "string1", + "leader": "leader", "follower1": [ - "string1", - "string2", - "string3" + "value" ], "follower2": [ - "string1", - "string2", - "string3" - ] - }, - { - "leader": "string2", - "follower1": [ - "string1", - "string2", - "string3" - ], - "follower2": [ - "string1", - "string2", - "string3" - ] - }, - { - "leader": "string3", - "follower1": [ - "string1", - "string2", - "string3" - ], - "follower2": [ - "string1", - "string2", - "string3" + "value1", + "value2" ] } ] diff --git a/tests/results/test_namespace/40_0leadership_follower_default_submulti_calculation.json b/tests/results/test_namespace/40_0leadership_follower_default_submulti_calculation.json index a0fd982..050e9ed 100644 --- a/tests/results/test_namespace/40_0leadership_follower_default_submulti_calculation.json +++ b/tests/results/test_namespace/40_0leadership_follower_default_submulti_calculation.json @@ -6,42 +6,12 @@ "rougail": { "leader": [ { - "leader": "string1", + "leader": "leader", "follower1": [ - "string1", - "string2", - "string3" + "value" ], "follower2": [ - "string1", - "string2", - "string3" - ] - }, - { - "leader": "string2", - "follower1": [ - "string1", - "string2", - "string3" - ], - "follower2": [ - "string1", - "string2", - "string3" - ] - }, - { - "leader": "string3", - "follower1": [ - "string1", - "string2", - "string3" - ], - "follower2": [ - "string1", - "string2", - "string3" + "value" ] } ] @@ -52,42 +22,12 @@ "rougail": { "leader": [ { - "leader": "string1", + "leader": "leader", "follower1": [ - "string1", - "string2", - "string3" + "value" ], "follower2": [ - "string1", - "string2", - "string3" - ] - }, - { - "leader": "string2", - "follower1": [ - "string1", - "string2", - "string3" - ], - "follower2": [ - "string1", - "string2", - "string3" - ] - }, - { - "leader": "string3", - "follower1": [ - "string1", - "string2", - "string3" - ], - "follower2": [ - "string1", - "string2", - "string3" + "value" ] } ] diff --git a/tests/results/test_namespace/40_0leadership_follower_default_value.json b/tests/results/test_namespace/40_0leadership_follower_default_value.json index 47365fe..701b56d 100644 --- a/tests/results/test_namespace/40_0leadership_follower_default_value.json +++ b/tests/results/test_namespace/40_0leadership_follower_default_value.json @@ -4,39 +4,13 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "leader": [ - { - "leader": "string1", - "follower1": "string1" - }, - { - "leader": "string2", - "follower1": "string2" - }, - { - "leader": "string3", - "follower1": "string3" - } - ] + "leader": [] } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "leader": [ - { - "leader": "string1", - "follower1": "string1" - }, - { - "leader": "string2", - "follower1": "string2" - }, - { - "leader": "string3", - "follower1": "string3" - } - ] + "leader": [] } } } diff --git a/tests/results/test_namespace/40_0leadership_leader_follower.json b/tests/results/test_namespace/40_0leadership_leader_follower.json new file mode 100644 index 0000000..4695c30 --- /dev/null +++ b/tests/results/test_namespace/40_0leadership_leader_follower.json @@ -0,0 +1,58 @@ +{ + "_meta": { + "hostvars": { + "GROUP1_01": { + "ansible_host": "group1.net", + "rougail": { + "leadership": [ + { + "leader": "value1", + "follower": "value1" + }, + { + "leader": "value2", + "follower": "value2" + } + ] + } + }, + "GROUP2_01": { + "ansible_host": "group2.net", + "rougail": { + "leadership": [ + { + "leader": "value1", + "follower": "value1" + }, + { + "leader": "value2", + "follower": "value2" + } + ] + } + } + } + }, + "all": { + "children": [ + "ungrouped", + "groups" + ] + }, + "group1": { + "hosts": [ + "GROUP1_01" + ] + }, + "group2": { + "hosts": [ + "GROUP2_01" + ] + }, + "groups": { + "children": [ + "group1", + "group2" + ] + } +} \ No newline at end of file diff --git a/tests/results/test_namespace/40_0leadership_leader_not_multi.json b/tests/results/test_namespace/40_0leadership_leader_not_multi.json index ce575a3..efc29b1 100644 --- a/tests/results/test_namespace/40_0leadership_leader_not_multi.json +++ b/tests/results/test_namespace/40_0leadership_leader_not_multi.json @@ -5,7 +5,7 @@ "ansible_host": "group1.net", "rougail": { "general": { - "mode_conteneur_actif": "string1" + "mode_conteneur_actif": "non" }, "general1": { "leader": [ @@ -32,7 +32,7 @@ "ansible_host": "group2.net", "rougail": { "general": { - "mode_conteneur_actif": "string1" + "mode_conteneur_actif": "non" }, "general1": { "leader": [ diff --git a/tests/results/test_namespace/40_2leadership_calculation_index.json b/tests/results/test_namespace/40_2leadership_calculation_index.json index 5eb9c10..e6a7db3 100644 --- a/tests/results/test_namespace/40_2leadership_calculation_index.json +++ b/tests/results/test_namespace/40_2leadership_calculation_index.json @@ -6,16 +6,16 @@ "rougail": { "leader": [ { - "leader": "string1", + "leader": "a", + "follower1": 0 + }, + { + "leader": "b", "follower1": 1 }, { - "leader": "string2", + "leader": "c", "follower1": 2 - }, - { - "leader": "string3", - "follower1": 3 } ] } @@ -25,16 +25,16 @@ "rougail": { "leader": [ { - "leader": "string1", + "leader": "a", + "follower1": 0 + }, + { + "leader": "b", "follower1": 1 }, { - "leader": "string2", + "leader": "c", "follower1": 2 - }, - { - "leader": "string3", - "follower1": 3 } ] } diff --git a/tests/results/test_namespace/40_2leadership_calculation_param_index.json b/tests/results/test_namespace/40_2leadership_calculation_param_index.json index 5eb9c10..e6a7db3 100644 --- a/tests/results/test_namespace/40_2leadership_calculation_param_index.json +++ b/tests/results/test_namespace/40_2leadership_calculation_param_index.json @@ -6,16 +6,16 @@ "rougail": { "leader": [ { - "leader": "string1", + "leader": "a", + "follower1": 0 + }, + { + "leader": "b", "follower1": 1 }, { - "leader": "string2", + "leader": "c", "follower1": 2 - }, - { - "leader": "string3", - "follower1": 3 } ] } @@ -25,16 +25,16 @@ "rougail": { "leader": [ { - "leader": "string1", + "leader": "a", + "follower1": 0 + }, + { + "leader": "b", "follower1": 1 }, { - "leader": "string2", + "leader": "c", "follower1": 2 - }, - { - "leader": "string3", - "follower1": 3 } ] } diff --git a/tests/results/test_namespace/40_2leadership_leader_calculation.json b/tests/results/test_namespace/40_2leadership_leader_calculation.json index 442cbea..04db0a7 100644 --- a/tests/results/test_namespace/40_2leadership_leader_calculation.json +++ b/tests/results/test_namespace/40_2leadership_leader_calculation.json @@ -6,19 +6,14 @@ "rougail": { "leader": [ { - "leader": "string1", + "leader": "val1", "follower1": "string1", "follower2": "string1" }, { - "leader": "string2", + "leader": "val2", "follower1": "string2", "follower2": "string2" - }, - { - "leader": "string3", - "follower1": "string3", - "follower2": "string3" } ] } @@ -28,19 +23,14 @@ "rougail": { "leader": [ { - "leader": "string1", + "leader": "val1", "follower1": "string1", "follower2": "string1" }, { - "leader": "string2", + "leader": "val2", "follower1": "string2", "follower2": "string2" - }, - { - "leader": "string3", - "follower1": "string3", - "follower2": "string3" } ] } diff --git a/tests/results/test_namespace/40_6leadership_follower_multi.json b/tests/results/test_namespace/40_6leadership_follower_multi.json index dfbe57b..b63bb8d 100644 --- a/tests/results/test_namespace/40_6leadership_follower_multi.json +++ b/tests/results/test_namespace/40_6leadership_follower_multi.json @@ -13,9 +13,7 @@ "string3" ], "follower2": [ - "string1", - "string2", - "string3" + "value" ] }, { @@ -26,9 +24,7 @@ "string3" ], "follower2": [ - "string1", - "string2", - "string3" + "value" ] }, { @@ -39,9 +35,7 @@ "string3" ], "follower2": [ - "string1", - "string2", - "string3" + "value" ] } ] @@ -59,9 +53,7 @@ "string3" ], "follower2": [ - "string1", - "string2", - "string3" + "value" ] }, { @@ -72,9 +64,7 @@ "string3" ], "follower2": [ - "string1", - "string2", - "string3" + "value" ] }, { @@ -85,9 +75,7 @@ "string3" ], "follower2": [ - "string1", - "string2", - "string3" + "value" ] } ] diff --git a/tests/results/test_namespace/40_8calculation_boolean.json b/tests/results/test_namespace/40_8calculation_boolean.json index 21ee16c..024227f 100644 --- a/tests/results/test_namespace/40_8calculation_boolean.json +++ b/tests/results/test_namespace/40_8calculation_boolean.json @@ -4,24 +4,26 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "bool": true, + "bool": false, "multi1": [ - true + false ], "multi2": [ - true + true, + false ] } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "bool": true, + "bool": false, "multi1": [ - true + false ], "multi2": [ - true + true, + false ] } } diff --git a/tests/results/test_namespace/40_8calculation_boolean_return_none.json b/tests/results/test_namespace/40_8calculation_boolean_return_none.json index d61cc24..2f51814 100644 --- a/tests/results/test_namespace/40_8calculation_boolean_return_none.json +++ b/tests/results/test_namespace/40_8calculation_boolean_return_none.json @@ -4,14 +4,14 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var1": "string1", + "var1": "yes", "var2": true } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var1": "string1", + "var1": "yes", "var2": true } } diff --git a/tests/results/test_namespace/40_8calculation_integer.json b/tests/results/test_namespace/40_8calculation_integer.json index e424b84..ebb2460 100644 --- a/tests/results/test_namespace/40_8calculation_integer.json +++ b/tests/results/test_namespace/40_8calculation_integer.json @@ -4,17 +4,17 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "bool": true, - "int1": 1, - "int2": 1 + "bool": false, + "int1": 2, + "int2": 3 } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "bool": true, - "int1": 1, - "int2": 1 + "bool": false, + "int1": 2, + "int2": 3 } } } diff --git a/tests/results/test_namespace/40_8calculation_multi_variable.json b/tests/results/test_namespace/40_8calculation_multi_variable.json index 31e9096..91b8877 100644 --- a/tests/results/test_namespace/40_8calculation_multi_variable.json +++ b/tests/results/test_namespace/40_8calculation_multi_variable.json @@ -5,24 +5,22 @@ "ansible_host": "group1.net", "rougail": { "var": [ - "string1", - "string2", - "string3" + "no", + "yes" ], - "var2": "string1", - "var3": "string1" + "var2": "no", + "var3": "yes" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { "var": [ - "string1", - "string2", - "string3" + "no", + "yes" ], - "var2": "string1", - "var3": "string1" + "var2": "no", + "var3": "yes" } } } diff --git a/tests/results/test_namespace/40_8calculation_multi_variable_parent.json b/tests/results/test_namespace/40_8calculation_multi_variable_parent.json index d5555f9..d561050 100644 --- a/tests/results/test_namespace/40_8calculation_multi_variable_parent.json +++ b/tests/results/test_namespace/40_8calculation_multi_variable_parent.json @@ -4,18 +4,18 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var": "string1", + "var": "no", "fam1": { - "var": "string1" + "var": "no" } } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var": "string1", + "var": "no", "fam1": { - "var": "string1" + "var": "no" } } } diff --git a/tests/results/test_namespace/40_8calculation_multi_variable_parent2.json b/tests/results/test_namespace/40_8calculation_multi_variable_parent2.json index 9fb642b..d38ca8f 100644 --- a/tests/results/test_namespace/40_8calculation_multi_variable_parent2.json +++ b/tests/results/test_namespace/40_8calculation_multi_variable_parent2.json @@ -5,10 +5,10 @@ "ansible_host": "group1.net", "rougail": { "fam1": { - "var": "string1" + "var": "no" }, "fam2": { - "var": "string1" + "var": "no" } } }, @@ -16,10 +16,10 @@ "ansible_host": "group2.net", "rougail": { "fam1": { - "var": "string1" + "var": "no" }, "fam2": { - "var": "string1" + "var": "no" } } } diff --git a/tests/results/test_namespace/40_9calculation_variable_leader_follower_multi_inside.json b/tests/results/test_namespace/40_9calculation_variable_leader_follower_multi_inside.json new file mode 100644 index 0000000..b62e8f9 --- /dev/null +++ b/tests/results/test_namespace/40_9calculation_variable_leader_follower_multi_inside.json @@ -0,0 +1,66 @@ +{ + "_meta": { + "hostvars": { + "GROUP1_01": { + "ansible_host": "group1.net", + "rougail": { + "leadership": [ + { + "leader": "value1", + "follower": [ + "value1" + ] + }, + { + "leader": "value2", + "follower": [ + "value2" + ] + } + ] + } + }, + "GROUP2_01": { + "ansible_host": "group2.net", + "rougail": { + "leadership": [ + { + "leader": "value1", + "follower": [ + "value1" + ] + }, + { + "leader": "value2", + "follower": [ + "value2" + ] + } + ] + } + } + } + }, + "all": { + "children": [ + "ungrouped", + "groups" + ] + }, + "group1": { + "hosts": [ + "GROUP1_01" + ] + }, + "group2": { + "hosts": [ + "GROUP2_01" + ] + }, + "groups": { + "children": [ + "group1", + "group2" + ] + } +} \ No newline at end of file diff --git a/tests/results/test_namespace/40_9leadership-calculation-outside-follower-first.json b/tests/results/test_namespace/40_9leadership-calculation-outside-follower-first.json index 5d14b46..a29b036 100644 --- a/tests/results/test_namespace/40_9leadership-calculation-outside-follower-first.json +++ b/tests/results/test_namespace/40_9leadership-calculation-outside-follower-first.json @@ -6,25 +6,18 @@ "rougail": { "leader": [ { - "leader": "string1", - "follower1": "string1", - "follower2": "string1" + "leader": "value1", + "follower1": "val11", + "follower2": "val21" }, { - "leader": "string2", - "follower1": "string2", - "follower2": "string2" - }, - { - "leader": "string3", - "follower1": "string3", - "follower2": "string3" + "leader": "value2", + "follower1": "val11", + "follower2": "val21" } ], "calculate": [ - "string1", - "string2", - "string3" + "val11" ] } }, @@ -33,25 +26,18 @@ "rougail": { "leader": [ { - "leader": "string1", - "follower1": "string1", - "follower2": "string1" + "leader": "value1", + "follower1": "val11", + "follower2": "val21" }, { - "leader": "string2", - "follower1": "string2", - "follower2": "string2" - }, - { - "leader": "string3", - "follower1": "string3", - "follower2": "string3" + "leader": "value2", + "follower1": "val11", + "follower2": "val21" } ], "calculate": [ - "string1", - "string2", - "string3" + "val11" ] } } diff --git a/tests/results/test_namespace/40_9leadership-calculation-outside-follower-last.json b/tests/results/test_namespace/40_9leadership-calculation-outside-follower-last.json index 5d14b46..a29b036 100644 --- a/tests/results/test_namespace/40_9leadership-calculation-outside-follower-last.json +++ b/tests/results/test_namespace/40_9leadership-calculation-outside-follower-last.json @@ -6,25 +6,18 @@ "rougail": { "leader": [ { - "leader": "string1", - "follower1": "string1", - "follower2": "string1" + "leader": "value1", + "follower1": "val11", + "follower2": "val21" }, { - "leader": "string2", - "follower1": "string2", - "follower2": "string2" - }, - { - "leader": "string3", - "follower1": "string3", - "follower2": "string3" + "leader": "value2", + "follower1": "val11", + "follower2": "val21" } ], "calculate": [ - "string1", - "string2", - "string3" + "val11" ] } }, @@ -33,25 +26,18 @@ "rougail": { "leader": [ { - "leader": "string1", - "follower1": "string1", - "follower2": "string1" + "leader": "value1", + "follower1": "val11", + "follower2": "val21" }, { - "leader": "string2", - "follower1": "string2", - "follower2": "string2" - }, - { - "leader": "string3", - "follower1": "string3", - "follower2": "string3" + "leader": "value2", + "follower1": "val11", + "follower2": "val21" } ], "calculate": [ - "string1", - "string2", - "string3" + "val11" ] } } diff --git a/tests/results/test_namespace/04_5disabled_calculation_variable_multi2.json b/tests/results/test_namespace/40_9leadership-calculation-outside-follower-no-mandatory.json similarity index 56% rename from tests/results/test_namespace/04_5disabled_calculation_variable_multi2.json rename to tests/results/test_namespace/40_9leadership-calculation-outside-follower-no-mandatory.json index e970641..65633b9 100644 --- a/tests/results/test_namespace/04_5disabled_calculation_variable_multi2.json +++ b/tests/results/test_namespace/40_9leadership-calculation-outside-follower-no-mandatory.json @@ -4,30 +4,38 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "condition": [ - "string1", - "string2", - "string3" + "leader": [ + { + "leader": "a", + "follower": null + }, + { + "leader": "b", + "follower": null + } ], "variable": [ - "string1", - "string2", - "string3" + null, + null ] } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "condition": [ - "string1", - "string2", - "string3" + "leader": [ + { + "leader": "a", + "follower": null + }, + { + "leader": "b", + "follower": null + } ], "variable": [ - "string1", - "string2", - "string3" + null, + null ] } } diff --git a/tests/results/test_namespace/40_9leadership-calculation-outside-follower.json b/tests/results/test_namespace/40_9leadership-calculation-outside-follower.json index 5d14b46..0d945a0 100644 --- a/tests/results/test_namespace/40_9leadership-calculation-outside-follower.json +++ b/tests/results/test_namespace/40_9leadership-calculation-outside-follower.json @@ -6,25 +6,19 @@ "rougail": { "leader": [ { - "leader": "string1", - "follower1": "string1", - "follower2": "string1" + "leader": "value1", + "follower1": "val11", + "follower2": "val21" }, { - "leader": "string2", - "follower1": "string2", - "follower2": "string2" - }, - { - "leader": "string3", - "follower1": "string3", - "follower2": "string3" + "leader": "value2", + "follower1": "val11", + "follower2": "val21" } ], "calculate": [ - "string1", - "string2", - "string3" + "val11", + "val11" ] } }, @@ -33,25 +27,19 @@ "rougail": { "leader": [ { - "leader": "string1", - "follower1": "string1", - "follower2": "string1" + "leader": "value1", + "follower1": "val11", + "follower2": "val21" }, { - "leader": "string2", - "follower1": "string2", - "follower2": "string2" - }, - { - "leader": "string3", - "follower1": "string3", - "follower2": "string3" + "leader": "value2", + "follower1": "val11", + "follower2": "val21" } ], "calculate": [ - "string1", - "string2", - "string3" + "val11", + "val11" ] } } diff --git a/tests/results/test_namespace/40_9leadership-calculation-outside-leader-first.json b/tests/results/test_namespace/40_9leadership-calculation-outside-leader-first.json index 817310e..857f107 100644 --- a/tests/results/test_namespace/40_9leadership-calculation-outside-leader-first.json +++ b/tests/results/test_namespace/40_9leadership-calculation-outside-leader-first.json @@ -6,22 +6,17 @@ "rougail": { "leader": [ { - "leader": "string1", - "follower1": "string1", - "follower2": "string1" + "leader": "value1", + "follower1": "val11", + "follower2": "val21" }, { - "leader": "string2", - "follower1": "string2", - "follower2": "string2" - }, - { - "leader": "string3", - "follower1": "string3", - "follower2": "string3" + "leader": "value2", + "follower1": "val11", + "follower2": "val21" } ], - "calculate": "string1" + "calculate": "value1" } }, "GROUP2_01": { @@ -29,22 +24,17 @@ "rougail": { "leader": [ { - "leader": "string1", - "follower1": "string1", - "follower2": "string1" + "leader": "value1", + "follower1": "val11", + "follower2": "val21" }, { - "leader": "string2", - "follower1": "string2", - "follower2": "string2" - }, - { - "leader": "string3", - "follower1": "string3", - "follower2": "string3" + "leader": "value2", + "follower1": "val11", + "follower2": "val21" } ], - "calculate": "string1" + "calculate": "value1" } } } diff --git a/tests/results/test_namespace/40_9leadership-calculation-outside-leader-last.json b/tests/results/test_namespace/40_9leadership-calculation-outside-leader-last.json index 817310e..cbff4fa 100644 --- a/tests/results/test_namespace/40_9leadership-calculation-outside-leader-last.json +++ b/tests/results/test_namespace/40_9leadership-calculation-outside-leader-last.json @@ -6,22 +6,17 @@ "rougail": { "leader": [ { - "leader": "string1", - "follower1": "string1", - "follower2": "string1" + "leader": "value1", + "follower1": "val11", + "follower2": "val21" }, { - "leader": "string2", - "follower1": "string2", - "follower2": "string2" - }, - { - "leader": "string3", - "follower1": "string3", - "follower2": "string3" + "leader": "value2", + "follower1": "val11", + "follower2": "val21" } ], - "calculate": "string1" + "calculate": "value2" } }, "GROUP2_01": { @@ -29,22 +24,17 @@ "rougail": { "leader": [ { - "leader": "string1", - "follower1": "string1", - "follower2": "string1" + "leader": "value1", + "follower1": "val11", + "follower2": "val21" }, { - "leader": "string2", - "follower1": "string2", - "follower2": "string2" - }, - { - "leader": "string3", - "follower1": "string3", - "follower2": "string3" + "leader": "value2", + "follower1": "val11", + "follower2": "val21" } ], - "calculate": "string1" + "calculate": "value2" } } } diff --git a/tests/results/test_namespace/40_9leadership-calculation-outside-leader.json b/tests/results/test_namespace/40_9leadership-calculation-outside-leader.json index 5d14b46..8696a5c 100644 --- a/tests/results/test_namespace/40_9leadership-calculation-outside-leader.json +++ b/tests/results/test_namespace/40_9leadership-calculation-outside-leader.json @@ -6,25 +6,19 @@ "rougail": { "leader": [ { - "leader": "string1", - "follower1": "string1", - "follower2": "string1" + "leader": "value1", + "follower1": "val11", + "follower2": "val21" }, { - "leader": "string2", - "follower1": "string2", - "follower2": "string2" - }, - { - "leader": "string3", - "follower1": "string3", - "follower2": "string3" + "leader": "value2", + "follower1": "val11", + "follower2": "val21" } ], "calculate": [ - "string1", - "string2", - "string3" + "value1", + "value2" ] } }, @@ -33,25 +27,19 @@ "rougail": { "leader": [ { - "leader": "string1", - "follower1": "string1", - "follower2": "string1" + "leader": "value1", + "follower1": "val11", + "follower2": "val21" }, { - "leader": "string2", - "follower1": "string2", - "follower2": "string2" - }, - { - "leader": "string3", - "follower1": "string3", - "follower2": "string3" + "leader": "value2", + "follower1": "val11", + "follower2": "val21" } ], "calculate": [ - "string1", - "string2", - "string3" + "value1", + "value2" ] } } diff --git a/tests/results/test_namespace/40_9leadership-calculation-variable.json b/tests/results/test_namespace/40_9leadership-calculation-variable.json new file mode 100644 index 0000000..5bdf732 --- /dev/null +++ b/tests/results/test_namespace/40_9leadership-calculation-variable.json @@ -0,0 +1,70 @@ +{ + "_meta": { + "hostvars": { + "GROUP1_01": { + "ansible_host": "group1.net", + "rougail": { + "calculate": [ + "value1", + "value2" + ], + "leader": [ + { + "leader": "value1", + "follower1": "val11", + "follower2": "val21" + }, + { + "leader": "value2", + "follower1": "val11", + "follower2": "val21" + } + ] + } + }, + "GROUP2_01": { + "ansible_host": "group2.net", + "rougail": { + "calculate": [ + "value1", + "value2" + ], + "leader": [ + { + "leader": "value1", + "follower1": "val11", + "follower2": "val21" + }, + { + "leader": "value2", + "follower1": "val11", + "follower2": "val21" + } + ] + } + } + } + }, + "all": { + "children": [ + "ungrouped", + "groups" + ] + }, + "group1": { + "hosts": [ + "GROUP1_01" + ] + }, + "group2": { + "hosts": [ + "GROUP2_01" + ] + }, + "groups": { + "children": [ + "group1", + "group2" + ] + } +} \ No newline at end of file diff --git a/tests/results/test_namespace/40_9leadership-calculation-variable_leader_follower.json b/tests/results/test_namespace/40_9leadership-calculation-variable_leader_follower.json new file mode 100644 index 0000000..42abe4e --- /dev/null +++ b/tests/results/test_namespace/40_9leadership-calculation-variable_leader_follower.json @@ -0,0 +1,78 @@ +{ + "_meta": { + "hostvars": { + "GROUP1_01": { + "ansible_host": "group1.net", + "rougail": { + "leadership_1": [ + { + "leader": "value1", + "follower": "string1" + }, + { + "leader": "value2", + "follower": "string2" + } + ], + "leadership_2": [ + { + "leader": "string1", + "follower": "val" + }, + { + "leader": "string2", + "follower": "val" + } + ] + } + }, + "GROUP2_01": { + "ansible_host": "group2.net", + "rougail": { + "leadership_1": [ + { + "leader": "value1", + "follower": "string1" + }, + { + "leader": "value2", + "follower": "string2" + } + ], + "leadership_2": [ + { + "leader": "string1", + "follower": "val" + }, + { + "leader": "string2", + "follower": "val" + } + ] + } + } + } + }, + "all": { + "children": [ + "ungrouped", + "groups" + ] + }, + "group1": { + "hosts": [ + "GROUP1_01" + ] + }, + "group2": { + "hosts": [ + "GROUP2_01" + ] + }, + "groups": { + "children": [ + "group1", + "group2" + ] + } +} \ No newline at end of file diff --git a/tests/results/test_namespace/40_9leadership-calculation-variable_leader_follower_not_same.json b/tests/results/test_namespace/40_9leadership-calculation-variable_leader_follower_not_same.json new file mode 100644 index 0000000..2f6393c --- /dev/null +++ b/tests/results/test_namespace/40_9leadership-calculation-variable_leader_follower_not_same.json @@ -0,0 +1,90 @@ +{ + "_meta": { + "hostvars": { + "GROUP1_01": { + "ansible_host": "group1.net", + "rougail": { + "leadership_1": [ + { + "leader": "value1", + "follower": "string1" + }, + { + "leader": "value2", + "follower": "string2" + } + ], + "leadership_2": [ + { + "leader": "value1", + "follower": [ + "value1", + "value2" + ] + }, + { + "leader": "value2", + "follower": [ + "value1", + "value2" + ] + } + ] + } + }, + "GROUP2_01": { + "ansible_host": "group2.net", + "rougail": { + "leadership_1": [ + { + "leader": "value1", + "follower": "string1" + }, + { + "leader": "value2", + "follower": "string2" + } + ], + "leadership_2": [ + { + "leader": "value1", + "follower": [ + "value1", + "value2" + ] + }, + { + "leader": "value2", + "follower": [ + "value1", + "value2" + ] + } + ] + } + } + } + }, + "all": { + "children": [ + "ungrouped", + "groups" + ] + }, + "group1": { + "hosts": [ + "GROUP1_01" + ] + }, + "group2": { + "hosts": [ + "GROUP2_01" + ] + }, + "groups": { + "children": [ + "group1", + "group2" + ] + } +} \ No newline at end of file diff --git a/tests/results/test_namespace/41_0choice_leader.json b/tests/results/test_namespace/41_0choice_leader.json index a64c911..701b56d 100644 --- a/tests/results/test_namespace/41_0choice_leader.json +++ b/tests/results/test_namespace/41_0choice_leader.json @@ -4,39 +4,13 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "leader": [ - { - "leader": "string1", - "follower1": "a" - }, - { - "leader": "string2", - "follower1": "b" - }, - { - "leader": "string3", - "follower1": "c" - } - ] + "leader": [] } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "leader": [ - { - "leader": "string1", - "follower1": "a" - }, - { - "leader": "string2", - "follower1": "b" - }, - { - "leader": "string3", - "follower1": "c" - } - ] + "leader": [] } } } diff --git a/tests/results/test_namespace/44_4disabled_calcultion_follower.json b/tests/results/test_namespace/44_4disabled_calcultion_follower.json index 280e2b1..f8490c7 100644 --- a/tests/results/test_namespace/44_4disabled_calcultion_follower.json +++ b/tests/results/test_namespace/44_4disabled_calcultion_follower.json @@ -7,16 +7,8 @@ "condition": true, "leader": [ { - "leader": "string1", + "leader": "a", "follower": "string1" - }, - { - "leader": "string2", - "follower": "string2" - }, - { - "leader": "string3", - "follower": "string3" } ] } @@ -27,16 +19,8 @@ "condition": true, "leader": [ { - "leader": "string1", + "leader": "a", "follower": "string1" - }, - { - "leader": "string2", - "follower": "string2" - }, - { - "leader": "string3", - "follower": "string3" } ] } diff --git a/tests/results/test_namespace/44_4leadership_mandatory.json b/tests/results/test_namespace/44_4leadership_mandatory.json index 47365fe..43be248 100644 --- a/tests/results/test_namespace/44_4leadership_mandatory.json +++ b/tests/results/test_namespace/44_4leadership_mandatory.json @@ -7,15 +7,15 @@ "leader": [ { "leader": "string1", - "follower1": "string1" + "follower1": null }, { "leader": "string2", - "follower1": "string2" + "follower1": null }, { "leader": "string3", - "follower1": "string3" + "follower1": null } ] } @@ -26,15 +26,15 @@ "leader": [ { "leader": "string1", - "follower1": "string1" + "follower1": null }, { "leader": "string2", - "follower1": "string2" + "follower1": null }, { "leader": "string3", - "follower1": "string3" + "follower1": null } ] } diff --git a/tests/results/test_namespace/44_4leadership_mandatory_follower.json b/tests/results/test_namespace/44_4leadership_mandatory_follower.json index f12357d..701b56d 100644 --- a/tests/results/test_namespace/44_4leadership_mandatory_follower.json +++ b/tests/results/test_namespace/44_4leadership_mandatory_follower.json @@ -4,39 +4,13 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "leader": [ - { - "leader": "string1", - "follower": "string1" - }, - { - "leader": "string2", - "follower": "string2" - }, - { - "leader": "string3", - "follower": "string3" - } - ] + "leader": [] } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "leader": [ - { - "leader": "string1", - "follower": "string1" - }, - { - "leader": "string2", - "follower": "string2" - }, - { - "leader": "string3", - "follower": "string3" - } - ] + "leader": [] } } } diff --git a/tests/results/test_namespace/44_5leadership_leader_hidden_calculation.json b/tests/results/test_namespace/44_5leadership_leader_hidden_calculation.json index e7f9309..8f7f38f 100644 --- a/tests/results/test_namespace/44_5leadership_leader_hidden_calculation.json +++ b/tests/results/test_namespace/44_5leadership_leader_hidden_calculation.json @@ -4,41 +4,15 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "condition": "string1", - "leader": [ - { - "leader": "string1", - "follower": "string1" - }, - { - "leader": "string2", - "follower": "string2" - }, - { - "leader": "string3", - "follower": "string3" - } - ] + "condition": "no", + "leader": [] } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "condition": "string1", - "leader": [ - { - "leader": "string1", - "follower": "string1" - }, - { - "leader": "string2", - "follower": "string2" - }, - { - "leader": "string3", - "follower": "string3" - } - ] + "condition": "no", + "leader": [] } } } diff --git a/tests/results/test_namespace/44_6leadership_follower_disabled_calculation.json b/tests/results/test_namespace/44_6leadership_follower_disabled_calculation.json index e7f9309..f2d8c83 100644 --- a/tests/results/test_namespace/44_6leadership_follower_disabled_calculation.json +++ b/tests/results/test_namespace/44_6leadership_follower_disabled_calculation.json @@ -4,19 +4,16 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "condition": "string1", + "condition": "yes", "leader": [ { - "leader": "string1", - "follower": "string1" + "leader": "string1" }, { - "leader": "string2", - "follower": "string2" + "leader": "string2" }, { - "leader": "string3", - "follower": "string3" + "leader": "string3" } ] } @@ -24,19 +21,16 @@ "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "condition": "string1", + "condition": "yes", "leader": [ { - "leader": "string1", - "follower": "string1" + "leader": "string1" }, { - "leader": "string2", - "follower": "string2" + "leader": "string2" }, { - "leader": "string3", - "follower": "string3" + "leader": "string3" } ] } diff --git a/tests/results/test_namespace/44_9calculated_default_leadership_leader.json b/tests/results/test_namespace/44_9calculated_default_leadership_leader.json index f12357d..e2a5aed 100644 --- a/tests/results/test_namespace/44_9calculated_default_leadership_leader.json +++ b/tests/results/test_namespace/44_9calculated_default_leadership_leader.json @@ -6,16 +6,11 @@ "rougail": { "leader": [ { - "leader": "string1", - "follower": "string1" + "leader": "a" }, { - "leader": "string2", - "follower": "string2" - }, - { - "leader": "string3", - "follower": "string3" + "leader": "b", + "follower": "b" } ] } @@ -25,16 +20,11 @@ "rougail": { "leader": [ { - "leader": "string1", - "follower": "string1" + "leader": "a" }, { - "leader": "string2", - "follower": "string2" - }, - { - "leader": "string3", - "follower": "string3" + "leader": "b", + "follower": "b" } ] } diff --git a/tests/results/test_namespace/60_0family_dynamic_1_0.json b/tests/results/test_namespace/60_0family_dynamic_1_0.json index dffb2b4..07cc848 100644 --- a/tests/results/test_namespace/60_0family_dynamic_1_0.json +++ b/tests/results/test_namespace/60_0family_dynamic_1_0.json @@ -9,10 +9,10 @@ "val2" ], "dynval1": { - "vardyn": "string1" + "vardyn": null }, "dynval2": { - "vardyn": "string1" + "vardyn": null } } }, @@ -24,10 +24,10 @@ "val2" ], "dynval1": { - "vardyn": "string1" + "vardyn": null }, "dynval2": { - "vardyn": "string1" + "vardyn": null } } } diff --git a/tests/results/test_namespace/60_0family_dynamic_1_0_empty.json b/tests/results/test_namespace/60_0family_dynamic_1_0_empty.json index dffb2b4..2794f02 100644 --- a/tests/results/test_namespace/60_0family_dynamic_1_0_empty.json +++ b/tests/results/test_namespace/60_0family_dynamic_1_0_empty.json @@ -4,31 +4,13 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var": [ - "val1", - "val2" - ], - "dynval1": { - "vardyn": "string1" - }, - "dynval2": { - "vardyn": "string1" - } + "var": [] } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var": [ - "val1", - "val2" - ], - "dynval1": { - "vardyn": "string1" - }, - "dynval2": { - "vardyn": "string1" - } + "var": [] } } } diff --git a/tests/results/test_namespace/60_0family_dynamic_1_0_type_empty.json b/tests/results/test_namespace/60_0family_dynamic_1_0_type_empty.json index dffb2b4..2794f02 100644 --- a/tests/results/test_namespace/60_0family_dynamic_1_0_type_empty.json +++ b/tests/results/test_namespace/60_0family_dynamic_1_0_type_empty.json @@ -4,31 +4,13 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var": [ - "val1", - "val2" - ], - "dynval1": { - "vardyn": "string1" - }, - "dynval2": { - "vardyn": "string1" - } + "var": [] } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var": [ - "val1", - "val2" - ], - "dynval1": { - "vardyn": "string1" - }, - "dynval2": { - "vardyn": "string1" - } + "var": [] } } } diff --git a/tests/results/test_namespace/60_0family_dynamic_1_1_empty.json b/tests/results/test_namespace/60_0family_dynamic_1_1_empty.json index dffb2b4..2794f02 100644 --- a/tests/results/test_namespace/60_0family_dynamic_1_1_empty.json +++ b/tests/results/test_namespace/60_0family_dynamic_1_1_empty.json @@ -4,31 +4,13 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var": [ - "val1", - "val2" - ], - "dynval1": { - "vardyn": "string1" - }, - "dynval2": { - "vardyn": "string1" - } + "var": [] } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var": [ - "val1", - "val2" - ], - "dynval1": { - "vardyn": "string1" - }, - "dynval2": { - "vardyn": "string1" - } + "var": [] } } } diff --git a/tests/results/test_namespace/60_0family_dynamic_empty.json b/tests/results/test_namespace/60_0family_dynamic_empty.json index fb3cfa5..2794f02 100644 --- a/tests/results/test_namespace/60_0family_dynamic_empty.json +++ b/tests/results/test_namespace/60_0family_dynamic_empty.json @@ -4,39 +4,13 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var": [ - "string1", - "string2", - "string3" - ], - "dynstring1": { - "var": "string1" - }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { - "var": "string1" - } + "var": [] } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var": [ - "string1", - "string2", - "string3" - ], - "dynstring1": { - "var": "string1" - }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { - "var": "string1" - } + "var": [] } } } diff --git a/tests/results/test_namespace/60_0family_dynamic_forbidden_char.json b/tests/results/test_namespace/60_0family_dynamic_forbidden_char.json index fca64be..2ce7aa7 100644 --- a/tests/results/test_namespace/60_0family_dynamic_forbidden_char.json +++ b/tests/results/test_namespace/60_0family_dynamic_forbidden_char.json @@ -9,12 +9,12 @@ "val.2" ], "dynval_1": { - "var1": "string1", - "var2": "string1" + "var1": "val.1", + "var2": "val.1" }, "dynval_2": { - "var1": "string1", - "var2": "string1" + "var1": "val.2", + "var2": "val.2" } } }, @@ -26,12 +26,12 @@ "val.2" ], "dynval_1": { - "var1": "string1", - "var2": "string1" + "var1": "val.1", + "var2": "val.1" }, "dynval_2": { - "var1": "string1", - "var2": "string1" + "var1": "val.2", + "var2": "val.2" } } } diff --git a/tests/results/test_namespace/60_0family_dynamic_jinja_number.json b/tests/results/test_namespace/60_0family_dynamic_jinja_number.json index 6ffb306..6d5f8ae 100644 --- a/tests/results/test_namespace/60_0family_dynamic_jinja_number.json +++ b/tests/results/test_namespace/60_0family_dynamic_jinja_number.json @@ -9,12 +9,12 @@ 2 ], "dyn1": { - "var": "string1" + "var": "val" }, "dyn2": { - "var": "string1" + "var": "val" }, - "var2": "string1" + "var2": "val" } }, "GROUP2_01": { @@ -25,12 +25,12 @@ 2 ], "dyn1": { - "var": "string1" + "var": "val" }, "dyn2": { - "var": "string1" + "var": "val" }, - "var2": "string1" + "var2": "val" } } } diff --git a/tests/results/test_namespace/60_0family_dynamic_jinja_number_empty.json b/tests/results/test_namespace/60_0family_dynamic_jinja_number_empty.json index 6ffb306..82a3999 100644 --- a/tests/results/test_namespace/60_0family_dynamic_jinja_number_empty.json +++ b/tests/results/test_namespace/60_0family_dynamic_jinja_number_empty.json @@ -4,32 +4,14 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var": [ - 1, - 2 - ], - "dyn1": { - "var": "string1" - }, - "dyn2": { - "var": "string1" - }, + "var": [], "var2": "string1" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var": [ - 1, - 2 - ], - "dyn1": { - "var": "string1" - }, - "dyn2": { - "var": "string1" - }, + "var": [], "var2": "string1" } } diff --git a/tests/results/test_namespace/60_0family_dynamic_no_description_empty.json b/tests/results/test_namespace/60_0family_dynamic_no_description_empty.json index a1da453..2794f02 100644 --- a/tests/results/test_namespace/60_0family_dynamic_no_description_empty.json +++ b/tests/results/test_namespace/60_0family_dynamic_no_description_empty.json @@ -4,31 +4,13 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var": [ - "val1", - "val2" - ], - "dynval1": { - "var": "string1" - }, - "dynval2": { - "var": "string1" - } + "var": [] } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var": [ - "val1", - "val2" - ], - "dynval1": { - "var": "string1" - }, - "dynval2": { - "var": "string1" - } + "var": [] } } } diff --git a/tests/results/test_namespace/04_5disabled_calculation_variable_multi3.json b/tests/results/test_namespace/60_0family_dynamic_upper_char.json similarity index 57% rename from tests/results/test_namespace/04_5disabled_calculation_variable_multi3.json rename to tests/results/test_namespace/60_0family_dynamic_upper_char.json index e970641..806c27b 100644 --- a/tests/results/test_namespace/04_5disabled_calculation_variable_multi3.json +++ b/tests/results/test_namespace/60_0family_dynamic_upper_char.json @@ -4,31 +4,31 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "condition": [ - "string1", - "string2", - "string3" + "var": [ + "Val1", + "VAL2" ], - "variable": [ - "string1", - "string2", - "string3" - ] + "dynval1": { + "var": "string1" + }, + "dynval2": { + "var": "string1" + } } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "condition": [ - "string1", - "string2", - "string3" + "var": [ + "Val1", + "VAL2" ], - "variable": [ - "string1", - "string2", - "string3" - ] + "dynval1": { + "var": "string1" + }, + "dynval2": { + "var": "string1" + } } } } diff --git a/tests/results/test_namespace/60_0family_dynamic_variable_empty.json b/tests/results/test_namespace/60_0family_dynamic_variable_empty.json index fb3cfa5..ead36eb 100644 --- a/tests/results/test_namespace/60_0family_dynamic_variable_empty.json +++ b/tests/results/test_namespace/60_0family_dynamic_variable_empty.json @@ -10,13 +10,13 @@ "string3" ], "dynstring1": { - "var": "string1" + "var": "val" }, "dynstring2": { - "var": "string1" + "var": "val" }, "dynstring3": { - "var": "string1" + "var": "val" } } }, @@ -29,13 +29,13 @@ "string3" ], "dynstring1": { - "var": "string1" + "var": "val" }, "dynstring2": { - "var": "string1" + "var": "val" }, "dynstring3": { - "var": "string1" + "var": "val" } } } diff --git a/tests/results/test_namespace/60_0family_dynamic_variable_suffix.json b/tests/results/test_namespace/60_0family_dynamic_variable_suffix.json index a1da453..2d4834b 100644 --- a/tests/results/test_namespace/60_0family_dynamic_variable_suffix.json +++ b/tests/results/test_namespace/60_0family_dynamic_variable_suffix.json @@ -9,10 +9,10 @@ "val2" ], "dynval1": { - "var": "string1" + "var": "a value" }, "dynval2": { - "var": "string1" + "var": "a value" } } }, @@ -24,10 +24,10 @@ "val2" ], "dynval1": { - "var": "string1" + "var": "a value" }, "dynval2": { - "var": "string1" + "var": "a value" } } } diff --git a/tests/results/test_namespace/60_0family_dynamic_variable_suffix_empty.json b/tests/results/test_namespace/60_0family_dynamic_variable_suffix_empty.json index a1da453..2d4834b 100644 --- a/tests/results/test_namespace/60_0family_dynamic_variable_suffix_empty.json +++ b/tests/results/test_namespace/60_0family_dynamic_variable_suffix_empty.json @@ -9,10 +9,10 @@ "val2" ], "dynval1": { - "var": "string1" + "var": "a value" }, "dynval2": { - "var": "string1" + "var": "a value" } } }, @@ -24,10 +24,10 @@ "val2" ], "dynval1": { - "var": "string1" + "var": "a value" }, "dynval2": { - "var": "string1" + "var": "a value" } } } diff --git a/tests/results/test_namespace/60_0family_mode.json b/tests/results/test_namespace/60_0family_mode.json index 6ca56f1..b769d47 100644 --- a/tests/results/test_namespace/60_0family_mode.json +++ b/tests/results/test_namespace/60_0family_mode.json @@ -5,7 +5,7 @@ "ansible_host": "group1.net", "rougail": { "family": { - "var": "string1" + "var": "non" } } }, @@ -13,7 +13,7 @@ "ansible_host": "group2.net", "rougail": { "family": { - "var": "string1" + "var": "non" } } } diff --git a/tests/results/test_namespace/60_1family_dynamic_jinja.json b/tests/results/test_namespace/60_1family_dynamic_jinja.json index e941de6..f3791fe 100644 --- a/tests/results/test_namespace/60_1family_dynamic_jinja.json +++ b/tests/results/test_namespace/60_1family_dynamic_jinja.json @@ -5,18 +5,14 @@ "ansible_host": "group1.net", "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], "dyn1": { - "var": "string1" + "var": "val" }, "dyn2": { - "var": "string1" - }, - "dyn3": { - "var": "string1" + "var": "val" } } }, @@ -24,18 +20,14 @@ "ansible_host": "group2.net", "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], "dyn1": { - "var": "string1" + "var": "val" }, "dyn2": { - "var": "string1" - }, - "dyn3": { - "var": "string1" + "var": "val" } } } diff --git a/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group_2.json b/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group_2.json index cbca33d..fe88774 100644 --- a/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group_2.json +++ b/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group_2.json @@ -10,15 +10,15 @@ ], "dynval1": { "family": { - "var": "string1" + "var": "val1" } }, "dynval2": { "family": { - "var": "string1" + "var": "val2" } }, - "var2": "string1" + "var2": "val1" } }, "GROUP2_01": { @@ -30,15 +30,15 @@ ], "dynval1": { "family": { - "var": "string1" + "var": "val1" } }, "dynval2": { "family": { - "var": "string1" + "var": "val2" } }, - "var2": "string1" + "var2": "val1" } } } diff --git a/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group_2_empty.json b/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group_2_empty.json index cbca33d..e3f7f50 100644 --- a/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group_2_empty.json +++ b/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group_2_empty.json @@ -4,41 +4,15 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var": [ - "val1", - "val2" - ], - "dynval1": { - "family": { - "var": "string1" - } - }, - "dynval2": { - "family": { - "var": "string1" - } - }, - "var2": "string1" + "var": [], + "var2": null } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var": [ - "val1", - "val2" - ], - "dynval1": { - "family": { - "var": "string1" - } - }, - "dynval2": { - "family": { - "var": "string1" - } - }, - "var2": "string1" + "var": [], + "var2": null } } } diff --git a/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group_empty.json b/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group_empty.json index aa2a666..beba781 100644 --- a/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group_empty.json +++ b/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group_empty.json @@ -4,41 +4,15 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var1": [ - "val1", - "val2" - ], - "dynval1": { - "family": { - "var": "string1" - } - }, - "dynval2": { - "family": { - "var": "string1" - } - }, - "var2": "string1" + "var1": [], + "var2": null } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var1": [ - "val1", - "val2" - ], - "dynval1": { - "family": { - "var": "string1" - } - }, - "dynval2": { - "family": { - "var": "string1" - } - }, - "var2": "string1" + "var1": [], + "var2": null } } } diff --git a/tests/results/test_namespace/60_2family_dynamic_outside_calc.json b/tests/results/test_namespace/60_2family_dynamic_outside_calc.json index 8076aff..d893aa3 100644 --- a/tests/results/test_namespace/60_2family_dynamic_outside_calc.json +++ b/tests/results/test_namespace/60_2family_dynamic_outside_calc.json @@ -9,12 +9,12 @@ "val2" ], "dynval1": { - "var": "string1" + "var": "val" }, "dynval2": { - "var": "string1" + "var": "val" }, - "newvar": "string1" + "newvar": "val" } }, "GROUP2_01": { @@ -25,12 +25,12 @@ "val2" ], "dynval1": { - "var": "string1" + "var": "val" }, "dynval2": { - "var": "string1" + "var": "val" }, - "newvar": "string1" + "newvar": "val" } } } diff --git a/tests/results/test_namespace/60_2family_dynamic_outside_calc_empty.json b/tests/results/test_namespace/60_2family_dynamic_outside_calc_empty.json index 8076aff..52482b3 100644 --- a/tests/results/test_namespace/60_2family_dynamic_outside_calc_empty.json +++ b/tests/results/test_namespace/60_2family_dynamic_outside_calc_empty.json @@ -4,33 +4,15 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var1": [ - "val1", - "val2" - ], - "dynval1": { - "var": "string1" - }, - "dynval2": { - "var": "string1" - }, - "newvar": "string1" + "var1": [], + "newvar": null } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var1": [ - "val1", - "val2" - ], - "dynval1": { - "var": "string1" - }, - "dynval2": { - "var": "string1" - }, - "newvar": "string1" + "var1": [], + "newvar": null } } } diff --git a/tests/results/test_namespace/60_5family_dynamic_calc2.json b/tests/results/test_namespace/60_5family_dynamic_calc2.json index 2cff302..79a6a58 100644 --- a/tests/results/test_namespace/60_5family_dynamic_calc2.json +++ b/tests/results/test_namespace/60_5family_dynamic_calc2.json @@ -10,10 +10,10 @@ ], "var2": "string1", "dynval1": { - "vardyn": "string1" + "vardyn": "val" }, "dynval2": { - "vardyn": "string1" + "vardyn": "val" } } }, @@ -26,10 +26,10 @@ ], "var2": "string1", "dynval1": { - "vardyn": "string1" + "vardyn": "val" }, "dynval2": { - "vardyn": "string1" + "vardyn": "val" } } } diff --git a/tests/results/test_namespace/60_5family_dynamic_calc2_empty.json b/tests/results/test_namespace/60_5family_dynamic_calc2_empty.json index 2cff302..82a3999 100644 --- a/tests/results/test_namespace/60_5family_dynamic_calc2_empty.json +++ b/tests/results/test_namespace/60_5family_dynamic_calc2_empty.json @@ -4,33 +4,15 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var": [ - "val1", - "val2" - ], - "var2": "string1", - "dynval1": { - "vardyn": "string1" - }, - "dynval2": { - "vardyn": "string1" - } + "var": [], + "var2": "string1" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var": [ - "val1", - "val2" - ], - "var2": "string1", - "dynval1": { - "vardyn": "string1" - }, - "dynval2": { - "vardyn": "string1" - } + "var": [], + "var2": "string1" } } } diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_suffix2.json b/tests/results/test_namespace/60_5family_dynamic_calc_suffix2.json index a1da453..1d16fad 100644 --- a/tests/results/test_namespace/60_5family_dynamic_calc_suffix2.json +++ b/tests/results/test_namespace/60_5family_dynamic_calc_suffix2.json @@ -9,10 +9,10 @@ "val2" ], "dynval1": { - "var": "string1" + "var": "val1" }, "dynval2": { - "var": "string1" + "var": "val2" } } }, @@ -24,10 +24,10 @@ "val2" ], "dynval1": { - "var": "string1" + "var": "val1" }, "dynval2": { - "var": "string1" + "var": "val2" } } } diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_suffix2_empty.json b/tests/results/test_namespace/60_5family_dynamic_calc_suffix2_empty.json index a1da453..2794f02 100644 --- a/tests/results/test_namespace/60_5family_dynamic_calc_suffix2_empty.json +++ b/tests/results/test_namespace/60_5family_dynamic_calc_suffix2_empty.json @@ -4,31 +4,13 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var": [ - "val1", - "val2" - ], - "dynval1": { - "var": "string1" - }, - "dynval2": { - "var": "string1" - } + "var": [] } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var": [ - "val1", - "val2" - ], - "dynval1": { - "var": "string1" - }, - "dynval2": { - "var": "string1" - } + "var": [] } } } diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_disabled2.json b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_disabled2.json new file mode 100644 index 0000000..d6c2b08 --- /dev/null +++ b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_disabled2.json @@ -0,0 +1,42 @@ +{ + "_meta": { + "hostvars": { + "GROUP1_01": { + "ansible_host": "group1.net", + "rougail": { + "var1": [], + "var2": "string1" + } + }, + "GROUP2_01": { + "ansible_host": "group2.net", + "rougail": { + "var1": [], + "var2": "string1" + } + } + } + }, + "all": { + "children": [ + "ungrouped", + "groups" + ] + }, + "group1": { + "hosts": [ + "GROUP1_01" + ] + }, + "group2": { + "hosts": [ + "GROUP2_01" + ] + }, + "groups": { + "children": [ + "group1", + "group2" + ] + } +} \ No newline at end of file diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_empty.json b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_empty.json index 02b4c21..d6c2b08 100644 --- a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_empty.json +++ b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_empty.json @@ -4,32 +4,14 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var1": [ - "val1", - "val2" - ], - "dynval1": { - "var": "string1" - }, - "dynval2": { - "var": "string1" - }, + "var1": [], "var2": "string1" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var1": [ - "val1", - "val2" - ], - "dynval1": { - "var": "string1" - }, - "dynval2": { - "var": "string1" - }, + "var1": [], "var2": "string1" } } diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_empty_2.json b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_empty_2.json index 47f0b50..d6c2b08 100644 --- a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_empty_2.json +++ b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_empty_2.json @@ -4,24 +4,14 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var1": [ - "val1" - ], - "dynval1": { - "var": "string1" - }, + "var1": [], "var2": "string1" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var1": [ - "val1" - ], - "dynval1": { - "var": "string1" - }, + "var1": [], "var2": "string1" } } diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_empty_3.json b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_empty_3.json index 1c3072e..4a57ac6 100644 --- a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_empty_3.json +++ b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_empty_3.json @@ -5,32 +5,14 @@ "ansible_host": "group1.net", "rougail": { "var2": "string1", - "var1": [ - "val1", - "val2" - ], - "dynval1": { - "var": "string1" - }, - "dynval2": { - "var": "string1" - } + "var1": [] } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { "var2": "string1", - "var1": [ - "val1", - "val2" - ], - "dynval1": { - "var": "string1" - }, - "dynval2": { - "var": "string1" - } + "var1": [] } } } diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_param.json b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_param.json index a1da453..1d16fad 100644 --- a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_param.json +++ b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_param.json @@ -9,10 +9,10 @@ "val2" ], "dynval1": { - "var": "string1" + "var": "val1" }, "dynval2": { - "var": "string1" + "var": "val2" } } }, @@ -24,10 +24,10 @@ "val2" ], "dynval1": { - "var": "string1" + "var": "val1" }, "dynval2": { - "var": "string1" + "var": "val2" } } } diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_param_empty.json b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_param_empty.json index a1da453..2794f02 100644 --- a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_param_empty.json +++ b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_param_empty.json @@ -4,31 +4,13 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var": [ - "val1", - "val2" - ], - "dynval1": { - "var": "string1" - }, - "dynval2": { - "var": "string1" - } + "var": [] } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var": [ - "val1", - "val2" - ], - "dynval1": { - "var": "string1" - }, - "dynval2": { - "var": "string1" - } + "var": [] } } } diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_variable_empty.json b/tests/results/test_namespace/60_5family_dynamic_calc_variable_empty.json index 02b4c21..d6c2b08 100644 --- a/tests/results/test_namespace/60_5family_dynamic_calc_variable_empty.json +++ b/tests/results/test_namespace/60_5family_dynamic_calc_variable_empty.json @@ -4,32 +4,14 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var1": [ - "val1", - "val2" - ], - "dynval1": { - "var": "string1" - }, - "dynval2": { - "var": "string1" - }, + "var1": [], "var2": "string1" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var1": [ - "val1", - "val2" - ], - "dynval1": { - "var": "string1" - }, - "dynval2": { - "var": "string1" - }, + "var1": [], "var2": "string1" } } diff --git a/tests/results/test_namespace/60_5family_dynamic_hidden_suffix.json b/tests/results/test_namespace/60_5family_dynamic_hidden_suffix.json index fca6de0..44c6f67 100644 --- a/tests/results/test_namespace/60_5family_dynamic_hidden_suffix.json +++ b/tests/results/test_namespace/60_5family_dynamic_hidden_suffix.json @@ -5,9 +5,9 @@ "ansible_host": "group1.net", "rougail": { "dynval1": { - "var": "string1", + "var": null, "family": { - "var": "string1" + "var": null } }, "dynval2": { @@ -22,9 +22,9 @@ "ansible_host": "group2.net", "rougail": { "dynval1": { - "var": "string1", + "var": null, "family": { - "var": "string1" + "var": null } }, "dynval2": { diff --git a/tests/results/test_namespace/60_5family_dynamic_unknown_suffix.json b/tests/results/test_namespace/60_5family_dynamic_unknown_suffix.json index 66fc41c..0ff6681 100644 --- a/tests/results/test_namespace/60_5family_dynamic_unknown_suffix.json +++ b/tests/results/test_namespace/60_5family_dynamic_unknown_suffix.json @@ -9,14 +9,14 @@ "val2" ], "val1_dyn": { - "var1": "string1", - "var2": "string1", - "var3": "string1" + "var1": "val1", + "var2": "val1", + "var3": "val1" }, "val2_dyn": { - "var1": "string1", - "var2": "string1", - "var3": "string1" + "var1": "val2", + "var2": "val2", + "var3": "val2" } } }, @@ -28,14 +28,14 @@ "val2" ], "val1_dyn": { - "var1": "string1", - "var2": "string1", - "var3": "string1" + "var1": "val1", + "var2": "val1", + "var3": "val1" }, "val2_dyn": { - "var1": "string1", - "var2": "string1", - "var3": "string1" + "var1": "val2", + "var2": "val2", + "var3": "val2" } } } diff --git a/tests/results/test_namespace/60_5family_dynamic_unknown_suffix_empty.json b/tests/results/test_namespace/60_5family_dynamic_unknown_suffix_empty.json index c03a4ee..2794f02 100644 --- a/tests/results/test_namespace/60_5family_dynamic_unknown_suffix_empty.json +++ b/tests/results/test_namespace/60_5family_dynamic_unknown_suffix_empty.json @@ -4,71 +4,13 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var": [ - "val1", - "val2", - "val3", - "val4" - ], - "val1_dyn": { - "var1": "string1", - "var2": "string1", - "var3": "string1", - "var4": "string1" - }, - "val2_dyn": { - "var1": "string1", - "var2": "string1", - "var3": "string1", - "var4": "string1" - }, - "val3_dyn": { - "var1": "string1", - "var2": "string1", - "var3": "string1", - "var4": "string1" - }, - "val4_dyn": { - "var1": "string1", - "var2": "string1", - "var3": "string1", - "var4": "string1" - } + "var": [] } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var": [ - "val1", - "val2", - "val3", - "val4" - ], - "val1_dyn": { - "var1": "string1", - "var2": "string1", - "var3": "string1", - "var4": "string1" - }, - "val2_dyn": { - "var1": "string1", - "var2": "string1", - "var3": "string1", - "var4": "string1" - }, - "val3_dyn": { - "var1": "string1", - "var2": "string1", - "var3": "string1", - "var4": "string1" - }, - "val4_dyn": { - "var1": "string1", - "var2": "string1", - "var3": "string1", - "var4": "string1" - } + "var": [] } } } diff --git a/tests/results/test_namespace/60_5family_dynamic_variable_outside.json b/tests/results/test_namespace/60_5family_dynamic_variable_outside.json index fdb0ab3..832f23d 100644 --- a/tests/results/test_namespace/60_5family_dynamic_variable_outside.json +++ b/tests/results/test_namespace/60_5family_dynamic_variable_outside.json @@ -9,15 +9,14 @@ "val2" ], "my_dyn_family_val1": { - "var": "string1" + "var": "val1" }, "my_dyn_family_val2": { - "var": "string1" + "var": "val2" }, "var2": [ - "string1", - "string2", - "string3" + "val1", + "val2" ] } }, @@ -29,15 +28,14 @@ "val2" ], "my_dyn_family_val1": { - "var": "string1" + "var": "val1" }, "my_dyn_family_val2": { - "var": "string1" + "var": "val2" }, "var2": [ - "string1", - "string2", - "string3" + "val1", + "val2" ] } } diff --git a/tests/results/test_namespace/60_5family_dynamic_variable_outside2.json b/tests/results/test_namespace/60_5family_dynamic_variable_outside2.json index 002d5ac..23cb6d2 100644 --- a/tests/results/test_namespace/60_5family_dynamic_variable_outside2.json +++ b/tests/results/test_namespace/60_5family_dynamic_variable_outside2.json @@ -5,19 +5,18 @@ "ansible_host": "group1.net", "rougail": { "var2": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], "var": [ "val1", "val2" ], "my_dyn_family_val1": { - "var": "string1" + "var": "val1" }, "my_dyn_family_val2": { - "var": "string1" + "var": "val2" } } }, @@ -25,19 +24,18 @@ "ansible_host": "group2.net", "rougail": { "var2": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], "var": [ "val1", "val2" ], "my_dyn_family_val1": { - "var": "string1" + "var": "val1" }, "my_dyn_family_val2": { - "var": "string1" + "var": "val2" } } } diff --git a/tests/results/test_namespace/60_5family_dynamic_variable_outside2_empty.json b/tests/results/test_namespace/60_5family_dynamic_variable_outside2_empty.json index 002d5ac..9003063 100644 --- a/tests/results/test_namespace/60_5family_dynamic_variable_outside2_empty.json +++ b/tests/results/test_namespace/60_5family_dynamic_variable_outside2_empty.json @@ -9,16 +9,7 @@ "string2", "string3" ], - "var": [ - "val1", - "val2" - ], - "my_dyn_family_val1": { - "var": "string1" - }, - "my_dyn_family_val2": { - "var": "string1" - } + "var": [] } }, "GROUP2_01": { @@ -29,16 +20,7 @@ "string2", "string3" ], - "var": [ - "val1", - "val2" - ], - "my_dyn_family_val1": { - "var": "string1" - }, - "my_dyn_family_val2": { - "var": "string1" - } + "var": [] } } } diff --git a/tests/results/test_namespace/60_5family_dynamic_variable_outside_1_0.json b/tests/results/test_namespace/60_5family_dynamic_variable_outside_1_0.json index fdb0ab3..832f23d 100644 --- a/tests/results/test_namespace/60_5family_dynamic_variable_outside_1_0.json +++ b/tests/results/test_namespace/60_5family_dynamic_variable_outside_1_0.json @@ -9,15 +9,14 @@ "val2" ], "my_dyn_family_val1": { - "var": "string1" + "var": "val1" }, "my_dyn_family_val2": { - "var": "string1" + "var": "val2" }, "var2": [ - "string1", - "string2", - "string3" + "val1", + "val2" ] } }, @@ -29,15 +28,14 @@ "val2" ], "my_dyn_family_val1": { - "var": "string1" + "var": "val1" }, "my_dyn_family_val2": { - "var": "string1" + "var": "val2" }, "var2": [ - "string1", - "string2", - "string3" + "val1", + "val2" ] } } diff --git a/tests/results/test_namespace/60_5family_dynamic_variable_outside_empty.json b/tests/results/test_namespace/60_5family_dynamic_variable_outside_empty.json index fdb0ab3..53ff584 100644 --- a/tests/results/test_namespace/60_5family_dynamic_variable_outside_empty.json +++ b/tests/results/test_namespace/60_5family_dynamic_variable_outside_empty.json @@ -4,16 +4,7 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var": [ - "val1", - "val2" - ], - "my_dyn_family_val1": { - "var": "string1" - }, - "my_dyn_family_val2": { - "var": "string1" - }, + "var": [], "var2": [ "string1", "string2", @@ -24,16 +15,7 @@ "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var": [ - "val1", - "val2" - ], - "my_dyn_family_val1": { - "var": "string1" - }, - "my_dyn_family_val2": { - "var": "string1" - }, + "var": [], "var2": [ "string1", "string2", diff --git a/tests/results/test_namespace/60_5family_dynamic_variable_outside_jinja.json b/tests/results/test_namespace/60_5family_dynamic_variable_outside_jinja.json index fdb0ab3..832f23d 100644 --- a/tests/results/test_namespace/60_5family_dynamic_variable_outside_jinja.json +++ b/tests/results/test_namespace/60_5family_dynamic_variable_outside_jinja.json @@ -9,15 +9,14 @@ "val2" ], "my_dyn_family_val1": { - "var": "string1" + "var": "val1" }, "my_dyn_family_val2": { - "var": "string1" + "var": "val2" }, "var2": [ - "string1", - "string2", - "string3" + "val1", + "val2" ] } }, @@ -29,15 +28,14 @@ "val2" ], "my_dyn_family_val1": { - "var": "string1" + "var": "val1" }, "my_dyn_family_val2": { - "var": "string1" + "var": "val2" }, "var2": [ - "string1", - "string2", - "string3" + "val1", + "val2" ] } } diff --git a/tests/results/test_namespace/60_5family_dynamic_variable_outside_jinja_empty.json b/tests/results/test_namespace/60_5family_dynamic_variable_outside_jinja_empty.json index fdb0ab3..53ff584 100644 --- a/tests/results/test_namespace/60_5family_dynamic_variable_outside_jinja_empty.json +++ b/tests/results/test_namespace/60_5family_dynamic_variable_outside_jinja_empty.json @@ -4,16 +4,7 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var": [ - "val1", - "val2" - ], - "my_dyn_family_val1": { - "var": "string1" - }, - "my_dyn_family_val2": { - "var": "string1" - }, + "var": [], "var2": [ "string1", "string2", @@ -24,16 +15,7 @@ "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var": [ - "val1", - "val2" - ], - "my_dyn_family_val1": { - "var": "string1" - }, - "my_dyn_family_val2": { - "var": "string1" - }, + "var": [], "var2": [ "string1", "string2", diff --git a/tests/results/test_namespace/60_5family_dynamic_variable_outside_sub_suffix.json b/tests/results/test_namespace/60_5family_dynamic_variable_outside_sub_suffix.json index acbb433..c5ed698 100644 --- a/tests/results/test_namespace/60_5family_dynamic_variable_outside_sub_suffix.json +++ b/tests/results/test_namespace/60_5family_dynamic_variable_outside_sub_suffix.json @@ -10,24 +10,23 @@ ], "my_dyn_family_val1": { "subdyn_val1": { - "var": "string1" + "var": "val1" }, "subdyn_val2": { - "var": "string1" + "var": "val2" } }, "my_dyn_family_val2": { "subdyn_val1": { - "var": "string1" + "var": "val1" }, "subdyn_val2": { - "var": "string1" + "var": "val2" } }, "var2": [ - "string1", - "string2", - "string3" + "val1", + "val2" ] } }, @@ -40,24 +39,23 @@ ], "my_dyn_family_val1": { "subdyn_val1": { - "var": "string1" + "var": "val1" }, "subdyn_val2": { - "var": "string1" + "var": "val2" } }, "my_dyn_family_val2": { "subdyn_val1": { - "var": "string1" + "var": "val1" }, "subdyn_val2": { - "var": "string1" + "var": "val2" } }, "var2": [ - "string1", - "string2", - "string3" + "val1", + "val2" ] } } diff --git a/tests/results/test_namespace/60_5family_dynamic_variable_outside_sub_suffix_empty.json b/tests/results/test_namespace/60_5family_dynamic_variable_outside_sub_suffix_empty.json index acbb433..4c00a2b 100644 --- a/tests/results/test_namespace/60_5family_dynamic_variable_outside_sub_suffix_empty.json +++ b/tests/results/test_namespace/60_5family_dynamic_variable_outside_sub_suffix_empty.json @@ -4,61 +4,15 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var": [ - "val1", - "val2" - ], - "my_dyn_family_val1": { - "subdyn_val1": { - "var": "string1" - }, - "subdyn_val2": { - "var": "string1" - } - }, - "my_dyn_family_val2": { - "subdyn_val1": { - "var": "string1" - }, - "subdyn_val2": { - "var": "string1" - } - }, - "var2": [ - "string1", - "string2", - "string3" - ] + "var": [], + "var2": [] } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var": [ - "val1", - "val2" - ], - "my_dyn_family_val1": { - "subdyn_val1": { - "var": "string1" - }, - "subdyn_val2": { - "var": "string1" - } - }, - "my_dyn_family_val2": { - "subdyn_val1": { - "var": "string1" - }, - "subdyn_val2": { - "var": "string1" - } - }, - "var2": [ - "string1", - "string2", - "string3" - ] + "var": [], + "var2": [] } } } diff --git a/tests/results/test_namespace/60_5family_dynamic_variable_outside_suffix.json b/tests/results/test_namespace/60_5family_dynamic_variable_outside_suffix.json index 0a35fc1..b3b68cd 100644 --- a/tests/results/test_namespace/60_5family_dynamic_variable_outside_suffix.json +++ b/tests/results/test_namespace/60_5family_dynamic_variable_outside_suffix.json @@ -9,12 +9,12 @@ "val2" ], "dyn_val1": { - "var": "string1" + "var": "val1" }, "dyn_val2": { - "var": "string1" + "var": "val2" }, - "var2": "string1" + "var2": "val1" } }, "GROUP2_01": { @@ -25,12 +25,12 @@ "val2" ], "dyn_val1": { - "var": "string1" + "var": "val1" }, "dyn_val2": { - "var": "string1" + "var": "val2" }, - "var2": "string1" + "var2": "val1" } } } diff --git a/tests/results/test_namespace/60_5family_dynamic_variable_outside_suffix_empty.json b/tests/results/test_namespace/60_5family_dynamic_variable_outside_suffix_empty.json index 0a35fc1..e3f7f50 100644 --- a/tests/results/test_namespace/60_5family_dynamic_variable_outside_suffix_empty.json +++ b/tests/results/test_namespace/60_5family_dynamic_variable_outside_suffix_empty.json @@ -4,33 +4,15 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var": [ - "val1", - "val2" - ], - "dyn_val1": { - "var": "string1" - }, - "dyn_val2": { - "var": "string1" - }, - "var2": "string1" + "var": [], + "var2": null } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var": [ - "val1", - "val2" - ], - "dyn_val1": { - "var": "string1" - }, - "dyn_val2": { - "var": "string1" - }, - "var2": "string1" + "var": [], + "var2": null } } } diff --git a/tests/results/test_namespace/60_6family_dynamic_inside.json b/tests/results/test_namespace/60_6family_dynamic_inside.json index 960e084..6980b0f 100644 --- a/tests/results/test_namespace/60_6family_dynamic_inside.json +++ b/tests/results/test_namespace/60_6family_dynamic_inside.json @@ -9,16 +9,16 @@ "val2" ], "val1_dyn": { - "var1": "string1", - "var2": "string1", - "var3": "string1", - "var4": "string1" + "var1": "val1", + "var2": "val1", + "var3": "val1", + "var4": "val1" }, "val2_dyn": { - "var1": "string1", - "var2": "string1", - "var3": "string1", - "var4": "string1" + "var1": "val2", + "var2": "val2", + "var3": "val2", + "var4": "val1" } } }, @@ -30,16 +30,16 @@ "val2" ], "val1_dyn": { - "var1": "string1", - "var2": "string1", - "var3": "string1", - "var4": "string1" + "var1": "val1", + "var2": "val1", + "var3": "val1", + "var4": "val1" }, "val2_dyn": { - "var1": "string1", - "var2": "string1", - "var3": "string1", - "var4": "string1" + "var1": "val2", + "var2": "val2", + "var3": "val2", + "var4": "val1" } } } diff --git a/tests/results/test_namespace/60_6family_dynamic_inside_empty.json b/tests/results/test_namespace/60_6family_dynamic_inside_empty.json index 960e084..2794f02 100644 --- a/tests/results/test_namespace/60_6family_dynamic_inside_empty.json +++ b/tests/results/test_namespace/60_6family_dynamic_inside_empty.json @@ -4,43 +4,13 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var": [ - "val1", - "val2" - ], - "val1_dyn": { - "var1": "string1", - "var2": "string1", - "var3": "string1", - "var4": "string1" - }, - "val2_dyn": { - "var1": "string1", - "var2": "string1", - "var3": "string1", - "var4": "string1" - } + "var": [] } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var": [ - "val1", - "val2" - ], - "val1_dyn": { - "var1": "string1", - "var2": "string1", - "var3": "string1", - "var4": "string1" - }, - "val2_dyn": { - "var1": "string1", - "var2": "string1", - "var3": "string1", - "var4": "string1" - } + "var": [] } } } diff --git a/tests/results/test_namespace/60_6family_dynamic_leadership.json b/tests/results/test_namespace/60_6family_dynamic_leadership.json index dfab50c..7ac540b 100644 --- a/tests/results/test_namespace/60_6family_dynamic_leadership.json +++ b/tests/results/test_namespace/60_6family_dynamic_leadership.json @@ -12,18 +12,18 @@ "leadership": [ { "leader": "string1", - "follower1": "string1", - "follower2": "string1" + "follower1": null, + "follower2": null }, { "leader": "string2", - "follower1": "string2", - "follower2": "string2" + "follower1": null, + "follower2": null }, { "leader": "string3", - "follower1": "string3", - "follower2": "string3" + "follower1": null, + "follower2": null } ] }, @@ -31,18 +31,18 @@ "leadership": [ { "leader": "string1", - "follower1": "string1", - "follower2": "string1" + "follower1": null, + "follower2": null }, { "leader": "string2", - "follower1": "string2", - "follower2": "string2" + "follower1": null, + "follower2": null }, { "leader": "string3", - "follower1": "string3", - "follower2": "string3" + "follower1": null, + "follower2": null } ] } @@ -59,18 +59,18 @@ "leadership": [ { "leader": "string1", - "follower1": "string1", - "follower2": "string1" + "follower1": null, + "follower2": null }, { "leader": "string2", - "follower1": "string2", - "follower2": "string2" + "follower1": null, + "follower2": null }, { "leader": "string3", - "follower1": "string3", - "follower2": "string3" + "follower1": null, + "follower2": null } ] }, @@ -78,18 +78,18 @@ "leadership": [ { "leader": "string1", - "follower1": "string1", - "follower2": "string1" + "follower1": null, + "follower2": null }, { "leader": "string2", - "follower1": "string2", - "follower2": "string2" + "follower1": null, + "follower2": null }, { "leader": "string3", - "follower1": "string3", - "follower2": "string3" + "follower1": null, + "follower2": null } ] } diff --git a/tests/results/test_namespace/60_6family_dynamic_leadership_empty.json b/tests/results/test_namespace/60_6family_dynamic_leadership_empty.json index dfab50c..2794f02 100644 --- a/tests/results/test_namespace/60_6family_dynamic_leadership_empty.json +++ b/tests/results/test_namespace/60_6family_dynamic_leadership_empty.json @@ -4,95 +4,13 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var": [ - "val1", - "val2" - ], - "dynval1": { - "leadership": [ - { - "leader": "string1", - "follower1": "string1", - "follower2": "string1" - }, - { - "leader": "string2", - "follower1": "string2", - "follower2": "string2" - }, - { - "leader": "string3", - "follower1": "string3", - "follower2": "string3" - } - ] - }, - "dynval2": { - "leadership": [ - { - "leader": "string1", - "follower1": "string1", - "follower2": "string1" - }, - { - "leader": "string2", - "follower1": "string2", - "follower2": "string2" - }, - { - "leader": "string3", - "follower1": "string3", - "follower2": "string3" - } - ] - } + "var": [] } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var": [ - "val1", - "val2" - ], - "dynval1": { - "leadership": [ - { - "leader": "string1", - "follower1": "string1", - "follower2": "string1" - }, - { - "leader": "string2", - "follower1": "string2", - "follower2": "string2" - }, - { - "leader": "string3", - "follower1": "string3", - "follower2": "string3" - } - ] - }, - "dynval2": { - "leadership": [ - { - "leader": "string1", - "follower1": "string1", - "follower2": "string1" - }, - { - "leader": "string2", - "follower1": "string2", - "follower2": "string2" - }, - { - "leader": "string3", - "follower1": "string3", - "follower2": "string3" - } - ] - } + "var": [] } } } diff --git a/tests/results/test_namespace/60_6family_dynamic_sub_dynamic.json b/tests/results/test_namespace/60_6family_dynamic_sub_dynamic.json index 96f4003..8a9cc83 100644 --- a/tests/results/test_namespace/60_6family_dynamic_sub_dynamic.json +++ b/tests/results/test_namespace/60_6family_dynamic_sub_dynamic.json @@ -14,14 +14,14 @@ "tval2" ], "dyn_tval1": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" + "var": "tval1", + "var_identifier": "val1", + "var_identifiers": "val1-tval1" }, "dyn_tval2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" + "var": "tval2", + "var_identifier": "val1", + "var_identifiers": "val1-tval2" } }, "dynval2": { @@ -30,14 +30,14 @@ "tval2" ], "dyn_tval1": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" + "var": "tval1", + "var_identifier": "val2", + "var_identifiers": "val2-tval1" }, "dyn_tval2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" + "var": "tval2", + "var_identifier": "val2", + "var_identifiers": "val2-tval2" } } } @@ -55,14 +55,14 @@ "tval2" ], "dyn_tval1": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" + "var": "tval1", + "var_identifier": "val1", + "var_identifiers": "val1-tval1" }, "dyn_tval2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" + "var": "tval2", + "var_identifier": "val1", + "var_identifiers": "val1-tval2" } }, "dynval2": { @@ -71,14 +71,14 @@ "tval2" ], "dyn_tval1": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" + "var": "tval1", + "var_identifier": "val2", + "var_identifiers": "val2-tval1" }, "dyn_tval2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" + "var": "tval2", + "var_identifier": "val2", + "var_identifiers": "val2-tval2" } } } diff --git a/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_1_0.json b/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_1_0.json index 96f4003..8a9cc83 100644 --- a/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_1_0.json +++ b/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_1_0.json @@ -14,14 +14,14 @@ "tval2" ], "dyn_tval1": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" + "var": "tval1", + "var_identifier": "val1", + "var_identifiers": "val1-tval1" }, "dyn_tval2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" + "var": "tval2", + "var_identifier": "val1", + "var_identifiers": "val1-tval2" } }, "dynval2": { @@ -30,14 +30,14 @@ "tval2" ], "dyn_tval1": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" + "var": "tval1", + "var_identifier": "val2", + "var_identifiers": "val2-tval1" }, "dyn_tval2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" + "var": "tval2", + "var_identifier": "val2", + "var_identifiers": "val2-tval2" } } } @@ -55,14 +55,14 @@ "tval2" ], "dyn_tval1": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" + "var": "tval1", + "var_identifier": "val1", + "var_identifiers": "val1-tval1" }, "dyn_tval2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" + "var": "tval2", + "var_identifier": "val1", + "var_identifiers": "val1-tval2" } }, "dynval2": { @@ -71,14 +71,14 @@ "tval2" ], "dyn_tval1": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" + "var": "tval1", + "var_identifier": "val2", + "var_identifiers": "val2-tval1" }, "dyn_tval2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" + "var": "tval2", + "var_identifier": "val2", + "var_identifiers": "val2-tval2" } } } diff --git a/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty.json b/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty.json index 96f4003..2794f02 100644 --- a/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty.json +++ b/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty.json @@ -4,83 +4,13 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var": [ - "val1", - "val2" - ], - "dynval1": { - "var": [ - "tval1", - "tval2" - ], - "dyn_tval1": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_tval2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - } - }, - "dynval2": { - "var": [ - "tval1", - "tval2" - ], - "dyn_tval1": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_tval2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - } - } + "var": [] } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var": [ - "val1", - "val2" - ], - "dynval1": { - "var": [ - "tval1", - "tval2" - ], - "dyn_tval1": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_tval2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - } - }, - "dynval2": { - "var": [ - "tval1", - "tval2" - ], - "dyn_tval1": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_tval2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - } - } + "var": [] } } } diff --git a/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty2.json b/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty2.json index 702eca7..924d0c8 100644 --- a/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty2.json +++ b/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty2.json @@ -9,48 +9,10 @@ "val2" ], "dynval1": { - "var": [ - "string1", - "string2", - "string3" - ], - "dyn_string1": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string3": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - } + "var": [] }, "dynval2": { - "var": [ - "string1", - "string2", - "string3" - ], - "dyn_string1": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string3": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - } + "var": [] } } }, @@ -62,48 +24,10 @@ "val2" ], "dynval1": { - "var": [ - "string1", - "string2", - "string3" - ], - "dyn_string1": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string3": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - } + "var": [] }, "dynval2": { - "var": [ - "string1", - "string2", - "string3" - ], - "dyn_string1": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string3": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - } + "var": [] } } } diff --git a/tests/results/test_namespace/60_6family_dynamic_suffix_auto_multi.json b/tests/results/test_namespace/60_6family_dynamic_suffix_auto_multi.json new file mode 100644 index 0000000..2dd9753 --- /dev/null +++ b/tests/results/test_namespace/60_6family_dynamic_suffix_auto_multi.json @@ -0,0 +1,86 @@ +{ + "_meta": { + "hostvars": { + "GROUP1_01": { + "ansible_host": "group1.net", + "rougail": { + "var1": [ + "val1", + "val2" + ], + "dynval1": { + "dynval1": { + "var": "string1" + }, + "dynval2": { + "var": "string1" + } + }, + "dynval2": { + "dynval1": { + "var": "string1" + }, + "dynval2": { + "var": "string1" + } + }, + "var2": [ + "string1", + "string1" + ] + } + }, + "GROUP2_01": { + "ansible_host": "group2.net", + "rougail": { + "var1": [ + "val1", + "val2" + ], + "dynval1": { + "dynval1": { + "var": "string1" + }, + "dynval2": { + "var": "string1" + } + }, + "dynval2": { + "dynval1": { + "var": "string1" + }, + "dynval2": { + "var": "string1" + } + }, + "var2": [ + "string1", + "string1" + ] + } + } + } + }, + "all": { + "children": [ + "ungrouped", + "groups" + ] + }, + "group1": { + "hosts": [ + "GROUP1_01" + ] + }, + "group2": { + "hosts": [ + "GROUP2_01" + ] + }, + "groups": { + "children": [ + "group1", + "group2" + ] + } +} \ No newline at end of file diff --git a/tests/results/test_namespace/60_9extra_dynamic_extra.json b/tests/results/test_namespace/60_9extra_dynamic_extra.json index 0370058..09ac381 100644 --- a/tests/results/test_namespace/60_9extra_dynamic_extra.json +++ b/tests/results/test_namespace/60_9extra_dynamic_extra.json @@ -6,9 +6,7 @@ "rougail": { "general": { "varname": [ - "string1", - "string2", - "string3" + "a" ] } }, @@ -26,9 +24,7 @@ "rougail": { "general": { "varname": [ - "string1", - "string2", - "string3" + "a" ] } }, diff --git a/tests/results/test_namespace/60_9family_dynamic_calc_both.json b/tests/results/test_namespace/60_9family_dynamic_calc_both.json index 027ef3e..c7fed1c 100644 --- a/tests/results/test_namespace/60_9family_dynamic_calc_both.json +++ b/tests/results/test_namespace/60_9family_dynamic_calc_both.json @@ -4,11 +4,11 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "var": "string1", + "var": "val2", "dynval1": { "vardyn": "string1" }, - "dynstring1": { + "dynval2": { "vardyn": "string1" } } @@ -16,11 +16,11 @@ "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "var": "string1", + "var": "val2", "dynval1": { "vardyn": "string1" }, - "dynstring1": { + "dynval2": { "vardyn": "string1" } } diff --git a/tests/results/test_namespace/68_0family_leadership_mode.json b/tests/results/test_namespace/68_0family_leadership_mode.json index 442cbea..701b56d 100644 --- a/tests/results/test_namespace/68_0family_leadership_mode.json +++ b/tests/results/test_namespace/68_0family_leadership_mode.json @@ -4,45 +4,13 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "leader": [ - { - "leader": "string1", - "follower1": "string1", - "follower2": "string1" - }, - { - "leader": "string2", - "follower1": "string2", - "follower2": "string2" - }, - { - "leader": "string3", - "follower1": "string3", - "follower2": "string3" - } - ] + "leader": [] } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "leader": [ - { - "leader": "string1", - "follower1": "string1", - "follower2": "string1" - }, - { - "leader": "string2", - "follower1": "string2", - "follower2": "string2" - }, - { - "leader": "string3", - "follower1": "string3", - "follower2": "string3" - } - ] + "leader": [] } } } diff --git a/tests/results/test_namespace_mandatory/40_0leadership_leader_follower.json b/tests/results/test_namespace_mandatory/40_0leadership_leader_follower.json new file mode 100644 index 0000000..9883be5 --- /dev/null +++ b/tests/results/test_namespace_mandatory/40_0leadership_leader_follower.json @@ -0,0 +1,66 @@ +{ + "_meta": { + "hostvars": { + "GROUP1_01": { + "ansible_host": "group1.net", + "rougail": { + "leadership": [ + { + "leader": "string1", + "follower": "string1" + }, + { + "leader": "string2", + "follower": "string2" + }, + { + "leader": "string3", + "follower": "string3" + } + ] + } + }, + "GROUP2_01": { + "ansible_host": "group2.net", + "rougail": { + "leadership": [ + { + "leader": "string1", + "follower": "string1" + }, + { + "leader": "string2", + "follower": "string2" + }, + { + "leader": "string3", + "follower": "string3" + } + ] + } + } + } + }, + "all": { + "children": [ + "ungrouped", + "groups" + ] + }, + "group1": { + "hosts": [ + "GROUP1_01" + ] + }, + "group2": { + "hosts": [ + "GROUP2_01" + ] + }, + "groups": { + "children": [ + "group1", + "group2" + ] + } +} \ No newline at end of file diff --git a/tests/results/test_namespace_mandatory/40_9calculation_variable_leader_follower_multi_inside.json b/tests/results/test_namespace_mandatory/40_9calculation_variable_leader_follower_multi_inside.json new file mode 100644 index 0000000..a773dca --- /dev/null +++ b/tests/results/test_namespace_mandatory/40_9calculation_variable_leader_follower_multi_inside.json @@ -0,0 +1,90 @@ +{ + "_meta": { + "hostvars": { + "GROUP1_01": { + "ansible_host": "group1.net", + "rougail": { + "leadership": [ + { + "leader": "string1", + "follower": [ + "string1", + "string2", + "string3" + ] + }, + { + "leader": "string2", + "follower": [ + "string1", + "string2", + "string3" + ] + }, + { + "leader": "string3", + "follower": [ + "string1", + "string2", + "string3" + ] + } + ] + } + }, + "GROUP2_01": { + "ansible_host": "group2.net", + "rougail": { + "leadership": [ + { + "leader": "string1", + "follower": [ + "string1", + "string2", + "string3" + ] + }, + { + "leader": "string2", + "follower": [ + "string1", + "string2", + "string3" + ] + }, + { + "leader": "string3", + "follower": [ + "string1", + "string2", + "string3" + ] + } + ] + } + } + } + }, + "all": { + "children": [ + "ungrouped", + "groups" + ] + }, + "group1": { + "hosts": [ + "GROUP1_01" + ] + }, + "group2": { + "hosts": [ + "GROUP2_01" + ] + }, + "groups": { + "children": [ + "group1", + "group2" + ] + } +} \ No newline at end of file diff --git a/tests/results/test_namespace_mandatory/40_9leadership-calculation-outside-follower-no-mandatory.json b/tests/results/test_namespace_mandatory/40_9leadership-calculation-outside-follower-no-mandatory.json new file mode 100644 index 0000000..5decf99 --- /dev/null +++ b/tests/results/test_namespace_mandatory/40_9leadership-calculation-outside-follower-no-mandatory.json @@ -0,0 +1,76 @@ +{ + "_meta": { + "hostvars": { + "GROUP1_01": { + "ansible_host": "group1.net", + "rougail": { + "leader": [ + { + "leader": "string1", + "follower": "string1" + }, + { + "leader": "string2", + "follower": "string2" + }, + { + "leader": "string3", + "follower": "string3" + } + ], + "variable": [ + "string1", + "string2", + "string3" + ] + } + }, + "GROUP2_01": { + "ansible_host": "group2.net", + "rougail": { + "leader": [ + { + "leader": "string1", + "follower": "string1" + }, + { + "leader": "string2", + "follower": "string2" + }, + { + "leader": "string3", + "follower": "string3" + } + ], + "variable": [ + "string1", + "string2", + "string3" + ] + } + } + } + }, + "all": { + "children": [ + "ungrouped", + "groups" + ] + }, + "group1": { + "hosts": [ + "GROUP1_01" + ] + }, + "group2": { + "hosts": [ + "GROUP2_01" + ] + }, + "groups": { + "children": [ + "group1", + "group2" + ] + } +} \ No newline at end of file diff --git a/tests/results/test_namespace_mandatory/40_9leadership-calculation-variable.json b/tests/results/test_namespace_mandatory/40_9leadership-calculation-variable.json new file mode 100644 index 0000000..43dd77e --- /dev/null +++ b/tests/results/test_namespace_mandatory/40_9leadership-calculation-variable.json @@ -0,0 +1,82 @@ +{ + "_meta": { + "hostvars": { + "GROUP1_01": { + "ansible_host": "group1.net", + "rougail": { + "calculate": [ + "string1", + "string2", + "string3" + ], + "leader": [ + { + "leader": "string1", + "follower1": "string1", + "follower2": "string1" + }, + { + "leader": "string2", + "follower1": "string2", + "follower2": "string2" + }, + { + "leader": "string3", + "follower1": "string3", + "follower2": "string3" + } + ] + } + }, + "GROUP2_01": { + "ansible_host": "group2.net", + "rougail": { + "calculate": [ + "string1", + "string2", + "string3" + ], + "leader": [ + { + "leader": "string1", + "follower1": "string1", + "follower2": "string1" + }, + { + "leader": "string2", + "follower1": "string2", + "follower2": "string2" + }, + { + "leader": "string3", + "follower1": "string3", + "follower2": "string3" + } + ] + } + } + } + }, + "all": { + "children": [ + "ungrouped", + "groups" + ] + }, + "group1": { + "hosts": [ + "GROUP1_01" + ] + }, + "group2": { + "hosts": [ + "GROUP2_01" + ] + }, + "groups": { + "children": [ + "group1", + "group2" + ] + } +} \ No newline at end of file diff --git a/tests/results/test_namespace_mandatory/40_9leadership-calculation-variable_leader_follower.json b/tests/results/test_namespace_mandatory/40_9leadership-calculation-variable_leader_follower.json new file mode 100644 index 0000000..9310ae7 --- /dev/null +++ b/tests/results/test_namespace_mandatory/40_9leadership-calculation-variable_leader_follower.json @@ -0,0 +1,94 @@ +{ + "_meta": { + "hostvars": { + "GROUP1_01": { + "ansible_host": "group1.net", + "rougail": { + "leadership_1": [ + { + "leader": "string1", + "follower": "string1" + }, + { + "leader": "string2", + "follower": "string2" + }, + { + "leader": "string3", + "follower": "string3" + } + ], + "leadership_2": [ + { + "leader": "string1", + "follower": "string1" + }, + { + "leader": "string2", + "follower": "string2" + }, + { + "leader": "string3", + "follower": "string3" + } + ] + } + }, + "GROUP2_01": { + "ansible_host": "group2.net", + "rougail": { + "leadership_1": [ + { + "leader": "string1", + "follower": "string1" + }, + { + "leader": "string2", + "follower": "string2" + }, + { + "leader": "string3", + "follower": "string3" + } + ], + "leadership_2": [ + { + "leader": "string1", + "follower": "string1" + }, + { + "leader": "string2", + "follower": "string2" + }, + { + "leader": "string3", + "follower": "string3" + } + ] + } + } + } + }, + "all": { + "children": [ + "ungrouped", + "groups" + ] + }, + "group1": { + "hosts": [ + "GROUP1_01" + ] + }, + "group2": { + "hosts": [ + "GROUP2_01" + ] + }, + "groups": { + "children": [ + "group1", + "group2" + ] + } +} \ No newline at end of file diff --git a/tests/results/test_namespace_mandatory/40_9leadership-calculation-variable_leader_follower_not_same.json b/tests/results/test_namespace_mandatory/40_9leadership-calculation-variable_leader_follower_not_same.json new file mode 100644 index 0000000..b364802 --- /dev/null +++ b/tests/results/test_namespace_mandatory/40_9leadership-calculation-variable_leader_follower_not_same.json @@ -0,0 +1,118 @@ +{ + "_meta": { + "hostvars": { + "GROUP1_01": { + "ansible_host": "group1.net", + "rougail": { + "leadership_1": [ + { + "leader": "string1", + "follower": "string1" + }, + { + "leader": "string2", + "follower": "string2" + }, + { + "leader": "string3", + "follower": "string3" + } + ], + "leadership_2": [ + { + "leader": "string1", + "follower": [ + "string1", + "string2", + "string3" + ] + }, + { + "leader": "string2", + "follower": [ + "string1", + "string2", + "string3" + ] + }, + { + "leader": "string3", + "follower": [ + "string1", + "string2", + "string3" + ] + } + ] + } + }, + "GROUP2_01": { + "ansible_host": "group2.net", + "rougail": { + "leadership_1": [ + { + "leader": "string1", + "follower": "string1" + }, + { + "leader": "string2", + "follower": "string2" + }, + { + "leader": "string3", + "follower": "string3" + } + ], + "leadership_2": [ + { + "leader": "string1", + "follower": [ + "string1", + "string2", + "string3" + ] + }, + { + "leader": "string2", + "follower": [ + "string1", + "string2", + "string3" + ] + }, + { + "leader": "string3", + "follower": [ + "string1", + "string2", + "string3" + ] + } + ] + } + } + } + }, + "all": { + "children": [ + "ungrouped", + "groups" + ] + }, + "group1": { + "hosts": [ + "GROUP1_01" + ] + }, + "group2": { + "hosts": [ + "GROUP2_01" + ] + }, + "groups": { + "children": [ + "group1", + "group2" + ] + } +} \ No newline at end of file diff --git a/tests/results/test_namespace_mandatory/04_5disabled_calculation_variable_multi2.json b/tests/results/test_namespace_mandatory/60_0family_dynamic_upper_char.json similarity index 57% rename from tests/results/test_namespace_mandatory/04_5disabled_calculation_variable_multi2.json rename to tests/results/test_namespace_mandatory/60_0family_dynamic_upper_char.json index e970641..806c27b 100644 --- a/tests/results/test_namespace_mandatory/04_5disabled_calculation_variable_multi2.json +++ b/tests/results/test_namespace_mandatory/60_0family_dynamic_upper_char.json @@ -4,31 +4,31 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "condition": [ - "string1", - "string2", - "string3" + "var": [ + "Val1", + "VAL2" ], - "variable": [ - "string1", - "string2", - "string3" - ] + "dynval1": { + "var": "string1" + }, + "dynval2": { + "var": "string1" + } } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "condition": [ - "string1", - "string2", - "string3" + "var": [ + "Val1", + "VAL2" ], - "variable": [ - "string1", - "string2", - "string3" - ] + "dynval1": { + "var": "string1" + }, + "dynval2": { + "var": "string1" + } } } } diff --git a/tests/results/test_namespace_read_write/04_5disabled_calculation_variable_multi3.json b/tests/results/test_namespace_mandatory/60_5family_dynamic_calc_suffix_disabled2.json similarity index 75% rename from tests/results/test_namespace_read_write/04_5disabled_calculation_variable_multi3.json rename to tests/results/test_namespace_mandatory/60_5family_dynamic_calc_suffix_disabled2.json index 90f14b6..75847a7 100644 --- a/tests/results/test_namespace_read_write/04_5disabled_calculation_variable_multi3.json +++ b/tests/results/test_namespace_mandatory/60_5family_dynamic_calc_suffix_disabled2.json @@ -4,21 +4,25 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "condition": [ + "var1": [ "val1", "val2" ], - "variable": [] + "dynval1": {}, + "dynval2": {}, + "var2": "string1" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "condition": [ + "var1": [ "val1", "val2" ], - "variable": [] + "dynval1": {}, + "dynval2": {}, + "var2": "string1" } } } diff --git a/tests/results/test_namespace_mandatory/60_6family_dynamic_suffix_auto_multi.json b/tests/results/test_namespace_mandatory/60_6family_dynamic_suffix_auto_multi.json new file mode 100644 index 0000000..50c92f4 --- /dev/null +++ b/tests/results/test_namespace_mandatory/60_6family_dynamic_suffix_auto_multi.json @@ -0,0 +1,88 @@ +{ + "_meta": { + "hostvars": { + "GROUP1_01": { + "ansible_host": "group1.net", + "rougail": { + "var1": [ + "val1", + "val2" + ], + "dynval1": { + "dynval1": { + "var": "string1" + }, + "dynval2": { + "var": "string1" + } + }, + "dynval2": { + "dynval1": { + "var": "string1" + }, + "dynval2": { + "var": "string1" + } + }, + "var2": [ + "string1", + "string2", + "string3" + ] + } + }, + "GROUP2_01": { + "ansible_host": "group2.net", + "rougail": { + "var1": [ + "val1", + "val2" + ], + "dynval1": { + "dynval1": { + "var": "string1" + }, + "dynval2": { + "var": "string1" + } + }, + "dynval2": { + "dynval1": { + "var": "string1" + }, + "dynval2": { + "var": "string1" + } + }, + "var2": [ + "string1", + "string2", + "string3" + ] + } + } + } + }, + "all": { + "children": [ + "ungrouped", + "groups" + ] + }, + "group1": { + "hosts": [ + "GROUP1_01" + ] + }, + "group2": { + "hosts": [ + "GROUP2_01" + ] + }, + "groups": { + "children": [ + "group1", + "group2" + ] + } +} \ No newline at end of file diff --git a/tests/results/test_namespace_read_write/00_8calculation_namespace.json b/tests/results/test_namespace_read_write/00_8calculation_namespace.json index b485ba8..68728de 100644 --- a/tests/results/test_namespace_read_write/00_8calculation_namespace.json +++ b/tests/results/test_namespace_read_write/00_8calculation_namespace.json @@ -4,13 +4,13 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "variable": "hosts" + "variable": "Rougail" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "variable": "hosts" + "variable": "Rougail" } } } diff --git a/tests/results/test_namespace_read_write/40_0leadership_leader_follower.json b/tests/results/test_namespace_read_write/40_0leadership_leader_follower.json new file mode 100644 index 0000000..4695c30 --- /dev/null +++ b/tests/results/test_namespace_read_write/40_0leadership_leader_follower.json @@ -0,0 +1,58 @@ +{ + "_meta": { + "hostvars": { + "GROUP1_01": { + "ansible_host": "group1.net", + "rougail": { + "leadership": [ + { + "leader": "value1", + "follower": "value1" + }, + { + "leader": "value2", + "follower": "value2" + } + ] + } + }, + "GROUP2_01": { + "ansible_host": "group2.net", + "rougail": { + "leadership": [ + { + "leader": "value1", + "follower": "value1" + }, + { + "leader": "value2", + "follower": "value2" + } + ] + } + } + } + }, + "all": { + "children": [ + "ungrouped", + "groups" + ] + }, + "group1": { + "hosts": [ + "GROUP1_01" + ] + }, + "group2": { + "hosts": [ + "GROUP2_01" + ] + }, + "groups": { + "children": [ + "group1", + "group2" + ] + } +} \ No newline at end of file diff --git a/tests/results/test_namespace_read_write/40_9calculation_variable_leader_follower_multi_inside.json b/tests/results/test_namespace_read_write/40_9calculation_variable_leader_follower_multi_inside.json new file mode 100644 index 0000000..b62e8f9 --- /dev/null +++ b/tests/results/test_namespace_read_write/40_9calculation_variable_leader_follower_multi_inside.json @@ -0,0 +1,66 @@ +{ + "_meta": { + "hostvars": { + "GROUP1_01": { + "ansible_host": "group1.net", + "rougail": { + "leadership": [ + { + "leader": "value1", + "follower": [ + "value1" + ] + }, + { + "leader": "value2", + "follower": [ + "value2" + ] + } + ] + } + }, + "GROUP2_01": { + "ansible_host": "group2.net", + "rougail": { + "leadership": [ + { + "leader": "value1", + "follower": [ + "value1" + ] + }, + { + "leader": "value2", + "follower": [ + "value2" + ] + } + ] + } + } + } + }, + "all": { + "children": [ + "ungrouped", + "groups" + ] + }, + "group1": { + "hosts": [ + "GROUP1_01" + ] + }, + "group2": { + "hosts": [ + "GROUP2_01" + ] + }, + "groups": { + "children": [ + "group1", + "group2" + ] + } +} \ No newline at end of file diff --git a/tests/results/test_namespace_read_write/40_9leadership-calculation-outside-follower-no-mandatory.json b/tests/results/test_namespace_read_write/40_9leadership-calculation-outside-follower-no-mandatory.json new file mode 100644 index 0000000..65633b9 --- /dev/null +++ b/tests/results/test_namespace_read_write/40_9leadership-calculation-outside-follower-no-mandatory.json @@ -0,0 +1,66 @@ +{ + "_meta": { + "hostvars": { + "GROUP1_01": { + "ansible_host": "group1.net", + "rougail": { + "leader": [ + { + "leader": "a", + "follower": null + }, + { + "leader": "b", + "follower": null + } + ], + "variable": [ + null, + null + ] + } + }, + "GROUP2_01": { + "ansible_host": "group2.net", + "rougail": { + "leader": [ + { + "leader": "a", + "follower": null + }, + { + "leader": "b", + "follower": null + } + ], + "variable": [ + null, + null + ] + } + } + } + }, + "all": { + "children": [ + "ungrouped", + "groups" + ] + }, + "group1": { + "hosts": [ + "GROUP1_01" + ] + }, + "group2": { + "hosts": [ + "GROUP2_01" + ] + }, + "groups": { + "children": [ + "group1", + "group2" + ] + } +} \ No newline at end of file diff --git a/tests/results/test_namespace_read_write/40_9leadership-calculation-variable.json b/tests/results/test_namespace_read_write/40_9leadership-calculation-variable.json new file mode 100644 index 0000000..5bdf732 --- /dev/null +++ b/tests/results/test_namespace_read_write/40_9leadership-calculation-variable.json @@ -0,0 +1,70 @@ +{ + "_meta": { + "hostvars": { + "GROUP1_01": { + "ansible_host": "group1.net", + "rougail": { + "calculate": [ + "value1", + "value2" + ], + "leader": [ + { + "leader": "value1", + "follower1": "val11", + "follower2": "val21" + }, + { + "leader": "value2", + "follower1": "val11", + "follower2": "val21" + } + ] + } + }, + "GROUP2_01": { + "ansible_host": "group2.net", + "rougail": { + "calculate": [ + "value1", + "value2" + ], + "leader": [ + { + "leader": "value1", + "follower1": "val11", + "follower2": "val21" + }, + { + "leader": "value2", + "follower1": "val11", + "follower2": "val21" + } + ] + } + } + } + }, + "all": { + "children": [ + "ungrouped", + "groups" + ] + }, + "group1": { + "hosts": [ + "GROUP1_01" + ] + }, + "group2": { + "hosts": [ + "GROUP2_01" + ] + }, + "groups": { + "children": [ + "group1", + "group2" + ] + } +} \ No newline at end of file diff --git a/tests/results/test_namespace_read_write/40_9leadership-calculation-variable_leader_follower.json b/tests/results/test_namespace_read_write/40_9leadership-calculation-variable_leader_follower.json new file mode 100644 index 0000000..35474b1 --- /dev/null +++ b/tests/results/test_namespace_read_write/40_9leadership-calculation-variable_leader_follower.json @@ -0,0 +1,78 @@ +{ + "_meta": { + "hostvars": { + "GROUP1_01": { + "ansible_host": "group1.net", + "rougail": { + "leadership_1": [ + { + "leader": "value1", + "follower": null + }, + { + "leader": "value2", + "follower": null + } + ], + "leadership_2": [ + { + "leader": null, + "follower": "val" + }, + { + "leader": null, + "follower": "val" + } + ] + } + }, + "GROUP2_01": { + "ansible_host": "group2.net", + "rougail": { + "leadership_1": [ + { + "leader": "value1", + "follower": null + }, + { + "leader": "value2", + "follower": null + } + ], + "leadership_2": [ + { + "leader": null, + "follower": "val" + }, + { + "leader": null, + "follower": "val" + } + ] + } + } + } + }, + "all": { + "children": [ + "ungrouped", + "groups" + ] + }, + "group1": { + "hosts": [ + "GROUP1_01" + ] + }, + "group2": { + "hosts": [ + "GROUP2_01" + ] + }, + "groups": { + "children": [ + "group1", + "group2" + ] + } +} \ No newline at end of file diff --git a/tests/results/test_namespace_read_write/40_9leadership-calculation-variable_leader_follower_not_same.json b/tests/results/test_namespace_read_write/40_9leadership-calculation-variable_leader_follower_not_same.json new file mode 100644 index 0000000..86c4752 --- /dev/null +++ b/tests/results/test_namespace_read_write/40_9leadership-calculation-variable_leader_follower_not_same.json @@ -0,0 +1,90 @@ +{ + "_meta": { + "hostvars": { + "GROUP1_01": { + "ansible_host": "group1.net", + "rougail": { + "leadership_1": [ + { + "leader": "value1", + "follower": null + }, + { + "leader": "value2", + "follower": null + } + ], + "leadership_2": [ + { + "leader": "value1", + "follower": [ + "value1", + "value2" + ] + }, + { + "leader": "value2", + "follower": [ + "value1", + "value2" + ] + } + ] + } + }, + "GROUP2_01": { + "ansible_host": "group2.net", + "rougail": { + "leadership_1": [ + { + "leader": "value1", + "follower": null + }, + { + "leader": "value2", + "follower": null + } + ], + "leadership_2": [ + { + "leader": "value1", + "follower": [ + "value1", + "value2" + ] + }, + { + "leader": "value2", + "follower": [ + "value1", + "value2" + ] + } + ] + } + } + } + }, + "all": { + "children": [ + "ungrouped", + "groups" + ] + }, + "group1": { + "hosts": [ + "GROUP1_01" + ] + }, + "group2": { + "hosts": [ + "GROUP2_01" + ] + }, + "groups": { + "children": [ + "group1", + "group2" + ] + } +} \ No newline at end of file diff --git a/tests/results/test_namespace_mandatory/04_5disabled_calculation_variable_multi3.json b/tests/results/test_namespace_read_write/60_0family_dynamic_upper_char.json similarity index 57% rename from tests/results/test_namespace_mandatory/04_5disabled_calculation_variable_multi3.json rename to tests/results/test_namespace_read_write/60_0family_dynamic_upper_char.json index e970641..f93df77 100644 --- a/tests/results/test_namespace_mandatory/04_5disabled_calculation_variable_multi3.json +++ b/tests/results/test_namespace_read_write/60_0family_dynamic_upper_char.json @@ -4,31 +4,31 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "condition": [ - "string1", - "string2", - "string3" + "var": [ + "Val1", + "VAL2" ], - "variable": [ - "string1", - "string2", - "string3" - ] + "dynval1": { + "var": null + }, + "dynval2": { + "var": null + } } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "condition": [ - "string1", - "string2", - "string3" + "var": [ + "Val1", + "VAL2" ], - "variable": [ - "string1", - "string2", - "string3" - ] + "dynval1": { + "var": null + }, + "dynval2": { + "var": null + } } } } diff --git a/tests/results/test_namespace_read_write/04_5disabled_calculation_variable_multi2.json b/tests/results/test_namespace_read_write/60_5family_dynamic_calc_suffix_disabled2.json similarity index 84% rename from tests/results/test_namespace_read_write/04_5disabled_calculation_variable_multi2.json rename to tests/results/test_namespace_read_write/60_5family_dynamic_calc_suffix_disabled2.json index d0612c0..beba781 100644 --- a/tests/results/test_namespace_read_write/04_5disabled_calculation_variable_multi2.json +++ b/tests/results/test_namespace_read_write/60_5family_dynamic_calc_suffix_disabled2.json @@ -4,13 +4,15 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "condition": [] + "var1": [], + "var2": null } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "condition": [] + "var1": [], + "var2": null } } } diff --git a/tests/results/test_namespace_read_write/60_6family_dynamic_suffix_auto_multi.json b/tests/results/test_namespace_read_write/60_6family_dynamic_suffix_auto_multi.json new file mode 100644 index 0000000..9bd24c6 --- /dev/null +++ b/tests/results/test_namespace_read_write/60_6family_dynamic_suffix_auto_multi.json @@ -0,0 +1,86 @@ +{ + "_meta": { + "hostvars": { + "GROUP1_01": { + "ansible_host": "group1.net", + "rougail": { + "var1": [ + "val1", + "val2" + ], + "dynval1": { + "dynval1": { + "var": null + }, + "dynval2": { + "var": null + } + }, + "dynval2": { + "dynval1": { + "var": null + }, + "dynval2": { + "var": null + } + }, + "var2": [ + null, + null + ] + } + }, + "GROUP2_01": { + "ansible_host": "group2.net", + "rougail": { + "var1": [ + "val1", + "val2" + ], + "dynval1": { + "dynval1": { + "var": null + }, + "dynval2": { + "var": null + } + }, + "dynval2": { + "dynval1": { + "var": null + }, + "dynval2": { + "var": null + } + }, + "var2": [ + null, + null + ] + } + } + } + }, + "all": { + "children": [ + "ungrouped", + "groups" + ] + }, + "group1": { + "hosts": [ + "GROUP1_01" + ] + }, + "group2": { + "hosts": [ + "GROUP2_01" + ] + }, + "groups": { + "children": [ + "group1", + "group2" + ] + } +} \ No newline at end of file diff --git a/tests/results/test_namespace_read_write_mandatory/04_5disabled_calculation_variable_multi2.json b/tests/results/test_namespace_read_write_mandatory/04_5disabled_calculation_variable_multi2.json deleted file mode 100644 index e970641..0000000 --- a/tests/results/test_namespace_read_write_mandatory/04_5disabled_calculation_variable_multi2.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "_meta": { - "hostvars": { - "GROUP1_01": { - "ansible_host": "group1.net", - "rougail": { - "condition": [ - "string1", - "string2", - "string3" - ], - "variable": [ - "string1", - "string2", - "string3" - ] - } - }, - "GROUP2_01": { - "ansible_host": "group2.net", - "rougail": { - "condition": [ - "string1", - "string2", - "string3" - ], - "variable": [ - "string1", - "string2", - "string3" - ] - } - } - } - }, - "all": { - "children": [ - "ungrouped", - "groups" - ] - }, - "group1": { - "hosts": [ - "GROUP1_01" - ] - }, - "group2": { - "hosts": [ - "GROUP2_01" - ] - }, - "groups": { - "children": [ - "group1", - "group2" - ] - } -} \ No newline at end of file diff --git a/tests/results/test_namespace_read_write_mandatory/04_5disabled_calculation_variable_multi3.json b/tests/results/test_namespace_read_write_mandatory/04_5disabled_calculation_variable_multi3.json deleted file mode 100644 index e970641..0000000 --- a/tests/results/test_namespace_read_write_mandatory/04_5disabled_calculation_variable_multi3.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "_meta": { - "hostvars": { - "GROUP1_01": { - "ansible_host": "group1.net", - "rougail": { - "condition": [ - "string1", - "string2", - "string3" - ], - "variable": [ - "string1", - "string2", - "string3" - ] - } - }, - "GROUP2_01": { - "ansible_host": "group2.net", - "rougail": { - "condition": [ - "string1", - "string2", - "string3" - ], - "variable": [ - "string1", - "string2", - "string3" - ] - } - } - } - }, - "all": { - "children": [ - "ungrouped", - "groups" - ] - }, - "group1": { - "hosts": [ - "GROUP1_01" - ] - }, - "group2": { - "hosts": [ - "GROUP2_01" - ] - }, - "groups": { - "children": [ - "group1", - "group2" - ] - } -} \ No newline at end of file diff --git a/tests/results/test_namespace_read_write_mandatory/40_0leadership_leader_follower.json b/tests/results/test_namespace_read_write_mandatory/40_0leadership_leader_follower.json new file mode 100644 index 0000000..9883be5 --- /dev/null +++ b/tests/results/test_namespace_read_write_mandatory/40_0leadership_leader_follower.json @@ -0,0 +1,66 @@ +{ + "_meta": { + "hostvars": { + "GROUP1_01": { + "ansible_host": "group1.net", + "rougail": { + "leadership": [ + { + "leader": "string1", + "follower": "string1" + }, + { + "leader": "string2", + "follower": "string2" + }, + { + "leader": "string3", + "follower": "string3" + } + ] + } + }, + "GROUP2_01": { + "ansible_host": "group2.net", + "rougail": { + "leadership": [ + { + "leader": "string1", + "follower": "string1" + }, + { + "leader": "string2", + "follower": "string2" + }, + { + "leader": "string3", + "follower": "string3" + } + ] + } + } + } + }, + "all": { + "children": [ + "ungrouped", + "groups" + ] + }, + "group1": { + "hosts": [ + "GROUP1_01" + ] + }, + "group2": { + "hosts": [ + "GROUP2_01" + ] + }, + "groups": { + "children": [ + "group1", + "group2" + ] + } +} \ No newline at end of file diff --git a/tests/results/test_namespace_read_write_mandatory/40_9calculation_variable_leader_follower_multi_inside.json b/tests/results/test_namespace_read_write_mandatory/40_9calculation_variable_leader_follower_multi_inside.json new file mode 100644 index 0000000..a773dca --- /dev/null +++ b/tests/results/test_namespace_read_write_mandatory/40_9calculation_variable_leader_follower_multi_inside.json @@ -0,0 +1,90 @@ +{ + "_meta": { + "hostvars": { + "GROUP1_01": { + "ansible_host": "group1.net", + "rougail": { + "leadership": [ + { + "leader": "string1", + "follower": [ + "string1", + "string2", + "string3" + ] + }, + { + "leader": "string2", + "follower": [ + "string1", + "string2", + "string3" + ] + }, + { + "leader": "string3", + "follower": [ + "string1", + "string2", + "string3" + ] + } + ] + } + }, + "GROUP2_01": { + "ansible_host": "group2.net", + "rougail": { + "leadership": [ + { + "leader": "string1", + "follower": [ + "string1", + "string2", + "string3" + ] + }, + { + "leader": "string2", + "follower": [ + "string1", + "string2", + "string3" + ] + }, + { + "leader": "string3", + "follower": [ + "string1", + "string2", + "string3" + ] + } + ] + } + } + } + }, + "all": { + "children": [ + "ungrouped", + "groups" + ] + }, + "group1": { + "hosts": [ + "GROUP1_01" + ] + }, + "group2": { + "hosts": [ + "GROUP2_01" + ] + }, + "groups": { + "children": [ + "group1", + "group2" + ] + } +} \ No newline at end of file diff --git a/tests/results/test_namespace_read_write_mandatory/40_9leadership-calculation-outside-follower-no-mandatory.json b/tests/results/test_namespace_read_write_mandatory/40_9leadership-calculation-outside-follower-no-mandatory.json new file mode 100644 index 0000000..5decf99 --- /dev/null +++ b/tests/results/test_namespace_read_write_mandatory/40_9leadership-calculation-outside-follower-no-mandatory.json @@ -0,0 +1,76 @@ +{ + "_meta": { + "hostvars": { + "GROUP1_01": { + "ansible_host": "group1.net", + "rougail": { + "leader": [ + { + "leader": "string1", + "follower": "string1" + }, + { + "leader": "string2", + "follower": "string2" + }, + { + "leader": "string3", + "follower": "string3" + } + ], + "variable": [ + "string1", + "string2", + "string3" + ] + } + }, + "GROUP2_01": { + "ansible_host": "group2.net", + "rougail": { + "leader": [ + { + "leader": "string1", + "follower": "string1" + }, + { + "leader": "string2", + "follower": "string2" + }, + { + "leader": "string3", + "follower": "string3" + } + ], + "variable": [ + "string1", + "string2", + "string3" + ] + } + } + } + }, + "all": { + "children": [ + "ungrouped", + "groups" + ] + }, + "group1": { + "hosts": [ + "GROUP1_01" + ] + }, + "group2": { + "hosts": [ + "GROUP2_01" + ] + }, + "groups": { + "children": [ + "group1", + "group2" + ] + } +} \ No newline at end of file diff --git a/tests/results/test_namespace_read_write_mandatory/40_9leadership-calculation-variable.json b/tests/results/test_namespace_read_write_mandatory/40_9leadership-calculation-variable.json new file mode 100644 index 0000000..43dd77e --- /dev/null +++ b/tests/results/test_namespace_read_write_mandatory/40_9leadership-calculation-variable.json @@ -0,0 +1,82 @@ +{ + "_meta": { + "hostvars": { + "GROUP1_01": { + "ansible_host": "group1.net", + "rougail": { + "calculate": [ + "string1", + "string2", + "string3" + ], + "leader": [ + { + "leader": "string1", + "follower1": "string1", + "follower2": "string1" + }, + { + "leader": "string2", + "follower1": "string2", + "follower2": "string2" + }, + { + "leader": "string3", + "follower1": "string3", + "follower2": "string3" + } + ] + } + }, + "GROUP2_01": { + "ansible_host": "group2.net", + "rougail": { + "calculate": [ + "string1", + "string2", + "string3" + ], + "leader": [ + { + "leader": "string1", + "follower1": "string1", + "follower2": "string1" + }, + { + "leader": "string2", + "follower1": "string2", + "follower2": "string2" + }, + { + "leader": "string3", + "follower1": "string3", + "follower2": "string3" + } + ] + } + } + } + }, + "all": { + "children": [ + "ungrouped", + "groups" + ] + }, + "group1": { + "hosts": [ + "GROUP1_01" + ] + }, + "group2": { + "hosts": [ + "GROUP2_01" + ] + }, + "groups": { + "children": [ + "group1", + "group2" + ] + } +} \ No newline at end of file diff --git a/tests/results/test_namespace_read_write_mandatory/40_9leadership-calculation-variable_leader_follower.json b/tests/results/test_namespace_read_write_mandatory/40_9leadership-calculation-variable_leader_follower.json new file mode 100644 index 0000000..9310ae7 --- /dev/null +++ b/tests/results/test_namespace_read_write_mandatory/40_9leadership-calculation-variable_leader_follower.json @@ -0,0 +1,94 @@ +{ + "_meta": { + "hostvars": { + "GROUP1_01": { + "ansible_host": "group1.net", + "rougail": { + "leadership_1": [ + { + "leader": "string1", + "follower": "string1" + }, + { + "leader": "string2", + "follower": "string2" + }, + { + "leader": "string3", + "follower": "string3" + } + ], + "leadership_2": [ + { + "leader": "string1", + "follower": "string1" + }, + { + "leader": "string2", + "follower": "string2" + }, + { + "leader": "string3", + "follower": "string3" + } + ] + } + }, + "GROUP2_01": { + "ansible_host": "group2.net", + "rougail": { + "leadership_1": [ + { + "leader": "string1", + "follower": "string1" + }, + { + "leader": "string2", + "follower": "string2" + }, + { + "leader": "string3", + "follower": "string3" + } + ], + "leadership_2": [ + { + "leader": "string1", + "follower": "string1" + }, + { + "leader": "string2", + "follower": "string2" + }, + { + "leader": "string3", + "follower": "string3" + } + ] + } + } + } + }, + "all": { + "children": [ + "ungrouped", + "groups" + ] + }, + "group1": { + "hosts": [ + "GROUP1_01" + ] + }, + "group2": { + "hosts": [ + "GROUP2_01" + ] + }, + "groups": { + "children": [ + "group1", + "group2" + ] + } +} \ No newline at end of file diff --git a/tests/results/test_namespace_read_write_mandatory/40_9leadership-calculation-variable_leader_follower_not_same.json b/tests/results/test_namespace_read_write_mandatory/40_9leadership-calculation-variable_leader_follower_not_same.json new file mode 100644 index 0000000..b364802 --- /dev/null +++ b/tests/results/test_namespace_read_write_mandatory/40_9leadership-calculation-variable_leader_follower_not_same.json @@ -0,0 +1,118 @@ +{ + "_meta": { + "hostvars": { + "GROUP1_01": { + "ansible_host": "group1.net", + "rougail": { + "leadership_1": [ + { + "leader": "string1", + "follower": "string1" + }, + { + "leader": "string2", + "follower": "string2" + }, + { + "leader": "string3", + "follower": "string3" + } + ], + "leadership_2": [ + { + "leader": "string1", + "follower": [ + "string1", + "string2", + "string3" + ] + }, + { + "leader": "string2", + "follower": [ + "string1", + "string2", + "string3" + ] + }, + { + "leader": "string3", + "follower": [ + "string1", + "string2", + "string3" + ] + } + ] + } + }, + "GROUP2_01": { + "ansible_host": "group2.net", + "rougail": { + "leadership_1": [ + { + "leader": "string1", + "follower": "string1" + }, + { + "leader": "string2", + "follower": "string2" + }, + { + "leader": "string3", + "follower": "string3" + } + ], + "leadership_2": [ + { + "leader": "string1", + "follower": [ + "string1", + "string2", + "string3" + ] + }, + { + "leader": "string2", + "follower": [ + "string1", + "string2", + "string3" + ] + }, + { + "leader": "string3", + "follower": [ + "string1", + "string2", + "string3" + ] + } + ] + } + } + } + }, + "all": { + "children": [ + "ungrouped", + "groups" + ] + }, + "group1": { + "hosts": [ + "GROUP1_01" + ] + }, + "group2": { + "hosts": [ + "GROUP2_01" + ] + }, + "groups": { + "children": [ + "group1", + "group2" + ] + } +} \ No newline at end of file diff --git a/tests/results/test_namespace_read_write_mandatory/60_0family_dynamic_upper_char.json b/tests/results/test_namespace_read_write_mandatory/60_0family_dynamic_upper_char.json new file mode 100644 index 0000000..806c27b --- /dev/null +++ b/tests/results/test_namespace_read_write_mandatory/60_0family_dynamic_upper_char.json @@ -0,0 +1,58 @@ +{ + "_meta": { + "hostvars": { + "GROUP1_01": { + "ansible_host": "group1.net", + "rougail": { + "var": [ + "Val1", + "VAL2" + ], + "dynval1": { + "var": "string1" + }, + "dynval2": { + "var": "string1" + } + } + }, + "GROUP2_01": { + "ansible_host": "group2.net", + "rougail": { + "var": [ + "Val1", + "VAL2" + ], + "dynval1": { + "var": "string1" + }, + "dynval2": { + "var": "string1" + } + } + } + } + }, + "all": { + "children": [ + "ungrouped", + "groups" + ] + }, + "group1": { + "hosts": [ + "GROUP1_01" + ] + }, + "group2": { + "hosts": [ + "GROUP2_01" + ] + }, + "groups": { + "children": [ + "group1", + "group2" + ] + } +} \ No newline at end of file diff --git a/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_calc_suffix_disabled2.json b/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_calc_suffix_disabled2.json new file mode 100644 index 0000000..75847a7 --- /dev/null +++ b/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_calc_suffix_disabled2.json @@ -0,0 +1,52 @@ +{ + "_meta": { + "hostvars": { + "GROUP1_01": { + "ansible_host": "group1.net", + "rougail": { + "var1": [ + "val1", + "val2" + ], + "dynval1": {}, + "dynval2": {}, + "var2": "string1" + } + }, + "GROUP2_01": { + "ansible_host": "group2.net", + "rougail": { + "var1": [ + "val1", + "val2" + ], + "dynval1": {}, + "dynval2": {}, + "var2": "string1" + } + } + } + }, + "all": { + "children": [ + "ungrouped", + "groups" + ] + }, + "group1": { + "hosts": [ + "GROUP1_01" + ] + }, + "group2": { + "hosts": [ + "GROUP2_01" + ] + }, + "groups": { + "children": [ + "group1", + "group2" + ] + } +} \ No newline at end of file diff --git a/tests/results/test_namespace_read_write_mandatory/60_6family_dynamic_suffix_auto_multi.json b/tests/results/test_namespace_read_write_mandatory/60_6family_dynamic_suffix_auto_multi.json new file mode 100644 index 0000000..50c92f4 --- /dev/null +++ b/tests/results/test_namespace_read_write_mandatory/60_6family_dynamic_suffix_auto_multi.json @@ -0,0 +1,88 @@ +{ + "_meta": { + "hostvars": { + "GROUP1_01": { + "ansible_host": "group1.net", + "rougail": { + "var1": [ + "val1", + "val2" + ], + "dynval1": { + "dynval1": { + "var": "string1" + }, + "dynval2": { + "var": "string1" + } + }, + "dynval2": { + "dynval1": { + "var": "string1" + }, + "dynval2": { + "var": "string1" + } + }, + "var2": [ + "string1", + "string2", + "string3" + ] + } + }, + "GROUP2_01": { + "ansible_host": "group2.net", + "rougail": { + "var1": [ + "val1", + "val2" + ], + "dynval1": { + "dynval1": { + "var": "string1" + }, + "dynval2": { + "var": "string1" + } + }, + "dynval2": { + "dynval1": { + "var": "string1" + }, + "dynval2": { + "var": "string1" + } + }, + "var2": [ + "string1", + "string2", + "string3" + ] + } + } + } + }, + "all": { + "children": [ + "ungrouped", + "groups" + ] + }, + "group1": { + "hosts": [ + "GROUP1_01" + ] + }, + "group2": { + "hosts": [ + "GROUP2_01" + ] + }, + "groups": { + "children": [ + "group1", + "group2" + ] + } +} \ No newline at end of file diff --git a/tests/results/test_namespace_read_write_mandatory_errors/00_8calculation_namespace.json b/tests/results/test_namespace_read_write_mandatory_errors/00_8calculation_namespace.json index b485ba8..68728de 100644 --- a/tests/results/test_namespace_read_write_mandatory_errors/00_8calculation_namespace.json +++ b/tests/results/test_namespace_read_write_mandatory_errors/00_8calculation_namespace.json @@ -4,13 +4,13 @@ "GROUP1_01": { "ansible_host": "group1.net", "rougail": { - "variable": "hosts" + "variable": "Rougail" } }, "GROUP2_01": { "ansible_host": "group2.net", "rougail": { - "variable": "hosts" + "variable": "Rougail" } } } diff --git a/tests/results/test_namespace_read_write_mandatory_errors/40_0leadership_leader_follower.json b/tests/results/test_namespace_read_write_mandatory_errors/40_0leadership_leader_follower.json new file mode 100644 index 0000000..4695c30 --- /dev/null +++ b/tests/results/test_namespace_read_write_mandatory_errors/40_0leadership_leader_follower.json @@ -0,0 +1,58 @@ +{ + "_meta": { + "hostvars": { + "GROUP1_01": { + "ansible_host": "group1.net", + "rougail": { + "leadership": [ + { + "leader": "value1", + "follower": "value1" + }, + { + "leader": "value2", + "follower": "value2" + } + ] + } + }, + "GROUP2_01": { + "ansible_host": "group2.net", + "rougail": { + "leadership": [ + { + "leader": "value1", + "follower": "value1" + }, + { + "leader": "value2", + "follower": "value2" + } + ] + } + } + } + }, + "all": { + "children": [ + "ungrouped", + "groups" + ] + }, + "group1": { + "hosts": [ + "GROUP1_01" + ] + }, + "group2": { + "hosts": [ + "GROUP2_01" + ] + }, + "groups": { + "children": [ + "group1", + "group2" + ] + } +} \ No newline at end of file diff --git a/tests/results/test_namespace_read_write_mandatory_errors/40_9calculation_variable_leader_follower_multi_inside.json b/tests/results/test_namespace_read_write_mandatory_errors/40_9calculation_variable_leader_follower_multi_inside.json new file mode 100644 index 0000000..b62e8f9 --- /dev/null +++ b/tests/results/test_namespace_read_write_mandatory_errors/40_9calculation_variable_leader_follower_multi_inside.json @@ -0,0 +1,66 @@ +{ + "_meta": { + "hostvars": { + "GROUP1_01": { + "ansible_host": "group1.net", + "rougail": { + "leadership": [ + { + "leader": "value1", + "follower": [ + "value1" + ] + }, + { + "leader": "value2", + "follower": [ + "value2" + ] + } + ] + } + }, + "GROUP2_01": { + "ansible_host": "group2.net", + "rougail": { + "leadership": [ + { + "leader": "value1", + "follower": [ + "value1" + ] + }, + { + "leader": "value2", + "follower": [ + "value2" + ] + } + ] + } + } + } + }, + "all": { + "children": [ + "ungrouped", + "groups" + ] + }, + "group1": { + "hosts": [ + "GROUP1_01" + ] + }, + "group2": { + "hosts": [ + "GROUP2_01" + ] + }, + "groups": { + "children": [ + "group1", + "group2" + ] + } +} \ No newline at end of file diff --git a/tests/results/test_namespace_read_write_mandatory_errors/40_9leadership-calculation-outside-follower-no-mandatory.json b/tests/results/test_namespace_read_write_mandatory_errors/40_9leadership-calculation-outside-follower-no-mandatory.json new file mode 100644 index 0000000..65633b9 --- /dev/null +++ b/tests/results/test_namespace_read_write_mandatory_errors/40_9leadership-calculation-outside-follower-no-mandatory.json @@ -0,0 +1,66 @@ +{ + "_meta": { + "hostvars": { + "GROUP1_01": { + "ansible_host": "group1.net", + "rougail": { + "leader": [ + { + "leader": "a", + "follower": null + }, + { + "leader": "b", + "follower": null + } + ], + "variable": [ + null, + null + ] + } + }, + "GROUP2_01": { + "ansible_host": "group2.net", + "rougail": { + "leader": [ + { + "leader": "a", + "follower": null + }, + { + "leader": "b", + "follower": null + } + ], + "variable": [ + null, + null + ] + } + } + } + }, + "all": { + "children": [ + "ungrouped", + "groups" + ] + }, + "group1": { + "hosts": [ + "GROUP1_01" + ] + }, + "group2": { + "hosts": [ + "GROUP2_01" + ] + }, + "groups": { + "children": [ + "group1", + "group2" + ] + } +} \ No newline at end of file diff --git a/tests/results/test_namespace_read_write_mandatory_errors/40_9leadership-calculation-variable.json b/tests/results/test_namespace_read_write_mandatory_errors/40_9leadership-calculation-variable.json new file mode 100644 index 0000000..5bdf732 --- /dev/null +++ b/tests/results/test_namespace_read_write_mandatory_errors/40_9leadership-calculation-variable.json @@ -0,0 +1,70 @@ +{ + "_meta": { + "hostvars": { + "GROUP1_01": { + "ansible_host": "group1.net", + "rougail": { + "calculate": [ + "value1", + "value2" + ], + "leader": [ + { + "leader": "value1", + "follower1": "val11", + "follower2": "val21" + }, + { + "leader": "value2", + "follower1": "val11", + "follower2": "val21" + } + ] + } + }, + "GROUP2_01": { + "ansible_host": "group2.net", + "rougail": { + "calculate": [ + "value1", + "value2" + ], + "leader": [ + { + "leader": "value1", + "follower1": "val11", + "follower2": "val21" + }, + { + "leader": "value2", + "follower1": "val11", + "follower2": "val21" + } + ] + } + } + } + }, + "all": { + "children": [ + "ungrouped", + "groups" + ] + }, + "group1": { + "hosts": [ + "GROUP1_01" + ] + }, + "group2": { + "hosts": [ + "GROUP2_01" + ] + }, + "groups": { + "children": [ + "group1", + "group2" + ] + } +} \ No newline at end of file diff --git a/tests/results/test_namespace_read_write_mandatory_errors/40_9leadership-calculation-variable_leader_follower.json b/tests/results/test_namespace_read_write_mandatory_errors/40_9leadership-calculation-variable_leader_follower.json new file mode 100644 index 0000000..80ffff7 --- /dev/null +++ b/tests/results/test_namespace_read_write_mandatory_errors/40_9leadership-calculation-variable_leader_follower.json @@ -0,0 +1,24 @@ +{ + "_meta": { + "hostvars": { + "localhost": { + "_errors": [ + "The following variables are mandatory but have no value:", + " - rougail.leadership_1.follower (a follower)", + " - rougail.leadership_1.follower (a follower)", + " - rougail.leadership_2.leader (a leader)" + ] + } + } + }, + "all": { + "children": [ + "ungrouped" + ] + }, + "ungrouped": { + "hosts": [ + "localhost" + ] + } +} \ No newline at end of file diff --git a/tests/results/test_namespace_read_write_mandatory_errors/40_9leadership-calculation-variable_leader_follower_not_same.json b/tests/results/test_namespace_read_write_mandatory_errors/40_9leadership-calculation-variable_leader_follower_not_same.json new file mode 100644 index 0000000..78e1289 --- /dev/null +++ b/tests/results/test_namespace_read_write_mandatory_errors/40_9leadership-calculation-variable_leader_follower_not_same.json @@ -0,0 +1,23 @@ +{ + "_meta": { + "hostvars": { + "localhost": { + "_errors": [ + "The following variables are mandatory but have no value:", + " - rougail.leadership_1.follower (a follower)", + " - rougail.leadership_1.follower (a follower)" + ] + } + } + }, + "all": { + "children": [ + "ungrouped" + ] + }, + "ungrouped": { + "hosts": [ + "localhost" + ] + } +} \ No newline at end of file diff --git a/tests/results/test_namespace_read_write_mandatory_errors/04_5disabled_calculation_variable_multi3.json b/tests/results/test_namespace_read_write_mandatory_errors/60_0family_dynamic_upper_char.json similarity index 71% rename from tests/results/test_namespace_read_write_mandatory_errors/04_5disabled_calculation_variable_multi3.json rename to tests/results/test_namespace_read_write_mandatory_errors/60_0family_dynamic_upper_char.json index 25cc8b7..c51b8cc 100644 --- a/tests/results/test_namespace_read_write_mandatory_errors/04_5disabled_calculation_variable_multi3.json +++ b/tests/results/test_namespace_read_write_mandatory_errors/60_0family_dynamic_upper_char.json @@ -4,7 +4,8 @@ "localhost": { "_errors": [ "The following variables are mandatory but have no value:", - " - rougail.variable (a variable)" + " - rougail.dynval1.var (A dynamic variable)", + " - rougail.dynval2.var (A dynamic variable)" ] } } diff --git a/tests/results/test_namespace_read_write_mandatory_errors/04_5disabled_calculation_variable_multi2.json b/tests/results/test_namespace_read_write_mandatory_errors/60_5family_dynamic_calc_suffix_disabled2.json similarity index 84% rename from tests/results/test_namespace_read_write_mandatory_errors/04_5disabled_calculation_variable_multi2.json rename to tests/results/test_namespace_read_write_mandatory_errors/60_5family_dynamic_calc_suffix_disabled2.json index 7fe8500..63926c8 100644 --- a/tests/results/test_namespace_read_write_mandatory_errors/04_5disabled_calculation_variable_multi2.json +++ b/tests/results/test_namespace_read_write_mandatory_errors/60_5family_dynamic_calc_suffix_disabled2.json @@ -4,7 +4,7 @@ "localhost": { "_errors": [ "The following variables are mandatory but have no value:", - " - rougail.condition (a condition)" + " - rougail.var2 (A variable calculated)" ] } } diff --git a/tests/results/test_namespace_read_write_mandatory_errors/60_6family_dynamic_suffix_auto_multi.json b/tests/results/test_namespace_read_write_mandatory_errors/60_6family_dynamic_suffix_auto_multi.json new file mode 100644 index 0000000..fcacd5b --- /dev/null +++ b/tests/results/test_namespace_read_write_mandatory_errors/60_6family_dynamic_suffix_auto_multi.json @@ -0,0 +1,26 @@ +{ + "_meta": { + "hostvars": { + "localhost": { + "_errors": [ + "The following variables are mandatory but have no value:", + " - rougail.dynval1.dynval1.var (A dynamic variable)", + " - rougail.dynval2.dynval2.var (A dynamic variable)", + " - rougail.dynval1.dynval1.var (A dynamic variable)", + " - rougail.dynval2.dynval2.var (A dynamic variable)", + " - rougail.var2 (A variable calculated)" + ] + } + } + }, + "all": { + "children": [ + "ungrouped" + ] + }, + "ungrouped": { + "hosts": [ + "localhost" + ] + } +} \ No newline at end of file diff --git a/tests/test_load.py b/tests/test_load.py index 2a15ba6..4fd150c 100644 --- a/tests/test_load.py +++ b/tests/test_load.py @@ -57,7 +57,10 @@ def _test_dictionaries(test_dir, namespace, ext, *, read_write=True, mandatory=F config = rougail.run() ################################## if do_calc and (mandatory or not read_write): - get_values_for_config(config) + if mandatory: + get_values_for_config(config) + else: + get_values_for_config(config, level="mandatories") ################################## generated_output = RougailOutput(config, rougailconfig=rougailconfig).run()[1] output_file = Path(__file__).parent / 'results' / dir_name / (test_dir.name + "." + ext)