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

Reviewed-on: #5

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/check/README.md

@@ -1,5 +1,4 @@
 # Les vérifications des valeurs
 
   - [Fonction de vérification](function.md)
-  - [Les variables à choix](valid_enum.md)
   - [Réfinition](redefine.md)

doc/check/valid_enum.md

@@ -1,46 +0,0 @@
-# Les variables à choix
-
-Une variable à choix est d'abord une variable avec une [fonction check](function.md).
-
-## Les variables à choix simple
-
-Il est possible d'imposer une liste de valeur pour une variable particulière :
-
-```
-<check name="valid_enum">
-    <param>yes</param>
-    <param>no</param>
-    <param>maybe</param>
-    <target>my_variable</target>
-</check>
-```
-
-Dans ce cas, seule les valeurs proposés sont possible pour cette variable.
-
-Par défaut, cette variable est obligatoire. Cela signifie qu'il n'est pas possible de spécifier "None" à cette variable.
-
-## Les variables à choix avec valeur None
-
-Il y a deux possibilités pour avoir une valeur "None" dans les choix :
-
-- rendre la variable non obligatoire, cela va ajouter un choix "None" dans la liste :
-
-```
-<variable name="my_variable" mandatory="False">
-```
-
-Ou en ajoutant le paramètre "None" :
-
-```
-<check name="valid_enum">
-    <param>yes</param>
-    <param>no</param>
-    <param type='nil'/>
-    <param>maybe</param>
-    <target>my_variable</target>
-</check>
-```
-
-## La valeur par défaut
-
-Si aucune valeur n'est spécifié pour la variable, automatiquement le premier choix va est placé comme valeur par défaut.

doc/service/service.md

@@ -29,6 +29,16 @@ Un service non géré ne peut conteneur que des fichiers.
 
 ## Désactiver la génération d'un service
 
+Il est possible de désactiver un service. Pour cela il faut rajouter l'attribut "disabled" à True :
+
+```
+<services>
+    <service name="test" disabled="True"/>
+</services>
+```
+
+Dans ce cas, tous les services et les éléments qu'il compose ([fichier](file.md), ...) seront désactivés.
+
 Il est possible de définir une [condition](../condition/README.md) de type "disabled_if_in" ou "disabled_if_not_in" sur une balise service :
 
 ```

doc/variable/README.md

@@ -116,7 +116,6 @@ Les variables booléans sont par défaut obligatoire. Pour qu'une variable bool
 ```
 
 Les variables avec une valeur par défaut (non calculée) sont également automatiquement obligatoire.
-[Les variables à choix](../check/valid_enum.md) sans choix "None" sont également automatiquement obligatoire.
 
 ## Valeur par défaut d'une variable
 

doc/variable/choice.md

@@ -0,0 +1,91 @@
+# Les variables à choix
+
+## Une variable à choix
+
+Il est possible d'imposer une liste de valeur pour une variable particulière :
+
+```
+<variable name="my_variable" type="choice">
+    <choice>val1</choice>
+    <choice>val2</choice>
+    <choice>val3</choice>
+</variable>
+```
+
+Dans ce cas, seules les valeurs proposées sont possibles pour cette variable.
+Cette variable n'est pas obligatoire dont il est possible de mettre la valeur "None".
+
+Si la variable est obligatoire ou si une valeur est précisée (la variable passe obligatoire) alors la valeur "None" n'est plus autorisé :
+
+```
+<variable name="my_variable" type="choice">
+    <choice>val1</choice>
+    <choice>val2</choice>
+    <choice>val3</choice>
+    <value>val1</value>
+</variable>
+```
+
+## Un variable à choix typée
+
+Par défaut les choix sont de type "string". Il est possible de préciser des nombres, des booléens ou la valeur None :
+
+```
+<variable name="my_variable" type="choice">
+    <choice>val1</choice>
+    <choice type="string">val2</choice>
+    <choice type="number">3</choice>
+    <choice type="boolean">True</choice>
+    <choice type="nil"/>
+</variable>
+```
+
+Comme vu précédement ajouter la valeur None n'est pas utile parce qu'elle est automatiquement ajouté si la variable n'est pas obligatoire.
+
+## Ajouter une option à une variable à choix existante
+
+Pour ajouter un choix à une variable à choix existante, rien de plus simple, juste redéfinir la variable en ajoutant le choix voulu :
+
+```
+<variable name="my_variable" redefine="True">
+    <choice>val4</choice>
+</variable>
+```
+
+## Redéfinir une option à choix
+
+Si on veut supprimer un choix ou redéfinir complètement la liste, il faut redéfinir cette variable et ajouter l'attribut "remove_choice" à "True" :
+
+```
+<variable name="my_variable" redefine="True" remove_choice="True">
+    <choice>val1</choice>
+    <choice>val2</choice>
+</variable>
+```
+
+Dans ce cas toutes les anciens choix ne seront plus possible. Seuls les nouveaux le seront.
+
+## Un variable à choix provenant d'une variable
+
+Une variable à valeur multiple peut servir de source des choix :
+
+```
+<variable name="my_variable" type="choice">
+    <choice type="variable">other_variable</choice>
+</variable>
+```
+
+Dans ce cas, toutes les valeurs de la variable seront des choix utilisables par l'utilisateur.
+Seul un choice de type "variable" est possible par variable.
+
+## Un variable à choix provenant d'une fonction
+
+```
+<variable name="my_variable" type="choice">
+    <choice type="function" name="trange">
+        <param type="number">0</param>
+        <param type="number">10</param>
+    </choice>
+    <value type="number">9</value>
+</variable>
+```

src/rougail/annotator/__init__.py

@@ -71,6 +71,9 @@ class SpaceAnnotator:  # pylint: disable=R0903
             get_annotators(ANNOTATORS, 'rougail.annotator')
             for extra_annotator in objectspace.rougailconfig['extra_annotators']:
                 get_annotators(ANNOTATORS, extra_annotator)
+        for extra_annotator in objectspace.rougailconfig['extra_annotators']:
+            if extra_annotator not in ANNOTATORS:
+                get_annotators(ANNOTATORS, extra_annotator)
         annotators = ANNOTATORS['rougail.annotator'].copy()
         for extra_annotator in objectspace.rougailconfig['extra_annotators']:
             annotators.extend(ANNOTATORS[extra_annotator])

src/rougail/annotator/check.py

@@ -33,7 +33,7 @@ from rougail.utils import load_modules
 from rougail.i18n import _
 from rougail.error import DictConsistencyError, display_xmlfiles
 
