Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop

debian/agpl-3

@@ -0,0 +1,662 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.
+

debian/compat

@@ -0,0 +1 @@
+11

debian/control

@@ -0,0 +1,14 @@
+Source: rougail
+Section: admin
+Priority: extra
+Maintainer: Cadoles <contact@cadoles.com>
+Build-depends: debhelper (>=11), python3-all, python3-setuptools, dh-python
+Standards-Version: 3.9.4
+Homepage: https://forge.cadoles.com/Infra/rougail
+
+Package: python3-rougail
+Architecture: any
+Pre-Depends: dpkg, python3, ${misc:Pre-Depends}
+Depends: ${python:Depends}, ${misc:Depends}, python3-cheetah, python3-tiramisu3
+Description: configuration manager
+

debian/copyright

@@ -0,0 +1,22 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: risotto
+Upstream-Contact: Cadoles <contact@cadoles.com>
+Source: https://forge.cadoles.com/Infra/rougail
+
+Files: *
+Copyright: 2019-2020 Cadoles <contact@cadoles.com>
+License: AGPL-3+
+
+License: AGPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Affero General Public License for more details.
+ .
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <https://www.gnu.org/licenses/>.

debian/rougail.dirs

@@ -0,0 +1,3 @@
+/var/rougail/patches
+/var/rougail/templates
+/var/rougail/manifests

debian/rules

@@ -0,0 +1,10 @@
+#!/usr/bin/make -f
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#DH_VERBOSE = 1
+
+export PYBUILD_NAME = rougail
+export PYBUILD_DISABLE_python3 = test
+
+%:
+	dh $@ --with python3 --buildsystem=pybuild

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

doc/auto.rst

@@ -0,0 +1,23 @@
+Valeur automatiquement modifiée
+===============================
+
+Une variable avec valeur automatiquement modifiée est une variable dont la valeur sera considéré comme modifié quand le serveur sera déployé.
+
+Voici un variable a valeur automatiquement modifiée :
+
+    <variable name="my_variable" type="oui/non" description="My variable" auto_save="True">
+
+Dans ce cas la valeur est fixée à la valeur actuelle.
+Par exemple, si la valeur de cette variable est issue d'un calcul, la valeur ne sera plus recalculée.
+
+Valeur en lecture seule automatique
+===================================
+
+Une variable avec valeur en lecture seule automatique est une variable dont la valeur ne sera plus modifiable par l'utilisateur quand le serveur sera déployé.
+
+Voici un variable à valeur en lecture seule automatique :
+
+    <variable name="my_variable" type="oui/non" description="My variable" auto_freeze="True">
+
+Dans ce cas la valeur est fixée à la valeur actuelle et elle ne sera plus modifiable par l'utilisateur.
+Par exemple, si la valeur de cette variable est issue d'un calcul, la valeur ne sera plus recalculée.

doc/fill.rst

