Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #7605: Policies errors on policies generation #999

Merged
merged 1 commit into from Dec 14, 2015
Merged

Fixes #7605: Policies errors on policies generation #999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...er-core/src/main/scala/com/normation/rudder/services/policies/SystemVariableService.scala
View file
Open in desktop
Expand Up @@ -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
Expand All @@ -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")
}
Expand Down
8 changes: 4 additions & 4 deletions .../configuration-repository/expected-share/root-default-install/common/1.0/rudder-groups.cf
View file
Open in desktop
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ...src/test/resources/configuration-repository/expected-share/test-rudder-groups/no-group.cf
View file
Open in desktop
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions .../test/resources/configuration-repository/expected-share/test-rudder-groups/some-groups.cf
View file
Open in desktop
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ...src/test/resources/configuration-repository/techniques/system/common/1.0/rudder-groups.st
View file
Open in desktop
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ...c/test/scala/com/normation/rudder/services/policies/write/WriteSystemTechniquesTest.scala
View file
Open in desktop
Expand Up @@ -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) {
Expand Down