-INTERNAL_FUNCTIONS = ['valid_enum', 'valid_in_network', 'valid_differ', 'valid_entier']
+INTERNAL_FUNCTIONS = ['valid_in_network', 'valid_differ', 'valid_entier']
 
 class Annotator(TargetAnnotator, ParamAnnotator):
     """Annotate check
@@ -58,21 +58,11 @@ class Annotator(TargetAnnotator, ParamAnnotator):
         self.convert_target(self.objectspace.space.constraints.check)
         self.convert_param(self.objectspace.space.constraints.check)
         self.check_check()
-        self.check_valid_enum()
         self.check_change_warning()
         self.convert_valid_entier()
         self.convert_check()
         del objectspace.space.constraints.check
 
-    def valid_type_validation(self,
-                              obj,
-                              ) -> None:
-        variable_type = None
-        if obj.name == 'valid_enum':
-            for target in obj.target:
-                variable_type = target.name.type
-        return variable_type
-
     def check_check(self):  # pylint: disable=R0912
         """valid and manage <check>
         """
@@ -87,119 +77,6 @@ class Annotator(TargetAnnotator, ParamAnnotator):
         for idx in remove_indexes:
             del self.objectspace.space.constraints.check[idx]
 
-    def check_valid_enum(self):
-        """verify valid_enum
-        """
-        remove_indexes = []
-        for idx, check in enumerate(self.objectspace.space.constraints.check):
-            if check.name != 'valid_enum':
-                continue
-            for target in check.target:
-                if target.name.path in self.objectspace.valid_enums:
-                    check_xmlfiles = display_xmlfiles(self.objectspace.valid_enums\
-                            [target.name.path]['xmlfiles'])
-                    msg = _(f'valid_enum already set in {check_xmlfiles} '
-                            f'for "{target.name.name}", you may have forget remove_check')
-                    raise DictConsistencyError(msg, 3, check.xmlfiles)
-                if not hasattr(check, 'param'):
-                    msg = _(f'param is mandatory for a valid_enum of variable "{target.name.name}"')
-                    raise DictConsistencyError(msg, 4, check.xmlfiles)
-                variable_type = target.name.type
-                values = self._set_valid_enum(target.name,
-                                              check,
-                                              )
-                if values:
-                    if hasattr(target.name, 'value'):
-                        # check value
-                        self.check_valid_enum_value(target.name, values)
-                    else:
-                        # no value, set the first choice as default value
-                        new_value = self.objectspace.value(check.xmlfiles)
-                        new_value.name = values[0]
-                        new_value.type = variable_type
-                        target.name.value = [new_value]
-            remove_indexes.append(idx)
-        remove_indexes.sort(reverse=True)
-        for idx in remove_indexes:
-            del self.objectspace.space.constraints.check[idx]
-
-    def _set_valid_enum(self,
-                        variable,
-                        check,
-                        ) -> List[Any]:
-        # build choice
-        variable.values = []
-        variable.ori_type = variable.type
-        variable.type = 'choice'
-
-        has_variable = False
-        values = []
-        has_nil = False
-        is_function = False
-        for param in check.param:
-            if has_variable:
-                msg = _(f'only one "variable" parameter is allowed for valid_enum '
-                        f'of variable "{variable.name}"')
-                raise DictConsistencyError(msg, 5, param.xmlfiles)
-            if param.type == 'function':
-                is_function = True
-                choice = self.objectspace.choice(variable.xmlfiles)
-                choice.name = param.text
-                choice.type = 'function'
-                choice.param = []
-                variable.values.append(choice)
-                continue
-            if is_function:
-                variable.values[0].param.append(param)
-                continue
-            param_type = variable.ori_type
-            if param.type == 'variable':
-                has_variable = True
-                if param.optional is True:
-                    msg = _(f'optional parameter in valid_enum for variable "{variable.name}" '
-                            f'is not allowed')
-                    raise DictConsistencyError(msg, 14, param.xmlfiles)
-                if not param.text.multi:
-                    msg = _(f'only multi "variable" parameter is allowed for valid_enum '
-                            f'of variable "{variable.name}"')
-                    raise DictConsistencyError(msg, 6, param.xmlfiles)
-                param_type = 'variable'
-            elif param.type == 'nil':
-                has_nil = True
-            values.append(param.text)
-            choice = self.objectspace.choice(variable.xmlfiles)
-            choice.name = param.text
-            choice.type = param_type
-            variable.values.append(choice)
-        if is_function:
-            return None
-        if 'mandatory' not in vars(variable):
-            variable.mandatory = not has_nil
-        elif variable.mandatory is False:
-            choice = self.objectspace.choice(variable.xmlfiles)
-            choice.name = None
-            choice.type = 'nil'
-            variable.values.append(choice)
-        if has_variable:
-            return None
-        self.objectspace.valid_enums[variable.path] = {'type': variable.ori_type,
-                                                       'values': values,
-                                                       'xmlfiles': check.xmlfiles,
-                                                       }
-        return values
-
-    @staticmethod
-    def check_valid_enum_value(variable,
-                               values,
-                               ) -> None:
-        """check that values in valid_enum are valid
-        """
-        for value in variable.value:
-            if value.name not in values:
-                msg = _(f'value "{value.name}" of variable "{variable.name}" is not in list '
-                        f'of all expected values ({values})')
-                raise DictConsistencyError(msg, 15, value.xmlfiles)
-
     def check_change_warning(self):
         """convert level to "warnings_only"
         """

src/rougail/annotator/condition.py

@@ -67,7 +67,7 @@ class Annotator(TargetAnnotator, ParamAnnotator, Walk):
                               obj,
                               ) -> None:
         if obj.source.type == 'choice':
-            return obj.source.ori_type
+            return None
         return obj.source.type
 
     def convert_auto_freeze(self):

src/rougail/annotator/fill.py

@@ -32,7 +32,7 @@ from rougail.annotator.target import TargetAnnotator
 from rougail.annotator.param import ParamAnnotator
 
 
-CALC_MULTI = ('calc_value', 'calc_list', 'get_range', 'calc_val_first_value', 'unbound_filename')
+CALC_MULTI = ('calc_value', 'calc_list', 'get_range', 'calc_val_first_value', 'unbound_filename', 'zone_information', 'get_certificates', 'nsd_filename', 'get_linked_configuration')
 
 
 class Annotator(TargetAnnotator, ParamAnnotator):

src/rougail/annotator/param.py

@@ -132,16 +132,17 @@ class ParamAnnotator:
             msg = _(f'parameter has incompatible type "{param.type}" '
                     f'with type "{variable_type}"')
             raise DictConsistencyError(msg, 7, param.xmlfiles)
-        try:
-            option = CONVERT_OPTION[variable_type]
-            param.text = option.get('func', str)(param.text)
-            getattr(tiramisu, option['opttype'])('test',
-                                                 'Object to valid value',
-                                                 param.text,
-                                                 **option.get('initkwargs', {}),
-                                                 )
-        except ValueError as err:
-            msg = _(f'unable to change type of value "{param.text}" '
-                    f'is not a valid "{variable_type}"')
-            raise DictConsistencyError(msg, 13, param.xmlfiles) from err
+        if variable_type != 'choice':
+            try:
+                option = CONVERT_OPTION[variable_type]
+                param.text = option.get('func', str)(param.text)
+                getattr(tiramisu, option['opttype'])('test',
+                                                     'Object to valid value',
+                                                     param.text,
+                                                     **option.get('initkwargs', {}),
+                                                     )
+            except ValueError as err:
+                msg = _(f'unable to change type of value "{param.text}" '
+                        f'is not a valid "{variable_type}"')
+                raise DictConsistencyError(msg, 13, param.xmlfiles) from err
         param.type = variable_type

src/rougail/annotator/service.py

@@ -32,11 +32,9 @@ from rougail.utils import normalize_family
 from rougail.error import DictConsistencyError
 # a object's attribute has some annotations
 # that shall not be present in the exported (flatened) XML
-ERASED_ATTRIBUTES = ('redefine', 'exists', 'optional', 'remove_check', 'namespace',
-                     'remove_condition', 'path', 'instance_mode', 'index',
-                     'level', 'remove_fill', 'xmlfiles', 'type', 'reflector_name',
-                     'reflector_object',)
-ALLOW_ATTRIBUT_NOT_MANAGE = ['file']
+ERASED_ATTRIBUTES = ('redefine', 'namespace', 'xmlfiles', 'disabled', 'name', 'manage')
+ERASED_ATTRIBUTES2 = ('redefine', 'namespace', 'xmlfiles')
+ALLOW_ATTRIBUT_NOT_MANAGE = ['file', 'engine', 'target']
 
 
 class Annotator:
@@ -72,14 +70,16 @@ class Annotator:
         self.objectspace.space.services.doc = 'services'
         self.objectspace.space.services.path = 'services'
         for service_name, service in self.objectspace.space.services.service.items():
+            service.name = normalize_family(service_name)
             activate_obj = self._generate_element('boolean',
                                                   None,
                                                   None,
                                                   'activate',
-                                                  True,
+                                                  not service.disabled,
                                                   service,
-                                                  '.'.join(['services', normalize_family(service_name), 'activate']),
+                                                  '.'.join(['services', service.name, 'activate']),
                                                   )
+            service.disabled = None
             for elttype, values in dict(vars(service)).items():
                 if elttype == 'servicelist':
                     self.objectspace.list_conditions.setdefault('servicelist',
@@ -87,39 +87,44 @@ class Annotator:
                                                                     values,
                                                                     []).append(activate_obj)
                     continue
-                if not isinstance(values, (dict, list)) or elttype in ERASED_ATTRIBUTES:
+                if elttype in ERASED_ATTRIBUTES:
                     continue
                 if not service.manage and elttype not in ALLOW_ATTRIBUT_NOT_MANAGE:
                     msg = _(f'unmanage service cannot have "{elttype}"')
                     raise DictConsistencyError(msg, 66, service.xmlfiles)
-                if elttype != 'ip':
-                    eltname = elttype + 's'
+                if isinstance(values, (dict, list)):
+                    if elttype != 'ip':
+                        eltname = elttype + 's'
+                    else:
+                        eltname = elttype
+                    path = '.'.join(['services', service.name, eltname])
+                    family = self._gen_family(eltname,
+                                              path,
+                                              service.xmlfiles,
+                                              with_informations=False,
+                                              )
+                    if isinstance(values, dict):
+                        values = list(values.values())
+                    family.family = self.make_group_from_elts(service_name,
+                                                              elttype,
+                                                              values,
+                                                              path,
+                                                              )
+                    setattr(service, elttype, family)
                 else:
-                    eltname = elttype
-                path = '.'.join(['services', normalize_family(service_name), eltname])
-                family = self._gen_family(eltname,
-                                          path,
-                                          service.xmlfiles,
-                                          with_informations=False,
-                                          )
-                if isinstance(values, dict):
-                    values = list(values.values())
-                family.family = self.make_group_from_elts(service_name,
-                                                          elttype,
-                                                          values,
-                                                          path,
-                                                          )
-                setattr(service, elttype, family)
+                    if not hasattr(service, 'information'):
+                        service.information = self.objectspace.information(service.xmlfiles)
+                    setattr(service.information, elttype, values)
             manage = self._generate_element('boolean',
                                             None,
                                             None,
                                             'manage',
                                             service.manage,
                                             service,
-                                            '.'.join(['services', normalize_family(service_name), 'manage']),
+                                            '.'.join(['services', service.name, 'manage']),
                                                   )
             service.variable = [activate_obj, manage]
-            service.doc = service.name
+            service.doc = service_name
 
     def make_group_from_elts(self,
                              service_name,
@@ -156,7 +161,7 @@ class Annotator:
                                                   '.'.join([subpath, 'activate']),
                                                   )
             for key in dir(elt):
-                if key.startswith('_') or key.endswith('_type') or key in ERASED_ATTRIBUTES:
+                if key.startswith('_') or key.endswith('_type') or key in ERASED_ATTRIBUTES2:
                     continue
                 value = getattr(elt, key)
                 if key == listname:

src/rougail/annotator/value.py

@@ -41,6 +41,7 @@ class Annotator(Walk):  # pylint: disable=R0903
             return
         self.objectspace = objectspace
         self.convert_value()
+        self.add_choice_nil()
 
     def convert_value(self) -> None:
         """convert value
@@ -83,8 +84,22 @@ class Annotator(Walk):  # pylint: disable=R0903
                     variable.default_multi = variable.value[0].name
         else:
             if len(variable.value) > 1:
