From 9dda1a8550c3e79448c7dcfdb7674df93eeea2f3 Mon Sep 17 00:00:00 2001 From: Nicolas Charles Date: Mon, 14 Dec 2015 10:04:05 +0100 Subject: [PATCH] Fixes #7605: Policies errors on policies generation --- .../rudder/services/policies/SystemVariableService.scala | 4 ++-- .../root-default-install/common/1.0/rudder-groups.cf | 8 ++++---- .../expected-share/test-rudder-groups/no-group.cf | 2 +- .../expected-share/test-rudder-groups/some-groups.cf | 6 +++--- .../techniques/system/common/1.0/rudder-groups.st | 2 +- .../policies/write/WriteSystemTechniquesTest.scala | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/rudder-core/src/main/scala/com/normation/rudder/services/policies/SystemVariableService.scala b/rudder-core/src/main/scala/com/normation/rudder/services/policies/SystemVariableService.scala index f5cebf80d3..3469307bd1 100644 --- a/rudder-core/src/main/scala/com/normation/rudder/services/policies/SystemVariableService.scala +++ b/rudder-core/src/main/scala/com/normation/rudder/services/policies/SystemVariableService.scala @@ -372,7 +372,7 @@ class SystemVariableServiceImpl( * - group_64f85ba8_39c7_418a_a099_24c2c2909dfd * - group_serveurs_pre_prod * and vars: - * - by_uuid["64f85ba8-39c7-418a-a099-24c2c2909dfd"] string => "Serveurs pré-prod" + * - "by_uuid[64f85ba8-39c7-418a-a099-24c2c2909dfd]" string => "Serveurs pré-prod" * with a meta: { "inventory", "attribute_name=rudder_groups" } */ //build the list of nodeId -> names, taking care of special nodeIds for special target @@ -388,7 +388,7 @@ class SystemVariableServiceImpl( "" } else { nodeGroups.map { case (id, name) => - s"""by_uuid["${id}"] ${" "*(nodeMaxString-id.size)} string => "${name}",\n""" + + s""""by_uuid[${id}]" ${" "*(nodeMaxString-id.size)} string => "${name}",\n""" + s""" ${" "*(nodeMaxString) } meta => { "inventory", "attribute_name=rudder_groups" };""" }.mkString("\n") } diff --git a/rudder-core/src/test/resources/configuration-repository/expected-share/root-default-install/common/1.0/rudder-groups.cf b/rudder-core/src/test/resources/configuration-repository/expected-share/root-default-install/common/1.0/rudder-groups.cf index 5efa77b1c8..5e90eac44a 100644 --- a/rudder-core/src/test/resources/configuration-repository/expected-share/root-default-install/common/1.0/rudder-groups.cf +++ b/rudder-core/src/test/resources/configuration-repository/expected-share/root-default-install/common/1.0/rudder-groups.cf @@ -29,17 +29,17 @@ # - group_64f85ba8_39c7_418a_a099_24c2c2909dfd # - group_serveurs_pre_prod # and vars: -# - by_uuid["64f85ba8-39c7-418a-a099-24c2c2909dfd"] = "Serveurs pré-prod" +# - "by_uuid[64f85ba8-39c7-418a-a099-24c2c2909dfd]" = "Serveurs pré-prod" # More over, each value of the array will have an attribute "meta": { "inventory", "attribute_name=rudder_groups" } # bundle common rudder_groups { vars: - by_uuid["c8813416-316f-4307-9b6a-ca9c109a9fb0"] string => "Serveurs [€ðŋ] cassés", + "by_uuid[c8813416-316f-4307-9b6a-ca9c109a9fb0]" string => "Serveurs [€ðŋ] cassés", meta => { "inventory", "attribute_name=rudder_groups" }; - by_uuid["policyServer:root"] string => "special:policyServer_root", + "by_uuid[policyServer:root]" string => "special:policyServer_root", meta => { "inventory", "attribute_name=rudder_groups" }; - by_uuid["special:all"] string => "special:all", + "by_uuid[special:all]" string => "special:all", meta => { "inventory", "attribute_name=rudder_groups" }; classes: diff --git a/rudder-core/src/test/resources/configuration-repository/expected-share/test-rudder-groups/no-group.cf b/rudder-core/src/test/resources/configuration-repository/expected-share/test-rudder-groups/no-group.cf index 9911f3b6db..4edac664bc 100644 --- a/rudder-core/src/test/resources/configuration-repository/expected-share/test-rudder-groups/no-group.cf +++ b/rudder-core/src/test/resources/configuration-repository/expected-share/test-rudder-groups/no-group.cf @@ -29,7 +29,7 @@ # - group_64f85ba8_39c7_418a_a099_24c2c2909dfd # - group_serveurs_pre_prod # and vars: -# - by_uuid["64f85ba8-39c7-418a-a099-24c2c2909dfd"] = "Serveurs pré-prod" +# - "by_uuid[64f85ba8-39c7-418a-a099-24c2c2909dfd]" = "Serveurs pré-prod" # More over, each value of the array will have an attribute "meta": { "inventory", "attribute_name=rudder_groups" } # bundle common rudder_groups { diff --git a/rudder-core/src/test/resources/configuration-repository/expected-share/test-rudder-groups/some-groups.cf b/rudder-core/src/test/resources/configuration-repository/expected-share/test-rudder-groups/some-groups.cf index b85bc911be..ffa7dcd9d1 100644 --- a/rudder-core/src/test/resources/configuration-repository/expected-share/test-rudder-groups/some-groups.cf +++ b/rudder-core/src/test/resources/configuration-repository/expected-share/test-rudder-groups/some-groups.cf @@ -29,15 +29,15 @@ # - group_64f85ba8_39c7_418a_a099_24c2c2909dfd # - group_serveurs_pre_prod # and vars: -# - by_uuid["64f85ba8-39c7-418a-a099-24c2c2909dfd"] = "Serveurs pré-prod" +# - "by_uuid[64f85ba8-39c7-418a-a099-24c2c2909dfd]" = "Serveurs pré-prod" # More over, each value of the array will have an attribute "meta": { "inventory", "attribute_name=rudder_groups" } # bundle common rudder_groups { vars: - by_uuid["c8813416-316f-4307-9b6a-ca9c109a9fb0"] string => "Serveurs [€ðŋ] cassés", + "by_uuid[c8813416-316f-4307-9b6a-ca9c109a9fb0]" string => "Serveurs [€ðŋ] cassés", meta => { "inventory", "attribute_name=rudder_groups" }; - by_uuid["policyServer:root"] string => "special:policyServer_root", + "by_uuid[policyServer:root]" string => "special:policyServer_root", meta => { "inventory", "attribute_name=rudder_groups" }; classes: diff --git a/rudder-core/src/test/resources/configuration-repository/techniques/system/common/1.0/rudder-groups.st b/rudder-core/src/test/resources/configuration-repository/techniques/system/common/1.0/rudder-groups.st index a86dd86abf..7b582ae906 100644 --- a/rudder-core/src/test/resources/configuration-repository/techniques/system/common/1.0/rudder-groups.st +++ b/rudder-core/src/test/resources/configuration-repository/techniques/system/common/1.0/rudder-groups.st @@ -29,7 +29,7 @@ # - group_64f85ba8_39c7_418a_a099_24c2c2909dfd # - group_serveurs_pre_prod # and vars: -# - by_uuid["64f85ba8-39c7-418a-a099-24c2c2909dfd"] = "Serveurs pré-prod" +# - "by_uuid[64f85ba8-39c7-418a-a099-24c2c2909dfd]" = "Serveurs pré-prod" # More over, each value of the array will have an attribute "meta": { "inventory", "attribute_name=rudder_groups" } # bundle common rudder_groups { diff --git a/rudder-core/src/test/scala/com/normation/rudder/services/policies/write/WriteSystemTechniquesTest.scala b/rudder-core/src/test/scala/com/normation/rudder/services/policies/write/WriteSystemTechniquesTest.scala index 5629a9a45d..4be77f93f8 100644 --- a/rudder-core/src/test/scala/com/normation/rudder/services/policies/write/WriteSystemTechniquesTest.scala +++ b/rudder-core/src/test/scala/com/normation/rudder/services/policies/write/WriteSystemTechniquesTest.scala @@ -106,7 +106,7 @@ import org.specs2.specification.AfterEach * of that file. */ @RunWith(classOf[JUnitRunner]) -class WriteSystemTechniqueSpec extends Specification with Loggable with ContentMatchers with AfterAll with AfterEach { +class WriteSystemTechniqueTest extends Specification with Loggable with ContentMatchers with AfterAll with AfterEach { //just a little sugar to stop hurting my eyes with new File(blablab, plop) implicit class PathString(root: String) {