From 2207537b640deb0c2019f24f563f3631e29fac3f Mon Sep 17 00:00:00 2001
From: Emmanuel Garette <egarette@cadoles.com>
Date: Sun, 22 Dec 2019 15:49:21 +0100
Subject: [PATCH] group in extra

---
 src/rougail/template.py                       |  2 +-
 .../flattener_dicos/60extra_group/00-base.xml | 19 +++++
 .../extra_dirs/extra/00-base.xml              | 19 +++++
 .../60extra_group/makedict/base.json          |  1 +
 .../60extra_group/result/00-base.xml          | 70 +++++++++++++++++++
 tests/templates/60extra_group/00-base.xml     | 70 +++++++++++++++++++
 .../60extra_group/result/test/etc/mailname    |  1 +
 tests/templates/60extra_group/tmpl/mailname   |  3 +
 8 files changed, 184 insertions(+), 1 deletion(-)
 create mode 100644 tests/flattener_dicos/60extra_group/00-base.xml
 create mode 100644 tests/flattener_dicos/60extra_group/extra_dirs/extra/00-base.xml
 create mode 100644 tests/flattener_dicos/60extra_group/makedict/base.json
 create mode 100644 tests/flattener_dicos/60extra_group/result/00-base.xml
 create mode 100644 tests/templates/60extra_group/00-base.xml
 create mode 100644 tests/templates/60extra_group/result/test/etc/mailname
 create mode 100644 tests/templates/60extra_group/tmpl/mailname

diff --git a/src/rougail/template.py b/src/rougail/template.py
index 975b8093..c1060a8f 100644
--- a/src/rougail/template.py
+++ b/src/rougail/template.py
@@ -318,7 +318,7 @@ class CreoleTemplateEngine:
                     for idx, suboption in enumerate(variable.list('all')):
                         if idx == 0:
                             leader = CreoleLeader(suboption.value.get())