-                msg = _(f'the non multi variable "{variable.name}" cannot have '
+                msg = _(f'the none multi variable "{variable.name}" cannot have '
                         'more than one value')
                 raise DictConsistencyError(msg, 68, variable.xmlfiles)
             variable.default = variable.value[0].name
         del variable.value
+
+    def add_choice_nil(self) -> None:
+        for variable in self.get_variables():
+            if variable.type != 'choice':
+                continue
+            is_none = False
+            for choice in variable.choice:
+                if choice.type == 'nil':
+                    is_none = True
+            if not variable.mandatory and not is_none:
+                choice = self.objectspace.choice(variable.xmlfiles)
+                choice.name = None
+                choice.type = 'nil'
+                variable.choice.append(choice)

src/rougail/annotator/variable.py

@@ -62,11 +62,6 @@ CONVERT_OPTION = {'number': dict(opttype="IntOption", func=int),
                   }
 
 
-FORCE_CHOICE = {'schedule': ['none', 'daily', 'weekly', 'monthly'],
-                'schedulemod': ['pre', 'post'],
-                }
-
-
 class Walk:
     """Walk to objectspace to find variable or family
     """
@@ -154,36 +149,49 @@ class Annotator(Walk):  # pylint: disable=R0903
                 del variable.value[idx]
             if not variable.value:
                 del variable.value
+        if hasattr(variable, 'choice'):
+            if variable.type != 'choice':
+                msg = _(f'choice for the variable "{variable.name}" not allowed with "{variable.type}" type')
+                raise DictConsistencyError(msg, 3, variable.xmlfiles)
+            values = []
+            choice_type = None
+            for choice in variable.choice:
+                if choice_type == 'variable':
+                    msg = _(f'only one "variable" choice is allowed '
+                            f'the variable "{variable.name}"')
+                    raise DictConsistencyError(msg, 5, choice.xmlfiles)
+                if choice.type == 'nil':
+                    choice.name = None
+                elif choice.type == 'variable':
+                    choice.name = self.objectspace.paths.get_variable(choice.name)
+                    if not choice.name.multi:
+                        msg = _(f'only multi "variable" is allowed for a choice '
+                                f'of variable "{variable.name}"')
+                        raise DictConsistencyError(msg, 6, choice.xmlfiles)
+                else:
+                    if not hasattr(choice, 'name'):
+                        msg = _(f'choice for variable "{variable.name}" must have a value')
+                        raise DictConsistencyError(msg, 14, choice.xmlfiles)
+                    choice.name = CONVERT_OPTION.get(choice.type, {}).get('func', str)(choice.name)
+                if choice_type is None:
+                    choice_type = choice.type
+                values.append(choice.name)
+            if choice_type not in ['function', 'variable'] and hasattr(variable, 'value'):
+                for value in variable.value:
+                    if value.name not in values:
+                        msg = _(f'value "{value.name}" of variable "{variable.name}" is not in list '
+                                f'of all expected values ({values})')
+                        raise DictConsistencyError(msg, 15, value.xmlfiles)
+            ref_choice = variable.choice[0]
+            self.objectspace.valid_enums[variable.path] = {'type': ref_choice.type,
+                                                           'values': values,
+                                                           'xmlfiles': ref_choice.xmlfiles,
+                                                           }
+        elif variable.type == 'choice':
+            msg = _(f'choice is mandatory for the variable "{variable.name}" with choice type')
+            raise DictConsistencyError(msg, 4, variable.xmlfiles)
         variable.doc = variable.description
         del variable.description
-        self._convert_valid_enum(variable)
-
-    def _convert_valid_enum(self,
-                            variable,
-                            ):
-        """some types are, in fact, choices
-        convert this kind of variables into choice
-        """
-        if variable.type in FORCE_CHOICE:
-            if not hasattr(self.objectspace.space, 'constraints'):
-                xmlfiles = variable.xmlfiles
-                self.objectspace.space.constraints = self.objectspace.constraints(xmlfiles)
-                self.objectspace.space.constraints.namespace = variable.namespace
-            if not hasattr(self.objectspace.space.constraints, 'check'):
-                self.objectspace.space.constraints.check = []
-            check = self.objectspace.check(variable.xmlfiles)
-            check.name = 'valid_enum'
-            target = self.objectspace.target(variable.xmlfiles)
-            target.name = variable.path
-            check.target = [target]
-            check.namespace = variable.namespace
-            check.param = []
-            for value in FORCE_CHOICE[variable.type]:
-                param = self.objectspace.param(variable.xmlfiles)
-                param.text = value
-                check.param.append(param)
-            self.objectspace.space.constraints.check.append(check)
-            variable.type = 'string'
 
     def convert_test(self):
         """Convert variable tests value

src/rougail/data/rougail.dtd

@@ -50,6 +50,10 @@
 <!ATTLIST service name CDATA #REQUIRED>
 <!ATTLIST service manage (True|False) "True">
 <!ATTLIST service servicelist CDATA #IMPLIED>
+<!ATTLIST service disabled (True|False) "False">
+<!ATTLIST service engine (none|creole|jinja2) #IMPLIED>
+<!ATTLIST service target CDATA #IMPLIED>
+<!ATTLIST service type (service|mount|swap) "service">
 
 <!ELEMENT ip (#PCDATA)>
 <!ATTLIST ip iplist CDATA #IMPLIED>
@@ -86,9 +90,9 @@
 <!ATTLIST family leadership (True|False) "False">
 <!ATTLIST family provider CDATA #IMPLIED>
 
-<!ELEMENT variable (value*)>
+<!ELEMENT variable ((choice*|value*)*)>
 <!ATTLIST variable name CDATA #REQUIRED>
-<!ATTLIST variable type (number|float|string|password|mail|boolean|filename|date|unix_user|ip|local_ip|netmask|network|broadcast|netbios|domainname|hostname|web_address|port|mac|cidr|network_cidr|schedule|schedulemod) "string">
+<!ATTLIST variable type (number|float|string|password|mail|boolean|filename|date|unix_user|ip|local_ip|netmask|network|broadcast|netbios|domainname|hostname|web_address|port|mac|cidr|network_cidr|choice) "string">
 <!ATTLIST variable description CDATA #IMPLIED>
 <!ATTLIST variable help CDATA #IMPLIED>
 <!ATTLIST variable hidden (True|False) "False">
@@ -100,6 +104,7 @@
 <!ATTLIST variable auto_freeze (True|False) "False">
 <!ATTLIST variable auto_save (True|False) "False">
 <!ATTLIST variable mode CDATA #IMPLIED>
+<!ATTLIST variable remove_choice (True|False) "False">
 <!ATTLIST variable remove_check (True|False) "False">
 <!ATTLIST variable remove_condition (True|False) "False">
 <!ATTLIST variable remove_fill (True|False) "False">
@@ -107,6 +112,11 @@
 <!ATTLIST variable test CDATA #IMPLIED>
 
 <!ELEMENT value (#PCDATA)>
+<!ATTLIST value type (string|number|nil|boolean) #IMPLIED>
+
+<!ELEMENT choice (#PCDATA | param)*>
+<!ATTLIST choice type (string|number|nil|boolean|function|variable) "string">
+<!ATTLIST choice name CDATA #IMPLIED>
 
 <!ELEMENT constraints ((fill*|check*|condition*)*)>
 

src/rougail/objspace.py

@@ -40,7 +40,7 @@ FORCE_UNREDEFINABLES = ('value',)
 # RougailObjSpace's elements that shall not be modify
 UNREDEFINABLE = ('multi', 'type',)
 # RougailObjSpace's elements that did not created automaticly
-FORCE_ELEMENTS = ('choice', 'property_', 'information')
+FORCE_ELEMENTS = ('property_', 'information')
 # XML text are convert has name
 FORCED_TEXT_ELTS_AS_NAME = ('choice', 'property', 'value',)
 
@@ -393,7 +393,7 @@ class RougailObjSpace:
         for attr, val in child.attrib.items():
             if redefine and attr in UNREDEFINABLE:
                 msg = _(f'cannot redefine attribute "{attr}" for variable "{child.attrib["name"]}"'
-                        f' in "{xmlfile}", already defined')
+                        f' already defined')
                 raise DictConsistencyError(msg, 48, variableobj.xmlfiles[:-1])
             if attr in self.booleans_attributs:
                 val = convert_boolean(val)
@@ -410,6 +410,12 @@ class RougailObjSpace:
         """Rougail object tree manipulations
         """
         if child.tag == 'variable':
+            if child.attrib.get('remove_choice', False):
+                if variableobj.type != 'choice':
+                    msg = _(f'cannot remove choices for variable "{variableobj.path}"'
+                            f' the variable has type "{variableobj.type}"')
+                    raise DictConsistencyError(msg, 33, variableobj.xmlfiles)
+                variableobj.choice = []
             if child.attrib.get('remove_check', False):
                 self.remove_check(variableobj.name)
             if child.attrib.get('remove_condition', False):
@@ -424,14 +430,15 @@ class RougailObjSpace:
     def remove_check(self, name):
         """Remove a check with a specified target
         """
-        remove_checks = []
-        for idx, check in enumerate(self.space.constraints.check):  # pylint: disable=E1101
-            for target in check.target:
-                if target.name == name:
-                    remove_checks.append(idx)
-        remove_checks.sort(reverse=True)
-        for idx in remove_checks:
-            self.space.constraints.check.pop(idx)  # pylint: disable=E1101
+        if hasattr(self.space.constraints, 'check'):
+            remove_checks = []
+            for idx, check in enumerate(self.space.constraints.check):  # pylint: disable=E1101
+                for target in check.target:
+                    if target.name == name:
+                        remove_checks.append(idx)
+            remove_checks.sort(reverse=True)
+            for idx in remove_checks:
+                self.space.constraints.check.pop(idx)  # pylint: disable=E1101
 
     def remove_condition(self,
                          name: str,

src/rougail/path.py

@@ -174,6 +174,7 @@ class Path:
                                           )
         namespace = dico['variableobj'].namespace
         if namespace not in [self.variable_namespace, 'services'] and \
+                current_namespace != 'services' and \
                 current_namespace != namespace:
             msg = _(f'A variable located in the "{namespace}" namespace shall not be used '
                     f'in the "{current_namespace}" namespace')

src/rougail/template/base.py

@@ -184,6 +184,11 @@ class RougailExtra:
         except KeyError:
             raise AttributeError(f'unable to find extra "{key}"')
 
+    def __getitem__(self,
+                    key: str,
+                    ) -> Any:
+        return self.__getattr__(key)
+
     def __iter__(self):
         return iter(self._suboption.values())
 
@@ -255,6 +260,7 @@ class RougailBaseTemplate:
                       filevar: Dict,
                       type_: str,
                       service_name: str,
+                      service_type: str,
                       ) -> None:
         """Run templatisation on one file
         """
@@ -275,10 +281,11 @@ class RougailBaseTemplate:
                 var = variable[idx]
             else:
                 var = None
-            func = f'_instance_{type_}'
+            func = f'get_data_{type_}'
             data = getattr(self, func)(filevar,
                                        filename,
                                        service_name,
+                                       service_type,
                                        variable,
                                        idx,
                                        )
@@ -318,11 +325,27 @@ class RougailBaseTemplate:
             self.prepare_template(template)
         for included in (True, False):
             for service_obj in await self.config.option('services').list('all'):
-                service_name = await service_obj.option.name()
+                service_name = await service_obj.option.description()
+                service_type = await service_obj.information.get('type', 'service')
                 if await service_obj.option('activate').value.get() is False:
                     if included is False:
-                        self.desactive_service(service_name)
+                        self.desactive_service(service_name, service_type)
                     continue
+                if not included:
+                    engine = await service_obj.information.get('engine', None)
+                    if engine:
+                        self.instance_file({'engine': engine},
+                                           'service',
+                                           service_name,
+                                           service_type,
+                                           )
+                    target_name = await service_obj.information.get('target', None)
+                    if target_name:
+                        self.target_service(service_name,
+                                            target_name,
+                                            service_type,
+                                            engine is None,
+                                            )
                 for fills in await service_obj.list('optiondescription'):
                     type_ = await fills.option.name()
                     for fill_obj in await fills.list('all'):
@@ -335,10 +358,14 @@ class RougailBaseTemplate:
                         elif included is True:
                             continue
                         if fill['activate']:
-                            self.instance_file(fill, type_, service_name)
+                            self.instance_file(fill,
+                                               type_,
+                                               service_name,
+                                               service_type,
+                                               )
                         else:
                             self.log.debug(_("Instantiation of file '{filename}' disabled"))
-                self.post_instance_service(service_name)
+                self.post_instance_service(service_name, service_type)
         self.post_instance()
         chdir(ori_dir)
 
@@ -356,29 +383,42 @@ class RougailBaseTemplate:
             dico[key] = await obj.information.get(key, default_value)
 
     def desactive_service(self,
-                          service_name: str,
+                          *args,
                           ):
         raise NotImplementedError(_('cannot desactivate a service'))
 
-    def post_instance_service(self, service_name):  # pragma: no cover
+    def target_service(self,
+                       service_name: str,
+                       *args,
+                       ):
+        raise NotImplementedError(_('cannot use target for the service {service_name}'))
+
+    def post_instance_service(self,
+                              *args,
+                              ):  # pragma: no cover
         pass
 
     def post_instance(self):  # pragma: no cover
         pass
 
-    def _instance_ip(self,
-                     *args,
-                     ) -> None:  # pragma: no cover
+    def get_data_ip(self,
+                    *args,
+                    ) -> None:  # pragma: no cover
         raise NotImplementedError(_('cannot instanciate this service type ip'))
 
-    def _instance_files(self,
-                        *args,
-                        ) -> None:  # pragma: no cover
+    def get_data_files(self,
+                       *args,
+                       ) -> None:  # pragma: no cover
         raise NotImplementedError(_('cannot instanciate this service type file'))
 
-    def _instance_overrides(self,
-                            *args,
-                            ) -> None:  # pragma: no cover
+    def get_data_service(self,
+                         *args,
+                          ) -> None:  # pragma: no cover
+        raise NotImplementedError(_('cannot instanciate this service'))
+
+    def get_data_overrides(self,
+                           *args,
+                           ) -> None:  # pragma: no cover
         raise NotImplementedError(_('cannot instanciate this service type override'))
 
     async def load_variables(self,

src/rougail/template/systemd.py

@@ -38,9 +38,13 @@ IPAddressDeny=any
 """
 
 
-ROUGAIL_TMPL_TEMPLATE = """%def display(%%file, %%filename)
+ROUGAIL_DEST = '/usr/local/lib'
+ROUGAIL_GLOBAL_SYSTEMD_FILE = '/usr/lib/systemd/system'
+
+
+ROUGAIL_TMPL_TEMPLATE = f"""%def display(%%file, %%filename)
 %if %%filename.startswith('/etc/') or %%filename.startswith('/var/') or %%filename.startswith('/srv/')
-C %%filename %%file.mode %%file.owner %%file.group - /usr/local/lib%%filename
+C %%filename %%file.mode %%file.owner %%file.group - {ROUGAIL_DEST}%%filename
 z %%filename - - - - -
 %end if
 %end def
@@ -70,13 +74,14 @@ class RougailSystemdTemplate(RougailBaseTemplate):
         self.ip_per_service = None
         super().__init__(config, rougailconfig)
 
-    def _instance_files(self,
-                        filevar: Dict,
-                        destfile: str,
-                        service_name: str,
-                        variable,
-                        idx: int,
-                        ) -> tuple:
+    def get_data_files(self,
+                       filevar: Dict,
+                       destfile: str,
+                       service_name: str,
+                       service_type: str,
+                       variable,
+                       idx: int,
+                       ) -> tuple:
         source = filevar['source']
         if not isfile(source):  # pragma: no cover
             raise FileNotFound(_(f"File {source} does not exist."))
@@ -88,27 +93,30 @@ class RougailSystemdTemplate(RougailBaseTemplate):
             var = None
         return tmp_file, None, destfile, var
 
-    def _instance_overrides(self,
-                            filevar: Dict,
-                            destfile,
-                            service_name: str,
-                            *args,
-                            ) -> tuple:
+    def get_data_overrides(self,
+                           filevar: Dict,
+                           destfile,
+                           service_name: str,
+                           service_type: str,
+                           *args,
+                           ) -> tuple:
         source = filevar['source']
         if not isfile(source):  # pragma: no cover
             raise FileNotFound(_(f"File {source} does not exist."))
         tmp_file = join(self.tmp_dir, source)
         service_name = filevar['name']
-        return tmp_file, None, f'/systemd/system/{service_name}.service.d/rougail.conf', None
+        destfile = f'/systemd/system/{service_name}.{service_type}.d/rougail.conf'
+        return tmp_file, None, destfile, None
 
-    def _instance_ip(self,
-                     filevar: Dict,
-                     ip,
-                     service_name: str,
-                     var: Any,
-                     idx: int,
-                     *args,
-                     ) -> tuple:
+    def get_data_ip(self,
+                    filevar: Dict,
+                    ip,
+                    service_name: str,
+                    service_type: str,
+                    var: Any,
+                    idx: int,
+                    *args,
+                    ) -> tuple:
         if self.ip_per_service is None:
             self.ip_per_service = []
         if 'netmask' in filevar:
@@ -120,19 +128,49 @@ class RougailSystemdTemplate(RougailBaseTemplate):
         elif ip:
             self.ip_per_service.append(ip)
 
+    def get_data_service(self,
+                         servicevar: Dict,
+                         info,
+                         service_name: str,
+                         service_type: str,
+                         *args,
+                         ):
+        filename = f'{service_name}.{service_type}'
+        tmp_file = join(self.tmp_dir, filename)
+        var = None
+        destfile = f'/systemd/system/{filename}'
+        return tmp_file, None, destfile, var
+
+
     def desactive_service(self,
                           service_name: str,
+                          service_type: str,
                           ):
-        filename = f'{self.destinations_dir}/systemd/system/{service_name}.service'
+        filename = f'{self.destinations_dir}/systemd/system/{service_name}.{service_type}'
         makedirs(dirname(filename), exist_ok=True)
         symlink('/dev/null', filename)
 
+    def target_service(self,
+                       service_name: str,
+                       target_name: str,
+                       service_type: str,
+                       global_service: str,
+                       ):
+        filename = f'{self.destinations_dir}/systemd/system/{target_name}.target.wants/{service_name}.{service_type}'
+        makedirs(dirname(filename), exist_ok=True)
+        if global_service:
+            source_filename = f'{ROUGAIL_GLOBAL_SYSTEMD_FILE}/{service_name}.{service_type}'
+        else:
+            source_filename = f'{ROUGAIL_DEST}/systemd/system/{service_name}.{service_type}'
+        symlink(source_filename, filename)
+
     def post_instance_service(self,
                               service_name: str,
+                              service_type: str,
                               ) -> None:  # pragma: no cover
         if self.ip_per_service is None:
             return
-        destfile = f'/systemd/system/{service_name}.service.d/rougail_ip.conf'
+        destfile = f'/systemd/system/{service_name}.{service_type}.d/rougail_ip.conf'
         destfilename = join(self.destinations_dir, destfile[1:])
         makedirs(dirname(destfilename), exist_ok=True)
         self.log.info(_(f"creole processing: '{destfilename}'"))
@@ -148,7 +186,7 @@ class RougailSystemdTemplate(RougailBaseTemplate):
         self.ip_per_service = None
 
     def post_instance(self):
-        destfile = '/tmpfiles.d/rougail.conf'
+        destfile = '/tmpfiles.d/0rougail.conf'
         destfilename = join(self.destinations_dir, destfile[1:])
         makedirs(dirname(destfilename), exist_ok=True)
         self.log.info(_(f"creole processing: '{destfilename}'"))

src/rougail/tiramisureflector.py

@@ -243,7 +243,7 @@ class Common:
                        ):
         """Populate variable parameters
         """