@@ -0,0 +1,285 @@
+Les variables calculées
+=======================
+
+Une variable calculée est une variable donc sa valeur est le résultat d'une fonction python.
+
+Variable avec une valeur par défaut calculée
+--------------------------------------------
+
+Créons une variable de type "oui/non" donc la valeur est retournée par la fonction "return_no" :
+
+    <variables>
+        <family name="family">
+            <variable name="my_calculated_variable" type="oui/non" description="My calculated variable"/>
+        </family>
+    </variables>
+    <constraints>
+        <fill name="return_no" target="my_calculated_variable"/>
+    </constraints>
+
+Puis créons la fonction "return_no" :
+
+    def return_no():
+        return 'non'
+
+Dans ce cas, la valeur par défaut est la valeur retournée par la fonction (ici "non"), elle sera calculée tant que l'utilisateur n'a pas de spécifié une valeur à cette variable.
+
+Si l'utilisateur à définit une valeur par défaut à "my_calculated_variable" :
+
+    <variable name="my_calculated_variable" type="oui/non" description="My calculated variable">
+        <value>oui</value>
+    </variable>
+
+Cette valeur par défaut sera complètement ignorée.
+
+Variable avec une valeur calculée
+---------------------------------
+
+En ajoutant le paramètre "hidden" à "True" dans la variable précédente, l'utilisateur n'aura plus la possibilité de modifié la valeur. La valeur de la variable sera donc systématiquement calculée :
+
+    <variable name="my_calculated_variable" type="oui/non" description="My calculated variable" hidden="True"/>
+
+Si une condition "hidden_if_in" est spécifié à la variable, la valeur sera modifiable par l'utilisateur si elle n'est pas cachée mais elle sera systèmatiquement calculée (même si elle a déjà était modifiée) si la variable est cachée.
+
+Variable avec valeur calculée obligatoire
+-----------------------------------------
+
+Par défaut les variables calculées ne sont pas des varibles obligatoires.
+Dans ce cas un calcul peut retourner None, mais surtout un utilisateur peut spécifier une valeur nulle à cette variable. Dans ce cas le calcul ne sera pas réalisé.
+
+Fonction avec une valeur fixe comme paramètre positionnel
+---------------------------------------------------------
+
+Déclarons un calcul avec paramètre :
+
+    <constraints>
+        <fill name="return_value" target="my_calculated_variable">
+            <param>non</param>
+        </fill>
+    </constraints>
+
+Créons la fonction correspondante :
+
+    def return_value(value):
+        return value
+
+La variable aura donc "non" comme valeur puisque le paramètre aura la valeur fixe "non".
+
+Paramètre nommée
+----------------
+
+Déclarons une contrainte avec un paramètre nommée :
+
+    <constraints>
+        <fill name="return_value" target="my_calculated_variable">
+            <param name="valeur">non</param>
+        </fill>
+    </constraints>
+
+Dans ce cas la fonction return_value sera exécuté avec le paramètre nommé "valeur" dont sa valeur sera "non".
+
+Paramètre avec un nombre
+------------------------
+
+Déclarons un calcul avec paramètre avec un nombre :
+
+    <constraints>
+        <fill name="return_value_with_number" target="my_calculated_variable">
+            <param type="number">1</param>
+        </fill>
+    </constraints>
+
+Créons la fonction correspondante :
+
+    def return_value_with_number(value):
+        if value == 1:
+            return 'non'
+        return 'oui'
+
+La variable aura donc "non" comme valeur puisque le paramètre aura la valeur fixe "1".
+
+Paramètre dont la valeur est issue d'une autre variable
+-------------------------------------------------------
+
+Créons deux variables avec une contrainte de type variable qui contient le nom de la variable dont sa valeur sera utilisé comme paramètre :
+
+    <variables>
+        <family name="family">
+            <variable name="my_calculated_variable" type="oui/non" description="My calculated variable"/>
+            <variable name="my_variable" type="number" description="My variable">
+                <value>1</value>
+            </variable>
+        </family>
+    </variables>
+    <constraints>
+        <fill name="return_value_with_number" target="my_calculated_variable">
+            <param type="variable">my_variable</param>
+        </fill>
+    </constraints>
+
+Si l'utilisateur laisse la valeur 1 à "my_variable", la valeur par défault de la variable "my_calculated_variable" sera "non".
+Si la valeur de "my_variable" est différent de 1, la valeur par défaut de la variable "my_calculated_variable" sera "oui".
+
+Paramètre dont la valeur est issue d'une information de la configuration
+------------------------------------------------------------------------
+
+Créons une variable et la contrainte :
+
+    <variables>
+        <family name="family">
+            <variable name="my_calculated_variable" type="string" description="My calculated variable"/>
+        </family>
+    </variables>
+    <constraints>
+        <fill name="return_value" target="my_calculated_variable">
+            <param type="information">server_name</param>
+        </fill>
+    </constraints>
+
+Dans ce cas, l'information de la configuration "server_name" sera utilisé comme valeur de la variable "my_calculated_variable".
+Si l'information n'existe pas, la paramètre aura la valeur "None".
+
+Paramètre avec variable potentiellement non existante
+-----------------------------------------------------
+
+Suivant le contexte une variable peut exister ou ne pas exister.
+
+Un paramètre de type "variable" peut être "optional" :
+
+    <variables>
+        <family name="family">
+            <variable name="my_calculated_variable" type="oui/non" description="My calculated variable"/>
+        </family>
+    </variables>
+    <constraints>
+        <fill name="return_value" target="my_calculated_variable">
+            <param type="variable" optional="True">unknow_variable</param>
+        </fill>
+    </constraints>
+
+Dans ce cas la fonction "return_value" est exécuté sans paramètre.
+
+Paramètre avec variable potentiellement désactivée
+--------------------------------------------------
+
+FIXME :
+
+<!ATTLIST param notraisepropertyerror (True|False) "False">
+
+Il n'y a pas spécialement de test !
+
+Les variables suiveuses
+-----------------------
+
+FIXME : 
+
+- tests/flattener_dicos/10leadership_append/00-base.xml
+- tests/flattener_dicos/10leadership_auto/00-base.xml
+- tests/flattener_dicos/10leadership_autoleader/00-base.xml
+- tests/flattener_dicos/10leadership_autoleader_expert/00-base.xml
+
+Les variables dynamiques
+------------------------
+
+Paramètre avec variable dynamique
+'''''''''''''''''''''''''''''''''
+
+Il est possible de faire un calcul avec comme paramètre une variable dynamique mais pour une suffix particulier :
+
+    <variables>
+        <family name='family'>
+            <variable name='suffixes' type='string' description="Suffixes of dynamic family" multi="True">
+                <value>val1</value>
+                <value>val2</value>
+            </variable>
+            <variable name="my_calculated_variable" type="string" description="My calculated variable"/>
+        </family>
+        <family name='dyn' dynamic="suffixes">
+            <variable name='vardyn' type='string' description="Dynamic variable">
+                <value>val</value>
+            </variable>
+        </family>
+    </variables>
+    <constraints>
+        <fill name="return_value" target="my_calculated_variable">
+            <param type="variable">vardynval1</param>
+        </fill>
+    </constraints>
+
+Dans ce cas, valeur du paramètre de la fonction "return_value" sera la valeur de la variable "vardyn" avec le suffix "val1".
+
+Calcule d'une variable dynamique
+''''''''''''''''''''''''''''''''
+
+Il est également possible de calculer une variable dynamique à partir d'une variable standard :
+
+    <variables>
+        <family name='family'>
+            <variable name='suffixes' type='string' description="Suffixes of dynamic family" multi="True">
+                <value>val1</value>
+                <value>val2</value>
+            </variable>
+            <variable name="my_variable" type="string" description="My variable">
+                <value>val</value>
+            </variable>
+        </family>
+        <family name='dyn' dynamic="suffixes">
+            <variable name="my_calculated_variable_dyn_" type="string" description="My calculated variable"/>
+                <value>val</value>
+            </variable>
+        </family>
+    </variables>
+    <constraints>
+        <fill name="return_value" target="my_calculated_variable_dyn_">
+            <param type="variable">my_variable</param>
+        </fill>
+    </constraints>
+
+Dans ce cas, les variables dynamiques "my_calculated_variable_dyn_" seront calculés à partir de la valeur de la variable "my_variable".
+Que cela soit pour la variable "my_calculated_variable_dyn_val1" et "my_calculated_variable_dyn_val2".
+
+Par contre, il n'est pas possible de faire un calcul pour une seule des deux variables issues de la variable dynamique.
+Si c'est ce que vous cherchez à faire, il faudra prévoir un traitement particulier dans votre fonction.
+
+Dans ce cas, il faut explicitement demander la valeur du suffix dans la fonction :
+
+    <constraints>
+        <fill name="return_value_suffix" target="my_calculated_variable_dyn_">
+            <param type="variable">my_variable</param>
+            <param type="suffix"/>
+        </fill>
+    </constraints>
+
+Et ainsi faire un traitement spécifique pour ce suffix :
+
+    def return_value_suffix(value, suffix):
+        if suffix == 'val1':
+            return value
+
+Redéfinition des calcules
+-------------------------
+
+Dans un premier dictionnaire déclarons notre variable et notre calcule :
+
+    <variables>
+        <family name="family">
+            <variable name="my_calculated_variable" type="oui/non" description="My calculated variable"/>
+        </family>
+    </variables>
+    <constraints>
+        <fill name="return_no" target="my_calculated_variable"/>
+    </constraints>
+
+Dans un second dictionnaire il est possible de redéfinir le calcul :
+
+    <variables>
+        <family name="family">
+            <variable name="my_calculated_variable" redefine="True"/>
+        </family>
+    </variables>
+    <constraints>
+        <fill name="return_yes" target="my_calculated_variable"/>
+    </constraints>
+
+Dans ce cas, à aucun moment la fonction "return_no" ne sera exécuté. Seul la fonction "return_yes" le sera.
+

doc/variable.rst

@@ -0,0 +1,13 @@
+Variable
+========
+
+Variable obligatoire
+--------------------
+
+Variable dont une valeur est requise :
+
+    <variables>
+        <family name="family">
+            <variable name="my_variable" type="oui/non" description="My variable" mandatory="True"/>
+        </family>
+    </variables>

src/rougail/annotator.py

@@ -34,11 +34,38 @@ def mode_factory():
 modes = mode_factory()
 
 
+CONVERT_OPTION = {'number': dict(opttype="IntOption", func=int),
+                  'float': dict(opttype="FloatOption", func=float),
+                  'choice': dict(opttype="ChoiceOption"),
+                  'string': dict(opttype="StrOption"),
+                  'password': dict(opttype="PasswordOption"),
+                  'mail': dict(opttype="EmailOption"),
+                  'boolean': dict(opttype="BoolOption"),
+                  'symlink': dict(opttype="SymLinkOption"),
+                  'filename': dict(opttype="FilenameOption"),
+                  'date': dict(opttype="DateOption"),
+                  'unix_user': dict(opttype="UsernameOption"),
+                  'ip': dict(opttype="IPOption", initkwargs={'allow_reserved': True}),
+                  'local_ip': dict(opttype="IPOption", initkwargs={'private_only': True, 'warnings_only': True}),
+                  'netmask': dict(opttype="NetmaskOption"),
+                  'network': dict(opttype="NetworkOption"),
+                  'broadcast': dict(opttype="BroadcastOption"),
+                  'netbios': dict(opttype="DomainnameOption", initkwargs={'type': 'netbios', 'warnings_only': True}),
+                  'domain': dict(opttype="DomainnameOption", initkwargs={'type': 'domainname', 'allow_ip': False}),
+                  'hostname': dict(opttype="DomainnameOption", initkwargs={'type': 'hostname', 'allow_ip': False}),
+                  'web_address': dict(opttype="URLOption", initkwargs={'allow_ip': True, 'allow_without_dot': True}),
+                  'port': dict(opttype="PortOption", initkwargs={'allow_private': True}),
+                  'mac': dict(opttype="MACOption"),
+                  'cidr': dict(opttype="IPOption", initkwargs={'cidr': True}),
+                  'network_cidr': dict(opttype="NetworkOption", initkwargs={'cidr': True}),
+                  }
+
+
 # a CreoleObjSpace's attribute has some annotations
 # that shall not be present in the exported (flatened) XML
 ERASED_ATTRIBUTES = ('redefine', 'exists', 'fallback', 'optional', 'remove_check', 'namespace',
                      'remove_condition', 'path', 'instance_mode', 'index', 'is_in_leadership',
-                     'level')  # , '_real_container')
+                     'level', 'remove_fill', 'xmlfiles')
 ERASED_CONTAINER_ATTRIBUTES = ('id', 'container', 'group_id', 'group', 'container_group')
 
 FORCE_CHOICE = {'oui/non': ['oui', 'non'],
@@ -56,11 +83,6 @@ KEY_TYPE = {'variable': 'symlink',
             'URLOption': 'web_address',
             'FilenameOption': 'filename'}
 
-TYPE_PARAM_CHECK = ('string', 'python', 'variable')
-TYPE_PARAM_CONDITION = ('string', 'python', 'number', 'variable')
-TYPE_PARAM_FILL = ('string', 'number', 'variable')
-CONVERSION = {'number': int}
-
 FREEZE_AUTOFREEZE_VARIABLE = 'module_instancie'
 
 PROPERTIES = ('hidden', 'frozen', 'auto_freeze', 'auto_save', 'force_default_on_freeze',
@@ -111,7 +133,7 @@ class GroupAnnotator:
                     self.manage_follower(namespace,
                                          leader_family_name,
                                          variable,
-                                         leader_name,
+                                         leadership_name,
                                          follower_names,
                                          leader_space,
                                          leader_is_hidden,
@@ -128,9 +150,14 @@ class GroupAnnotator:
                         # if variable.hidden:
                         #     leader_is_hidden = True
                     else:
-                        leader_space = self.objectspace.Leadership()
+                        leader_space = self.objectspace.Leadership(variable.xmlfiles)
+                        if hasattr(group, 'name'):
+                            leadership_name = group.name
+                        else:
+                            leadership_name = leader_name
                         leader_is_hidden = self.manage_leader(leader_space,
                                                               leader_family_name,
+                                                              leadership_name,
                                                               leader_name,
                                                               namespace,
                                                               variable,
@@ -145,6 +172,7 @@ class GroupAnnotator:
     def manage_leader(self,
                       leader_space: 'Leadership',
                       leader_family_name: str,
+                      leadership_name: str,
                       leader_name: str,
                       namespace: str,
                       variable: 'Variable',
@@ -155,7 +183,7 @@ class GroupAnnotator:
         if variable.multi is not True:
             raise DictConsistencyError(_('the variable {} in a group must be multi').format(variable.name))
         leader_space.variable = []
-        leader_space.name = leader_name
+        leader_space.name = leadership_name
         leader_space.hidden = variable.hidden
         if variable.hidden:
             leader_is_hidden = True
@@ -170,9 +198,9 @@ class GroupAnnotator:
             leader_space.doc = variable.description
         else:
             leader_space.doc = variable.name
-        leader_path = namespace + '.' + leader_family_name + '.' + leader_name
+        leadership_path = namespace + '.' + leader_family_name + '.' + leadership_name
         self.objectspace.paths.add_family(namespace,
-                                          leader_path,
+                                          leadership_path,
                                           leader_space,
                                           )
         leader_family = self.objectspace.space.variables[namespace].family[leader_family_name]
@@ -236,7 +264,7 @@ class ServiceAnnotator:
         families = {}
         for idx, service_name in enumerate(self.objectspace.space.services.service.keys()):
             service = self.objectspace.space.services.service[service_name]
-            new_service = self.objectspace.service()
+            new_service = self.objectspace.service(service.xmlfiles)
             for elttype, values in vars(service).items():
                 if not isinstance(values, (dict, list)) or elttype in ERASED_ATTRIBUTES:
                     setattr(new_service, elttype, values)
@@ -245,6 +273,7 @@ class ServiceAnnotator:
                 path = '.'.join(['services', service_name, eltname])
                 family = self.gen_family(eltname,
                                          path,
+                                         service.xmlfiles,
                                          )
                 if isinstance(values, dict):
                     values = list(values.values())
@@ -261,8 +290,9 @@ class ServiceAnnotator:
     def gen_family(self,
                    name,
                    path,
+                   xmlfiles
                    ):
-        family = self.objectspace.family()
+        family = self.objectspace.family(xmlfiles)
         family.name = normalize_family(name)
         family.doc = name
         family.mode = None
@@ -310,7 +340,10 @@ class ServiceAnnotator:
                 if not self.objectspace.paths.family_is_defined(subpath):
                     break
                 idx += 1
-            family = self.gen_family(c_name, subpath)
+            family = self.gen_family(c_name,
+                                     subpath,
+                                     elt.xmlfiles,
+                                     )
             family.variable = []
             listname = '{}list'.format(name)
             activate_path = '.'.join([subpath, 'activate'])
@@ -348,7 +381,7 @@ class ServiceAnnotator:
                           elt,
                           path,
                           ):
-        variable = self.objectspace.variable()
+        variable = self.objectspace.variable(elt.xmlfiles)
         variable.name = normalize_family(key)
         variable.mode = None
         if key == 'name':
@@ -373,7 +406,7 @@ class ServiceAnnotator:
             variable.multi = None
         else:
             variable.doc = key
-            val = self.objectspace.value()
+            val = self.objectspace.value(elt.xmlfiles)
             val.type = type_
             val.name = value
             variable.value = [val]
@@ -457,7 +490,7 @@ class VariableAnnotator:
                 for value in variable.value:
                     if not hasattr(value, 'type'):
                         value.type = variable.type
-                    value.name = CONVERSION.get(value.type, str)(value.name)
+                    value.name = CONVERT_OPTION.get(value.type, {}).get('func', str)(value.name)
             for key, value in RENAME_ATTIBUTES.items():
                 setattr(variable, value, getattr(variable, key))
                 setattr(variable, key, None)
@@ -472,21 +505,28 @@ class VariableAnnotator:
                                 path,
                                 ):
             if variable.type in FORCE_CHOICE:
-                check = self.objectspace.check()
+                check = self.objectspace.check(variable.xmlfiles)
                 check.name = 'valid_enum'
                 check.target = path
                 check.namespace = namespace
-                param = self.objectspace.param()
-                param.text = str(FORCE_CHOICE[variable.type])
-                check.param = [param]
+                check.param = []
+                for value in FORCE_CHOICE[variable.type]:
+                    param = self.objectspace.param(variable.xmlfiles)
+                    param.text = value
+                    check.param.append(param)
                 if not hasattr(self.objectspace.space, 'constraints'):
-                    self.objectspace.space.constraints = self.objectspace.constraints()
+                    self.objectspace.space.constraints = self.objectspace.constraints(variable.xmlfiles)
                     self.objectspace.space.constraints.namespace = namespace
                 if not hasattr(self.objectspace.space.constraints, 'check'):
                     self.objectspace.space.constraints.check = []
                 self.objectspace.space.constraints.check.append(check)
                 variable.type = 'string'
 
+        def _valid_type(variable):
+            if variable.type not in CONVERT_OPTION:
+                xmlfiles = self.objectspace.display_xmlfiles(variable.xmlfiles)
+                raise DictConsistencyError(_(f'unvalid type "{variable.type}" for variable "{variable.name}" in {xmlfiles}'))
+
         if not hasattr(self.objectspace.space, 'variables'):
             return
         for families in self.objectspace.space.variables.values():
@@ -516,6 +556,7 @@ class VariableAnnotator:
                                                         follower,
                                                         path,
                                                         )
+                                    _valid_type(follower)
                             else:
                                 path = '{}.{}.{}'.format(namespace, normalize_family(family.name), variable.name)
                                 _convert_variable(variable,
@@ -525,6 +566,7 @@ class VariableAnnotator:
                                                     variable,
                                                     path,
                                                     )
+                                _valid_type(variable)
 
     def convert_helps(self):
         if not hasattr(self.objectspace.space, 'help'):
@@ -543,14 +585,14 @@ class VariableAnnotator:
     def convert_auto_freeze(self):  # pylint: disable=C0111
         def _convert_auto_freeze(variable, namespace):
             if variable.auto_freeze:
-                new_condition = self.objectspace.condition()
+                new_condition = self.objectspace.condition(variable.xmlfiles)
                 new_condition.name = 'auto_hidden_if_not_in'
                 new_condition.namespace = namespace
                 new_condition.source = FREEZE_AUTOFREEZE_VARIABLE
-                new_param = self.objectspace.param()
+                new_param = self.objectspace.param(variable.xmlfiles)
                 new_param.text = 'oui'
                 new_condition.param = [new_param]
-                new_target = self.objectspace.target()
+                new_target = self.objectspace.target(variable.xmlfiles)
                 new_target.type = 'variable'
                 path = variable.namespace + '.' + normalize_family(family.name) + '.' + variable.name
                 new_target.name = path
@@ -584,7 +626,8 @@ class VariableAnnotator:
                         subpath = self.objectspace.paths.get_variable_path(separator.name,
                                                                            separator.namespace,
                                                                            )
-                        raise DictConsistencyError(_('{} already has a separator').format(subpath))
+                        xmlfiles = self.objectspace.display_xmlfiles(separator.xmlfiles)
+                        raise DictConsistencyError(_(f'{subpath} already has a separator in {xmlfiles}'))
                     option.separator = separator.text
             del family.separators
 
@@ -597,7 +640,9 @@ class ConstraintAnnotator:
         if not hasattr(objectspace.space, 'constraints'):
             return
         self.objectspace = objectspace
-        self.eosfunc = imp.load_source('eosfunc', eosfunc_file)
+        eosfunc = imp.load_source('eosfunc', eosfunc_file)
+        self.functions = dir(eosfunc)
+        self.functions.extend(INTERNAL_FUNCTIONS)
         self.valid_enums = {}
         if hasattr(self.objectspace.space.constraints, 'check'):
             self.check_check()
@@ -619,21 +664,19 @@ class ConstraintAnnotator:
 
     def check_check(self):
         remove_indexes = []
-        functions = dir(self.eosfunc)
-        functions.extend(INTERNAL_FUNCTIONS)
         for check_idx, check in enumerate(self.objectspace.space.constraints.check):
-            if not check.name in functions:
-                raise DictConsistencyError(_('cannot find check function {}').format(check.name))
+            if not check.name in self.functions:
+                xmlfiles = self.objectspace.display_xmlfiles(check.xmlfiles)
+                raise DictConsistencyError(_(f'cannot find check function "{check.name}" in {xmlfiles}'))
             if hasattr(check, 'param'):
                 param_option_indexes = []
                 for idx, param in enumerate(check.param):
-                    if param.type not in TYPE_PARAM_CHECK:
-                        raise DictConsistencyError(_('cannot use {} type as a param in check for {}').format(param.type, check.target))
                     if param.type == 'variable' and not self.objectspace.paths.path_is_defined(param.text):
                         if param.optional is True:
                             param_option_indexes.append(idx)
                         else:
-                            raise DictConsistencyError(_(f'unknown param {param.text} in check'))
+                            xmlfiles = self.objectspace.display_xmlfiles(check.xmlfiles)
+                            raise DictConsistencyError(_(f'cannot find check param "{param.text}" in {xmlfiles}'))
                     if param.type != 'variable':
                         param.notraisepropertyerror = None
                 param_option_indexes = list(set(param_option_indexes))
@@ -661,55 +704,50 @@ class ConstraintAnnotator:
         remove_indexes = []
         for idx, check in enumerate(self.objectspace.space.constraints.check):
             if check.name == 'valid_enum':
-                if len(check.param) != 1:
-                    raise DictConsistencyError(_(f'cannot set more than one param for valid_enum for variable {check.target}'))
-                param = check.param[0]
                 if check.target in self.valid_enums:
                     raise DictConsistencyError(_(f'valid_enum already set for {check.target}'))
-                if param.type not in ['string', 'python', 'number']:
-                    raise DictConsistencyError(_(f'unknown type {param.type} for param in valid_enum for {check.target}'))
+                if not hasattr(check, 'param'):
+                    raise DictConsistencyError(_(f'param is mandatory for a valid_enum of variable {check.target}'))
                 variable = self.objectspace.paths.get_variable_obj(check.target)
-                values = self.load_params_in_validenum(param,
-                                                       variable.name,
-                                                       variable.type,
-                                                       )
-                self.valid_enums[check.target] = {'type': param.type,
-                                                  'values': values}
+                values = self.load_params_in_valid_enum(check.param,
+                                                        variable.name,
+                                                        variable.type,
+                                                        )
                 self._set_valid_enum(variable,
                                      values,
                                      variable.type,
+                                     check.target
                                      )
                 remove_indexes.append(idx)
         remove_indexes.sort(reverse=True)
         for idx in remove_indexes:
             del self.objectspace.space.constraints.check[idx]
 
-    def load_params_in_validenum(self,
-                                 param,
-                                 variable_name,
-                                 variable_type,
-                                 ):
-        if not hasattr(param, 'text') and (param.type == 'python' or param.type == 'number'):
-            raise DictConsistencyError(_(f"All '{param.type}' variables shall be set in order to calculate valid_enum for variable {variable_name}"))
-        if variable_type == 'string' and param.type == 'number':
-            raise DictConsistencyError(_(f'Unconsistency valid_enum type ({param.type}), for variable {variable_name}'))
-        if param.type == 'python':
-            try:
-                values = eval(param.text, {'eosfunc': self.eosfunc, '__builtins__': {'range': range, 'str': str}})
-            except NameError:
-                raise DictConsistencyError(_('The function {} is unknown').format(param.text))
-        else:
-            try:
-                values = literal_eval(param.text)
-            except ValueError:
-                raise DictConsistencyError(_(f'Cannot load {param.text} in valid_enum'))
-        if not isinstance(values, list):
-            raise DictConsistencyError(_('Function {} shall return a list').format(param.text))
-        for value in values:
-            if variable_type == 'string' and not isinstance(value, str):
-                raise DictConsistencyError(_(f'Cannot load "{param.text}", "{value}" is not a string'))
-            if variable_type == 'number' and not isinstance(value, int):
-                raise DictConsistencyError(_(f'Cannot load "{param.text}", "{value}" is not a number'))
+    def load_params_in_valid_enum(self,
+                                  params,
+                                  variable_name,
+                                  variable_type,
+                                  ):
+        has_variable = None
+        values = []
+        for param in params:
+            if param.type == 'variable':
+                if has_variable is not None:
+                    raise DictConsistencyError(_(f'only one "variable" parameter is allowed for valid_enum of variable {variable_name}'))
+                has_variable = True
+                variable = self.objectspace.paths.get_variable_obj(param.text)
+                if not variable.multi:
+                    raise DictConsistencyError(_(f'only multi "variable" parameter is allowed for valid_enum of variable {variable_name}'))
+                values = param.text
+            else:
+                if has_variable:
+                    raise DictConsistencyError(_(f'only one "variable" parameter is allowed for valid_enum of variable {variable_name}'))
+                if not hasattr(param, 'text'):
+                    if param.type == 'number':
+                        raise DictConsistencyError(_(f'value is mandatory for valid_enum of variable {variable_name}'))
+                    values.append(None)
+                else:
+                    values.append(param.text)
         return values
 
     def check_change_warning(self):
@@ -736,9 +774,6 @@ class ConstraintAnnotator:
 
     def check_params_target(self):
         for condition in self.objectspace.space.constraints.condition:
-            for param in condition.param:
-                if param.type not in TYPE_PARAM_CONDITION:
-                    raise DictConsistencyError(_(f'cannot use {param.type} type as a param in a condition'))
             if not hasattr(condition, 'target'):
                 raise DictConsistencyError(_('target is mandatory in condition'))
             for target in condition.target:
@@ -777,7 +812,7 @@ class ConstraintAnnotator:
                         for listvar in listvars:
                             variable = self.objectspace.paths.get_variable_obj(listvar)
                             type_ = 'variable'
-                            new_target = self.objectspace.target()
+                            new_target = self.objectspace.target(variable.xmlfiles)
                             new_target.type = type_
                             new_target.name = listvar
                             new_target.index = target.index
@@ -902,7 +937,7 @@ class ConstraintAnnotator:
                     if hasattr(leader_or_variable, actions[0]) and getattr(leader_or_variable, actions[0]) is True:
                         continue
                     for idx, action in enumerate(actions):
-                        prop = self.objectspace.property_()
+                        prop = self.objectspace.property_(leader_or_variable.xmlfiles)
                         prop.type = 'calculation'
                         prop.inverse = inverse
                         prop.source = condition.source
@@ -919,40 +954,52 @@ class ConstraintAnnotator:
                                 variable.property.append(prop)
         del self.objectspace.space.constraints.condition
 
-    def _set_valid_enum(self, variable, values, type_):
+    def _set_valid_enum(self, variable, values, type_, target):
         # value for choice's variable is mandatory
         variable.mandatory = True
         # build choice
         variable.choice = []
-        choices = []
-        for value in values:
+        if isinstance(values, str):
             choice = self.objectspace.choice()
-            try:
-                choice.name = CONVERSION.get(type_, str)(value)
-            except:
-                raise DictConsistencyError(_(f'unable to change type of a valid_enum entry "{value}" is not a valid "{type_}" for "{variable.name}"'))
-            if choice.name == '':
-                choice.name = None
-            choices.append(choice.name)
-            choice.type = type_
+            choice.type = 'calculation'
+            choice.name = values
             variable.choice.append(choice)
+        else:
+            self.valid_enums[target] = {'type': type_,
+                                        'values': values,
+                                        }
+            choices = []
+            for value in values:
+                choice = self.objectspace.choice(variable.xmlfiles)
+                try:
+                    if value is not None:
+                        choice.name = CONVERT_OPTION[type_].get('func', str)(value)
+                    else:
+                        choice.name = value
+                except:
+                    raise DictConsistencyError(_(f'unable to change type of a valid_enum entry "{value}" is not a valid "{type_}" for "{variable.name}"'))
+                if choice.name == '':
+                    choice.name = None
+                choices.append(choice.name)
+                choice.type = type_
+                variable.choice.append(choice)
+            # check value or set first choice value has default value
+            if hasattr(variable, 'value'):
+                for value in variable.value:
+                    value.type = type_
+                    try:
+                        cvalue = CONVERT_OPTION[type_].get('func', str)(value.name)
+                    except:
+                        raise DictConsistencyError(_(f'unable to change type of value "{value}" is not a valid "{type_}" for "{variable.name}"'))
+                    if cvalue not in choices:
+                        raise DictConsistencyError(_('value "{}" of variable "{}" is not in list of all expected values ({})').format(value.name, variable.name, choices))
+            else:
+                new_value = self.objectspace.value(variable.xmlfiles)
+                new_value.name = choices[0]
+                new_value.type = type_
+                variable.value = [new_value]
         if not variable.choice:
             raise DictConsistencyError(_('empty valid enum is not allowed for variable {}').format(variable.name))
-        # check value or set first choice value has default value
-        if hasattr(variable, 'value'):
-            for value in variable.value:
-                value.type = type_
-                try:
-                    cvalue = CONVERSION.get(type_, str)(value.name)
-                except:
-                    raise DictConsistencyError(_(f'unable to change type of value "{value}" is not a valid "{type_}" for "{variable.name}"'))
-                if cvalue not in choices:
-                    raise DictConsistencyError(_('value "{}" of variable "{}" is not in list of all expected values ({})').format(value.name, variable.name, choices))
-        else:
-            new_value = self.objectspace.value()
-            new_value.name = values[0]
-            new_value.type = type_
-            variable.value = [new_value]
         variable.type = 'choice'
 
     def convert_check(self):
@@ -972,26 +1019,30 @@ class ConstraintAnnotator:
                     else:
                         raise DictConsistencyError(_(f'unknown parameter {param.text} in check "valid_entier" for variable {check.target}'))
             else:
-                check_ = self.objectspace.check()
+                check_ = self.objectspace.check(variable.xmlfiles)
                 if name == 'valid_differ':
                     name = 'valid_not_equal'
                 elif name == 'valid_network_netmask':
                     params_len = 1
                     if len(check.param) != params_len:
-                        raise DictConsistencyError(_('{} must have {} param').format(name, params_len))
+                        xmlfiles = self.objectspace.display_xmlfiles(check.xmlfiles)
+                        raise DictConsistencyError(_(f'{name} must have {params_len} param in {xmlfiles}'))
                 elif name == 'valid_ipnetmask':
                     params_len = 1
                     if len(check.param) != params_len:
-                        raise DictConsistencyError(_('{} must have {} param').format(name, params_len))
+                        xmlfiles = self.objectspace.display_xmlfiles(check.xmlfiles)
+                        raise DictConsistencyError(_(f'{name} must have {params_len} param in {xmlfiles}'))
                     name = 'valid_ip_netmask'
                 elif name == 'valid_broadcast':
                     params_len = 2
                     if len(check.param) != params_len:
-                        raise DictConsistencyError(_('{} must have {} param').format(name, params_len))
+                        xmlfiles = self.objectspace.display_xmlfiles(check.xmlfiles)
+                        raise DictConsistencyError(_(f'{name} must have {params_len} param in {xmlfiles}'))
                 elif name == 'valid_in_network':
-                    params_len = 2
-                    if len(check.param) != params_len:
-                        raise DictConsistencyError(_('{} must have {} param').format(name, params_len))
+                    if len(check.param) not in (1, 2):
+                        params_len = 2
+                        xmlfiles = self.objectspace.display_xmlfiles(check.xmlfiles)
+                        raise DictConsistencyError(_(f'{name} must have {params_len} param in {xmlfiles}'))
                 check_.name = name
                 check_.warnings_only = check.warnings_only
                 if hasattr(check, 'param'):
@@ -1007,7 +1058,6 @@ class ConstraintAnnotator:
         indexes = list(fills.keys())
         indexes.sort()
         targets = []
-        eosfunc = dir(self.eosfunc)
         for idx in indexes:
             fill = fills[idx]
             # test if it's redefined calculation
@@ -1015,25 +1065,31 @@ class ConstraintAnnotator:
                 raise DictConsistencyError(_(f"A fill already exists for the target: {fill.target}"))
             targets.append(fill.target)
             #
-            if fill.name not in eosfunc:
+            if fill.name not in self.functions:
                 raise DictConsistencyError(_('cannot find fill function {}').format(fill.name))
 
             namespace = fill.namespace
             # let's replace the target by the path
-            fill.target = self.objectspace.paths.get_variable_path(fill.target,
-                                                                   namespace,
-                                                                   )
-
-            value = self.objectspace.value()
+            fill.target, suffix = self.objectspace.paths.get_variable_path(fill.target,
+                                                                           namespace,
+                                                                           with_suffix=True,
+                                                                           )
+            if suffix is not None:
+                raise DictConsistencyError(_(f'Cannot add fill function to "{fill.target}" only with the suffix "{suffix}"'))
+            variable = self.objectspace.paths.get_variable_obj(fill.target)
+            value = self.objectspace.value(variable.xmlfiles)
             value.type = 'calculation'
             value.name = fill.name
             if hasattr(fill, 'param'):
                 param_to_delete = []
                 for fill_idx, param in enumerate(fill.param):
-                    if param.type not in TYPE_PARAM_FILL:
-                        raise DictConsistencyError(_(f'cannot use {param.type} type as a param in a fill/auto'))
-                    if param.type != 'string' and not hasattr(param, 'text'):
-                        raise DictConsistencyError(_(f"All '{param.type}' variables shall have a value in order to calculate {fill.target}"))
+                    if param.type not in ['suffix', 'string'] and not hasattr(param, 'text'):
+                        raise DictConsistencyError(_(f"All '{param.type}' variables must have a value in order to calculate {fill.target}"))
+                    if param.type == 'suffix' and hasattr(param, 'text'):
+                        raise DictConsistencyError(_(f"All '{param.type}' variables must not have a value in order to calculate {fill.target}"))
+                    if param.type == 'string':
+                        if not hasattr(param, 'text'):
+                            param.text = None
                     if param.type == 'variable':
                         try:
                             param.text, suffix = self.objectspace.paths.get_variable_path(param.text,
@@ -1053,7 +1109,6 @@ class ConstraintAnnotator:
                 for param_idx in param_to_delete:
                     fill.param.pop(param_idx)
                 value.param = fill.param
-            variable = self.objectspace.paths.get_variable_obj(fill.target)
             variable.value = [value]
         del self.objectspace.space.constraints.fill
 
@@ -1061,6 +1116,7 @@ class ConstraintAnnotator:
         if hasattr(self.objectspace.space.constraints, 'index'):
             del self.objectspace.space.constraints.index
         del self.objectspace.space.constraints.namespace
+        del self.objectspace.space.constraints.xmlfiles
         if vars(self.objectspace.space.constraints):
             raise Exception('constraints again?')
         del self.objectspace.space.constraints
@@ -1121,7 +1177,7 @@ class FamilyAnnotator:
         # if the variable is mandatory and doesn't have any value
         # then the variable's mode is set to 'basic'
         if not hasattr(variable, 'value') and variable.type == 'boolean':
-            new_value = self.objectspace.value()
+            new_value = self.objectspace.value(variable.xmlfiles)
             new_value.name = True
             new_value.type = 'boolean'
             variable.value = [new_value]
@@ -1136,9 +1192,9 @@ class FamilyAnnotator:
                             if param.type == 'variable':
                                 has_variable = True
                                 break
-                    if not has_variable:
-                        # if one parameter is a variable, let variable choice if it's mandatory
-                        variable.mandatory = True
+                    #if not has_variable:
+                    #    # if one parameter is a variable, let variable choice if it's mandatory
+                    #    variable.mandatory = True
             if has_value:
                 # if has value but without any calculation
                 variable.mandatory = True

src/rougail/config.py

@@ -3,17 +3,20 @@
 fichier de configuration pour rougail
 
 """
-from os.path import join, isfile, abspath, dirname
-from pathlib import Path
+from os.path import join, abspath, dirname
 
-rougailroot = '/var/rougail' 
-patch_dir = join(rougailroot, 'patches')
-manifests_dir = join(rougailroot, 'manifests')
-templates_dir = join(rougailroot, 'templates')
+
+rougailroot = '/var/rougail'
 dtddir = join(dirname(abspath(__file__)), 'data')
-dtdfilename = join(dtddir, 'rougail.dtd')
 
-# chemin du répertoire source des fichiers templates
-patch_dir = '/srv/rougail/patch'
 
-variable_namespace = 'rougail'
+Config = {'rougailroot': rougailroot,
+          'patch_dir': join(rougailroot, 'patches'),
+          'manifests_dir': join(rougailroot, 'manifests'),
+          'templates_dir': join(rougailroot, 'templates'),
+          'dtdfilename': join(dtddir, 'rougail.dtd'),
+          'dtddir': dtddir,
+          # chemin du répertoire source des fichiers templates
+          'patch_dir': '/srv/rougail/patch',
+          'variable_namespace': 'rougail',
+          }

src/rougail/data/rougail.dtd

@@ -45,7 +45,7 @@
 
 <!ELEMENT services (service*)>
 
-<!ELEMENT service ((port* | tcpwrapper* | ip* | interface* | package* | file* | digitalcertificate* | override*)*) >
+<!ELEMENT service ((port* | tcpwrapper* | ip* | interface* | package* | file* | override*)*) >
 <!ATTLIST service name CDATA #REQUIRED>
 <!ATTLIST service manage (True|False) "True">
 
@@ -75,14 +75,6 @@
 <!ATTLIST file redefine (True|False) "False">
 <!ATTLIST file templating (True|False) "True">
 
-<!ELEMENT digitalcertificate EMPTY>
-<!ATTLIST digitalcertificate name CDATA #REQUIRED >
-<!ATTLIST digitalcertificate digitalcertificate_type (variable) "variable">
-<!ATTLIST digitalcertificate certificate CDATA #REQUIRED >
-<!ATTLIST digitalcertificate certificate_type (variable) "variable">
-<!ATTLIST digitalcertificate type CDATA #REQUIRED >
-<!ATTLIST digitalcertificate ca CDATA #REQUIRED >
-
 <!ELEMENT override EMPTY>
 <!ATTLIST override source CDATA #IMPLIED >
 <!ATTLIST override templating (True|False) "True">
@@ -110,6 +102,7 @@
 <!ATTLIST variable mode (basic|normal|expert) "normal">
 <!ATTLIST variable remove_check (True|False) "False">
 <!ATTLIST variable remove_condition (True|False) "False">
+<!ATTLIST variable remove_fill (True|False) "False">
 <!ATTLIST variable test CDATA #IMPLIED>
 
 <!ELEMENT separators (separator*)>
@@ -138,10 +131,11 @@
 
 <!ELEMENT group (follower+)>
 <!ATTLIST group leader CDATA #REQUIRED>
+<!ATTLIST group name CDATA #IMPLIED>
 <!ATTLIST group description CDATA #IMPLIED>
 
 <!ELEMENT param (#PCDATA)>
-<!ATTLIST param type (string|variable|number|python) "string">
+<!ATTLIST param type (string|number|variable|information|suffix) "string">
 <!ATTLIST param name CDATA #IMPLIED>
 <!ATTLIST param notraisepropertyerror (True|False) "False">
 <!ATTLIST param optional (True|False) "False">

src/rougail/objspace.py

@@ -32,7 +32,7 @@ from .tiramisureflector import TiramisuReflector
 from .utils import normalize_family
 from .error import OperationError, SpaceObjShallNotBeUpdated, DictConsistencyError
 from .path import Path
-from .config import variable_namespace
+from .config import Config
 
 # CreoleObjSpace's elements like 'family' or 'follower', that shall be forced to the Redefinable type
 FORCE_REDEFINABLES = ('family', 'follower', 'service', 'disknod', 'variables')
@@ -59,7 +59,10 @@ CONVERT_EXPORT = {'Leadership': 'leader',
 # _____________________________________________________________________________
 # special types definitions for the Object Space's internal representation
 class RootCreoleObject:
-    ""
+    def __init__(self, xmlfiles):
+        if not isinstance(xmlfiles, list):
+            xmlfiles = [xmlfiles]
+        self.xmlfiles = xmlfiles
 
 
 class CreoleObjSpace:
@@ -92,6 +95,7 @@ class CreoleObjSpace:
         self.xmlreflector = XMLReflector()
         self.xmlreflector.parse_dtd(dtdfilename)
         self.redefine_variables = None
+        self.fill_removed = None
         self.check_removed = None
         self.condition_removed = None
 
@@ -153,14 +157,17 @@ class CreoleObjSpace:
         """
         for xmlfile, document in self.xmlreflector.load_xml_from_folders(xmlfolders):
             self.redefine_variables = []
+            self.fill_removed = []
             self.check_removed = []
             self.condition_removed = []
-            self.xml_parse_document(document,
+            self.xml_parse_document(xmlfile,
+                                    document,
                                     self.space,
                                     namespace,
                                     )
 
     def xml_parse_document(self,
+                           xmlfile,
                            document,
                            space,
                            namespace,
@@ -177,7 +184,7 @@ class CreoleObjSpace:
                 continue
             if child.tag == 'family':
                 if child.attrib['name'] in family_names:
-                    raise DictConsistencyError(_('Family {} is set several times').format(child.attrib['name']))
+                    raise DictConsistencyError(_(f'Family "{child.attrib["name"]}" is set several times in "{xmlfile}"'))
                 family_names.append(child.attrib['name'])
             if child.tag == 'variables':
                 child.attrib['name'] = namespace
@@ -186,16 +193,18 @@ class CreoleObjSpace:
                 continue
             # variable objects creation
             try:
-                variableobj = self.generate_variableobj(child,
-                                                    space,
-                                                    namespace,
-                                                    )
+                variableobj = self.generate_variableobj(xmlfile,
+                                                        child,
+                                                        space,
+                                                        namespace,
+                                                        )
             except SpaceObjShallNotBeUpdated:
                 continue
             self.set_text_to_obj(child,
                                  variableobj,
                                  )
-            self.set_xml_attributes_to_obj(child,
+            self.set_xml_attributes_to_obj(xmlfile,
+                                           child,
                                            variableobj,
                                            )
             self.variableobj_tree_visitor(child,
@@ -213,26 +222,29 @@ class CreoleObjSpace:
                                        child,
                                        )
             if list(child) != []:
-                self.xml_parse_document(child,
+                self.xml_parse_document(xmlfile,
+                                        child,
                                         variableobj,
                                         namespace,
                                         )
 
     def generate_variableobj(self,
-                           child,
-                           space,
-                           namespace,
-                           ):
+                             xmlfile,
+                             child,
+                             space,
+                             namespace,
+                             ):
         """
         instanciates or creates Creole Object Subspace objects
         """
-        variableobj = getattr(self, child.tag)()
+        variableobj = getattr(self, child.tag)(xmlfile)
         if isinstance(variableobj, self.Redefinable):
-            variableobj = self.create_or_update_redefinable_object(child.attrib,
-                                                                 space,
-                                                                 child,
-                                                                 namespace,
-                                                                 )
+            variableobj = self.create_or_update_redefinable_object(xmlfile,
+                                                                   child.attrib,
+                                                                   space,
+                                                                   child,
+                                                                   namespace,
+                                                                   )
         elif isinstance(variableobj, self.Atom) and child.tag in vars(space):
             # instanciates an object from the CreoleObjSpace's builtins types
             # example : child.tag = constraints -> a self.Constraints() object is created
@@ -246,6 +258,7 @@ class CreoleObjSpace:
         return variableobj
 
     def create_or_update_redefinable_object(self,
+                                            xmlfile,
                                             subspace,
                                             space,
                                             child,
@@ -279,15 +292,17 @@ class CreoleObjSpace:
             name = child.text
         else:
             name = subspace['name']
-        if self.is_already_exists(name,
-                                  space,
-                                  child,
-                                  namespace,
-                                  ):
+        existed_var = self.is_already_exists(name,
+                                             space,
+                                             child,
+                                             namespace,
+                                             )
+        if existed_var:
             default_redefine = child.tag in FORCE_REDEFINABLES
             redefine = self.convert_boolean(subspace.get('redefine', default_redefine))
             exists = self.convert_boolean(subspace.get('exists', True))
             if redefine is True:
+                existed_var.xmlfiles.append(xmlfile)
                 return self.translate_in_space(name,
                                                space,
                                                child,
@@ -295,12 +310,21 @@ class CreoleObjSpace:
                                                )
             elif exists is False:
                 raise SpaceObjShallNotBeUpdated()
-            raise DictConsistencyError(_(f'Already present in another XML file, {name} cannot be re-created'))
+            xmlfiles = self.display_xmlfiles(existed_var.xmlfiles)
+            raise DictConsistencyError(_(f'"{child.tag}" named "{name}" cannot be re-created in "{xmlfile}", already defined in {xmlfiles}'))
         redefine = self.convert_boolean(subspace.get('redefine', False))
         exists = self.convert_boolean(subspace.get('exists', False))
         if redefine is False or exists is True:
-            return getattr(self, child.tag)()
-        raise DictConsistencyError(_(f'Redefined object: {name} does not exist yet'))
+            return getattr(self, child.tag)(xmlfile)
+        raise DictConsistencyError(_(f'Redefined object in "{xmlfile}": "{name}" does not exist yet'))
+
+    def display_xmlfiles(self,
+                         xmlfiles: list,
+                         ) -> str:
+        if len(xmlfiles) == 1:
+            return '"' + xmlfiles[0] + '"'
+        else:
+            return '"' + '", "'.join(xmlfiles[:-1]) + '"' + ' and ' + '"' + xmlfiles[-1] + '"'
 
     def create_tree_structure(self,
                               space,
@@ -327,16 +351,25 @@ class CreoleObjSpace:
                 raise OperationError(_("Creole object {} "
                                              "has a wrong type").format(type(variableobj)))
 
-    def is_already_exists(self, name, space, child, namespace):
+    def is_already_exists(self,
+                          name: str,
+                          space: str,
+                          child,
+                          namespace: str,
+                          ):
         if isinstance(space, self.family):  # pylint: disable=E1101
-            if namespace != variable_namespace:
+            if namespace != Config['variable_namespace']:
                 name = space.path + '.' + name
-            return self.paths.path_is_defined(name)
+            if self.paths.path_is_defined(name):
+                return self.paths.get_variable_obj(name)
+            return
         if child.tag == 'family':
             norm_name = normalize_family(name)
         else:
             norm_name = name
-        return norm_name in getattr(space, child.tag, {})
+        children = getattr(space, child.tag, {})
+        if norm_name in children:
+            return children[norm_name]
 
     def convert_boolean(self, value):  # pylint: disable=R0201
         """Boolean coercion. The Creole XML may contain srings like `True` or `False`
@@ -362,14 +395,14 @@ class CreoleObjSpace:
             else:
                 norm_name = name
             return getattr(family, variable.tag)[norm_name]
-        if namespace == variable_namespace:
+        if namespace == Config['variable_namespace']:
             path = name
         else:
             path = family.path + '.' + name
         old_family_name = self.paths.get_variable_family_name(path)
         if normalize_family(family.name) == old_family_name:
             return getattr(family, variable.tag)[name]
-        old_family = self.space.variables[variable_namespace].family[old_family_name]  # pylint: disable=E1101
+        old_family = self.space.variables[Config['variable_namespace']].family[old_family_name]  # pylint: disable=E1101
         variable_obj = old_family.variable[name]
         del old_family.variable[name]
         if 'variable' not in vars(family):
@@ -383,6 +416,18 @@ class CreoleObjSpace:
                                 )
         return variable_obj
 
+    def remove_fill(self, name):  # pylint: disable=C0111
+        if hasattr(self.space, 'constraints') and hasattr(self.space.constraints, 'fill'):
+            remove_fills= []
+            for idx, fill in enumerate(self.space.constraints.fill):  # pylint: disable=E1101
+                if hasattr(fill, 'target') and fill.target == name:
+                    remove_fills.append(idx)
+
+            remove_fills = list(set(remove_fills))
+            remove_fills.sort(reverse=True)
+            for idx in remove_fills:
+                self.space.constraints.fill.pop(idx)  # pylint: disable=E1101
+
     def remove_check(self, name):  # pylint: disable=C0111
         if hasattr(self.space, 'constraints') and hasattr(self.space.constraints, 'check'):
             remove_checks = []
@@ -437,6 +482,7 @@ class CreoleObjSpace:
                 variableobj.text = text
 
     def set_xml_attributes_to_obj(self,
+                                  xmlfile,
                                   child,
                                   variableobj,
                                   ):
@@ -449,7 +495,8 @@ class CreoleObjSpace:
                 # UNREDEFINABLE concerns only 'variable' node so we can fix name
                 # to child.attrib['name']
                 name = child.attrib['name']
-                raise DictConsistencyError(_(f'cannot redefine attribute {attr} for variable {name}'))
+                xmlfiles = self.display_xmlfiles(variableobj.xmlfiles[:-1])
+                raise DictConsistencyError(_(f'cannot redefine attribute "{attr}" for variable "{name}" in "{xmlfile}", already defined in {xmlfiles}'))
             if attr in self.booleans_attributs:
                 val = self.convert_boolean(val)
             if not (attr == 'name' and getattr(variableobj, 'name', None) != None):
@@ -468,16 +515,21 @@ class CreoleObjSpace:
                 self.remove_check(variableobj.name)
             if child.attrib.get('remove_condition', False):
                 self.remove_condition(variableobj.name)
+            if child.attrib.get('remove_fill', False):
+                self.remove_fill(variableobj.name)
         if child.tag == 'fill':
             # if variable is a redefine in current dictionary
             # XXX not working with variable not in variable and in leader/followers
             variableobj.redefine = child.attrib['target'] in self.redefine_variables
+            if child.attrib['target'] in self.redefine_variables and child.attrib['target'] not in self.fill_removed:
+                self.remove_fill(child.attrib['target'])
+                self.fill_removed.append(child.attrib['target'])
         if not hasattr(variableobj, 'index'):
             variableobj.index = self.index
         if child.tag == 'check' and child.attrib['target'] in self.redefine_variables and child.attrib['target'] not in self.check_removed:
             self.remove_check(child.attrib['target'])
             self.check_removed.append(child.attrib['target'])
-        if child.tag == 'condition' and child.attrib['source'] in self.redefine_variables and child.attrib['source'] not in self.check_removed:
+        if child.tag == 'condition' and child.attrib['source'] in self.redefine_variables and child.attrib['source'] not in self.condition_removed:
             self.remove_condition(child.attrib['source'])
             self.condition_removed.append(child.attrib['source'])
         variableobj.namespace = namespace
@@ -501,7 +553,7 @@ class CreoleObjSpace:
                                     document.attrib.get('dynamic') != None,
                                     variableobj)
             if child.attrib.get('redefine', 'False') == 'True':
-                if namespace == variable_namespace:
+                if namespace == Config['variable_namespace']:
                     self.redefine_variables.append(child.attrib['name'])
                 else:
                     self.redefine_variables.append(namespace + '.' + family_name + '.' +
@@ -509,7 +561,7 @@ class CreoleObjSpace:
 
         elif child.tag == 'family':
             family_name = normalize_family(child.attrib['name'])
-            if namespace != variable_namespace:
+            if namespace != Config['variable_namespace']:
                 family_name = namespace + '.' + family_name
             self.paths.add_family(namespace,
                                   family_name,

src/rougail/path.py

@@ -1,7 +1,7 @@
 from .i18n import _
 from .utils import normalize_family
 from .error import OperationError, DictConsistencyError
-from .config import variable_namespace
+from .config import Config
 
 
 class Path:
@@ -13,7 +13,8 @@ class Path:
     def __init__(self):
         self.variables = {}
         self.families = {}
-        self.full_paths = {}
+        self.full_paths_families = {}
+        self.full_paths_variables = {}
 
     # Family
     def add_family(self,
@@ -21,9 +22,9 @@ class Path:
                    name: str,
                    variableobj: str,
                    ) -> str:  # pylint: disable=C0111
-        if '.' not in name and namespace == variable_namespace:
+        if '.' not in name and namespace == Config['variable_namespace']:
             full_name = '.'.join([namespace, name])
-            self.full_paths[name] = full_name
+            self.full_paths_families[name] = full_name
         else:
             full_name = name
         if full_name in self.families and self.families[full_name]['variableobj'] != variableobj:
@@ -41,12 +42,12 @@ class Path:
                                 check_name=False,
                                 allow_dot=True,
                                 )
-        if '.' not in name and current_namespace == variable_namespace and name in self.full_paths:
-            name = self.full_paths[name]
+        if '.' not in name and current_namespace == Config['variable_namespace'] and name in self.full_paths_families:
+            name = self.full_paths_families[name]
         if current_namespace is None:  # pragma: no cover
             raise OperationError('current_namespace must not be None')
         dico = self.families[name]
-        if dico['namespace'] != variable_namespace and current_namespace != dico['namespace']:
+        if dico['namespace'] != Config['variable_namespace'] and current_namespace != dico['namespace']:
             raise DictConsistencyError(_('A family located in the {} namespace '
                                                'shall not be used in the {} namespace').format(
                                                    dico['namespace'], current_namespace))
@@ -55,8 +56,8 @@ class Path:
     def get_family_obj(self,
                        name: str,
                        ) -> 'Family':  # pylint: disable=C0111
-        if '.' not in name and name in self.full_paths:
-            name = self.full_paths[name]
+        if '.' not in name and name in self.full_paths_families:
+            name = self.full_paths_families[name]
         if name not in self.families:
             raise DictConsistencyError(_('unknown family {}').format(name))
         dico = self.families[name]
@@ -65,7 +66,7 @@ class Path:
     def family_is_defined(self,
                         name: str,
                         ) -> str:  # pylint: disable=C0111
-        if '.' not in name and name not in self.families and name in self.full_paths:
+        if '.' not in name and name not in self.families and name in self.full_paths_families:
             return True
         return name in self.families
 
@@ -87,8 +88,8 @@ class Path:
                           False,
                           dico['variableobj'],
                           )
-        if namespace == variable_namespace:
-            self.full_paths[name] = new_path
+        if namespace == Config['variable_namespace']:
+            self.full_paths_variables[name] = new_path
         else:
             name = new_path
         dico = self._get_variable(name)
@@ -110,10 +111,10 @@ class Path:
                      ) -> str:  # pylint: disable=C0111
         if '.' not in name:
             full_name = '.'.join([namespace, family, name])
-            self.full_paths[name] = full_name
+            self.full_paths_variables[name] = full_name
         else:
             full_name = name
-            if namespace == variable_namespace:
+            if namespace == Config['variable_namespace']:
                 name = name.rsplit('.', 1)[1]
         self.variables[full_name] = dict(name=name,
                                          family=family,
@@ -157,7 +158,7 @@ class Path:
         else:
             dico = self._get_variable(name)
         if not allow_source:
-            if dico['namespace'] not in [variable_namespace, 'services'] and current_namespace != dico['namespace']:
+            if dico['namespace'] not in [Config['variable_namespace'], 'services'] and current_namespace != dico['namespace']:
                 raise DictConsistencyError(_('A variable located in the {} namespace '
                                                    'shall not be used in the {} namespace').format(
                                                        dico['namespace'], current_namespace))
@@ -176,7 +177,7 @@ class Path:
     def path_is_defined(self,
                         name: str,
                         ) -> str:  # pylint: disable=C0111
-        if '.' not in name and name not in self.variables and name in self.full_paths:
+        if '.' not in name and name not in self.variables and name in self.full_paths_variables:
             return True
         return name in self.variables
 
@@ -186,17 +187,21 @@ class Path:
                       ) -> str:
         if name not in self.variables:
             if name not in self.variables:
-                if '.' not in name and name in self.full_paths:
-                    name = self.full_paths[name]
+                if '.' not in name and name in self.full_paths_variables:
+                    name = self.full_paths_variables[name]
             if name not in self.variables:
                 for var_name, variable in self.variables.items():
                     if variable['is_dynamic'] and name.startswith(var_name):
+                        if not with_suffix:
+                            raise Exception('This option is dynamic, should use "with_suffix" attribute')
                         return variable, name[len(var_name):]
                 if '.' not in name:
-                    for var_name, path in self.full_paths.items():
+                    for var_name, path in self.full_paths_variables.items():
                         if name.startswith(var_name):
-                            variable = self.variables[self.full_paths[var_name]]
+                            variable = self.variables[self.full_paths_variables[var_name]]
                             if variable['is_dynamic']:
+                                if not with_suffix:
+                                    raise Exception('This option is dynamic, should use "with_suffix" attribute')
                                 return variable, name[len(var_name):]
                 raise DictConsistencyError(_('unknown option {}').format(name))
         if with_suffix:

src/rougail/template.py

@@ -9,16 +9,20 @@ from shutil import copy
 import logging
 from typing import Dict, Any
 from subprocess import call
-from os import listdir, makedirs
-from os.path import dirname, join, isfile
+from os import listdir, makedirs, getcwd, chdir
+from os.path import dirname, join, isfile, abspath, normpath, relpath
 
 from Cheetah.Template import Template as ChtTemplate
 from Cheetah.NameMapper import NotFound as CheetahNotFound
 
-from tiramisu import Config
-from tiramisu.error import PropertiesOptionError
+try:
+    from tiramisu3 import Config
+    from tiramisu3.error import PropertiesOptionError
+except:
+    from tiramisu import Config
+    from tiramisu.error import PropertiesOptionError
 
-from .config import patch_dir, variable_namespace
+from .config import Config
 from .error import FileNotFound, TemplateError
 from .i18n import _
 from .utils import normalize_family
@@ -75,7 +79,8 @@ class CheetahTemplate(ChtTemplate):
                  context,
                  eosfunc: Dict,
                  destfilename,
-                 variable):
+                 variable,
+                 ):
         """Initialize Creole CheetahTemplate
         """
         extra_context = {'is_defined' : IsDefined(context),
@@ -88,6 +93,24 @@ class CheetahTemplate(ChtTemplate):
                              file=filename,
                              searchList=[context, eosfunc, extra_context])
 
+    # FORK of Cheetah fonction, do not replace '\\' by '/'
+    def serverSidePath(self,
+                       path=None,
+                       normpath=normpath,
+                       abspath=abspath
+                       ):
+
+        # strange...
+        if path is None and isinstance(self, str):
+            path = self
+        if path:
+            return normpath(abspath(path))
+#            return normpath(abspath(path.replace("\\", '/')))
+        elif hasattr(self, '_filePath') and self._filePath:
+            return normpath(abspath(self._filePath))
+        else:
+            return None
+
 
 class CreoleLeader:
     def __init__(self, value, follower=None, index=None):
@@ -283,37 +306,43 @@ class CreoleTemplateEngine:
         return CreoleExtra(families)
 
     def patch_template(self,
-                       filename: str):
+                       filename: str,
+                       tmp_dir: str,
+                       patch_dir: str,
+                       ) -> None:
         """Apply patch to a template
         """
-        patch_cmd = ['patch', '-d', self.tmp_dir, '-N', '-p1']
+        patch_cmd = ['patch', '-d', tmp_dir, '-N', '-p1']
         patch_no_debug = ['-s', '-r', '-', '--backup-if-mismatch']
 
-        # patches variante + locaux
-        for directory in [join(patch_dir, 'variante'), patch_dir]:
-            patch_file = join(directory, f'{filename}.patch')
-            if isfile(patch_file):
-                log.info(_("Patching template '{filename}' with '{patch_file}'"))
-                ret = call(patch_cmd + patch_no_debug + ['-i', patch_file])
-                if ret:
-                    patch_cmd_err = ' '.join(patch_cmd + ['-i', patch_file])
-                    log.error(_(f"Error applying patch: '{patch_file}'\nTo reproduce and fix this error {patch_cmd_err}"))
-                    copy(filename, self.tmp_dir)
+        patch_file = join(patch_dir, f'{filename}.patch')
+        if isfile(patch_file):
+            log.info(_("Patching template '{filename}' with '{patch_file}'"))
+            rel_patch_file = relpath(patch_file, tmp_dir)
+            ret = call(patch_cmd + patch_no_debug + ['-i', rel_patch_file])
+            if ret:
+                patch_cmd_err = ' '.join(patch_cmd + ['-i', rel_patch_file])
+                log.error(_(f"Error applying patch: '{rel_patch_file}'\nTo reproduce and fix this error {patch_cmd_err}"))
+                copy(join(self.distrib_dir, filename), tmp_dir)
 
     def prepare_template(self,
-                         filename: str):
+                         filename: str,
+                         tmp_dir: str,
+                         patch_dir: str,
+                         ) -> None:
         """Prepare template source file
         """
-        log.info(_("Copy template: '{filename}' -> '{self.tmp_dir}'"))
-        copy(filename, self.tmp_dir)
-        self.patch_template(filename)
+        log.info(_("Copy template: '{filename}' -> '{tmp_dir}'"))
+        copy(filename, tmp_dir)
+        self.patch_template(filename, tmp_dir, patch_dir)
 
     def process(self,
                 source: str,
                 true_destfilename: str,
                 destfilename: str,
                 filevar: Dict,
-                variable: Any):
+                variable: Any,
+                ):
         """Process a cheetah template
         """
         # full path of the destination file
@@ -337,7 +366,10 @@ class CreoleTemplateEngine:
 
     def instance_file(self,
                       filevar: Dict,
-                      service_name: str) -> None:
+                      service_name: str,
+                      tmp_dir: str,
+                      dest_dir: str,
+                      ) -> None:
         """Run templatisation on one file
         """
         log.info(_("Instantiating file '{filename}'"))
@@ -351,13 +383,13 @@ class CreoleTemplateEngine:
             if variable:
                 variable = [variable]
         for idx, filename in enumerate(filenames):
-            destfilename = join(self.dest_dir, filename[1:])
+            destfilename = join(dest_dir, filename[1:])
             makedirs(dirname(destfilename), exist_ok=True)
             if variable:
                 var = variable[idx]
             else:
                 var = None
-            source = join(self.tmp_dir, filevar['source'])
+            source = join(tmp_dir, filevar['source'])
             if filevar['templating']:
                 self.process(source,
                              filename,
@@ -370,16 +402,21 @@ class CreoleTemplateEngine:
     async def instance_files(self) -> None:
         """Run templatisation on all files
         """
+        ori_dir = getcwd()
+        tmp_dir = relpath(self.tmp_dir, self.distrib_dir)
+        dest_dir = relpath(self.dest_dir, self.distrib_dir)
+        patch_dir = relpath(Config['patch_dir'], self.distrib_dir)
+        chdir(self.distrib_dir)
         for option in await self.config.option.list(type='all'):
             namespace = await option.option.name()
-            if namespace == variable_namespace:
+            if namespace == Config['variable_namespace']:
                 await self.load_eole_variables_rougail(option)
             else:
                 families = await self.load_eole_variables(namespace,
                                                           option)
                 self.rougail_variables_dict[namespace] = families
-        for template in listdir(self.distrib_dir):
-            self.prepare_template(join(self.distrib_dir, template))
+        for template in listdir('.'):
+            self.prepare_template(template, tmp_dir, patch_dir)
         for service_obj in await self.config.option('services').list('all'):
             service_name = await service_obj.option.doc()
             for fills in await service_obj.list('all'):
@@ -387,15 +424,17 @@ class CreoleTemplateEngine:
                     for fill_obj in await fills.list('all'):
                         fill = await fill_obj.value.dict()
                         filename = fill['source']
-                        distib_file = join(self.distrib_dir, filename)
-                        if not isfile(distib_file):
-                            raise FileNotFound(_(f"File {distib_file} does not exist."))
+                        if not isfile(filename):
+                            raise FileNotFound(_(f"File {filename} does not exist."))
                         if fill.get('activate', False):
                             self.instance_file(fill,
                                                service_name,
+                                               tmp_dir,
+                                               dest_dir,
                                                )
                         else:
                             log.debug(_("Instantiation of file '{filename}' disabled"))
+        chdir(ori_dir)
 
 
 async def generate(config: Config,

src/rougail/tiramisu.py

@@ -1,4 +1,7 @@
-from tiramisu import DynOptionDescription
+try:
+    from tiramisu3 import DynOptionDescription
+except:
+    from tiramisu import DynOptionDescription
 from .utils import normalize_family
 
 

src/rougail/tiramisureflector.py

@@ -1,13 +1,10 @@
 """loader
 flattened XML specific
 """
-from os.path import isfile
-from lxml.etree import DTD
-
-from .config import dtdfilename, variable_namespace
+from .config import Config
 from .i18n import _
 from .error import LoaderError
-from .annotator import ERASED_ATTRIBUTES
+from .annotator import ERASED_ATTRIBUTES, CONVERT_OPTION
 
 
 FUNC_TO_DICT = ['valid_not_equal']
@@ -15,42 +12,22 @@ FORCE_INFORMATIONS = ['help', 'test', 'separator', 'manage']
 ATTRIBUTES_ORDER = ('name', 'doc', 'default', 'multi')
 
 
-CONVERT_OPTION = {'number': dict(opttype="IntOption", func=int),
-                  'choice': dict(opttype="ChoiceOption"),
-                  'string': dict(opttype="StrOption"),
-                  'password': dict(opttype="PasswordOption"),
-                  'mail': dict(opttype="EmailOption"),
-                  'boolean': dict(opttype="BoolOption"),
-                  'symlink': dict(opttype="SymLinkOption"),
-                  'filename': dict(opttype="FilenameOption"),
-                  'date': dict(opttype="DateOption"),
-                  'unix_user': dict(opttype="UsernameOption"),
-                  'ip': dict(opttype="IPOption", initkwargs={'allow_reserved': True}),
-                  'local_ip': dict(opttype="IPOption", initkwargs={'private_only': True, 'warnings_only': True}),
-                  'netmask': dict(opttype="NetmaskOption"),
-                  'network': dict(opttype="NetworkOption"),
-                  'broadcast': dict(opttype="BroadcastOption"),
-                  'netbios': dict(opttype="DomainnameOption", initkwargs={'type': 'netbios', 'warnings_only': True}),
-                  'domain': dict(opttype="DomainnameOption", initkwargs={'type': 'domainname', 'allow_ip': False}),
-                  'hostname': dict(opttype="DomainnameOption", initkwargs={'type': 'hostname', 'allow_ip': False}),
-                  'web_address': dict(opttype="URLOption", initkwargs={'allow_ip': True, 'allow_without_dot': True}),
-                  'port': dict(opttype="PortOption", initkwargs={'allow_private': True}),
-                  'mac': dict(opttype="MACOption"),
-                  'cidr': dict(opttype="IPOption", initkwargs={'cidr': True}),
-                  'network_cidr': dict(opttype="NetworkOption", initkwargs={'cidr': True}),
-                  }
-
-
 class TiramisuReflector:
     def __init__(self,
                  xmlroot,
                  funcs_path,
                  ):
         self.storage = ElementStorage()
-        self.storage.text = ["from tiramisu import *",
-                             "from rougail.tiramisu import ConvertDynOptionDescription",
-                             "import imp",
+        self.storage.text = ["import imp",
                              f"func = imp.load_source('func', '{funcs_path}')",
+                             "for key, value in dict(locals()).items():",
+                             "    if key != ['imp', 'func']:",
+                             "        setattr(func, key, value)",
+                             "try:",
+                             "    from tiramisu3 import *",
+                             "except:",
+                             "    from tiramisu import *",
+                             "from rougail.tiramisu import ConvertDynOptionDescription",
                              ]
         self.make_tiramisu_objects(xmlroot)
         # parse object
@@ -80,10 +57,10 @@ class TiramisuReflector:
         # variable_namespace family has to be loaded before any other family
         # because `extra` family could use `variable_namespace` variables.
         if hasattr(xmlroot, 'variables'):
-            if variable_namespace in xmlroot.variables:
-                yield xmlroot.variables[variable_namespace]
+            if Config['variable_namespace'] in xmlroot.variables:
+                yield xmlroot.variables[Config['variable_namespace']]
             for xmlelt, value in xmlroot.variables.items():
-                if xmlelt != variable_namespace:
+                if xmlelt != Config['variable_namespace']:
                     yield value
         if hasattr(xmlroot, 'services'):
             yield xmlroot.services
@@ -252,7 +229,7 @@ class Common:
                 if not self.attrib[key]:
                     continue
                 value = "frozenset({" + self.attrib[key] + "})"
-            elif key in ['default', 'multi', 'suffixes', 'validators']:
+            elif key in ['default', 'multi', 'suffixes', 'validators', 'values']:
                 value = self.attrib[key]
             elif isinstance(value, str) and key != 'opt' and not value.startswith('['):
                 value = "'" + value.replace("'", "\\\'") + "'"
@@ -341,6 +318,8 @@ class Variable(Common):
                     value = value.split(',')
                     if self.object_type == 'IntOption':
                         value = [int(v) for v in value]
+                    elif self.object_type == 'FloatOption':
+                        value = [float(v) for v in value]
                 self.informations[key] = value
             else:
                 self.attrib[key] = value
@@ -368,9 +347,16 @@ class Variable(Common):
                 elif tag == 'check':
                     self.attrib['validators'].append(self.calculation_value(child, ['ParamSelfOption()']))
                 elif tag == 'choice':
-                    choices.append(child.name)
+                    if child.type == 'calculation':
+                        value = self.storage.get(child.name).get()
+                        choices = f"Calculation(func.calc_value, Params((ParamOption({value}))))"
+                    else:
+                        choices.append(child.name)
         if choices:
-            self.attrib['values'] = tuple(choices)
+            if isinstance(choices, list):
+                self.attrib['values'] = str(tuple(choices))
+            else:
+                self.attrib['values'] = choices
         if self.attrib['default'] == []:
             del self.attrib['default']
         elif not self.attrib['multi'] and isinstance(self.attrib['default'], list):
@@ -387,7 +373,7 @@ class Variable(Common):
             function = child.name
             if hasattr(child, 'param'):
                 for param in child.param:
-                    value = self.populate_param(param)
+                    value = self.populate_param(function, param)
                     if not hasattr(param, 'name'):
                         args.append(str(value))
                     else:
@@ -401,6 +387,7 @@ class Variable(Common):
         return ret + ')'
 
     def populate_param(self,
+                       function: str,
                        param,
                        ):
         if param.type == 'string':
@@ -410,11 +397,15 @@ class Variable(Common):
         elif param.type == 'variable':
             value = {'option': param.text,
                      'notraisepropertyerror': param.notraisepropertyerror,
-                     'todict': param.text in FUNC_TO_DICT,
+                     'todict': function in FUNC_TO_DICT,
                      }
             if hasattr(param, 'suffix'):
                 value['suffix'] = param.suffix
             return self.build_param(value)
+        elif param.type == 'information':
+            return f'ParamInformation("{param.text}", None)'
+        elif param.type == 'suffix':
+            return f'ParamSuffix()'
         raise LoaderError(_('unknown param type {}').format(param.type))
 
     def populate_value(self,
@@ -429,7 +420,7 @@ class Variable(Common):
             self.attrib['default'].append(value)
             if not self.is_leader:
                 self.attrib['default_multi'] = value
-        elif isinstance(value, int):
+        elif isinstance(value, (int, float)):
             self.attrib['default'].append(value)
         else:
             self.attrib['default'].append("'" + value + "'")

src/rougail/xmlreflector.py

@@ -37,7 +37,7 @@ class XMLReflector(object):
         # document = parse(BytesIO(xmlfile), XMLParser(remove_blank_text=True))
         document = parse(xmlfile)
         if not self.dtd.validate(document):
-            raise DictConsistencyError(_("not a valid xml file: {}").format(xmlfile))
+            raise DictConsistencyError(_(f'"{xmlfile}" not a valid xml file: {self.dtd.error_log.filter_from_errors()[0]}'))
         return document.getroot()
 
     def load_xml_from_folders(self, xmlfolders):

tests/dictionaries/00empty/tiramisu/base.py

@@ -0,0 +1,14 @@
+import imp
+func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+for key, value in dict(locals()).items():
+    if key != ['imp', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+from rougail.tiramisu import ConvertDynOptionDescription
+option_2 = OptionDescription(name='tata', doc='tata', children=[])
+option_2.impl_set_information("manage", True)
+option_1 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_2])
+option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/00load_autofreeze/tiramisu/base.py

@@ -0,0 +1,15 @@
+import imp
+func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+for key, value in dict(locals()).items():
+    if key != ['imp', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+from rougail.tiramisu import ConvertDynOptionDescription
+option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='module_instancie', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_3 = ChoiceOption(properties=frozenset({'auto_freeze', 'basic', 'force_store_value', 'mandatory', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'basic'}), children=[option_3, option_4])
+option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
+option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/00load_autofreezeexpert/tiramisu/base.py

@@ -0,0 +1,15 @@
+import imp
+func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+for key, value in dict(locals()).items():
+    if key != ['imp', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+from rougail.tiramisu import ConvertDynOptionDescription
+option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='module_instancie', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_3 = ChoiceOption(properties=frozenset({'auto_freeze', 'expert', 'force_store_value', 'mandatory', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4])
+option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
+option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/00load_autosave/tiramisu/base.py

@@ -0,0 +1,14 @@
+import imp
+func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+for key, value in dict(locals()).items():
+    if key != ['imp', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+from rougail.tiramisu import ConvertDynOptionDescription
+option_3 = ChoiceOption(properties=frozenset({'basic', 'force_store_value', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'basic'}), children=[option_3])
+option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
+option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/00load_autosaveexpert/tiramisu/base.py

@@ -0,0 +1,14 @@
+import imp
+func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+for key, value in dict(locals()).items():
+    if key != ['imp', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+from rougail.tiramisu import ConvertDynOptionDescription
+option_3 = ChoiceOption(properties=frozenset({'expert', 'force_store_value', 'mandatory'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'expert'}), children=[option_3])
+option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
+option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/00load_comment/tiramisu/base.py

@@ -0,0 +1,14 @@
+import imp
+func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+for key, value in dict(locals()).items():
+    if key != ['imp', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+from rougail.tiramisu import ConvertDynOptionDescription
+option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3])
+option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
+option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/00load_notype/tiramisu/base.py

@@ -0,0 +1,15 @@
+import imp
+func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+for key, value in dict(locals()).items():
+    if key != ['imp', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+from rougail.tiramisu import ConvertDynOptionDescription
+option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_4 = StrOption(properties=frozenset({'mandatory', 'normal'}), name='without_type', doc='without_type', multi=False, default='non')
+option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4])
+option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
+option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/00load_save/tiramisu/base.py

@@ -0,0 +1,14 @@
+import imp
+func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+for key, value in dict(locals()).items():
+    if key != ['imp', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+from rougail.tiramisu import ConvertDynOptionDescription
+option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3])
+option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
+option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/00load_subfolder/tiramisu/base.py

@@ -0,0 +1,15 @@
+import imp
+func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+for key, value in dict(locals()).items():
+    if key != ['imp', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+from rougail.tiramisu import ConvertDynOptionDescription
+option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_4 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4])
+option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
+option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/01auto_base/tiramisu/base.py

@@ -0,0 +1,15 @@
+import imp
+func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+for key, value in dict(locals()).items():
+    if key != ['imp', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+from rougail.tiramisu import ConvertDynOptionDescription
+option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), values=('oui', 'non'))
+option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4])
+option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
+option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/01auto_withoutparam/tiramisu/base.py

@@ -0,0 +1,15 @@
+import imp
+func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+for key, value in dict(locals()).items():
+    if key != ['imp', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+from rougail.tiramisu import ConvertDynOptionDescription
+option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((), kwargs={})), values=('oui', 'non'))
+option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non'))
+option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4])
+option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
+option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1])

tests/dictionaries/01base_file_include/00-base.xml

@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail>
+
+    <services>
+        <service name="test">
+            <file name="/etc/file"/>
+        </service>
+    </services>
+
+    <variables>
+        <family name="general">
+            <variable name="mode_conteneur_actif" type="oui/non" description="Description">
+                <value>non</value>
+            </variable>
+        </family>
+        <separators/>
+    </variables>
+</rougail>
+<!-- vim: ts=4 sw=4 expandtab
+-->

tests/dictionaries/01base_file_include/makedict/base.json

@@ -0,0 +1 @@
+{"rougail.general.mode_conteneur_actif": "non", "services.test.files.file.group": "root", "services.test.files.file.mode": "0644", "services.test.files.file.name": "/etc/file", "services.test.files.file.owner": "root", "services.test.files.file.source": "file", "services.test.files.file.templating": true, "services.test.files.file.activate": true}

tests/dictionaries/01base_file_include/tiramisu/base.py

@@ -0,0 +1,26 @@
+import imp
+func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+for key, value in dict(locals()).items():
+    if key != ['imp', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+from rougail.tiramisu import ConvertDynOptionDescription
+option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='Description', multi=False, default='non', values=('oui', 'non'))
+option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3])
+option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
+option_8 = StrOption(name='group', doc='group', multi=False, default='root')
+option_9 = StrOption(name='mode', doc='mode', multi=False, default='0644')
+option_10 = StrOption(name='name', doc='name', multi=False, default='/etc/file')
+option_11 = StrOption(name='owner', doc='owner', multi=False, default='root')
+option_12 = StrOption(name='source', doc='source', multi=False, default='file')
+option_13 = BoolOption(name='templating', doc='templating', multi=False, default=True)
+option_14 = BoolOption(name='activate', doc='activate', multi=False, default=True)
+option_7 = OptionDescription(name='file', doc='file', children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14])
+option_6 = OptionDescription(name='files', doc='files', children=[option_7])
+option_5 = OptionDescription(name='test', doc='test', children=[option_6])
+option_5.impl_set_information("manage", True)
+option_4 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_5])
+option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4])

tests/dictionaries/01base_file_include/tmpl/file

@@ -0,0 +1 @@
+%include "incfile"

tests/dictionaries/01base_file_patch/00-base.xml

@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail>
+
+    <services>
+        <service name="test">
+            <file name="/etc/file"/>
+        </service>
+    </services>
+
+    <variables>
+        <family name="general">
+            <variable name="mode_conteneur_actif" type="oui/non" description="Description">
+                <value>non</value>
+            </variable>
+        </family>
+        <separators/>
+    </variables>
+</rougail>
+<!-- vim: ts=4 sw=4 expandtab
+-->

tests/dictionaries/01base_file_patch/makedict/base.json

@@ -0,0 +1 @@
+{"rougail.general.mode_conteneur_actif": "non", "services.test.files.file.group": "root", "services.test.files.file.mode": "0644", "services.test.files.file.name": "/etc/file", "services.test.files.file.owner": "root", "services.test.files.file.source": "file", "services.test.files.file.templating": true, "services.test.files.file.activate": true}

tests/dictionaries/01base_file_patch/patches/file.patch

@@ -0,0 +1,5 @@
+--- tmpl/file	2020-11-20 07:44:38.588472784 +0100
++++ dest/file	2020-11-20 07:44:54.588536011 +0100
+@@ -1 +1 @@
+-unpatched
++patched

tests/dictionaries/01base_file_patch/result/etc/file

@@ -0,0 +1 @@
+patched

tests/dictionaries/01base_file_patch/tiramisu/base.py

@@ -0,0 +1,26 @@
+import imp
+func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+for key, value in dict(locals()).items():
+    if key != ['imp', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+from rougail.tiramisu import ConvertDynOptionDescription
+option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='Description', multi=False, default='non', values=('oui', 'non'))
+option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3])
+option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
+option_8 = StrOption(name='group', doc='group', multi=False, default='root')
+option_9 = StrOption(name='mode', doc='mode', multi=False, default='0644')
+option_10 = StrOption(name='name', doc='name', multi=False, default='/etc/file')
+option_11 = StrOption(name='owner', doc='owner', multi=False, default='root')
+option_12 = StrOption(name='source', doc='source', multi=False, default='file')
+option_13 = BoolOption(name='templating', doc='templating', multi=False, default=True)
+option_14 = BoolOption(name='activate', doc='activate', multi=False, default=True)
+option_7 = OptionDescription(name='file', doc='file', children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14])
+option_6 = OptionDescription(name='files', doc='files', children=[option_7])
+option_5 = OptionDescription(name='test', doc='test', children=[option_6])
+option_5.impl_set_information("manage", True)
+option_4 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_5])
+option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4])

tests/dictionaries/01base_file_patch/tmpl/file

@@ -0,0 +1 @@
+unpatched

tests/dictionaries/01base_file_utfchar/00-base.xml

@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail>
+
+    <services>
+        <service name="test">
+            <file name="/etc/systemd-makefs@dev-disk-by\\x2dpartlabel"/>
+        </service>
+    </services>
+
+    <variables>
+        <family name="general">
+            <variable name="mode_conteneur_actif" type="oui/non" description="Description">
+                <value>non</value>
+            </variable>
+        </family>
+        <separators/>
+    </variables>
+</rougail>
+<!-- vim: ts=4 sw=4 expandtab
+-->

tests/dictionaries/01base_file_utfchar/makedict/base.json

@@ -0,0 +1 @@
+{"rougail.general.mode_conteneur_actif": "non", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.group": "root", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.mode": "0644", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.name": "/etc/systemd-makefs@dev-disk-by\\x2dpartlabel", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.owner": "root", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.source": "systemd-makefs@dev-disk-by\\x2dpartlabel", "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.templating": true, "services.test.files.systemd_makefs@dev_disk_by\\x2dpartlabel.activate": true}

tests/dictionaries/01base_file_utfchar/tiramisu/base.py

@@ -0,0 +1,26 @@
+import imp
+func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+for key, value in dict(locals()).items():
+    if key != ['imp', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+from rougail.tiramisu import ConvertDynOptionDescription
+option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='Description', multi=False, default='non', values=('oui', 'non'))
+option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3])
+option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2])
+option_8 = StrOption(name='group', doc='group', multi=False, default='root')
+option_9 = StrOption(name='mode', doc='mode', multi=False, default='0644')
+option_10 = StrOption(name='name', doc='name', multi=False, default='/etc/systemd-makefs@dev-disk-by\\x2dpartlabel')
+option_11 = StrOption(name='owner', doc='owner', multi=False, default='root')
+option_12 = StrOption(name='source', doc='source', multi=False, default='systemd-makefs@dev-disk-by\\x2dpartlabel')
+option_13 = BoolOption(name='templating', doc='templating', multi=False, default=True)
+option_14 = BoolOption(name='activate', doc='activate', multi=False, default=True)
+option_7 = OptionDescription(name='systemd_makefs@dev_disk_by\\x2dpartlabel', doc='systemd-makefs@dev-disk-by\\x2dpartlabel', children=[option_8, option_9, option_10, option_11, option_12, option_13, option_14])
+option_6 = OptionDescription(name='files', doc='files', children=[option_7])
+option_5 = OptionDescription(name='test', doc='test', children=[option_6])
+option_5.impl_set_information("manage", True)
+option_4 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_5])
+option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4])

tests/dictionaries/01base_file_utfchar/tmpl/systemd-makefs@dev-disk-by\x2dpartlabel

@@ -0,0 +1 @@
+%%mode_conteneur_actif

tests/dictionaries/01base_float/00-base.xml

@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail>
+    <variables>
+        <family name="general">
+            <variable name="float" type="float" description="Description">
+                <value>0.527</value>
+            </variable>
+            <variable name="float_multi" type="float" description="Description" multi="True">
+                <value>0.527</value>
+            </variable>
+        </family>
+        <separators/>
+    </variables>
+</rougail>
+<!-- vim: ts=4 sw=4 expandtab
+-->

tests/dictionaries/01base_float/makedict/base.json

@@ -0,0 +1 @@
+{"rougail.general.float": 0.527, "rougail.general.float_multi": [0.527]}