-                            leader_name = suboption.value.name()
+                            leader_name = suboption.option.name()
                         else:
                             leader.add_slave(config,
                                              suboption.option.name(),
diff --git a/tests/flattener_dicos/60extra_group/00-base.xml b/tests/flattener_dicos/60extra_group/00-base.xml
new file mode 100644
index 00000000..82930cc3
--- /dev/null
+++ b/tests/flattener_dicos/60extra_group/00-base.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<creole>
+    <containers>
+        <container name='test' id='23'>
+            <file name='/etc/mailname'/>
+        </container>
+    </containers>
+    <variables>
+        <family name="général">
+            <variable name="mode_conteneur_actif" type="oui/non" description="No change" hidden="True">
+                <value>non</value>
+            </variable>
+            <variable name="activer_ejabberd" type="oui/non" description="No change" hidden="True">
+                <value>non</value>
+            </variable>
+        </family>
+        <separators/>
+    </variables>
+</creole>
diff --git a/tests/flattener_dicos/60extra_group/extra_dirs/extra/00-base.xml b/tests/flattener_dicos/60extra_group/extra_dirs/extra/00-base.xml
new file mode 100644
index 00000000..3eee3a03
--- /dev/null
+++ b/tests/flattener_dicos/60extra_group/extra_dirs/extra/00-base.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<creole>
+    <variables>
+        <family name='ejabberd'>
+            <variable name="description" type="string" multi="True">
+                <value>test</value>
+            </variable>
+            <variable name="mode" type="string" multi="True">
+                <value>pre</value>
+            </variable>
+        </family>
+    </variables>
+    <constraints>
+        <group master="extra.ejabberd.description">
+            <slave>mode</slave>
+        </group>
+    </constraints>
+</creole>
diff --git a/tests/flattener_dicos/60extra_group/makedict/base.json b/tests/flattener_dicos/60extra_group/makedict/base.json
new file mode 100644
index 00000000..b9fcd95b
--- /dev/null
+++ b/tests/flattener_dicos/60extra_group/makedict/base.json
@@ -0,0 +1 @@
+{"containers.container0.files.file0.mkdir": false, "containers.container0.files.file0.name": "/etc/mailname", "containers.container0.files.file0.rm": false, "containers.container0.files.file0.source": "mailname", "containers.container0.files.file0.activate": true, "extra.ejabberd.description.description": ["test"], "extra.ejabberd.description.mode": ["pre"]}
\ No newline at end of file
diff --git a/tests/flattener_dicos/60extra_group/result/00-base.xml b/tests/flattener_dicos/60extra_group/result/00-base.xml
new file mode 100644
index 00000000..9444a882
--- /dev/null
+++ b/tests/flattener_dicos/60extra_group/result/00-base.xml
@@ -0,0 +1,70 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<creole>
+  <family name="containers">
+    <family name="container0" doc="test">
+      <family doc="files" name="files">
+        <family doc="file0" name="file0">
+          <variable doc="" multi="False" name="mkdir" type="boolean">
+            <value>False</value>
+          </variable>
+          <variable doc="" multi="False" name="name" type="string">
+            <value>/etc/mailname</value>
+          </variable>
+          <variable doc="" multi="False" name="rm" type="boolean">
+            <value>False</value>
+          </variable>
+          <variable doc="" multi="False" name="source" type="string">
+            <value>mailname</value>
+          </variable>
+          <variable doc="" multi="False" name="activate" type="boolean">
+            <value>True</value>
+          </variable>
+        </family>
+      </family>
+      <property>basic</property>
+    </family>
+  </family>
+  <family doc="" name="creole">
+    <family doc="général" name="general">
+      <property>normal</property>
+      <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">
+        <choice type="string">oui</choice>
+        <choice type="string">non</choice>
+        <property>force_default_on_freeze</property>
+        <property>frozen</property>
+        <property>hidden</property>
+        <property>mandatory</property>
+        <property>normal</property>
+        <value type="string">non</value>
+      </variable>
+      <variable doc="No change" multi="False" name="activer_ejabberd" type="choice">
+        <choice type="string">oui</choice>
+        <choice type="string">non</choice>
+        <property>force_default_on_freeze</property>
+        <property>frozen</property>
+        <property>hidden</property>
+        <property>mandatory</property>
+        <property>normal</property>
+        <value type="string">non</value>
+      </variable>
+    </family>
+    <separators/>
+  </family>
+  <family doc="" name="extra">
+    <family doc="ejabberd" name="ejabberd">
+      <property>normal</property>
+      <leader doc="description" name="description">
+        <property>normal</property>
+        <variable doc="description" multi="True" name="description" type="string">
+          <property>mandatory</property>
+          <value>test</value>
+        </variable>
+        <variable doc="mode" multi="True" name="mode" type="string">
+          <property>mandatory</property>
+          <property>normal</property>
+          <value>pre</value>
+        </variable>
+      </leader>
+    </family>
+  </family>
+</creole>
diff --git a/tests/templates/60extra_group/00-base.xml b/tests/templates/60extra_group/00-base.xml
new file mode 100644
index 00000000..9444a882
--- /dev/null
+++ b/tests/templates/60extra_group/00-base.xml
@@ -0,0 +1,70 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<creole>
+  <family name="containers">
+    <family name="container0" doc="test">
+      <family doc="files" name="files">
+        <family doc="file0" name="file0">
+          <variable doc="" multi="False" name="mkdir" type="boolean">
+            <value>False</value>
+          </variable>
+          <variable doc="" multi="False" name="name" type="string">
+            <value>/etc/mailname</value>
+          </variable>
+          <variable doc="" multi="False" name="rm" type="boolean">
+            <value>False</value>
+          </variable>
+          <variable doc="" multi="False" name="source" type="string">
+            <value>mailname</value>
+          </variable>
+          <variable doc="" multi="False" name="activate" type="boolean">
+            <value>True</value>
+          </variable>
+        </family>
+      </family>
+      <property>basic</property>
+    </family>
+  </family>
+  <family doc="" name="creole">
+    <family doc="général" name="general">
+      <property>normal</property>
+      <variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">
+        <choice type="string">oui</choice>
+        <choice type="string">non</choice>
+        <property>force_default_on_freeze</property>
+        <property>frozen</property>
+        <property>hidden</property>
+        <property>mandatory</property>
+        <property>normal</property>
+        <value type="string">non</value>
+      </variable>
+      <variable doc="No change" multi="False" name="activer_ejabberd" type="choice">
+        <choice type="string">oui</choice>
+        <choice type="string">non</choice>
+        <property>force_default_on_freeze</property>
+        <property>frozen</property>
+        <property>hidden</property>
+        <property>mandatory</property>
+        <property>normal</property>
+        <value type="string">non</value>
+      </variable>
+    </family>
+    <separators/>
+  </family>
+  <family doc="" name="extra">
+    <family doc="ejabberd" name="ejabberd">
+      <property>normal</property>
+      <leader doc="description" name="description">
+        <property>normal</property>
+        <variable doc="description" multi="True" name="description" type="string">
+          <property>mandatory</property>
+          <value>test</value>
+        </variable>
+        <variable doc="mode" multi="True" name="mode" type="string">
+          <property>mandatory</property>
+          <property>normal</property>
+          <value>pre</value>
+        </variable>
+      </leader>
+    </family>
+  </family>
+</creole>
diff --git a/tests/templates/60extra_group/result/test/etc/mailname b/tests/templates/60extra_group/result/test/etc/mailname
new file mode 100644
index 00000000..ecca61d9
--- /dev/null
+++ b/tests/templates/60extra_group/result/test/etc/mailname
@@ -0,0 +1 @@
+pre
diff --git a/tests/templates/60extra_group/tmpl/mailname b/tests/templates/60extra_group/tmpl/mailname
new file mode 100644
index 00000000..da3e807a
--- /dev/null
+++ b/tests/templates/60extra_group/tmpl/mailname
@@ -0,0 +1,3 @@
+%for %%description in %%extra.ejabberd.description
+%%description.mode
+%end for