-        if param.type in ['number', 'boolean', 'nil', 'string', 'port']:
+        if param.type in ['number', 'boolean', 'nil', 'string', 'port', 'choice']:
             value = param.text
             if param.type == 'string' and value is not None:
                 value = self.convert_str(value)
@@ -298,13 +298,13 @@ class Variable(Common):
                          ):
         if hasattr(self.elt, 'opt'):
             keys['opt'] = self.elt.opt.reflector_object.get()
-        if hasattr(self.elt, 'values'):
-            values = self.elt.values
+        if hasattr(self.elt, 'choice'):
+            values = self.elt.choice
             if values[0].type == 'variable':
                 value = values[0].name.reflector_object.get()
                 keys['values'] = f"Calculation(func.calc_value, Params((ParamOption({value}))))"
             elif values[0].type == 'function':
-                keys['values'] = self.calculation_value(self.elt.values[0], [])
+                keys['values'] = self.calculation_value(values[0], [])
             else:
                 keys['values'] = str(tuple([val.name for val in values]))
         if hasattr(self.elt, 'multi') and self.elt.multi:

src/rougail/update.py

@@ -115,42 +115,64 @@ class RougailUpgrade:
         variables = root.find('variables')
         if variables is None:
             return root
-        constraints = root.find('constraints')
-        if constraints is None:
-            return root
-        groups = []
-        for constraint in constraints:
-            if constraint.tag == 'group':
-                constraints.remove(constraint)
-                groups.append(constraint)
-        if not groups:
-            return root
         paths = self._get_path_variables(variables,
                                          namespace == self.rougailconfig['variable_namespace'],
                                          namespace,
                                          )
+        constraints = root.find('constraints')
+        # convert schedule and schedulemod
+        for variable in paths.values():
+            variable = variable['variable']
+            if variable.tag != 'variable':
+                continue
+            if 'type' in variable.attrib and variable.attrib['type'] in ['schedule', 'schedulemod']:
+                if variable.attrib['type'] == 'schedule':
+                    choices = ('none', 'daily', 'weekly', 'monthly')
+                else:
+                    choices = ('pre', 'post')
+                variable.attrib['type'] = 'choice'
+                has_value = False
+                for value in variable:
+                    if value.tag == 'value':
+                        has_value = True
+                        break
+                for name in choices:
+                    choice = SubElement(variable, 'choice')
+                    choice.text = name
+                if not has_value:
+                    value = SubElement(variable, 'value')
+                    value.text = choices[0]
+                variable.attrib['mandatory'] = 'True'
+
+        # convert group to leadership
+        groups = []
+        if constraints is not None:
+            for constraint in constraints:
+                if constraint.tag == 'group':
+                    constraints.remove(constraint)
+                    groups.append(constraint)
         for group in groups:
             if group.attrib['leader'] in paths:
                 leader_obj = paths[group.attrib['leader']]
                 #FIXME name peut avoir "." il faut le virer
                 #FIXME si extra c'est un follower !
                 if 'name' in group.attrib:
-                    name = group.attrib['name']
+                    grpname = group.attrib['name']
                     if 'description' in group.attrib:
                         description = group.attrib['description']
                     else:
-                        description = name
+                        description = grpname
                 else:
-                    name = leader_obj['variable'].attrib['name']
-                    if '.' in name:
-                        name = name.rsplit('.', 1)[-1]
+                    grpname = leader_obj['variable'].attrib['name']
+                    if '.' in grpname:
+                        grpname = grpname.rsplit('.', 1)[-1]
                     if 'description' in group.attrib:
                         description = group.attrib['description']
                     elif 'description' in leader_obj['variable'].attrib:
                         description = leader_obj['variable'].attrib['description']
                     else:
-                        description = name
-                family = SubElement(leader_obj['parent'], 'family', name=name, description=description, leadership="True")
+                        description = grpname
+                family = SubElement(leader_obj['parent'], 'family', name=grpname, description=description, leadership="True")
                 leader_obj['parent'].remove(leader_obj['variable'])
                 family.append(leader_obj['variable'])
             else:
@@ -164,6 +186,7 @@ class RougailUpgrade:
                     follower_path = follower.text
                 obj = paths[follower_path]
                 family = SubElement(obj['parent'], 'family', name=leader_name, leadership="True")
+                grpname = leader_name
             for follower in group:
                 leader_name = group.attrib['leader']
                 if '.' in leader_name:
@@ -174,6 +197,73 @@ class RougailUpgrade:
                 follower_obj = paths[follower_path]
                 follower_obj['parent'].remove(follower_obj['variable'])
                 family.append(follower_obj['variable'])
+                if '.' in follower_path:
+                    new_path = follower_path.rsplit('.', 1)[0] + '.' + grpname + '.' + follower_path.rsplit('.', 1)[1]
+                    paths[new_path] = paths[follower_path]
+
+        # convert choice option
+        valid_enums = []
+        if constraints is not None:
+            for constraint in constraints:
+                if constraint.tag == 'check' and constraint.attrib['name'] == 'valid_enum':
+                    constraints.remove(constraint)
+                    valid_enums.append(constraint)
+        for valid_enum in valid_enums:
+            targets = []
+            for target in valid_enum:
+                if target.tag != 'target':
+                    continue
+                if target.text in paths:
+                    # not in paths if it's optional
+                    # but not check it
+                    targets.append(paths[target.text]['variable'])
+            params = []
+            function_param = None
+            for param in valid_enum:
+                if param.tag != 'param':
+                    continue
+                if 'type' in param.attrib and param.attrib['type'] == 'function':
+                    function_param = param.text
+                    continue
+                params.append(param)
+            first_choice = None
+            for target in targets:
+                if function_param is not None:
+                    function = SubElement(target, 'choice', type='function', name=function_param)
+                for param in params:
+                    if function_param is not None:
+                        function.append(param)
+                    else:
+                        choice = SubElement(target, 'choice')
+                        if first_choice is None:
+                            first_choice = choice
+                        choice.text = param.text
+                        if 'type' not in param.attrib and param.text is None:
+                            choice_type = 'nil'
+                        elif 'type' in param.attrib:
+                            choice_type = param.attrib['type']
+                        elif 'type' in target.attrib:
+                            choice_type = target.attrib['type']
+                        else:
+                            choice_type = 'string'
+                        choice.attrib['type'] = choice_type
+            has_value = False
+            for target in targets:
+                if 'remove_check' in target.attrib:
+                    target.attrib['remove_choice'] = target.attrib['remove_check']
+            for target in targets:
+                for value in target:
+                    if value.tag == 'value':
+                        has_value = True
+                        if 'type' in target.attrib:
+                            value.attrib['type'] = target.attrib['type']
+            if first_choice is not None and not has_value:
+                value = SubElement(target, 'value')
+                value.attrib['type'] = first_choice.attrib['type']
+                value.text = first_choice.text
+            for target in targets:
+                if 'remove_choice' not in target.attrib or target.attrib['remove_choice'] != 'True':
+                    target.attrib['type'] = 'choice'
         return root
 
     def _get_path_variables(self, variables, is_variable_namespace, path, dico=None):
@@ -184,6 +274,8 @@ class RougailUpgrade:
                 subpath = path + '.'
             else:
                 subpath = ''
+            if variable.tag not in ['variable', 'family']:
+                continue
             subpath += variable.attrib['name']
             if variable.tag == 'family':
                 self._get_path_variables(variable, is_variable_namespace, subpath, dico)

tests/dictionaries/10frozenifin_unknown_valid_enum_number/00-base.xml

@@ -7,17 +7,16 @@
       </variable>
     </family>
     <family name="enumfam" mode="expert">
-      <variable name="enumvar" type="number" description="enumvar" help="bla bla bla"/>
+      <variable name="enumvar" type="choice" description="enumvar" help="bla bla bla">
+        <choice type="number">1</choice>
+        <choice type="number">2</choice>
+        <choice type="number">3</choice>
+        <value type="number">1</value>
+      </variable>
       <variable name="test_variable" type="number" description="test variable"/>
     </family>
   </variables>
   <constraints>
-    <check name="valid_enum">
-      <param>1</param>
-      <param>2</param>
-      <param>3</param>
-      <target>enumvar</target>
-    </check>
     <condition name="hidden_if_in" source="enumvar">
       <param>4</param>
       <target type="variable">test_variable</target>

tests/dictionaries/10load_disabled_if_in_variable/00-base.xml

@@ -2,8 +2,11 @@
 <rougail version="0.10">
   <variables>
     <family name="general">
-      <variable name="condition" type="string" description="No change">
-        <value>tous</value>
+      <variable name="condition" type="choice" description="No change">
+        <value type="string">tous</value>
+        <choice type="string">tous</choice>
+        <choice type="string">authentifié</choice>
+        <choice type="string">aucun</choice>
       </variable>
       <variable name="mode_conteneur_actif" type="string" description="No change">
         <value>tous</value>
@@ -14,12 +17,6 @@
     </family>
   </variables>
   <constraints>
-    <check name="valid_enum">
-      <param>tous</param>
-      <param>authentifié</param>
-      <param>aucun</param>
-      <target>condition</target>
-    </check>
     <condition name="disabled_if_in" source="condition">
       <param type="variable">mode_conteneur_actif</param>
       <target type="variable">mode_conteneur_actif2</target>

tests/dictionaries/10load_disabled_if_in_variable2/00-base.xml

@@ -2,8 +2,11 @@
 <rougail version="0.10">
   <variables>
     <family name="general">
-      <variable name="condition" type="string" description="No change">
-        <value>tous</value>
+      <variable name="condition" type="choice" description="No change">
+        <value type="string">tous</value>
+        <choice type="string">tous</choice>
+        <choice type="string">authentifié</choice>
+        <choice type="string">aucun</choice>
       </variable>
       <variable name="mode_conteneur_actif" type="string" description="No change">
         <value>aucun</value>
@@ -14,12 +17,6 @@
     </family>
   </variables>
   <constraints>
-    <check name="valid_enum">
-      <param>tous</param>
-      <param>authentifié</param>
-      <param>aucun</param>
-      <target>condition</target>
-    </check>
     <condition name="disabled_if_in" source="condition">
       <param type="variable">mode_conteneur_actif</param>
       <target type="variable">mode_conteneur_actif2</target>

tests/dictionaries/10load_frozenifin_multiparam/00-base.xml

@@ -2,8 +2,11 @@
 <rougail version="0.10">
   <variables>
     <family name="general">
-      <variable name="condition" type="string" description="No change">
-        <value>tous</value>
+      <variable name="condition" type="choice" description="No change">
+        <value type="string">tous</value>
+        <choice type="string">tous</choice>
+        <choice type="string">authentifié</choice>
+        <choice type="string">aucun</choice>
       </variable>
       <variable name="mode_conteneur_actif" type="string" description="No change">
         <value>non</value>
@@ -14,12 +17,6 @@
     </family>
   </variables>
   <constraints>
-    <check name="valid_enum">
-      <param>tous</param>
-      <param>authentifié</param>
-      <param>aucun</param>
-      <target>condition</target>
-    </check>
     <condition name="hidden_if_in" source="condition">
       <param>tous</param>
       <param>authentifié</param>

tests/dictionaries/10load_frozenifin_noexist/00-base.xml

@@ -2,8 +2,11 @@
 <rougail version="0.10">
   <variables>
     <family name="general">
-      <variable name="condition" type="string" description="No change">
-        <value>tous</value>
+      <variable name="condition" type="choice" description="No change">
+        <value type="string">tous</value>
+        <choice type="string">tous</choice>
+        <choice type="string">authentifié</choice>
+        <choice type="string">aucun</choice>
       </variable>
       <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
         <value>non</value>
@@ -14,12 +17,6 @@
     </family>
   </variables>
   <constraints>
-    <check name="valid_enum">
-      <param>tous</param>
-      <param>authentifié</param>
-      <param>aucun</param>
-      <target>condition</target>
-    </check>
     <condition name="hidden_if_in" source="condition">
       <param>oui</param>
       <param>non</param>

tests/dictionaries/10load_frozenifin_variable/00-base.xml

@@ -2,8 +2,11 @@
 <rougail version="0.10">
   <variables>
     <family name="general">
-      <variable name="condition" type="string" description="No change">
-        <value>tous</value>
+      <variable name="condition" type="choice" description="No change">
+        <value type="string">tous</value>
+        <choice type="string">tous</choice>
+        <choice type="string">authentifié</choice>
+        <choice type="string">aucun</choice>
       </variable>
       <variable name="mode_conteneur_actif" type="string" description="No change">
         <value>tous</value>
@@ -14,12 +17,6 @@
     </family>
   </variables>
   <constraints>
-    <check name="valid_enum">
-      <param>tous</param>
-      <param>authentifié</param>
-      <param>aucun</param>
-      <target>condition</target>
-    </check>
     <condition name="hidden_if_in" source="condition">
       <param type="variable">mode_conteneur_actif</param>
       <target type="variable">mode_conteneur_actif2</target>

tests/dictionaries/10load_frozenifnotin_noexist/00-base.xml

@@ -2,8 +2,11 @@
 <rougail version="0.10">
   <variables>
     <family name="general">
-      <variable name="condition" type="string" description="No change">
-        <value>tous</value>
+      <variable name="condition" type="choice" description="No change">
+        <value type="string">tous</value>
+        <choice type="string">tous</choice>
+        <choice type="string">authentifié</choice>
+        <choice type="string">aucun</choice>
       </variable>
       <variable name="mode_conteneur_actif" type="string" description="No change">
         <value>non</value>
@@ -14,12 +17,6 @@
     </family>
   </variables>
   <constraints>
-    <check name="valid_enum">
-      <param>tous</param>
-      <param>authentifié</param>
-      <param>aucun</param>
-      <target>condition</target>
-    </check>
     <condition name="hidden_if_not_in" source="condition">
       <param>oui</param>
       <param>non</param>

tests/dictionaries/10load_mandatoryifnotin_noexist/00-base.xml

@@ -2,8 +2,11 @@
 <rougail version="0.10">
   <variables>
     <family name="general">
-      <variable name="condition" type="string" description="No change">
-        <value>tous</value>
+      <variable name="condition" type="choice" description="No change">
+        <value type="string">tous</value>
+        <choice type="string">tous</choice>
+        <choice type="string">authentifié</choice>
+        <choice type="string">aucun</choice>
       </variable>
       <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
         <value>non</value>
@@ -14,12 +17,6 @@
     </family>
   </variables>
   <constraints>
-    <check name="valid_enum">
-      <param>tous</param>
-      <param>authentifié</param>
-      <param>aucun</param>
-      <target>condition</target>
-    </check>
     <condition name="mandatory_if_not_in" source="condition">
       <param>oui</param>
       <param>non</param>

tests/dictionaries/10valid_enum_accent/00-base.xml

@@ -7,18 +7,14 @@
       </variable>
     </family>
     <family name="enumfam" mode="expert">
-      <variable name="enumvar" type="string" description="multi" help="bla bla bla">
-        <value>c</value>
+      <variable name="enumvar" type="choice" description="multi" help="bla bla bla">
+        <value type="string">c</value>
+        <choice type="string">a</choice>
+        <choice type="string">b</choice>
+        <choice type="string">c</choice>
+        <choice type="string">é</choice>
       </variable>
     </family>
   </variables>
-  <constraints>
-    <check name="valid_enum">
-      <param>a</param>
-      <param>b</param>
-      <param>c</param>
-      <param>é</param>
-      <target>enumvar</target>
-    </check>
-  </constraints>
+  <constraints/>
 </rougail>

tests/dictionaries/10valid_enum_append/00-base.xml

@@ -7,15 +7,12 @@
       </variable>
     </family>
     <family name="enumfam" mode="expert">
-      <variable name="enumvar" type="string" description="enumvar">
-        <value>non</value>
+      <variable name="enumvar" type="choice" description="multi" help="bla bla bla">
+        <value type="string">b</value>
+        <choice type="string">a</choice>
+        <choice type="string">b</choice>
       </variable>
     </family>
   </variables>
-  <constraints>
-    <check name="valid_enum">
-      <param type="number">1</param>
-      <target>enumvar</target>
-    </check>
-  </constraints>
+  <constraints/>
 </rougail>

tests/dictionaries/10valid_enum_append/01-base.xml

@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="enumfam">
+      <variable name="enumvar" redefine="True">
+        <value type="string">c</value>
+        <choice type="string">c</choice>
+      </variable>
+    </family>
+  </variables>
+  <constraints/>
+</rougail>
+

tests/dictionaries/10valid_enum_append/makedict/after.json

@@ -2,5 +2,9 @@
     "rougail.general.mode_conteneur_actif": {
         "owner": "default",
         "value": "non"
+    },
+    "rougail.enumfam.enumvar": {
+        "owner": "default",
+        "value": "c"
     }
 }

tests/dictionaries/10valid_enum_append/makedict/base.json

@@ -0,0 +1,4 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.enumfam.enumvar": "c"
+}

tests/dictionaries/10valid_enum_append/makedict/before.json

@@ -2,5 +2,9 @@
     "rougail.general.mode_conteneur_actif": {
         "owner": "default",
         "value": "non"
+    },
+    "rougail.enumfam.enumvar": {
+        "owner": "default",
+        "value": "c"
     }
 }

tests/dictionaries/10valid_enum_append/tiramisu/base.py

@@ -11,7 +11,10 @@ try:
     from tiramisu3 import *
 except:
     from tiramisu import *
-option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
-option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"}))
-option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"}))
+option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"expert"}))
+option_5 = ChoiceOption(name="enumvar", doc="multi", values=('a', 'b', 'c'), default="c", properties=frozenset({"expert", "mandatory"}))
+option_5.impl_set_information('help', "bla bla bla")
+option_4 = OptionDescription(name="enumfam", doc="enumfam", children=[option_5], properties=frozenset({"expert"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1])

tests/dictionaries/10valid_enum_base/00-base.xml

@@ -7,17 +7,13 @@
       </variable>
     </family>
     <family name="enumfam" mode="expert">
-      <variable name="enumvar" type="string" description="multi" help="bla bla bla">
-        <value>c</value>
+      <variable name="enumvar" type="choice" description="multi" help="bla bla bla">
+        <value type="string">c</value>
+        <choice type="string">a</choice>
+        <choice type="string">b</choice>
+        <choice type="string">c</choice>
       </variable>
     </family>
   </variables>
-  <constraints>
-    <check name="valid_enum">
-      <param>a</param>
-      <param>b</param>
-      <param>c</param>
-      <target>enumvar</target>
-    </check>
-  </constraints>
+  <constraints/>
 </rougail>

tests/dictionaries/10valid_enum_base_no_mandatory/00-base.xml

@@ -7,17 +7,13 @@
       </variable>
     </family>
     <family name="enumfam" mode="expert">
-      <variable name="enumvar" mandatory="False">
+      <variable name="enumvar" mandatory="False" type="choice">
         <value>c</value>
+        <choice type="string">a</choice>
+        <choice type="string">b</choice>
+        <choice type="string">c</choice>
       </variable>
     </family>
   </variables>
-  <constraints>
-    <check name="valid_enum">
-      <param>a</param>
-      <param>b</param>
-      <param>c</param>
-      <target>enumvar</target>
-    </check>
-  </constraints>
+  <constraints/>
 </rougail>

tests/dictionaries/10valid_enum_base_redefine/00-base.xml

@@ -7,26 +7,19 @@
       </variable>
     </family>
     <family name="enumfam" mode="expert">
-      <variable name="enumvar2" type="string" description="multi">
-        <value>c</value>
+      <variable name="enumvar2" type="choice" description="multi">
+        <value type="string">c</value>
+        <choice type="string">a</choice>
+        <choice type="string">b</choice>
+        <choice type="string">c</choice>
       </variable>
-      <variable name="enumvar" type="string" description="multi" help="bla bla bla">
-        <value>c</value>
+      <variable name="enumvar" type="choice" description="multi" help="bla bla bla">
+        <value type="string">c</value>
+        <choice type="string">a</choice>
+        <choice type="string">b</choice>
+        <choice type="string">c</choice>
       </variable>
     </family>
   </variables>
-  <constraints>
-    <check name="valid_enum">
-      <param>a</param>
-      <param>b</param>
-      <param>c</param>
-      <target>enumvar</target>
-    </check>
-    <check name="valid_enum">
-      <param>a</param>
-      <param>b</param>
-      <param>c</param>
-      <target>enumvar2</target>
-    </check>
-  </constraints>
+  <constraints/>
 </rougail>

tests/dictionaries/10valid_enum_base_redefine/01-base.xml

@@ -2,16 +2,12 @@
 <rougail version="0.10">
   <variables>
     <family name="enumfam" mode="expert">
-      <variable name="enumvar" redefine="True" remove_check="True">
+      <variable name="enumvar" redefine="True" remove_check="True" remove_choice="True">
         <value>c</value>
+        <choice type="string">a</choice>
+        <choice type="string">c</choice>
       </variable>
     </family>
   </variables>
-  <constraints>
-    <check name="valid_enum">
-      <param>a</param>
-      <param>c</param>
-      <target>enumvar</target>
-    </check>
-  </constraints>
+  <constraints/>
 </rougail>

tests/dictionaries/10valid_enum_leader/00-base.xml

@@ -7,17 +7,15 @@
       </variable>
       <family name="leader" description="leader" leadership="True">
         <variable name="leader" type="string" description="leader" multi="True"/>
-        <variable name="follower1" type="string" description="follower1"/>
+        <variable name="follower1" type="choice" description="follower1">
+          <choice type="string">a</choice>
+          <choice type="string">b</choice>
+          <choice type="string">c</choice>
+          <value type="string">a</value>
+        </variable>
         <variable name="follower2" type="string" description="follower2"/>
       </family>
     </family>
   </variables>
-  <constraints>
-    <check name="valid_enum">
-      <param>a</param>
-      <param>b</param>
-      <param>c</param>
-      <target>follower1</target>
-    </check>
-  </constraints>
+  <constraints/>
 </rougail>

tests/dictionaries/10valid_enum_mandatory/00-base.xml

@@ -8,15 +8,13 @@
       </variable>
     </family>
     <family name="enumfam" mode="expert">
-      <variable name="enumvar" type="string" description="multi" mandatory="True"/>
+      <variable name="enumvar" type="choice" description="multi" mandatory="True">
+        <choice type="string">a</choice>
+        <choice type="string">b</choice>
+        <choice type="string">c</choice>
+        <value type="string">a</value>
+      </variable>
     </family>
   </variables>
-  <constraints>
-    <check name="valid_enum">
-      <param>a</param>
-      <param>b</param>
-      <param>c</param>
-      <target>enumvar</target>
-    </check>
-  </constraints>
+  <constraints/>
 </rougail>

tests/dictionaries/10valid_enum_multi/00-base.xml

@@ -5,15 +5,13 @@
       <variable name="mode_conteneur_actif" type="string" description="No change">
         <value>non</value>
       </variable>
-      <variable name="multi" type="string" description="multi" multi="True"/>
+      <variable name="multi" type="choice" description="multi" multi="True">
+        <choice type="string">a</choice>
+        <choice type="string">b</choice>
+        <choice type="string">c</choice>
+        <value type="string">a</value>
+      </variable>
     </family>
   </variables>
-  <constraints>
-    <check name="valid_enum">
-      <param>a</param>
-      <param>b</param>
-      <param>c</param>
-      <target>multi</target>
-    </check>
-  </constraints>
+  <constraints/>
 </rougail>

tests/dictionaries/10valid_enum_none/00-base.xml

@@ -7,17 +7,13 @@
       </variable>
     </family>
     <family name="enumfam" mode="expert">
-      <variable name="enumvar" type="string" description="multi" help="bla bla bla" mandatory="False">
-        <value>b</value>
+      <variable name="enumvar" type="choice" description="multi" help="bla bla bla" mandatory="False">
+        <value type="string">b</value>
+        <choice type="string">a</choice>
+        <choice type="string">b</choice>
+        <choice type="nil"/>
       </variable>
     </family>
   </variables>
-  <constraints>
-    <check name="valid_enum">
-      <param>a</param>
-      <param>b</param>
-      <param/>
-      <target>enumvar</target>
-    </check>
-  </constraints>
+  <constraints/>
 </rougail>

tests/dictionaries/10valid_enum_none/tiramisu/base.py

@@ -13,7 +13,7 @@ except:
     from tiramisu import *
 option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"}))
 option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"expert"}))
-option_5 = ChoiceOption(name="enumvar", doc="multi", values=('a', 'b', '', None), default="b", properties=frozenset({"expert"}))
+option_5 = ChoiceOption(name="enumvar", doc="multi", values=('a', 'b', None), default="b", properties=frozenset({"expert"}))
 option_5.impl_set_information('help', "bla bla bla")
 option_4 = OptionDescription(name="enumfam", doc="enumfam", children=[option_5], properties=frozenset({"expert"}))
 option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4])

tests/dictionaries/10valid_enum_number/00-base.xml

@@ -7,15 +7,13 @@
       </variable>
     </family>
     <family name="enumfam" mode="expert">
-      <variable name="enumvar" type="number" description="enumvar" help="bla bla bla"/>
+      <variable name="enumvar" type="choice" description="enumvar" help="bla bla bla">
+        <choice type="number">1</choice>
+        <choice type="number">2</choice>
+        <choice type="number">3</choice>
+        <value type="number">1</value>
+      </variable>
     </family>
   </variables>
-  <constraints>
-    <check name="valid_enum">
-      <param>1</param>
-      <param>2</param>
-      <param>3</param>
-      <target>enumvar</target>
-    </check>
-  </constraints>
+  <constraints/>
 </rougail>

tests/dictionaries/10valid_enum_numberdefault/00-base.xml

@@ -7,17 +7,13 @@
       </variable>
     </family>
     <family name="enumfam" mode="expert">
-      <variable name="enumvar" type="number" description="enumvar" help="bla bla bla">
-        <value>3</value>
+      <variable name="enumvar" type="choice" description="enumvar" help="bla bla bla">
+        <value type="number">3</value>
+        <choice type="number">1</choice>
+        <choice type="number">2</choice>
+        <choice type="number">3</choice>
       </variable>
     </family>
   </variables>
-  <constraints>
-    <check name="valid_enum">
-      <param>1</param>
-      <param>2</param>
-      <param>3</param>
-      <target>enumvar</target>
-    </check>
-  </constraints>
+  <constraints/>
 </rougail>

tests/dictionaries/10valid_enum_param_empty/00-base.xml

@@ -7,13 +7,11 @@
       </variable>
     </family>
     <family name="enumfam" mode="expert">
-      <variable name="enumvar" type="string" description="multi" help="bla bla bla"/>
+      <variable name="enumvar" type="choice" description="multi" help="bla bla bla">
+        <choice type="nil"/>
+        <value type="nil"/>
+      </variable>
     </family>
   </variables>
-  <constraints>
-    <check name="valid_enum">
-      <param type="nil"/>
-      <target>enumvar</target>
-    </check>
-  </constraints>
+  <constraints/>
 </rougail>

tests/dictionaries/10valid_enum_param_empty2/00-base.xml

@@ -7,13 +7,11 @@
       </variable>
     </family>
     <family name="enumfam" mode="expert">
-      <variable name="enumvar" type="string" description="multi" help="bla bla bla"/>
+      <variable name="enumvar" type="choice" description="multi" help="bla bla bla">
+        <choice type="nil"/>
+        <value type="nil"/>
+      </variable>
     </family>
   </variables>
-  <constraints>
-    <check name="valid_enum">
-      <param type="nil"/>
-      <target>enumvar</target>
-    </check>
-  </constraints>
+  <constraints/>
 </rougail>

tests/dictionaries/10valid_enum_quote/00-base.xml

@@ -7,15 +7,13 @@
       </variable>
     </family>
     <family name="enumfam" mode="expert">
-      <variable name="enumvar" type="string" description="multi" help="bla bla bla"/>
+      <variable name="enumvar" type="choice" description="multi" help="bla bla bla">
+        <choice type="string">quote'</choice>
+        <choice type="string">quote"</choice>
+        <choice type="string">quote"'</choice>
+        <value type="string">quote'</value>
+      </variable>
     </family>
   </variables>
-  <constraints>
-    <check name="valid_enum">
-      <param>quote'</param>
-      <param>quote"</param>
-      <param>quote"'</param>
-      <target>enumvar</target>
-    </check>
-  </constraints>
+  <constraints/>
 </rougail>

tests/dictionaries/10valid_enum_value/00-base.xml

@@ -2,17 +2,13 @@
 <rougail version="0.10">
   <variables>
     <family name="general">
-      <variable name="mode_conteneur_actif" type="string" description="No change">
-        <value>b</value>
+      <variable name="mode_conteneur_actif" type="choice" description="No change">
+        <value type="string">b</value>
+        <choice type="string">a</choice>
+        <choice type="string">b</choice>
+        <choice type="string">c</choice>
       </variable>
     </family>
   </variables>
-  <constraints>
-    <check name="valid_enum">
-      <param>a</param>
-      <param>b</param>
-      <param>c</param>
-      <target>mode_conteneur_actif</target>
-    </check>
-  </constraints>
+  <constraints/>
 </rougail>

tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/00-base.xml

@@ -7,8 +7,10 @@
   </services>
   <variables>
     <family name="general">
-      <variable name="condition" type="string" description="No change">
-        <value>non</value>
+      <variable name="condition" type="choice" description="No change">
+        <value type="string">non</value>
+        <choice type="string">non</choice>
+        <choice type="string">statique</choice>
       </variable>
       <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
         <value>non</value>
@@ -19,11 +21,6 @@
     </family>
   </variables>
   <constraints>
-    <check name="valid_enum">
-      <param>non</param>
-      <param>statique</param>
-      <target>condition</target>
-    </check>
     <condition name="disabled_if_not_in" source="condition">
       <param>statique</param>
       <target type="filelist">afilllist</target>

tests/dictionaries/11valid_enum_function/00-base.xml

@@ -2,17 +2,14 @@
 <rougail version="0.10">
   <variables>
     <family name="general">
-      <variable name="var" type="number" description="New variable">
-        <value>9</value>
+      <variable name="var" type="choice" description="New variable">
+        <value type="number">9</value>
+        <choice type="function" name="trange">
+          <param type="number">0</param>
+          <param type="number">10</param>
+        </choice>
       </variable>
     </family>
   </variables>
-  <constraints>
-    <check name="valid_enum">
-      <param type="function">trange</param>
-      <param type="number">0</param>
-      <param type="number">10</param>
-      <target>var</target>
-    </check>
-  </constraints>
+  <constraints/>
 </rougail>

tests/dictionaries/11valid_enum_variable/00-base.xml

@@ -2,8 +2,9 @@
 <rougail version="0.10">
   <variables>
     <family name="general">
-      <variable name="mode_conteneur_actif" type="string" description="No change">
-        <value>a</value>
+      <variable name="mode_conteneur_actif" type="choice" description="No change">
+        <value type="string">a</value>
+        <choice type="variable">var</choice>
       </variable>
       <variable name="var" type="string" description="New variable" multi="True">
         <value>a</value>
@@ -12,10 +13,5 @@
       </variable>
     </family>
   </variables>
-  <constraints>
-    <check name="valid_enum">
-      <param type="variable">var</param>
-      <target>mode_conteneur_actif</target>
-    </check>
-  </constraints>
+  <constraints/>
 </rougail>

tests/dictionaries/40ifin_validenum/00-base.xml

@@ -10,16 +10,15 @@
       <variable name="mode_conteneur_actif2" type="string" description="No change">
         <value>non</value>
       </variable>
-      <variable name="mode_conteneur_actif3" type="string" description="No change"/>
+      <variable name="mode_conteneur_actif3" type="choice" description="No change">
+        <choice type="string">a</choice>
+        <choice type="string">b</choice>
+        <choice type="string">c</choice>
+        <value type="string">a</value>
+      </variable>
     </family>
   </variables>
   <constraints>
-    <check name="valid_enum">
-      <param>a</param>
-      <param>b</param>
-      <param>c</param>
-      <target>mode_conteneur_actif3</target>
-    </check>
     <condition name="disabled_if_in" source="mode_conteneur_actif3">
       <param>d</param>
       <target type="variable">mode_conteneur_actif</target>

tests/dictionaries/51redefine_remove_check/00-base.xml

@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.10">
-  <variables>
-    <family name="general">
-      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True"/>
-    </family>
-  </variables>
-  <constraints>
-    <check name="valid_enum">
-      <param>a</param>
-      <param>b</param>
-      <param>c</param>
-      <target>mode_conteneur_actif</target>
-    </check>
-  </constraints>
-</rougail>

tests/dictionaries/51redefine_remove_check/01-base.xml

@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<rougail version="0.10">
-  <variables>
-    <family name="general">
-      <variable name="mode_conteneur_actif" redefine="True" remove_check="True">
-        <value>non</value>
-      </variable>
-    </family>
-  </variables>
-</rougail>

tests/dictionaries/51redefine_remove_check/makedict/base.json

@@ -1,3 +0,0 @@
-{
-    "rougail.general.mode_conteneur_actif": "non"
-}

tests/dictionaries/51redefine_validenum/00-base.xml

@@ -2,15 +2,13 @@
 <rougail version="0.10">
   <variables>
     <family name="general">
-      <variable name="mode_conteneur_actif" type="string" description="Redefine description" hidden="True"/>
+      <variable name="mode_conteneur_actif" type="choice" description="Redefine description" hidden="True">
+        <choice type="string">a</choice>
+        <choice type="string">b</choice>
+        <choice type="string">c</choice>
+        <value type="string">a</value>
+      </variable>
     </family>
   </variables>
-  <constraints>
-    <check name="valid_enum">
-      <param>a</param>
-      <param>b</param>
-      <param>c</param>
-      <target>mode_conteneur_actif</target>
-    </check>
-  </constraints>
+  <constraints/>
 </rougail>

tests/dictionaries/51redefine_validenum/01-redefine.xml

@@ -2,14 +2,12 @@
 <rougail version="0.10">
   <variables>
     <family name="general">
-      <variable name="mode_conteneur_actif" redefine="True" remove_check="True"/>
+      <variable name="mode_conteneur_actif" redefine="True" remove_check="True" remove_choice="True">
+        <choice type="string">a</choice>
+        <choice type="string">b</choice>
+        <value type="string">a</value>
+      </variable>
     </family>
   </variables>
-  <constraints>
-    <check name="valid_enum">
-      <param>a</param>
-      <param>b</param>
-      <target>mode_conteneur_actif</target>
-    </check>
-  </constraints>
+  <constraints/>
 </rougail>

tests/dictionaries/60extra_externalspacecondition/extra_dirs/extra/00-base.xml

@@ -5,9 +5,17 @@
       <variable name="description" type="string">
         <value>Exportation de la base de ejabberd</value>
       </variable>
-      <variable name="day" type="schedule"/>
-      <variable name="mode" type="schedulemod">
+      <variable name="day" type="choice" mandatory="True">
+        <choice>none</choice>
+        <choice>daily</choice>
+        <choice>weekly</choice>
+        <choice>monthly</choice>
+        <value>none</value>
+      </variable>
+      <variable name="mode" type="choice" mandatory="True">
         <value>pre</value>
+        <choice>pre</choice>
+        <choice>post</choice>
       </variable>
     </family>
   </variables>

tests/dictionaries/60extra_help/extra_dirs/extra/00-base.xml

@@ -5,9 +5,17 @@
       <variable name="description" type="string">
         <value>Exportation de la base de ejabberd</value>
       </variable>
-      <variable name="day" type="schedule" help="Test help"/>
-      <variable name="mode" type="schedulemod">
+      <variable name="day" type="choice" help="Test help" mandatory="True">
+        <choice>none</choice>
+        <choice>daily</choice>
+        <choice>weekly</choice>
+        <choice>monthly</choice>
+        <value>none</value>
+      </variable>
+      <variable name="mode" type="choice" mandatory="True">
         <value>pre</value>
+        <choice>pre</choice>
+        <choice>post</choice>
       </variable>
     </family>
   </variables>

tests/dictionaries/60extra_leadership_name_item/00-base.xml

@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <services>
+    <service name="test">
+      <file>/etc/mailname</file>
+      <file engine="jinja2">/etc/mailname2</file>
+    </service>
+  </services>
+  <variables>
+    <family name="general" description="général">
+      <variable name="mode_conteneur_actif" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+      <variable name="activer_ejabberd" type="string" description="No change" hidden="True">
+        <value>non</value>
+      </variable>
+    </family>
+  </variables>
+</rougail>

tests/dictionaries/60extra_leadership_name_item/extra_dirs/extra/00-base.xml

@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rougail version="0.10">
+  <variables>
+    <family name="ejabberd">
+      <family name="new_name" description="new_name" leadership="True">
+        <variable name="description" type="string" multi="True">
+          <value>test</value>
+        </variable>
+        <variable name="mode" type="string">
+          <value>pre</value>
+        </variable>
+      </family>
+    </family>
+  </variables>
+  <constraints/>
+</rougail>

tests/dictionaries/60extra_leadership_name_item/makedict/after.json

@@ -0,0 +1,48 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.activer_ejabberd": {
+        "owner": "default",
+        "value": "non"
+    },
+    "extra.ejabberd.new_name.description": {
+        "owner": "default",
+        "value": [
+            "test"
+        ]
+    },
+    "extra.ejabberd.new_name.mode": {
+        "owner": [
+            "default"
+        ],
+        "value": [
+            "pre"
+        ]
+    },
+    "services.test.files.mailname.name": {
+        "owner": "default",
+        "value": "/etc/mailname"
+    },
+    "services.test.files.mailname.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.mailname2.name": {
+        "owner": "default",
+        "value": "/etc/mailname2"
+    },
+    "services.test.files.mailname2.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}

tests/dictionaries/60extra_leadership_name_item/makedict/base.json

@@ -0,0 +1,16 @@
+{
+    "rougail.general.mode_conteneur_actif": "non",
+    "rougail.general.activer_ejabberd": "non",
+    "extra.ejabberd.new_name.description": [
+        {
+            "extra.ejabberd.new_name.description": "test",
+            "extra.ejabberd.new_name.mode": "pre"
+        }
+    ],
+    "services.test.files.mailname.name": "/etc/mailname",
+    "services.test.files.mailname.activate": true,
+    "services.test.files.mailname2.name": "/etc/mailname2",
+    "services.test.files.mailname2.activate": true,
+    "services.test.activate": true,
+    "services.test.manage": true
+}

tests/dictionaries/60extra_leadership_name_item/makedict/before.json

@@ -0,0 +1,48 @@
+{
+    "rougail.general.mode_conteneur_actif": {
+        "owner": "default",
+        "value": "non"
+    },
+    "rougail.general.activer_ejabberd": {
+        "owner": "default",
+        "value": "non"
+    },
+    "extra.ejabberd.new_name.description": {
+        "owner": "default",
+        "value": [
+            "test"
+        ]
+    },
+    "extra.ejabberd.new_name.mode": {
+        "owner": [
+            "default"
+        ],
+        "value": [
+            "pre"
+        ]
+    },
+    "services.test.files.mailname.name": {
+        "owner": "default",
+        "value": "/etc/mailname"
+    },
+    "services.test.files.mailname.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.files.mailname2.name": {
+        "owner": "default",
+        "value": "/etc/mailname2"
+    },
+    "services.test.files.mailname2.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.activate": {
+        "owner": "default",
+        "value": true
+    },
+    "services.test.manage": {
+        "owner": "default",
+        "value": true
+    }
+}

tests/dictionaries/60extra_leadership_name_item/result/etc/mailname

@@ -0,0 +1,11 @@
+contain test
+1
+leader: test
+follower: pre
+supeq
+sup
+diff
+testpre
+pretest
+leader2: test
+follower2: pre

tests/dictionaries/60extra_leadership_name_item/result/etc/mailname2

@@ -0,0 +1,11 @@
+contain test
+1
+leader: test
+follower: pre
+supeq
+sup
+diff
+testpre
+pretest
+leader2: test
+follower2: pre

tests/dictionaries/60extra_leadership_name_item/tiramisu/base.py

@@ -0,0 +1,37 @@
+from importlib.machinery import SourceFileLoader
+from importlib.util import spec_from_loader, module_from_spec
+loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py')
+spec = spec_from_loader(loader.name, loader)
+func = module_from_spec(spec)
+loader.exec_module(func)
+for key, value in dict(locals()).items():
+    if key != ['SourceFileLoader', 'func']:
+        setattr(func, key, value)
+try:
+    from tiramisu3 import *
+except:
+    from tiramisu import *
+option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_4 = StrOption(name="activer_ejabberd", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"}))
+option_2 = OptionDescription(name="general", doc="général", children=[option_3, option_4], properties=frozenset({"normal"}))
+option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2])
+option_8 = StrOption(name="description", doc="description", multi=True, default=['test'], properties=frozenset({"mandatory"}))
+option_9 = StrOption(name="mode", doc="mode", multi=True, default_multi="pre", properties=frozenset({"mandatory", "normal"}))
+option_7 = Leadership(name="new_name", doc="new_name", children=[option_8, option_9], properties=frozenset({"normal"}))
+option_6 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_7], properties=frozenset({"normal"}))
+option_5 = OptionDescription(name="extra", doc="extra", children=[option_6])
+option_14 = FilenameOption(name="name", doc="name", default="/etc/mailname")
+option_15 = BoolOption(name="activate", doc="activate", default=True)
+option_13 = OptionDescription(name="mailname", doc="mailname", children=[option_14, option_15])
+option_13.impl_set_information('source', "mailname")
+option_17 = FilenameOption(name="name", doc="name", default="/etc/mailname2")
+option_18 = BoolOption(name="activate", doc="activate", default=True)
+option_16 = OptionDescription(name="mailname2", doc="mailname2", children=[option_17, option_18])
+option_16.impl_set_information('engine', "jinja2")
+option_16.impl_set_information('source', "mailname2")
+option_12 = OptionDescription(name="files", doc="files", children=[option_13, option_16])
+option_19 = BoolOption(name="activate", doc="activate", default=True)
+option_20 = BoolOption(name="manage", doc="manage", default=True)
+option_11 = OptionDescription(name="test", doc="test", children=[option_12, option_19, option_20])
+option_10 = OptionDescription(name="services", doc="services", children=[option_11], properties=frozenset({"hidden"}))
+option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_5, option_10])

tests/dictionaries/60extra_leadership_name_item/tmpl/mailname

@@ -0,0 +1,35 @@
+%if 'test' in %%extra['ejabberd']['new_name']
+contain test
+%end if
+%%len(%%extra['ejabberd']['new_name'])
+%if 'a' in %%extra['ejabberd']['new_name']
+contain a
+%end if
+%for %%description in %%extra['ejabberd']['new_name']
+leader: %%description
+follower: %%description['mode']
+%if %%description <= %%description['mode']
+infeq
+%end if
+%if %%description >= %%description['mode']
+supeq
+%end if
+%if %%description < %%description['mode']
+inf
+%end if
+%if %%description > %%description['mode']
+sup
+%end if
+%if %%description == %%description['mode']
+eq
+%end if
+%if %%description != %%description['mode']
+diff
+%end if
+%set %%var = %%description + %%description['mode']
+%%var
+%set %%var = %%description['mode'] + %%description
+%%var
+%end for
+leader2: %%extra['ejabberd']['new_name'][0]['description']
+follower2: %%extra['ejabberd']['new_name'][0]['mode']

tests/dictionaries/60extra_leadership_name_item/tmpl/mailname2

@@ -0,0 +1,33 @@
+{% if 'test' in extra.ejabberd.new_name -%}
+contain test
+{% endif -%}
+{{ extra.ejabberd.new_name |length }}
+{% if 'a' in extra.ejabberd.new_name -%}
+contain a
+{% endif -%}
+{% for description in extra.ejabberd.new_name -%}
+leader: {{ description }}
+follower: {{ description.mode }}
+{% if description <= description.mode -%}
+infeq
+{% endif -%}
+{% if description >= description.mode -%}
+supeq
+{% endif -%}
+{% if description < description.mode -%}
+inf
+{% endif -%}
+{% if description > description.mode -%}
+sup
+{% endif -%}
+{% if description == description.mode -%}
+eq
+{% endif -%}
+{% if description != description.mode -%}
+diff
+{% endif -%}
+{{ description + description.mode }}
+{{ description.mode + description }}
+{% endfor -%}
+leader2: {{ extra.ejabberd.new_name[0].description }}
+follower2: {{ extra.ejabberd.new_name[0].mode }}

tests/dictionaries/60extra_leadership_valid_enum/extra_dirs/extra/00-base.xml

@@ -6,17 +6,12 @@
         <variable name="description" type="string" multi="True">
           <value>test</value>
         </variable>
-        <variable name="mode" type="string">
+        <variable name="mode" type="choice">
+          <choice>pre</choice>
+          <choice>post</choice>
           <value>pre</value>
         </variable>
       </family>
     </family>
   </variables>
-  <constraints>
-    <check name="valid_enum">
-      <param>pre</param>
-      <param>post</param>
-      <target>extra.ejabberd.description.mode</target>
-    </check>
-  </constraints>
 </rougail>

tests/dictionaries/60extra_leadership_valid_enum/result/tmpfiles.d/0rougail.conf

@@ -0,0 +1,4 @@
+C /etc/mailname 0644 root root - /usr/local/lib/etc/mailname
+z /etc/mailname - - - - -
+C /etc/mailname2 0644 root root - /usr/local/lib/etc/mailname2
+z /etc/mailname2 - - - - -